49ce6eaa609cd48b55ae0387dbeb32ee8761bc63 - platform/external/mockito

commit	49ce6eaa609cd48b55ae0387dbeb32ee8761bc63	[log] [tgz]
author	Garfield Tan <xutan@google.com>	Tue Sep 10 10:59:56 2019 -0700
committer	Garfield Tan <xutan@google.com>	Tue Sep 10 15:27:13 2019 -0700
tree	bc8b6ddef81b0693a169e714db156fcb1378371b
parent	c8600e6ec88a49c46f00d772e24c0139738a1020 [diff]

Revert "Update to Mockito v2.25.7."

This reverts commit e14b62991dfb625a81997be77825455fdce66ebd.

Bug: 140773999
Test: Builds.
Change-Id: I299dabdf4fdb30845de3415ed8b2f727c5011098

Android.bp[diff]
README.version[diff]
lib/byte-buddy-1.8.15-sources.jar[Added - diff]
lib/byte-buddy-1.8.15.jar[Added - diff]
lib/byte-buddy-1.8.15.jar.txt[Renamed from lib/byte-buddy-1.9.10.jar.txt - diff]
lib/byte-buddy-1.9.10-sources.jar[Deleted - diff]
lib/byte-buddy-1.9.10.jar[Deleted - diff]
lib/byte-buddy-agent-1.8.15-sources.jar[Added - diff]
lib/byte-buddy-agent-1.8.15.jar[Added - diff]
lib/byte-buddy-agent-1.8.15.jar.txt[Copied from lib/byte-buddy-1.9.10.jar.txt - diff]
lib/byte-buddy-agent-1.9.10-sources.jar[Deleted - diff]
lib/byte-buddy-agent-1.9.10.jar[Deleted - diff]
lib/byte-buddy-agent-1.9.10.jar.txt[Deleted - diff]
lib/opentest4j-1.1.1-sources.jar[Deleted - diff]
lib/opentest4j-1.1.1.jar[Deleted - diff]
lib/opentest4j-1.1.1.jar.txt[Deleted - diff]
src/main/java/org/mockito/AdditionalAnswers.java[diff]
src/main/java/org/mockito/ArgumentCaptor.java[diff]
src/main/java/org/mockito/ArgumentMatchers.java[diff]
src/main/java/org/mockito/Mock.java[diff]
src/main/java/org/mockito/MockSettings.java[diff]
src/main/java/org/mockito/Mockito.java[diff]
src/main/java/org/mockito/MockitoFramework.java[diff]
src/main/java/org/mockito/MockitoSession.java[diff]
src/main/java/org/mockito/exceptions/misusing/InjectMocksException.java[Deleted - diff]
src/main/java/org/mockito/exceptions/verification/ArgumentsAreDifferent.java[diff]
src/main/java/org/mockito/exceptions/verification/junit/package-info.java[diff]
src/main/java/org/mockito/exceptions/verification/opentest4j/ArgumentsAreDifferent.java[Deleted - diff]
src/main/java/org/mockito/exceptions/verification/opentest4j/package-info.java[Deleted - diff]
src/main/java/org/mockito/internal/MockitoCore.java[diff]
src/main/java/org/mockito/internal/configuration/InjectingAnnotationEngine.java[diff]
src/main/java/org/mockito/internal/configuration/MockAnnotationProcessor.java[diff]
src/main/java/org/mockito/internal/configuration/plugins/DefaultMockitoPlugins.java[diff]
src/main/java/org/mockito/internal/configuration/plugins/PluginRegistry.java[diff]
src/main/java/org/mockito/internal/configuration/plugins/Plugins.java[diff]
src/main/java/org/mockito/internal/creation/MockSettingsImpl.java[diff]
src/main/java/org/mockito/internal/creation/SuspendMethod.java[diff]
src/main/java/org/mockito/internal/creation/bytebuddy/InlineByteBuddyMockMaker.java[diff]
src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java[diff]
src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodAdvice.java[diff]
src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodInterceptor.java[diff]
src/main/java/org/mockito/internal/creation/bytebuddy/ModuleHandler.java[Deleted - diff]
src/main/java/org/mockito/internal/creation/bytebuddy/SubclassBytecodeGenerator.java[diff]
src/main/java/org/mockito/internal/creation/bytebuddy/SubclassInjectionLoader.java[diff]
src/main/java/org/mockito/internal/creation/bytebuddy/SubclassLoader.java[diff]
src/main/java/org/mockito/internal/creation/bytebuddy/inject/MockMethodDispatcher.java[Deleted - diff]
src/main/java/org/mockito/internal/creation/bytebuddy/inject/package-info.java[Deleted - diff]
src/main/java/org/mockito/internal/creation/settings/CreationSettings.java[diff]
src/main/java/org/mockito/internal/debugging/LocationImpl.java[diff]
src/main/java/org/mockito/internal/exceptions/Reporter.java[diff]
src/main/java/org/mockito/internal/exceptions/stacktrace/StackTraceFilter.java[diff]
src/main/java/org/mockito/internal/framework/DefaultMockitoFramework.java[diff]
src/main/java/org/mockito/internal/framework/DefaultMockitoSession.java[diff]
src/main/java/org/mockito/internal/invocation/InterceptedInvocation.java[diff]
src/main/java/org/mockito/internal/invocation/InvocationMatcher.java[diff]
src/main/java/org/mockito/internal/junit/DefaultStubbingLookupListener.java[diff]
src/main/java/org/mockito/internal/junit/ExceptionFactory.java[diff]
src/main/java/org/mockito/internal/junit/JUnitRule.java[diff]
src/main/java/org/mockito/internal/junit/MismatchReportingTestListener.java[diff]
src/main/java/org/mockito/internal/junit/StrictStubsRunnerTestListener.java[diff]
src/main/java/org/mockito/internal/junit/StubbingArgMismatches.java[diff]
src/main/java/org/mockito/internal/junit/UniversalTestListener.java[diff]
src/main/java/org/mockito/internal/junit/UnusedStubbings.java[diff]
src/main/java/org/mockito/internal/junit/VerificationCollectorImpl.java[diff]
src/main/java/org/mockito/internal/listeners/AutoCleanableListener.java[Deleted - diff]
src/main/java/org/mockito/internal/listeners/StubbingLookupNotifier.java[diff]
src/main/java/org/mockito/internal/progress/MockingProgressImpl.java[diff]
src/main/java/org/mockito/internal/reporting/PrintSettings.java[diff]
src/main/java/org/mockito/internal/runners/DefaultInternalRunner.java[diff]
src/main/java/org/mockito/internal/runners/RunnerFactory.java[diff]
src/main/java/org/mockito/internal/session/DefaultMockitoSessionBuilder.java[diff]
src/main/java/org/mockito/internal/session/MockitoLoggerAdapter.java[diff]
src/main/java/org/mockito/internal/session/MockitoSessionLoggerAdapter.java[diff]
src/main/java/org/mockito/internal/stubbing/BaseStubbing.java[diff]
src/main/java/org/mockito/internal/stubbing/ConsecutiveStubbing.java[diff]
src/main/java/org/mockito/internal/stubbing/OngoingStubbingImpl.java[diff]
src/main/java/org/mockito/internal/stubbing/StubberImpl.java[diff]
src/main/java/org/mockito/internal/stubbing/answers/AnswerFunctionalInterfaces.java[diff]
src/main/java/org/mockito/internal/stubbing/defaultanswers/ForwardsInvocations.java[diff]
src/main/java/org/mockito/internal/stubbing/defaultanswers/RetrieveGenericsForDefaultAnswers.java[Deleted - diff]
src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsDeepStubs.java[diff]
src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsMocks.java[diff]
src/main/java/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNulls.java[diff]
src/main/java/org/mockito/internal/util/ConsoleMockitoLogger.java[diff]
src/main/java/org/mockito/internal/util/reflection/GenericMetadataSupport.java[diff]
src/main/java/org/mockito/internal/verification/VerificationWrapperInOrderWrapper.java[diff]
src/main/java/org/mockito/invocation/Invocation.java[diff]
src/main/java/org/mockito/invocation/InvocationOnMock.java[diff]
src/main/java/org/mockito/invocation/Location.java[diff]
src/main/java/org/mockito/junit/MockitoJUnit.java[diff]
src/main/java/org/mockito/listeners/StubbingLookupEvent.java[Deleted - diff]
src/main/java/org/mockito/listeners/StubbingLookupListener.java[Deleted - diff]
src/main/java/org/mockito/mock/MockCreationSettings.java[diff]
src/main/java/org/mockito/plugins/InlineMockMaker.java[Deleted - diff]
src/main/java/org/mockito/plugins/MockitoLogger.java[Deleted - diff]
src/main/java/org/mockito/runners/ConsoleSpammingMockitoJUnitRunner.java[diff]
src/main/java/org/mockito/session/MockitoSessionBuilder.java[diff]
src/main/java/org/mockito/session/MockitoSessionLogger.java[diff]
src/main/java/org/mockito/stubbing/Answer6.java[Deleted - diff]
src/main/java/org/mockito/stubbing/VoidAnswer6.java[Deleted - diff]
src/test/java/org/mockito/StaticMockingExperimentTest.java[diff]
src/test/java/org/mockito/internal/configuration/plugins/DefaultMockitoPluginsTest.java[diff]
src/test/java/org/mockito/internal/creation/MockSettingsImplTest.java[diff]
src/test/java/org/mockito/internal/creation/bytebuddy/InlineByteBuddyMockMakerTest.java[diff]
src/test/java/org/mockito/internal/framework/DefaultMockitoFrameworkTest.java[diff]
src/test/java/org/mockito/internal/invocation/InvocationBuilder.java[diff]
src/test/java/org/mockito/internal/junit/ExceptionFactoryTest.java[diff]
src/test/java/org/mockito/internal/listeners/StubbingLookupNotifierTest.java[diff]
src/test/java/org/mockito/internal/progress/MockingProgressImplTest.java[diff]
src/test/java/org/mockito/internal/runners/DefaultInternalRunnerTest.java[diff]
src/test/java/org/mockito/internal/session/DefaultMockitoSessionBuilderTest.java[diff]
src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsGenericDeepStubsTest.java[diff]
src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsMocksTest.java[diff]
src/test/java/org/mockito/internal/stubbing/defaultanswers/ReturnsSmartNullsTest.java[diff]
src/test/java/org/mockito/internal/util/MockSettingsTest.java[diff]
src/test/java/org/mockito/internal/util/SimpleMockitoLogger.java[diff]
src/test/java/org/mockito/internal/util/reflection/GenericMetadataSupportTest.java[diff]
src/test/java/org/mockito/internal/verification/VerificationOverTimeImplTest.java[diff]
src/test/java/org/mockito/internal/verification/checkers/MissingInvocationCheckerTest.java[diff]
src/test/java/org/mockito/internal/verification/checkers/MissingInvocationInOrderCheckerTest.java[diff]
src/test/java/org/mockitointegration/NoJUnitDependenciesTest.java[diff]
src/test/java/org/mockitousage/IMethods.java[diff]
src/test/java/org/mockitousage/MethodsImpl.java[diff]
src/test/java/org/mockitousage/basicapi/MockingMultipleInterfacesTest.java[diff]
src/test/java/org/mockitousage/basicapi/MocksCreationTest.java[diff]
src/test/java/org/mockitousage/basicapi/UsingVarargsTest.java[diff]
src/test/java/org/mockitousage/debugging/StubbingLookupListenerCallbackTest.java[Deleted - diff]
src/test/java/org/mockitousage/internal/debugging/LocationImplTest.java[diff]
src/test/java/org/mockitousage/junitrule/LenientJUnitRuleTest.java[diff]
src/test/java/org/mockitousage/junitrule/MockitoJUnitRuleTest.java[diff]
src/test/java/org/mockitousage/junitrule/StrictJUnitRuleTest.java[diff]
src/test/java/org/mockitousage/junitrule/VerificationCollectorImplTest.java[diff]
src/test/java/org/mockitousage/junitrunner/StrictStubsRunnerTest.java[diff]
src/test/java/org/mockitousage/matchers/CustomMatcherDoesYieldCCETest.java[diff]
src/test/java/org/mockitousage/matchers/HamcrestMatchersTest.java[diff]
src/test/java/org/mockitousage/matchers/MatchersTest.java[diff]
src/test/java/org/mockitousage/matchers/MoreMatchersTest.java[diff]
src/test/java/org/mockitousage/matchers/ReflectionMatchersTest.java[diff]
src/test/java/org/mockitousage/matchers/VarargsTest.java[diff]
src/test/java/org/mockitousage/plugins/MockitoPluginsTest.java[diff]
src/test/java/org/mockitousage/serialization/AcrossClassLoaderSerializationTest.java[diff]
src/test/java/org/mockitousage/serialization/DeepStubsSerializableTest.java[diff]
src/test/java/org/mockitousage/serialization/StrictStubsSerializableTest.java[Deleted - diff]
src/test/java/org/mockitousage/session/MockitoSessionTest.java[diff]
src/test/java/org/mockitousage/stacktrace/ClickableStackTracesTest.java[diff]
src/test/java/org/mockitousage/strictness/LenientMockAnnotationTest.java[Deleted - diff]
src/test/java/org/mockitousage/strictness/PotentialStubbingSensitivityTest.java[Deleted - diff]
src/test/java/org/mockitousage/strictness/ProductionCode.java[Deleted - diff]
src/test/java/org/mockitousage/strictness/StrictnessPerMockTest.java[diff]
src/test/java/org/mockitousage/strictness/StrictnessPerStubbingTest.java[diff]
src/test/java/org/mockitousage/strictness/StrictnessPerStubbingWithRunnerTest.java[diff]
src/test/java/org/mockitousage/strictness/StrictnessWhenRuleStrictnessIsUpdatedTest.java[diff]
src/test/java/org/mockitousage/strictness/StrictnessWithRulesTest.java[diff]
src/test/java/org/mockitousage/stubbing/BasicStubbingTest.java[diff]
src/test/java/org/mockitousage/stubbing/DeepStubbingTest.java[diff]
src/test/java/org/mockitousage/stubbing/SmartNullsGenericBugTest.java[Deleted - diff]
src/test/java/org/mockitousage/stubbing/SmartNullsStubbingTest.java[diff]
src/test/java/org/mockitousage/stubbing/StrictStubbingEndToEndTest.java[diff]
src/test/java/org/mockitousage/stubbing/StrictStubbingTest.java[diff]
src/test/java/org/mockitousage/stubbing/StubbingWithAdditionalAnswersTest.java[diff]
src/test/java/org/mockitousage/stubbing/StubbingWithBadThrowablesTest.java[Deleted - diff]
src/test/java/org/mockitousage/stubbing/StubbingWithDelegateTest.java[diff]
src/test/java/org/mockitousage/verification/BasicVerificationInOrderTest.java[diff]
src/test/java/org/mockitousage/verification/BasicVerificationTest.java[diff]
src/test/java/org/mockitousage/verification/DescriptiveMessagesOnVerificationInOrderErrorsTest.java[diff]
src/test/java/org/mockitousage/verification/DescriptiveMessagesWhenVerificationFailsTest.java[diff]
src/test/java/org/mockitousage/verification/PrintingVerboseTypesWithArgumentsTest.java[diff]
src/test/java/org/mockitousage/verification/VerificationInOrderWithTimeoutTest.java[Deleted - diff]
src/test/java/org/mockitousage/verification/VerificationUsingMatchersTest.java[diff]
src/test/java/org/mockitousage/verification/VerificationWithAfterTest.java[diff]
src/test/java/org/mockitoutil/async/AsyncTesting.java[diff]
subprojects/android/src/main/java/org/mockito/android/internal/creation/AndroidByteBuddyMockMaker.java[diff]
subprojects/android/src/main/java/org/mockito/android/internal/creation/AndroidLoadingStrategy.java[diff]
subprojects/android/src/main/java/org/mockito/android/internal/creation/AndroidTempFileLocator.java[diff]
subprojects/inline/inline.gradle[diff]
subprojects/inline/src/test/java/org/mockitoinline/OneLinerStubStressTest.java[Deleted - diff]
subprojects/inline/src/test/java/org/mockitoinline/bugs/CyclicMockMethodArgumentMemoryLeakTest.java[Deleted - diff]
subprojects/inline/src/test/java/org/mockitoinline/bugs/SelfSpyReferenceMemoryLeakTest.java[Deleted - diff]

178 files changed

tree: bc8b6ddef81b0693a169e714db156fcb1378371b

lib/
src/
subprojects/
Android.bp
build.gradle
CleanSpec.mk
LICENSE
MODULE_LICENSE_MIT
NOTICE
OWNERS
README.version
TEST_MAPPING
update_source.sh