clean-up

Author: seran

core/src/main/kotlin/org/evomaster/core/output/service/HttpWsTestCaseWriter.kt

@@ -827,7 +827,7 @@ abstract class HttpWsTestCaseWriter : ApiTestCaseWriter() {
             lines.indented {
                 lines.add("get(\"${verifier.stub}\")")
                 lines.indented {
-                    lines.add(".withMetadata(Metadata.metadata().attr(\"ssrf\", \"${action.getName()}\"))")
+                    lines.add(".withMetadata(Metadata.metadata().attr(SSRF_METADATA_TAG, \"${action.getName()}\"))")
                     lines.add(".atPriority(1)")
                     lines.add(".willReturn(")
                     lines.indented {
@@ -859,21 +859,11 @@ abstract class HttpWsTestCaseWriter : ApiTestCaseWriter() {
     private fun handleCallbackVerifierRequests(lines: Lines, action: Action, verifier: ActionStubMapping, assertTrue: Boolean) {
         if (assertTrue) {
             lines.addSingleCommentLine("Verifying that the request is successfully made to HttpCallbackVerifier after test execution.")
-            lines.add("assertTrue(verifierHasServedRequests(${verifier.getVerifierName()}, \"${action.getName()}\"))")
-//            lines.add("assertTrue(${verifier.getVerifierName()}")
+            lines.add("assertTrue(verifierHasReceivedRequests(${verifier.getVerifierName()}, \"${action.getName()}\"))")
         } else {
             lines.addSingleCommentLine("Verifying that there are no requests made to HttpCallbackVerifier before test execution.")
-//            lines.add("assertFalse(${verifier.getVerifierName()}")
-            lines.add("assertFalse(verifierHasServedRequests(${verifier.getVerifierName()}, \"${action.getName()}\"))")
-        }
-//        lines.indented {
-//            if (format.isKotlin()) {
-//                lines.add(".allServeEvents")
-//                lines.add(".filter { it.wasMatched && it.stubMapping.metadata != null }")
-//                lines.add(".any { it.stubMapping.metadata.getString(\"ssrf\") == \"${action.getName()}\" }")
-//            }
-//        }
-//        lines.add(")")
+            lines.add("assertFalse(verifierHasReceivedRequests(${verifier.getVerifierName()}, \"${action.getName()}\"))")
+        }
     }
 
 }

core/src/main/kotlin/org/evomaster/core/output/service/TestSuiteWriter.kt

@@ -674,6 +674,7 @@ class TestSuiteWriter {
             if (config.ssrf && solution.hasSsrfFaults()) {
                 httpCallbackVerifier.getActionVerifierMappings().forEach { v ->
                     addStatement("private lateinit var ${v.getVerifierName()}: WireMockServer", lines)
+                    addStatement("private const val SSRF_METADATA_TAG: String = \"SSRF\" ", lines)
                 }
             }
 
@@ -1154,10 +1155,10 @@ class TestSuiteWriter {
         lines.endCommentBlock()
         when {
             format.isKotlin() -> {
-                lines.add("fun verifierHasServedRequests(verifier: WireMockServer, actionName: String) : Boolean")
+                lines.add("fun verifierHasReceivedRequests(verifier: WireMockServer, actionName: String) : Boolean")
             }
             format.isJava() -> {
-                lines.add("public boolean verifierHasServedRequests(WireMockServer verifier, String actionName)")
+                lines.add("public boolean verifierHasReceivedRequests(WireMockServer verifier, String actionName)")
             }
         }
         lines.block {
@@ -1166,7 +1167,7 @@ class TestSuiteWriter {
                 if (format.isKotlin()) {
                     lines.add(".allServeEvents")
                     lines.add(".filter { it.wasMatched && it.stubMapping.metadata != null }")
-                    lines.add(".any { it.stubMapping.metadata.getString(\"ssrf\") == actionName }")
+                    lines.add(".any { it.stubMapping.metadata.getString(SSRF_METADATA_TAG) == actionName }")
                 }
             }
         }