[jmock2] 04/08: Merge tag 'upstream/2.8.2'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Sep 27 08:17:14 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jmock2.
commit 640ac73187340ecedf60496d87f49b91c443442f
Merge: f2838f8 51a2911
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Sep 26 17:22:02 2016 +0200
Merge tag 'upstream/2.8.2'
Upstream version 2.8.2
.gitignore | 15 +-
.travis.yml | 10 +
LICENSE.txt | 2 +-
README => README.md | 22 +-
build.xml | 250 --------------------
javadoc-lists/cglib/package-list | 8 -
javadoc-lists/javase6/package-list | 203 ----------------
javadoc-lists/junit-4.11/package-list | 18 --
jmock-example/pom.xml | 50 ++++
.../org/jmock/example/announcer/Announcer.java | 0
.../jmock/example/announcer/AnnouncerTests.java | 0
.../gettingstarted/GettingStartedJUnit3.java | 0
.../GettingStartedJUnit3Mockomatic.java | 0
.../gettingstarted/GettingStartedJUnit4.java | 0
.../GettingStartedJUnit4Mockomatic.java | 0
.../gettingstarted/GettingStartedJUnit4Rule.java | 0
.../GettingStartedJUnit4RuleMockomatic.java | 0
.../jmock/example/gettingstarted/Publisher.java | 0
.../jmock/example/gettingstarted/Subscriber.java | 0
.../src/main}/org/jmock/example/qcon/DJ.java | 0
.../src/main}/org/jmock/example/qcon/DJTests.java | 0
.../org/jmock/example/qcon/LocationAware.java | 0
.../main}/org/jmock/example/qcon/MediaControl.java | 0
.../main}/org/jmock/example/qcon/MediaTracker.java | 0
.../src/main}/org/jmock/example/qcon/Playlist.java | 0
.../main}/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
.../src/main}/org/jmock/example/sniper/Money.java | 0
.../main}/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
jmock-junit3/.gitignore | 1 +
jmock-junit3/pom.xml | 53 +++++
.../integration/junit3/JUnit3ErrorTranslator.java | 0
.../jmock/integration/junit3/JUnit3Mockery.java | 0
.../integration/junit3/MockObjectTestCase.java | 0
.../integration/junit3/VerifyingTestCase.java | 0
.../org/jmock/integration/junit3/package.html | 0
.../junit3/MockObjectTestCaseTests.java | 0
.../integration/junit3/VerifyingTestCaseTests.java | 0
.../integration/junit3/FailingExampleTestCase.java | 0
jmock-junit4/pom.xml | 42 ++++
.../java}/org/jmock/integration/junit4/JMock.java | 0
.../jmock/integration/junit4/JUnit4Mockery.java | 0
.../jmock/integration/junit4/JUnitRuleMockery.java | 1 -
.../org/jmock/integration/junit4/package.html | 0
.../junit4/FailureRecordingRunListener.java | 0
.../acceptance/junit4/JUnit4TestRunnerTests.java | 7 +-
.../junit4/JUnit4WithRulesTestRunnerTests.java | 0
.../concurrent/internal}/SynchroniserTests.java | 2 +-
.../acceptance/junit4/BaseClassWithMockery.java | 0
...edJUnit4TestThatDoesNotSatisfyExpectations.java | 0
.../JUnit4TestThatAutoInstantiatesMocks.java | 0
.../junit4/JUnit4TestThatCreatesNoMockery.java | 0
.../junit4/JUnit4TestThatCreatesTwoMockeries.java | 0
.../JUnit4TestThatDoesNotCreateAMockery.java | 0
.../JUnit4TestThatDoesNotSatisfyExpectations.java | 0
.../JUnit4TestThatDoesSatisfyExpectations.java | 0
.../JUnit4TestThatThrowsExpectedException.java | 0
.../JUnit4TestWithNonPublicBeforeMethod.java | 0
.../acceptance/junit4/JUnit4WithRulesExamples.java | 0
jmock-legacy/pom.xml | 51 ++++
.../org/jmock/lib/legacy/ClassImposteriser.java | 0
.../main/java}/org/jmock/lib/legacy/package.html | 0
.../acceptance/ClassLoaderAcceptanceTests.java | 14 +-
.../FinalizerIsIgnoredAcceptanceTests.java | 0
.../InvocationDescriptionAcceptanceTests.java | 0
.../MockeryFinalizationAcceptanceTests.java | 0
.../acceptance/MockingClassesAcceptanceTests.java | 0
...ImplementationOfGenericTypeAcceptanceTests.java | 17 ++
...MockingPackageProtectedTypeAcceptanceTests.java | 0
.../RedeclaredObjectMethodsAcceptanceTests.java | 0
.../unit/lib/legacy/ClassImposteriserTests.java | 12 +-
.../test/unit/lib/legacy/Java8Issue79UnitTest.java | 28 +++
jmock/.gitignore | 5 +
jmock/pom.xml | 128 ++++++++++
.../main/java/org/jmock/AbstractExpectations.java | 17 +-
jmock/src/main/java/org/jmock/Expectations.java | 8 +
.../main/java/org/jmock/ExpectationsCreator.java | 177 ++++++++++++++
.../src/main/java}/org/jmock/Mockery.java | 13 +
.../src/main/java}/org/jmock/Sequence.java | 0
{src => jmock/src/main/java}/org/jmock/States.java | 0
.../src/main/java}/org/jmock/api/Action.java | 0
.../src/main/java}/org/jmock/api/Expectation.java | 2 +-
.../main/java}/org/jmock/api/ExpectationError.java | 0
.../org/jmock/api/ExpectationErrorTranslator.java | 0
.../src/main/java}/org/jmock/api/Imposteriser.java | 0
.../src/main/java}/org/jmock/api/Invocation.java | 0
.../src/main/java}/org/jmock/api/Invokable.java | 0
.../org/jmock/api/MockObjectNamingScheme.java | 0
.../main/java}/org/jmock/api/ThreadingPolicy.java | 0
.../src/main/java}/org/jmock/api/package.html | 0
.../src/main/java}/org/jmock/auto/Auto.java | 0
.../src/main/java}/org/jmock/auto/Mock.java | 0
.../java}/org/jmock/auto/internal/Mockomatic.java | 0
.../org/jmock/internal/AllDeclaredFields.java | 0
.../java}/org/jmock/internal/CaptureControl.java | 0
.../main/java}/org/jmock/internal/Cardinality.java | 0
.../org/jmock/internal/ChangeStateSideEffect.java | 0
.../org/jmock/internal/ExpectationBuilder.java | 0
.../org/jmock/internal/ExpectationCapture.java | 0
.../org/jmock/internal/ExpectationCollector.java | 0
.../org/jmock/internal/FakeObjectMethods.java | 0
.../main/java}/org/jmock/internal/Formatting.java | 0
.../jmock/internal/InStateOrderingConstraint.java | 0
.../org/jmock/internal/InvocationDispatcher.java | 0
.../org/jmock/internal/InvocationDiverter.java | 0
.../org/jmock/internal/InvocationExpectation.java | 0
.../internal/InvocationExpectationBuilder.java | 0
.../InvocationToExpectationTranslator.java | 0
.../java}/org/jmock/internal/NamedSequence.java | 0
.../internal/ObjectMethodExpectationBouncer.java | 0
.../org/jmock/internal/OrderingConstraint.java | 0
.../org/jmock/internal/ParametersMatcher.java | 0
.../org/jmock/internal/ProxiedObjectIdentity.java | 0
.../jmock/internal/ReturnDefaultValueAction.java | 3 +-
.../org/jmock/internal/SearchingClassLoader.java | 0
.../main/java}/org/jmock/internal/SideEffect.java | 0
.../org/jmock/internal/SingleThreadedPolicy.java | 0
.../src/main/java}/org/jmock/internal/State.java | 0
.../java}/org/jmock/internal/StateMachine.java | 0
.../java}/org/jmock/internal/StatePredicate.java | 0
.../internal/matcher/AllParametersMatcher.java | 0
.../org/jmock/internal/matcher/MethodMatcher.java | 0
.../jmock/internal/matcher/MethodNameMatcher.java | 0
.../jmock/internal/matcher/MockObjectMatcher.java | 0
.../jmock/internal/matcher/ParametersMatcher.java | 0
.../src/main/java}/org/jmock/internal/package.html | 0
.../org/jmock/lib/AssertionErrorTranslator.java | 0
.../java}/org/jmock/lib/CamelCaseNamingScheme.java | 0
.../java}/org/jmock/lib/CurrentStateMatcher.java | 0
.../lib/IdentityExpectationErrorTranslator.java | 0
.../org/jmock/lib/JavaReflectionImposteriser.java | 0
.../java}/org/jmock/lib/LastWordNamingScheme.java | 0
.../java}/org/jmock/lib/RetroNamingScheme.java | 0
.../java}/org/jmock/lib/action/ActionSequence.java | 0
.../java}/org/jmock/lib/action/CustomAction.java | 0
.../java}/org/jmock/lib/action/DoAllAction.java | 0
.../jmock/lib/action/ReturnEnumerationAction.java | 0
.../org/jmock/lib/action/ReturnIteratorAction.java | 0
.../org/jmock/lib/action/ReturnValueAction.java | 0
.../java}/org/jmock/lib/action/ThrowAction.java | 0
.../java}/org/jmock/lib/action/VoidAction.java | 0
.../main/java}/org/jmock/lib/action/package.html | 0
.../java}/org/jmock/lib/concurrent/Blitzer.java | 0
.../lib/concurrent/DeterministicExecutor.java | 0
.../lib/concurrent/DeterministicScheduler.java | 4 +-
.../org/jmock/lib/concurrent/Synchroniser.java | 0
.../UnsupportedSynchronousOperationException.java | 0
.../jmock/lib/concurrent/internal/DeltaQueue.java | 16 ++
.../lib/concurrent/internal/FixedTimeout.java | 0
.../lib/concurrent/internal/InfiniteTimeout.java | 0
.../org/jmock/lib/concurrent/internal/Timeout.java | 0
.../java}/org/jmock/lib/concurrent/package.html | 0
.../src/main/java}/org/jmock/lib/package.html | 0
.../java}/org/jmock/lib/script/ScriptedAction.java | 0
.../main/java}/org/jmock/lib/script/package.html | 0
.../src/main/java}/org/jmock/package.html | 0
.../main/java}/org/jmock/syntax/ActionClause.java | 0
.../jmock/syntax/ArgumentConstraintPhrases.java | 0
.../java}/org/jmock/syntax/CardinalityClause.java | 0
.../main/java}/org/jmock/syntax/MethodClause.java | 0
.../java}/org/jmock/syntax/ParametersClause.java | 0
.../java}/org/jmock/syntax/ReceiverClause.java | 0
.../main/java}/org/jmock/syntax/StatesClause.java | 0
.../main/java}/org/jmock/syntax/WithClause.java | 0
.../src/main/java}/org/jmock/syntax/package.html | 0
{src => jmock/src/main/java}/overview.html | 0
.../test/acceptance/AnyMethodAcceptanceTests.java | 0
.../CascadedFailuresAcceptanceTests.java | 0
.../ConsecutiveCallsAcceptanceTests.java | 0
...pectationWithinExpectationsAcceptanceTests.java | 0
.../test/acceptance/DoAllAcceptanceTests.java | 0
.../acceptance/ErrorMessagesAcceptanceTests.java | 1 -
.../ExpectationCountsAcceptanceTests.java | 0
.../ExpectationErrorCheckingAcceptanceTests.java | 0
...ExpectationErrorTranslationAcceptanceTests.java | 0
.../FlexibleExpectationsAcceptanceTests.java | 0
.../HamcrestTypeSafetyAcceptanceTests.java | 0
.../org/jmock/test/acceptance/MockedType.java | 1 +
.../NewStyleParameterMatchingAcceptanceTests.java | 0
.../acceptance/NullAndNonNullAcceptanceTests.java | 16 +-
...errideExpectationsFromSetUpAcceptanceTests.java | 0
.../test/acceptance/PackageProtectedType.java | 0
.../ParameterMatchingAcceptanceTests.java | 0
.../PrimitiveParameterTypesAcceptanceTests.java | 39 ++-
.../test/acceptance/RecordingAcceptanceTests.java | 0
.../ReturningIteratorsAcceptanceTests.java | 0
.../acceptance/ReturningValuesAcceptanceTests.java | 0
.../test/acceptance/SequenceAcceptanceTests.java | 0
.../test/acceptance/StatesAcceptanceTest.java | 0
.../ThrowingExceptionsAcceptanceTests.java | 0
.../test/acceptance/UniqueNamesAcceptanceTest.java | 0
.../UnorderedExpectationsAcceptanceTests.java | 0
.../WarnAboutMultipleThreadsAcceptanceTests.java | 0
.../java}/org/jmock/test/unit/MockeryTests.java | 0
.../org/jmock/test/unit/api/InvocationTests.java | 0
.../test/unit/auto/internal/MockomaticTests.java | 0
.../test/unit/internal/AllDeclaredFieldsTests.java | 0
.../jmock/test/unit/internal/CardinalityTests.java | 0
.../unit/internal/ChangeStateSideEffectTests.java | 0
.../unit/internal}/FailingExampleTestCase.java | 3 +-
.../jmock/test/unit/internal/FormattingTests.java | 0
.../internal/InStateOrderingConstraintTests.java | 0
.../unit/internal/InvocationDispatcherTests.java | 0
.../unit/internal/InvocationDiverterTests.java | 0
.../unit/internal/InvocationExpectationTests.java | 0
.../test/unit/internal}/MockObjectTestCase.java | 5 +-
.../unit/internal/ProxiedObjectIdentityTests.java | 0
.../internal/ReturnDefaultCollectionTests.java | 0
.../internal/ReturnDefaultValueActionTests.java | 0
.../test/unit/internal/StateMachineTests.java | 0
.../test/unit/internal}/VerifyingTestCase.java | 2 +-
.../unit/internal}/VerifyingTestCaseTests.java | 6 +-
.../jmock/test/unit/lib/AbstractMatcherTest.java | 101 ++++++++
.../test/unit/lib/CamelCaseNamingSchemeTests.java | 0
.../test/unit/lib/CurrentStateMatcherTests.java | 1 -
.../IdentityExpectationErrorTranslatorTests.java | 0
.../unit/lib/JavaReflectionImposteriserTests.java | 81 +++++++
.../test/unit/lib/LastWordNamingSchemeTests.java | 0
.../test/unit/lib/RetroNamingSchemeTests.java | 0
.../test/unit/lib/action/ActionSequenceTests.java | 0
.../test/unit/lib/action/CustomActionTests.java | 0
.../test/unit/lib/action/DoAllActionTests.java | 0
.../lib/action/ReturnEnumerationActionTests.java | 0
.../unit/lib/action/ReturnIteratorActionTests.java | 0
.../unit/lib/action/ReturnValueActionTests.java | 0
.../test/unit/lib/action/ThrowActionTests.java | 0
.../test/unit/lib/action/VoidActionTests.java | 0
.../test/unit/lib/concurrent/BlitzerTests.java | 16 +-
.../lib/concurrent/DeterministicExecutorTests.java | 2 +-
.../concurrent/DeterministicSchedulerTests.java | 72 +++++-
.../lib/concurrent/ScheduleOnExecutorAction.java | 0
.../lib/concurrent/internal/DeltaQueueTests.java | 0
.../test/unit/lib/script/ScriptedActionTests.java | 0
.../org/jmock/test/unit/support/AssertThat.java | 0
.../jmock/test/unit/support/DummyInterface.java | 0
.../jmock/test/unit/support/DummyThrowable.java | 0
.../org/jmock/test/unit/support/MethodFactory.java | 89 +++++++
.../test/unit/support/MethodFactoryTests.java | 0
.../org/jmock/test/unit/support/MockAction.java | 0
.../jmock/test/unit/support/MockExpectation.java | 0
.../org/jmock/test/unit/support/StubInvokable.java | 0
.../SyntheticEmptyInterfaceClassLoader.java | 8 +-
lib/.cvsignore | 3 -
pom.xml | 261 +++++++++++++++++++++
release.sh | 61 -----
.../unit/lib/JavaReflectionImposteriserTests.java | 68 ------
.../org/jmock/test/unit/support/MethodFactory.java | 96 --------
testdata/TypeInSignedJar.java | 4 -
testjar/.gitignore | 4 +
testjar/pom.xml | 73 ++++++
testjar/pubring.gpg | Bin 0 -> 1262 bytes
testjar/secring.gpg | Bin 0 -> 2640 bytes
.../src/main/java}/ClassFromOtherClassLoader.java | 0
.../main/java}/InterfaceFromOtherClassLoader.java | 0
.../java/org/jmock/testjar/TypeInSignedJar.java | 8 +
263 files changed, 1433 insertions(+), 767 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