Compare commits

..

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
eeaaba439a
!9 Enable test for build
From: @wk333 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
2023-10-08 01:13:50 +00:00
wk333
74a1ee3b11 Enable test for build 2023-10-07 17:09:55 +08:00
openeuler-ci-bot
56eaa985ff
!8 Update to 4.13.2
From: @wk333 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
2023-09-28 08:08:08 +00:00
wk333
3dabb0837a Update to 4.13.2 2023-09-27 10:31:20 +08:00
openeuler-ci-bot
3d846e7d82
!7 add yaml
From: @yahoohey 
Reviewed-by: @overweight 
Signed-off-by: @overweight
2022-02-23 01:22:53 +00:00
yahoohey
16466ba526 add junit.yaml. 2021-07-09 08:52:39 +00:00
openeuler-ci-bot
d15f9e0d48 !2 fix CVE-2020-15250
From: @wangxiao65
Reviewed-by: @wang_yue111,@small_leek,@myeuler
Signed-off-by: @small_leek,@myeuler
2021-02-20 11:01:45 +08:00
wangxiao65
cc8fa02dee fix CVE-2020-15250 2021-02-19 09:43:30 +08:00
openeuler-ci-bot
0ebefe51bb !1 package init
Merge pull request !1 from 快乐的一只小青蛙/br_pi
2020-02-27 11:14:06 +08:00
byeX012
4de22f5945 Package init 2020-02-14 17:06:47 +08:00
4 changed files with 206 additions and 0 deletions

View File

@ -0,0 +1,108 @@
From 85c780b61cd35b4544d2926393805e1699641f38 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
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<T extends Throwable> extends
return Throwables.getStacktrace(throwable);
}
- @Factory
public static <T extends Throwable> Matcher<T> isThrowable(
Matcher<T> throwableMatcher) {
return new StacktracePrintingMatcher<T>(throwableMatcher);
}
- @Factory
public static <T extends Exception> Matcher<T> isException(
Matcher<T> exceptionMatcher) {
return new StacktracePrintingMatcher<T>(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<T extends Throwable> extends
* @param matcher to apply to the cause of the outer exception
* @param <T> type of the outer exception
*/
- @Factory
public static <T extends Throwable> Matcher<T> hasCause(final Matcher<?> matcher) {
return new ThrowableCauseMatcher<T>(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<T extends Throwable> extends
matcher.describeMismatch(item.getMessage(), description);
}
- @Factory
public static <T extends Throwable> Matcher<T> hasMessage(final Matcher<String> matcher) {
return new ThrowableMessageMatcher<T>(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 <T> Matcher<Iterable<T>> everyItem(final Matcher<T> elementMatcher) {
+ public static <T> Matcher<Iterable<? extends T>> everyItem(final Matcher<T> 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<Iterable<Failure>> empty() {
+ private Matcher<Iterable<? extends Failure>> empty() {
return everyItem(nullValue(Failure.class));
}
}
--
2.25.2

94
junit.spec Normal file
View File

@ -0,0 +1,94 @@
Name: junit
Epoch: 1
Version: 4.13.2
Release: 2
Summary: A Java package for unit testing frameworks
License: EPL-1.0
URL: http://www.junit.org/
Source0: https://github.com/%{name}-team/%{name}/archive/r%{version}.tar.gz
Patch0000: 0001-Port-to-hamcrest-2.2.patch
BuildArch: noarch
BuildRequires: maven-local mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin)
BuildRequires: mvn(org.hamcrest:hamcrest-core)
BuildRequires: java-11-openjdk-devel
Requires: java-11-openjdk
Obsoletes: %{name}-demo < 4.12
%description
JUnit is a simple framework to write repeatable tests. It is an
instance of the xUnit architecture for unit testing frameworks.
%package help
Summary: Documents for junit
Provides: %{name}-manual = %{epoch}:%{version}-%{release}
Obsoletes: %{name}-manual < %{epoch}:%{version}-%{release}
Provides: %{name}-javadoc = %{epoch}:%{version}-%{release}
Obsoletes: %{name}-javadoc < %{epoch}:%{version}-%{release}
%description help
The junit-help package contains related documents.
%prep
%autosetup -n %{name}4-r%{version} -p1
find . -name "*.jar" -delete
find . -name "*.class" -delete
# InaccessibleBaseClassTest fails with Java 8
sed -i /InaccessibleBaseClassTest/d src/test/java/org/junit/tests/AllTests.java
%pom_remove_plugin :replacer
sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >src/main/java/junit/runner/Version.java
%pom_remove_plugin :animal-sniffer-maven-plugin
%pom_remove_plugin :maven-javadoc-plugin
%pom_xpath_inject pom:project "<packaging>bundle</packaging>"
%pom_xpath_inject pom:build/pom:plugins "
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>org.junit</Bundle-SymbolicName>
<Export-Package>{local-packages},!org.hamcrest*,*;x-internal:=true</Export-Package>
<_nouses>true</_nouses>
</instructions>
</configuration>
</plugin>"
%mvn_file : junit
%mvn_alias junit:junit junit:junit-dep
%build
#set openjdk11 for build
export JAVA_HOME=%{_jvmdir}/java-11-openjdk
%mvn_build -- -DjdkVersion=1.7 -P\!restrict-doclint
%install
%mvn_install
%files -f .mfiles
%doc LICENSE-junit.txt README.md
%files help -f .mfiles-javadoc
%doc doc/*
%changelog
* Mon Sep 25 2023 wangkai <13474090681@163.com> - 1:4.13.2-2
- Enable test for build
* Mon Sep 25 2023 wangkai <13474090681@163.com> - 1:4.13.2-1
- Update to 4.13.2
* Fri Feb 19 2021 wangxiao <wangxiao65@huawei.com> - 1:4.12-13
- Fix CVE-2020-15250
* Sun Jan 19 2020 Jiangping Hu <hujp1985@foxmail.com> - 1:4.12-12
- Package init

4
junit.yaml Normal file
View File

@ -0,0 +1,4 @@
version_control: github
src_repo: junit-team/junit4
tag_prefix: "^r"
separator: "."

BIN
r4.13.2.tar.gz Normal file

Binary file not shown.