casa-mp-base

--- src/main/java/org/junit/internal/matchers/CombinableMatcher.java    2009-06-12 05:01:46.000000000 +0200

+++ src/main/java/org/junit/internal/matchers/CombinableMatcher.java    2009-06-12 15:54:29.000000000 +0200

@@ -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<T> extends BaseMatcher<T> {

-

-   private final Matcher<? extends T> fMatcher;

-

-   public CombinableMatcher(Matcher<? extends T> matcher) {

-       fMatcher= matcher;

-   }

-

-   public boolean matches(Object item) {

-       return fMatcher.matches(item);

-   }

-

-   public void describeTo(Description description) {

-       description.appendDescriptionOf(fMatcher);

-   }

-   

-   @SuppressWarnings("unchecked")

-   public CombinableMatcher<T> and(Matcher<? extends T> matcher) {

-       return new CombinableMatcher<T>(allOf(matcher, fMatcher));

-   }

-

-   @SuppressWarnings("unchecked")

-   public CombinableMatcher<T> or(Matcher<? extends T> matcher) {

-       return new CombinableMatcher<T>(anyOf(matcher, fMatcher));

+/**

+ * @deprectated Use org.hamcrest.core.CombinableMatcher directly

+ */

+@Deprecated

+public class CombinableMatcher<T> extends org.hamcrest.core.CombinableMatcher<T> {

+   // should only be using static factories

+   private CombinableMatcher(Matcher<? super T> matcher) {

+       super(matcher);

    }

 }

\ No newline at end of file

--- src/main/java/org/junit/internal/matchers/Each.java 2009-06-12 05:01:46.000000000 +0200

+++ src/main/java/org/junit/internal/matchers/Each.java 2009-06-12 15:54:29.000000000 +0200

@@ -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