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

Fixed building with new JUnit

Browse Source
This commit is contained in:
Tomas Radej 2012-02-21 16:36:07 +01:00
parent 5832ed5358
commit 138fd2a934
3 changed files with 418 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
easymock-removed-alltests.patch Normal file
View File

@ -0,0 +1,65 @@
diff --git a/src/org/easymock/tests/AllTests.java b/src/org/easymock/tests/AllTests.java
deleted file mode 100644
index b0b5d96..0000000
--- a/src/org/easymock/tests/AllTests.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2001-2005 OFFIS. This program is made available under the terms of
- * the MIT License.
- */
-package org.easymock.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests {
-
- public static void main(String[] args) {
- junit.swingui.TestRunner.run(AllTests.class);
- }
-
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.easymock.tests");
- suite.addTestSuite(ArgumentsMatcherTest.class);
- suite.addTestSuite(ArrayMatcherTest.class);
- suite.addTestSuite(DefaultMatcherTest.class);
- suite.addTestSuite(EqualsMatcherTest.class);
- suite.addTestSuite(ExpectedMethodCallTest.class);
- suite.addTestSuite(LegacyBehaviorTests.class);
- suite.addTestSuite(MatchableArgumentsTest.class);
- suite.addTestSuite(MethodCallTest.class);
- suite.addTestSuite(MockNameTest.class);
- suite.addTestSuite(NiceMockControlTest.class);
- suite.addTestSuite(NiceMockControlLongCompatibleReturnValueTest.class);
- suite.addTestSuite(ObjectMethodsTest.class);
- suite.addTestSuite(RecordStateInvalidDefaultReturnValueTest.class);
- suite.addTestSuite(RecordStateInvalidDefaultThrowableTest.class);
- suite.addTestSuite(RecordStateInvalidMatcherTest.class);
- suite.addTestSuite(RecordStateInvalidRangeTest.class);
- suite.addTestSuite(RecordStateInvalidReturnValueTest.class);
- suite.addTestSuite(RecordStateInvalidStateChangeTest.class);
- suite.addTestSuite(RecordStateInvalidThrowableTest.class);
- suite.addTestSuite(RecordStateInvalidUsageTest.class);
- suite.addTestSuite(RecordStateMethodCallMissingTest.class);
- suite.addTestSuite(ReplayStateInvalidUsageTest.class);
- suite.addTestSuite(StacktraceTest.class);
- suite.addTestSuite(UsageCallCountTest.class);
- suite.addTestSuite(UsageDefaultReturnValueTest.class);
- suite.addTestSuite(UsageExpectAndDefaultReturnTest.class);
- suite.addTestSuite(UsageExpectAndDefaultThrowTest.class);
- suite.addTestSuite(UsageExpectAndReturnTest.class);
- suite.addTestSuite(UsageExpectAndThrowTest.class);
- suite.addTestSuite(UsageFloatingPointReturnValueTest.class);
- suite.addTestSuite(UsageLongCompatibleReturnValueTest.class);
- suite.addTestSuite(UsageOverloadedDefaultValueTest.class);
- suite.addTestSuite(UsageOverloadedMethodTest.class);
- suite.addTestSuite(UsageUnorderedTest.class);
- suite.addTestSuite(UsageRangeTest.class);
- suite.addTestSuite(UsageStrictMockTest.class);
- suite.addTestSuite(UsageTest.class);
- suite.addTestSuite(UsageThrowableTest.class);
- suite.addTestSuite(UsageVerifyTest.class);
- return suite;
- }
-}

345
easymock-removed-test.patch Normal file
View File

@ -0,0 +1,345 @@
diff --git a/src/org/easymock/tests/ReplayStateInvalidUsageTest.java b/src/org/easymock/tests/ReplayStateInvalidUsageTest.java
deleted file mode 100644
index 06e0ac1..0000000
--- a/src/org/easymock/tests/ReplayStateInvalidUsageTest.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * Copyright (c) 2001-2005 OFFIS. This program is made available under the terms of
- * the MIT License.
- */
-package org.easymock.tests;
-
-import junit.extensions.ExceptionTestCase;
-
-import org.easymock.MockControl;
-
-public class ReplayStateInvalidUsageTest extends ExceptionTestCase {
-
- private MockControl control;
-
- private Exception exception;
-
- public ReplayStateInvalidUsageTest(String name) {
- super(name, IllegalStateException.class);
- }
-
- protected void setUp() {
- exception = new Exception();
- control = MockControl.createControl(IMethods.class);
- control.replay();
- }
-
- public void testExpectAndThrowObjectWithMinMax() {
- control.expectAndThrow("", exception, 1, 2);
- }
-
- public void testExpectAndThrowDoubleWithMinMax() {
- control.expectAndThrow(0.0d, exception, 1, 2);
- }
-
- public void testExpectAndThrowFloatWithMinMax() {
- control.expectAndThrow(0.0f, exception, 1, 2);
- }
-
- public void testExpectAndThrowLongWithMinMax() {
- control.expectAndThrow(0, exception, 1, 2);
- }
-
- public void testExpectAndThrowBooleanWithMinMax() {
- control.expectAndThrow(false, exception, 1, 2);
- }
-
- public void testExpectAndThrowObjectWithCount() {
- control.expectAndThrow("", exception, 1);
- }
-
- public void testExpectAndThrowDoubleWithCount() {
- control.expectAndThrow(0.0d, exception, 1);
- }
-
- public void testExpectAndThrowFloatWithCount() {
- control.expectAndThrow(0.0f, exception, 1);
- }
-
- public void testExpectAndThrowLongWithCount() {
- control.expectAndThrow(0, exception, 1);
- }
-
- public void testExpectAndThrowBooleanWithCount() {
- control.expectAndThrow(false, exception, 1);
- }
-
- public void testExpectAndThrowObjectWithRange() {
- control.expectAndThrow("", exception, MockControl.ONE);
- }
-
- public void testExpectAndThrowDoubleWithRange() {
- control.expectAndThrow(0.0d, exception, MockControl.ONE);
- }
-
- public void testExpectAndThrowFloatWithRange() {
- control.expectAndThrow(0.0f, exception, MockControl.ONE);
- }
-
- public void testExpectAndThrowLongWithRange() {
- control.expectAndThrow(0, exception, MockControl.ONE);
- }
-
- public void testExpectAndThrowBooleanWithRange() {
- control.expectAndThrow(false, exception, MockControl.ONE);
- }
-
- public void testExpectAndThrowObject() {
- control.expectAndThrow("", exception);
- }
-
- public void testExpectAndThrowDouble() {
- control.expectAndThrow(0.0d, exception);
- }
-
- public void testExpectAndThrowFloat() {
- control.expectAndThrow(0.0f, exception);
- }
-
- public void testExpectAndThrowLong() {
- control.expectAndThrow(0, exception);
- }
-
- public void testExpectAndThrowBoolean() {
- control.expectAndThrow(false, exception);
- }
-
- public void testExpectAndReturnObjectWithMinMax() {
- control.expectAndReturn("", "", 1, 2);
- }
-
- public void testExpectAndReturnDoubleWithMinMax() {
- control.expectAndReturn(0.0d, 0.0d, 1, 2);
- }
-
- public void testExpectAndReturnFloatWithMinMax() {
- control.expectAndReturn(0.0f, 0.0f, 1, 2);
- }
-
- public void testExpectAndReturnLongWithMinMax() {
- control.expectAndReturn(0, 0, 1, 2);
- }
-
- public void testExpectAndReturnBooleanWithMinMax() {
- control.expectAndReturn(false, false, 1, 2);
- }
-
- public void testExpectAndReturnObjectWithCount() {
- control.expectAndReturn("", "", 1);
- }
-
- public void testExpectAndReturnDoubleWithCount() {
- control.expectAndReturn(0.0d, 0.0d, 1);
- }
-
- public void testExpectAndReturnFloatWithCount() {
- control.expectAndReturn(0.0f, 0.0f, 1);
- }
-
- public void testExpectAndReturnLongWithCount() {
- control.expectAndReturn(0, 0, 1);
- }
-
- public void testExpectAndReturnBooleanWithCount() {
- control.expectAndReturn(false, false, 1);
- }
-
- public void testExpectAndReturnObjectWithRange() {
- control.expectAndReturn("", "", MockControl.ONE);
- }
-
- public void testExpectAndReturnDoubleWithRange() {
- control.expectAndReturn(0.0d, 0.0d, MockControl.ONE);
- }
-
- public void testExpectAndReturnFloatWithRange() {
- control.expectAndReturn(0.0f, 0.0f, MockControl.ONE);
- }
-
- public void testExpectAndReturnLongWithRange() {
- control.expectAndReturn(0, 0, MockControl.ONE);
- }
-
- public void testExpectAndReturnBooleanWithRange() {
- control.expectAndReturn(false, false, MockControl.ONE);
- }
-
- public void testExpectAndReturnObject() {
- control.expectAndReturn("", "");
- }
-
- public void testExpectAndReturnDouble() {
- control.expectAndReturn(0.0d, 0.0d);
- }
-
- public void testExpectAndReturnFloat() {
- control.expectAndReturn(0.0f, 0.0f);
- }
-
- public void testExpectAndReturnLong() {
- control.expectAndReturn(0, 0);
- }
-
- public void testExpectAndReturnBoolean() {
- control.expectAndReturn(false, false);
- }
-
- public void testSetDefaultMatcher() {
- control.setDefaultMatcher(MockControl.ARRAY_MATCHER);
- }
-
- public void testSetReturnValueObjectWithMinMax() {
- control.setReturnValue("", 1, 2);
- }
-
- public void testSetReturnValueDoubleWithMinMax() {
- control.setReturnValue(0.0d, 1, 2);
- }
-
- public void testSetReturnValueFloatWithMinMax() {
- control.setReturnValue(0.0f, 1, 2);
- }
-
- public void testSetReturnValueLongWithMinMax() {
- control.setReturnValue(0, 1, 2);
- }
-
- public void testSetReturnValueBooleanWithMinMax() {
- control.setReturnValue(false, 1, 2);
- }
-
- public void testSetThrowableWithMinMax() {
- control.setThrowable(exception, 1, 2);
- }
-
- public void testSetVoidCallableWithMinMax() {
- control.setVoidCallable(1, 2);
- }
-
- public void testSetMatcher() {
- control.setMatcher(MockControl.ARRAY_MATCHER);
- }
-
- public void testSetDefaultReturnValueObject() {
- control.setDefaultReturnValue("");
- }
-
- public void testSetDefaultReturnValueDouble() {
- control.setDefaultReturnValue(0.0d);
- }
-
- public void testSetDefaultReturnValueFloat() {
- control.setDefaultReturnValue(0.0f);
- }
-
- public void testSetDefaultReturnValueLong() {
- control.setDefaultReturnValue(0);
- }
-
- public void testSetDefaultReturnValueBoolean() {
- control.setDefaultReturnValue(false);
- }
-
- public void testSetDefaultThrowable() {
- control.setDefaultThrowable(exception);
- }
-
- public void testSetDefaultVoidCallable() {
- control.setDefaultVoidCallable();
- }
-
- public void testSetReturnValueObjectWithRange() {
- control.setReturnValue("", MockControl.ONE);
- }
-
- public void testSetReturnValueLongWithRange() {
- control.setReturnValue(0, MockControl.ONE);
- }
-
- public void testSetReturnValueFloatWithRange() {
- control.setReturnValue(0.0f, MockControl.ONE);
- }
-
- public void testSetReturnValueDoubleWithRange() {
- control.setReturnValue(0.0d, MockControl.ONE);
- }
-
- public void testSetReturnValueBooleanWithRange() {
- control.setReturnValue(false, MockControl.ONE);
- }
-
- public void testSetThrowableWithRange() {
- control.setThrowable(exception, MockControl.ONE);
- }
-
- public void testSetVoidCallableWithRange() {
- control.setVoidCallable(MockControl.ONE);
- }
-
- public void testSetReturnValueObjectWithCount() {
- control.setReturnValue("", 1);
- }
-
- public void testSetReturnValueLongWithCount() {
- control.setReturnValue(0, 1);
- }
-
- public void testSetReturnValueFloatWithCount() {
- control.setReturnValue(0.0f, 1);
- }
-
- public void testSetReturnValueDoubleWithCount() {
- control.setReturnValue(0.0d, 1);
- }
-
- public void testSetReturnValueBooleanWithCount() {
- control.setReturnValue(false, 1);
- }
-
- public void testSetThrowableWithCount() {
- control.setThrowable(exception, 1);
- }
-
- public void testSetVoidCallableWithCount() {
- control.setVoidCallable(1);
- }
-
- public void testSetReturnValueObject() {
- control.setReturnValue("");
- }
-
- public void testSetReturnValueDouble() {
- control.setReturnValue(0.0d);
- }
-
- public void testSetReturnValueFloat() {
- control.setReturnValue(0.0f);
- }
-
- public void testSetReturnValueLong() {
- control.setReturnValue(0);
- }
-
- public void testSetReturnValueBoolean() {
- control.setReturnValue(false);
- }
-
- public void testSetThrowable() {
- control.setThrowable(exception);
- }
-
- public void testSetVoidCallable() {
- control.setVoidCallable();
- }
-
- public void testReplay() {
- control.replay();
- }
-}
\ No newline at end of file

9
easymock.spec
View File

@ -30,7 +30,7 @@
Name: easymock Name: easymock
Version: 1.2 Version: 1.2
Release: 14%{?dist} Release: 15%{?dist}
Epoch: 0 Epoch: 0
Summary: Easy mock objects Summary: Easy mock objects
Group: Development/Libraries Group: Development/Libraries
@ -43,6 +43,8 @@ Source0: easymock-1.2-src.tar.gz
Source1: http://repo1.maven.org/maven2/easymock/easymock/1.2_Java1.5/easymock-1.2_Java1.5.pom Source1: http://repo1.maven.org/maven2/easymock/easymock/1.2_Java1.5/easymock-1.2_Java1.5.pom
Source2: easymock-component-info.xml Source2: easymock-component-info.xml
Patch0: easymock-1.2-build_xml.patch Patch0: easymock-1.2-build_xml.patch
Patch1: %{name}-removed-test.patch
Patch2: %{name}-removed-alltests.patch
Requires(post): jpackage-utils >= 1.7.2 Requires(post): jpackage-utils >= 1.7.2
Requires(postun): jpackage-utils >= 1.7.2 Requires(postun): jpackage-utils >= 1.7.2
BuildRequires: jpackage-utils >= 0:1.6 BuildRequires: jpackage-utils >= 0:1.6
@ -68,6 +70,8 @@ Javadoc for %{name}.
%prep %prep
%setup -q -n %{name} %setup -q -n %{name}
%patch0 -p0 %patch0 -p0
%patch1 -p1
%patch2 -p1
mkdir lib mkdir lib
pushd lib pushd lib
ln -sf $(build-classpath junit) . ln -sf $(build-classpath junit) .
@ -124,6 +128,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%{_javadocdir}/%{name} %{_javadocdir}/%{name}
%changelog %changelog
* Tue Feb 21 2012 Tomas Radej <tradej@redhat.com> - 0:1.2-15
- Removed test
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2-14 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild