Upgate unit tests

Author: KMariusz

…c/resources/enviroments/environments.csv …/resources/environments/environments.csvmrchecker-framework-modules/mrchecker-cli-module/src/resources/enviroments/environments.csv renamed to mrchecker-framework-modules/mrchecker-cli-module/src/resources/environments/environments.csv mrchecker-framework-modules/mrchecker-cli-module/src/resources/enviroments/environments.csv renamed to mrchecker-framework-modules/mrchecker-cli-module/src/resources/environments/environments.csv

@@ -158,12 +158,12 @@ public void shouldPassTestsMultithreaded() {
 
         verify(testObserver, times(1)).onTestSuccess();
         verify(testObserver, times(0)).onTestFailed();
-        verify(testObserver, times(0)).onTestFinish();
+        verify(testObserver, times(1)).onTestFinish();
         verify(testObserver, times(1)).onTestClassFinish();
 
         verify(testObserverSecond, times(1)).onTestSuccess();
         verify(testObserverSecond, times(0)).onTestFailed();
-        verify(testObserverSecond, times(0)).onTestFinish();
+        verify(testObserverSecond, times(1)).onTestFinish();
         verify(testObserverSecond, times(1)).onTestClassFinish();
 
         assertThat(isBaseTestSetupCalled, is(equalTo(CALLED)));

mrchecker-framework-modules/mrchecker-core-module/src/test/java/com/capgemini/mrchecker/test/core/integration/RunningTestsTest.java

@@ -39,15 +39,15 @@ public void shouldCallOnTestSuccess() throws IOException {
     public void shouldCallOnTestFailure() throws IOException {
         SUT.onTestFailed();
 
-        assertThat(FileTestUtils.getLastLineInFile(logFilePath), containsString("Page.onTestFailure    " + SUT.getClass()
+        assertThat(FileTestUtils.getLastLineInFile(logFilePath), containsString("Page.onTestFailed    " + SUT.getClass()
                 .getSimpleName()));
     }
 
     @Test
     public void shouldCallOnTestFinish() throws IOException {
         SUT.onTestFinish();
 
-        assertThat(FileTestUtils.getLastLineInFile(logFilePath), containsString("To remove observer: " + SUT.toString()));
+        assertThat(FileTestUtils.getLastLineInFile(logFilePath), containsString("Removed observer: " + SUT.toString()));
     }
 
     @Test

mrchecker-framework-modules/mrchecker-core-module/src/test/java/com/capgemini/mrchecker/test/core/unit/PageTest.java

@@ -24,7 +24,7 @@ public void shouldRemoveObserver() {
 
         SUT.testSuccessful(contextMock);
 
-        verify(observerMock, times(0)).onTestSuccess();
-        verify(observerMock, times(0)).onTestFinish();
+        verify(observerMock, times(1)).onTestSuccess();
+        verify(observerMock, times(1)).onTestFinish();
     }
-}
+}

mrchecker-framework-modules/mrchecker-core-module/src/test/java/com/capgemini/mrchecker/test/core/unit/TestExecutionClassObserverRemoveTest.java

@@ -80,7 +80,7 @@ public void shouldCallTestAborted() throws IOException {
         SUT.testAborted(contextMock, new RuntimeException("Test_Exception"));
 
         assertThat(FileTestUtils.getAllLinesInFile(FileTestUtils.getLogFilePath()), containsString("- ABORTED."));
-        verify(observerMock, times(0)).onTestFinish();
+        verify(observerMock, times(1)).onTestFinish();
     }
 
     @Test
@@ -89,7 +89,7 @@ public void shouldCallTestSuccessful() throws IOException {
 
         assertThat(FileTestUtils.getAllLinesInFile(FileTestUtils.getLogFilePath()), containsString("- PASSED."));
         verify(observerMock, times(1)).onTestSuccess();
-        verify(observerMock, times(0)).onTestFinish();
+        verify(observerMock, times(1)).onTestFinish();
     }
 
     @Test
@@ -98,7 +98,7 @@ public void shouldCallTestFailed() throws IOException {
 
         assertThat(FileTestUtils.getAllLinesInFile(FileTestUtils.getLogFilePath()), containsString("- FAILED."));
         verify(observerMock, times(1)).onTestFailed();
-        verify(observerMock, times(0)).onTestFinish();
+        verify(observerMock, times(1)).onTestFinish();
     }
 
     @Test

mrchecker-framework-modules/mrchecker-core-module/src/test/java/com/capgemini/mrchecker/test/core/unit/TestExecutionClassObserverTest.java

@@ -6,6 +6,7 @@
 import com.capgemini.mrchecker.test.core.exceptions.BFSecureModuleException;
 import com.capgemini.mrchecker.test.core.tags.UnitTest;
 import com.google.inject.Guice;
+import com.google.inject.ProvisionException;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -40,7 +41,9 @@ public void shouldCreateDataEncryptionServiceInstance() {
 
     @Test
     public void shouldCreateThrowBFSecureModuleExceptionWhenWrongFile() {
-        assertThrows(BFSecureModuleException.class, () -> Guice.createInjector(new DataEncryptionModule(NO_FILE_PATH))
+        ProvisionException parentException = assertThrows(ProvisionException.class, () -> Guice.createInjector(new DataEncryptionModule(NO_FILE_PATH))
                 .getInstance(IDataEncryptionService.class));
+        Throwable cause = parentException.getCause();
+        assertThat(cause.getClass(), is(BFSecureModuleException.class));
     }
-}
+}

mrchecker-framework-modules/mrchecker-core-module/src/test/java/com/capgemini/mrchecker/test/core/unit/base/encryption/DataEncryptionModuleTest.java

@@ -6,6 +6,7 @@
 import com.capgemini.mrchecker.test.core.exceptions.BFInputDataException;
 import com.capgemini.mrchecker.test.core.tags.UnitTest;
 import com.google.inject.Guice;
+import com.google.inject.ProvisionException;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -41,7 +42,9 @@ public void shouldCreateEnvironmentServiceInstance() {
 
     @Test
     public void shouldCreateThrowExceptionWhenWrongFile() {
-        assertThrows(BFInputDataException.class, () -> Guice.createInjector(new EnvironmentModule(NO_FILE_PATH))
+        ProvisionException parentException = assertThrows(ProvisionException.class, () -> Guice.createInjector(new EnvironmentModule(NO_FILE_PATH))
                 .getInstance(IEnvironmentService.class));
+        Throwable cause = parentException.getCause();
+        assertThat(cause.getClass(), is(BFInputDataException.class));
     }
-}
+}

mrchecker-framework-modules/mrchecker-core-module/src/test/java/com/capgemini/mrchecker/test/core/unit/base/environment/EnvironmentModuleTest.java

@@ -1,17 +1,16 @@
 className,expectedOnTestSuccessCount,expectedOnTestFailureCount,expectedOnTestFinishCount,expectedOnTestClassFinishCount,expectedAreHooksCalled
 PassingTestWithObserverAddedInTestMethod,1,0,1,1,true
 PassingTestWithObserverAddedTwiceInTestMethod,1,0,1,1,true
-PassingTestWithObserverAddedInBeforeAll,1,0,0,1,true
-FailingTestDueToFailingAssertion,0,1,0,1,true
-FailingTestDueToExceptionInTestMethod,0,1,0,1,true
+PassingTestWithObserverAddedInBeforeAll,1,0,1,1,true
+FailingTestDueToFailingAssertion,0,1,1,1,true
+FailingTestDueToExceptionInTestMethod,0,1,1,1,true
 FailingTestDueToExceptionInBeforeAll,0,0,0,1,false
-FailingTestDueToExceptionInBeforeEach,0,1,0,1,false
-FailingTestThatPassedExecutionDueToExceptionInAfterEach,0,1,0,1,true
-FailingTestThatFailedExecutionDueToExceptionInAfterEach,0,1,0,1,true
-FailingTestThatPassedExecutionDueToExceptionInAfterAll,1,0,0,1,true
-FailingTestThatFailedExecutionDueToExceptionInAfterAll,0,1,0,1,true
+FailingTestDueToExceptionInBeforeEach,0,1,1,1,false
+FailingTestThatPassedExecutionDueToExceptionInAfterEach,0,1,1,1,true
+FailingTestThatFailedExecutionDueToExceptionInAfterEach,0,1,1,1,true
+FailingTestThatPassedExecutionDueToExceptionInAfterAll,1,0,1,1,true
+FailingTestThatFailedExecutionDueToExceptionInAfterAll,0,1,1,1,true
 DisabledTestWithObserverAddedInTestMethod,0,0,0,0,false
-DisabledTestWithObserverAddedInBeforeAll,0,0,0,1,false
+DisabledTestWithObserverAddedInBeforeAll,0,0,1,1,false
 AbortTestWithObserverAddedInTestMethod,0,0,1,1,true
-AbortTestWithObserverAddedInBeforeAll,0,0,0,1,true
-
+AbortTestWithObserverAddedInBeforeAll,0,0,1,1,true

mrchecker-framework-modules/mrchecker-core-module/src/test/resources/datadriven/integration/running_tests.csv

@@ -1,10 +1,6 @@
-junit.jupiter.extensions.autodetection.enabled=true
 junit.jupiter.execution.parallel.enabled=true
-#junit.jupiter.execution.parallel.mode.default=concurrent
 junit.jupiter.execution.parallel.mode.default=same_thread
 junit.jupiter.execution.parallel.mode.classes.default=concurrent
-#junit.jupiter.execution.parallel.mode.classes.default=same_thread
-junit.jupiter.execution.parallel.config.strategy=dynamic
-junit.jupiter.execution.parallel.config.dynamic.factor=1
-cucumber.ansi-colors.disabled=false
-cucumber.publish.quiet=true
+junit.jupiter.execution.parallel.config.strategy=fixed
+junit.jupiter.execution.parallel.config.fixed.parallelism=1
+junit.jupiter.extensions.autodetection.enabled=true