Skip to content

Commit 33d6efc

Browse files
committed
changes after review
1 parent 55f9bde commit 33d6efc

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -857,12 +857,13 @@ abstract class HttpWsTestCaseWriter : ApiTestCaseWriter() {
857857
}
858858

859859
private fun handleCallbackVerifierRequests(lines: Lines, action: Action, verifier: ActionStubMapping, assertTrue: Boolean) {
860+
val verifierHasReceivedRequestsCheck = "verifierHasReceivedRequests(${verifier.getVerifierName()}, \"${action.getName()}\")"
860861
if (assertTrue) {
861862
lines.addSingleCommentLine("Verifying that the request is successfully made to HttpCallbackVerifier after test execution.")
862-
lines.addStatement("assertTrue(verifierHasReceivedRequests(${verifier.getVerifierName()}, \"${action.getName()}\"))")
863+
lines.addStatement("assertTrue($verifierHasReceivedRequestsCheck)")
863864
} else {
864865
lines.addSingleCommentLine("Verifying that there are no requests made to HttpCallbackVerifier before test execution.")
865-
lines.addStatement("assertFalse(verifierHasReceivedRequests(${verifier.getVerifierName()}, \"${action.getName()}\"))")
866+
lines.addStatement("assertFalse($verifierHasReceivedRequestsCheck)")
866867
}
867868
}
868869

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,7 +1040,7 @@ class TestSuiteWriter {
10401040
initTestMethod(solution, lines, testSuiteFileName)
10411041
lines.addEmpty(2)
10421042

1043-
if (config.ssrf && solution.hasSsrfFaults() && format.isJava()) {
1043+
if (config.ssrf && solution.hasSsrfFaults() && config.outputFormat.isJavaOrKotlin()) {
10441044
assertionUtilFunctionForSSRF(lines, config.outputFormat)
10451045
}
10461046
}
@@ -1154,14 +1154,15 @@ class TestSuiteWriter {
11541154
private fun assertionUtilFunctionForSSRF(lines: Lines, format: OutputFormat) {
11551155
lines.addEmpty(1)
11561156

1157+
val methodComment = "Method to verify whether the HttpCallbackVerifier has received any requests."
11571158
when {
11581159
format.isKotlin() -> {
1159-
lines.addSingleCommentLine("To verify whether the HttpCallbackVerifier has received any requests.")
1160+
lines.addSingleCommentLine(methodComment)
11601161
lines.add("fun verifierHasReceivedRequests(verifier: WireMockServer, actionName: String) : Boolean")
11611162
}
11621163
format.isJava() -> {
11631164
lines.startCommentBlock()
1164-
lines.addBlockCommentLine("Method to verify whether the HttpCallbackVerifier has received any requests.")
1165+
lines.addBlockCommentLine(methodComment)
11651166
lines.endCommentBlock()
11661167
lines.add("public static boolean verifierHasReceivedRequests(WireMockServer verifier, String actionName)")
11671168
}

0 commit comments

Comments
 (0)