[easymock] branch master updated (06eb441 -> f6591d4)
Markus Koschany
apo-guest at moszumanska.debian.org
Tue Nov 25 17:51:09 GMT 2014
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a change to branch master
in repository easymock.
from 06eb441 Merge tag 'upstream/3.2+ds'
new 0b3e38c Imported Upstream version 3.3+ds
new 1878af5 Merge tag 'upstream/3.3+ds'
new b4c96fc Update pom.xml for new release.
new 130b13d Update copyright years.
new 0afe686 Update changelog for 3.3+ds-1
new 82c545a Do not install Documentation files anymore. They are no longer provided by
new 60cd392 Exclude EasyMockAnnotationsTest to prevent a FTBFS
new f6591d4 Update Vcs-fields to new canonical address.
The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
Documentation.html | 1186 -------------------
Documentation_fr.html | 1251 --------------------
debian/build.xml | 1 +
debian/changelog | 12 +-
debian/control | 2 +-
debian/copyright | 4 +-
debian/libeasymock-java-doc.docs | 3 -
debian/pom.xml | 37 +-
easymock.css | 106 --
...ockTest.java => AnnotatedMockWithRuleTest.java} | 94 +-
...kTest.java => AnnotatedMockWithRunnerTest.java} | 10 +-
.../org/easymock/samples/BasicClassMockTest.java | 2 +-
samples/org/easymock/samples/ClassTested.java | 8 +-
samples/org/easymock/samples/Collaborator.java | 2 +-
.../samples/ConstructorCalledMockTest.java | 2 +-
samples/org/easymock/samples/ExampleTest.java | 76 +-
.../org/easymock/samples/PartialClassMockTest.java | 2 +-
samples/org/easymock/samples/SupportTest.java | 6 +-
samples/org/easymock/samples/ThrowableEquals.java | 2 +-
src/org/easymock/Capture.java | 32 +-
src/org/easymock/CaptureType.java | 2 +-
src/org/easymock/ConstructorArgs.java | 2 +-
src/org/easymock/EasyMock.java | 28 +-
src/org/easymock/EasyMockRule.java | 41 +
src/org/easymock/EasyMockRunner.java | 41 +-
src/org/easymock/EasyMockSupport.java | 126 +-
src/org/easymock/IAnswer.java | 2 +-
src/org/easymock/IArgumentMatcher.java | 2 +-
src/org/easymock/IExpectationSetters.java | 14 +-
src/org/easymock/IMockBuilder.java | 2 +-
src/org/easymock/IMocksControl.java | 2 +-
src/org/easymock/LogicalOperator.java | 2 +-
src/org/easymock/Mock.java | 18 +-
src/org/easymock/MockType.java | 2 +-
src/org/easymock/TestSubject.java | 4 +-
.../internal/AndroidClassProxyFactory.java | 2 +-
src/org/easymock/internal/AndroidSupport.java | 8 +-
src/org/easymock/internal/ArgumentToString.java | 2 +-
.../easymock/internal/AssertionErrorWrapper.java | 2 +-
.../easymock/internal/BridgeMethodResolver.java | 2 +-
.../internal/ClassInstantiatorFactory.java | 2 +-
src/org/easymock/internal/ClassProxyFactory.java | 2 +-
.../internal/DefaultClassInstantiator.java | 2 +-
src/org/easymock/internal/EasyMockProperties.java | 2 +-
.../EasyMockStatement.java} | 103 +-
src/org/easymock/internal/ErrorMessage.java | 2 +-
src/org/easymock/internal/ExpectedInvocation.java | 2 +-
.../internal/ExpectedInvocationAndResult.java | 2 +-
.../internal/ExpectedInvocationAndResults.java | 2 +-
src/org/easymock/internal/IClassInstantiator.java | 2 +-
src/org/easymock/internal/IMocksBehavior.java | 2 +-
src/org/easymock/internal/IMocksControlState.java | 4 +-
src/org/easymock/internal/IProxyFactory.java | 2 +-
src/org/easymock/internal/Injection.java | 84 ++
src/org/easymock/internal/InjectionPlan.java | 98 ++
src/org/easymock/internal/InjectionTarget.java | 76 ++
src/org/easymock/internal/Injector.java | 243 ++++
src/org/easymock/internal/Invocation.java | 2 +-
src/org/easymock/internal/JavaProxyFactory.java | 2 +-
src/org/easymock/internal/LastControl.java | 47 +-
.../internal/MethodSerializationWrapper.java | 2 +-
src/org/easymock/internal/MockBuilder.java | 2 +-
.../easymock/internal/MockInvocationHandler.java | 2 +-
src/org/easymock/internal/MocksBehavior.java | 2 +-
src/org/easymock/internal/MocksControl.java | 43 +-
src/org/easymock/internal/ObjectMethodsFilter.java | 2 +-
.../internal/ObjenesisClassInstantiator.java | 2 +-
src/org/easymock/internal/Range.java | 2 +-
src/org/easymock/internal/RecordState.java | 11 +-
src/org/easymock/internal/ReflectionUtils.java | 2 +-
src/org/easymock/internal/ReplayState.java | 6 +-
src/org/easymock/internal/Result.java | 2 +-
src/org/easymock/internal/Results.java | 2 +-
.../easymock/internal/RuntimeExceptionWrapper.java | 2 +-
src/org/easymock/internal/ThrowableWrapper.java | 2 +-
src/org/easymock/internal/UnorderedBehavior.java | 2 +-
src/org/easymock/internal/matchers/And.java | 2 +-
src/org/easymock/internal/matchers/Any.java | 2 +-
.../easymock/internal/matchers/ArrayEquals.java | 2 +-
src/org/easymock/internal/matchers/Captures.java | 2 +-
src/org/easymock/internal/matchers/Compare.java | 2 +-
.../easymock/internal/matchers/CompareEqual.java | 2 +-
src/org/easymock/internal/matchers/CompareTo.java | 2 +-
src/org/easymock/internal/matchers/Contains.java | 2 +-
src/org/easymock/internal/matchers/EndsWith.java | 2 +-
src/org/easymock/internal/matchers/Equals.java | 2 +-
.../internal/matchers/EqualsWithDelta.java | 2 +-
src/org/easymock/internal/matchers/Find.java | 2 +-
.../easymock/internal/matchers/GreaterOrEqual.java | 2 +-
.../easymock/internal/matchers/GreaterThan.java | 2 +-
src/org/easymock/internal/matchers/InstanceOf.java | 2 +-
.../easymock/internal/matchers/LessOrEqual.java | 2 +-
src/org/easymock/internal/matchers/LessThan.java | 2 +-
src/org/easymock/internal/matchers/Matches.java | 2 +-
src/org/easymock/internal/matchers/Not.java | 2 +-
src/org/easymock/internal/matchers/NotNull.java | 2 +-
src/org/easymock/internal/matchers/Null.java | 2 +-
src/org/easymock/internal/matchers/Or.java | 2 +-
src/org/easymock/internal/matchers/Same.java | 2 +-
src/org/easymock/internal/matchers/StartsWith.java | 2 +-
tests/org/easymock/tests/ArgumentToStringTest.java | 2 +-
.../org/easymock/tests/BaseEasyMockRunnerTest.java | 2 +-
tests/org/easymock/tests/CapturesMatcherTest.java | 2 +-
tests/org/easymock/tests/CglibTest.java | 13 +-
.../tests/ClassInstantiatorFactoryTest.java | 2 +-
tests/org/easymock/tests/ConstructorTest.java | 2 +-
.../tests/DefaultClassInstantiatorTest.java | 2 +-
tests/org/easymock/tests/ErrorMessageTest.java | 2 +-
.../org/easymock/tests/ExpectedMethodCallTest.java | 2 +-
tests/org/easymock/tests/GenericTest.java | 2 +-
tests/org/easymock/tests/IMethods.java | 2 +-
tests/org/easymock/tests/IVarArgs.java | 2 +-
tests/org/easymock/tests/InvocationTest.java | 2 +-
tests/org/easymock/tests/LimitationsTest.java | 2 +-
.../org/easymock/tests/MatchableArgumentsTest.java | 2 +-
.../tests/MethodSerializationWrapperTest.java | 2 +-
tests/org/easymock/tests/MockClassControlTest.java | 2 +-
tests/org/easymock/tests/MockNameTest.java | 2 +-
tests/org/easymock/tests/MockTypeTest.java | 2 +-
tests/org/easymock/tests/MockingTest.java | 2 +-
...ceMockControlLongCompatibleReturnValueTest.java | 2 +-
tests/org/easymock/tests/NiceMockControlTest.java | 2 +-
tests/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 | 12 +-
.../tests/ReplayStateInvalidCallsTest.java | 7 +-
.../tests/ReplayStateInvalidUsageTest.java | 2 +-
tests/org/easymock/tests/ResultTest.java | 2 +-
tests/org/easymock/tests/StacktraceTest.java | 2 +-
tests/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 +-
tests/org/easymock/tests/UsageRangeTest.java | 2 +-
tests/org/easymock/tests/UsageStrictMockTest.java | 2 +-
tests/org/easymock/tests/UsageTest.java | 43 +-
tests/org/easymock/tests/UsageThrowableTest.java | 2 +-
tests/org/easymock/tests/UsageUnorderedTest.java | 2 +-
tests/org/easymock/tests/UsageVarargTest.java | 2 +-
tests/org/easymock/tests/UsageVerifyTest.java | 2 +-
tests/org/easymock/tests/Util.java | 2 +-
tests/org/easymock/tests2/AnswerTest.java | 2 +-
.../easymock/tests2/CallbackAndArgumentsTest.java | 2 +-
tests/org/easymock/tests2/CallbackTest.java | 2 +-
tests/org/easymock/tests2/CaptureTest.java | 84 +-
tests/org/easymock/tests2/ChildEquals.java | 2 +-
.../easymock/tests2/ClassExtensionHelperTest.java | 2 +-
tests/org/easymock/tests2/CompareToTest.java | 2 +-
.../easymock/tests2/ConstraintsToStringTest.java | 2 +-
tests/org/easymock/tests2/ConstructorArgsTest.java | 2 +-
tests/org/easymock/tests2/DelegateToTest.java | 2 +-
tests/org/easymock/tests2/DependencyTest.java | 2 +-
.../easymock/tests2/EasyMockAnnotationsTest.java | 347 ++++++
.../tests2/EasyMockClassExtensionTest.java | 2 +-
.../easymock/tests2/EasyMockPropertiesTest.java | 2 +-
.../{ChildEquals.java => EasyMockRuleTest.java} | 18 +-
tests/org/easymock/tests2/EasyMockRunnerTest.java | 97 +-
.../easymock/tests2/EasyMockSupportClassTest.java | 2 +-
tests/org/easymock/tests2/EasyMockSupportTest.java | 2 +-
tests/org/easymock/tests2/FilteringRule.java | 2 +-
tests/org/easymock/tests2/MockBuilderTest.java | 2 +-
tests/org/easymock/tests2/MockedExceptionTest.java | 2 +-
tests/org/easymock/tests2/MocksControlTest.java | 13 +-
tests/org/easymock/tests2/NameTest.java | 2 +-
tests/org/easymock/tests2/NiceMockTest.java | 2 +-
tests/org/easymock/tests2/ParentEquals.java | 2 +-
tests/org/easymock/tests2/PartialMockingTest.java | 2 +-
tests/org/easymock/tests2/ReflectionUtilsTest.java | 2 +-
tests/org/easymock/tests2/SerializationTest.java | 2 +-
tests/org/easymock/tests2/StubTest.java | 2 +-
tests/org/easymock/tests2/ThreadingTest.java | 2 +-
.../org/easymock/tests2/UsageConstraintsTest.java | 2 +-
tests/org/easymock/tests2/UsageMatchersTest.java | 2 +-
tests/org/easymock/tests2/UsageStrictMockTest.java | 2 +-
tests/org/easymock/tests2/UsageTest.java | 2 +-
187 files changed, 1533 insertions(+), 3214 deletions(-)
delete mode 100644 Documentation.html
delete mode 100644 Documentation_fr.html
delete mode 100644 easymock.css
copy samples/org/easymock/samples/{AnnotatedMockTest.java => AnnotatedMockWithRuleTest.java} (74%)
rename samples/org/easymock/samples/{AnnotatedMockTest.java => AnnotatedMockWithRunnerTest.java} (81%)
create mode 100644 src/org/easymock/EasyMockRule.java
copy src/org/easymock/{EasyMockRunner.java => internal/EasyMockStatement.java} (58%)
create mode 100644 src/org/easymock/internal/Injection.java
create mode 100644 src/org/easymock/internal/InjectionPlan.java
create mode 100644 src/org/easymock/internal/InjectionTarget.java
create mode 100644 src/org/easymock/internal/Injector.java
create mode 100644 tests/org/easymock/tests2/EasyMockAnnotationsTest.java
copy tests/org/easymock/tests2/{ChildEquals.java => EasyMockRuleTest.java} (62%)
--
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