Return disabled mock tests for parameterization mode #1136 (#1254)

sofurihafe · web-flow · commit 721fa0eb9145 · 2022-11-09T17:58:43.000+03:00
Enable disabled mock tests
diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/FieldMockTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/FieldMockTest.kt
@@ -18,8 +18,8 @@ import org.utbot.tests.infrastructure.TestExecution
 internal class FieldMockTest : UtValueTestCaseChecker(
     testClass = ServiceWithField::class,
     pipelines = listOf(
-        TestLastStage(CodegenLanguage.JAVA, lastStage = TestExecution, parameterizedModeLastStage = Compilation),
-        TestLastStage(CodegenLanguage.KOTLIN, lastStage = TestExecution)
+        TestLastStage(CodegenLanguage.JAVA),
+        TestLastStage(CodegenLanguage.KOTLIN)
     )
 ) {
     @Test
diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockFinalClassTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockFinalClassTest.kt
@@ -15,8 +15,8 @@ import org.utbot.tests.infrastructure.TestExecution
 internal class MockFinalClassTest : UtValueTestCaseChecker(
     testClass = MockFinalClassExample::class,
     pipelines = listOf(
-        TestLastStage(CodegenLanguage.JAVA, lastStage = TestExecution, parameterizedModeLastStage = Compilation),
-        TestLastStage(CodegenLanguage.KOTLIN, lastStage = TestExecution)
+        TestLastStage(CodegenLanguage.JAVA),
+        TestLastStage(CodegenLanguage.KOTLIN)
     )
 ) {
     @Test
diff --git a/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockRandomTest.kt b/utbot-framework-test/src/test/kotlin/org/utbot/examples/mock/MockRandomTest.kt
@@ -22,7 +22,7 @@ internal class MockRandomTest : UtValueTestCaseChecker(
     testClass = MockRandomExamples::class,
     testCodeGeneration = true,
     pipelines = listOf(
-        TestLastStage(CodegenLanguage.JAVA, lastStage = TestExecution, parameterizedModeLastStage = Compilation),
+        TestLastStage(CodegenLanguage.JAVA, lastStage = TestExecution),
         TestLastStage(CodegenLanguage.KOTLIN, lastStage = CodeGeneration)
     )
 ) {
diff --git a/utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/TestSpecificTestCaseGenerator.kt b/utbot-framework/src/main/kotlin/org/utbot/tests/infrastructure/TestSpecificTestCaseGenerator.kt
@@ -73,11 +73,6 @@ class TestSpecificTestCaseGenerator(
                                             conflictTriggers.triggered(Conflict.ForceStaticMockHappened))
                                 ) {
                                     it.containsMocking = true
-
-                                    conflictTriggers.reset(
-                                        Conflict.ForceMockHappened,
-                                        Conflict.ForceStaticMockHappened
-                                    )
                                 }
                                 executions += it
                             }
@@ -87,6 +82,7 @@ class TestSpecificTestCaseGenerator(
             }
         }
 
+        conflictTriggers.reset(Conflict.ForceMockHappened, Conflict.ForceStaticMockHappened)
         forceMockListener.detach(this, forceMockListener)
         forceStaticMockListener.detach(this, forceStaticMockListener)
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ internal class MockRandomTest : UtValueTestCaseChecker(`
`22`	`22`	`testClass = MockRandomExamples::class,`
`23`	`23`	`testCodeGeneration = true,`
`24`	`24`	`pipelines = listOf(`
`25`		`- TestLastStage(CodegenLanguage.JAVA, lastStage = TestExecution, parameterizedModeLastStage = Compilation),`
	`25`	`+ TestLastStage(CodegenLanguage.JAVA, lastStage = TestExecution),`
`26`	`26`	`TestLastStage(CodegenLanguage.KOTLIN, lastStage = CodeGeneration)`
`27`	`27`	`)`
`28`	`28`	`) {`
Original file line number	Diff line number	Diff line change
`@@ -73,11 +73,6 @@ class TestSpecificTestCaseGenerator(`
`73`	`73`	`conflictTriggers.triggered(Conflict.ForceStaticMockHappened))`
`74`	`74`	`) {`
`75`	`75`	`it.containsMocking = true`
`76`		`-`
`77`		`- conflictTriggers.reset(`
`78`		`- Conflict.ForceMockHappened,`
`79`		`- Conflict.ForceStaticMockHappened`
`80`		`- )`
`81`	`76`	`}`
`82`	`77`	`executions += it`
`83`	`78`	`}`
`@@ -87,6 +82,7 @@ class TestSpecificTestCaseGenerator(`
`87`	`82`	`}`
`88`	`83`	`}`
`89`	`84`
	`85`	`+ conflictTriggers.reset(Conflict.ForceMockHappened, Conflict.ForceStaticMockHappened)`
`90`	`86`	`forceMockListener.detach(this, forceMockListener)`
`91`	`87`	`forceStaticMockListener.detach(this, forceStaticMockListener)`
`92`	`88`