issue junit-team#426 new consistent coding style

Reformatted the code base for an consistent coding/formatting style
awulder · Aug 22, 2012 · aad05c6 · aad05c6
1 parent 2e53904
commit aad05c6
Show file tree

Hide file tree

Showing 304 changed files with 22,408 additions and 20,871 deletions.
diff --git a/src/main/java/junit/extensions/ActiveTestSuite.java b/src/main/java/junit/extensions/ActiveTestSuite.java
@@ -10,61 +10,61 @@
  * test in a separate thread and waits until all
  * threads have terminated.
  * -- Aarhus Radisson Scandinavian Center 11th floor
- */ 
+ */
 public class ActiveTestSuite extends TestSuite {
-	private volatile int fActiveTestDeathCount;
+    private volatile int fActiveTestDeathCount;
 
-	public ActiveTestSuite() {
-	}
-
-	public ActiveTestSuite(Class<? extends TestCase> theClass) {
-		super(theClass);
-	}
-
-	public ActiveTestSuite(String name) {
-		super (name);
-	}
-
-	public ActiveTestSuite(Class<? extends TestCase> theClass, String name) {
-		super(theClass, name);
-	}
-
-	@Override
-	public void run(TestResult result) {
-		fActiveTestDeathCount= 0;
-		super.run(result);
-		waitUntilFinished();
-	}
-
-	@Override
-	public void runTest(final Test test, final TestResult result) {
-		Thread t= new Thread() {
-			@Override
-			public void run() {
-				try {
-					// inlined due to limitation in VA/Java 
-					//ActiveTestSuite.super.runTest(test, result);
-					test.run(result);
-				} finally {
-					ActiveTestSuite.this.runFinished();
-				}
-			}
-		};
-		t.start();
-	}
+    public ActiveTestSuite() {
+    }
 
-	synchronized void waitUntilFinished() {
-		while (fActiveTestDeathCount < testCount()) {
-			try {
-				wait();
-			} catch (InterruptedException e) {
-				return; // ignore
-			}
-		}
-	}
-
-	synchronized public void runFinished() {
-		fActiveTestDeathCount++;
-		notifyAll();
-	}
+    public ActiveTestSuite(Class<? extends TestCase> theClass) {
+        super(theClass);
+    }
+
+    public ActiveTestSuite(String name) {
+        super(name);
+    }
+
+    public ActiveTestSuite(Class<? extends TestCase> theClass, String name) {
+        super(theClass, name);
+    }
+
+    @Override
+    public void run(TestResult result) {
+        fActiveTestDeathCount = 0;
+        super.run(result);
+        waitUntilFinished();
+    }
+
+    @Override
+    public void runTest(final Test test, final TestResult result) {
+        Thread t = new Thread() {
+            @Override
+            public void run() {
+                try {
+                    // inlined due to limitation in VA/Java
+                    //ActiveTestSuite.super.runTest(test, result);
+                    test.run(result);
+                } finally {
+                    ActiveTestSuite.this.runFinished();
+                }
+            }
+        };
+        t.start();
+    }
+
+    synchronized void waitUntilFinished() {
+        while (fActiveTestDeathCount < testCount()) {
+            try {
+                wait();
+            } catch (InterruptedException e) {
+                return; // ignore
+            }
+        }
+    }
+
+    synchronized public void runFinished() {
+        fActiveTestDeathCount++;
+        notifyAll();
+    }
 }
diff --git a/src/main/java/junit/extensions/RepeatedTest.java b/src/main/java/junit/extensions/RepeatedTest.java
@@ -5,34 +5,35 @@
 
 /**
  * A Decorator that runs a test repeatedly.
- * 
  */
 public class RepeatedTest extends TestDecorator {
-	private int fTimesRepeat;
+    private int fTimesRepeat;
 
-	public RepeatedTest(Test test, int repeat) {
-		super(test);
-		if (repeat < 0)
-			throw new IllegalArgumentException("Repetition count must be >= 0");
-		fTimesRepeat= repeat;
-	}
+    public RepeatedTest(Test test, int repeat) {
+        super(test);
+        if (repeat < 0) {
+            throw new IllegalArgumentException("Repetition count must be >= 0");
+        }
+        fTimesRepeat = repeat;
+    }
 
-	@Override
-	public int countTestCases() {
-		return super.countTestCases() * fTimesRepeat;
-	}
+    @Override
+    public int countTestCases() {
+        return super.countTestCases() * fTimesRepeat;
+    }
 
-	@Override
-	public void run(TestResult result) {
-		for (int i= 0; i < fTimesRepeat; i++) {
-			if (result.shouldStop())
-				break;
-			super.run(result);
-		}
-	}
+    @Override
+    public void run(TestResult result) {
+        for (int i = 0; i < fTimesRepeat; i++) {
+            if (result.shouldStop()) {
+                break;
+            }
+            super.run(result);
+        }
+    }
 
-	@Override
-	public String toString() {
-		return super.toString() + "(repeated)";
-	}
+    @Override
+    public String toString() {
+        return super.toString() + "(repeated)";
+    }
 }
diff --git a/src/main/java/junit/extensions/TestDecorator.java b/src/main/java/junit/extensions/TestDecorator.java
@@ -8,36 +8,35 @@
  * A Decorator for Tests. Use TestDecorator as the base class for defining new
  * test decorators. Test decorator subclasses can be introduced to add behaviour
  * before or after a test is run.
- * 
  */
 public class TestDecorator extends Assert implements Test {
-	protected Test fTest;
-
-	public TestDecorator(Test test) {
-		fTest= test;
-	}
-
-	/**
-	 * The basic run behaviour.
-	 */
-	public void basicRun(TestResult result) {
-		fTest.run(result);
-	}
-
-	public int countTestCases() {
-		return fTest.countTestCases();
-	}
-
-	public void run(TestResult result) {
-		basicRun(result);
-	}
-
-	@Override
-	public String toString() {
-		return fTest.toString();
-	}
-
-	public Test getTest() {
-		return fTest;
-	}
+    protected Test fTest;
+
+    public TestDecorator(Test test) {
+        fTest = test;
+    }
+
+    /**
+     * The basic run behaviour.
+     */
+    public void basicRun(TestResult result) {
+        fTest.run(result);
+    }
+
+    public int countTestCases() {
+        return fTest.countTestCases();
+    }
+
+    public void run(TestResult result) {
+        basicRun(result);
+    }
+
+    @Override
+    public String toString() {
+        return fTest.toString();
+    }
+
+    public Test getTest() {
+        return fTest;
+    }
 }
diff --git a/src/main/java/junit/extensions/TestSetup.java b/src/main/java/junit/extensions/TestSetup.java
@@ -11,32 +11,32 @@
  */
 public class TestSetup extends TestDecorator {
 
-	public TestSetup(Test test) {
-		super(test);
-	}
+    public TestSetup(Test test) {
+        super(test);
+    }
 
-	@Override
-	public void run(final TestResult result) {
-		Protectable p= new Protectable() {
-			public void protect() throws Exception {
-				setUp();
-				basicRun(result);
-				tearDown();
-			}
-		};
-		result.runProtected(this, p);
-	}
+    @Override
+    public void run(final TestResult result) {
+        Protectable p = new Protectable() {
+            public void protect() throws Exception {
+                setUp();
+                basicRun(result);
+                tearDown();
+            }
+        };
+        result.runProtected(this, p);
+    }
 
-	/**
-	 * Sets up the fixture. Override to set up additional fixture state.
-	 */
-	protected void setUp() throws Exception {
-	}
+    /**
+     * Sets up the fixture. Override to set up additional fixture state.
+     */
+    protected void setUp() throws Exception {
+    }
 
-	/**
-	 * Tears down the fixture. Override to tear down the additional fixture
-	 * state.
-	 */
-	protected void tearDown() throws Exception {
-	}
+    /**
+     * Tears down the fixture. Override to tear down the additional fixture
+     * state.
+     */
+    protected void tearDown() throws Exception {
+    }
 }