From ad999fa0c60e40150335df3a65fba1ecf4447c85013f7abd1169654d9422830a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 9 Jun 2022 18:12:21 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/junit?expand=0&rev=43 --- 0001-Port-to-hamcrest-2.2.patch | 108 ++++++++++++++++++++++++++++++++ junit.changes | 10 +++ junit.spec | 2 + 3 files changed, 120 insertions(+) create mode 100644 0001-Port-to-hamcrest-2.2.patch diff --git a/0001-Port-to-hamcrest-2.2.patch b/0001-Port-to-hamcrest-2.2.patch new file mode 100644 index 0000000..ea5b5f2 --- /dev/null +++ b/0001-Port-to-hamcrest-2.2.patch @@ -0,0 +1,108 @@ +From 85c780b61cd35b4544d2926393805e1699641f38 Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Fri, 6 Mar 2020 14:28:05 +0100 +Subject: [PATCH] Port to hamcrest 2.2 + +--- + .../org/junit/internal/matchers/StacktracePrintingMatcher.java | 3 --- + .../org/junit/internal/matchers/ThrowableCauseMatcher.java | 2 -- + .../org/junit/internal/matchers/ThrowableMessageMatcher.java | 2 -- + src/main/java/org/junit/matchers/JUnitMatchers.java | 2 +- + .../experimental/theories/runner/WithDataPointMethod.java | 2 +- + 5 files changed, 2 insertions(+), 9 deletions(-) + +diff --git a/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java b/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java +index 93a6827..3ea4a81 100644 +--- a/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java ++++ b/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java +@@ -1,7 +1,6 @@ + package org.junit.internal.matchers; + + import org.hamcrest.Description; +-import org.hamcrest.Factory; + import org.hamcrest.Matcher; + + import org.junit.internal.Throwables; +@@ -39,13 +38,11 @@ public class StacktracePrintingMatcher extends + return Throwables.getStacktrace(throwable); + } + +- @Factory + public static Matcher isThrowable( + Matcher throwableMatcher) { + return new StacktracePrintingMatcher(throwableMatcher); + } + +- @Factory + public static Matcher isException( + Matcher exceptionMatcher) { + return new StacktracePrintingMatcher(exceptionMatcher); +diff --git a/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java b/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java +index 6e2ff5e..1f0a0a0 100644 +--- a/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java ++++ b/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java +@@ -1,7 +1,6 @@ + package org.junit.internal.matchers; + + import org.hamcrest.Description; +-import org.hamcrest.Factory; + import org.hamcrest.Matcher; + import org.hamcrest.TypeSafeMatcher; + +@@ -43,7 +42,6 @@ public class ThrowableCauseMatcher extends + * @param matcher to apply to the cause of the outer exception + * @param type of the outer exception + */ +- @Factory + public static Matcher hasCause(final Matcher matcher) { + return new ThrowableCauseMatcher(matcher); + } +diff --git a/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java b/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java +index 74386a8..7d16b11 100644 +--- a/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java ++++ b/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java +@@ -1,7 +1,6 @@ + package org.junit.internal.matchers; + + import org.hamcrest.Description; +-import org.hamcrest.Factory; + import org.hamcrest.Matcher; + import org.hamcrest.TypeSafeMatcher; + +@@ -30,7 +29,6 @@ public class ThrowableMessageMatcher extends + matcher.describeMismatch(item.getMessage(), description); + } + +- @Factory + public static Matcher hasMessage(final Matcher matcher) { + return new ThrowableMessageMatcher(matcher); + } +diff --git a/src/main/java/org/junit/matchers/JUnitMatchers.java b/src/main/java/org/junit/matchers/JUnitMatchers.java +index 13407cc..8889266 100644 +--- a/src/main/java/org/junit/matchers/JUnitMatchers.java ++++ b/src/main/java/org/junit/matchers/JUnitMatchers.java +@@ -56,7 +56,7 @@ public class JUnitMatchers { + * @deprecated Please use {@link CoreMatchers#everyItem(Matcher)} instead. + */ + @Deprecated +- public static Matcher> everyItem(final Matcher elementMatcher) { ++ public static Matcher> everyItem(final Matcher elementMatcher) { + return CoreMatchers.everyItem(elementMatcher); + } + +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 f2b2753..e5759ed 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 +@@ -108,7 +108,7 @@ public class WithDataPointMethod { + return JUnitCore.runClasses(type).getFailures(); + } + +- private Matcher> empty() { ++ private Matcher> empty() { + return everyItem(nullValue(Failure.class)); + } + } +-- +2.25.2 + diff --git a/junit.changes b/junit.changes index f68cfba..50fc62d 100644 --- a/junit.changes +++ b/junit.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Jun 9 18:02:17 UTC 2022 - Fridrich Strba + +- Added patch: + * 0001-Port-to-hamcrest-2.2.patch + + do not use the org.hamcrest.Factory that was removed in + hamcrest 2.x and should have been an internal annotation + only + + fix some incompatibilities with template types in matchers + ------------------------------------------------------------------- Fri Mar 18 16:38:08 UTC 2022 - Fridrich Strba diff --git a/junit.spec b/junit.spec index 1ee06ce..52c7b7b 100644 --- a/junit.spec +++ b/junit.spec @@ -25,6 +25,7 @@ Group: Development/Libraries/Java URL: https://junit.org/junit4/ Source0: https://github.com/junit-team/junit4/archive/r%{version}.tar.gz Source1: build.xml +Patch0: 0001-Port-to-hamcrest-2.2.patch BuildRequires: ant BuildRequires: fdupes BuildRequires: hamcrest >= 1.3 @@ -63,6 +64,7 @@ Documentation for %{name}. %prep %setup -q -n %{name}4-r%{version} +%patch0 -p1 cp %{SOURCE1} . find . -type f -name "*.jar" -or -name "*.class" | xargs -t rm -rf From 3e553e2decccdba219910f6423f77409e24fe015ac37247136ef82bf6cb80002 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 9 Jun 2022 18:16:56 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/junit?expand=0&rev=44 --- junit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/junit.spec b/junit.spec index 52c7b7b..354196d 100644 --- a/junit.spec +++ b/junit.spec @@ -28,7 +28,7 @@ Source1: build.xml Patch0: 0001-Port-to-hamcrest-2.2.patch BuildRequires: ant BuildRequires: fdupes -BuildRequires: hamcrest >= 1.3 +BuildRequires: hamcrest >= 2.2 BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local Requires: mvn(org.hamcrest:hamcrest-core) From 2ab2515d378d31bc7167cacedf84bac116f50b9ee8593e9044ff20a54a00fcc6 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 9 Jun 2022 18:36:51 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/junit?expand=0&rev=45 --- junit.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/junit.spec b/junit.spec index 354196d..a665c3b 100644 --- a/junit.spec +++ b/junit.spec @@ -69,10 +69,10 @@ cp %{SOURCE1} . find . -type f -name "*.jar" -or -name "*.class" | xargs -t rm -rf -ln -s $(build-classpath hamcrest/all) lib/hamcrest-core-1.3.jar +ln -s $(build-classpath hamcrest/hamcrest) lib/hamcrest-core-1.3.jar %build -export CLASSPATH=$(build-classpath hamcrest/all) +export CLASSPATH=$(build-classpath hamcrest/hamcrest) ant jars javadoc -Dversion-status= %install From 9d182279727bfc70f7b20bfd46771bc8aeb0f8552283c36b96e40dc8b3d3aa65 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 10 Jun 2022 06:08:23 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/junit?expand=0&rev=46 --- build.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.xml b/build.xml index 2235fcc..e76295d 100644 --- a/build.xml +++ b/build.xml @@ -110,13 +110,13 @@ - + - + @@ -148,7 +148,7 @@ - + junit.extensions,junit.framework,junit.runner,org.hamcrest.core,org.hamcrest,org.junit,org.junit.experimental.theories,org.junit.experimental.theories.internal,org.junit.function,org.junit.internal,org.junit.internal.builders,org.junit.internal.management,org.junit.internal.matchers,org.junit.internal.requests,org.junit.internal.runners,org.junit.internal.runners.model,org.junit.internal.runners.rules,org.junit.internal.runners.statements,org.junit.matchers,org.junit.rules,org.junit.runner,org.junit.runner.manipulation,org.junit.runner.notification,org.junit.runners,org.junit.runners.model,org.junit.runners.parameterized,org.junit.validator From e35ad093c7bd76a74193fe00bf1f144907eaf3d3440299c895c237a06ca93ef9 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 10 Jun 2022 10:51:04 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/junit?expand=0&rev=47 --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index e76295d..6f35bf1 100644 --- a/build.xml +++ b/build.xml @@ -148,7 +148,7 @@ - junit.extensions,junit.framework,junit.runner,org.hamcrest.core,org.hamcrest,org.junit,org.junit.experimental.theories,org.junit.experimental.theories.internal,org.junit.function,org.junit.internal,org.junit.internal.builders,org.junit.internal.management,org.junit.internal.matchers,org.junit.internal.requests,org.junit.internal.runners,org.junit.internal.runners.model,org.junit.internal.runners.rules,org.junit.internal.runners.statements,org.junit.matchers,org.junit.rules,org.junit.runner,org.junit.runner.manipulation,org.junit.runner.notification,org.junit.runners,org.junit.runners.model,org.junit.runners.parameterized,org.junit.validator +