conflicts

Author: omursahin

core-tests/e2e-tests/spring-rest-openapi-v2/src/main/java/com/foo/rest/examples/spring/endpointfocusandprefix/EndpointFocusAndPrefixRest.java

@@ -9,7 +9,6 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.util.HtmlUtils;
 
 import javax.ws.rs.core.MediaType;
 import java.util.Arrays;
@@ -155,7 +154,7 @@ public String placeOrder() {
     public String getUserByName(    @ApiParam("username to retrieve")
                                     @PathVariable("username")
                                     String name) {
-        return "Retrieved information for the user " + HtmlUtils.htmlEscape(String.valueOf(name));
+        return "Retrieved information for the user " + name;
     }
 
     @ApiOperation("Update information about a user")
@@ -168,7 +167,7 @@ public String updateUserInformation(
             @ApiParam("username to update")
             @PathVariable("username")
             String name) {
-        return "Updated information for the user " + HtmlUtils.htmlEscape(String.valueOf(name));
+        return "Updated information for the user " + name;
     }
 
     @ApiOperation("Delete information about a user")
@@ -181,7 +180,7 @@ public String deleteUserInformation(
             @ApiParam("username to delete")
             @PathVariable("username")
             String name) {
-        return "Deleted information for the user " + HtmlUtils.htmlEscape(String.valueOf(name));
+        return "Deleted information for the user " + name;
     }
 
     @ApiOperation("Create a new user")
@@ -208,10 +207,10 @@ public String createUserWithList(
         for(EndpointFocusAndPrefixRestDTO dto : userlist) {
 
             reportBuilder.append("-------\n");
-            reportBuilder.append("ID: ").append(HtmlUtils.htmlEscape(String.valueOf(dto.id))).append("\n");
-            reportBuilder.append("Username: ").append(HtmlUtils.htmlEscape(dto.userName)).append("\n");
-            reportBuilder.append("Firstname: ").append(HtmlUtils.htmlEscape(dto.firstName)).append("\n");
-            reportBuilder.append("Lastname: ").append(HtmlUtils.htmlEscape(dto.lastName)).append("\n");
+            reportBuilder.append("ID: ").append(dto.id).append("\n");
+            reportBuilder.append("Username: ").append(dto.userName).append("\n");
+            reportBuilder.append("Firstname: ").append(dto.firstName).append("\n");
+            reportBuilder.append("Lastname: ").append(dto.lastName).append("\n");
             reportBuilder.append("-------\n");
         }
         String report = reportBuilder.toString();

core-tests/e2e-tests/spring-rest-openapi-v2/src/test/java/org/evomaster/e2etests/spring/examples/endpointfocusandprefix/EndpointFocusAndPrefixTest.java

@@ -255,7 +255,7 @@ public void testRunBlackboxWithPrefixWithoutParameters() throws Throwable {
                     assertAllSolutionsHavePathFocusOrPrefixList(solution, pathsToCheck, false);
 
                     // The solution should include 8 solutions, 7 endpoints and 1 failure case
-                    assertEquals(8, solution.getIndividuals().size());
+                    assertEquals(solution.getIndividuals().size(), 8);
 
                     // write test into the output folder
                     compile(outputFolder);

core-tests/e2e-tests/spring-rest-openapi-v3/src/test/kotlin/org/evomaster/e2etests/spring/openapi/v3/sleep/SleepEMTest.kt

@@ -40,9 +40,8 @@ class SleepEMTest : SpringTestBase() {
 
             assertTrue(solution.individuals.size >= 1)
 
-            //minimization and extra oracles can re-execute the test
-            val n = SleepCounter.counter.get()
-            assertTrue(n > iterations, "Times n=$n of calls should be more than i=$iterations iterations")
+            //minimization re-execute the test
+            assertEquals(iterations+1, SleepCounter.counter.get())
         }
     }