diff --git a/client-java/controller/src/main/java/org/evomaster/client/java/controller/contentMatchers/StringCollectionMatcher.java b/client-java/controller/src/main/java/org/evomaster/client/java/controller/contentMatchers/StringCollectionMatcher.java index 3a7a6357ff..00bdb208bf 100644 --- a/client-java/controller/src/main/java/org/evomaster/client/java/controller/contentMatchers/StringCollectionMatcher.java +++ b/client-java/controller/src/main/java/org/evomaster/client/java/controller/contentMatchers/StringCollectionMatcher.java @@ -2,8 +2,6 @@ import org.hamcrest.Description; import org.hamcrest.TypeSafeMatcher; - -import java.util.Arrays; import java.util.Collection; public class StringCollectionMatcher extends TypeSafeMatcher> { diff --git a/core/src/main/kotlin/org/evomaster/core/output/service/PartialOracles.kt b/core/src/main/kotlin/org/evomaster/core/output/service/PartialOracles.kt index a6e96eb08f..8e1ef61e2e 100644 --- a/core/src/main/kotlin/org/evomaster/core/output/service/PartialOracles.kt +++ b/core/src/main/kotlin/org/evomaster/core/output/service/PartialOracles.kt @@ -47,12 +47,8 @@ class PartialOracles { lines.add("expectationHandler") lines.indented { lines.add(".expect($expectationsMasterSwitch)") - for (oracle in oracles) { - oracle.addExpectations(call, lines, res, name, format) - if (format.isJava()) { - lines.append(";") - } - } + for (oracle in oracles) { oracle.addExpectations(call, lines, res, name, format) } + if (format.isJava()) { lines.append(";") } } } diff --git a/core/src/test/kotlin/org/evomaster/core/output/MatcherTests.kt b/core/src/test/kotlin/org/evomaster/core/output/MatcherTests.kt index 4ef339d685..75d174e76d 100644 --- a/core/src/test/kotlin/org/evomaster/core/output/MatcherTests.kt +++ b/core/src/test/kotlin/org/evomaster/core/output/MatcherTests.kt @@ -3,9 +3,11 @@ package org.evomaster.core.output import org.evomaster.client.java.controller.contentMatchers.NumberMatcher.numbersMatch import org.evomaster.client.java.controller.contentMatchers.StringMatcher.stringsMatch import org.evomaster.client.java.controller.contentMatchers.SubStringMatcher.subStringsMatch +import org.evomaster.client.java.controller.contentMatchers.StringCollectionMatcher.collectionContains import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Assertions.assertFalse import org.junit.jupiter.api.Test +import java.util.* class MatcherTests{ @@ -56,4 +58,14 @@ class MatcherTests{ assertFalse(numbersMatch(404.1, "404.0")) } + /** + * The [testStringCollectionMatcher] + */ + @Test + fun testStringCollectionMatcher(){ + assertTrue(collectionContains(Arrays.asList("mup", "tup", "vup"), "vup")) + assertFalse(collectionContains(Arrays.asList("mup", "tup", "vup"), "mjup")) + } + + } \ No newline at end of file