diff --git a/.classpath b/.classpath index 9cecf517e451..5566e4403c98 100644 --- a/.classpath +++ b/.classpath @@ -3,6 +3,6 @@ - + diff --git a/lib/hamcrest-core-1.1.jar b/lib/hamcrest-core-1.1.jar deleted file mode 100644 index 5f1d5ce0c3d6..000000000000 Binary files a/lib/hamcrest-core-1.1.jar and /dev/null differ diff --git a/lib/hamcrest-core-1.2.jar b/lib/hamcrest-core-1.2.jar new file mode 100644 index 000000000000..79bb288728d7 Binary files /dev/null and b/lib/hamcrest-core-1.2.jar differ diff --git a/src/main/java/org/junit/Assume.java b/src/main/java/org/junit/Assume.java index 7b6c21a823e5..c25924f3bc6d 100644 --- a/src/main/java/org/junit/Assume.java +++ b/src/main/java/org/junit/Assume.java @@ -4,9 +4,9 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.CoreMatchers.everyItem; import org.hamcrest.Matcher; import org.junit.internal.AssumptionViolatedException; -import org.junit.internal.matchers.Each; /** * A set of methods useful for stating assumptions about the conditions in which a test is meaningful. @@ -44,7 +44,7 @@ public static void assumeTrue(boolean b) { * @param objects */ public static void assumeNotNull(Object... objects) { - assumeThat(asList(objects), Each.each(notNullValue())); + assumeThat(asList(objects), everyItem(notNullValue())); } /** diff --git a/src/main/java/org/junit/experimental/results/ResultMatchers.java b/src/main/java/org/junit/experimental/results/ResultMatchers.java index d22e3a0a009a..326e667ed174 100644 --- a/src/main/java/org/junit/experimental/results/ResultMatchers.java +++ b/src/main/java/org/junit/experimental/results/ResultMatchers.java @@ -3,7 +3,7 @@ import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; -import org.junit.internal.matchers.TypeSafeMatcher; +import org.hamcrest.TypeSafeMatcher; public class ResultMatchers { public static Matcher isSuccessful() { diff --git a/src/main/java/org/junit/internal/matchers/CombinableMatcher.java b/src/main/java/org/junit/internal/matchers/CombinableMatcher.java index e9e6947c3ae2..46b55facc94f 100644 --- a/src/main/java/org/junit/internal/matchers/CombinableMatcher.java +++ b/src/main/java/org/junit/internal/matchers/CombinableMatcher.java @@ -1,34 +1,14 @@ package org.junit.internal.matchers; -import static org.hamcrest.CoreMatchers.allOf; -import static org.hamcrest.CoreMatchers.anyOf; -import org.hamcrest.BaseMatcher; -import org.hamcrest.Description; import org.hamcrest.Matcher; -public class CombinableMatcher extends BaseMatcher { - - private final Matcher fMatcher; - - public CombinableMatcher(Matcher matcher) { - fMatcher= matcher; - } - - public boolean matches(Object item) { - return fMatcher.matches(item); - } - - public void describeTo(Description description) { - description.appendDescriptionOf(fMatcher); - } - - @SuppressWarnings("unchecked") - public CombinableMatcher and(Matcher matcher) { - return new CombinableMatcher(allOf(matcher, fMatcher)); - } - - @SuppressWarnings("unchecked") - public CombinableMatcher or(Matcher matcher) { - return new CombinableMatcher(anyOf(matcher, fMatcher)); +/** + * @deprectated Use org.hamcrest.core.CombinableMatcher directly + */ +@Deprecated +public class CombinableMatcher extends org.hamcrest.core.CombinableMatcher { + // should only be using static factories + private CombinableMatcher(Matcher matcher) { + super(matcher); } } \ No newline at end of file diff --git a/src/main/java/org/junit/internal/matchers/Each.java b/src/main/java/org/junit/internal/matchers/Each.java index 527db3bf3c2f..90f4f6ff7051 100644 --- a/src/main/java/org/junit/internal/matchers/Each.java +++ b/src/main/java/org/junit/internal/matchers/Each.java @@ -1,24 +1,15 @@ package org.junit.internal.matchers; -import static org.hamcrest.CoreMatchers.not; -import static org.junit.internal.matchers.IsCollectionContaining.hasItem; -import org.hamcrest.BaseMatcher; -import org.hamcrest.Description; import org.hamcrest.Matcher; +import org.hamcrest.core.Every; + +/** + * @deprecated use org.hamcrest.core.Every + */ +@Deprecated public class Each { public static Matcher> each(final Matcher individual) { - final Matcher> allItemsAre = not(hasItem(not(individual))); - - return new BaseMatcher>() { - public boolean matches(Object item) { - return allItemsAre.matches(item); - } - - public void describeTo(Description description) { - description.appendText("each "); - individual.describeTo(description); - } - }; + return Every.everyItem(individual); } } diff --git a/src/main/java/org/junit/internal/matchers/IsCollectionContaining.java b/src/main/java/org/junit/internal/matchers/IsCollectionContaining.java index 4436a83cb71b..4042567000b9 100644 --- a/src/main/java/org/junit/internal/matchers/IsCollectionContaining.java +++ b/src/main/java/org/junit/internal/matchers/IsCollectionContaining.java @@ -1,67 +1,16 @@ package org.junit.internal.matchers; -import static org.hamcrest.core.AllOf.allOf; -import static org.hamcrest.core.IsEqual.equalTo; - -import java.util.ArrayList; -import java.util.Collection; - -import org.hamcrest.Description; -import org.hamcrest.Factory; import org.hamcrest.Matcher; // Copied (hopefully temporarily) from hamcrest-library -public class IsCollectionContaining extends TypeSafeMatcher> { - private final Matcher elementMatcher; - - public IsCollectionContaining(Matcher elementMatcher) { - this.elementMatcher = elementMatcher; - } - - @Override - public boolean matchesSafely(Iterable collection) { - for (T item : collection) { - if (elementMatcher.matches(item)){ - return true; - } - } - return false; - } - - public void describeTo(Description description) { - description - .appendText("a collection containing ") - .appendDescriptionOf(elementMatcher); - } - - @Factory - public static Matcher> hasItem(Matcher elementMatcher) { - return new IsCollectionContaining(elementMatcher); - } - - @Factory - public static Matcher> hasItem(T element) { - return hasItem(equalTo(element)); - } - - @Factory - public static Matcher> hasItems(Matcher... elementMatchers) { - Collection>> all - = new ArrayList>>(elementMatchers.length); - for (Matcher elementMatcher : elementMatchers) { - all.add(hasItem(elementMatcher)); - } - return allOf(all); - } - - @Factory - public static Matcher> hasItems(T... elements) { - Collection>> all - = new ArrayList>>(elements.length); - for (T element : elements) { - all.add(hasItem(element)); - } - return allOf(all); - } - +/** + * @deprecated use org.hamcrest.core.IsCollectionContaining directly + */ +@Deprecated +public class IsCollectionContaining extends org.hamcrest.core.IsCollectionContaining { + // Client code should just use static factories, so this should be OK + private IsCollectionContaining(Matcher elementMatcher) { + super(elementMatcher); + // TODO Auto-generated constructor stub + } } diff --git a/src/main/java/org/junit/internal/matchers/StringContains.java b/src/main/java/org/junit/internal/matchers/StringContains.java index e5f53345d5eb..597f1fd0c707 100644 --- a/src/main/java/org/junit/internal/matchers/StringContains.java +++ b/src/main/java/org/junit/internal/matchers/StringContains.java @@ -2,12 +2,14 @@ */ package org.junit.internal.matchers; +import org.hamcrest.CoreMatchers; import org.hamcrest.Factory; import org.hamcrest.Matcher; /** - * Tests if the argument is a string that contains a substring. + * @deprectated Use org.hamcrest.core.StringContains directly */ +@Deprecated public class StringContains extends SubstringMatcher { public StringContains(String substring) { super(substring); @@ -25,7 +27,7 @@ protected String relationship() { @Factory public static Matcher containsString(String substring) { - return new StringContains(substring); + return CoreMatchers.containsString(substring); } } \ No newline at end of file diff --git a/src/main/java/org/junit/internal/matchers/SubstringMatcher.java b/src/main/java/org/junit/internal/matchers/SubstringMatcher.java index 1c652409946b..50835d11e4cd 100644 --- a/src/main/java/org/junit/internal/matchers/SubstringMatcher.java +++ b/src/main/java/org/junit/internal/matchers/SubstringMatcher.java @@ -2,6 +2,10 @@ import org.hamcrest.Description; +/** + * @deprectated Use org.hamcrest.core.SubstringMatcher directly + */ +@Deprecated public abstract class SubstringMatcher extends TypeSafeMatcher { protected final String substring; diff --git a/src/main/java/org/junit/internal/matchers/TypeSafeMatcher.java b/src/main/java/org/junit/internal/matchers/TypeSafeMatcher.java index 794a1749d9c9..92e1061cac0b 100644 --- a/src/main/java/org/junit/internal/matchers/TypeSafeMatcher.java +++ b/src/main/java/org/junit/internal/matchers/TypeSafeMatcher.java @@ -10,6 +10,10 @@ * * @author Joe Walnes */ +/** + * @deprectated Use org.hamcrest.TypeSafeMatcher + */ +@Deprecated public abstract class TypeSafeMatcher extends BaseMatcher { private Class expectedType; diff --git a/src/main/java/org/junit/matchers/JUnitMatchers.java b/src/main/java/org/junit/matchers/JUnitMatchers.java index ab38b05c66af..f692c2655a74 100644 --- a/src/main/java/org/junit/matchers/JUnitMatchers.java +++ b/src/main/java/org/junit/matchers/JUnitMatchers.java @@ -1,38 +1,46 @@ package org.junit.matchers; +import org.hamcrest.CoreMatchers; import org.hamcrest.Matcher; -import org.junit.internal.matchers.CombinableMatcher; -import org.junit.internal.matchers.Each; -import org.junit.internal.matchers.IsCollectionContaining; -import org.junit.internal.matchers.StringContains; +import org.hamcrest.core.CombinableMatcher; /** * Convenience import class: these are useful matchers for use with the assertThat method, but they are * not currently included in the basic CoreMatchers class from hamcrest. + * @deprecated as of JUnit 4.7, all of these matchers are found in the org.hamcrest.CoreMatchers + * class instead. */ +@Deprecated public class JUnitMatchers { + // TODO (May 27, 2009 11:46:27 AM): deprecate all? /** * @param element * @return A matcher matching any collection containing element + * @deprecated Use org.hamcrest.CoreMatchers.hasItem */ - public static org.hamcrest.Matcher> hasItem(T element) { - return IsCollectionContaining.hasItem(element); + @Deprecated + public static Matcher> hasItem(T element) { + return CoreMatchers.hasItem(element); } /** * @param elementMatcher * @return A matcher matching any collection containing an element matching elementMatcher + * @deprecated Use org.hamcrest.CoreMatchers.hasItem */ - public static org.hamcrest.Matcher> hasItem(org.hamcrest.Matcher elementMatcher) { - return IsCollectionContaining.hasItem(elementMatcher); + @Deprecated + public static Matcher> hasItem(Matcher elementMatcher) { + return CoreMatchers.hasItem(elementMatcher); } /** * @param elements * @return A matcher matching any collection containing every element in elements + * @deprecated Use org.hamcrest.CoreMatchers.hasItems */ + @Deprecated public static org.hamcrest.Matcher> hasItems(T... elements) { - return IsCollectionContaining.hasItems(elements); + return CoreMatchers.hasItems(elements); } /** @@ -40,25 +48,31 @@ public static org.hamcrest.Matcher> hasItems(T... elem * @return A matcher matching any collection containing at least one element that matches * each matcher in elementMatcher (this may be one element matching all matchers, * or different elements matching each matcher) + * @deprecated Use org.hamcrest.CoreMatchers.hasItems */ - public static org.hamcrest.Matcher> hasItems(org.hamcrest.Matcher... elementMatchers) { - return IsCollectionContaining.hasItems(elementMatchers); + @Deprecated + public static Matcher> hasItems(Matcher... elementMatchers) { + return CoreMatchers.hasItems(elementMatchers); } /** * @param elementMatcher * @return A matcher matching any collection in which every element matches elementMatcher + * @deprecated use CoreMatchers.everyItem directly */ + @Deprecated public static Matcher> everyItem(final Matcher elementMatcher) { - return Each.each(elementMatcher); + return CoreMatchers.everyItem(elementMatcher); } /** * @param substring * @return a matcher matching any string that contains substring + * @deprecated Use org.hamcrest.CoreMatchers.containsString */ + @Deprecated public static org.hamcrest.Matcher containsString(java.lang.String substring) { - return StringContains.containsString(substring); + return CoreMatchers.containsString(substring); } /** @@ -66,9 +80,11 @@ public static org.hamcrest.Matcher containsString(java.lang.St * 
 	 *   assertThat(string, both(containsString("a")).and(containsString("b")));
 	 *
+ * @deprecated Use org.hamcrest.CoreMatchers.both */ - public static CombinableMatcher both(Matcher matcher) { - return new CombinableMatcher(matcher); + @Deprecated + public static CombinableMatcher both(Matcher matcher) { + return CoreMatchers.both(matcher); } /** @@ -76,8 +92,10 @@ public static CombinableMatcher both(Matcher matcher) { * 
 	 *   assertThat(string, both(containsString("a")).and(containsString("b")));
 	 *
+ * @deprecated Use org.hamcrest.CoreMatchers.either */ - public static CombinableMatcher either(Matcher matcher) { - return new CombinableMatcher(matcher); + @Deprecated + public static CombinableMatcher either(Matcher matcher) { + return CoreMatchers.either(matcher); } } diff --git a/src/test/java/org/junit/tests/AllTests.java b/src/test/java/org/junit/tests/AllTests.java index 8d6c0db2c050..34cac3c0661a 100644 --- a/src/test/java/org/junit/tests/AllTests.java +++ b/src/test/java/org/junit/tests/AllTests.java @@ -7,7 +7,6 @@ import org.junit.runners.Suite.SuiteClasses; import org.junit.tests.assertion.AssertionTest; import org.junit.tests.assertion.BothTest; -import org.junit.tests.assertion.EachTest; import org.junit.tests.deprecated.JUnit4ClassRunnerTest; import org.junit.tests.description.AnnotatedDescriptionTest; import org.junit.tests.description.SuiteDescriptionTest; @@ -109,7 +108,6 @@ AnnotatedDescriptionTest.class, BothTest.class, AssumptionViolatedExceptionTest.class, - EachTest.class, ExperimentalTests.class, InheritedTestTest.class, TestClassTest.class, diff --git a/src/test/java/org/junit/tests/assertion/BothTest.java b/src/test/java/org/junit/tests/assertion/BothTest.java index fd51a0900e7f..98c61ea4f521 100644 --- a/src/test/java/org/junit/tests/assertion/BothTest.java +++ b/src/test/java/org/junit/tests/assertion/BothTest.java @@ -1,12 +1,12 @@ package org.junit.tests.assertion; +import static org.hamcrest.CoreMatchers.both; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.either; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; import static org.junit.Assume.assumeTrue; -import static org.junit.matchers.JUnitMatchers.both; -import static org.junit.matchers.JUnitMatchers.containsString; -import static org.junit.matchers.JUnitMatchers.either; import org.hamcrest.Matcher; import org.junit.Test; import org.junit.experimental.theories.DataPoint; @@ -17,10 +17,10 @@ @RunWith(Theories.class) public class BothTest { @DataPoint - public static Matcher IS_3= is(3); + public static Matcher IS_3= is(3); @DataPoint - public static Matcher IS_4= is(4); + public static Matcher IS_4= is(4); @DataPoint public static int THREE= 3; diff --git a/src/test/java/org/junit/tests/assertion/EachTest.java b/src/test/java/org/junit/tests/assertion/EachTest.java deleted file mode 100644 index 16327e288e9c..000000000000 --- a/src/test/java/org/junit/tests/assertion/EachTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.junit.tests.assertion; - -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; -import org.junit.Test; -import org.junit.internal.matchers.Each; - -public class EachTest { - @Test - public void eachDescription() { - assertThat(Each.each(is("a")).toString(), is("each is \"a\"")); - } -} diff --git a/src/test/java/org/junit/tests/experimental/AssumptionTest.java b/src/test/java/org/junit/tests/experimental/AssumptionTest.java index 153b942405f0..c9994062abc2 100644 --- a/src/test/java/org/junit/tests/experimental/AssumptionTest.java +++ b/src/test/java/org/junit/tests/experimental/AssumptionTest.java @@ -1,5 +1,6 @@ package org.junit.tests.experimental; +import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; @@ -9,7 +10,6 @@ import static org.junit.Assume.assumeTrue; import static org.junit.experimental.results.PrintableResult.testResult; import static org.junit.experimental.results.ResultMatchers.isSuccessful; -import static org.junit.internal.matchers.StringContains.containsString; import org.junit.Assume; import org.junit.Before; import org.junit.BeforeClass; diff --git a/src/test/java/org/junit/tests/experimental/AssumptionViolatedExceptionTest.java b/src/test/java/org/junit/tests/experimental/AssumptionViolatedExceptionTest.java index f1cb955bfb58..6ef4bde5ec93 100644 --- a/src/test/java/org/junit/tests/experimental/AssumptionViolatedExceptionTest.java +++ b/src/test/java/org/junit/tests/experimental/AssumptionViolatedExceptionTest.java @@ -1,10 +1,10 @@ package org.junit.tests.experimental; +import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.junit.Assert.assertThat; import static org.junit.Assume.assumeThat; -import static org.junit.internal.matchers.StringContains.containsString; import org.hamcrest.Matcher; import org.hamcrest.StringDescription; import org.junit.Test; diff --git a/src/test/java/org/junit/tests/experimental/interceptor/InterceptorTest.java b/src/test/java/org/junit/tests/experimental/interceptor/InterceptorTest.java index c58cd3ee8ed4..d7d154cf7a3e 100644 --- a/src/test/java/org/junit/tests/experimental/interceptor/InterceptorTest.java +++ b/src/test/java/org/junit/tests/experimental/interceptor/InterceptorTest.java @@ -1,5 +1,6 @@ package org.junit.tests.experimental.interceptor; +import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; @@ -7,7 +8,6 @@ import static org.junit.Assert.fail; import static org.junit.experimental.results.PrintableResult.testResult; import static org.junit.experimental.results.ResultMatchers.hasSingleFailureContaining; -import static org.junit.matchers.JUnitMatchers.containsString; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/org/junit/tests/experimental/interceptor/TimeoutInterceptorTest.java b/src/test/java/org/junit/tests/experimental/interceptor/TimeoutInterceptorTest.java index 4c9e250a0272..9322efe8504f 100644 --- a/src/test/java/org/junit/tests/experimental/interceptor/TimeoutInterceptorTest.java +++ b/src/test/java/org/junit/tests/experimental/interceptor/TimeoutInterceptorTest.java @@ -1,8 +1,8 @@ package org.junit.tests.experimental.interceptor; +import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; -import static org.junit.matchers.JUnitMatchers.containsString; import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.interceptor.Interceptor; diff --git a/src/test/java/org/junit/tests/experimental/max/MaxStarterTest.java b/src/test/java/org/junit/tests/experimental/max/MaxStarterTest.java index 803a408482f9..4f7f4ed94292 100644 --- a/src/test/java/org/junit/tests/experimental/max/MaxStarterTest.java +++ b/src/test/java/org/junit/tests/experimental/max/MaxStarterTest.java @@ -1,11 +1,11 @@ package org.junit.tests.experimental.max; +import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.junit.matchers.JUnitMatchers.containsString; import java.io.File; import java.util.ArrayList; diff --git a/src/test/java/org/junit/tests/experimental/parallel/ParallelClassTest.java b/src/test/java/org/junit/tests/experimental/parallel/ParallelClassTest.java index 2e68270681fb..ab8bb73f0caa 100644 --- a/src/test/java/org/junit/tests/experimental/parallel/ParallelClassTest.java +++ b/src/test/java/org/junit/tests/experimental/parallel/ParallelClassTest.java @@ -4,9 +4,9 @@ import static org.junit.Assert.assertTrue; import org.hamcrest.Description; import org.hamcrest.Matcher; +import org.hamcrest.TypeSafeMatcher; import org.junit.Test; import org.junit.experimental.ParallelComputer; -import org.junit.internal.matchers.TypeSafeMatcher; import org.junit.runner.JUnitCore; import org.junit.runner.Result; import org.junit.runner.RunWith; diff --git a/src/test/java/org/junit/tests/experimental/parallel/ParallelMethodTest.java b/src/test/java/org/junit/tests/experimental/parallel/ParallelMethodTest.java index be5a792a9432..f79a6f07b92a 100644 --- a/src/test/java/org/junit/tests/experimental/parallel/ParallelMethodTest.java +++ b/src/test/java/org/junit/tests/experimental/parallel/ParallelMethodTest.java @@ -4,9 +4,9 @@ import static org.junit.Assert.assertTrue; import org.hamcrest.Description; import org.hamcrest.Matcher; +import org.hamcrest.TypeSafeMatcher; import org.junit.Test; import org.junit.experimental.ParallelComputer; -import org.junit.internal.matchers.TypeSafeMatcher; import org.junit.runner.JUnitCore; import org.junit.runner.Result; diff --git a/src/test/java/org/junit/tests/experimental/results/PrintableResultTest.java b/src/test/java/org/junit/tests/experimental/results/PrintableResultTest.java index de715cbf038e..9a6cf8e6ed40 100644 --- a/src/test/java/org/junit/tests/experimental/results/PrintableResultTest.java +++ b/src/test/java/org/junit/tests/experimental/results/PrintableResultTest.java @@ -2,8 +2,8 @@ import static java.util.Arrays.asList; import static org.hamcrest.CoreMatchers.allOf; +import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; -import static org.junit.internal.matchers.StringContains.containsString; import java.util.Arrays; @@ -17,7 +17,6 @@ @RunWith(Theories.class) public class PrintableResultTest { - @SuppressWarnings("unchecked") @Theory(nullsAccepted= false) public void backTraceHasGoodToString(String descriptionName, final String stackTraceClassName) { diff --git a/src/test/java/org/junit/tests/experimental/results/ResultMatchersTest.java b/src/test/java/org/junit/tests/experimental/results/ResultMatchersTest.java index 1263a8c4cb77..43bc73bcaf2b 100644 --- a/src/test/java/org/junit/tests/experimental/results/ResultMatchersTest.java +++ b/src/test/java/org/junit/tests/experimental/results/ResultMatchersTest.java @@ -1,11 +1,12 @@ package org.junit.tests.experimental.results; +import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; -import static org.junit.internal.matchers.StringContains.containsString; import org.junit.Test; import org.junit.experimental.results.ResultMatchers; import org.junit.experimental.theories.Theory; + public class ResultMatchersTest { @Test public void hasFailuresHasGoodDescription() { diff --git a/src/test/java/org/junit/tests/experimental/theories/ParameterSignatureTest.java b/src/test/java/org/junit/tests/experimental/theories/ParameterSignatureTest.java index c0191c459df7..cf02331cb028 100644 --- a/src/test/java/org/junit/tests/experimental/theories/ParameterSignatureTest.java +++ b/src/test/java/org/junit/tests/experimental/theories/ParameterSignatureTest.java @@ -1,10 +1,10 @@ package org.junit.tests.experimental.theories; +import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assume.assumeTrue; -import static org.junit.matchers.JUnitMatchers.hasItem; import java.lang.annotation.Annotation; import java.lang.reflect.Method; diff --git a/src/test/java/org/junit/tests/experimental/theories/ParameterizedAssertionErrorTest.java b/src/test/java/org/junit/tests/experimental/theories/ParameterizedAssertionErrorTest.java index 91c0e04517ec..c0d8fd34d4b4 100644 --- a/src/test/java/org/junit/tests/experimental/theories/ParameterizedAssertionErrorTest.java +++ b/src/test/java/org/junit/tests/experimental/theories/ParameterizedAssertionErrorTest.java @@ -1,10 +1,10 @@ package org.junit.tests.experimental.theories; +import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; import static org.junit.Assume.assumeThat; -import static org.junit.internal.matchers.StringContains.containsString; import org.junit.Test; import org.junit.experimental.theories.DataPoint; import org.junit.experimental.theories.Theories; diff --git a/src/test/java/org/junit/tests/experimental/theories/runner/UnsuccessfulWithDataPointFields.java b/src/test/java/org/junit/tests/experimental/theories/runner/UnsuccessfulWithDataPointFields.java index 01eeed827a9d..1ffa851c4950 100644 --- a/src/test/java/org/junit/tests/experimental/theories/runner/UnsuccessfulWithDataPointFields.java +++ b/src/test/java/org/junit/tests/experimental/theories/runner/UnsuccessfulWithDataPointFields.java @@ -1,12 +1,12 @@ package org.junit.tests.experimental.theories.runner; +import static org.hamcrest.CoreMatchers.both; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.junit.experimental.results.PrintableResult.testResult; import static org.junit.experimental.results.ResultMatchers.failureCountIs; import static org.junit.experimental.results.ResultMatchers.hasFailureContaining; import static org.junit.experimental.results.ResultMatchers.hasSingleFailureContaining; -import static org.junit.matchers.JUnitMatchers.both; import org.junit.Test; import org.junit.experimental.theories.DataPoint; import org.junit.experimental.theories.Theories; diff --git a/src/test/java/org/junit/tests/experimental/theories/runner/WhenNoParametersMatch.java b/src/test/java/org/junit/tests/experimental/theories/runner/WhenNoParametersMatch.java index 3c83d8262d96..498f8612924e 100644 --- a/src/test/java/org/junit/tests/experimental/theories/runner/WhenNoParametersMatch.java +++ b/src/test/java/org/junit/tests/experimental/theories/runner/WhenNoParametersMatch.java @@ -1,11 +1,11 @@ package org.junit.tests.experimental.theories.runner; +import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.assertThat; import static org.junit.Assume.assumeThat; import static org.junit.experimental.results.PrintableResult.testResult; -import static org.junit.internal.matchers.StringContains.containsString; import org.hamcrest.Matcher; import org.junit.experimental.theories.DataPoint; import org.junit.experimental.theories.DataPoints; diff --git a/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java b/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java index 659f43000778..68feabe0a465 100644 --- a/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java +++ b/src/test/java/org/junit/tests/experimental/theories/runner/WithDataPointMethod.java @@ -1,13 +1,13 @@ package org.junit.tests.experimental.theories.runner; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.everyItem; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.CoreMatchers.nullValue; import static org.junit.Assert.assertThat; import static org.junit.experimental.results.PrintableResult.testResult; import static org.junit.experimental.results.ResultMatchers.isSuccessful; -import static org.junit.internal.matchers.Each.each; -import static org.junit.internal.matchers.StringContains.containsString; import java.lang.reflect.Method; import java.util.ArrayList; @@ -147,6 +147,6 @@ private List failures(Class type) { private Matcher> empty() { Matcher nullValue= nullValue(); - return each(nullValue); + return everyItem(nullValue); } } diff --git a/src/test/java/org/junit/tests/experimental/theories/runner/WithOnlyTestAnnotations.java b/src/test/java/org/junit/tests/experimental/theories/runner/WithOnlyTestAnnotations.java index f029bf56d8e6..908bf4ed41ab 100644 --- a/src/test/java/org/junit/tests/experimental/theories/runner/WithOnlyTestAnnotations.java +++ b/src/test/java/org/junit/tests/experimental/theories/runner/WithOnlyTestAnnotations.java @@ -1,12 +1,12 @@ package org.junit.tests.experimental.theories.runner; +import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.experimental.results.PrintableResult.testResult; import static org.junit.experimental.results.ResultMatchers.failureCountIs; import static org.junit.experimental.results.ResultMatchers.isSuccessful; -import static org.junit.matchers.JUnitMatchers.containsString; import org.junit.Test; import org.junit.experimental.theories.DataPoint; import org.junit.experimental.theories.Theories; diff --git a/src/test/java/org/junit/tests/junit3compatibility/AllTestsTest.java b/src/test/java/org/junit/tests/junit3compatibility/AllTestsTest.java index d9076e3aa0f6..773913c450c1 100644 --- a/src/test/java/org/junit/tests/junit3compatibility/AllTestsTest.java +++ b/src/test/java/org/junit/tests/junit3compatibility/AllTestsTest.java @@ -1,9 +1,9 @@ package org.junit.tests.junit3compatibility; +import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import static org.junit.matchers.JUnitMatchers.containsString; import junit.framework.JUnit4TestAdapter; import junit.framework.TestCase; import junit.framework.TestSuite; diff --git a/src/test/java/org/junit/tests/running/classes/ParameterizedTestTest.java b/src/test/java/org/junit/tests/running/classes/ParameterizedTestTest.java index d48433f26fa0..29350b454576 100644 --- a/src/test/java/org/junit/tests/running/classes/ParameterizedTestTest.java +++ b/src/test/java/org/junit/tests/running/classes/ParameterizedTestTest.java @@ -1,9 +1,9 @@ package org.junit.tests.running.classes; +import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.experimental.results.PrintableResult.testResult; -import static org.junit.matchers.JUnitMatchers.containsString; import java.util.Arrays; import java.util.Collection; diff --git a/src/test/java/org/junit/tests/running/methods/AnnotationTest.java b/src/test/java/org/junit/tests/running/methods/AnnotationTest.java index 2eb496a90ac9..87550c91ab73 100644 --- a/src/test/java/org/junit/tests/running/methods/AnnotationTest.java +++ b/src/test/java/org/junit/tests/running/methods/AnnotationTest.java @@ -1,8 +1,8 @@ package org.junit.tests.running.methods; +import static org.hamcrest.CoreMatchers.both; +import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; -import static org.junit.matchers.JUnitMatchers.both; -import static org.junit.matchers.JUnitMatchers.containsString; import java.util.Collection; import java.util.HashSet; diff --git a/src/test/java/org/junit/tests/running/methods/TimeoutTest.java b/src/test/java/org/junit/tests/running/methods/TimeoutTest.java index 777b0bdf8919..b381c1d57b43 100644 --- a/src/test/java/org/junit/tests/running/methods/TimeoutTest.java +++ b/src/test/java/org/junit/tests/running/methods/TimeoutTest.java @@ -1,11 +1,11 @@ package org.junit.tests.running.methods; +import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.junit.matchers.JUnitMatchers.containsString; import java.io.PrintWriter; import java.io.StringWriter;