Skip to content

Commit 8aa0925

Browse files
authored
Merge branch 'master' into pr/dynamodb-operations-and-parsers
2 parents 4477f1a + af47dbe commit 8aa0925

25 files changed

Lines changed: 92 additions & 75 deletions

File tree

core-tests/e2e-tests/spring/spring-rest-h2-z3solver/src/test/java/org/evomaster/e2etests/spring/h2/z3solver/Z3SolverEMTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@
55
import org.evomaster.core.problem.rest.data.RestIndividual;
66
import org.evomaster.core.search.Solution;
77
import org.junit.jupiter.api.BeforeAll;
8+
import org.junit.jupiter.api.Disabled;
89
import org.junit.jupiter.api.Test;
910

1011
import static org.junit.jupiter.api.Assertions.assertFalse;
1112

13+
14+
@Disabled("Currently disabled due to bug in reset of database")
1215
public class Z3SolverEMTest extends SpringTestBase {
1316

1417
@BeforeAll

core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/test/kotlin/org/evomaster/e2etests/spring/openapi/v3/httporacle/failmodification/FailModificationEMTest.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@ class FailModificationEMTest : SpringTestBase(){
3939

4040
val faults = DetectedFaultUtils.getDetectedFaults(solution)
4141

42-
assertEquals(2, faults.size)
43-
assertEquals(ExperimentalFaultCategory.HTTP_SIDE_EFFECTS_FAILED_MODIFICATION, faults.first().category)
42+
val found = faults.filter { it.category == ExperimentalFaultCategory.HTTP_SIDE_EFFECTS_FAILED_MODIFICATION}
43+
44+
assertEquals(2, found.size)
4445
}
4546
}
4647
}

core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/test/kotlin/org/evomaster/e2etests/spring/openapi/v3/httporacle/failmodification/FailModificationForbiddenEMTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ class FailModificationForbiddenEMTest : SpringTestBase(){
3838
assertTrue(solution.individuals.size >= 1)
3939

4040
val faults = DetectedFaultUtils.getDetectedFaults(solution)
41+
.filter { it.category == ExperimentalFaultCategory.HTTP_SIDE_EFFECTS_FAILED_MODIFICATION}
4142

4243
assertEquals(1, faults.size)
43-
assertEquals(ExperimentalFaultCategory.HTTP_SIDE_EFFECTS_FAILED_MODIFICATION, faults.first().category)
4444
}
4545
}
4646
}

core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/test/kotlin/org/evomaster/e2etests/spring/openapi/v3/oracledisable/ForgottenAuthenticationDisableEMTest.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.evomaster.e2etests.spring.openapi.v3.oracledisable
22

33
import com.foo.rest.examples.spring.openapi.v3.security.forgottenauthentication.ForgottenAuthenticationController
4+
import com.webfuzzing.commons.faults.DefinedFaultCategory
45
import org.evomaster.core.problem.enterprise.DetectedFaultUtils
56
import org.evomaster.core.problem.enterprise.ExperimentalFaultCategory
67
import org.evomaster.e2etests.spring.openapi.v3.SpringTestBase
@@ -31,14 +32,14 @@ class ForgottenAuthenticationDisableEMTest : SpringTestBase(){
3132
setOption(args, "security", "true")
3233
setOption(args, "schemaOracles", "false")
3334
setOption(args, "useExperimentalOracles", "true")
34-
setOption(args, "disabledOracleCodes", ExperimentalFaultCategory.IGNORE_ANONYMOUS.code.toString())
35+
setOption(args, "disabledOracleCodes", DefinedFaultCategory.SECURITY_IGNORE_ANONYMOUS.code.toString())
3536

3637
val solution = initAndRun(args)
3738

3839
assertTrue(solution.individuals.size >= 1)
3940

4041
val faults = DetectedFaultUtils.getDetectedFaultCategories(solution)
41-
assertFalse(ExperimentalFaultCategory.IGNORE_ANONYMOUS in faults)
42+
assertFalse(DefinedFaultCategory.SECURITY_IGNORE_ANONYMOUS in faults)
4243

4344
}
4445
}

core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/test/kotlin/org/evomaster/e2etests/spring/openapi/v3/oracledisable/StackTraceDisableEMTest.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.evomaster.e2etests.spring.openapi.v3.oracledisable
22

33
import com.foo.rest.examples.spring.openapi.v3.security.stacktrace.StackTraceJSONController
4+
import com.webfuzzing.commons.faults.DefinedFaultCategory
45
import org.evomaster.core.problem.enterprise.DetectedFaultUtils
56
import org.evomaster.core.problem.enterprise.ExperimentalFaultCategory
67
import org.evomaster.e2etests.spring.openapi.v3.SpringTestBase
@@ -30,14 +31,14 @@ class StackTraceDisableEMTest : SpringTestBase(){
3031

3132
setOption(args, "security", "true")
3233
setOption(args, "schemaOracles", "false")
33-
setOption(args, "disabledOracleCodes", ExperimentalFaultCategory.LEAKED_STACK_TRACES.code.toString())
34+
setOption(args, "disabledOracleCodes", DefinedFaultCategory.SECURITY_LEAKED_STACK_TRACES.code.toString())
3435

3536
val solution = initAndRun(args)
3637

3738
assertTrue(solution.individuals.size >= 1)
3839

3940
val faults = DetectedFaultUtils.getDetectedFaultCategories(solution)
40-
assertFalse(ExperimentalFaultCategory.LEAKED_STACK_TRACES in faults)
41+
assertFalse(DefinedFaultCategory.SECURITY_LEAKED_STACK_TRACES in faults)
4142

4243
}
4344
}

core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/test/kotlin/org/evomaster/e2etests/spring/openapi/v3/security/anonymouswrite/SecurityAnonymousWriteEMTest.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.evomaster.e2etests.spring.openapi.v3.security.anonymouswrite
22

33
import com.foo.rest.examples.spring.openapi.v3.security.anonymouswrite.AnonymousWriteController
4+
import com.webfuzzing.commons.faults.DefinedFaultCategory
45
import org.evomaster.core.problem.enterprise.DetectedFaultUtils
56
import org.evomaster.core.problem.enterprise.ExperimentalFaultCategory
67
import org.evomaster.e2etests.spring.openapi.v3.SpringTestBase
@@ -42,11 +43,11 @@ class SecurityAnonymousWriteEMTest : SpringTestBase(){
4243
assertEquals(1, faultsCategories.size)
4344
assertEquals(3, faults.size)
4445

45-
assertTrue(ExperimentalFaultCategory.ANONYMOUS_MODIFICATIONS in faultsCategories)
46+
assertTrue(DefinedFaultCategory.SECURITY_ANONYMOUS_MODIFICATIONS in faultsCategories)
4647

4748
// PUT:/api/resources/201/{id}
4849
assertTrue(faults.none {
49-
it.category == ExperimentalFaultCategory.ANONYMOUS_MODIFICATIONS
50+
it.category == DefinedFaultCategory.SECURITY_ANONYMOUS_MODIFICATIONS
5051
&& it.operationId == "PUT:/api/resources/201/{id}"
5152
})
5253
}

core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/test/kotlin/org/evomaster/e2etests/spring/openapi/v3/security/forgottenauthentication/ForgottenAuthenticationEMTest.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.evomaster.e2etests.spring.openapi.v3.security.forgottenauthentication
22

33
import com.foo.rest.examples.spring.openapi.v3.security.forgottenauthentication.ForgottenAuthenticationController
4+
import com.webfuzzing.commons.faults.DefinedFaultCategory
45
import org.evomaster.core.problem.enterprise.DetectedFaultUtils
56
import org.evomaster.core.problem.enterprise.ExperimentalFaultCategory
67
import org.evomaster.core.problem.rest.data.HttpVerb
@@ -44,7 +45,7 @@ class ForgottenAuthenticationEMTest : SpringTestBase(){
4445

4546
val faults = DetectedFaultUtils.getDetectedFaultCategories(solution)
4647
assertEquals(1, faults.size)
47-
assertEquals(ExperimentalFaultCategory.IGNORE_ANONYMOUS, faults.first())
48+
assertEquals(DefinedFaultCategory.SECURITY_IGNORE_ANONYMOUS, faults.first())
4849
}
4950
}
5051
}

core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/test/kotlin/org/evomaster/e2etests/spring/openapi/v3/security/hiddenaccessible/HiddenAccessibleEMTest.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.evomaster.e2etests.spring.openapi.v3.security.hiddenaccessible
22

33
import com.foo.rest.examples.spring.openapi.v3.security.hiddenaccessible.HiddenAccessibleController
4+
import com.webfuzzing.commons.faults.DefinedFaultCategory
45
import org.evomaster.core.problem.enterprise.DetectedFaultUtils
56
import org.evomaster.core.problem.enterprise.ExperimentalFaultCategory
67
import org.evomaster.core.problem.rest.data.HttpVerb
@@ -46,7 +47,7 @@ class HiddenAccessibleEMTest : SpringTestBase(){
4647
val faults = DetectedFaultUtils.getDetectedFaults(solution)
4748
assertTrue(faults.size >= 2)
4849

49-
val hidden = faults.filter{it.category == ExperimentalFaultCategory.HIDDEN_ACCESSIBLE_ENDPOINT}
50+
val hidden = faults.filter{it.category == DefinedFaultCategory.SECURITY_HIDDEN_ACCESSIBLE_ENDPOINT}
5051
assertEquals(2, hidden.size)
5152

5253
assertNotNull(hidden.find { it.operationId == "GET:/api/resources" })

core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/test/kotlin/org/evomaster/e2etests/spring/openapi/v3/security/stacktrace/StackTraceEMTest.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.evomaster.e2etests.spring.openapi.v3.security.stacktrace
22

33
import com.foo.rest.examples.spring.openapi.v3.security.stacktrace.StackTraceController
4+
import com.webfuzzing.commons.faults.DefinedFaultCategory
45
import org.evomaster.core.problem.enterprise.DetectedFaultUtils
56
import org.evomaster.core.problem.enterprise.ExperimentalFaultCategory
67
import org.evomaster.core.problem.rest.data.HttpVerb
@@ -43,11 +44,11 @@ class StackTraceEMTest : SpringTestBase(){
4344
val faultsCategories = DetectedFaultUtils.getDetectedFaultCategories(solution)
4445
val faults = DetectedFaultUtils.getDetectedFaults(solution)
4546

46-
assertTrue(ExperimentalFaultCategory.LEAKED_STACK_TRACES in faultsCategories)
47+
assertTrue(DefinedFaultCategory.SECURITY_LEAKED_STACK_TRACES in faultsCategories)
4748

4849
// GET:/api/resources/null-pointer_not_stack_trace
4950
assertTrue(faults.none {
50-
it.category == ExperimentalFaultCategory.LEAKED_STACK_TRACES
51+
it.category == DefinedFaultCategory.SECURITY_LEAKED_STACK_TRACES
5152
&& it.operationId == "GET:/api/resources/null-pointer_not_stack_trace"
5253
})
5354

core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/test/kotlin/org/evomaster/e2etests/spring/openapi/v3/security/stacktrace/StackTraceJSONEMTest.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.evomaster.e2etests.spring.openapi.v3.security.stacktrace
22

33
import com.foo.rest.examples.spring.openapi.v3.security.stacktrace.StackTraceJSONController
4+
import com.webfuzzing.commons.faults.DefinedFaultCategory
45
import org.evomaster.core.problem.enterprise.DetectedFaultUtils
56
import org.evomaster.core.problem.enterprise.ExperimentalFaultCategory
67
import org.evomaster.core.problem.rest.data.HttpVerb
@@ -41,15 +42,15 @@ class StackTraceJSONEMTest : SpringTestBase(){
4142
val faultsCategories = DetectedFaultUtils.getDetectedFaultCategories(solution)
4243
val faults = DetectedFaultUtils.getDetectedFaults(solution)
4344

44-
assertTrue(ExperimentalFaultCategory.LEAKED_STACK_TRACES in faultsCategories)
45+
assertTrue(DefinedFaultCategory.SECURITY_LEAKED_STACK_TRACES in faultsCategories)
4546

4647
assertTrue(faults.any {
47-
it.category == ExperimentalFaultCategory.LEAKED_STACK_TRACES
48+
it.category == DefinedFaultCategory.SECURITY_LEAKED_STACK_TRACES
4849
&& it.operationId == "GET:/api/resources/null-pointer-json"
4950
})
5051

5152
assertTrue(faults.any {
52-
it.category == ExperimentalFaultCategory.LEAKED_STACK_TRACES
53+
it.category == DefinedFaultCategory.SECURITY_LEAKED_STACK_TRACES
5354
&& it.operationId == "GET:/api/resources/null-pointer-json-not-list"
5455
})
5556

0 commit comments

Comments
 (0)