Skip to content

Commit 8b13918

Browse files
MohsenTaheriShalmaniMohsenTaheriShalmani
committed
Update
1 parent 7e4b4b9 commit 8b13918

9 files changed

Lines changed: 153 additions & 89 deletions

File tree

‎core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/test/kotlin/org/evomaster/e2etests/spring/openapi/v3/aiclassification/allornone/ACAllOrNoneEMTest.kt‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,54 +24,61 @@ class ACAllOrNoneEMTest : AIClassificationEMTestBase() {
2424
@Disabled
2525
@Test
2626
fun testRunDeterministic(){
27-
testRunEM("DETERMINISTIC")
27+
testRunEM(AIResponseClassifierModel.DETERMINISTIC)
2828
}
2929

3030
@Disabled
3131
@Test
3232
fun testRunGaussian(){
33-
testRunEM("GAUSSIAN")
33+
testRunEM(AIResponseClassifierModel.GAUSSIAN)
3434
}
3535

3636
@Disabled
3737
@Test
3838
fun testRunGLM(){
39-
testRunEM("GLM")
39+
testRunEM(AIResponseClassifierModel.GLM)
4040
}
4141

4242
@Disabled
4343
@Test
4444
fun testRunKDE(){
45-
testRunEM("KDE")
45+
testRunEM(AIResponseClassifierModel.KDE)
4646
}
4747

4848
@Disabled
4949
@Test
5050
fun testRunKNN(){
51-
testRunEM("KNN")
51+
testRunEM(AIResponseClassifierModel.KNN)
5252
}
5353

5454
@Disabled
5555
@Test
5656
fun testRunNN(){
57-
testRunEM("NN")
57+
testRunEM(AIResponseClassifierModel.NN)
5858
}
5959

60-
6160
@Test
6261
fun testRunEnsemble(){
63-
testRunEM("GAUSSIAN,GLM,KDE,KNN,NN")
62+
testRunEM(
63+
AIResponseClassifierModel.GAUSSIAN,
64+
AIResponseClassifierModel.GLM,
65+
AIResponseClassifierModel.KDE,
66+
AIResponseClassifierModel.KNN,
67+
AIResponseClassifierModel.NN
68+
)
6469
}
6570

66-
private fun testRunEM(model: String) {
71+
private fun testRunEM(vararg models: AIResponseClassifierModel) {
72+
73+
val modelString = models.joinToString(",") { it.name }
6774

6875
runTestHandlingFlakyAndCompilation(
6976
"ACAllOrNoneEM",
7077
500
7178
) { args: MutableList<String> ->
7279

7380
args.add("--aiModelForResponseClassification")
74-
args.add("$model")
81+
args.add(modelString)
7582

7683
val (injector, solution) = initAndDebug(args)
7784

‎core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/test/kotlin/org/evomaster/e2etests/spring/openapi/v3/aiclassification/arithmetic/ACArithmeticEMTest.kt‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,54 +24,61 @@ class ACArithmeticEMTest : AIClassificationEMTestBase() {
2424
@Disabled
2525
@Test
2626
fun testRunDeterministic(){
27-
testRunEM("DETERMINISTIC")
27+
testRunEM(AIResponseClassifierModel.DETERMINISTIC)
2828
}
2929

3030
@Disabled
3131
@Test
3232
fun testRunGaussian(){
33-
testRunEM("GAUSSIAN")
33+
testRunEM(AIResponseClassifierModel.GAUSSIAN)
3434
}
3535

3636
@Disabled
3737
@Test
3838
fun testRunGLM(){
39-
testRunEM("GLM")
39+
testRunEM(AIResponseClassifierModel.GLM)
4040
}
4141

4242
@Disabled
4343
@Test
4444
fun testRunKDE(){
45-
testRunEM("KDE")
45+
testRunEM(AIResponseClassifierModel.KDE)
4646
}
4747

4848
@Disabled
4949
@Test
5050
fun testRunKNN(){
51-
testRunEM("KNN")
51+
testRunEM(AIResponseClassifierModel.KNN)
5252
}
5353

5454
@Disabled
5555
@Test
5656
fun testRunNN(){
57-
testRunEM("NN")
57+
testRunEM(AIResponseClassifierModel.NN)
5858
}
5959

60-
6160
@Test
6261
fun testRunEnsemble(){
63-
testRunEM("GAUSSIAN,GLM,KDE,KNN,NN")
62+
testRunEM(
63+
AIResponseClassifierModel.GAUSSIAN,
64+
AIResponseClassifierModel.GLM,
65+
AIResponseClassifierModel.KDE,
66+
AIResponseClassifierModel.KNN,
67+
AIResponseClassifierModel.NN
68+
)
6469
}
6570

66-
private fun testRunEM(model: String) {
71+
private fun testRunEM(vararg models: AIResponseClassifierModel) {
72+
73+
val modelString = models.joinToString(",") { it.name }
6774

6875
runTestHandlingFlakyAndCompilation(
6976
"ACArithmeticEM",
7077
500
7178
) { args: MutableList<String> ->
7279

7380
args.add("--aiModelForResponseClassification")
74-
args.add("$model")
81+
args.add(modelString)
7582

7683
val (injector, solution) = initAndDebug(args)
7784

‎core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/test/kotlin/org/evomaster/e2etests/spring/openapi/v3/aiclassification/basic/ACBasicEMTest.kt‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,54 +24,61 @@ class ACBasicEMTest : AIClassificationEMTestBase() {
2424
@Disabled
2525
@Test
2626
fun testRunDeterministic(){
27-
testRunEM("DETERMINISTIC")
27+
testRunEM(AIResponseClassifierModel.DETERMINISTIC)
2828
}
2929

3030
@Disabled
3131
@Test
3232
fun testRunGaussian(){
33-
testRunEM("GAUSSIAN")
33+
testRunEM(AIResponseClassifierModel.GAUSSIAN)
3434
}
3535

3636
@Disabled
3737
@Test
3838
fun testRunGLM(){
39-
testRunEM("GLM")
39+
testRunEM(AIResponseClassifierModel.GLM)
4040
}
4141

4242
@Disabled
4343
@Test
4444
fun testRunKDE(){
45-
testRunEM("KDE")
45+
testRunEM(AIResponseClassifierModel.KDE)
4646
}
4747

4848
@Disabled
4949
@Test
5050
fun testRunKNN(){
51-
testRunEM("KNN")
51+
testRunEM(AIResponseClassifierModel.KNN)
5252
}
5353

5454
@Disabled
5555
@Test
5656
fun testRunNN(){
57-
testRunEM("NN")
57+
testRunEM(AIResponseClassifierModel.NN)
5858
}
5959

60-
6160
@Test
6261
fun testRunEnsemble(){
63-
testRunEM("GAUSSIAN,GLM,KDE,KNN,NN")
62+
testRunEM(
63+
AIResponseClassifierModel.GAUSSIAN,
64+
AIResponseClassifierModel.GLM,
65+
AIResponseClassifierModel.KDE,
66+
AIResponseClassifierModel.KNN,
67+
AIResponseClassifierModel.NN
68+
)
6469
}
6570

66-
private fun testRunEM(model: String) {
71+
private fun testRunEM(vararg models: AIResponseClassifierModel) {
72+
73+
val modelString = models.joinToString(",") { it.name }
6774

6875
runTestHandlingFlakyAndCompilation(
6976
"ACBasicEM",
7077
500
7178
) { args: MutableList<String> ->
7279

7380
args.add("--aiModelForResponseClassification")
74-
args.add("$model")
81+
args.add(modelString)
7582

7683
val (injector, solution) = initAndDebug(args)
7784

‎core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/test/kotlin/org/evomaster/e2etests/spring/openapi/v3/aiclassification/imply/ACImplyEMTest.kt‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,54 +32,61 @@ class ACImplyEMTest : AIClassificationEMTestBase() {
3232
@Disabled
3333
@Test
3434
fun testRunDeterministic(){
35-
testRunEM("DETERMINISTIC")
35+
testRunEM(AIResponseClassifierModel.DETERMINISTIC)
3636
}
3737

3838
@Disabled
3939
@Test
4040
fun testRunGaussian(){
41-
testRunEM("GAUSSIAN")
41+
testRunEM(AIResponseClassifierModel.GAUSSIAN)
4242
}
4343

4444
@Disabled
4545
@Test
4646
fun testRunGLM(){
47-
testRunEM("GLM")
47+
testRunEM(AIResponseClassifierModel.GLM)
4848
}
4949

5050
@Disabled
5151
@Test
5252
fun testRunKDE(){
53-
testRunEM("KDE")
53+
testRunEM(AIResponseClassifierModel.KDE)
5454
}
5555

5656
@Disabled
5757
@Test
5858
fun testRunKNN(){
59-
testRunEM("KNN")
59+
testRunEM(AIResponseClassifierModel.KNN)
6060
}
6161

6262
@Disabled
6363
@Test
6464
fun testRunNN(){
65-
testRunEM("NN")
65+
testRunEM(AIResponseClassifierModel.NN)
6666
}
6767

68-
6968
@Test
7069
fun testRunEnsemble(){
71-
testRunEM("GAUSSIAN,GLM,KDE,KNN,NN")
70+
testRunEM(
71+
AIResponseClassifierModel.GAUSSIAN,
72+
AIResponseClassifierModel.GLM,
73+
AIResponseClassifierModel.KDE,
74+
AIResponseClassifierModel.KNN,
75+
AIResponseClassifierModel.NN
76+
)
7277
}
7378

74-
private fun testRunEM(model: String) {
79+
private fun testRunEM(vararg models: AIResponseClassifierModel) {
80+
81+
val modelString = models.joinToString(",") { it.name }
7582

7683
runTestHandlingFlakyAndCompilation(
7784
"ACImplyEM",
7885
500
7986
) { args: MutableList<String> ->
8087

8188
args.add("--aiModelForResponseClassification")
82-
args.add("$model")
89+
args.add(modelString)
8390

8491
val (injector, solution) = initAndDebug(args)
8592

‎core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/test/kotlin/org/evomaster/e2etests/spring/openapi/v3/aiclassification/mixed/ACMixedEMTest.kt‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,53 +33,61 @@ class ACMixedEMTest : AIClassificationEMTestBase() {
3333
@Disabled
3434
@Test
3535
fun testRunDeterministic(){
36-
testRunEM("DETERMINISTIC")
36+
testRunEM(AIResponseClassifierModel.DETERMINISTIC)
3737
}
3838

3939
@Disabled
4040
@Test
4141
fun testRunGaussian(){
42-
testRunEM("GAUSSIAN")
42+
testRunEM(AIResponseClassifierModel.GAUSSIAN)
4343
}
4444

4545
@Disabled
4646
@Test
4747
fun testRunGLM(){
48-
testRunEM("GLM")
48+
testRunEM(AIResponseClassifierModel.GLM)
4949
}
5050

5151
@Disabled
5252
@Test
5353
fun testRunKDE(){
54-
testRunEM("KDE")
54+
testRunEM(AIResponseClassifierModel.KDE)
5555
}
5656

5757
@Disabled
5858
@Test
5959
fun testRunKNN(){
60-
testRunEM("KNN")
60+
testRunEM(AIResponseClassifierModel.KNN)
6161
}
6262

6363
@Disabled
6464
@Test
6565
fun testRunNN(){
66-
testRunEM("NN")
66+
testRunEM(AIResponseClassifierModel.NN)
6767
}
6868

6969
@Test
7070
fun testRunEnsemble(){
71-
testRunEM("GAUSSIAN,GLM,KDE,KNN,NN")
71+
testRunEM(
72+
AIResponseClassifierModel.GAUSSIAN,
73+
AIResponseClassifierModel.GLM,
74+
AIResponseClassifierModel.KDE,
75+
AIResponseClassifierModel.KNN,
76+
AIResponseClassifierModel.NN
77+
)
7278
}
7379

74-
private fun testRunEM(model: String) {
80+
private fun testRunEM(vararg models: AIResponseClassifierModel) {
81+
82+
val modelString = models.joinToString(",") { it.name }
7583

7684
runTestHandlingFlakyAndCompilation(
7785
"ACMixedEM",
7886
500
7987
) { args: MutableList<String> ->
8088

8189
args.add("--aiModelForResponseClassification")
82-
args.add("$model")
90+
args.add(modelString)
8391

8492
val (injector, solution) = initAndDebug(args)
8593

0 commit comments

Comments
 (0)