[powermock] 02/05: Merge tag 'upstream/1.6.6'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Nov 11 21:44:35 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository powermock.
commit a044d08d94a19ee5448439926ee9ea7ea1dac866
Merge: 2ed3fbf d1364e9
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Nov 11 22:29:25 2016 +0100
Merge tag 'upstream/1.6.6'
Upstream version 1.6.6
.gitignore | 3 +-
README.md | 11 +-
api/easymock/pom.xml | 2 +-
.../java/org/powermock/api/easymock/PowerMock.java | 12 +-
.../api/extension/InjectFieldSearcher.java} | 12 +-
.../listener/AnnotationGlobalMetadata.java | 14 +-
.../extension/listener/AnnotationMockMetadata.java | 8 +-
.../extension/listener/AnnotationMockScanner.java | 4 +-
.../listener/DefaultInjectFieldSearcher.java | 83 ++
.../listener/EasyMockAnnotationSupport.java | 32 +-
.../api/extension/listener/MockMetadata.java} | 23 +-
.../extension/listener/TestSubjectInjector.java | 14 +-
.../proxyframework/ProxyFrameworkImpl.java | 33 -
api/mockito-common/pom.xml | 2 +-
.../agent/JavaAgentFrameworkRegisterImpl.java | 10 +-
.../expectation/ConstructorExpectationSetup.java | 0
.../api/mockito/expectation/WithAnyArguments.java | 0
.../mockito/expectation/WithExpectedArguments.java | 0
.../expectation/WithExpectedParameterTypes.java | 0
.../WithOrWithoutExpectedArguments.java | 0
.../expectation/WithoutExpectedArguments.java | 0
.../reporter/MockitoPowerMockReporter.java | 2 +
.../AbstractConstructorExpectationSetup.java} | 68 +-
.../DelegatingToConstructorsOngoingStubbing.java | 0
.../expectation/LocalizedMatcherAdapter.java | 7 +
.../InvocationControlAssertionError.java | 16 +-
.../invocation/MockitoNewInvocationControl.java | 12 +-
.../internal/mockcreation/AbstractMockCreator.java | 10 +-
.../mockito/internal/mockcreation/MockCreator.java | 10 +
api/mockito/pom.xml | 2 +-
.../proxyframework/ProxyFrameworkImpl.java | 54 -
.../org/powermock/api/mockito/PowerMockito.java | 16 +-
.../DefaultConstructorExpectationSetup.java | 100 +-
.../DefaultLocalizedMatcherAdapter.java | 22 +
.../invocation/MockitoMethodInvocationControl.java | 89 +-
.../internal/invocation/ToStringGenerator.java | 2 +-
.../{MockCreator.java => DefaultMockCreator.java} | 9 +-
.../internal/stubbing/answers/ChainReturns.java | 5 +-
.../DefaultConstructorArgumentsVerfication.java | 2 +-
.../api/mockito/repackaged/CGLIBHacker.java | 1 -
...reatorTest.java => DefaultMockCreatorTest.java} | 10 +-
api/mockito2/pom.xml | 2 +-
.../proxyframework/ProxyFrameworkImpl.java | 55 -
.../org/powermock/api/mockito/PowerMockito.java | 16 +-
.../expectation/ConstructorExpectationSetup.java | 21 -
.../WithOrWithoutExpectedArguments.java | 20 -
.../DefaultConstructorExpectationSetup.java | 101 +-
.../DefaultLocalizedMatcherAdapter.java | 23 +
.../DelegatingToConstructorsOngoingStubbing.java | 163 ---
.../InvocationControlAssertionError.java | 158 ---
.../invocation/MockitoMethodInvocationControl.java | 14 +-
.../invocation/MockitoNewInvocationControl.java | 122 --
.../internal/invocation/ToStringGenerator.java | 2 +-
.../{MockCreator.java => DefaultMockCreator.java} | 8 +-
.../internal/stubbing/answers/ChainReturns.java | 5 +-
.../DefaultConstructorArgumentsVerfication.java | 2 +-
.../api/mockito/repackaged/asm/MethodWriter.java | 2 +-
.../powermock/api/mockito/repackaged/asm/Type.java | 2 +-
.../repackaged/asm/tree/analysis/Frame.java | 2 +-
.../repackaged/asm/util/CheckClassAdapter.java | 2 +-
.../mockito/repackaged/cglib/beans/BeanMap.java | 2 +-
.../repackaged/cglib/beans/BeanMapEmitter.java | 2 +-
.../mockito/repackaged/cglib/beans/BulkBean.java | 6 +-
.../cglib/core/AbstractClassGenerator.java | 2 -
.../mockito/repackaged/cglib/core/CodeEmitter.java | 2 -
.../repackaged/cglib/core/CollectionUtils.java | 2 +-
.../mockito/repackaged/cglib/core/EmitUtils.java | 6 +-
.../mockito/repackaged/cglib/core/KeyFactory.java | 4 +-
.../repackaged/cglib/core/ReflectUtils.java | 12 +-
.../mockito/repackaged/cglib/core/TypeUtils.java | 8 +-
.../mockito/repackaged/cglib/proxy/Enhancer.java | 2 +-
.../repackaged/cglib/proxy/MethodProxy.java | 2 +-
.../api/mockito/repackaged/cglib/proxy/Mixin.java | 2 +-
.../api/mockito/repackaged/cglib/proxy/Proxy.java | 2 +-
.../repackaged/cglib/reflect/FastClass.java | 2 +-
.../cglib/transform/AbstractClassLoader.java | 2 -
.../cglib/transform/ClassTransformerChain.java | 4 +-
.../cglib/transform/TransformingClassLoader.java | 2 +-
.../transform/impl/AddDelegateTransformer.java | 2 +-
.../repackaged/cglib/util/StringSwitcher.java | 2 +-
.../internal/mockcreation/MockCreatorTest.java | 8 +-
api/pom.xml | 2 +-
api/support/pom.xml | 2 +-
changelog.txt | 26 +-
classloading/classloading-base/pom.xml | 2 +-
classloading/classloading-objenesis/pom.xml | 2 +-
.../org/powermock/classloading/DeepCloner.java | 2 +-
.../classloading/ObjenesisDeepClonerTest.java | 3 +-
classloading/classloading-xstream/pom.xml | 2 +-
.../classloading/XStreamDeepClonerTest.java | 3 +-
classloading/pom.xml | 2 +-
core/pom.xml | 36 +-
.../main/java/org/powermock/core/ClassLocator.java | 2 +-
.../org/powermock/core/ConcreteClassGenerator.java | 10 +-
core/src/main/java/org/powermock/core/ListMap.java | 19 +-
.../main/java/org/powermock/core/MockGateway.java | 353 +++--
.../java/org/powermock/core/MockRepository.java | 4 +-
.../classloader/DeferSupportingClassLoader.java | 42 +-
.../core/classloader/MockClassLoader.java | 7 +-
.../powermock/core/reporter/PowerMockReporter.java | 1 +
.../core/spi/MethodInvocationControl.java | 2 +-
.../core/spi/support/InvocationSubstitute.java | 3 +-
.../org/powermock/core/spi/testresult/Result.java | 2 +-
.../core/transformers/MockTransformer.java | 2 +-
.../core/transformers/TransformStrategy.java | 2 +-
.../impl/AbstractMainMockTransformer.java | 212 ++-
.../transformers/impl/TestClassTransformer.java | 24 +-
.../impl/MockPolicyClassLoadingSettingsImpl.java | 9 +-
.../impl/MockPolicyInterceptionSettingsImpl.java | 12 +-
.../mockpolicies/support/LogPolicySupport.java | 2 +-
.../impl/AbstractCommonTestSuiteChunkerImpl.java | 7 -
.../utils/impl/AbstractTestSuiteChunkerImpl.java | 2 -
.../tests/utils/impl/ArrayMergerImpl.java | 3 +-
.../utils/impl/MockPolicyInitializerImpl.java | 18 +-
.../impl/PowerMockIgnorePackagesExtractorImpl.java | 9 +-
.../utils/impl/PowerMockTestNotifierImpl.java | 10 +-
.../StaticConstructorSuppressExtractorImpl.java | 2 +-
.../java/org/powermock/utils/StringJoiner.java | 2 +-
.../core/classloader/MockClassLoaderTest.java | 75 +-
.../classloader/ResourcePrefixClassLoader.java | 3 +-
.../GlobalNotificationBuildSupportTest.java | 15 +-
.../impl/ClassMockTransformerTest.java | 227 ++-
.../support/MainMockTransformerTestSupport.java | 38 +-
examples/AbstractFactory/pom.xml | 2 +-
examples/ApacheCLIExample/pom.xml | 2 +-
examples/ApacheMina/pom.xml | 2 +-
examples/DocumentationExamples/pom.xml | 2 +-
examples/HamcrestExample/pom.xml | 2 +-
examples/SignedMocking/pom.xml | 2 +-
examples/byte-buddy-easymock/pom.xml | 2 +-
examples/byte-buddy-mockito/pom.xml | 2 +-
examples/dom4j/pom.xml | 2 +-
examples/easymock31/pom.xml | 2 +-
examples/java8/pom.xml | 10 +-
.../demo/org/powermock/examples/SimpleOps.java | 3 +
examples/jcl/pom.xml | 2 +-
examples/jdom/pom.xml | 2 +-
examples/jmock/pom.xml | 14 +-
examples/log4j/pom.xml | 2 +-
examples/pom.xml | 2 +-
examples/simple/pom.xml | 2 +-
examples/slf4j-mockito/pom.xml | 2 +-
examples/slf4j-noimpl/pom.xml | 2 +-
examples/slf4j/pom.xml | 2 +-
examples/spring-easymock/pom.xml | 2 +-
examples/spring-mockito-delegate/pom.xml | 11 +-
.../spring/mockito/PowermockClassLoadTest.java | 36 +
examples/spring-mockito-xml-agent/pom.xml | 2 +-
examples/spring-mockito-xml/pom.xml | 2 +-
examples/spring-mockito/pom.xml | 2 +-
examples/tutorial/pom.xml | 2 +-
modules/module-impl/agent/pom.xml | 2 +-
.../support/PowerMockAgentTestInitializer.java | 38 +-
.../java/sun/tools/attach/BsdVirtualMachine.java | 2 -
.../sun/tools/attach/HotSpotVirtualMachine.java | 1 -
.../java/sun/tools/attach/LinuxVirtualMachine.java | 2 -
.../sun/tools/attach/SolarisVirtualMachine.java | 2 -
.../sun/tools/attach/WindowsVirtualMachine.java | 4 -
modules/module-impl/junit3/pom.xml | 2 +-
.../internal/impl/JUnit3TestSuiteChunkerImpl.java | 8 +-
modules/module-impl/junit4-common/pom.xml | 2 +-
.../internal/impl/JUnit4TestSuiteChunkerImpl.java | 8 +-
modules/module-impl/junit4-legacy/pom.xml | 2 +-
...owerMockJUnit4LegacyTestClassMethodsRunner.java | 11 +-
modules/module-impl/junit4-rule-agent/pom.xml | 2 +-
.../modules/junit4/rule/PowerMockRule.java | 6 -
modules/module-impl/junit4-rule/pom.xml | 2 +-
.../junit4/rule/PowerMockClassloaderExecutor.java | 3 -
modules/module-impl/junit4/pom.xml | 2 +-
.../junit4/internal/impl/NotificationBuilder.java | 6 +-
.../impl/PowerMockJUnit44RunnerDelegateImpl.java | 6 +-
.../junit4/internal/impl/PowerMockRunNotifier.java | 2 +-
.../PowerMockJUnit4MethodValidator.java | 12 +-
modules/module-impl/pom.xml | 2 +-
modules/module-impl/testng-agent/pom.xml | 2 +-
modules/module-impl/testng-common/pom.xml | 2 +-
.../modules/testng/PowerMockTestCase.java | 7 +-
modules/module-impl/testng/pom.xml | 2 +-
.../testng/internal/ClassLoaderFactory.java | 1 -
.../PowerMockClassloaderObjectFactory.java | 7 +-
modules/module-test/easymock/junit3-test/pom.xml | 2 +-
.../samples/junit3/singleton/MockStaticTest.java | 4 +-
modules/module-test/easymock/junit4-agent/pom.xml | 2 +-
.../easymock/junit4-legacy-test/pom.xml | 2 +-
.../legacy/noannotation/NoAnnotationUsageTest.java | 31 +-
.../junit4/legacy/singleton/MockStaticTest.java | 4 +-
modules/module-test/easymock/junit4-test/pom.xml | 18 +-
.../java/samples/junit4/assume/AssumeTest.java | 1 -
...{ExpectNewDemoTest.java => ExpectNewCases.java} | 70 +-
.../junit4/expectnew/ExpectNewDemoTest.java | 625 +--------
.../samples/junit4/expectnew/MockDateTest.java | 1 -
.../samples/junit4/finalmocking/FinalDemoTest.java | 1 -
.../privatemocking/PrivateMethodDemoTest.java | 4 +-
.../samples/junit4/singleton/MockStaticTest.java | 6 +-
.../junit4/singleton/SimpleStaticServiceTest.java | 2 -
modules/module-test/easymock/junit410-test/pom.xml | 9 +-
.../junit410/expectnew/ExpectNewDemoTest.java | 627 +--------
.../java/samples/junit410/github668/Github668.java | 38 +
.../github668/IncidentPropertyChangeDAO.java | 8 +
.../samples/junit410/github668/package-info.java | 5 +
.../{junit410-test => junit412-test}/pom.xml | 8 +-
.../junit412}/expectnew/ExpectNewDemoTest.java | 11 +-
.../expectnew/ExpectNewOfFinalSystemClassTest.java | 46 +
.../samples/junit412/github668/Github668Test.java | 11 +
.../github668/IncidentPropertyChangeDAO.java | 8 +
.../TwoMockFieldsWithDifferentTypesClass.java | 46 +
.../github668/TwoMockFieldsWithSameTypeCase.java | 45 +
.../samples/junit412/github668/package-info.java | 5 +
modules/module-test/easymock/junit45-test/pom.xml | 2 +-
modules/module-test/easymock/junit47-test/pom.xml | 9 +-
.../junit4/expectnew/ExpectNewDemoTest.java | 624 +--------
modules/module-test/easymock/junit48-test/pom.xml | 9 +-
.../junit48/expectnew/ExpectNewDemoTest.java | 626 +--------
modules/module-test/easymock/pom.xml | 2 +-
.../module-test/easymock/testng-agent-test/pom.xml | 2 +-
modules/module-test/easymock/testng-test/pom.xml | 2 +-
modules/module-test/junit4/pom.xml | 2 +-
.../proxyframework/ProxyFrameworkImpl.java | 18 -
modules/module-test/mockito/junit4-agent/pom.xml | 9 +-
.../powermockito/junit4/agent/FinalDemoTest.java | 141 --
.../agent/MockFinalNonStaticMethodsTest.java | 47 +
.../powermockito/junit4/agent/WhenNewTest.java | 567 +-------
.../module-test/mockito/junit4-delegate/pom.xml | 9 +-
.../mockito/junit4/delegate/WhenNewCaseMethod.java | 1 +
.../junit4/delegate/parameterized/WhenNewTest.java | 3 +-
.../module-test/mockito/junit4-java8-agent/pom.xml | 9 +-
.../bugs/github510/ClassUsesInterfaceTest.java | 2 -
.../mockito/junit4-java8-rule-xstream/pom.xml | 2 +-
.../bugs/github510/ClassUsesInterfaceTest.java | 2 -
modules/module-test/mockito/junit4-java8/pom.xml | 2 +-
.../mockito/junit4-rule-objenesis/pom.xml | 9 +-
.../junit4/rule/objenesis/FinalDemoTest.java | 141 --
.../objenesis/MockFinalNonStaticMethodsTest.java | 47 +
.../junit4/rule/objenesis/WhenNewTest.java | 567 +-------
.../mockito/junit4-rule-xstream/pom.xml | 9 +-
.../junit4/rule/xstream/FinalDemoTest.java | 141 --
.../xstream/MockFinalNonStaticMethodsTest.java | 47 +
.../junit4/rule/xstream/WhenNewTest.java | 574 +-------
modules/module-test/mockito/junit4/pom.xml | 30 +-
.../junit4/{ => bugs}/ClassLoaderBugTest.java | 2 +-
.../junit4/bugs/github668/GitHub668Test.java | 31 +
.../junit4/bugs/github668/package-info.java | 4 +
.../junit4/bugs/github701/GitHub701Test.java | 43 +
.../junit4/bugs/github701/MapWrapper.java | 24 +
.../junit4/bugs/github701/OverridesEquals.java | 8 +
.../junit4/bugs/github701/package-info.java | 6 +
.../bugs/github704/PrepareForTestSignedTest.java | 28 +
.../bugs/github704/SomeClassUseSignedClasses.java | 11 +
.../junit4/bugs/github704/package-info.java | 5 +
.../junit4/finalmocking/FinalDemoTest.java | 135 --
.../junit4/finalmocking/MockFinalMethodsCases.java | 120 ++
.../MockFinalNonStaticMethodsTest.java | 31 +
.../junit4/getannotation/GetAnnotationTest.java | 81 ++
.../junit4/jacoco/InstanceMethods.java | 25 +
.../junit4/jacoco/JacocoCoverageTest.java | 169 +++
.../powermockito/junit4/jacoco/StaticMethods.java | 25 +
.../powermockito/junit4/jacoco/TargetTest.java | 43 +
.../powermockito/junit4/whennew}/WhenNewCases.java | 149 +-
.../powermockito/junit4/whennew/WhenNewTest.java | 609 +--------
modules/module-test/mockito/junit49/pom.xml | 2 +-
.../powermockito/junit4/rules/JUnit49RuleTest.java | 4 -
modules/module-test/mockito/pom.xml | 2 +-
modules/module-test/mockito/testng/pom.xml | 2 +-
.../testng/bugs/github656/GitHub656Test.java | 38 +
.../testng/bugs/github656/package-info.java | 5 +
modules/module-test/pom.xml | 2 +-
modules/module-test/testng/pom.xml | 2 +-
.../proxyframework/ProxyFrameworkImpl.java | 18 -
modules/pom.xml | 2 +-
pom.xml | 49 +-
reflect/pom.xml | 12 +-
.../main/java/org/powermock/reflect/Whitebox.java | 37 +-
.../powermock/reflect/internal/Constructor.java | 26 +
.../reflect/internal/ConstructorFinder.java | 128 ++
.../reflect/internal/ParameterTypesMatcher.java | 2 +-
.../reflect/internal/ParametersMatcher.java | 86 ++
.../powermock/reflect/internal/WhiteboxImpl.java | 195 ++-
.../AssignableToFieldTypeMatcherStrategy.java | 2 +-
.../reflect/internal/proxy/ProxyFrameworks.java | 62 +
.../ClassLoaderRegisterProxyFramework.java | 31 -
.../proxyframework/ProxyFrameworkHelper.java | 53 -
.../proxyframework/RegisterProxyFramework.java | 20 -
.../org/powermock/reflect/spi/ProxyFramework.java | 23 -
.../powermock/reflect/WhiteBoxGetFieldTest.java | 5 +-
.../java/org/powermock/reflect/WhiteBoxTest.java | 1442 ++++++++++----------
.../reflect/internal/WhiteboxImplTest.java | 15 +-
.../internal/proxy/ProxyFrameworksTest.java | 63 +
.../reflect/internal/proxy/SomeClass.java | 7 +
.../reflect/internal/proxy/SomeInterface.java | 7 +
.../testclasses/ClassWithInternalState.java | 10 +-
release/easymock-extension-api-full/pom.xml | 2 +-
release/junit-without-mock-framework/pom.xml | 2 +-
release/mockito-extension-api-full/pom.xml | 13 +-
release/mockito2-extension-api-full/pom.xml | 13 +-
release/pom.xml | 2 +-
release/testng-without-mock-framework/pom.xml | 2 +-
release/with-junit-easymock-dependencies/pom.xml | 2 +-
release/with-junit-mockito-dependencies/pom.xml | 2 +-
release/with-junit-mockito2-dependencies/pom.xml | 2 +-
release/with-testng-easymock-dependencies/pom.xml | 2 +-
release/with-testng-mockito-dependencies/pom.xml | 2 +-
release/with-testng-mockito2-dependencies/pom.xml | 2 +-
release/without-test-and-mock-framework/pom.xml | 2 +-
tests/pom.xml | 2 +-
tests/utils/pom.xml | 2 +-
.../annotationbased/AnnotatedClassDemo.java | 10 +
.../testannotations/RuntimeAnnotation.java | 12 +
.../java/samples/expectnew/CreationException.java | 7 +
.../main/java/samples/expectnew/ExpectNewDemo.java | 18 +
.../src/main/java/samples/expectnew/ITarget.java | 10 +
.../expectnew/SimpleVarArgsConstructorDemo.java | 17 +-
.../src/main/java/samples/expectnew/Target.java | 25 +
312 files changed, 4216 insertions(+), 8096 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/powermock.git
More information about the pkg-java-commits
mailing list