update tests after solving conflicts

Author: omursahin

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

@@ -9,6 +9,7 @@
 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;
@@ -29,8 +30,8 @@ public class EndpointFocusAndPrefixRest {
             produces = MediaType.APPLICATION_JSON
     )
     public String getPetById(    @ApiParam("Value to retrieve")
-                              @PathVariable("petId")
-                              Integer value) {
+                                 @PathVariable("petId")
+                                 Integer value) {
         return value + " retrieved";
     }
 
@@ -41,8 +42,8 @@ public String getPetById(    @ApiParam("Value to retrieve")
             produces = MediaType.APPLICATION_JSON
     )
     public String updatePetById(    @ApiParam("Value to store")
-                              @PathVariable("petId")
-                              Integer value) {
+                                    @PathVariable("petId")
+                                    Integer value) {
         return value + " updated";
     }
 
@@ -53,8 +54,8 @@ public String updatePetById(    @ApiParam("Value to store")
             produces = MediaType.APPLICATION_JSON
     )
     public String deletePetById(    @ApiParam("Value to delete")
-                                   @PathVariable("petId")
-                                   Integer value) {
+                                    @PathVariable("petId")
+                                    Integer value) {
         return value + " deleted";
     }
 
@@ -65,8 +66,8 @@ public String deletePetById(    @ApiParam("Value to delete")
             produces = MediaType.APPLICATION_JSON
     )
     public String uploadImageForPet(    @ApiParam("Pet ID to upload")
-                                    @PathVariable("petId")
-                                    Integer value) {
+                                        @PathVariable("petId")
+                                        Integer value) {
         return "Image uploaded for the pet: " + value;
     }
 
@@ -118,8 +119,8 @@ public List<String> getStoreInventory() {
             produces = MediaType.APPLICATION_JSON
     )
     public String findStoreOrderById(    @ApiParam("order ID to check")
-                                  @PathVariable("orderID")
-                                  Integer value) {
+                                         @PathVariable("orderID")
+                                         Integer value) {
         return "Information for the order: " + value;
     }
 
@@ -130,8 +131,8 @@ public String findStoreOrderById(    @ApiParam("order ID to check")
             produces = MediaType.APPLICATION_JSON
     )
     public String deleteStoreOrderById(    @ApiParam("order ID to check")
-                                         @PathVariable("orderID")
-                                         Integer value) {
+                                           @PathVariable("orderID")
+                                           Integer value) {
         return "Deleted the order: " + value;
     }
 
@@ -154,7 +155,7 @@ public String placeOrder() {
     public String getUserByName(    @ApiParam("username to retrieve")
                                     @PathVariable("username")
                                     String name) {
-        return "Retrieved information for the user " + name;
+        return "Retrieved information for the user " + HtmlUtils.htmlEscape(String.valueOf(name));
     }
 
     @ApiOperation("Update information about a user")
@@ -167,7 +168,7 @@ public String updateUserInformation(
             @ApiParam("username to update")
             @PathVariable("username")
             String name) {
-        return "Updated information for the user " + name;
+        return "Updated information for the user " + HtmlUtils.htmlEscape(String.valueOf(name));
     }
 
     @ApiOperation("Delete information about a user")
@@ -180,7 +181,7 @@ public String deleteUserInformation(
             @ApiParam("username to delete")
             @PathVariable("username")
             String name) {
-        return "Deleted information for the user " + name;
+        return "Deleted information for the user " + HtmlUtils.htmlEscape(String.valueOf(name));
     }
 
     @ApiOperation("Create a new user")
@@ -207,10 +208,10 @@ public String createUserWithList(
         for(EndpointFocusAndPrefixRestDTO dto : userlist) {
 
             reportBuilder.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("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("-------\n");
         }
         String report = reportBuilder.toString();
@@ -241,4 +242,4 @@ public String userLogout() {
 
         return "Logged out a user";
     }
-}
+}

core-tests/e2e-tests/spring/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(solution.getIndividuals().size(), 8);
+                    assertEquals(8, solution.getIndividuals().size());
 
                     // write test into the output folder
                     compile(outputFolder);

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

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