[jmock2] 01/04: Merge branch 'upstream'
Miguel Landaeta
nomadium-guest at alioth.debian.org
Sun Sep 29 22:55:17 UTC 2013
This is an automated email from the git hooks/post-receive script.
nomadium-guest pushed a commit to branch master
in repository jmock2.
commit f12323674f7397276da3b98e4ca1a0a465c7b273
Merge: 0ce7816 0c364a8
Author: Miguel Landaeta <miguel at miguel.cc>
Date: Sun Sep 29 17:23:49 2013 -0300
Merge branch 'upstream'
.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 +-
.../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 ++
144 files changed, 3096 insertions(+), 1542 deletions(-)
--
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