Merge from master branch.

dsaff · Jun 13, 2011 · 6c56ef2 · 6c56ef2
2 parents 46f8c84 + 59b6817
commit 6c56ef2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/test/java/org/junit/contrib/truth/AllTests.java b/src/test/java/org/junit/contrib/truth/AllTests.java
@@ -40,8 +40,9 @@
     IntegerTest.class, 
     StringTest.class,
     SubjectTest.class,
-    ExtensionTest.class,
-    DelegationTest.class
+    // Extensions-tests.
+    DelegationTest.class,
+    ExtensionTest.class
     }) public class AllTests {
 
 }
diff --git a/src/test/java/org/junit/contrib/truth/IntegerTest.java b/src/test/java/org/junit/contrib/truth/IntegerTest.java
@@ -24,13 +24,16 @@
 import org.junit.Test;
 import org.junit.contrib.truth.Expect;
 import org.junit.internal.AssumptionViolatedException;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * Tests for Integer Subjects.
  * 
  * @author David Saff
  * @author Christian Gruber (cgruber@israfil.net)
  */
+@RunWith(JUnit4.class)
 public class IntegerTest {
   @Rule public Expect EXPECT = Expect.create();
 

diff --git a/src/test/java/org/junit/contrib/truth/extensiontest/ExtensionTest.java b/src/test/java/org/junit/contrib/truth/extensiontest/ExtensionTest.java
@@ -18,13 +18,16 @@
 
 import static org.junit.contrib.truth.extensiontest.ExtendedVerb.ASSERT;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 /**
  * A test that's more or less intended to show how one uses an extended verb.
  * 
  * @author David Saff
  * @author Christian Gruber (cgruber@israfil.net)
  */
+@RunWith(JUnit4.class)
 public class ExtensionTest {
   @Test public void customTypeCompares() {
     ASSERT.that(new MyType(5)).matches(new MyType(2 + 3));