working commit

Author: seran

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

@@ -859,34 +859,21 @@ 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(${verifier.getVerifierName()}")
+            lines.add("assertTrue(callbackVerifierHasServed(${verifier.getVerifierName()}, \"${action.getName()}\"))")
+//            lines.add("assertTrue(${verifier.getVerifierName()}")
         } else {
             lines.addSingleCommentLine("Verifying that there are no requests made to HttpCallbackVerifier before test execution.")
-            lines.add("assertFalse(${verifier.getVerifierName()}")
-        }
-        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(")")
-    }
-
-    private fun ssrfAssertionsUtilFunction(lines: Lines, action: Action, verifier: ActionStubMapping, assertTrue: Boolean) {
-        // TODO: Add function
-//        lines.add()
-        lines.indented {
-            lines.add(verifier.getVerifierName())
-            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("assertFalse(${verifier.getVerifierName()}")
+            lines.add("assertFalse(callbackVerifierHasServed(${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(")")
     }
 
 }

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

@@ -1036,6 +1036,10 @@ class TestSuiteWriter {
 
         initTestMethod(solution, lines, testSuiteFileName)
         lines.addEmpty(2)
+
+        if (config.ssrf && solution.hasSsrfFaults()) {
+            ssrfAssertionsUtilFunction(lines, config.outputFormat)
+        }
     }
 
 
@@ -1144,4 +1148,26 @@ class TestSuiteWriter {
             .toList()
     }
 
+    private fun ssrfAssertionsUtilFunction(lines: Lines, format: OutputFormat) {
+//        lines.addBlockCommentLine()
+        when {
+            format.isKotlin() -> {
+                lines.add("fun callbackVerifierHasServed(verifier: WireMockServer, actionName: String) : Boolean")
+            }
+            format.isJava() -> {
+                lines.add("public boolean callbackVerifierHasServed(WireMockServer verifier, String actionName)")
+            }
+        }
+        lines.block {
+            lines.add("return verifier")
+            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\") == actionName }")
+                }
+            }
+        }
+    }
+
 }