[easymock] 41/41: Merge tag 'upstream/3.2+ds'
Markus Koschany
apo-guest at moszumanska.debian.org
Tue Nov 25 16:49:14 GMT 2014
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository easymock.
commit 06eb44140152dc2576b24a42f1ba0e4f83cff62d
Merge: 640cf0d 5f3e743
Author: Markus Koschany <apo at gambaru.de>
Date: Tue Nov 25 17:48:13 2014 +0100
Merge tag 'upstream/3.2+ds'
Upstream version 3.2+ds
# gpg: Unterschrift vom Di 25 Nov 2014 17:48:12 CET mittels RSA-Schlüssel ID 513B51E4
# gpg: Korrekte Unterschrift von "Markus Koschany <apo at gambaru.de>" [uneingeschränkt]
# gpg: alias "Markus Koschany <markus at koschany.net>" [uneingeschränkt]
Documentation.html | 2179 ++++++-----
Documentation_fr.html | 2293 ++++++------
LICENSE.txt | 202 ++
License.html | 33 -
easymock.css | 57 +-
.../org/easymock/samples/AnnotatedMockTest.java | 46 +
.../org/easymock/samples/BasicClassMockTest.java | 101 +
samples/org/easymock/samples/ClassTested.java | 91 +
samples/org/easymock/samples/ClassUnderTest.java | 93 -
samples/org/easymock/samples/Collaborator.java | 48 +-
.../samples/ConstructorCalledMockTest.java | 90 +
samples/org/easymock/samples/ExampleTest.java | 271 +-
.../org/easymock/samples/PartialClassMockTest.java | 80 +
samples/org/easymock/samples/SupportTest.java | 70 +
samples/org/easymock/samples/ThrowableEquals.java | 93 +-
src/org/easymock/AbstractMatcher.java | 125 -
src/org/easymock/ArgumentsMatcher.java | 42 -
src/org/easymock/Capture.java | 206 +-
src/org/easymock/CaptureType.java | 44 +
src/org/easymock/ConstructorArgs.java | 103 +
src/org/easymock/EasyMock.java | 3828 +++++++++++---------
src/org/easymock/EasyMockRunner.java | 58 +
src/org/easymock/EasyMockSupport.java | 728 ++++
src/org/easymock/IAnswer.java | 63 +-
src/org/easymock/IArgumentMatcher.java | 87 +-
src/org/easymock/IExpectationSetters.java | 269 +-
src/org/easymock/IMockBuilder.java | 336 ++
src/org/easymock/IMocksControl.java | 266 +-
src/org/easymock/LogicalOperator.java | 114 +-
src/org/easymock/Mock.java | 42 +
src/org/easymock/MockControl.java | 597 ---
src/org/easymock/MockType.java | 31 +
src/org/easymock/TestSubject.java | 34 +
src/org/easymock/internal/AlwaysMatcher.java | 21 -
.../internal/AndroidClassProxyFactory.java | 101 +
src/org/easymock/internal/AndroidSupport.java | 37 +
src/org/easymock/internal/ArgumentToString.java | 97 +
src/org/easymock/internal/ArrayMatcher.java | 24 -
.../easymock/internal/AssertionErrorWrapper.java | 54 +-
.../easymock/internal/BridgeMethodResolver.java | 444 +++
.../internal/ClassInstantiatorFactory.java | 81 +
src/org/easymock/internal/ClassProxyFactory.java | 285 ++
.../internal/DefaultClassInstantiator.java | 206 ++
src/org/easymock/internal/EasyMockProperties.java | 139 +
src/org/easymock/internal/EqualsMatcher.java | 13 -
src/org/easymock/internal/ErrorMessage.java | 60 +
src/org/easymock/internal/ExpectedInvocation.java | 241 +-
.../internal/ExpectedInvocationAndResult.java | 71 +-
.../internal/ExpectedInvocationAndResults.java | 81 +-
src/org/easymock/internal/IClassInstantiator.java | 36 +
.../easymock/internal/ILegacyMatcherMethods.java | 16 -
src/org/easymock/internal/ILegacyMethods.java | 13 -
src/org/easymock/internal/IMocksBehavior.java | 70 +-
src/org/easymock/internal/IMocksControlState.java | 96 +-
src/org/easymock/internal/IProxyFactory.java | 58 +-
src/org/easymock/internal/Invocation.java | 391 +-
src/org/easymock/internal/JavaProxyFactory.java | 52 +-
src/org/easymock/internal/LastControl.java | 245 +-
.../easymock/internal/LegacyMatcherProvider.java | 56 -
.../internal/MethodSerializationWrapper.java | 147 +-
src/org/easymock/internal/MockBuilder.java | 239 ++
.../easymock/internal/MockInvocationHandler.java | 93 +-
src/org/easymock/internal/MocksBehavior.java | 366 +-
src/org/easymock/internal/MocksControl.java | 671 ++--
src/org/easymock/internal/ObjectMethodsFilter.java | 223 +-
.../internal/ObjenesisClassInstantiator.java | 29 +
src/org/easymock/internal/Range.java | 158 +-
src/org/easymock/internal/RecordState.java | 686 ++--
src/org/easymock/internal/ReflectionUtils.java | 233 ++
src/org/easymock/internal/ReplayState.java | 288 +-
src/org/easymock/internal/Result.java | 186 +-
src/org/easymock/internal/Results.java | 185 +-
.../easymock/internal/RuntimeExceptionWrapper.java | 54 +-
src/org/easymock/internal/ThrowableWrapper.java | 54 +-
src/org/easymock/internal/UnorderedBehavior.java | 205 +-
src/org/easymock/internal/matchers/And.java | 98 +-
src/org/easymock/internal/matchers/Any.java | 70 +-
.../easymock/internal/matchers/ArrayEquals.java | 144 +-
src/org/easymock/internal/matchers/Captures.java | 90 +-
src/org/easymock/internal/matchers/Compare.java | 100 +-
.../easymock/internal/matchers/CompareEqual.java | 65 +-
src/org/easymock/internal/matchers/CompareTo.java | 93 +-
src/org/easymock/internal/matchers/Contains.java | 71 +-
src/org/easymock/internal/matchers/EndsWith.java | 70 +-
src/org/easymock/internal/matchers/Equals.java | 127 +-
.../internal/matchers/EqualsWithDelta.java | 82 +-
src/org/easymock/internal/matchers/Find.java | 73 +-
.../easymock/internal/matchers/GreaterOrEqual.java | 65 +-
.../easymock/internal/matchers/GreaterThan.java | 65 +-
src/org/easymock/internal/matchers/InstanceOf.java | 70 +-
.../easymock/internal/matchers/LessOrEqual.java | 65 +-
src/org/easymock/internal/matchers/LessThan.java | 65 +-
src/org/easymock/internal/matchers/Matches.java | 71 +-
src/org/easymock/internal/matchers/Not.java | 74 +-
src/org/easymock/internal/matchers/NotNull.java | 70 +-
src/org/easymock/internal/matchers/Null.java | 68 +-
src/org/easymock/internal/matchers/Or.java | 98 +-
src/org/easymock/internal/matchers/Same.java | 85 +-
src/org/easymock/internal/matchers/StartsWith.java | 71 +-
tests/org/easymock/tests/ArgumentToStringTest.java | 83 +
tests/org/easymock/tests/ArgumentsMatcherTest.java | 143 -
tests/org/easymock/tests/ArrayMatcherTest.java | 108 -
.../org/easymock/tests/BaseEasyMockRunnerTest.java | 26 +
tests/org/easymock/tests/CapturesMatcherTest.java | 114 +-
tests/org/easymock/tests/CglibTest.java | 70 +
.../tests/ClassInstantiatorFactoryTest.java | 63 +
tests/org/easymock/tests/ConstructorTest.java | 72 +
.../tests/DefaultClassInstantiatorTest.java | 217 ++
tests/org/easymock/tests/DefaultMatcherTest.java | 94 -
tests/org/easymock/tests/EqualsMatcherTest.java | 33 -
tests/org/easymock/tests/ErrorMessageTest.java | 59 +
.../org/easymock/tests/ExpectedMethodCallTest.java | 85 +-
tests/org/easymock/tests/GenericTest.java | 123 +
tests/org/easymock/tests/IMethods.java | 190 +-
tests/org/easymock/tests/IVarArgs.java | 68 +-
tests/org/easymock/tests/InvocationTest.java | 204 +-
tests/org/easymock/tests/LegacyBehaviorTests.java | 66 -
tests/org/easymock/tests/LimitationsTest.java | 85 +
.../org/easymock/tests/MatchableArgumentsTest.java | 99 +-
.../tests/MethodSerializationWrapperTest.java | 68 +-
tests/org/easymock/tests/MockClassControlTest.java | 168 +
tests/org/easymock/tests/MockNameTest.java | 59 +-
tests/org/easymock/tests/MockTypeTest.java | 104 +
tests/org/easymock/tests/MockingTest.java | 147 +
...ceMockControlLongCompatibleReturnValueTest.java | 120 +-
tests/org/easymock/tests/NiceMockControlTest.java | 109 +-
tests/org/easymock/tests/ObjectMethodsTest.java | 171 +-
.../RecordStateInvalidDefaultReturnValueTest.java | 136 +-
.../RecordStateInvalidDefaultThrowableTest.java | 155 +-
.../tests/RecordStateInvalidMatcherTest.java | 75 -
.../tests/RecordStateInvalidRangeTest.java | 166 +-
.../tests/RecordStateInvalidReturnValueTest.java | 214 +-
.../tests/RecordStateInvalidStateChangeTest.java | 140 +-
.../tests/RecordStateInvalidThrowableTest.java | 158 +-
.../tests/RecordStateInvalidUsageTest.java | 220 +-
.../tests/RecordStateMethodCallMissingTest.java | 263 +-
.../tests/ReplayStateInvalidCallsTest.java | 289 +-
.../tests/ReplayStateInvalidUsageTest.java | 583 +--
tests/org/easymock/tests/ResultTest.java | 83 +-
tests/org/easymock/tests/StacktraceTest.java | 223 +-
tests/org/easymock/tests/UsageCallCountTest.java | 276 +-
.../tests/UsageDefaultReturnValueTest.java | 256 +-
.../tests/UsageExpectAndDefaultReturnTest.java | 160 +-
.../tests/UsageExpectAndDefaultThrowTest.java | 315 +-
.../easymock/tests/UsageExpectAndReturnTest.java | 404 ++-
.../easymock/tests/UsageExpectAndThrowTest.java | 780 ++--
.../tests/UsageFloatingPointReturnValueTest.java | 117 +-
.../tests/UsageLongCompatibleReturnValueTest.java | 204 +-
.../tests/UsageOverloadedDefaultValueTest.java | 223 +-
.../easymock/tests/UsageOverloadedMethodTest.java | 317 +-
tests/org/easymock/tests/UsageRangeTest.java | 203 +-
tests/org/easymock/tests/UsageStrictMockTest.java | 471 ++-
tests/org/easymock/tests/UsageTest.java | 422 ++-
tests/org/easymock/tests/UsageThrowableTest.java | 286 +-
tests/org/easymock/tests/UsageUnorderedTest.java | 109 +-
tests/org/easymock/tests/UsageVarargTest.java | 342 +-
tests/org/easymock/tests/UsageVerifyTest.java | 305 +-
tests/org/easymock/tests/Util.java | 55 +-
tests/org/easymock/tests2/AnswerTest.java | 320 +-
.../easymock/tests2/CallbackAndArgumentsTest.java | 186 +-
tests/org/easymock/tests2/CallbackTest.java | 188 +-
tests/org/easymock/tests2/CaptureTest.java | 506 ++-
tests/org/easymock/tests2/ChildEquals.java | 25 +
.../easymock/tests2/ClassExtensionHelperTest.java | 118 +
tests/org/easymock/tests2/CompareToTest.java | 172 +-
.../easymock/tests2/ConstraintsToStringTest.java | 326 +-
tests/org/easymock/tests2/ConstructorArgsTest.java | 91 +
tests/org/easymock/tests2/DelegateToTest.java | 138 +
tests/org/easymock/tests2/DependencyTest.java | 74 +
.../tests2/EasyMockClassExtensionTest.java | 384 ++
.../easymock/tests2/EasyMockPropertiesTest.java | 256 ++
tests/org/easymock/tests2/EasyMockRunnerTest.java | 112 +
.../easymock/tests2/EasyMockSupportClassTest.java | 206 ++
tests/org/easymock/tests2/EasyMockSupportTest.java | 273 ++
tests/org/easymock/tests2/FilteringRule.java | 165 +
tests/org/easymock/tests2/MockBuilderTest.java | 355 ++
tests/org/easymock/tests2/MockedExceptionTest.java | 122 +
tests/org/easymock/tests2/MocksControlTest.java | 199 +
tests/org/easymock/tests2/NameTest.java | 171 +-
tests/org/easymock/tests2/NiceMockTest.java | 108 +-
tests/org/easymock/tests2/ParentEquals.java | 25 +
tests/org/easymock/tests2/PartialMockingTest.java | 93 +
tests/org/easymock/tests2/ReflectionUtilsTest.java | 169 +
tests/org/easymock/tests2/SerializationTest.java | 174 +-
tests/org/easymock/tests2/StubTest.java | 158 +-
tests/org/easymock/tests2/ThreadingTest.java | 295 +-
.../org/easymock/tests2/UsageConstraintsTest.java | 1294 +++----
tests/org/easymock/tests2/UsageMatchersTest.java | 58 +-
tests/org/easymock/tests2/UsageStrictMockTest.java | 408 ++-
tests/org/easymock/tests2/UsageTest.java | 617 ++--
190 files changed, 24654 insertions(+), 15505 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/easymock.git
More information about the pkg-java-commits
mailing list