Testify/playwright

core-tests/e2e-tests/e2e-tests-utils/src/test/kotlin/org/evomaster/e2etests/utils/BlackBoxUtils.kt

@@ -36,7 +36,6 @@ object BlackBoxUtils {
 
     private fun mvn() = if (isWindows()) "mvn.cmd" else "mvn"
 
-
     private fun runNpmInstall() {
         val command = listOf(npm(), "ci")
 
@@ -106,7 +105,7 @@ object BlackBoxUtils {
         }
     }
 
-    fun runNpmTests(folderRelativePath: String) {
+    fun runNpmTests(folderRelativePath: String, isPlaywright: Boolean = false) {
         runNpmInstall()
 
         val path = if(folderRelativePath.endsWith("/")){
@@ -116,8 +115,12 @@ object BlackBoxUtils {
             "$folderRelativePath/"
         }
 
-        val command = listOf(npm(), "test", "--", "--testPathPattern=\"$path\"")
-        runTestsCommand(command, JS_BASE_PATH, "NPM")
+        val command = if (isPlaywright) {
+            listOf(npm(), "run", "test:playwright", "--", path)
+        } else {
+            listOf(npm(), "test", "--", "--testPathPattern=\"$path\"")
+        }
+        runTestsCommand(command, JS_BASE_PATH, if (isPlaywright) "Playwright" else "NPM")
     }
 
     fun runPythonTests(folderRelativePath: String) {
@@ -151,4 +154,4 @@ object BlackBoxUtils {
 
     fun getOutputFilePrefixKotlin(outputFolderName: String) = "com.kotlin.$outputFolderName.EM"
 
-}
+}

core-tests/e2e-tests/spring/spring-graphql-bb/src/test/kotlin/org/evomaster/e2etests/spring/graphql/bb/SpringTestBase.kt

@@ -100,7 +100,12 @@ abstract class SpringTestBase : GraphQLTestBase() {
     fun runGeneratedTests(outputFormat: OutputFormat, outputFolderName: String){
 
         when{
-            outputFormat.isJavaScript() -> BlackBoxUtils.runNpmTests(BlackBoxUtils.relativePath(outputFolderName))
+            outputFormat.isJavaScript() ->
+                if (outputFormat.isPlaywright()) {
+                    BlackBoxUtils.runNpmTests(BlackBoxUtils.relativePath(outputFolderName), true)
+                } else {
+                    BlackBoxUtils.runNpmTests(BlackBoxUtils.relativePath(outputFolderName))
+                }
             outputFormat.isPython() -> BlackBoxUtils.runPythonTests(BlackBoxUtils.relativePath(outputFolderName))
             else -> throw IllegalArgumentException("Not supported output type $outputFormat")
         }

core-tests/e2e-tests/spring/spring-rest-bb/javascript/package.json

@@ -6,16 +6,19 @@
   "author": "EvoMaster Team",
   "license": "LGPL-3.0-only",
   "devDependencies": {
+    "@playwright/test": "^1.59.1",
     "jest": "29.7.0",
     "superagent": "9.0.2",
     "supertest": "7.0.0",
     "urijs": "1.19.6"
   },
   "scripts": {
-    "test": "jest"
+    "test": "jest",
+    "test:playwright": "playwright test"
   },
   "jest": {
     "testEnvironment": "node",
-    "testRegex": "generated/.*/.*[tT]est\\.js$"
+    "testRegex": "generated/.*/.*[tT]est\\.js$",
+    "testPathIgnorePatterns": [".*_pw\\.js$"]
   }
 }

core-tests/e2e-tests/spring/spring-rest-bb/javascript/playwright.config.js

@@ -0,0 +1,6 @@
+const { defineConfig } = require('@playwright/test');
+
+module.exports = defineConfig({
+  testDir: './generated',
+  testMatch: /.*[tT]est\.js/,
+});

core-tests/e2e-tests/spring/spring-rest-bb/maven/pom.xml

@@ -11,7 +11,7 @@
  -->
     <parent>
         <groupId>org.evomaster</groupId>
-        <artifactId>evomaster-e2e-tests</artifactId>
+        <artifactId>evomaster-e2e-tests-spring</artifactId>
         <!-- WARNING: the marker is used in the version.py script -->
         <version>6.1.2-SNAPSHOT</version><!--MARKER-->
         <relativePath>../../pom.xml</relativePath>

core-tests/e2e-tests/spring/spring-rest-bb/src/test/kotlin/org/evomaster/e2etests/spring/rest/bb/SpringTestBase.kt

@@ -150,7 +150,6 @@ abstract class SpringTestBase : RestTestBase() {
         }
     }
 
-
     fun runBlackBoxEM(
         outputFormat: OutputFormat,
         outputFolderName: String,
@@ -172,7 +171,7 @@ abstract class SpringTestBase : RestTestBase() {
     fun runGeneratedTests(outputFormat: OutputFormat, outputFolderName: String){
 
         when{
-            outputFormat.isJavaScript() -> BlackBoxUtils.runNpmTests(BlackBoxUtils.relativePath(outputFolderName))
+            outputFormat.isJavaScript() -> BlackBoxUtils.runNpmTests(BlackBoxUtils.relativePath(outputFolderName), outputFormat.isPlaywright())
             outputFormat.isPython() -> BlackBoxUtils.runPythonTests(BlackBoxUtils.relativePath(outputFolderName))
             outputFormat.isJava() -> BlackBoxUtils.runJavaTests(outputFolderName)
             outputFormat.isKotlin() -> BlackBoxUtils.runKotlinTests(outputFolderName)
@@ -218,6 +217,9 @@ abstract class SpringTestBase : RestTestBase() {
                 if(outputFormat.isKotlin()){
                     setOption(args,"outputFilePrefix",BlackBoxUtils.getOutputFilePrefixKotlin(outputFolderName))
                 }
+                if (outputFormat.isPlaywright()) {
+                    setOption(args, "outputFilePrefix", "EvoMaster_pw")
+                }
 
                 defaultSeed++
                 lambda.accept(ArrayList(args))
@@ -230,4 +232,4 @@ abstract class SpringTestBase : RestTestBase() {
         }
     }
 
-}
+}

core/src/main/kotlin/org/evomaster/core/output/OutputFormat.kt

@@ -18,6 +18,7 @@ enum class OutputFormat {
     KOTLIN_JUNIT_4,
     KOTLIN_JUNIT_5,
     JS_JEST,
+    JS_PLAYWRIGHT,
     //CSHARP_XUNIT, //no longer supported, but there is still legacy code not removed
     PYTHON_UNITTEST
     ;
@@ -28,6 +29,8 @@ enum class OutputFormat {
 
     fun isJavaScript() = this.name.startsWith("js_", true)
 
+    fun isPlaywright() = this.name.endsWith("_playwright", true)
+
     fun isJavaOrKotlin() = isJava() || isKotlin()
 
     fun isJUnit5() = this.name.endsWith("junit_5", true)
@@ -40,5 +43,4 @@ enum class OutputFormat {
     fun isCsharp() = this.name.startsWith("csharp",ignoreCase = true)
 
     fun isPython() = this.name.startsWith("python_", true)
-
 }