This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository easymock.
commit 3c516d68a947f7c53198b249d99f9a42cf48e24b Merge: 33d6c0a 6222868 Author: Markus Koschany <[email protected]> Date: Fri Oct 7 12:18:52 2016 +0200 Merge tag 'upstream/3.4+ds' Upstream version 3.4+ds # gpg: Signatur vom Fr 07 Okt 2016 12:18:51 CEST # gpg: mittels RSA-Schlüssel D9AD14B9513B51E4 # gpg: Korrekte Signatur von "Markus Koschany <[email protected]>" [ultimativ] # gpg: alias "Markus Koschany <[email protected]>" [ultimativ] # gpg: alias "Markus Koschany <[email protected]>" [ultimativ] .editorconfig | 26 + .gitignore | 24 + .travis.yml | 5 + CONTRIBUTING.md | 7 + EasyMock-cleanup.xml | 56 + EasyMock-formatter.xml | 291 +++++ README.md | 167 +++ ReleaseNotes.md | 4 + bench/launch.sh | 3 + bench/pom.xml | 105 ++ .../org/easymock/benchmark/EasyMockBenchmark.java | 54 + core/.settings/org.eclipse.jdt.core.prefs | 355 ++++++ core/.settings/org.eclipse.jdt.ui.prefs | 132 +++ LICENSE.txt => core/LICENSE.txt | 0 core/findbugs-exclude.xml | 22 + core/pom.xml | 168 +++ core/src/main/assembly/assembly-samples.xml | 27 + core/src/main/assembly/assembly-tests.xml | 27 + core/src/main/assembly/assembly.xml | 22 + .../src/main/java}/org/easymock/Capture.java | 18 +- .../src/main/java}/org/easymock/CaptureType.java | 0 .../main/java}/org/easymock/ConstructorArgs.java | 16 +- .../src/main/java}/org/easymock/EasyMock.java | 1163 +++++++++----------- .../src/main/java}/org/easymock/EasyMockRule.java | 4 +- .../main/java}/org/easymock/EasyMockRunner.java | 5 +- .../main/java/org/easymock/EasyMockSupport.java | 530 +++++++++ .../src/main/java}/org/easymock/IAnswer.java | 0 .../main/java}/org/easymock/IArgumentMatcher.java | 0 .../java}/org/easymock/IExpectationSetters.java | 38 +- .../src/main/java}/org/easymock/IMockBuilder.java | 672 +++++------ .../src/main/java}/org/easymock/IMocksControl.java | 84 +- .../main/java}/org/easymock/LogicalOperator.java | 12 +- {src => core/src/main/java}/org/easymock/Mock.java | 6 +- .../src/main/java}/org/easymock/MockType.java | 0 .../src/main/java}/org/easymock/TestSubject.java | 0 .../internal/AndroidClassProxyFactory.java | 2 +- .../org/easymock/internal/AndroidSupport.java | 2 +- .../org/easymock/internal/ArgumentToString.java | 16 +- .../easymock/internal/AssertionErrorWrapper.java | 2 +- .../easymock/internal/BridgeMethodResolver.java | 888 +++++++-------- .../internal/ClassInstantiatorFactory.java | 2 +- .../org/easymock/internal/ClassProxyFactory.java | 58 +- .../internal/DefaultClassInstantiator.java | 424 +++---- .../org/easymock/internal/EasyMockProperties.java | 14 +- .../org/easymock/internal/EasyMockStatement.java | 2 +- .../java}/org/easymock/internal/ErrorMessage.java | 120 +- .../org/easymock/internal/ExpectedInvocation.java | 28 +- .../internal/ExpectedInvocationAndResult.java | 2 +- .../internal/ExpectedInvocationAndResults.java | 2 +- .../org/easymock/internal/IClassInstantiator.java | 72 +- .../org/easymock/internal/IMocksBehavior.java | 0 .../org/easymock/internal/IMocksControlState.java | 0 .../java}/org/easymock/internal/IProxyFactory.java | 0 .../java}/org/easymock/internal/Injection.java | 2 +- .../java}/org/easymock/internal/InjectionPlan.java | 8 +- .../org/easymock/internal/InjectionTarget.java | 8 +- .../main/java}/org/easymock/internal/Injector.java | 91 +- .../java}/org/easymock/internal/Invocation.java | 62 +- .../org/easymock/internal/JavaProxyFactory.java | 0 .../java}/org/easymock/internal/LastControl.java | 30 +- .../internal/MethodSerializationWrapper.java | 12 +- .../java}/org/easymock/internal/MockBuilder.java | 73 +- .../easymock/internal/MockInvocationHandler.java | 10 +- .../java}/org/easymock/internal/MocksBehavior.java | 42 +- .../java}/org/easymock/internal/MocksControl.java | 148 ++- .../org/easymock/internal/ObjectMethodsFilter.java | 14 +- .../internal/ObjenesisClassInstantiator.java | 2 +- .../main/java}/org/easymock/internal/Range.java | 6 +- .../java}/org/easymock/internal/RecordState.java | 70 +- .../org/easymock/internal/ReflectionUtils.java | 466 ++++---- .../java}/org/easymock/internal/ReplayState.java | 40 +- .../main/java}/org/easymock/internal/Result.java | 16 +- .../main/java}/org/easymock/internal/Results.java | 12 +- .../easymock/internal/RuntimeExceptionWrapper.java | 2 +- .../org/easymock/internal/ThrowableWrapper.java | 2 +- .../org/easymock/internal/UnorderedBehavior.java | 34 +- .../java}/org/easymock/internal/matchers/And.java | 10 +- .../java}/org/easymock/internal/matchers/Any.java | 4 +- .../easymock/internal/matchers/ArrayEquals.java | 8 +- .../org/easymock/internal/matchers/Captures.java | 8 +- .../org/easymock/internal/matchers/Compare.java | 6 +- .../easymock/internal/matchers/CompareEqual.java | 4 +- .../org/easymock/internal/matchers/CompareTo.java | 6 +- .../org/easymock/internal/matchers/Contains.java | 6 +- .../org/easymock/internal/matchers/EndsWith.java | 6 +- .../org/easymock/internal/matchers/Equals.java | 10 +- .../internal/matchers/EqualsWithDelta.java | 8 +- .../java}/org/easymock/internal/matchers/Find.java | 18 +- .../easymock/internal/matchers/GreaterOrEqual.java | 4 +- .../easymock/internal/matchers/GreaterThan.java | 4 +- .../org/easymock/internal/matchers/InstanceOf.java | 6 +- .../easymock/internal/matchers/LessOrEqual.java | 4 +- .../org/easymock/internal/matchers/LessThan.java | 4 +- .../org/easymock/internal/matchers/Matches.java | 19 +- .../java}/org/easymock/internal/matchers/Not.java | 6 +- .../org/easymock/internal/matchers/NotNull.java | 4 +- .../java}/org/easymock/internal/matchers/Null.java | 4 +- .../java}/org/easymock/internal/matchers/Or.java | 10 +- .../java}/org/easymock/internal/matchers/Same.java | 6 +- .../org/easymock/internal/matchers/StartsWith.java | 6 +- .../samples/AnnotatedMockWithRuleTest.java | 4 +- .../samples/AnnotatedMockWithRunnerTest.java | 92 +- .../org/easymock/samples/BasicClassMockTest.java | 201 ++-- .../java}/org/easymock/samples/ClassTested.java | 22 +- .../java}/org/easymock/samples/Collaborator.java | 0 .../samples/ConstructorCalledMockTest.java | 16 +- .../java}/org/easymock/samples/EnclosedTest.java | 2 +- .../java}/org/easymock/samples/ExampleTest.java | 8 +- .../org/easymock/samples/PartialClassMockTest.java | 12 +- .../java}/org/easymock/samples/SupportTest.java | 10 +- .../org/easymock/samples/ThrowableEquals.java | 10 +- .../org/easymock/tests/ArgumentToStringTest.java | 8 +- .../org/easymock/tests/BaseEasyMockRunnerTest.java | 0 .../org/easymock/tests/CapturesMatcherTest.java | 6 +- .../test/java}/org/easymock/tests/CglibTest.java | 16 +- .../tests/ClassInstantiatorFactoryTest.java | 6 +- .../java}/org/easymock/tests/ConstructorTest.java | 4 +- .../tests/DefaultClassInstantiatorTest.java | 28 +- .../java}/org/easymock/tests/ErrorMessageTest.java | 14 +- .../org/easymock/tests/ExpectedMethodCallTest.java | 16 +- .../test/java}/org/easymock/tests/GenericTest.java | 246 ++--- .../test/java}/org/easymock/tests/IMethods.java | 0 .../test/java}/org/easymock/tests/IVarArgs.java | 0 .../java}/org/easymock/tests/InvocationTest.java | 34 +- .../java}/org/easymock/tests/LimitationsTest.java | 10 +- .../org/easymock/tests/MatchableArgumentsTest.java | 24 +- .../tests/MethodSerializationWrapperTest.java | 8 +- .../org/easymock/tests/MockClassControlTest.java | 16 +- .../java}/org/easymock/tests/MockNameTest.java | 6 +- .../java}/org/easymock/tests/MockTypeTest.java | 28 +- .../test/java}/org/easymock/tests/MockingTest.java | 57 +- ...ceMockControlLongCompatibleReturnValueTest.java | 0 .../org/easymock/tests/NiceMockControlTest.java | 0 .../org/easymock/tests/ObjectMethodsTest.java | 18 +- .../RecordStateInvalidDefaultReturnValueTest.java | 2 +- .../RecordStateInvalidDefaultThrowableTest.java | 6 +- .../tests/RecordStateInvalidRangeTest.java | 14 +- .../tests/RecordStateInvalidReturnValueTest.java | 6 +- .../tests/RecordStateInvalidStateChangeTest.java | 6 +- .../tests/RecordStateInvalidThrowableTest.java | 6 +- .../tests/RecordStateInvalidUsageTest.java | 6 +- .../tests/RecordStateMethodCallMissingTest.java | 52 +- .../tests/ReplayStateInvalidCallsTest.java | 0 .../tests/ReplayStateInvalidUsageTest.java | 0 .../test/java}/org/easymock/tests/ResultTest.java | 14 +- .../java}/org/easymock/tests/StacktraceTest.java | 20 +- .../org/easymock/tests/UsageCallCountTest.java | 4 +- .../tests/UsageDefaultReturnValueTest.java | 10 +- .../tests/UsageExpectAndDefaultReturnTest.java | 0 .../tests/UsageExpectAndDefaultThrowTest.java | 26 +- .../easymock/tests/UsageExpectAndReturnTest.java | 0 .../easymock/tests/UsageExpectAndThrowTest.java | 70 +- .../tests/UsageFloatingPointReturnValueTest.java | 0 .../tests/UsageLongCompatibleReturnValueTest.java | 0 .../tests/UsageOverloadedDefaultValueTest.java | 4 +- .../easymock/tests/UsageOverloadedMethodTest.java | 6 +- .../java}/org/easymock/tests/UsageRangeTest.java | 2 +- .../org/easymock/tests/UsageStrictMockTest.java | 18 +- .../test/java}/org/easymock/tests/UsageTest.java | 25 +- .../org/easymock/tests/UsageThrowableTest.java | 14 +- .../org/easymock/tests/UsageUnorderedTest.java | 4 +- .../java}/org/easymock/tests/UsageVarargTest.java | 6 +- .../java}/org/easymock/tests/UsageVerifyTest.java | 18 +- .../src/test/java}/org/easymock/tests/Util.java | 8 +- .../test/java}/org/easymock/tests2/AnswerTest.java | 28 +- .../easymock/tests2/CallbackAndArgumentsTest.java | 6 +- .../java}/org/easymock/tests2/CallbackTest.java | 16 +- .../java}/org/easymock/tests2/CaptureTest.java | 96 +- .../java}/org/easymock/tests2/ChildEquals.java | 0 .../easymock/tests2/ClassExtensionHelperTest.java | 235 ++-- .../java}/org/easymock/tests2/CompareToTest.java | 12 +- .../easymock/tests2/ConstraintsToStringTest.java | 10 +- .../org/easymock/tests2/ConstructorArgsTest.java | 6 +- .../java}/org/easymock/tests2/DelegateToTest.java | 32 +- .../easymock/tests2/EasyMockAnnotationsTest.java | 28 +- .../tests2/EasyMockClassExtensionTest.java | 118 +- .../easymock/tests2/EasyMockPropertiesTest.java | 46 +- .../org/easymock/tests2/EasyMockRuleTest.java | 0 .../org/easymock/tests2/EasyMockRunnerTest.java | 0 .../easymock/tests2/EasyMockSupportClassTest.java | 92 +- .../org/easymock/tests2/EasyMockSupportTest.java | 20 +- .../java}/org/easymock/tests2/MockBuilderTest.java | 710 ++++++------ .../org/easymock/tests2/MockedExceptionTest.java | 26 +- .../org/easymock/tests2/MocksControlTest.java | 81 +- .../test/java}/org/easymock/tests2/NameTest.java | 36 +- .../java}/org/easymock/tests2/NiceMockTest.java | 0 .../java}/org/easymock/tests2/ParentEquals.java | 0 .../org/easymock/tests2/PartialMockingTest.java | 22 +- .../org/easymock/tests2/ReflectionUtilsTest.java | 338 +++--- .../org/easymock/tests2/SerializationTest.java | 8 +- .../test/java}/org/easymock/tests2/StubTest.java | 6 +- .../java}/org/easymock/tests2/ThreadingTest.java | 64 +- .../org/easymock/tests2/UsageConstraintsTest.java | 48 +- .../org/easymock/tests2/UsageMatchersTest.java | 2 +- .../org/easymock/tests2/UsageStrictMockTest.java | 14 +- .../test/java}/org/easymock/tests2/UsageTest.java | 32 +- deploy-easymock.sh | 78 ++ deploy-website.sh | 38 + header.txt | 13 + mail.txt | 13 + pom.xml | 539 +++++++++ src/org/easymock/EasyMockSupport.java | 626 ----------- start-next-version.sh | 25 + test-android/.gitignore | 8 + test-android/pom.xml | 217 ++++ test-android/project.properties | 14 + test-android/src/main/AndroidManifest.xml | 43 + .../main/java/org/easymock/android/AndroidTck.java | 91 ++ test-android/src/main/res/.gitkeep | 1 + LICENSE.txt => test-deploy/LICENSE.txt | 404 +++---- test-deploy/pom.xml | 133 +++ .../test/java/org/easymock/test/EasyMockTest.java | 50 + .../.settings/org.eclipse.jdt.ui.prefs | 119 ++ LICENSE.txt => test-integration/LICENSE.txt | 404 +++---- test-integration/pom.xml | 101 ++ .../src/main/java/org/itests/StaticService.java | 51 +- .../src/test/java/org/itests/PowermockTest.java | 68 ++ test-nodeps/.settings/org.eclipse.jdt.ui.prefs | 119 ++ LICENSE.txt => test-nodeps/LICENSE.txt | 404 +++---- test-nodeps/pom.xml | 84 ++ .../src/test/java/org/itests}/DependencyTest.java | 159 +-- .../src/test/java/org/itests}/FilteringRule.java | 330 +++--- .../src/test/java/org/itests/NoDepsTest.java | 50 + test-osgi/.settings/org.eclipse.jdt.ui.prefs | 119 ++ LICENSE.txt => test-osgi/LICENSE.txt | 404 +++---- test-osgi/pom.xml | 204 ++++ .../org/easymock/itests/InterfaceOnlyTest.java | 87 ++ .../java/org/easymock/itests/OsgiBaseTest.java | 115 ++ .../test/java/org/easymock/itests/OsgiTest.java | 131 +++ test-osgi/src/test/resources/log4j.properties | 8 + .../osgi/test/internal/boot-bundles.properties | 89 ++ 231 files changed, 9721 insertions(+), 6017 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
