This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository easymock.
commit 6f908a400259ef441c292ee7993dacd86f4cec32
Merge: e5020ab 25f597e
Author: Markus Koschany <a...@debian.org>
Date: Thu Apr 12 19:54:34 2018 +0200
Update upstream source from tag 'upstream/3.6'
Update to upstream version '3.6'
with Debian dir 1f10846ba68175534b40a864fe654852f2f6a1a2
.travis.yml | 8 +-
README.md | 6 +-
ReleaseNotes.md | 14 +-
bench/pom.xml | 8 +-
.../org/easymock/benchmark/EasyMockBenchmark.java | 2 +-
core/findbugs-exclude.xml | 9 +-
core/pom.xml | 31 +++-
core/src/main/java/org/easymock/Capture.java | 2 +-
core/src/main/java/org/easymock/CaptureType.java | 2 +-
.../main/java/org/easymock/ConstructorArgs.java | 2 +-
core/src/main/java/org/easymock/EasyMock.java | 2 +-
.../main/java/org/easymock/EasyMockListener.java | 2 +-
core/src/main/java/org/easymock/EasyMockRule.java | 2 +-
.../src/main/java/org/easymock/EasyMockRunner.java | 2 +-
.../main/java/org/easymock/EasyMockSupport.java | 2 +-
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 | 2 +-
.../main/java/org/easymock/LogicalOperator.java | 2 +-
core/src/main/java/org/easymock/Mock.java | 2 +-
core/src/main/java/org/easymock/MockType.java | 2 +-
core/src/main/java/org/easymock/TestSubject.java | 2 +-
.../internal/AndroidClassProxyFactory.java | 2 +-
.../java/org/easymock/internal/AndroidSupport.java | 2 +-
.../org/easymock/internal/ArgumentToString.java | 2 +-
.../easymock/internal/AssertionErrorWrapper.java | 2 +-
.../easymock/internal/BridgeMethodResolver.java | 2 +-
.../internal/ClassInstantiatorFactory.java | 2 +-
.../org/easymock/internal/ClassProxyFactory.java | 12 +-
.../internal/DefaultClassInstantiator.java | 2 +-
.../org/easymock/internal/EasyMockProperties.java | 2 +-
.../org/easymock/internal/EasyMockStatement.java | 2 +-
.../java/org/easymock/internal/ErrorMessage.java | 2 +-
.../org/easymock/internal/ExpectedInvocation.java | 2 +-
.../internal/ExpectedInvocationAndResult.java | 2 +-
.../internal/ExpectedInvocationAndResults.java | 2 +-
.../org/easymock/internal/IClassInstantiator.java | 2 +-
.../java/org/easymock/internal/IMocksBehavior.java | 2 +-
.../org/easymock/internal/IMocksControlState.java | 2 +-
.../java/org/easymock/internal/IProxyFactory.java | 2 +-
.../main/java/org/easymock/internal/Injection.java | 2 +-
.../java/org/easymock/internal/InjectionPlan.java | 2 +-
.../org/easymock/internal/InjectionTarget.java | 2 +-
.../main/java/org/easymock/internal/Injector.java | 2 +-
.../java/org/easymock/internal/Invocation.java | 2 +-
.../org/easymock/internal/JavaProxyFactory.java | 2 +-
.../java/org/easymock/internal/LastControl.java | 2 +-
.../org/easymock/internal/LinkedClassLoader.java | 2 +-
.../internal/MethodSerializationWrapper.java | 2 +-
.../java/org/easymock/internal/MockBuilder.java | 42 +++--
.../easymock/internal/MockInvocationHandler.java | 2 +-
.../java/org/easymock/internal/MocksBehavior.java | 2 +-
.../java/org/easymock/internal/MocksControl.java | 11 +-
.../org/easymock/internal/ObjectMethodsFilter.java | 12 +-
.../internal/ObjenesisClassInstantiator.java | 2 +-
.../java/org/easymock/internal/PrimitiveUtils.java | 2 +-
.../src/main/java/org/easymock/internal/Range.java | 2 +-
.../java/org/easymock/internal/RecordState.java | 2 +-
.../org/easymock/internal/ReflectionUtils.java | 72 +++++++-
.../java/org/easymock/internal/ReplayState.java | 2 +-
.../main/java/org/easymock/internal/Result.java | 2 +-
.../main/java/org/easymock/internal/Results.java | 2 +-
.../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 | 2 +-
.../java/org/easymock/samples/EnclosedTest.java | 2 +-
.../java/org/easymock/samples/ExampleTest.java | 2 +-
.../org/easymock/samples/PartialClassMockTest.java | 2 +-
.../easymock/samples/SupportDelegationTest.java | 2 +-
.../java/org/easymock/samples/SupportTest.java | 2 +-
.../java/org/easymock/samples/ThrowableEquals.java | 2 +-
.../easymock/internal/LinkedClassLoaderTest.java | 2 +-
.../org/easymock/internal/PrimitiveUtilsTest.java | 2 +-
.../org/easymock/tests/ArgumentToStringTest.java | 2 +-
.../org/easymock/tests/BaseEasyMockRunnerTest.java | 2 +-
.../org/easymock/tests/CapturesMatcherTest.java | 2 +-
.../test/java/org/easymock/tests/CglibTest.java | 2 +-
.../tests/ClassInstantiatorFactoryTest.java | 2 +-
.../java/org/easymock/tests/ConstructorTest.java | 2 +-
.../tests/DefaultClassInstantiatorTest.java | 2 +-
.../java/org/easymock/tests/ErrorMessageTest.java | 2 +-
.../org/easymock/tests/ExpectedMethodCallTest.java | 2 +-
.../java/org/easymock/tests/FinalEqualsTest.java | 2 +-
.../test/java/org/easymock/tests/GenericTest.java | 2 +-
.../src/test/java/org/easymock/tests/IMethods.java | 2 +-
.../src/test/java/org/easymock/tests/IVarArgs.java | 2 +-
.../java/org/easymock/tests/InvocationTest.java | 2 +-
.../java/org/easymock/tests/LimitationsTest.java | 2 +-
.../org/easymock/tests/MatchableArgumentsTest.java | 2 +-
.../tests/MethodSerializationWrapperTest.java | 2 +-
.../org/easymock/tests/MockClassControlTest.java | 2 +-
.../test/java/org/easymock/tests/MockNameTest.java | 2 +-
.../test/java/org/easymock/tests/MockTypeTest.java | 2 +-
.../test/java/org/easymock/tests/MockingTest.java | 14 +-
...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 | 2 +-
.../tests/ReplayStateInvalidCallsTest.java | 2 +-
.../tests/ReplayStateInvalidUsageTest.java | 2 +-
.../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 | 2 +-
.../org/easymock/tests/UsageStrictMockTest.java | 2 +-
.../test/java/org/easymock/tests/UsageTest.java | 2 +-
.../org/easymock/tests/UsageThrowableTest.java | 2 +-
.../org/easymock/tests/UsageUnorderedTest.java | 2 +-
.../java/org/easymock/tests/UsageVarargTest.java | 2 +-
.../java/org/easymock/tests/UsageVerifyTest.java | 2 +-
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 | 2 +-
.../test/java/org/easymock/tests2/CaptureTest.java | 2 +-
.../test/java/org/easymock/tests2/ChildEquals.java | 2 +-
.../easymock/tests2/ClassExtensionHelperTest.java | 2 +-
.../java/org/easymock/tests2/CompareToTest.java | 2 +-
.../easymock/tests2/ConstraintsToStringTest.java | 2 +-
.../org/easymock/tests2/ConstructorArgsTest.java | 2 +-
.../java/org/easymock/tests2/DelegateToTest.java | 2 +-
.../easymock/tests2/EasyMockAnnotationsTest.java | 2 +-
.../tests2/EasyMockClassExtensionTest.java | 2 +-
.../easymock/tests2/EasyMockPropertiesTest.java | 2 +-
.../java/org/easymock/tests2/EasyMockRuleTest.java | 2 +-
.../org/easymock/tests2/EasyMockRunnerTest.java | 2 +-
.../easymock/tests2/EasyMockSupportClassTest.java | 2 +-
.../org/easymock/tests2/EasyMockSupportTest.java | 2 +-
.../java/org/easymock/tests2/MockBuilderTest.java | 17 +-
.../org/easymock/tests2/MockedExceptionTest.java | 2 +-
.../java/org/easymock/tests2/MocksControlTest.java | 18 +-
.../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 | 2 +-
.../org/easymock/tests2/ReflectionUtilsTest.java | 147 ++++++++-------
.../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 | 2 +-
.../org/easymock/tests2/UsageMatchersTest.java | 2 +-
.../org/easymock/tests2/UsageStrictMockTest.java | 2 +-
.../test/java/org/easymock/tests2/UsageTest.java | 2 +-
deploy-easymock.sh | 5 +-
findbugs-exclude.xml | 2 +
pom.xml | 43 ++++-
test-android/pom.xml | 23 +--
test-android/src/main/AndroidManifest.xml | 2 +-
.../main/java/org/easymock/android/AndroidTck.java | 2 +-
test-deploy/pom.xml | 2 +-
.../test/java/org/easymock/test/EasyMockTest.java | 2 +-
test-integration/pom.xml | 2 +-
.../src/main/java/org/itests/StaticService.java | 2 +-
.../src/test/java/org/itests/PowermockTest.java | 2 +-
test-java8/LICENSE.txt | 202 +++++++++++++++++++++
{test-nodeps => test-java8}/pom.xml | 11 +-
.../src/test/java/org/easymock/java8/IMethods.java | 12 +-
.../test/java/org/easymock/java8/Java8Test.java | 55 ++++++
.../src/test/java/org/easymock/java8/Methods.java | 54 ++++++
.../org/easymock/java8/ReflectionUtilsTest.java | 54 ++++++
test-nodeps/pom.xml | 2 +-
.../src/test/java/org/depends/Dependency.java | 2 +-
.../src/test/java/org/itests/DependencyTest.java | 2 +-
.../src/test/java/org/itests/FilteringRule.java | 2 +-
.../src/test/java/org/itests/NoDepsTest.java | 2 +-
test-nodeps/src/test/java/org/main/Main.java | 2 +-
test-osgi/pom.xml | 17 +-
.../org/easymock/itests/InterfaceOnlyTest.java | 2 +-
.../java/org/easymock/itests/OsgiBaseTest.java | 2 +-
.../test/java/org/easymock/itests/OsgiTest.java | 2 +-
test-testng/pom.xml | 10 +-
.../org/easymock/itests/EasyMockListenerTest.java | 2 +-
.../test/java/org/easymock/itests/IMethods.java | 2 +-
.../test/java/org/easymock/itests/IVarArgs.java | 2 +-
222 files changed, 909 insertions(+), 390 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/easymock.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
