fixed condition and failing test

WebFuzzing · Jun 1, 2017 · f13ea40 · f13ea40
1 parent 311332f
commit f13ea40
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/core/src/main/kotlin/org/evomaster/core/problem/rest/service/RestActionBuilder.kt b/core/src/main/kotlin/org/evomaster/core/problem/rest/service/RestActionBuilder.kt
@@ -226,10 +226,10 @@ class RestActionBuilder {
 
         */
 
-        if(! parameter?.getEnum()?.isEmpty()!! && type == "string") {
+        if(type == "string" && ! (parameter?.getEnum()?.isEmpty() ?: true) ) {
             //TODO enum can be for any type, not just strings
             //Besides the defined values, add one to test robustness
-            return EnumGene(name, parameter.getEnum().apply { add("EVOMASTER") })
+            return EnumGene(name, parameter!!.getEnum().apply { add("EVOMASTER") })
         }
 
         //first check for "optional" format

diff --git a/...mples/src/test/java/org/evomaster/e2etests/spring/examples/strings/StringsManualTest.java b/...mples/src/test/java/org/evomaster/e2etests/spring/examples/strings/StringsManualTest.java
@@ -7,7 +7,6 @@
 import org.evomaster.clientJava.controllerApi.dto.SutInfoDto;
 import org.junit.jupiter.api.Test;
 
-import static io.restassured.RestAssured.baseURI;
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.core.Is.is;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -33,7 +32,7 @@ public void testSwaggerJSON() {
     }
 
     @Test
-    public void testEqualsFoo(){
+    public void testEqualsFoo() {
 
         given().accept(ContentType.JSON)
                 .get(baseUrlOfSut + "/api/strings/equalsFoo/bar")
@@ -49,7 +48,7 @@ public void testEqualsFoo(){
     }
 
     @Test
-    public void testStartEnds(){
+    public void testStartEnds() {
 
         given().accept(ContentType.JSON)
                 .get(baseUrlOfSut + "/api/strings/startEnds/foo")
@@ -70,14 +69,13 @@ public void testStartEnds(){
                 .body("valid", is(false));
 
         given().accept(ContentType.JSON)
-                .get(baseUrlOfSut + "/api/strings/startEnds/foobar")
+                .get(baseUrlOfSut + "/api/strings/startEnds/X12Y")
                 .then()
                 .statusCode(200)
                 .body("valid", is(true));
     }
 
 
-
     @Test
     public void testContains() {