introduce new subproject junit-tests and moved existing tests over

junit-team#24
qodana · Dec 3, 2015 · 950bd89 · 950bd89
1 parent 59a0a13
commit 950bd89
Show file tree

Hide file tree

Showing 24 changed files with 31 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,7 @@ bin/
 *.iml
 *.ipr
 *.iws
+*.uml
 .idea/
 
 # Misc

diff --git a/build.gradle b/build.gradle
@@ -34,10 +34,6 @@ subprojects {
 	}
 
 	dependencies {
-		testCompile("org.assertj:assertj-core:${assertJVersion}")
-		testCompile("junit:junit:${junit4Version}")
-		testRuntime("org.apache.logging.log4j:log4j-core:${log4JVersion}")
-		testRuntime("org.apache.logging.log4j:log4j-jul:${log4JVersion}")
 	}
 
 	eclipse {

diff --git a/junit-tests/build.gradle b/junit-tests/build.gradle
@@ -0,0 +1,21 @@
+dependencies {
+    compile(project(':junit-commons'))
+    compile(project(':junit-console'))
+    compile(project(':junit-engine-api'))
+    compile(project(':junit-launcher'))
+    compile(project(':junit4-launcher-runner'))
+    compile(project(':junit4-engine'))
+    compile(project(':junit5-api'))
+    compile(project(':junit5-engine'))
+
+
+    testCompile("org.assertj:assertj-core:${assertJVersion}")
+    testCompile("junit:junit:${junit4Version}")
+
+    testRuntime("org.apache.logging.log4j:log4j-core:${log4JVersion}")
+    testRuntime("org.apache.logging.log4j:log4j-jul:${log4JVersion}")
+
+}
+
+
+
diff --git a/...n5/commons/util/AnnotationUtilsTests.java → ...n5/commons/util/AnnotationUtilsTests.java b/...n5/commons/util/AnnotationUtilsTests.java → ...n5/commons/util/AnnotationUtilsTests.java
diff --git a/...n5/commons/util/ClasspathScannerTest.java → ...n5/commons/util/ClasspathScannerTest.java b/...n5/commons/util/ClasspathScannerTest.java → ...n5/commons/util/ClasspathScannerTest.java
diff --git a/...n5/engine/AbstractTestDescriptorTest.java → ...n5/engine/AbstractTestDescriptorTest.java b/...n5/engine/AbstractTestDescriptorTest.java → ...n5/engine/AbstractTestDescriptorTest.java
diff --git a/...n5/engine/TestPlanSpecificationTests.java → ...n5/engine/TestPlanSpecificationTests.java b/...n5/engine/TestPlanSpecificationTests.java → ...n5/engine/TestPlanSpecificationTests.java
diff --git a/...it5/AbstractJUnit5TestEngineTestCase.java → ...it5/AbstractJUnit5TestEngineTestCase.java b/...it5/AbstractJUnit5TestEngineTestCase.java → ...it5/AbstractJUnit5TestEngineTestCase.java
diff --git a/...ngine/junit5/ClassLevelCallbackTests.java → ...ngine/junit5/ClassLevelCallbackTests.java b/...ngine/junit5/ClassLevelCallbackTests.java → ...ngine/junit5/ClassLevelCallbackTests.java
diff --git a/...ine/junit5/CoreJUnit5TestEngineTests.java → ...ine/junit5/CoreJUnit5TestEngineTests.java b/...ine/junit5/CoreJUnit5TestEngineTests.java → ...ine/junit5/CoreJUnit5TestEngineTests.java
@@ -13,9 +13,7 @@
 import static org.junit.gen5.api.Assertions.assertTrue;
 import static org.junit.gen5.api.Assertions.fail;
 import static org.junit.gen5.api.Assumptions.assumeTrue;
-import static org.junit.gen5.engine.TestPlanSpecification.build;
-import static org.junit.gen5.engine.TestPlanSpecification.forClass;
-import static org.junit.gen5.engine.TestPlanSpecification.forUniqueId;
+import static org.junit.gen5.engine.TestPlanSpecification.*;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/...nit/gen5/engine/junit5/DisabledTests.java → ...nit/gen5/engine/junit5/DisabledTests.java b/...nit/gen5/engine/junit5/DisabledTests.java → ...nit/gen5/engine/junit5/DisabledTests.java
diff --git a/...gine/junit5/MethodLevelCallbackTests.java → ...gine/junit5/MethodLevelCallbackTests.java b/...gine/junit5/MethodLevelCallbackTests.java → ...gine/junit5/MethodLevelCallbackTests.java
diff --git a/...engine/junit5/NestedTestClassesTests.java → ...engine/junit5/NestedTestClassesTests.java b/...engine/junit5/NestedTestClassesTests.java → ...engine/junit5/NestedTestClassesTests.java
diff --git a/...engine/junit5/ParameterResolverTests.java → ...engine/junit5/ParameterResolverTests.java b/...engine/junit5/ParameterResolverTests.java → ...engine/junit5/ParameterResolverTests.java
@@ -10,9 +10,7 @@
 
 package org.junit.gen5.engine.junit5;
 
-import static org.junit.gen5.api.Assertions.assertEquals;
-import static org.junit.gen5.api.Assertions.assertNotNull;
-import static org.junit.gen5.api.Assertions.assertTrue;
+import static org.junit.gen5.api.Assertions.*;
 
 import org.junit.Assert;
 import org.junit.Ignore;

diff --git a/...junit5/TrackingTestExecutionListener.java → ...junit5/TrackingTestExecutionListener.java b/...junit5/TrackingTestExecutionListener.java → ...junit5/TrackingTestExecutionListener.java
diff --git a/.../execution/TestExtensionRegistryTest.java → .../execution/TestExtensionRegistryTest.java b/.../execution/TestExtensionRegistryTest.java → .../execution/TestExtensionRegistryTest.java
diff --git a/...on/injection/sample/CustomAnnotation.java → ...on/injection/sample/CustomAnnotation.java b/...on/injection/sample/CustomAnnotation.java → ...on/injection/sample/CustomAnnotation.java
diff --git a/...le/CustomAnnotationParameterResolver.java → ...le/CustomAnnotationParameterResolver.java b/...le/CustomAnnotationParameterResolver.java → ...le/CustomAnnotationParameterResolver.java
diff --git a/...xecution/injection/sample/CustomType.java → ...xecution/injection/sample/CustomType.java b/...xecution/injection/sample/CustomType.java → ...xecution/injection/sample/CustomType.java
diff --git a/...n/sample/CustomTypeParameterResolver.java → ...n/sample/CustomTypeParameterResolver.java b/...n/sample/CustomTypeParameterResolver.java → ...n/sample/CustomTypeParameterResolver.java
diff --git a/...5/engine/junit5/stubs/TestEngineStub.java → ...5/engine/junit5/stubs/TestEngineStub.java b/...5/engine/junit5/stubs/TestEngineStub.java → ...5/engine/junit5/stubs/TestEngineStub.java
diff --git a/...ommons/src/test/resources/log4j2-test.xml → ...-tests/src/test/resources/log4j2-test.xml b/...ommons/src/test/resources/log4j2-test.xml → ...-tests/src/test/resources/log4j2-test.xml
diff --git a/open-test-alliance/build.gradle b/open-test-alliance/build.gradle
@@ -4,3 +4,8 @@ compileJava {
 	sourceCompatibility = 1.6
 	targetCompatibility = 1.6
 }
+
+
+dependencies {
+	testCompile("junit:junit:4.12")
+}
diff --git a/settings.gradle b/settings.gradle
@@ -9,6 +9,8 @@ include "junit4-engine"
 include "junit5-api"
 include "junit5-engine"
 include "junit-gradle"
+include "junit-tests"
+
 include "open-test-alliance"
 
 include "sample-extension"
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,7 @@ bin/ @@
     *.iml
     *.ipr
     *.iws
+    *.uml
     .idea/
     # Misc
@@ Expand Down @@