fixes

Author: seran

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

@@ -859,10 +859,10 @@ 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(verifierHasReceivedRequests(${verifier.getVerifierName()}, \"${action.getName()}\"))")
+            lines.addStatement("assertTrue(verifierHasReceivedRequests(${verifier.getVerifierName()}, \"${action.getName()}\"))")
         } else {
             lines.addSingleCommentLine("Verifying that there are no requests made to HttpCallbackVerifier before test execution.")
-            lines.add("assertFalse(verifierHasReceivedRequests(${verifier.getVerifierName()}, \"${action.getName()}\"))")
+            lines.addStatement("assertFalse(verifierHasReceivedRequests(${verifier.getVerifierName()}, \"${action.getName()}\"))")
         }
     }
 

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

@@ -643,6 +643,7 @@ class TestSuiteWriter {
             if (config.ssrf && solution.hasSsrfFaults()) {
                 httpCallbackVerifier.getActionVerifierMappings().forEach { v ->
                     addStatement("private static WireMockServer ${v.getVerifierName()}", lines)
+                    addStatement("private static final String SSRF_METADATA_TAG = \"SSRF\"", lines)
                 }
             }
 
@@ -676,6 +677,7 @@ class TestSuiteWriter {
                     addStatement("private lateinit var ${v.getVerifierName()}: WireMockServer", lines)
                     addStatement("private const val SSRF_METADATA_TAG: String = \"SSRF\" ", lines)
                 }
+                assertionUtilFunctionForSSRF(lines, config.outputFormat)
             }
 
             if(config.problemType == EMConfig.ProblemType.WEBFRONTEND){
@@ -1038,7 +1040,7 @@ class TestSuiteWriter {
         initTestMethod(solution, lines, testSuiteFileName)
         lines.addEmpty(2)
 
-        if (config.ssrf && solution.hasSsrfFaults()) {
+        if (config.ssrf && solution.hasSsrfFaults() && format.isJava()) {
             assertionUtilFunctionForSSRF(lines, config.outputFormat)
         }
     }
@@ -1150,15 +1152,18 @@ class TestSuiteWriter {
     }
 
     private fun assertionUtilFunctionForSSRF(lines: Lines, format: OutputFormat) {
-        lines.startCommentBlock()
-        lines.addBlockCommentLine("A method for verifying requests sent to HttpCallbackVerifier.")
-        lines.endCommentBlock()
+        lines.addEmpty(1)
+
         when {
             format.isKotlin() -> {
+                lines.addSingleCommentLine("To verify whether the HttpCallbackVerifier has received any requests.")
                 lines.add("fun verifierHasReceivedRequests(verifier: WireMockServer, actionName: String) : Boolean")
             }
             format.isJava() -> {
-                lines.add("public boolean verifierHasReceivedRequests(WireMockServer verifier, String actionName)")
+                lines.startCommentBlock()
+                lines.addBlockCommentLine("Method to verify whether the HttpCallbackVerifier has received any requests.")
+                lines.endCommentBlock()
+                lines.add("public static boolean verifierHasReceivedRequests(WireMockServer verifier, String actionName)")
             }
         }
         lines.block {
@@ -1169,6 +1174,11 @@ class TestSuiteWriter {
                     lines.add(".filter { it.wasMatched && it.stubMapping.metadata != null }")
                     lines.add(".any { it.stubMapping.metadata.getString(SSRF_METADATA_TAG) == actionName }")
                 }
+                if (format.isJava()) {
+                    lines.add(".getAllServeEvents()")
+                    lines.add(".stream().filter( r -> r.getWasMatched() && r.getStubMapping().getMetadata() != null)")
+                    lines.add(".anyMatch( r -> r.getStubMapping().getMetadata().getString(SSRF_METADATA_TAG).equals(actionName));")
+                }
             }
         }
     }