This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository easymock.
commit 371b0167608456242cc436c521f9f13a710ea983 Merge: b578045 f75af3a Author: Markus Koschany <[email protected]> Date: Fri Sep 15 07:13:33 2017 +0200 Updated version 3.5+ds from 'upstream/3.5+ds' with Debian dir 87b4732222d693e66fd6e0fa7ab209d378a520f9 .editorconfig | 2 +- .gitattributes | 1 + .travis.yml | 22 +- EasyMock-formatter.xml | 582 ++++++++-------- README.md | 33 +- ReleaseNotes.md | 36 +- bench/findbugs-exclude.xml | 2 + bench/pom.xml | 7 +- .../org/easymock/benchmark/EasyMockBenchmark.java | 108 +-- core/.settings/org.eclipse.jdt.core.prefs | 6 +- core/findbugs-exclude.xml | 44 +- core/pom.xml | 31 +- core/src/main/java/org/easymock/Capture.java | 4 +- core/src/main/java/org/easymock/CaptureType.java | 2 +- .../main/java/org/easymock/ConstructorArgs.java | 206 +++--- core/src/main/java/org/easymock/EasyMock.java | 153 ++++- ...ThrowableWrapper.java => EasyMockListener.java} | 22 +- core/src/main/java/org/easymock/EasyMockRule.java | 2 +- .../src/main/java/org/easymock/EasyMockRunner.java | 2 +- .../main/java/org/easymock/EasyMockSupport.java | 85 ++- core/src/main/java/org/easymock/IAnswer.java | 2 +- .../main/java/org/easymock/IArgumentMatcher.java | 2 +- .../java/org/easymock/IExpectationSetters.java | 2 +- core/src/main/java/org/easymock/IMockBuilder.java | 2 +- core/src/main/java/org/easymock/IMocksControl.java | 20 +- .../main/java/org/easymock/LogicalOperator.java | 2 +- core/src/main/java/org/easymock/Mock.java | 8 +- core/src/main/java/org/easymock/MockType.java | 62 +- core/src/main/java/org/easymock/TestSubject.java | 2 +- .../internal/AndroidClassProxyFactory.java | 6 +- .../java/org/easymock/internal/AndroidSupport.java | 6 +- .../org/easymock/internal/ArgumentToString.java | 4 +- .../easymock/internal/AssertionErrorWrapper.java | 2 +- .../easymock/internal/BridgeMethodResolver.java | 2 +- .../internal/ClassInstantiatorFactory.java | 162 ++--- .../org/easymock/internal/ClassProxyFactory.java | 548 +++++++-------- .../internal/DefaultClassInstantiator.java | 2 +- .../org/easymock/internal/EasyMockProperties.java | 2 +- .../org/easymock/internal/EasyMockStatement.java | 88 +-- .../java/org/easymock/internal/ErrorMessage.java | 2 +- .../org/easymock/internal/ExpectedInvocation.java | 12 +- .../internal/ExpectedInvocationAndResult.java | 2 +- .../internal/ExpectedInvocationAndResults.java | 2 +- .../org/easymock/internal/IClassInstantiator.java | 4 +- .../java/org/easymock/internal/IMocksBehavior.java | 6 +- .../org/easymock/internal/IMocksControlState.java | 6 +- .../java/org/easymock/internal/IProxyFactory.java | 7 +- .../main/java/org/easymock/internal/Injection.java | 2 +- .../java/org/easymock/internal/InjectionPlan.java | 8 +- .../org/easymock/internal/InjectionTarget.java | 2 +- .../main/java/org/easymock/internal/Injector.java | 24 +- .../java/org/easymock/internal/Invocation.java | 6 +- .../org/easymock/internal/JavaProxyFactory.java | 2 +- .../java/org/easymock/internal/LastControl.java | 2 +- .../org/easymock/internal/LinkedClassLoader.java | 48 ++ .../internal/MethodSerializationWrapper.java | 2 +- .../java/org/easymock/internal/MockBuilder.java | 476 ++++++------- .../easymock/internal/MockInvocationHandler.java | 2 +- .../java/org/easymock/internal/MocksBehavior.java | 70 +- .../java/org/easymock/internal/MocksControl.java | 86 ++- .../org/easymock/internal/ObjectMethodsFilter.java | 6 +- .../internal/ObjenesisClassInstantiator.java | 58 +- .../java/org/easymock/internal/PrimitiveUtils.java | 75 ++ .../src/main/java/org/easymock/internal/Range.java | 2 +- .../java/org/easymock/internal/RecordState.java | 69 +- .../org/easymock/internal/ReflectionUtils.java | 17 +- .../java/org/easymock/internal/ReplayState.java | 46 +- .../main/java/org/easymock/internal/Result.java | 33 +- .../main/java/org/easymock/internal/Results.java | 7 +- .../easymock/internal/RuntimeExceptionWrapper.java | 2 +- .../org/easymock/internal/ThrowableWrapper.java | 2 +- .../org/easymock/internal/UnorderedBehavior.java | 2 +- .../java/org/easymock/internal/matchers/And.java | 2 +- .../java/org/easymock/internal/matchers/Any.java | 2 +- .../easymock/internal/matchers/ArrayEquals.java | 2 +- .../org/easymock/internal/matchers/Captures.java | 2 +- .../org/easymock/internal/matchers/Compare.java | 2 +- .../easymock/internal/matchers/CompareEqual.java | 2 +- .../org/easymock/internal/matchers/CompareTo.java | 2 +- .../org/easymock/internal/matchers/Contains.java | 2 +- .../org/easymock/internal/matchers/EndsWith.java | 2 +- .../org/easymock/internal/matchers/Equals.java | 2 +- .../internal/matchers/EqualsWithDelta.java | 2 +- .../java/org/easymock/internal/matchers/Find.java | 2 +- .../easymock/internal/matchers/GreaterOrEqual.java | 2 +- .../easymock/internal/matchers/GreaterThan.java | 2 +- .../org/easymock/internal/matchers/InstanceOf.java | 2 +- .../easymock/internal/matchers/LessOrEqual.java | 2 +- .../org/easymock/internal/matchers/LessThan.java | 2 +- .../org/easymock/internal/matchers/Matches.java | 2 +- .../java/org/easymock/internal/matchers/Not.java | 2 +- .../org/easymock/internal/matchers/NotNull.java | 2 +- .../java/org/easymock/internal/matchers/Null.java | 2 +- .../java/org/easymock/internal/matchers/Or.java | 2 +- .../java/org/easymock/internal/matchers/Same.java | 2 +- .../org/easymock/internal/matchers/StartsWith.java | 2 +- .../samples/AnnotatedMockWithRuleTest.java | 2 +- .../samples/AnnotatedMockWithRunnerTest.java | 2 +- .../org/easymock/samples/BasicClassMockTest.java | 2 +- .../java/org/easymock/samples/ClassTested.java | 2 +- .../java/org/easymock/samples/Collaborator.java | 2 +- .../samples/ConstructorCalledMockTest.java | 180 ++--- .../java/org/easymock/samples/EnclosedTest.java | 5 +- .../java/org/easymock/samples/ExampleTest.java | 2 +- .../org/easymock/samples/PartialClassMockTest.java | 160 ++--- ...SupportTest.java => SupportDelegationTest.java} | 142 ++-- .../java/org/easymock/samples/SupportTest.java | 140 ++-- .../java/org/easymock/samples/ThrowableEquals.java | 2 +- .../easymock/internal/LinkedClassLoaderTest.java | 62 ++ .../org/easymock/internal/PrimitiveUtilsTest.java | 81 +++ .../org/easymock/tests/ArgumentToStringTest.java | 8 +- .../org/easymock/tests/BaseEasyMockRunnerTest.java | 2 +- .../org/easymock/tests/CapturesMatcherTest.java | 2 +- .../test/java/org/easymock/tests/CglibTest.java | 171 +++-- .../tests/ClassInstantiatorFactoryTest.java | 126 ++-- .../java/org/easymock/tests/ConstructorTest.java | 144 ++-- .../tests/DefaultClassInstantiatorTest.java | 434 ++++++------ .../java/org/easymock/tests/ErrorMessageTest.java | 118 ++-- .../org/easymock/tests/ExpectedMethodCallTest.java | 2 +- ...ltReturnValueTest.java => FinalEqualsTest.java} | 41 +- .../test/java/org/easymock/tests/GenericTest.java | 2 +- .../src/test/java/org/easymock/tests/IMethods.java | 4 +- .../src/test/java/org/easymock/tests/IVarArgs.java | 2 +- .../java/org/easymock/tests/InvocationTest.java | 11 +- .../java/org/easymock/tests/LimitationsTest.java | 170 ++--- .../org/easymock/tests/MatchableArgumentsTest.java | 2 +- .../tests/MethodSerializationWrapperTest.java | 2 +- .../org/easymock/tests/MockClassControlTest.java | 336 ++++----- .../test/java/org/easymock/tests/MockNameTest.java | 2 +- .../test/java/org/easymock/tests/MockTypeTest.java | 208 +++--- .../test/java/org/easymock/tests/MockingTest.java | 232 +++---- ...ceMockControlLongCompatibleReturnValueTest.java | 2 +- .../org/easymock/tests/NiceMockControlTest.java | 2 +- .../java/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 | 618 ++++++++--------- .../tests/ReplayStateInvalidCallsTest.java | 42 +- .../tests/ReplayStateInvalidUsageTest.java | 75 +- .../test/java/org/easymock/tests/ResultTest.java | 2 +- .../java/org/easymock/tests/StacktraceTest.java | 2 +- .../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 +- .../java/org/easymock/tests/UsageRangeTest.java | 12 +- .../org/easymock/tests/UsageStrictMockTest.java | 18 +- .../test/java/org/easymock/tests/UsageTest.java | 21 +- .../org/easymock/tests/UsageThrowableTest.java | 2 +- .../org/easymock/tests/UsageUnorderedTest.java | 10 +- .../java/org/easymock/tests/UsageVarargTest.java | 2 +- .../java/org/easymock/tests/UsageVerifyTest.java | 127 +++- core/src/test/java/org/easymock/tests/Util.java | 2 +- .../test/java/org/easymock/tests2/AnswerTest.java | 2 +- .../easymock/tests2/CallbackAndArgumentsTest.java | 2 +- .../java/org/easymock/tests2/CallbackTest.java | 10 +- .../test/java/org/easymock/tests2/CaptureTest.java | 2 +- .../test/java/org/easymock/tests2/ChildEquals.java | 2 +- .../easymock/tests2/ClassExtensionHelperTest.java | 8 +- .../java/org/easymock/tests2/CompareToTest.java | 2 +- .../easymock/tests2/ConstraintsToStringTest.java | 20 +- .../org/easymock/tests2/ConstructorArgsTest.java | 182 ++--- .../java/org/easymock/tests2/DelegateToTest.java | 48 +- .../easymock/tests2/EasyMockAnnotationsTest.java | 52 +- .../tests2/EasyMockClassExtensionTest.java | 756 ++++++++++----------- .../easymock/tests2/EasyMockPropertiesTest.java | 2 +- .../java/org/easymock/tests2/EasyMockRuleTest.java | 2 +- .../org/easymock/tests2/EasyMockRunnerTest.java | 2 +- .../easymock/tests2/EasyMockSupportClassTest.java | 292 ++++---- .../org/easymock/tests2/EasyMockSupportTest.java | 624 +++++++++-------- .../java/org/easymock/tests2/MockBuilderTest.java | 2 +- .../org/easymock/tests2/MockedExceptionTest.java | 244 +++---- .../java/org/easymock/tests2/MocksControlTest.java | 390 +++++------ .../test/java/org/easymock/tests2/NameTest.java | 2 +- .../java/org/easymock/tests2/NiceMockTest.java | 2 +- .../java/org/easymock/tests2/ParentEquals.java | 2 +- .../org/easymock/tests2/PartialMockingTest.java | 186 ++--- .../org/easymock/tests2/ReflectionUtilsTest.java | 8 +- .../org/easymock/tests2/SerializationTest.java | 2 +- .../test/java/org/easymock/tests2/StubTest.java | 2 +- .../java/org/easymock/tests2/ThreadingTest.java | 2 +- .../org/easymock/tests2/UsageConstraintsTest.java | 8 +- .../org/easymock/tests2/UsageMatchersTest.java | 18 +- .../org/easymock/tests2/UsageStrictMockTest.java | 18 +- .../test/java/org/easymock/tests2/UsageTest.java | 16 +- deploy-easymock.sh | 73 +- generate-changelog.sh | 19 + header.txt | 24 +- pom.xml | 73 +- test-android/.gitignore | 16 +- test-android/findbugs-exclude.xml | 2 + test-android/pom.xml | 23 +- test-android/project.properties | 2 +- test-android/src/main/AndroidManifest.xml | 2 +- .../main/java/org/easymock/android/AndroidTck.java | 9 +- test-android/src/main/res/.gitkeep | 2 +- test-deploy/LICENSE.txt | 404 +++++------ test-deploy/pom.xml | 4 +- .../test/java/org/easymock/test/EasyMockTest.java | 100 +-- .../.settings/org.eclipse.jdt.ui.prefs | 238 +++---- test-integration/LICENSE.txt | 404 +++++------ test-integration/pom.xml | 202 +++--- .../src/main/java/org/itests/StaticService.java | 52 +- .../src/test/java/org/itests/PowermockTest.java | 144 ++-- test-nodeps/.settings/org.eclipse.jdt.ui.prefs | 238 +++---- test-nodeps/LICENSE.txt | 404 +++++------ test-nodeps/pom.xml | 2 +- .../src/test/java/org/depends/Dependency.java | 9 +- .../src/test/java/org/itests/DependencyTest.java | 28 +- .../src/test/java/org/itests/FilteringRule.java | 2 +- .../src/test/java/org/itests/NoDepsTest.java | 100 +-- .../src/test/java/org/main/Main.java | 12 +- test-osgi/.settings/org.eclipse.jdt.ui.prefs | 238 +++---- test-osgi/LICENSE.txt | 404 +++++------ test-osgi/pom.xml | 370 +++++----- .../org/easymock/itests/InterfaceOnlyTest.java | 42 +- .../java/org/easymock/itests/OsgiBaseTest.java | 201 +++--- .../test/java/org/easymock/itests/OsgiTest.java | 59 +- test-osgi/src/test/resources/log4j.properties | 8 - test-osgi/src/test/resources/logback-test.xml | 29 + .../osgi/test/internal/boot-bundles.properties | 89 --- {test-nodeps => test-testng}/pom.xml | 73 +- .../org/easymock/itests/EasyMockListenerTest.java | 100 +++ .../test/java/org/easymock/itests}/IMethods.java | 4 +- .../test/java/org/easymock/itests/IVarArgs.java | 28 +- 236 files changed, 7649 insertions(+), 6682 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
