From 77cafbe36d5b3ca82b4fc3837b26be1aab73c537 Mon Sep 17 00:00:00 2001
From: Benedikt Ritter <britter@apache.org>
Date: Mon, 3 Oct 2016 18:06:38 +0200
Subject: [PATCH] Consistently rename JUnit 4.x integration tests

---
 ...ncurrencyIT.java => JUnit47ConcurrencyIT.java} |  4 ++--
 ...T.java => JUnit47StaticInnerClassTestsIT.java} |  2 +-
 ...CucumberIT.java => JUnit47WithCucumberIT.java} |  2 +-
 .../{Junit4IgnoreIT.java => JUnit4IgnoreIT.java}  |  2 +-
 ...unit4VersionsIT.java => JUnit4VersionsIT.java} |  2 +-
 .../pom.xml                                       | 15 +++++++--------
 .../src/test/java/junit47/BasicTest.java          |  0
 7 files changed, 13 insertions(+), 14 deletions(-)
 rename surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/{Junit47concurrencyIT.java => JUnit47ConcurrencyIT.java} (95%)
 rename surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/{Junit47StaticInnerClassTestsIT.java => JUnit47StaticInnerClassTestsIT.java} (96%)
 rename surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/{Junit47WithCucumberIT.java => JUnit47WithCucumberIT.java} (98%)
 rename surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/{Junit4IgnoreIT.java => JUnit4IgnoreIT.java} (98%)
 rename surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/{Junit4VersionsIT.java => JUnit4VersionsIT.java} (98%)
 rename surefire-integration-tests/src/test/resources/{concurrentjunit47 => junit47-concurrency}/pom.xml (86%)
 rename surefire-integration-tests/src/test/resources/{concurrentjunit47 => junit47-concurrency}/src/test/java/junit47/BasicTest.java (100%)

diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ConcurrencyIT.java
similarity index 95%
rename from surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java
rename to surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ConcurrencyIT.java
index 12c4419eb9..57007a72ad 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47ConcurrencyIT.java
@@ -32,14 +32,14 @@
  *
  * @author Kristian Rosenvold
  */
-public class Junit47concurrencyIT
+public class JUnit47ConcurrencyIT
     extends SurefireJUnit4IntegrationTestCase
 {
     @Test
     public void test47()
         throws Exception
     {
-        OutputValidator validator = unpack( "concurrentjunit47" )
+        OutputValidator validator = unpack( "junit47-concurrency" )
             .executeTest()
             .verifyErrorFree( 4 );
         String result = null;
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47StaticInnerClassTestsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47StaticInnerClassTestsIT.java
similarity index 96%
rename from surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47StaticInnerClassTestsIT.java
rename to surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47StaticInnerClassTestsIT.java
index b8d38bfc3a..e50e6d7df8 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47StaticInnerClassTestsIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47StaticInnerClassTestsIT.java
@@ -22,7 +22,7 @@
 import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
 import org.junit.Test;
 
-public class Junit47StaticInnerClassTestsIT
+public class JUnit47StaticInnerClassTestsIT
     extends SurefireJUnit4IntegrationTestCase
 {
 
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47WithCucumberIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47WithCucumberIT.java
similarity index 98%
rename from surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47WithCucumberIT.java
rename to surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47WithCucumberIT.java
index 4850005f69..4bb1842e82 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47WithCucumberIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47WithCucumberIT.java
@@ -34,7 +34,7 @@
  * 
  * @author agudian
  */
-public class Junit47WithCucumberIT
+public class JUnit47WithCucumberIT
     extends SurefireJUnit4IntegrationTestCase
 {
 
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4IgnoreIT.java
similarity index 98%
rename from surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java
rename to surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4IgnoreIT.java
index 0e050ce38e..71ec3d8b5b 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4IgnoreIT.java
@@ -28,7 +28,7 @@
  *
  * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
  */
-public class Junit4IgnoreIT
+public class JUnit4IgnoreIT
     extends SurefireJUnit4IntegrationTestCase
 {
     @Test
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java
similarity index 98%
rename from surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java
rename to surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java
index 500591a41b..87fe140aa3 100644
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4VersionsIT.java
@@ -37,7 +37,7 @@
  * @author <a href="mailto:dfabulich@apache.org">Dan Fabulich</a>
  */
 @RunWith( Parameterized.class )
-public class Junit4VersionsIT
+public class JUnit4VersionsIT
     extends SurefireJUnit4IntegrationTestCase
 {
 
diff --git a/surefire-integration-tests/src/test/resources/concurrentjunit47/pom.xml b/surefire-integration-tests/src/test/resources/junit47-concurrency/pom.xml
similarity index 86%
rename from surefire-integration-tests/src/test/resources/concurrentjunit47/pom.xml
rename to surefire-integration-tests/src/test/resources/junit47-concurrency/pom.xml
index d064175cef..4f648df637 100644
--- a/surefire-integration-tests/src/test/resources/concurrentjunit47/pom.xml
+++ b/surefire-integration-tests/src/test/resources/junit47-concurrency/pom.xml
@@ -23,7 +23,6 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-
   <parent>
     <groupId>org.apache.maven.surefire</groupId>
     <artifactId>it-parent</artifactId>
@@ -32,9 +31,9 @@
   </parent>
 
   <groupId>org.apache.maven.plugins.surefire</groupId>
-  <artifactId>junit47</artifactId>
+  <artifactId>junit47-concurrency</artifactId>
   <version>1.0-SNAPSHOT</version>
-  <name>Test for JUnit 4.7</name>
+  <name>Concurrency test for JUnit 4.7</name>
 
   <dependencies>
     <dependency>
@@ -50,11 +49,11 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-              <parallel>methods</parallel>
-              <perCoreThreadCount>false</perCoreThreadCount>
-              <threadCount>3</threadCount>
-          </configuration>
+        <configuration>
+          <parallel>methods</parallel>
+          <perCoreThreadCount>false</perCoreThreadCount>
+          <threadCount>3</threadCount>
+        </configuration>
       </plugin>
     </plugins>
   </build>
diff --git a/surefire-integration-tests/src/test/resources/concurrentjunit47/src/test/java/junit47/BasicTest.java b/surefire-integration-tests/src/test/resources/junit47-concurrency/src/test/java/junit47/BasicTest.java
similarity index 100%
rename from surefire-integration-tests/src/test/resources/concurrentjunit47/src/test/java/junit47/BasicTest.java
rename to surefire-integration-tests/src/test/resources/junit47-concurrency/src/test/java/junit47/BasicTest.java