rpms/easymock
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Port to hamcrest 2.1

Browse Source
This commit is contained in:
Marian Koncek 2019-08-29 15:42:46 +02:00
parent fa943ad03f
commit a3eda01c72
2 changed files with 77 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
0004-Port-to-hamcrest-2.1.patch Normal file
View File

@ -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

2
easymock.spec
View File

@ -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
@ -50,6 +51,7 @@ Javadoc for %{name}.
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%pom_remove_plugin :license-maven-plugin
%pom_remove_plugin :maven-enforcer-plugin