minor fixes about code style continued

WebFuzzing · Oct 8, 2023 · b1da27f · b1da27f
1 parent 2d5ef05
commit b1da27f
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 128 deletions.
diff --git a/core/src/main/kotlin/org/evomaster/core/problem/rest/OpenApiAccess.kt b/core/src/main/kotlin/org/evomaster/core/problem/rest/OpenApiAccess.kt
@@ -80,7 +80,7 @@ object OpenApiAccess {
         }
         // if the URL is not a valid one
         catch (e: Exception) {
-            throw SutProblemException("The file path provided for the OpenAPI Schema $openApiUrl ," +
+            throw SutProblemException("The file path provided for the OpenAPI Schema $openApiUrl," +
                     " is not a valid path");
         }
 

diff --git a/core/src/main/kotlin/org/evomaster/core/problem/rest/service/AbstractRestSampler.kt b/core/src/main/kotlin/org/evomaster/core/problem/rest/service/AbstractRestSampler.kt
@@ -250,7 +250,7 @@ abstract class AbstractRestSampler : HttpWsSampler<RestIndividual>() {
     private fun initForBlackBox() {
 
         swagger = OpenApiAccess.getOpenAPIFromURL(configuration.bbSwaggerUrl)
-        if (swagger.paths == null ) {
+        if (swagger.paths == null) {
             throw SutProblemException("There is no endpoint definition in the retrieved Swagger file")
         }
         // Onur: to give the error message for invalid swagger

diff --git a/core/src/test/kotlin/org/evomaster/core/problem/rest/OpenAPILocalURLIssueTest.kt b/core/src/test/kotlin/org/evomaster/core/problem/rest/OpenAPILocalURLIssueTest.kt
@@ -22,10 +22,8 @@ class OpenAPILocalURLIssueTest {
     private val executionPath :String = System.getProperty("user.dir")
     private lateinit var swagger: OpenAPI
 
-
     /*
-    Check that the swagger is created with a valid URL
-    and an existing file
+    Check that the swagger is created with a valid URL and an existing file
     */
     @Test
     fun testExistingFileValidURL() {
@@ -41,180 +39,94 @@ class OpenAPILocalURLIssueTest {
     }
 
     /*
-    Check that an exception is thrown with a non-existing file
-    and a valid url
+    Check that an exception is thrown with a non-existing file and a valid url
     */
     @Test
     fun testNonExistingFileValidURL() {
 
         // get the current directory
-        val urlToTest = "file://$executionPath/src/test" +
-                "/resources/openapi_pet_non_existing.json";
+        val urlToTest = "file://$executionPath/src/test/resources/openapi_pet_non_existing.json";
 
-        // since the file does not exist,
-        // a valid swagger cannot be created but an
-        // SutException should be thrown
+        // since the file does not exist, a valid swagger cannot be created but an SutException should be thrown
         val exception = Assertions.assertThrows(
             SutProblemException::class.java
         ) {
             // create swagger
             swagger = OpenApiAccess.getOpenAPIFromURL(urlToTest);
         }
 
-        // the message in the SutException should be
-        // Cannot find OpenAPI schema at file location: $urlToTest
-
-        // check that the message is correct
-        Assertions.assertTrue(
-            exception.message!!.contains("Cannot find OpenAPI " +
-                "schema at file location: $urlToTest"))
+        // the message in the SutException should be "Cannot find OpenAPI schema at file location: $urlToTest
+        // check that the message is correct"
+        Assertions.assertTrue(exception.message!!.contains("Cannot find OpenAPI schema at file " +
+                "location: $urlToTest"))
     }
 
     /*
-    Check that an exception is thrown when the file exists
-    but the URL is not valid, missing one slash (/)
+    Check that an exception is thrown when the file exists but the URL is not valid, missing one slash (/)
     */
     @Test
     fun testExistingFileInvalidURL() {
 
         // get the current directory
-        val urlToTest = "file:/$executionPath/src/test" +
-                "/resources/openapi_pet.json";
+        val urlToTest = "file:/$executionPath/src/test/resources/openapi_pet.json";
 
-        // since the file does not exist,
-        // a valid swagger cannot be created but an
-        // SutException should be thrown
+        // since the file URL is invalid, a valid swagger cannot be created but an  SutException should be thrown
         val exception = Assertions.assertThrows(
             SutProblemException::class.java
         ) {
             // create swagger
             swagger = OpenApiAccess.getOpenAPIFromURL(urlToTest);
         }
 
-        /*
-        the message in the SutException should be
-        The file path provided for the OpenAPI Schema
-        $urlToTest , is not a valid path
-        */
-        Assertions.assertTrue(
-            exception.message!!.contains("The file path provided for the OpenAPI Schema $urlToTest ," +
-                    " is not a valid path"))
+        // The message in the SutException should contain "The file path provided for the OpenAPI Schema
+        // $urlToTest is not a valid path
+        Assertions.assertTrue(exception.message!!.contains("The file path provided for the OpenAPI Schema " +
+                "$urlToTest, is not a valid path"))
     }
 
     /*
-    Check that an exception is thrown when the file
-    does not exist and the URL is not valid,
-    missing one slash (/)
+    Check that an exception is thrown when the file does not exist and the URL is not valid, missing one slash (/)
     */
     @Test
     fun testNonExistingFileInvalidURL() {
 
         // get the current directory
-        val urlToTest = "file:/$executionPath/src/test" +
-                "/resources/openapi_pet_non_existent.json";
-
-        // since the file does not exist,
-        // a valid swagger cannot be created but an
-        // SutException should be thrown
-        val exception = Assertions.assertThrows(
-            SutProblemException::class.java
-        ) {
-            // create swagger
-            swagger = OpenApiAccess.getOpenAPIFromURL(urlToTest);
-        }
-
-        /*
-        the message in the SutException should be
-        The file path provided for the OpenAPI Schema
-        $urlToTest , is not a valid path
-        */
-        Assertions.assertTrue(
-            exception.message!!.contains("The file path provided for the OpenAPI Schema $urlToTest ," +
-                    " is not a valid path"))
-    }
-
-    /*
-    Check that an exception is thrown when the file
-    does not exist and the URL is not valid,
-    missing one slash (/)
-    */
-    @Test
-    fun testExistingFileInvalidSwagger() {
-
-        // get the current directory
-        val urlToTest = "file:/$executionPath/src/test" +
-                "/resources/openapi_pet_non_existent.json";
+        val urlToTest = "file:/$executionPath/src/test/resources/openapi_pet_non_existent.json";
 
-        // since the file does not exist,
-        // a valid swagger cannot be created but an
-        // SutException should be thrown
+        // since the file does not exist and URL is invalid, a valid swagger cannot be created
+        // but an SutException should be thrown
         val exception = Assertions.assertThrows(
             SutProblemException::class.java
         ) {
             // create swagger
             swagger = OpenApiAccess.getOpenAPIFromURL(urlToTest);
         }
 
-        /*
-        the message in the SutException should be
-        The file path provided for the OpenAPI Schema
-        $urlToTest , is not a valid path
-        */
-        Assertions.assertTrue(
-            exception.message!!.contains("The file path provided for the OpenAPI Schema $urlToTest ," +
-                    " is not a valid path"))
+        // The message in the SutException should be "The file path provided for the OpenAPI Schema
+        // $urlToTest , is not a valid path"
+        Assertions.assertTrue(exception.message!!.contains("The file path provided for the OpenAPI Schema " +
+                "$urlToTest, is not a valid path"))
     }
 
-    /*
-    Check that when the swagger is invalid,
-    an exception is thrown with the message
-
-    */
+    //Check that when the swagger is invalid, an empty swagger object is created
     @Test
     fun testInvalidSwagger() {
 
         // get the current directory
-        val urlToTest = "file://$executionPath/src/test" +
-                "/resources/invalid_swagger.json";
+        val urlToTest = "file://$executionPath/src/test/resources/invalid_swagger.json";
 
         // create swagger
         swagger = OpenApiAccess.getOpenAPIFromURL(urlToTest);
 
-        /*
-        An empty swagger should be created
-        */
+        //An empty swagger should be created
         Assertions.assertTrue(swagger.paths.size == 0)
     }
 
-    @Test
-    fun testInvalidURLI() {
-
-        // get the current directory
-        val urlToTest = "file://$executionPath/xxxxxxxx";
-
-        val exception = Assertions.assertThrows(
-            SutProblemException::class.java
-        ) {
-            // create swagger
-            swagger = OpenApiAccess.getOpenAPIFromURL(urlToTest);
-        }
-
-        /*
-        the message in the SutException should be
-        The file path provided for the OpenAPI Schema
-        $urlToTest , is not a valid path
-        */
-        Assertions.assertTrue(
-            exception.message!!.contains("Cannot find OpenAPI " +
-                    "schema at file location: $urlToTest"))
-    }
-
     @Test
     fun testInvalidJSON() {
 
         // get the current directory
-        val urlToTest = "file://$executionPath/src/test" +
-                "/resources/invalid_json.json";
+        val urlToTest = "file://$executionPath/src/test/resources/invalid_json.json";
 
         // exception to throw
         val exception = Assertions.assertThrows(
@@ -224,17 +136,7 @@ class OpenAPILocalURLIssueTest {
             swagger = OpenApiAccess.getOpenAPIFromURL(urlToTest);
         }
 
-        /*
-        An empty swagger should be created
-        */
-        //Assertions.assertTrue(swagger.paths.size == 0)
-
-        print(exception.message)
-
+        // Failed to parse OpenApi schema
         Assertions.assertTrue( exception.message!!.contains("Failed to parse OpenApi schema"))
-
     }
-
-
-
 }