upgrading tests to Junit 5 (#82)

pom.xml

@@ -272,13 +272,7 @@
             <include>**/*Test.java</include>
           </includes>
         </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <version>${junit-jupiter.version}</version>
-          </dependency>
-        </dependencies>
+
       </plugin>
 
       <plugin>

src/main/java/com/societegenerale/commons/plugin/rules/TestClassesNamingRuleTest.java

@@ -16,7 +16,7 @@
 import com.tngtech.archunit.lang.ArchCondition;
 import com.tngtech.archunit.lang.ConditionEvents;
 import com.tngtech.archunit.lang.SimpleConditionEvent;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes;
 
@@ -133,7 +133,7 @@ private boolean isThereAtLeastOneMethodAnnotedWithTest(JavaClass javaClass) {
 
 		private boolean isAnnotedWithTest(JavaMethod method) {
 
-			return method.isAnnotatedWith(Test.class);
+			return method.isAnnotatedWith(Test.class) || method.isAnnotatedWith(org.junit.Test.class);
 		}
 	};
 

src/main/java/com/societegenerale/commons/plugin/rules/TestMethodsNamingRuleTest.java

@@ -10,7 +10,7 @@
 import com.tngtech.archunit.lang.ArchCondition;
 import com.tngtech.archunit.lang.ConditionEvents;
 import com.tngtech.archunit.lang.SimpleConditionEvent;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.methods;
 
@@ -44,7 +44,7 @@ public class TestMethodsNamingRuleTest implements ArchRuleTest {
 	@Override
 	public void execute(String packagePath, ScopePathProvider scopePathProvider, Collection<String> excludedPaths) {
 
-		methods().that().areAnnotatedWith(Test.class).should(respectNamingConvention())
+		methods().that().areAnnotatedWith(Test.class).or().areAnnotatedWith(org.junit.Test.class).should(respectNamingConvention())
 				.allowEmptyShould(true)
 				.check(ArchUtils.importAllClassesInPackage( scopePathProvider.getTestClassesPath(), packagePath, excludedPaths));
 

src/test/java/com/societegenerale/aut/test/ClassTestWithCorrectName1Test.java

@@ -1,6 +1,6 @@
 package com.societegenerale.aut.test;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ClassTestWithCorrectName1Test {
 

src/test/java/com/societegenerale/aut/test/ClassTestWithCorrectName2Test.java

@@ -1,7 +1,7 @@
 package com.societegenerale.aut.test;
 
-import org.junit.Test;
 import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
 
 public class ClassTestWithCorrectName2Test {
 

src/test/java/com/societegenerale/aut/test/ClassTestWithIncorrectName1.java

@@ -1,6 +1,6 @@
 package com.societegenerale.aut.test;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ClassTestWithIncorrectName1 {
 

src/test/java/com/societegenerale/aut/test/ClassTestWithIncorrectName2.java

@@ -1,7 +1,7 @@
 package com.societegenerale.aut.test;
 
-import org.junit.Test;
 import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
 
 public class ClassTestWithIncorrectName2 {
 

src/test/java/com/societegenerale/aut/test/MethodWithCorrectNameStartingWithShouldTest.java

@@ -1,6 +1,6 @@
 package com.societegenerale.aut.test;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class MethodWithCorrectNameStartingWithShouldTest {
 

src/test/java/com/societegenerale/aut/test/MethodWithCorrectNameStartingWithTestTest.java

@@ -1,6 +1,6 @@
 package com.societegenerale.aut.test;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class MethodWithCorrectNameStartingWithTestTest {
 

src/test/java/com/societegenerale/aut/test/MethodWithIncorrectNameTest.java

@@ -1,6 +1,6 @@
 package com.societegenerale.aut.test;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class MethodWithIncorrectNameTest {
 

src/test/java/com/societegenerale/aut/test/TestClassWithIgnoreAtClassLevel.java

@@ -1,7 +1,7 @@
 package com.societegenerale.aut.test;
 
 import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;

src/test/java/com/societegenerale/aut/test/TestClassWithIgnoreAtClassLevelWithComment.java

@@ -1,7 +1,7 @@
 package com.societegenerale.aut.test;
 
 import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;

src/test/java/com/societegenerale/aut/test/TestClassWithIgnoreAtMethodLevel.java

@@ -1,7 +1,7 @@
 package com.societegenerale.aut.test;
 
 import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;

src/test/java/com/societegenerale/aut/test/TestClassWithIgnoreAtMethodLevelWithComment.java

@@ -1,7 +1,7 @@
 package com.societegenerale.aut.test;
 
 import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;

src/test/java/com/societegenerale/aut/test/TestClassWithJunit4Asserts.java

@@ -1,6 +1,6 @@
 package com.societegenerale.aut.test;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;

src/test/java/com/societegenerale/aut/test/TestClassWithJunit5DisabledAtClassLevel.java

@@ -1,7 +1,7 @@
 package com.societegenerale.aut.test;
 
-import org.junit.Test;
 import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;

src/test/java/com/societegenerale/aut/test/TestClassWithJunit5DisabledAtClassLevelWithComment.java

@@ -1,7 +1,7 @@
 package com.societegenerale.aut.test;
 
-import org.junit.Test;
 import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;

src/test/java/com/societegenerale/aut/test/TestClassWithJunit5DisabledAtMethodLevel.java

@@ -1,7 +1,7 @@
 package com.societegenerale.aut.test;
 
-import org.junit.Test;
 import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;

src/test/java/com/societegenerale/aut/test/TestClassWithJunit5DisabledAtMethodLevelWithComment.java

@@ -1,7 +1,7 @@
 package com.societegenerale.aut.test;
 
-import org.junit.Test;
 import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;

src/test/java/com/societegenerale/aut/test/TestClassWithOutJunitAsserts.java

@@ -1,6 +1,6 @@
 package com.societegenerale.aut.test;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;

src/test/java/com/societegenerale/aut/test/TestClassWithPowerMock.java

@@ -1,6 +1,6 @@
 package com.societegenerale.aut.test;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.powermock.modules.junit4.PowerMockRunner;
 

src/test/java/com/societegenerale/commons/plugin/rules/ArchUtilsTest.java

@@ -7,7 +7,7 @@
 import com.societegenerale.commons.plugin.utils.ArchUtils;
 import com.tngtech.archunit.core.domain.JavaClass;
 import com.tngtech.archunit.core.domain.JavaClasses;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

src/test/java/com/societegenerale/commons/plugin/rules/ConstantsAndStaticNonFinalFieldsNamesRuleTestTest.java

@@ -3,8 +3,8 @@
 import com.societegenerale.aut.test.TestSpecificScopeProvider;
 import com.societegenerale.commons.plugin.SilentLog;
 import com.societegenerale.commons.plugin.utils.ArchUtils;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static com.societegenerale.commons.plugin.rules.ConstantsAndStaticNonFinalFieldsNamesRuleTest.CONSTANTS_VIOLATION_MESSAGE;
 import static com.societegenerale.commons.plugin.rules.ConstantsAndStaticNonFinalFieldsNamesRuleTest.ENUM_CONSTANTS_VIOLATION_MESSAGE;
@@ -27,7 +27,7 @@ public class ConstantsAndStaticNonFinalFieldsNamesRuleTestTest {
 
 	private String pathEnumWithValuesWrittenCorrectly = "com/societegenerale/aut/main/EnumWithValuesWrittenCorrectly.class";
 
-	@Before
+	@BeforeEach
 	public void setup() {
 		// in the normal lifecycle, ArchUtils is instantiated, which enables a static
 		// field there to be initialized

src/test/java/com/societegenerale/commons/plugin/rules/DontReturnNullCollectionTestTest.java

@@ -1,16 +1,16 @@
 package com.societegenerale.commons.plugin.rules;
 
+import com.societegenerale.aut.test.TestSpecificScopeProvider;
+import com.societegenerale.commons.plugin.SilentLog;
+import com.societegenerale.commons.plugin.utils.ArchUtils;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 import static java.util.Collections.emptySet;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.catchThrowable;
 
-import com.societegenerale.aut.test.TestSpecificScopeProvider;
-import com.societegenerale.commons.plugin.SilentLog;
-import com.societegenerale.commons.plugin.utils.ArchUtils;
-import org.junit.Before;
-import org.junit.Test;
-
 public class DontReturnNullCollectionTestTest {
 
     String pathObjectWithAmethodReturningAnullList = "com/societegenerale/aut/main/ObjectWithMethodsReturningNullCollections.class";
@@ -21,7 +21,7 @@ public class DontReturnNullCollectionTestTest {
 
     String pathObjectWithLombokBuilder = "com/societegenerale/aut/main/ObjectWithLombokBuilder.class$ObjectWithLombokBuilderBuilder";
 
-    @Before
+    @BeforeEach
     public void setup(){
         //in the normal lifecycle, ArchUtils is instantiated, which enables a static field there to be initialized
         new ArchUtils(new SilentLog());

src/test/java/com/societegenerale/commons/plugin/rules/FinalNonStaticFieldsHaveToBeStaticFinalFieldsRuleTestTest.java

@@ -3,31 +3,32 @@
 import com.societegenerale.aut.test.TestSpecificScopeProvider;
 import com.societegenerale.commons.plugin.SilentLog;
 import com.societegenerale.commons.plugin.utils.ArchUtils;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static java.util.Collections.emptySet;
 import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class FinalNonStaticFieldsHaveToBeStaticFinalFieldsRuleTestTest {
 
 	private String pathClassWithFinalNonStaticFields = "com/societegenerale/aut/main/ClassWithFinalNonStaticFields.class";
 
 	private String pathClassWithStaticFinalFields = "com/societegenerale/aut/main/ClassWithStaticFinalFields.class";
 
-	@Before
+	@BeforeEach
 	public void setup() {
 		// in the normal lifecycle, ArchUtils is instantiated, which enables a static
 		// field there to be initialized
 		ArchUtils archUtils = new ArchUtils(new SilentLog());
 	}
 
-	@Test(expected = AssertionError.class)
+	@Test
 	public void shouldThrowViolation() {
-
-		new FinalNonStaticFieldsHaveToBeStaticFinalFieldsRuleTest().execute(pathClassWithFinalNonStaticFields,
-				new TestSpecificScopeProvider(), emptySet());
-
+		assertThatThrownBy(() -> {
+			new FinalNonStaticFieldsHaveToBeStaticFinalFieldsRuleTest().execute(pathClassWithFinalNonStaticFields,
+					new TestSpecificScopeProvider(), emptySet());
+		}).isInstanceOf(AssertionError.class);
 	}
 
 	@Test

src/test/java/com/societegenerale/commons/plugin/rules/HexagonalArchitectureTestTest.java

@@ -4,8 +4,8 @@
 import com.societegenerale.commons.plugin.Log;
 import com.societegenerale.commons.plugin.SilentLog;
 import com.societegenerale.commons.plugin.utils.ArchUtils;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static com.societegenerale.commons.plugin.rules.HexagonalArchitectureTest.WHEN_FOLLOWING_HEXAGONAL_ARCHITECTURE;
 import static java.util.Collections.emptySet;
@@ -37,7 +37,7 @@ public class HexagonalArchitectureTestTest {
 
     private Log silentLogger=new SilentLog();
 
-    @Before
+    @BeforeEach
     public void setup(){
         //in the normal lifecycle, ArchUtils is instantiated, which enables a static field there to be initialized
         ArchUtils archUtils=new ArchUtils(new SilentLog());

src/test/java/com/societegenerale/commons/plugin/rules/NoAutowiredFieldTestTest.java

@@ -4,8 +4,8 @@
 import com.societegenerale.aut.test.TestSpecificScopeProvider;
 import com.societegenerale.commons.plugin.SilentLog;
 import com.societegenerale.commons.plugin.utils.ArchUtils;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static com.societegenerale.commons.plugin.rules.NoAutowiredFieldTest.NO_AUTOWIRED_FIELD_MESSAGE;
 import static java.util.Collections.emptySet;
@@ -20,7 +20,7 @@ public class NoAutowiredFieldTestTest {
 	// injected fields should not trigger autowired violation - they have their own rule
 	private String pathTestClassWithInjectedField = "com/societegenerale/aut/main/ClassWithInjectedField.class";
 
-	@Before
+	@BeforeEach
 	public void setup() {
 		// in the normal lifecycle, ArchUtils is instantiated, which enables a static
 		// field there to be initialized

src/test/java/com/societegenerale/commons/plugin/rules/NoInjectedFieldTestTest.java

@@ -4,8 +4,8 @@
 import com.societegenerale.aut.test.TestSpecificScopeProvider;
 import com.societegenerale.commons.plugin.SilentLog;
 import com.societegenerale.commons.plugin.utils.ArchUtils;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static com.societegenerale.commons.plugin.rules.NoInjectedFieldTest.NO_INJECTED_FIELD_MESSAGE;
 import static java.util.Collections.emptySet;
@@ -20,7 +20,7 @@ public class NoInjectedFieldTestTest {
 
 	private String pathTestClassWithInjectedField = "com/societegenerale/aut/main/ClassWithInjectedField.class";
 
-	@Before
+	@BeforeEach
 	public void setup() {
 		// in the normal lifecycle, ArchUtils is instantiated, which enables a static
 		// field there to be initialized

src/test/java/com/societegenerale/commons/plugin/rules/NoJavaUtilDateRuleTestTest.java

@@ -1,18 +1,17 @@
 package com.societegenerale.commons.plugin.rules;
 
-import static com.societegenerale.commons.plugin.rules.NoJavaUtilDateRuleTest.NO_JAVA_UTIL_DATE_VIOLATION_MESSAGE;
-import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes;
-import static org.assertj.core.api.Assertions.assertThatCode;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-import org.junit.Test;
-
 import com.societegenerale.aut.main.ObjectWithAdateField;
 import com.societegenerale.aut.main.ObjectWithJava8TimeLib;
 import com.societegenerale.aut.main.ObjectWithJavaTextDateFormat;
 import com.societegenerale.aut.main.ObjectWithJavaUtilGregorianCalendar;
 import com.tngtech.archunit.core.domain.JavaClasses;
 import com.tngtech.archunit.core.importer.ClassFileImporter;
+import org.junit.jupiter.api.Test;
+
+import static com.societegenerale.commons.plugin.rules.NoJavaUtilDateRuleTest.NO_JAVA_UTIL_DATE_VIOLATION_MESSAGE;
+import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes;
+import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class NoJavaUtilDateRuleTestTest {