You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2015/04/30 23:55:25 UTC
maven-surefire git commit: [SUREFIRE] reformat code
Repository: maven-surefire
Updated Branches:
refs/heads/master 6bdcc54b1 -> 710a3d58d
[SUREFIRE] reformat code
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/710a3d58
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/710a3d58
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/710a3d58
Branch: refs/heads/master
Commit: 710a3d58d62bae40a9bf2bed38c3877d4458be8e
Parents: 6bdcc54
Author: Tibor17 <ti...@lycos.com>
Authored: Thu Apr 30 23:54:56 2015 +0200
Committer: Tibor17 <ti...@lycos.com>
Committed: Thu Apr 30 23:54:56 2015 +0200
----------------------------------------------------------------------
.../test/resources/runorder-parallel/pom.xml | 54 +++++++++---------
.../src/test/java/runorder/parallel/Test1.java | 12 ++--
.../src/test/java/runorder/parallel/Test2.java | 36 ++++++------
.../src/test/java/runorder/parallel/Test3.java | 58 ++++++++++++--------
4 files changed, 89 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/710a3d58/surefire-integration-tests/src/test/resources/runorder-parallel/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/runorder-parallel/pom.xml b/surefire-integration-tests/src/test/resources/runorder-parallel/pom.xml
index b567912..f876e2b 100644
--- a/surefire-integration-tests/src/test/resources/runorder-parallel/pom.xml
+++ b/surefire-integration-tests/src/test/resources/runorder-parallel/pom.xml
@@ -1,5 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins.surefire</groupId>
<artifactId>runorder-parallel</artifactId>
@@ -15,33 +15,33 @@
</dependency>
</dependencies>
- <properties>
- <runOrder>balanced</runOrder>
- </properties>
+ <properties>
+ <runOrder>balanced</runOrder>
+ </properties>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- <configuration>
- <runOrder>${runOrder}</runOrder>
- <threadCount>2</threadCount>
- <perCoreThreadCount>false</perCoreThreadCount>
- <includes>
- <include>**/Test*.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <runOrder>${runOrder}</runOrder>
+ <threadCount>2</threadCount>
+ <perCoreThreadCount>false</perCoreThreadCount>
+ <includes>
+ <include>**/Test*.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/710a3d58/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test1.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test1.java b/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test1.java
index c8375db..8fbddd6 100755
--- a/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test1.java
+++ b/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test1.java
@@ -39,7 +39,8 @@ public class Test1
do
{
Thread.sleep( ms );
- } while ( System.currentTimeMillis() < target);
+ }
+ while ( System.currentTimeMillis() < target );
}
catch ( InterruptedException e )
{
@@ -50,21 +51,24 @@ public class Test1
@Test
public void testSleep200()
{
- System.out.println( Thread.currentThread().getName() + " Test1.sleep200 started @ " + System.currentTimeMillis() );
+ System.out.println(
+ Thread.currentThread().getName() + " Test1.sleep200 started @ " + System.currentTimeMillis() );
sleep( 200 );
}
@Test
public void testSleep400()
{
- System.out.println( Thread.currentThread().getName() + " Test1.sleep400 started @ " + System.currentTimeMillis() );
+ System.out.println(
+ Thread.currentThread().getName() + " Test1.sleep400 started @ " + System.currentTimeMillis() );
sleep( 400 );
}
@Test
public void testSleep600()
{
- System.out.println( Thread.currentThread().getName() + " Test1.sleep600 started @ " + System.currentTimeMillis() );
+ System.out.println(
+ Thread.currentThread().getName() + " Test1.sleep600 started @ " + System.currentTimeMillis() );
sleep( 600 );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/710a3d58/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test2.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test2.java b/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test2.java
index 62142f0..12ab95d 100644
--- a/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test2.java
+++ b/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test2.java
@@ -24,23 +24,27 @@ import org.junit.Test;
/**
* @author Kristian Rosenvold
*/
-public class Test2 {
+public class Test2
+{
- @Test
- public void testSleep100() {
- System.out.println("Test2.sleep100 started @ " + System.currentTimeMillis());
- Test1.sleep(100);
- }
+ @Test
+ public void testSleep100()
+ {
+ System.out.println( "Test2.sleep100 started @ " + System.currentTimeMillis() );
+ Test1.sleep( 100 );
+ }
- @Test
- public void testSleep300() {
- System.out.println("Test2.sleep300 started @ " + System.currentTimeMillis());
- Test1.sleep(300);
- }
+ @Test
+ public void testSleep300()
+ {
+ System.out.println( "Test2.sleep300 started @ " + System.currentTimeMillis() );
+ Test1.sleep( 300 );
+ }
- @Test
- public void testSleep500() {
- System.out.println("Test2.sleep500 started @ " + System.currentTimeMillis());
- Test1.sleep(500);
- }
+ @Test
+ public void testSleep500()
+ {
+ System.out.println( "Test2.sleep500 started @ " + System.currentTimeMillis() );
+ Test1.sleep( 500 );
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/710a3d58/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test3.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test3.java b/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test3.java
index 2ea7d6d..7667ec2 100644
--- a/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test3.java
+++ b/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test3.java
@@ -26,39 +26,48 @@ import org.junit.Test;
/**
* @author Kristian Rosenvold
*/
-public class Test3 {
+public class Test3
+{
- private void sleep(int ms) {
- try {
- Thread.sleep(ms);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
+ private void sleep( int ms )
+ {
+ try
+ {
+ Thread.sleep( ms );
+ }
+ catch ( InterruptedException e )
+ {
+ throw new RuntimeException( e );
+ }
}
- }
- @Test
- public void testSleep10() {
- System.out.println("Test3.sleep10 started @ " + System.currentTimeMillis());
- Test1.sleep(10);
- }
+ @Test
+ public void testSleep10()
+ {
+ System.out.println( "Test3.sleep10 started @ " + System.currentTimeMillis() );
+ Test1.sleep( 10 );
+ }
- @Test
- public void testSleep30() {
- System.out.println("Test3.sleep30 started @ " + System.currentTimeMillis());
- Test1.sleep(30);
- }
+ @Test
+ public void testSleep30()
+ {
+ System.out.println( "Test3.sleep30 started @ " + System.currentTimeMillis() );
+ Test1.sleep( 30 );
+ }
- @Test
- public void testSleep50() {
- System.out.println("Test3.sleep50 started @ " + System.currentTimeMillis());
- Test1.sleep(50);
- }
+ @Test
+ public void testSleep50()
+ {
+ System.out.println( "Test3.sleep50 started @ " + System.currentTimeMillis() );
+ Test1.sleep( 50 );
+ }
@BeforeClass
public static void setUpBeforeClass()
throws Exception
{
- System.out.println( Thread.currentThread().getName() + " Test3 beforeClass sleep 175 " + System.currentTimeMillis() );
+ System.out.println(
+ Thread.currentThread().getName() + " Test3 beforeClass sleep 175 " + System.currentTimeMillis() );
Thread.sleep( 175 );
}
@@ -66,7 +75,8 @@ public class Test3 {
public static void tearDownAfterClass()
throws Exception
{
- System.out.println( Thread.currentThread().getName() + " Test3 afterClass sleep 175 " + System.currentTimeMillis() );
+ System.out.println(
+ Thread.currentThread().getName() + " Test3 afterClass sleep 175 " + System.currentTimeMillis() );
Thread.sleep( 175 );
}