[easymock] 39/41: Merge tag 'upstream/2.4+ds1'

Markus Koschany apo-guest at moszumanska.debian.org
Tue Nov 25 16:49:13 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 640cf0d57f867d28036b3f39db6c009abd64d8ad
Merge: 1ec9e17 560caa5
Author: Markus Koschany <apo at gambaru.de>
Date:   Tue Nov 25 17:48:03 2014 +0100

    Merge tag 'upstream/2.4+ds1'
    
    Upstream version 2.4+ds1
    
    # gpg: Unterschrift vom Di 25 Nov 2014 17:48:02 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                                 |  993 ++++++++++++
 Documentation_fr.html                              | 1042 +++++++++++++
 License.html                                       |   33 +
 easymock.css                                       |   55 +
 samples/org/easymock/samples/ClassUnderTest.java   |   93 ++
 samples/org/easymock/samples/Collaborator.java     |   17 +
 samples/org/easymock/samples/ExampleTest.java      |  116 ++
 samples/org/easymock/samples/ThrowableEquals.java  |   40 +
 src/org/easymock/AbstractMatcher.java              |  125 ++
 src/org/easymock/ArgumentsMatcher.java             |   42 +
 src/org/easymock/Capture.java                      |   67 +
 src/org/easymock/EasyMock.java                     | 1632 ++++++++++++++++++++
 src/org/easymock/IAnswer.java                      |   23 +
 src/org/easymock/IArgumentMatcher.java             |   36 +
 src/org/easymock/IExpectationSetters.java          |  115 ++
 src/org/easymock/IMocksControl.java                |   75 +
 src/org/easymock/LogicalOperator.java              |   48 +
 src/org/easymock/MockControl.java                  |  597 +++++++
 src/org/easymock/internal/AlwaysMatcher.java       |   21 +
 src/org/easymock/internal/ArrayMatcher.java        |   24 +
 .../easymock/internal/AssertionErrorWrapper.java   |   20 +
 src/org/easymock/internal/EqualsMatcher.java       |   13 +
 src/org/easymock/internal/ExpectedInvocation.java  |  122 ++
 .../internal/ExpectedInvocationAndResult.java      |   30 +
 .../internal/ExpectedInvocationAndResults.java     |   35 +
 .../easymock/internal/ILegacyMatcherMethods.java   |   16 +
 src/org/easymock/internal/ILegacyMethods.java      |   13 +
 src/org/easymock/internal/IMocksBehavior.java      |   27 +
 src/org/easymock/internal/IMocksControlState.java  |   38 +
 src/org/easymock/internal/IProxyFactory.java       |   11 +
 src/org/easymock/internal/Invocation.java          |  168 ++
 src/org/easymock/internal/JavaProxyFactory.java    |   16 +
 src/org/easymock/internal/LastControl.java         |  110 ++
 .../easymock/internal/LegacyMatcherProvider.java   |   56 +
 .../internal/MethodSerializationWrapper.java       |   66 +
 .../easymock/internal/MockInvocationHandler.java   |   41 +
 src/org/easymock/internal/MocksBehavior.java       |  162 ++
 src/org/easymock/internal/MocksControl.java        |  279 ++++
 src/org/easymock/internal/ObjectMethodsFilter.java |   98 ++
 src/org/easymock/internal/Range.java               |   73 +
 src/org/easymock/internal/RecordState.java         |  346 +++++
 src/org/easymock/internal/ReplayState.java         |  132 ++
 src/org/easymock/internal/Result.java              |   69 +
 src/org/easymock/internal/Results.java             |   78 +
 .../easymock/internal/RuntimeExceptionWrapper.java |   20 +
 src/org/easymock/internal/ThrowableWrapper.java    |   20 +
 src/org/easymock/internal/UnorderedBehavior.java   |   95 ++
 src/org/easymock/internal/matchers/And.java        |   42 +
 src/org/easymock/internal/matchers/Any.java        |   28 +
 .../easymock/internal/matchers/ArrayEquals.java    |   81 +
 src/org/easymock/internal/matchers/Captures.java   |   31 +
 src/org/easymock/internal/matchers/Compare.java    |   42 +
 .../easymock/internal/matchers/CompareEqual.java   |   24 +
 src/org/easymock/internal/matchers/CompareTo.java  |   38 +
 src/org/easymock/internal/matchers/Contains.java   |   29 +
 src/org/easymock/internal/matchers/EndsWith.java   |   28 +
 src/org/easymock/internal/matchers/Equals.java     |   61 +
 .../internal/matchers/EqualsWithDelta.java         |   35 +
 src/org/easymock/internal/matchers/Find.java       |   30 +
 .../easymock/internal/matchers/GreaterOrEqual.java |   24 +
 .../easymock/internal/matchers/GreaterThan.java    |   24 +
 src/org/easymock/internal/matchers/InstanceOf.java |   28 +
 .../easymock/internal/matchers/LessOrEqual.java    |   24 +
 src/org/easymock/internal/matchers/LessThan.java   |   24 +
 src/org/easymock/internal/matchers/Matches.java    |   29 +
 src/org/easymock/internal/matchers/Not.java        |   30 +
 src/org/easymock/internal/matchers/NotNull.java    |   28 +
 src/org/easymock/internal/matchers/Null.java       |   27 +
 src/org/easymock/internal/matchers/Or.java         |   42 +
 src/org/easymock/internal/matchers/Same.java       |   40 +
 src/org/easymock/internal/matchers/StartsWith.java |   29 +
 tests/org/easymock/tests/ArgumentsMatcherTest.java |  143 ++
 tests/org/easymock/tests/ArrayMatcherTest.java     |  108 ++
 tests/org/easymock/tests/CapturesMatcherTest.java  |   37 +
 tests/org/easymock/tests/DefaultMatcherTest.java   |   94 ++
 tests/org/easymock/tests/EqualsMatcherTest.java    |   33 +
 .../org/easymock/tests/ExpectedMethodCallTest.java |   37 +
 tests/org/easymock/tests/IMethods.java             |   88 ++
 tests/org/easymock/tests/IVarArgs.java             |   27 +
 tests/org/easymock/tests/InvocationTest.java       |   87 ++
 tests/org/easymock/tests/LegacyBehaviorTests.java  |   66 +
 .../org/easymock/tests/MatchableArgumentsTest.java |   45 +
 .../tests/MethodSerializationWrapperTest.java      |   24 +
 tests/org/easymock/tests/MockNameTest.java         |   24 +
 ...ceMockControlLongCompatibleReturnValueTest.java |   56 +
 tests/org/easymock/tests/NiceMockControlTest.java  |   49 +
 tests/org/easymock/tests/ObjectMethodsTest.java    |   81 +
 .../RecordStateInvalidDefaultReturnValueTest.java  |   91 ++
 .../RecordStateInvalidDefaultThrowableTest.java    |   81 +
 .../tests/RecordStateInvalidMatcherTest.java       |   75 +
 .../tests/RecordStateInvalidRangeTest.java         |   74 +
 .../tests/RecordStateInvalidReturnValueTest.java   |  147 ++
 .../tests/RecordStateInvalidStateChangeTest.java   |   66 +
 .../tests/RecordStateInvalidThrowableTest.java     |   81 +
 .../tests/RecordStateInvalidUsageTest.java         |  157 ++
 .../tests/RecordStateMethodCallMissingTest.java    |  302 ++++
 .../tests/ReplayStateInvalidCallsTest.java         |  139 ++
 .../tests/ReplayStateInvalidUsageTest.java         |  473 ++++++
 tests/org/easymock/tests/ResultTest.java           |   24 +
 tests/org/easymock/tests/StacktraceTest.java       |   83 +
 tests/org/easymock/tests/UsageCallCountTest.java   |  133 ++
 .../tests/UsageDefaultReturnValueTest.java         |  126 ++
 .../tests/UsageExpectAndDefaultReturnTest.java     |   76 +
 .../tests/UsageExpectAndDefaultThrowTest.java      |  156 ++
 .../easymock/tests/UsageExpectAndReturnTest.java   |  199 +++
 .../easymock/tests/UsageExpectAndThrowTest.java    |  387 +++++
 .../tests/UsageFloatingPointReturnValueTest.java   |   54 +
 .../tests/UsageLongCompatibleReturnValueTest.java  |   99 ++
 .../tests/UsageOverloadedDefaultValueTest.java     |  112 ++
 .../easymock/tests/UsageOverloadedMethodTest.java  |  165 ++
 tests/org/easymock/tests/UsageRangeTest.java       |  106 ++
 tests/org/easymock/tests/UsageStrictMockTest.java  |  239 +++
 tests/org/easymock/tests/UsageTest.java            |  217 +++
 tests/org/easymock/tests/UsageThrowableTest.java   |  143 ++
 tests/org/easymock/tests/UsageUnorderedTest.java   |   49 +
 tests/org/easymock/tests/UsageVarargTest.java      |  149 ++
 tests/org/easymock/tests/UsageVerifyTest.java      |  154 ++
 tests/org/easymock/tests/Util.java                 |   16 +
 tests/org/easymock/tests2/AnswerTest.java          |  148 ++
 .../easymock/tests2/CallbackAndArgumentsTest.java  |   86 ++
 tests/org/easymock/tests2/CallbackTest.java        |   87 ++
 tests/org/easymock/tests2/CaptureTest.java         |  158 ++
 tests/org/easymock/tests2/CompareToTest.java       |   79 +
 .../easymock/tests2/ConstraintsToStringTest.java   |  147 ++
 tests/org/easymock/tests2/NameTest.java            |   75 +
 tests/org/easymock/tests2/NiceMockTest.java        |   47 +
 tests/org/easymock/tests2/SerializationTest.java   |   49 +
 tests/org/easymock/tests2/StubTest.java            |   72 +
 tests/org/easymock/tests2/ThreadingTest.java       |   91 ++
 .../org/easymock/tests2/UsageConstraintsTest.java  |  641 ++++++++
 tests/org/easymock/tests2/UsageMatchersTest.java   |   22 +
 tests/org/easymock/tests2/UsageStrictMockTest.java |  200 +++
 tests/org/easymock/tests2/UsageTest.java           |  305 ++++
 133 files changed, 15745 insertions(+)

-- 
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