This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository easymock.
commit 6d8b817e9edc92b07a2b7a7d478043a50f208e9b Merge: 2fad44a 5a419f0 Author: Markus Koschany <[email protected]> Date: Mon Jan 12 13:30:22 2015 +0100 Merge tag 'upstream/3.3.1+ds' Upstream version 3.3.1+ds # gpg: Signature made Mon 12 Jan 2015 13:30:18 CET using RSA key ID 513B51E4 # gpg: Good signature from "Markus Koschany <[email protected]>" [ultimate] # gpg: aka "Markus Koschany <[email protected]>" [ultimate] .../samples/AnnotatedMockWithRuleTest.java | 2 +- .../samples/AnnotatedMockWithRunnerTest.java | 2 +- .../org/easymock/samples/BasicClassMockTest.java | 2 +- samples/org/easymock/samples/ClassTested.java | 2 +- samples/org/easymock/samples/Collaborator.java | 2 +- .../samples/ConstructorCalledMockTest.java | 2 +- samples/org/easymock/samples/EnclosedTest.java | 113 +++++++++++++++++++++ samples/org/easymock/samples/ExampleTest.java | 18 ++-- .../org/easymock/samples/PartialClassMockTest.java | 2 +- samples/org/easymock/samples/SupportTest.java | 2 +- samples/org/easymock/samples/ThrowableEquals.java | 2 +- src/org/easymock/Capture.java | 2 +- src/org/easymock/CaptureType.java | 2 +- src/org/easymock/ConstructorArgs.java | 2 +- src/org/easymock/EasyMock.java | 2 +- src/org/easymock/EasyMockRule.java | 2 +- src/org/easymock/EasyMockRunner.java | 2 +- src/org/easymock/EasyMockSupport.java | 2 +- src/org/easymock/IAnswer.java | 2 +- src/org/easymock/IArgumentMatcher.java | 2 +- src/org/easymock/IExpectationSetters.java | 2 +- src/org/easymock/IMockBuilder.java | 2 +- src/org/easymock/IMocksControl.java | 2 +- src/org/easymock/LogicalOperator.java | 2 +- src/org/easymock/Mock.java | 2 +- src/org/easymock/MockType.java | 2 +- src/org/easymock/TestSubject.java | 2 +- .../internal/AndroidClassProxyFactory.java | 2 +- src/org/easymock/internal/AndroidSupport.java | 2 +- src/org/easymock/internal/ArgumentToString.java | 2 +- .../easymock/internal/AssertionErrorWrapper.java | 2 +- .../easymock/internal/BridgeMethodResolver.java | 2 +- .../internal/ClassInstantiatorFactory.java | 2 +- src/org/easymock/internal/ClassProxyFactory.java | 2 +- .../internal/DefaultClassInstantiator.java | 2 +- src/org/easymock/internal/EasyMockProperties.java | 2 +- src/org/easymock/internal/EasyMockStatement.java | 2 +- src/org/easymock/internal/ErrorMessage.java | 2 +- src/org/easymock/internal/ExpectedInvocation.java | 2 +- .../internal/ExpectedInvocationAndResult.java | 2 +- .../internal/ExpectedInvocationAndResults.java | 2 +- src/org/easymock/internal/IClassInstantiator.java | 2 +- src/org/easymock/internal/IMocksBehavior.java | 2 +- src/org/easymock/internal/IMocksControlState.java | 2 +- src/org/easymock/internal/IProxyFactory.java | 2 +- src/org/easymock/internal/Injection.java | 2 +- src/org/easymock/internal/InjectionPlan.java | 2 +- src/org/easymock/internal/InjectionTarget.java | 2 +- src/org/easymock/internal/Injector.java | 2 +- src/org/easymock/internal/Invocation.java | 2 +- src/org/easymock/internal/JavaProxyFactory.java | 2 +- src/org/easymock/internal/LastControl.java | 2 +- .../internal/MethodSerializationWrapper.java | 2 +- src/org/easymock/internal/MockBuilder.java | 2 +- .../easymock/internal/MockInvocationHandler.java | 2 +- src/org/easymock/internal/MocksBehavior.java | 2 +- src/org/easymock/internal/MocksControl.java | 2 +- src/org/easymock/internal/ObjectMethodsFilter.java | 2 +- .../internal/ObjenesisClassInstantiator.java | 2 +- src/org/easymock/internal/Range.java | 2 +- src/org/easymock/internal/RecordState.java | 2 +- src/org/easymock/internal/ReflectionUtils.java | 2 +- src/org/easymock/internal/ReplayState.java | 2 +- src/org/easymock/internal/Result.java | 2 +- src/org/easymock/internal/Results.java | 2 +- .../easymock/internal/RuntimeExceptionWrapper.java | 2 +- src/org/easymock/internal/ThrowableWrapper.java | 2 +- src/org/easymock/internal/UnorderedBehavior.java | 2 +- src/org/easymock/internal/matchers/And.java | 2 +- src/org/easymock/internal/matchers/Any.java | 2 +- .../easymock/internal/matchers/ArrayEquals.java | 2 +- src/org/easymock/internal/matchers/Captures.java | 2 +- src/org/easymock/internal/matchers/Compare.java | 2 +- .../easymock/internal/matchers/CompareEqual.java | 2 +- src/org/easymock/internal/matchers/CompareTo.java | 2 +- src/org/easymock/internal/matchers/Contains.java | 2 +- src/org/easymock/internal/matchers/EndsWith.java | 2 +- src/org/easymock/internal/matchers/Equals.java | 2 +- .../internal/matchers/EqualsWithDelta.java | 2 +- src/org/easymock/internal/matchers/Find.java | 2 +- .../easymock/internal/matchers/GreaterOrEqual.java | 2 +- .../easymock/internal/matchers/GreaterThan.java | 2 +- src/org/easymock/internal/matchers/InstanceOf.java | 2 +- .../easymock/internal/matchers/LessOrEqual.java | 2 +- src/org/easymock/internal/matchers/LessThan.java | 2 +- src/org/easymock/internal/matchers/Matches.java | 2 +- src/org/easymock/internal/matchers/Not.java | 2 +- src/org/easymock/internal/matchers/NotNull.java | 2 +- src/org/easymock/internal/matchers/Null.java | 2 +- src/org/easymock/internal/matchers/Or.java | 2 +- src/org/easymock/internal/matchers/Same.java | 2 +- src/org/easymock/internal/matchers/StartsWith.java | 2 +- tests/org/easymock/tests/ArgumentToStringTest.java | 2 +- .../org/easymock/tests/BaseEasyMockRunnerTest.java | 2 +- tests/org/easymock/tests/CapturesMatcherTest.java | 2 +- tests/org/easymock/tests/CglibTest.java | 19 +++- .../tests/ClassInstantiatorFactoryTest.java | 2 +- tests/org/easymock/tests/ConstructorTest.java | 2 +- .../tests/DefaultClassInstantiatorTest.java | 2 +- tests/org/easymock/tests/ErrorMessageTest.java | 2 +- .../org/easymock/tests/ExpectedMethodCallTest.java | 2 +- tests/org/easymock/tests/GenericTest.java | 2 +- tests/org/easymock/tests/IMethods.java | 2 +- tests/org/easymock/tests/IVarArgs.java | 2 +- tests/org/easymock/tests/InvocationTest.java | 2 +- tests/org/easymock/tests/LimitationsTest.java | 2 +- .../org/easymock/tests/MatchableArgumentsTest.java | 2 +- .../tests/MethodSerializationWrapperTest.java | 2 +- tests/org/easymock/tests/MockClassControlTest.java | 2 +- tests/org/easymock/tests/MockNameTest.java | 2 +- tests/org/easymock/tests/MockTypeTest.java | 2 +- tests/org/easymock/tests/MockingTest.java | 2 +- ...ceMockControlLongCompatibleReturnValueTest.java | 2 +- tests/org/easymock/tests/NiceMockControlTest.java | 2 +- tests/org/easymock/tests/ObjectMethodsTest.java | 2 +- .../RecordStateInvalidDefaultReturnValueTest.java | 2 +- .../RecordStateInvalidDefaultThrowableTest.java | 2 +- .../tests/RecordStateInvalidRangeTest.java | 2 +- .../tests/RecordStateInvalidReturnValueTest.java | 2 +- .../tests/RecordStateInvalidStateChangeTest.java | 2 +- .../tests/RecordStateInvalidThrowableTest.java | 2 +- .../tests/RecordStateInvalidUsageTest.java | 2 +- .../tests/RecordStateMethodCallMissingTest.java | 2 +- .../tests/ReplayStateInvalidCallsTest.java | 2 +- .../tests/ReplayStateInvalidUsageTest.java | 2 +- tests/org/easymock/tests/ResultTest.java | 2 +- tests/org/easymock/tests/StacktraceTest.java | 2 +- tests/org/easymock/tests/UsageCallCountTest.java | 2 +- .../tests/UsageDefaultReturnValueTest.java | 2 +- .../tests/UsageExpectAndDefaultReturnTest.java | 2 +- .../tests/UsageExpectAndDefaultThrowTest.java | 2 +- .../easymock/tests/UsageExpectAndReturnTest.java | 2 +- .../easymock/tests/UsageExpectAndThrowTest.java | 2 +- .../tests/UsageFloatingPointReturnValueTest.java | 2 +- .../tests/UsageLongCompatibleReturnValueTest.java | 2 +- .../tests/UsageOverloadedDefaultValueTest.java | 2 +- .../easymock/tests/UsageOverloadedMethodTest.java | 2 +- tests/org/easymock/tests/UsageRangeTest.java | 2 +- tests/org/easymock/tests/UsageStrictMockTest.java | 2 +- tests/org/easymock/tests/UsageTest.java | 2 +- tests/org/easymock/tests/UsageThrowableTest.java | 2 +- tests/org/easymock/tests/UsageUnorderedTest.java | 2 +- tests/org/easymock/tests/UsageVarargTest.java | 2 +- tests/org/easymock/tests/UsageVerifyTest.java | 2 +- tests/org/easymock/tests/Util.java | 2 +- tests/org/easymock/tests2/AnswerTest.java | 2 +- .../easymock/tests2/CallbackAndArgumentsTest.java | 2 +- tests/org/easymock/tests2/CallbackTest.java | 2 +- tests/org/easymock/tests2/CaptureTest.java | 2 +- tests/org/easymock/tests2/ChildEquals.java | 2 +- .../easymock/tests2/ClassExtensionHelperTest.java | 2 +- tests/org/easymock/tests2/CompareToTest.java | 2 +- .../easymock/tests2/ConstraintsToStringTest.java | 2 +- tests/org/easymock/tests2/ConstructorArgsTest.java | 2 +- tests/org/easymock/tests2/DelegateToTest.java | 2 +- tests/org/easymock/tests2/DependencyTest.java | 2 +- .../easymock/tests2/EasyMockAnnotationsTest.java | 2 +- .../tests2/EasyMockClassExtensionTest.java | 2 +- .../easymock/tests2/EasyMockPropertiesTest.java | 2 +- tests/org/easymock/tests2/EasyMockRuleTest.java | 2 +- tests/org/easymock/tests2/EasyMockRunnerTest.java | 2 +- .../easymock/tests2/EasyMockSupportClassTest.java | 2 +- tests/org/easymock/tests2/EasyMockSupportTest.java | 2 +- tests/org/easymock/tests2/FilteringRule.java | 2 +- tests/org/easymock/tests2/MockBuilderTest.java | 2 +- tests/org/easymock/tests2/MockedExceptionTest.java | 2 +- tests/org/easymock/tests2/MocksControlTest.java | 2 +- tests/org/easymock/tests2/NameTest.java | 2 +- tests/org/easymock/tests2/NiceMockTest.java | 2 +- tests/org/easymock/tests2/ParentEquals.java | 2 +- tests/org/easymock/tests2/PartialMockingTest.java | 2 +- tests/org/easymock/tests2/ReflectionUtilsTest.java | 2 +- tests/org/easymock/tests2/SerializationTest.java | 2 +- tests/org/easymock/tests2/StubTest.java | 2 +- tests/org/easymock/tests2/ThreadingTest.java | 2 +- .../org/easymock/tests2/UsageConstraintsTest.java | 2 +- tests/org/easymock/tests2/UsageMatchersTest.java | 2 +- tests/org/easymock/tests2/UsageStrictMockTest.java | 2 +- tests/org/easymock/tests2/UsageTest.java | 2 +- 179 files changed, 315 insertions(+), 187 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/easymock.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
