[jmock2] branch master updated (0ce7816 -> 79ad023)
Miguel Landaeta
nomadium-guest at alioth.debian.org
Sun Sep 29 22:55:16 UTC 2013
This is an automated email from the git hooks/post-receive script.
nomadium-guest pushed a change to branch master
in repository jmock2.
from 0ce7816 Changelog update
adds 0c364a8 Imported Upstream version 2.7~snapshot+201309170925-gitd7fe69b5+dfsg
new f123236 Merge branch 'upstream'
new 2725ea0 Add fix for #717122
new a8a1c3c Prepare 2.7~snapshot+201309170925-gitd7fe69b5+dfsg-1 release
new 79ad023 Add 2.7-SNAPSHOT hacks
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
.classpath | 13 -
.cvsignore | 5 -
.gitignore | 7 +
.project | 17 --
.settings/org.eclipse.jdt.core.prefs | 299 --------------------
.settings/org.eclipse.jdt.ui.prefs | 3 -
.settings/org.eclipse.ltk.core.refactoring.prefs | 3 -
.settings/org.eclipse.wst.validation.prefs | 6 -
LICENSE.txt | 2 +-
README.DEVELOPMENT | 6 +-
TODO | 12 -
build.xml | 26 +-
debian/changelog | 19 +-
debian/control | 6 +-
debian/maven.rules | 10 +-
debian/patches/00ignore.pc | 10 +-
debian/patches/03runtestsagainstsyslibs | 9 +-
debian/patches/04javadoc | 16 +-
debian/patches/06donthaltonjunitfailure | 20 ++
debian/patches/07missinghamcrestjar | 35 +++
debian/patches/08mavenpoms | 160 +++++++++++
debian/patches/series | 6 +-
debian/rules | 17 +-
.../org/jmock/example/announcer/Announcer.java | 0
.../jmock/example/announcer/AnnouncerTests.java | 0
.../gettingstarted/GettingStartedJUnit3.java | 24 ++
.../GettingStartedJUnit3Mockomatic.java | 25 ++
.../gettingstarted/GettingStartedJUnit4.java | 32 +++
.../GettingStartedJUnit4Mockomatic.java | 32 +++
.../gettingstarted/GettingStartedJUnit4Rule.java | 30 ++
.../GettingStartedJUnit4RuleMockomatic.java | 32 +++
.../jmock/example/gettingstarted/Publisher.java | 18 ++
.../jmock/example/gettingstarted/Subscriber.java | 5 +
{test => example}/org/jmock/example/qcon/DJ.java | 0
.../org/jmock/example/qcon/DJTests.java | 0
.../org/jmock/example/qcon/LocationAware.java | 0
.../org/jmock/example/qcon/MediaControl.java | 0
.../org/jmock/example/qcon/MediaTracker.java | 0
.../org/jmock/example/qcon/Playlist.java | 0
.../org/jmock/example/sniper/Auction.java | 0
.../org/jmock/example/sniper/AuctionException.java | 0
.../org/jmock/example/sniper/AuctionListener.java | 0
.../org/jmock/example/sniper/AuctionSniper.java | 0
.../example/sniper/AuctionSniperListener.java | 0
.../jmock/example/sniper/AuctionSniperTests.java | 0
.../org/jmock/example/sniper/Money.java | 0
.../org/jmock/example/timedcache/Clock.java | 0
.../org/jmock/example/timedcache/ObjectLoader.java | 0
.../org/jmock/example/timedcache/ReloadPolicy.java | 0
.../org/jmock/example/timedcache/TimedCache.java | 0
.../jmock/example/timedcache/TimedCacheTests.java | 0
javadoc-lists/cglib/package-list | 8 +
javadoc-lists/javase6/package-list | 203 +++++++++++++
javadoc-lists/junit-4.11/package-list | 18 ++
jester-build.sh | 5 -
jester.sh | 15 -
maven/RELEASE.txt | 17 --
maven/jmock-cglib/pom.xml | 21 --
maven/jmock-core/pom.xml | 13 -
maven/jmock-junit3/pom.xml | 25 --
maven/jmock-junit4/pom.xml | 31 --
maven/jmock-legacy/pom.xml | 30 --
maven/jmock-script/pom.xml | 23 --
maven/jmock/pom.xml | 25 --
maven/pom.xml | 179 ------------
maven/src/config/settings.xml | 10 -
maven/src/script/deploy-file.sh | 21 --
maven/src/script/download-jars.sh | 23 --
maven/src/script/install-file.sh | 19 --
src/org/jmock/Expectations.java | 170 +++++------
src/org/jmock/Mockery.java | 120 ++++----
src/org/jmock/api/Expectation.java | 4 +
src/org/jmock/api/ExpectationError.java | 64 ++---
src/org/jmock/api/ThreadingPolicy.java | 5 +
src/org/jmock/api/package.html | 2 +-
src/org/jmock/auto/Auto.java | 12 +
src/org/jmock/auto/Mock.java | 13 +
src/org/jmock/auto/internal/Mockomatic.java | 77 +++++
.../integration/junit3/MockObjectTestCase.java | 27 +-
src/org/jmock/integration/junit4/JMock.java | 95 ++++---
.../jmock/integration/junit4/JUnitRuleMockery.java | 77 +++++
src/org/jmock/integration/junit4/package.html | 19 ++
src/org/jmock/internal/AllDeclaredFields.java | 17 ++
src/org/jmock/internal/InvocationDispatcher.java | 40 ++-
src/org/jmock/internal/InvocationExpectation.java | 86 +++++-
.../internal/InvocationExpectationBuilder.java | 13 +-
src/org/jmock/internal/NamedSequence.java | 5 +
src/org/jmock/internal/ParametersMatcher.java | 12 +
.../jmock/internal/ReturnDefaultValueAction.java | 135 ++++++---
src/org/jmock/internal/SingleThreadedPolicy.java | 37 +++
src/org/jmock/internal/StateMachine.java | 6 +
.../internal/matcher/AllParametersMatcher.java | 79 ++++++
src/org/jmock/internal/matcher/MethodMatcher.java | 6 +
.../jmock/internal/matcher/MethodNameMatcher.java | 6 +
src/org/jmock/lib/CurrentStateMatcher.java | 48 ++++
src/org/jmock/lib/action/ActionSequence.java | 12 +-
src/org/jmock/lib/concurrent/Blitzer.java | 77 +++++
.../lib/concurrent/DeterministicScheduler.java | 8 +-
src/org/jmock/lib/concurrent/Synchroniser.java | 95 +++++++
.../lib/concurrent/internal/FixedTimeout.java | 31 ++
.../lib/concurrent/internal/InfiniteTimeout.java | 14 +
src/org/jmock/lib/concurrent/internal/Timeout.java | 11 +
src/org/jmock/lib/legacy/ClassImposteriser.java | 57 ++--
.../jmock/syntax/ArgumentConstraintPhrases.java | 7 -
src/org/jmock/syntax/CardinalityClause.java | 4 +-
src/org/jmock/syntax/WithClause.java | 16 ++
tag.sh | 18 --
.../CascadedFailuresAcceptanceTests.java | 18 +-
.../acceptance/ErrorMessagesAcceptanceTests.java | 47 ++-
.../ExpectationCountsAcceptanceTests.java | 1 -
.../HamcrestTypeSafetyAcceptanceTests.java | 4 +-
.../InvocationDescriptionAcceptanceTests.java | 78 +++++
test/org/jmock/test/acceptance/MockedType.java | 3 +-
.../MockeryFinalizationAcceptanceTests.java | 125 ++++++++
... NewStyleParameterMatchingAcceptanceTests.java} | 56 ++--
.../acceptance/NullAndNonNullAcceptanceTests.java | 16 +-
.../ParameterMatchingAcceptanceTests.java | 19 +-
.../PrimitiveParameterTypesAcceptanceTests.java | 38 ++-
.../test/acceptance/RecordingAcceptanceTests.java | 48 +++-
.../WarnAboutMultipleThreadsAcceptanceTests.java | 64 +++++
.../junit4/FailureRecordingRunListener.java | 46 +++
.../acceptance/junit4/JUnit4TestRunnerTests.java | 79 ++----
.../junit4/JUnit4WithRulesTestRunnerTests.java | 42 +++
.../test/unit/auto/internal/MockomaticTests.java | 86 ++++++
.../integration/junit3/VerifyingTestCaseTests.java | 24 +-
.../test/unit/internal/AllDeclaredFieldsTests.java | 58 ++++
...ctTest.java => ChangeStateSideEffectTests.java} | 2 +-
.../unit/internal/InvocationExpectationTests.java | 7 +-
.../internal/ReturnDefaultCollectionTests.java | 91 ++++++
.../internal/ReturnDefaultValueActionTests.java | 176 +++++-------
.../test/unit/internal/StateMachineTests.java | 2 +
.../test/unit/lib/CurrentStateMatcherTests.java | 60 ++++
.../IdentityExpectationErrorTranslatorTests.java | 2 +-
.../test/unit/lib/concurrent/BlitzerTests.java | 65 +++++
.../unit/lib/concurrent/SynchroniserTests.java | 172 +++++++++++
.../unit/lib/legacy/ClassImposteriserTests.java | 76 +++--
.../test/unit/lib/script/ScriptedActionTests.java | 4 +-
test/org/jmock/test/unit/support/AssertThat.java | 5 +-
.../org/jmock/test/unit/support/MethodFactory.java | 16 +-
test/org/jmock/test/unit/support/MockAction.java | 3 +-
.../jmock/test/unit/support/MockExpectation.java | 22 +-
.../test/unit/support/StringContainsInOrder.java | 47 ---
.../SyntheticEmptyInterfaceClassLoader.java | 16 +-
.../acceptance/junit4}/BaseClassWithMockery.java | 2 +-
...edJUnit4TestThatDoesNotSatisfyExpectations.java | 2 +-
.../JUnit4TestThatAutoInstantiatesMocks.java | 23 ++
.../junit4/JUnit4TestThatCreatesNoMockery.java | 13 +
.../junit4/JUnit4TestThatCreatesTwoMockeries.java | 19 ++
.../JUnit4TestThatDoesNotCreateAMockery.java | 4 +-
.../JUnit4TestThatDoesNotSatisfyExpectations.java | 2 +-
.../JUnit4TestThatDoesSatisfyExpectations.java | 2 +-
.../JUnit4TestThatThrowsExpectedException.java | 2 +-
.../JUnit4TestWithNonPublicBeforeMethod.java | 8 +-
.../acceptance/junit4/JUnit4WithRulesExamples.java | 108 +++++++
.../integration/junit3/FailingExampleTestCase.java | 27 ++
155 files changed, 3373 insertions(+), 1573 deletions(-)
delete mode 100644 .classpath
delete mode 100644 .cvsignore
create mode 100644 .gitignore
delete mode 100644 .project
delete mode 100644 .settings/org.eclipse.jdt.core.prefs
delete mode 100644 .settings/org.eclipse.jdt.ui.prefs
delete mode 100644 .settings/org.eclipse.ltk.core.refactoring.prefs
delete mode 100644 .settings/org.eclipse.wst.validation.prefs
delete mode 100644 TODO
create mode 100644 debian/patches/06donthaltonjunitfailure
create mode 100644 debian/patches/07missinghamcrestjar
create mode 100644 debian/patches/08mavenpoms
rename {test => example}/org/jmock/example/announcer/Announcer.java (100%)
rename {test => example}/org/jmock/example/announcer/AnnouncerTests.java (100%)
create mode 100644 example/org/jmock/example/gettingstarted/GettingStartedJUnit3.java
create mode 100644 example/org/jmock/example/gettingstarted/GettingStartedJUnit3Mockomatic.java
create mode 100644 example/org/jmock/example/gettingstarted/GettingStartedJUnit4.java
create mode 100644 example/org/jmock/example/gettingstarted/GettingStartedJUnit4Mockomatic.java
create mode 100644 example/org/jmock/example/gettingstarted/GettingStartedJUnit4Rule.java
create mode 100644 example/org/jmock/example/gettingstarted/GettingStartedJUnit4RuleMockomatic.java
create mode 100644 example/org/jmock/example/gettingstarted/Publisher.java
create mode 100644 example/org/jmock/example/gettingstarted/Subscriber.java
rename {test => example}/org/jmock/example/qcon/DJ.java (100%)
rename {test => example}/org/jmock/example/qcon/DJTests.java (100%)
rename {test => example}/org/jmock/example/qcon/LocationAware.java (100%)
rename {test => example}/org/jmock/example/qcon/MediaControl.java (100%)
rename {test => example}/org/jmock/example/qcon/MediaTracker.java (100%)
rename {test => example}/org/jmock/example/qcon/Playlist.java (100%)
rename {test => example}/org/jmock/example/sniper/Auction.java (100%)
rename {test => example}/org/jmock/example/sniper/AuctionException.java (100%)
rename {test => example}/org/jmock/example/sniper/AuctionListener.java (100%)
rename {test => example}/org/jmock/example/sniper/AuctionSniper.java (100%)
rename {test => example}/org/jmock/example/sniper/AuctionSniperListener.java (100%)
rename {test => example}/org/jmock/example/sniper/AuctionSniperTests.java (100%)
rename {test => example}/org/jmock/example/sniper/Money.java (100%)
rename {test => example}/org/jmock/example/timedcache/Clock.java (100%)
rename {test => example}/org/jmock/example/timedcache/ObjectLoader.java (100%)
rename {test => example}/org/jmock/example/timedcache/ReloadPolicy.java (100%)
rename {test => example}/org/jmock/example/timedcache/TimedCache.java (100%)
rename {test => example}/org/jmock/example/timedcache/TimedCacheTests.java (100%)
create mode 100644 javadoc-lists/cglib/package-list
create mode 100644 javadoc-lists/javase6/package-list
create mode 100644 javadoc-lists/junit-4.11/package-list
delete mode 100755 jester-build.sh
delete mode 100755 jester.sh
delete mode 100644 maven/RELEASE.txt
delete mode 100644 maven/jmock-cglib/pom.xml
delete mode 100644 maven/jmock-core/pom.xml
delete mode 100644 maven/jmock-junit3/pom.xml
delete mode 100644 maven/jmock-junit4/pom.xml
delete mode 100644 maven/jmock-legacy/pom.xml
delete mode 100644 maven/jmock-script/pom.xml
delete mode 100644 maven/jmock/pom.xml
delete mode 100644 maven/pom.xml
delete mode 100644 maven/src/config/settings.xml
delete mode 100755 maven/src/script/deploy-file.sh
delete mode 100755 maven/src/script/download-jars.sh
delete mode 100755 maven/src/script/install-file.sh
create mode 100644 src/org/jmock/api/ThreadingPolicy.java
create mode 100644 src/org/jmock/auto/Auto.java
create mode 100644 src/org/jmock/auto/Mock.java
create mode 100644 src/org/jmock/auto/internal/Mockomatic.java
create mode 100644 src/org/jmock/integration/junit4/JUnitRuleMockery.java
create mode 100644 src/org/jmock/internal/AllDeclaredFields.java
create mode 100644 src/org/jmock/internal/ParametersMatcher.java
create mode 100644 src/org/jmock/internal/SingleThreadedPolicy.java
create mode 100644 src/org/jmock/internal/matcher/AllParametersMatcher.java
create mode 100644 src/org/jmock/lib/CurrentStateMatcher.java
create mode 100644 src/org/jmock/lib/concurrent/Blitzer.java
create mode 100644 src/org/jmock/lib/concurrent/Synchroniser.java
create mode 100644 src/org/jmock/lib/concurrent/internal/FixedTimeout.java
create mode 100644 src/org/jmock/lib/concurrent/internal/InfiniteTimeout.java
create mode 100644 src/org/jmock/lib/concurrent/internal/Timeout.java
create mode 100644 src/org/jmock/syntax/WithClause.java
delete mode 100755 tag.sh
create mode 100644 test/org/jmock/test/acceptance/InvocationDescriptionAcceptanceTests.java
create mode 100644 test/org/jmock/test/acceptance/MockeryFinalizationAcceptanceTests.java
copy test/org/jmock/test/acceptance/{ParameterMatchingAcceptanceTests.java => NewStyleParameterMatchingAcceptanceTests.java} (64%)
create mode 100644 test/org/jmock/test/acceptance/WarnAboutMultipleThreadsAcceptanceTests.java
create mode 100644 test/org/jmock/test/acceptance/junit4/FailureRecordingRunListener.java
create mode 100644 test/org/jmock/test/acceptance/junit4/JUnit4WithRulesTestRunnerTests.java
create mode 100644 test/org/jmock/test/unit/auto/internal/MockomaticTests.java
create mode 100644 test/org/jmock/test/unit/internal/AllDeclaredFieldsTests.java
rename test/org/jmock/test/unit/internal/{ChangeStateSideEffectTest.java => ChangeStateSideEffectTests.java} (95%)
create mode 100644 test/org/jmock/test/unit/internal/ReturnDefaultCollectionTests.java
create mode 100644 test/org/jmock/test/unit/lib/CurrentStateMatcherTests.java
create mode 100644 test/org/jmock/test/unit/lib/concurrent/BlitzerTests.java
create mode 100644 test/org/jmock/test/unit/lib/concurrent/SynchroniserTests.java
delete mode 100644 test/org/jmock/test/unit/support/StringContainsInOrder.java
rename {test/org/jmock/test/acceptance/junit4/testdata => testdata-testclasses/testdata/jmock/acceptance/junit4}/BaseClassWithMockery.java (84%)
rename {test/org/jmock/test/acceptance/junit4/testdata => testdata-testclasses/testdata/jmock/acceptance/junit4}/DerivedJUnit4TestThatDoesNotSatisfyExpectations.java (89%)
create mode 100644 testdata-testclasses/testdata/jmock/acceptance/junit4/JUnit4TestThatAutoInstantiatesMocks.java
create mode 100644 testdata-testclasses/testdata/jmock/acceptance/junit4/JUnit4TestThatCreatesNoMockery.java
create mode 100644 testdata-testclasses/testdata/jmock/acceptance/junit4/JUnit4TestThatCreatesTwoMockeries.java
rename {test/org/jmock/test/acceptance/junit4/testdata => testdata-testclasses/testdata/jmock/acceptance/junit4}/JUnit4TestThatDoesNotCreateAMockery.java (73%)
rename {test/org/jmock/test/acceptance/junit4/testdata => testdata-testclasses/testdata/jmock/acceptance/junit4}/JUnit4TestThatDoesNotSatisfyExpectations.java (92%)
rename {test/org/jmock/test/acceptance/junit4/testdata => testdata-testclasses/testdata/jmock/acceptance/junit4}/JUnit4TestThatDoesSatisfyExpectations.java (92%)
rename {test/org/jmock/test/acceptance/junit4/testdata => testdata-testclasses/testdata/jmock/acceptance/junit4}/JUnit4TestThatThrowsExpectedException.java (95%)
rename {test/org/jmock/test/acceptance/junit4/testdata => testdata-testclasses/testdata/jmock/acceptance/junit4}/JUnit4TestWithNonPublicBeforeMethod.java (76%)
create mode 100644 testdata-testclasses/testdata/jmock/acceptance/junit4/JUnit4WithRulesExamples.java
create mode 100644 testdata-testclasses/testdata/jmock/integration/junit3/FailingExampleTestCase.java
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jmock2.git
More information about the pkg-java-commits
mailing list