<pre style='margin:0'>
Daniel J. Luke (danielluke) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a25b56bd7d6e32e0c4ff1ec4db4c0ac2209fc28c">https://github.com/macports/macports-ports/commit/a25b56bd7d6e32e0c4ff1ec4db4c0ac2209fc28c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new a25b56b junit: fix build (change to just download jar)
</span>a25b56b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a25b56bd7d6e32e0c4ff1ec4db4c0ac2209fc28c
</span>Author: Daniel J. Luke <dluke@macports.org>
AuthorDate: Mon Oct 15 14:19:54 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> junit: fix build (change to just download jar)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> also version bump to 4.12
</span>---
java/junit/Portfile | 50 +---
java/junit/files/patch-build.xml.diff | 40 ---
java/junit/files/patch-hamcrest-1.2-upgrade.diff | 281 ---------------------
...-java-org-junit-matchers-package-info.java.diff | 11 -
4 files changed, 11 insertions(+), 371 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/junit/Portfile b/java/junit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7ff5729..4b45979 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/junit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/junit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,10 +2,10 @@
</span>
PortSystem 1.0
PortGroup java 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
name junit
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup junit-team junit4 4.12 r
</span> categories java devel
license CPL-1
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,50 +20,22 @@ long_description \
</span> testing frameworks.
homepage http://www.junit.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/junit/junit/${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${name}${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_zip yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles ${name}-${version}.jar
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 2e59ed558001fd3b10d2146189167ff5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 98c8c625e999f0c7463397a684a5c47a0ea106e3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 4f87024e91b7252af89ad925db5cda0e17128525
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-build.xml.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-main-java-org-junit-matchers-package-info.java.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-hamcrest-1.2-upgrade.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${worksrcpath}/src/main/java
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${worksrcpath}/src/main/java && jar xvf ${worksrcpath}/${name}-${version}-src.jar"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build bin:ant:apache-ant
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:hamcrest-core
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 cac965767259d6112bd72f2aaad37eebb7e930aa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 314932
</span>
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd ant
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args -Dprefix=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dtestsrc=org/junit/tests \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Ddist=.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+extract {}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set docdir ${prefix}/share/doc/${name}-${version}
</span> set javadir ${prefix}/share/java
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set junitpkg junit.jar
</span>
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "jar cvf ${worksrcpath}/${junitpkg} -C ${worksrcpath}/target/main ."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${javadir} ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 ${worksrcpath}/${junitpkg} ${destroot}${javadir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/doc ${destroot}${docdir}/html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant doc description {Install extra documentation} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.target-append javadoc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/javadoc ${destroot}${docdir}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${javadir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${distpath}/${name}-${version}.jar ${destroot}${javadir}/${name}.jar
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/junit/files/patch-build.xml.diff b/java/junit/files/patch-build.xml.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3c91ee4..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/junit/files/patch-build.xml.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,40 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build.xml.orig 2009-06-12 21:55:56.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build.xml 2009-06-12 22:15:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,7 +18,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <property name="javadocdir" location="${dist}/javadoc" />
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <property name="javadoczip" location="${dist}-javadoc.zip" />
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <property name="javadocpackages" value="org.junit, org.junit.runner, org.junit.runner.description, org.junit.runner.manipulation, org.junit.runner.notification, org.junit.runners, org.hamcrest.core, org.junit.matchers" />
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <property name="hamcrestlib" location="lib/hamcrest-core-1.1.jar" />
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <property name="hamcrestlib" value="${prefix}/share/java/hamcrest-core.jar;${prefix}/share/java/hamcrest-library.jar" />
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <property name="hamcrestsrc" location="${dist}/temp.hamcrest.source" />
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <target name="init">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -72,8 +72,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <target name="build" depends="versiontag">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <junit_compilation srcdir="${src}" destdir="${bin}" classpath="${hamcrestlib}"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <unjar src="${hamcrestlib}" dest="${bin}" />
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <junit_compilation srcdir="${testsrc}" destdir="${testbin}" classpath="${hamcrestlib};${bin}"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </target>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <target name="jars">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -106,17 +104,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <unjar src="${hamcrestlib}" dest="${hamcrestsrc}" />
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </target>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <target name="javadoc" depends="unjar.hamcrest">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <target name="javadoc">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <javadoc packagenames="${javadocpackages}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destdir="${javadocdir}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- author="false"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version="false"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use="false"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- windowtitle="JUnit API"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- stylesheetfile="stylesheet.css"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ classpath="${hamcrestlib}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- >
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <sourcepath location="${src}" />
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <sourcepath location="${hamcrestsrc}" />
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </javadoc>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </target>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/junit/files/patch-hamcrest-1.2-upgrade.diff b/java/junit/files/patch-hamcrest-1.2-upgrade.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ee97316..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/junit/files/patch-hamcrest-1.2-upgrade.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,281 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/main/java/org/junit/internal/matchers/CombinableMatcher.java 2009-06-12 05:01:46.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/main/java/org/junit/internal/matchers/CombinableMatcher.java 2009-06-12 15:54:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,34 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- package org.junit.internal.matchers;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--import static org.hamcrest.CoreMatchers.allOf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--import static org.hamcrest.CoreMatchers.anyOf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--import org.hamcrest.BaseMatcher;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--import org.hamcrest.Description;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import org.hamcrest.Matcher;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--public class CombinableMatcher<T> extends BaseMatcher<T> {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- private final Matcher<? extends T> fMatcher;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- public CombinableMatcher(Matcher<? extends T> matcher) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fMatcher= matcher;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- public boolean matches(Object item) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return fMatcher.matches(item);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- public void describeTo(Description description) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- description.appendDescriptionOf(fMatcher);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @SuppressWarnings("unchecked")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- public CombinableMatcher<T> and(Matcher<? extends T> matcher) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return new CombinableMatcher<T>(allOf(matcher, fMatcher));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @SuppressWarnings("unchecked")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- public CombinableMatcher<T> or(Matcher<? extends T> matcher) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return new CombinableMatcher<T>(anyOf(matcher, fMatcher));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * @deprectated Use org.hamcrest.core.CombinableMatcher directly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@Deprecated
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+public class CombinableMatcher<T> extends org.hamcrest.core.CombinableMatcher<T> {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // should only be using static factories
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ private CombinableMatcher(Matcher<? super T> matcher) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ super(matcher);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/main/java/org/junit/internal/matchers/Each.java 2009-06-12 05:01:46.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/main/java/org/junit/internal/matchers/Each.java 2009-06-12 15:54:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,24 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- package org.junit.internal.matchers;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--import static org.hamcrest.CoreMatchers.not;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--import static org.junit.internal.matchers.IsCollectionContaining.hasItem;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--import org.hamcrest.BaseMatcher;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--import org.hamcrest.Description;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import org.hamcrest.Matcher;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import org.hamcrest.core.Every;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * @deprecated use org.hamcrest.core.Every
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@Deprecated
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public class Each {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public static <T> Matcher<Iterable<T>> each(final Matcher<T> individual) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- final Matcher<Iterable<T>> allItemsAre = not(hasItem(not(individual)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return new BaseMatcher<Iterable<T>>() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- public boolean matches(Object item) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return allItemsAre.matches(item);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- public void describeTo(Description description) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- description.appendText("each ");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- individual.describeTo(description);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return Every.everyItem(individual);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/main/java/org/junit/internal/matchers/IsCollectionContaining.java 2009-06-12 05:01:46.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/main/java/org/junit/internal/matchers/IsCollectionContaining.java 2009-06-12 15:54:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,67 +1,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- package org.junit.internal.matchers;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--import static org.hamcrest.core.AllOf.allOf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--import static org.hamcrest.core.IsEqual.equalTo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--import java.util.ArrayList;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--import java.util.Collection;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--import org.hamcrest.Description;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--import org.hamcrest.Factory;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import org.hamcrest.Matcher;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Copied (hopefully temporarily) from hamcrest-library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--public class IsCollectionContaining<T> extends TypeSafeMatcher<Iterable<T>> {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- private final Matcher<? extends T> elementMatcher;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- public IsCollectionContaining(Matcher<? extends T> elementMatcher) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- this.elementMatcher = elementMatcher;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @Override
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- public boolean matchesSafely(Iterable<T> collection) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (T item : collection) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (elementMatcher.matches(item)){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- public void describeTo(Description description) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- description
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- .appendText("a collection containing ")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- .appendDescriptionOf(elementMatcher);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @Factory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- public static <T> Matcher<Iterable<T>> hasItem(Matcher<? extends T> elementMatcher) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return new IsCollectionContaining<T>(elementMatcher);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @Factory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- public static <T> Matcher<Iterable<T>> hasItem(T element) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return hasItem(equalTo(element));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @Factory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- public static <T> Matcher<Iterable<T>> hasItems(Matcher<? extends T>... elementMatchers) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Collection<Matcher<? extends Iterable<T>>> all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- = new ArrayList<Matcher<? extends Iterable<T>>>(elementMatchers.length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (Matcher<? extends T> elementMatcher : elementMatchers) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- all.add(hasItem(elementMatcher));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return allOf(all);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @Factory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- public static <T> Matcher<Iterable<T>> hasItems(T... elements) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Collection<Matcher<? extends Iterable<T>>> all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- = new ArrayList<Matcher<? extends Iterable<T>>>(elements.length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (T element : elements) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- all.add(hasItem(element));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return allOf(all);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * @deprecated use org.hamcrest.core.IsCollectionContaining directly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@Deprecated
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+public class IsCollectionContaining<T> extends org.hamcrest.core.IsCollectionContaining<T> {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Client code should just use static factories, so this should be OK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ private IsCollectionContaining(Matcher<? super T> elementMatcher) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ super(elementMatcher);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // TODO Auto-generated constructor stub
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/main/java/org/junit/matchers/JUnitMatchers.java 2009-06-12 05:01:47.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/main/java/org/junit/matchers/JUnitMatchers.java 2009-06-12 15:54:29.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,38 +1,46 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- package org.junit.matchers;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import org.hamcrest.CoreMatchers;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import org.hamcrest.Matcher;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--import org.junit.internal.matchers.CombinableMatcher;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--import org.junit.internal.matchers.Each;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--import org.junit.internal.matchers.IsCollectionContaining;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--import org.junit.internal.matchers.StringContains;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import org.hamcrest.core.CombinableMatcher;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Convenience import class: these are useful matchers for use with the assertThat method, but they are
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * not currently included in the basic CoreMatchers class from hamcrest.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * @deprecated as of JUnit 4.7, all of these matchers are found in the org.hamcrest.CoreMatchers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * class instead.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@Deprecated
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public class JUnitMatchers {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // TODO (May 27, 2009 11:46:27 AM): deprecate all?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @param element
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @return A matcher matching any collection containing element
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * @deprecated Use org.hamcrest.CoreMatchers.hasItem
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- public static <T> org.hamcrest.Matcher<java.lang.Iterable<T>> hasItem(T element) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return IsCollectionContaining.hasItem(element);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @Deprecated
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public static <T> Matcher<Iterable<? super T>> hasItem(T element) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return CoreMatchers.<T>hasItem(element);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @param elementMatcher
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @return A matcher matching any collection containing an element matching elementMatcher
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * @deprecated Use org.hamcrest.CoreMatchers.hasItem
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- public static <T> org.hamcrest.Matcher<java.lang.Iterable<T>> hasItem(org.hamcrest.Matcher<? extends T> elementMatcher) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return IsCollectionContaining.hasItem(elementMatcher);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @Deprecated
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public static <T> Matcher<Iterable<? super T>> hasItem(Matcher<? super T> elementMatcher) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return CoreMatchers.<T>hasItem(elementMatcher);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @param elements
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @return A matcher matching any collection containing every element in elements
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * @deprecated Use org.hamcrest.CoreMatchers.hasItems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @Deprecated
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public static <T> org.hamcrest.Matcher<java.lang.Iterable<T>> hasItems(T... elements) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return IsCollectionContaining.hasItems(elements);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return CoreMatchers.<T>hasItems(elements);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -40,25 +48,31 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @return A matcher matching any collection containing at least one element that matches
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * each matcher in elementMatcher (this may be one element matching all matchers,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * or different elements matching each matcher)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * @deprecated Use org.hamcrest.CoreMatchers.hasItems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- public static <T> org.hamcrest.Matcher<java.lang.Iterable<T>> hasItems(org.hamcrest.Matcher<? extends T>... elementMatchers) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return IsCollectionContaining.hasItems(elementMatchers);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @Deprecated
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public static <T> Matcher<Iterable<T>> hasItems(Matcher<? super T>... elementMatchers) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return CoreMatchers.<T>hasItems(elementMatchers);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @param elementMatcher
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @return A matcher matching any collection in which every element matches elementMatcher
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * @deprecated use CoreMatchers.everyItem directly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @Deprecated
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public static <T> Matcher<Iterable<T>> everyItem(final Matcher<T> elementMatcher) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return Each.each(elementMatcher);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return CoreMatchers.everyItem(elementMatcher);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @param substring
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @return a matcher matching any string that contains substring
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * @deprecated Use org.hamcrest.CoreMatchers.containsString
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @Deprecated
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public static org.hamcrest.Matcher<java.lang.String> containsString(java.lang.String substring) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return StringContains.containsString(substring);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return CoreMatchers.containsString(substring);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -66,9 +80,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * <pre>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * assertThat(string, both(containsString("a")).and(containsString("b")));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * </pre>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * @deprecated Use org.hamcrest.CoreMatchers.both
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- public static <T> CombinableMatcher<T> both(Matcher<T> matcher) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return new CombinableMatcher<T>(matcher);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @Deprecated
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public static <T> CombinableMatcher<T> both(Matcher<? super T> matcher) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return CoreMatchers.both(matcher);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -76,8 +92,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * <pre>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * assertThat(string, both(containsString("a")).and(containsString("b")));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * </pre>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * @deprecated Use org.hamcrest.CoreMatchers.either
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- public static <T> CombinableMatcher<T> either(Matcher<T> matcher) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return new CombinableMatcher<T>(matcher);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @Deprecated
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public static <T> CombinableMatcher<T> either(Matcher<? super T> matcher) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return CoreMatchers.either(matcher);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/junit/files/patch-src-main-java-org-junit-matchers-package-info.java.diff b/java/junit/files/patch-src-main-java-org-junit-matchers-package-info.java.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index faa1090..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/junit/files/patch-src-main-java-org-junit-matchers-package-info.java.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/main/java/org/junit/matchers/package-info.java.orig 2009-02-09 22:31:20.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/main/java/org/junit/matchers/package-info.java 2012-10-23 00:32:34.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,6 +4,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * statement
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @since 4.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- * @see JUnitMatchers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * @see org.junit.matchers.JUnitMatchers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- package org.junit.matchers;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-\ No newline at end of file
</span></pre><pre style='margin:0'>
</pre>