Compare commits

...

No commits in common. 'c9' and 'c8-stream-201801' have entirely different histories.

@ -1 +1 @@
01c88efb013098238432986d3db7d6be5050aa43 SOURCES/easymock-4.2.tar.gz 86782f0dd52cd37220f97c0a63926c60e5e73f3c SOURCES/easymock-3.5.tar.gz

2
.gitignore vendored

@ -1 +1 @@
SOURCES/easymock-4.2.tar.gz SOURCES/easymock-3.5.tar.gz

@ -1,75 +0,0 @@
From 5393d71f7bf9de06efd763c501486bf14413ab4a Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Thu, 29 Aug 2019 15:18:53 +0200
Subject: [PATCH] Port to hamcrest 2.1
---
.../tests2/EasyMockSupportClassTest.java | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java b/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java
index c5dd63b..b8be307 100644
--- a/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java
+++ b/core/src/test/java/org/easymock/tests2/EasyMockSupportClassTest.java
@@ -48,49 +48,49 @@ public class EasyMockSupportClassTest extends EasyMockSupport {
@Test
public void testCreateStrictControl() {
IMocksControl ctrl = createStrictControl();
- assertThat(ctrl.createMock(ToMock.class), is(ToMock.class));
+ assertThat(ctrl.createMock(ToMock.class), org.hamcrest.core.Is.isA(ToMock.class));
}
@Test
public void testCreateControl() {
IMocksControl ctrl = createControl();
- assertThat(ctrl.createMock(ToMock.class), is(ToMock.class));
+ assertThat(ctrl.createMock(ToMock.class), org.hamcrest.core.Is.isA(ToMock.class));
}
@Test
public void testCreateNiceControl() {
IMocksControl ctrl = createNiceControl();
- assertThat(ctrl.createMock(ToMock.class), is(ToMock.class));
+ assertThat(ctrl.createMock(ToMock.class), org.hamcrest.core.Is.isA(ToMock.class));
}
@Test
public void testCreateStrictMockClassOfT() {
- assertThat(createStrictMock(ToMock.class), is(ToMock.class));
+ assertThat(createStrictMock(ToMock.class), org.hamcrest.core.Is.isA(ToMock.class));
}
@Test
public void testCreateStrictMockStringClassOfT() {
- assertThat(createStrictMock("myMock", ToMock.class), is(ToMock.class));
+ assertThat(createStrictMock("myMock", ToMock.class), org.hamcrest.core.Is.isA(ToMock.class));
}
@Test
public void testCreateMockClassOfT() {
- assertThat(createMock(ToMock.class), is(ToMock.class));
+ assertThat(createMock(ToMock.class), org.hamcrest.core.Is.isA(ToMock.class));
}
@Test
public void testCreateMockStringClassOfT() {
- assertThat(createMock("myMock", ToMock.class), is(ToMock.class));
+ assertThat(createMock("myMock", ToMock.class), org.hamcrest.core.Is.isA(ToMock.class));
}
@Test
public void testCreateNiceMockClassOfT() {
- assertThat(createNiceMock(ToMock.class), is(ToMock.class));
+ assertThat(createNiceMock(ToMock.class), org.hamcrest.core.Is.isA(ToMock.class));
}
@Test
public void testCreateNiceMockStringClassOfT() {
- assertThat(createNiceMock("myMock", ToMock.class), is(ToMock.class));
+ assertThat(createNiceMock("myMock", ToMock.class), org.hamcrest.core.Is.isA(ToMock.class));
}
@Test
--
2.21.0

@ -9,7 +9,7 @@ wget "https://github.com/${name}/${name}/archive/${name}-${version}.tar.gz" -O "
rm -rf tarball-tmp rm -rf tarball-tmp
mkdir tarball-tmp mkdir tarball-tmp
pushd tarball-tmp cd tarball-tmp
tar xf "../${name}-${version}.orig.tar.gz" tar xf "../${name}-${version}.orig.tar.gz"
# CLEAN TARBALL # CLEAN TARBALL
@ -18,6 +18,6 @@ find -name '*.class' -delete
# Contains minified js of uncertain origin # Contains minified js of uncertain origin
rm -r */website rm -r */website
tar -czf "../${name}-${version}.tar.gz" * tar cf "../${name}-${version}.tar.gz" *
popd cd ..
rm -r tarball-tmp "${name}-${version}.orig.tar.gz" rm -r tarball-tmp "${name}-${version}.orig.tar.gz"

@ -1,8 +1,6 @@
%bcond_with bootstrap
Name: easymock Name: easymock
Version: 4.2 Version: 3.5
Release: 6%{?dist} Release: 4%{?dist}
Summary: Easy mock objects Summary: Easy mock objects
License: ASL 2.0 License: ASL 2.0
URL: http://www.easymock.org URL: http://www.easymock.org
@ -15,34 +13,27 @@ Source1: generate-tarball.sh
Patch1: 0001-Disable-android-support.patch Patch1: 0001-Disable-android-support.patch
Patch2: 0002-Unshade-cglib-and-asm.patch Patch2: 0002-Unshade-cglib-and-asm.patch
Patch3: 0003-Fix-OSGi-manifest.patch Patch3: 0003-Fix-OSGi-manifest.patch
Patch4: 0004-Port-to-hamcrest-2.1.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: maven-local BuildRequires: maven-local
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap
%else
BuildRequires: mvn(cglib:cglib) BuildRequires: mvn(cglib:cglib)
BuildRequires: mvn(junit:junit) BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin)
BuildRequires: mvn(org.apache.maven.surefire:surefire-junit-platform) BuildRequires: mvn(org.apache.maven.surefire:surefire-junit47)
BuildRequires: mvn(org.apache.maven.surefire:surefire-testng) BuildRequires: mvn(org.apache.maven.surefire:surefire-testng)
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
BuildRequires: mvn(org.junit.jupiter:junit-jupiter)
BuildRequires: mvn(org.junit.vintage:junit-vintage-engine)
BuildRequires: mvn(org.objenesis:objenesis) BuildRequires: mvn(org.objenesis:objenesis)
BuildRequires: mvn(org.ow2.asm:asm) BuildRequires: mvn(org.ow2.asm:asm)
BuildRequires: mvn(org.testng:testng) BuildRequires: mvn(org.testng:testng)
%endif
# xmvn-builddep misses this: # xmvn-builddep misses this:
%if %{without bootstrap}
BuildRequires: mvn(org.apache:apache-jar-resource-bundle) BuildRequires: mvn(org.apache:apache-jar-resource-bundle)
%endif
Obsoletes: %{name}3 < 3.4
Provides: %{name}3 = %{version}-%{release} Provides: %{name}3 = %{version}-%{release}
Obsoletes: %{name}2 < 2.5.2-10
%description %description
EasyMock provides Mock Objects for interfaces in JUnit tests by generating EasyMock provides Mock Objects for interfaces in JUnit tests by generating
@ -50,28 +41,22 @@ them on the fly using Java's proxy mechanism. Due to EasyMock's unique style
of recording expectations, most refactorings will not affect the Mock Objects. of recording expectations, most refactorings will not affect the Mock Objects.
So EasyMock is a perfect fit for Test-Driven Development. So EasyMock is a perfect fit for Test-Driven Development.
%package javadoc %package javadoc
Summary: Javadoc for %{name} Summary: Javadoc for %{name}
%description javadoc %description javadoc
Javadoc for %{name}. Javadoc for %{name}.
%prep %prep
%setup -q -n %{name}-%{name}-%{version} %setup -q -n %{name}-%{name}-%{version}
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
%pom_remove_plugin :license-maven-plugin
%pom_remove_plugin :maven-enforcer-plugin
%pom_remove_plugin :animal-sniffer-maven-plugin
%pom_remove_plugin :animal-sniffer-maven-plugin core
%pom_remove_plugin :maven-gpg-plugin test-testng %pom_remove_plugin :maven-license-plugin
%pom_remove_plugin :maven-gpg-plugin test-java8
%pom_remove_plugin :maven-gpg-plugin test-junit5
# remove android support # remove android support
rm core/src/main/java/org/easymock/internal/Android*.java rm core/src/main/java/org/easymock/internal/Android*.java
@ -99,76 +84,21 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java
# ssh not needed during our builds # ssh not needed during our builds
%pom_xpath_remove pom:extensions %pom_xpath_remove pom:extensions
# Force Surefire to run tests with JUnit, not with TestNG
%pom_xpath_inject "pom:plugin[pom:artifactId='maven-surefire-plugin']" \
"<configuration><testNGArtifactName>none:none</testNGArtifactName></configuration>" core
%build %build
%mvn_build %mvn_build
%install %install
%mvn_install %mvn_install
%files -f .mfiles %files -f .mfiles
%license core/LICENSE.txt %license core/LICENSE.txt
%files javadoc -f .mfiles-javadoc %files javadoc -f .mfiles-javadoc
%license core/LICENSE.txt %license core/LICENSE.txt
%changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 4.2-6
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2-5
- Rebuild to workaround DistroBaker issue
* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2-4
- Bootstrap Maven for CentOS Stream 9
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2-3
- Bootstrap build
- Non-bootstrap build
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Aug 31 2020 Fabio Valentini <decathorpe@gmail.com> - 4.2-1
- Update to version 4.2.
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 3.6-6
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Wed Mar 04 2020 Marian Koncek <mkoncek@redhat.com> - 4.2-1
- Update to upstream version 4.2
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.0.2-2
- Mass rebuild for javapackages-tools 201902
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jul 18 2019 Marian Koncek <mkoncek@redhat.com> - 4.0.2-1
- Update to upstream version 4.0.2
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.5-5
- Mass rebuild for javapackages-tools 201901
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Nov 30 2018 Mat Booth <mat.booth@redhat.com> - 3.6-2
- Rebuild to fix OSGi dependency on ASM 7
* Mon Oct 8 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.6-1
- Update to upstream version 3.6
%changelog
* Tue Jul 31 2018 Michael Simacek <msimacek@redhat.com> - 3.5-4 * Tue Jul 31 2018 Michael Simacek <msimacek@redhat.com> - 3.5-4
- Repack the tarball without binaries - Repack the tarball without binaries

Loading…
Cancel
Save