[spock] 02/14: Merge tag 'upstream/0.7-groovy-2.0'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Oct 1 10:11:15 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository spock.
commit 3c78dc87454dc9f78284760e7257e58447655f7f
Merge: bd44010 b51cd3a
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Oct 1 10:35:26 2015 +0200
Merge tag 'upstream/0.7-groovy-2.0'
Upstream version 0.7-groovy-2.0
.travis.yml | 5 +
build.gradle | 46 +-
docs/conf.py | 18 +-
docs/data_driven_testing.rst | 320 +++++
docs/index.rst | 24 +-
docs/interaction_based_testing.rst | 914 +++++++++++++++
docs/introduction.rst | 7 +
docs/migration_guide.rst | 7 +
docs/new_and_noteworthy.rst | 299 ++++-
gradle/common.gradle | 6 +-
gradle/ide.gradle | 1 -
gradle/publishMaven.gradle | 45 +-
gradle/wrapper/gradle-wrapper.jar | Bin 41363 -> 45502 bytes
gradle/wrapper/gradle-wrapper.properties | 4 +-
gradlew | 7 +-
spock-core/core.gradle | 1 -
.../spock/util/concurrent/BlockingVariables.groovy | 17 +-
.../spock/util/matcher/HamcrestMatchers.groovy | 2 +-
.../groovy/spock/util/matcher/IsCloseTo.groovy | 21 +-
.../org/spockframework/builder/AddSlotFactory.java | 2 +-
.../org/spockframework/builder/BuilderHelper.java | 2 +-
.../spockframework/builder/ClosureBlueprint.java | 2 +-
.../builder/CollectionSlotFactory.java | 2 +-
.../spockframework/builder/DelegatingScript.java | 4 +-
.../org/spockframework/builder/PojoGestalt.java | 2 +-
.../org/spockframework/builder/Sculpturer.java | 6 +-
.../org/spockframework/builder/SetterLikeSlot.java | 4 +-
.../spockframework/builder/SetterSlotFactory.java | 2 +-
.../buildsupport/EmptyAnnotationVisitor.java | 7 +-
.../buildsupport/SpecClassFileVisitor.java | 6 +-
.../compiler/AbstractDeepBlockRewriter.java | 160 +++
.../org/spockframework/compiler/AstNodeCache.java | 19 +-
.../java/org/spockframework/compiler/AstUtil.java | 205 ++--
.../spockframework/compiler/ConditionRewriter.java | 8 +-
.../spockframework/compiler/DeepBlockRewriter.java | 261 +++++
.../compiler/DeepStatementRewriter.java | 208 ----
.../spockframework/compiler/IRewriteResources.java | 4 +-
.../compiler/ISpecialMethodCall.java | 61 +
.../compiler/InteractionRewriter.java | 134 ++-
.../compiler/NoSpecialMethodCall.java | 101 ++
.../org/spockframework/compiler/SpecRewriter.java | 256 +---
.../spockframework/compiler/SpecialMethodCall.java | 203 ++++
.../compiler/WhereBlockRewriter.java | 4 +-
.../compiler/model/CleanupBlock.java | 75 +-
.../spockframework/compiler/model/ExpectBlock.java | 1 +
.../spockframework/compiler/model/SetupBlock.java | 79 +-
.../spockframework/compiler/model/ThenBlock.java | 77 +-
.../spockframework/compiler/model/WhenBlock.java | 87 +-
.../spockframework/compiler/model/WhereBlock.java | 65 +-
.../gentyref/GenericTypeReflector.java | 4 -
.../org/spockframework/lang/ConditionBlock.java | 21 +
.../spockframework/lang/ISpecificationContext.java | 14 +
.../org/spockframework/lang/SpecInternals.java | 284 +++++
...tGenerator.java => CallRealMethodResponse.java} | 23 +-
.../mock/CannotCreateMockException.java | 11 +-
...r.java => CannotInvokeRealMethodException.java} | 21 +-
...DefaultEqualsHashCodeToStringInteractions.java} | 22 +-
.../mock/DefaultEqualsInteraction.java | 12 +-
.../mock/DefaultHashCodeInteraction.java | 6 +-
.../spockframework/mock/DefaultInteraction.java | 18 +-
.../spockframework/mock/DefaultMockFactory.java | 133 ---
.../mock/DefaultStubbedInteraction.java | 35 -
.../mock/DefaultToStringInteraction.java | 6 +-
.../spockframework/mock/EmptyOrDummyResponse.java | 124 ++
...rator.java => IChainableResponseGenerator.java} | 5 +-
...cationDispatcher.java => IDefaultResponse.java} | 10 +-
...ationDispatcher.java => IInteractionAware.java} | 8 +-
.../org/spockframework/mock/IInteractionScope.java | 2 +
.../spockframework/mock/IMockConfiguration.java | 89 ++
...ocationDispatcher.java => IMockController.java} | 5 +-
.../java/org/spockframework/mock/IMockFactory.java | 13 +-
.../org/spockframework/mock/IMockInteraction.java | 11 +
.../org/spockframework/mock/IMockInvocation.java | 28 +-
.../java/org/spockframework/mock/IMockMethod.java | 53 +
.../java/org/spockframework/mock/IMockObject.java | 52 +
...tionDispatcher.java => IResponseGenerator.java} | 14 +-
.../{IMockFactory.java => ISpockMockObject.java} | 12 +-
.../mock/InteractionNotSatisfiedError.java | 4 +-
.../java/org/spockframework/mock/MockDetector.java | 52 +
.../spockframework/mock/MockImplementation.java | 37 +
.../org/spockframework/mock/MockInteraction.java | 88 --
.../java/org/spockframework/mock/MockNature.java | 81 ++
.../mock/TooFewInvocationsError.java | 76 +-
.../mock/TooManyInvocationsError.java | 47 +-
.../spockframework/mock/ZeroOrNullResponse.java | 36 +
.../{ => constraint}/CodeArgumentConstraint.java | 8 +-
.../{ => constraint}/EqualArgumentConstraint.java | 5 +-
.../EqualMethodNameConstraint.java | 5 +-
.../EqualPropertyNameConstraint.java | 11 +-
.../NamedArgumentListConstraint.java | 5 +-
.../NegatingArgumentConstraint.java | 4 +-
.../PositionalArgumentListConstraint.java | 21 +-
.../RegexMethodNameConstraint.java | 5 +-
.../RegexPropertyNameConstraint.java | 11 +-
.../SpreadWildcardArgumentConstraint.java | 4 +-
.../TargetConstraint.java} | 20 +-
.../{ => constraint}/TypeArgumentConstraint.java | 4 +-
.../WildcardArgumentConstraint.java | 4 +-
.../WildcardMethodNameConstraint.java | 9 +-
...InvocationDispatcher.java => package-info.java} | 9 +-
.../CodeResponseGenerator.java} | 29 +-
.../ConstantResponseGenerator.java} | 11 +-
.../DefaultResponseGenerator.java} | 18 +-
.../IterableResponseGenerator.java} | 14 +-
.../ResponseGeneratorChain.java} | 27 +-
.../SingleResponseGenerator.java} | 21 +-
.../WildcardResponseGenerator.java} | 10 +-
.../mock/runtime/CglibMockInterceptorAdapter.java | 32 +
.../mock/runtime/CglibRealMethodInvoker.java | 39 +
.../mock/runtime/CompositeMockFactory.java | 50 +
.../mock/runtime/DelegatingMockInvocation.java | 49 +
.../mock/runtime/DynamicMockMethod.java | 54 +
.../DynamicProxyMockInterceptorAdapter.java | 31 +
.../FailingRealMethodInvoker.java} | 23 +-
.../mock/runtime/GroovyMockFactory.java | 74 ++
.../mock/runtime/GroovyMockInterceptor.java | 86 ++
.../mock/runtime/GroovyMockMetaClass.java | 124 ++
.../mock/runtime/GroovyRealMethodInvoker.java | 40 +
.../mock/runtime/IProxyBasedMockInterceptor.java | 18 +-
.../mock/{ => runtime}/InteractionBuilder.java | 58 +-
.../mock/{ => runtime}/InteractionScope.java | 30 +-
.../mock/runtime/JavaMockFactory.java | 57 +
.../mock/runtime/JavaMockInterceptor.java | 79 ++
.../mock/runtime/MockConfiguration.java | 94 ++
.../mock/{ => runtime}/MockController.java | 26 +-
.../mock/runtime/MockInstantiator.java | 48 +
.../mock/runtime/MockInteraction.java | 132 +++
.../{ => runtime}/MockInteractionDecorator.java | 19 +-
.../mock/{ => runtime}/MockInvocation.java | 47 +-
.../spockframework/mock/runtime/MockObject.java | 89 ++
.../mock/runtime/ProxyBasedMockFactory.java | 114 ++
.../mock/runtime/StaticMockMethod.java | 46 +
.../org/spockframework/runtime/BaseSpecRunner.java | 32 +-
.../runtime/ConfigurationScriptLoader.java | 2 +-
.../runtime/ExpressionInfoValueRenderer.java | 16 +-
.../{util => runtime}/GroovyRuntimeUtil.java | 90 +-
.../runtime/ParameterizedSpecRunner.java | 2 +-
.../spockframework/runtime/SpecInfoBuilder.java | 22 +-
.../runtime/SpecificationContext.java | 49 +
.../runtime/SpockAssertionError.java | 9 +-
.../org/spockframework/runtime/SpockRuntime.java | 42 +-
.../spockframework/runtime/SpockTimeoutError.java | 28 +-
.../runtime/UnallowedExceptionThrownError.java | 31 +
.../org/spockframework/runtime/ValueRecorder.java | 25 +-
.../runtime/WrongExceptionThrownError.java | 10 +-
.../runtime/condition/DiffedMapRenderer.java | 2 +-
.../condition/DiffedObjectAsBeanRenderer.java | 2 +-
.../condition/DiffedObjectAsStringRenderer.java | 2 +-
.../runtime/condition/LineBuilder.java | 2 +-
.../extension/builtin/AutoCleanupExtension.java | 1 -
.../extension/builtin/AutoCleanupInterceptor.java | 2 +-
.../extension/builtin/FailsWithExtension.java | 14 +
.../extension/builtin/IgnoreIfExtension.java | 2 +-
.../extension/builtin/StepwiseExtension.java | 2 +-
.../extension/builtin/TimeoutInterceptor.java | 14 +-
.../extension/builtin/UnrollNameProvider.java | 4 +-
.../spockframework/runtime/model/FieldInfo.java | 2 +-
.../runtime/model/IterationInfo.java | 11 +
.../org/spockframework/runtime/model/SpecInfo.java | 9 -
.../org/spockframework/util/AbstractMultiset.java | 111 ++
.../main/java/org/spockframework/util/Beta.java | 16 +
.../org/spockframework/util/CollectionUtil.java | 30 +
.../java/org/spockframework/util/HashMultiset.java | 20 +
.../java/org/spockframework/util/IMultiset.java | 37 +
.../java/org/spockframework/util/Identifiers.java | 187 +--
.../spockframework/util/InternalIdentifiers.java | 4 +-
.../spockframework/util/LinkedHashMultiset.java | 21 +
.../java/org/spockframework/util/Nullable.java | 6 +-
.../java/org/spockframework/util/ObjectUtil.java | 5 +
.../org/spockframework/util/ReflectionUtil.java | 60 +-
.../org/spockframework/util/SpockReleaseInfo.java | 6 +-
.../java/org/spockframework/util/TextUtil.java | 34 +
.../util/{Nullable.java => TimeUtil.java} | 15 +-
.../src/main/java/spock/lang/MockingApi.java | 1235 ++++++++++++++++++++
.../src/main/java/spock/lang/Specification.java | 167 +--
spock-core/src/main/java/spock/lang/Timeout.java | 4 +-
.../spock/util/concurrent/AsyncConditions.java | 44 +-
.../spock/util/concurrent/BlockingVariable.java | 37 +-
.../util/concurrent/BlockingVariablesImpl.java | 16 +-
.../spock/util/concurrent/PollingConditions.java | 191 +++
.../java/spock/util/matcher/HamcrestSupport.java | 18 +-
spock-core/src/main/resources/dsld/spk.dsld | 47 +
.../resources/org/spockframework/idea/spock.gdsl | 59 +
.../src/main/resources/META-INF/maven/plugin.xml | 14 +-
spock-specs/specs.gradle | 12 +-
.../AssertStatementSourcePositionTest.groovy | 23 +-
.../spockframework/groovy/AstInspectorTest.groovy | 14 +-
.../groovy/ClassAnnotationUsageTest.groovy | 126 --
.../Groovy2767_PatchLineColumnInfoTest.groovy | 101 --
.../spockframework/groovy/GroovyAnnotations.groovy | 29 -
.../ReturnStatementSourcePositionTest.groovy | 15 +-
.../groovy/SourcePositionPhaseConversion.groovy | 2 +-
.../spockframework/mock/MockDetectorSpec.groovy | 60 +
.../IterableResponseGeneratorSpec.groovy} | 44 +-
.../JavaMockFactorySpec.groovy} | 23 +-
.../mock/runtime/MockConfigurationSpec.groovy | 85 ++
.../GroovyRuntimeUtilIsVoidMethodSpec.groovy | 7 +-
.../runtime/GroovyRuntimeUtilSpec.groovy | 47 +
.../org/spockframework/smoke/CleanupBlocks.groovy | 40 +-
.../org/spockframework/smoke/FixtureMethods.groovy | 40 +-
.../smoke/StackTraceFiltering.groovy | 7 +-
.../smoke/StaticMethodsInSpecifications.groovy | 16 +-
.../smoke/condition/ConditionEvaluation.groovy | 9 +
.../condition/ConditionNotSatisfiedErrors.groovy | 24 +
.../condition/EqualityComparisonRendering.groovy | 19 +-
.../smoke/condition/ExceptionConditions.groovy | 54 +
.../ImplicitConditionsInWithBlocks.groovy | 151 +++
.../ImplicitConditionsInWithBlocksFailing.groovy | 119 ++
.../smoke/condition/IsRenderedExtension.groovy | 14 +
.../condition/MatcherConditionRendering.groovy | 14 +
.../smoke/condition/MatcherConditions.groovy | 17 +-
.../condition/NegativeExceptionConditions.groovy | 64 +
.../condition/StringComparisonRendering.groovy | 81 ++
.../smoke/condition/ValueRendering.groovy | 33 -
.../smoke/extension/AutoCleanupExtension.groovy | 58 +-
.../smoke/extension/FailsWithExtension.groovy | 34 +
.../smoke/extension/TimeoutExtension.groovy | 7 +-
.../smoke/groovy/UsageOfNotYetImplemented.groovy | 28 +
.../smoke/junit/UseJUnitTimeoutRule.groovy | 12 +
...ors.groovy => ChainedResponseGenerators.groovy} | 24 +-
.../spockframework/smoke/mock/GroovyMocks.groovy | 11 +
.../smoke/mock/GroovyMocksForGroovyClasses.groovy | 210 ++++
.../smoke/mock/GroovyMocksForInterfaces.groovy | 121 ++
.../smoke/mock/GroovySpiesThatAreGlobal.groovy | 235 ++++
.../smoke/mock/InvalidInteractions.groovy | 46 -
.../smoke/mock/InvalidMockCreation.groovy | 89 +-
...ions.groovy => JavaMocksDefaultBehavior.groovy} | 2 +-
.../smoke/mock/JavaMocksForGroovyClasses.groovy | 170 +++
.../org/spockframework/smoke/mock/JavaSpies.groovy | 195 ++++
.../org/spockframework/smoke/mock/JavaStubs.groovy | 131 +++
.../spockframework/smoke/mock/MockBasics.groovy | 151 +++
.../smoke/mock/MockCreationWithClosure.groovy | 101 ++
...rnValues.groovy => MockDefaultResponses.groovy} | 2 +-
...bjectMethods.groovy => MockProxyCaching.groovy} | 40 +-
.../smoke/mock/MockingAndBridgeMethods.groovy | 33 +-
.../smoke/mock/MockingClosures.groovy | 14 +
.../mock/MockingMethodsWithVarArgParameters.groovy | 41 +
.../smoke/mock/OverlappingInteractions.groovy | 72 ++
...lassBasedMocks.groovy => PartialMocking.groovy} | 55 +-
...Generators.groovy => ResponseGenerators.groovy} | 14 +-
.../org/spockframework/smoke/mock/SpyBasics.groovy | 74 ++
.../spockframework/smoke/mock/StubBasics.groovy | 102 ++
.../smoke/mock/StubDefaultResponses.groovy | 208 ++++
.../smoke/mock/TooFewInvocations.groovy | 180 +++
.../smoke/mock/TooManyInvocations.groovy | 52 +
.../smoke/mock/ValidMockCreation.groovy | 70 +-
.../mock/ValidMockCreationInDerivedClass.groovy | 14 +
.../smoke/mock/WildcardUsages.groovy | 2 +-
.../parameterization/UnrolledFeatureMethods.groovy | 29 +-
.../ToStringOutputOfMockingFrameworks.groovy | 47 -
.../util/AbstractMultisetSpec.groovy | 225 ++++
.../spockframework/util/CollectionUtilSpec.groovy | 9 +-
.../spockframework/util/HashMultisetSpec.groovy | 14 +-
.../util/LinkedHashMultisetSpec.groovy | 40 +
.../spockframework/util/ReflectionUtilSpec.groovy | 157 ++-
.../org/spockframework/util/TextUtilSpec.groovy | 31 +-
.../org/spockframework/util/TimeUtilSpec.groovy | 33 +-
.../util/concurrent/PollingConditionsSpec.groovy | 100 ++
.../groovy/spock/util/matcher/IsCloseToSpec.groovy | 34 +-
.../groovy/JavaAnnotationWithClassRetention.java | 27 -
.../groovy/JavaAnnotationWithRuntimeRetention.java | 27 -
spock-spring/spring.gradle | 2 +-
spock-tapestry/tapestry.gradle | 2 +-
263 files changed, 11718 insertions(+), 2720 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/spock.git
More information about the pkg-java-commits
mailing list