.easymock.metadata

@@ -1 +1 @@
-86782f0dd52cd37220f97c0a63926c60e5e73f3c SOURCES/easymock-3.5.tar.gz
+360dd15d7f8ef2cc4ca37de7495f272c348f2e2c SOURCES/easymock-4.0.2.tar.gz

.gitignore

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

SOURCES/0004-Port-to-hamcrest-2.1.patch

@@ -0,0 +1,75 @@
+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
+

SPECS/easymock.spec

@@ -1,6 +1,6 @@
 Name:           easymock
-Version:        3.5
+Version:        4.0.2
-Release:        4%{?dist}
+Release:        2%{?dist}
 Summary:        Easy mock objects
 License:        ASL 2.0
 URL:            http://www.easymock.org
@@ -13,6 +13,7 @@ Source1:        generate-tarball.sh
 Patch1:         0001-Disable-android-support.patch
 Patch2:         0002-Unshade-cglib-and-asm.patch
 Patch3:         0003-Fix-OSGi-manifest.patch
+Patch4:         0004-Port-to-hamcrest-2.1.patch
 
 BuildArch:      noarch
 
@@ -30,10 +31,7 @@ BuildRequires:  mvn(org.testng:testng)
 # xmvn-builddep misses this:
 BuildRequires:  mvn(org.apache:apache-jar-resource-bundle)
 
-Obsoletes:      %{name}3 < 3.4
 Provides:       %{name}3 = %{version}-%{release}
-Obsoletes:      %{name}2 < 2.5.2-10
-
 
 %description
 EasyMock provides Mock Objects for interfaces in JUnit tests by generating
@@ -41,22 +39,24 @@ 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.
 So EasyMock is a perfect fit for Test-Driven Development.
 
-
 %package javadoc
 Summary:        Javadoc for %{name}
 
 %description javadoc
 Javadoc for %{name}.
 
-
 %prep
 %setup -q -n %{name}-%{name}-%{version}
 
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
-%pom_remove_plugin :maven-license-plugin
+%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
 
 # remove android support
 rm core/src/main/java/org/easymock/internal/Android*.java
@@ -90,15 +90,22 @@ rm core/src/test/java/org/easymock/tests2/ClassExtensionHelperTest.java
 %install
 %mvn_install
 
-
 %files -f .mfiles
 %license core/LICENSE.txt
 
 %files javadoc -f .mfiles-javadoc
 %license core/LICENSE.txt
 
-
 %changelog
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.0.2-2
+- Mass rebuild for javapackages-tools 201902
+
+* 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
+
 * Tue Jul 31 2018 Michael Simacek <msimacek@redhat.com> - 3.5-4
 - Repack the tarball without binaries