more clean-up

EMResearch · May 8, 2024 · c4acb22 · c4acb22
1 parent f8706f4
commit c4acb22
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 38 deletions.
diff --git a/...v3/src/test/kotlin/org/evomaster/e2etests/spring/openapi/v3/jackson/base/JacksonEMTest.kt b/...v3/src/test/kotlin/org/evomaster/e2etests/spring/openapi/v3/jackson/base/JacksonEMTest.kt
@@ -15,20 +15,11 @@ class JacksonEMTest : SpringTestBase() {
         @JvmStatic
         fun init() {
             initClass(JacksonController())
-            /*
-                TODO for some weird reason, this fails on CI, although it pass on different
-                 Mac and Windows machines locally.
-                Could be an issue with Linux or used JDK
-             */
-            //CIUtils.skipIfOnGA()
         }
     }
 
     @Test
     fun basicEMTest() {
-
-        //CIUtils.skipIfOnGA()
-
         runTestHandlingFlakyAndCompilation(
             "JacksonGenericEM",
             "org.foo.JacksonGenericEM",
@@ -41,4 +32,4 @@ class JacksonEMTest : SpringTestBase() {
             assertHasAtLeastOne(solution, HttpVerb.POST, 200, "/api/jackson/generic", "Working")
         }
     }
-}
+}
diff --git a/.../src/test/kotlin/org/evomaster/e2etests/spring/openapi/v3/wiremock/auth0/WmAuth0EMTest.kt b/.../src/test/kotlin/org/evomaster/e2etests/spring/openapi/v3/wiremock/auth0/WmAuth0EMTest.kt
@@ -32,7 +32,7 @@ class WmAuth0EMTest : SpringTestBase() {
         runTestHandlingFlakyAndCompilation(
             "WmAuth0EM",
             "org.foo.WmAuth0EM",
-            500,
+            200,
             true,
             { args: MutableList<String> ->
 

diff --git a/...ster/e2etests/spring/openapi/v3/wiremock/harvestoptimisation/HarvestOptimisationEMTest.kt b/...ster/e2etests/spring/openapi/v3/wiremock/harvestoptimisation/HarvestOptimisationEMTest.kt
@@ -53,7 +53,7 @@ class HarvestOptimisationEMTest: SpringTestBase() {
         runTestHandlingFlakyAndCompilation(
             "HarvestOptimisationEM",
             "org.foo.HarvestOptimisationEM",
-            1000,
+            100,
             true,
             { args: MutableList<String> ->
 

diff --git a/...g/evomaster/e2etests/spring/openapi/v3/wiremock/harveststrategy/HarvestingStrategyTest.kt b/...g/evomaster/e2etests/spring/openapi/v3/wiremock/harveststrategy/HarvestingStrategyTest.kt
@@ -48,7 +48,7 @@ class HarvestingStrategyTest : SpringTestBase() {
         runTestHandlingFlakyAndCompilation(
             "HarvestStrategyExactEMTest",
             "org.foo.HarvestStrategyExactEMTest",
-            1500,
+            100,
             true, // this fails in local and CI
             { args: MutableList<String> ->
 
@@ -104,7 +104,7 @@ class HarvestingStrategyTest : SpringTestBase() {
         runTestHandlingFlakyAndCompilation(
             "HarvestStrategyClosestSameDomainEMTest",
             "org.foo.HarvestStrategyClosestEMTest",
-            1000,
+            100,
             true,
             { args: MutableList<String> ->
 

diff --git a/.../test/kotlin/org/evomaster/e2etests/spring/openapi/v3/wiremock/jsonmap/WmJsonMapEMTest.kt b/.../test/kotlin/org/evomaster/e2etests/spring/openapi/v3/wiremock/jsonmap/WmJsonMapEMTest.kt
@@ -33,7 +33,7 @@ class WmJsonMapEMTest : SpringTestBase() {
         runTestHandlingFlakyAndCompilation(
             "WmJsonMapEM",
             "org.foo.WmJsonMapEM",
-            1000,
+            100,
             true,
             { args: MutableList<String> ->
 

diff --git a/...rc/test/kotlin/org/evomaster/e2etests/spring/openapi/v3/wiremock/okhttp/WmOkHttpEMTest.kt b/...rc/test/kotlin/org/evomaster/e2etests/spring/openapi/v3/wiremock/okhttp/WmOkHttpEMTest.kt
@@ -20,13 +20,6 @@ class WmOkHttpEMTest : SpringTestBase() {
             val config = EMConfig()
             config.instrumentMR_NET = true
             initClass(WmOkHttpController(), config)
-
-            /*
-            The test fails on CI, but not local with WM 2.32.0
-
-            if updating WM to 2.34.0, the test fails on local windows as well (TO CHECK)
-            */
-            //CIUtils.skipIfOnGA()
         }
     }
 

diff --git a/...t/kotlin/org/evomaster/e2etests/spring/openapi/v3/wiremock/okhttp3/WmHttpOkHttp3EMTest.kt b/...t/kotlin/org/evomaster/e2etests/spring/openapi/v3/wiremock/okhttp3/WmHttpOkHttp3EMTest.kt
@@ -20,13 +20,6 @@ class WmHttpOkHttp3EMTest : SpringTestBase() {
             val config = EMConfig()
             config.instrumentMR_NET = true
             initClass(WmOkHttp3Controller(listOf("/api/wm/socketconnect/sstring")), config)
-
-            /*
-            The test fails on CI, but not local with WM 2.32.0
-
-            if updating WM to 2.34.0, the test fails on local windows as well (TO CHECK)
-            */
-            //CIUtils.skipIfOnGA()
         }
     }
 

diff --git a/.../kotlin/org/evomaster/e2etests/spring/openapi/v3/wiremock/okhttp3/WmHttpsOkHttp3EMTest.kt b/.../kotlin/org/evomaster/e2etests/spring/openapi/v3/wiremock/okhttp3/WmHttpsOkHttp3EMTest.kt
@@ -20,13 +20,6 @@ class WmHttpsOkHttp3EMTest : SpringTestBase() {
             val config = EMConfig()
             config.instrumentMR_NET = true
             initClass(WmOkHttp3Controller(listOf("/api/wm/socketconnect/string","/api/wm/socketconnect/object")), config)
-
-            /*
-            The test fails on CI, but not local with WM 2.32.0
-
-            if updating WM to 2.34.0, the test fails on local windows as well (TO CHECK)
-            */
-            //CIUtils.skipIfOnGA()
         }
     }
 
@@ -37,7 +30,7 @@ class WmHttpsOkHttp3EMTest : SpringTestBase() {
         runTestHandlingFlakyAndCompilation(
             "WmHttpsOkHttp3EM",
             "org.foo.WmHttpsOkHttp3EM",
-            500,
+            100,
             true,
             { args: MutableList<String> ->
 

diff --git a/.../test/kotlin/org/evomaster/e2etests/spring/openapi/v3/wiremock/urlopen/WmUrlOpenEMTest.kt b/.../test/kotlin/org/evomaster/e2etests/spring/openapi/v3/wiremock/urlopen/WmUrlOpenEMTest.kt
@@ -35,7 +35,7 @@ class WmUrlOpenEMTest : SpringTestBase() {
         runTestHandlingFlakyAndCompilation(
             "WmUrlOpenEM",
             "org.foo.WmUrlOpenEM",
-            500,
+            100,
             true,
             { args: MutableList<String> ->