You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by th...@apache.org on 2020/09/19 16:31:46 UTC
[tapestry-5] branch java9modules updated: TAP5-2641: fixing
Tapestry-IoC broken tests
This is an automated email from the ASF dual-hosted git repository.
thiagohp pushed a commit to branch java9modules
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
The following commit(s) were added to refs/heads/java9modules by this push:
new 8f5c3e1 TAP5-2641: fixing Tapestry-IoC broken tests
8f5c3e1 is described below
commit 8f5c3e19f19727b84811cd031bb7cbe8cc22c2c4
Author: Thiago H. de Paula Figueiredo <th...@arsmachina.com.br>
AuthorDate: Sat Sep 19 13:31:26 2020 -0300
TAP5-2641: fixing Tapestry-IoC broken tests
---
.../src/test/groovy/ioc/specs/AdvisorsSpec.groovy | 4 ++--
.../src/test/groovy/ioc/specs/AutobuildSpec.groovy | 6 +++---
.../test/groovy/ioc/specs/BridgeBuilderSpec.groovy | 2 +-
.../groovy/ioc/specs/ClassNameLocatorImplSpec.groovy | 4 ++--
.../test/groovy/ioc/specs/ConfigurationsSpec.groovy | 20 ++++++++++----------
.../groovy/ioc/specs/ContributionDefImplSpec.groovy | 2 +-
.../groovy/ioc/specs/DefaultModuleDefImplSpec.groovy | 10 +++++-----
.../src/test/groovy/ioc/specs/InjectionSpec.groovy | 10 +++++-----
.../test/groovy/ioc/specs/InternalUtilsSpec.groovy | 2 +-
.../groovy/ioc/specs/NonParallelExecutorSpec.groovy | 1 +
.../groovy/ioc/specs/ParallelExecutorSpec.groovy | 2 +-
.../RegistryConstructionAndRuntimeErrorsSpec.groovy | 4 ++--
.../src/test/groovy/ioc/specs/RegistrySpec.groovy | 2 +-
.../test/groovy/ioc/specs/ServiceLookupSpec.groovy | 2 +-
.../test/groovy/ioc/specs/ServiceProxySpec.groovy | 2 +-
.../src/test/groovy/ioc/specs/StackSpec.groovy | 1 +
.../src/test/groovy/ioc/specs/TestBaseSpec.groovy | 2 +-
.../services/ServiceDecoratorImplSpec.groovy | 6 +++---
.../internal/util/TargetStrings.properties | 0
19 files changed, 42 insertions(+), 40 deletions(-)
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/AdvisorsSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/AdvisorsSpec.groovy
index de54449..e65896b 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/AdvisorsSpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/AdvisorsSpec.groovy
@@ -19,7 +19,7 @@ class AdvisorsSpec extends AbstractRegistrySpecification {
RuntimeException e = thrown()
- e.message.contains "Advise method org.apache.tapestry5.ioc.NonVoidAdvisorMethodModule.adviseFoo(MethodAdviceReceiver)"
+ e.message.contains "Advise method org.apache.tapestry5.ioc.test.NonVoidAdvisorMethodModule.adviseFoo(MethodAdviceReceiver)"
e.message.contains "does not return void"
}
@@ -32,7 +32,7 @@ class AdvisorsSpec extends AbstractRegistrySpecification {
RuntimeException e = thrown()
- e.message.contains "Advise method org.apache.tapestry5.ioc.AdviceMethodMissingAdvisorParameterModule.adviseBar()"
+ e.message.contains "Advise method org.apache.tapestry5.ioc.test.AdviceMethodMissingAdvisorParameterModule.adviseBar()"
e.message.contains "must take a parameter of type org.apache.tapestry5.ioc.MethodAdviceReceiver."
}
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/AutobuildSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/AutobuildSpec.groovy
index 6f6ae67..d79fb76 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/AutobuildSpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/AutobuildSpec.groovy
@@ -71,7 +71,7 @@ class AutobuildSpec extends AbstractRegistrySpecification {
then:
RuntimeException e = thrown()
- e.message.contains "Could not find default implementation class org.apache.tapestry5.ioc.StringTransformerImpl."
+ e.message.contains "Could not find default implementation class org.apache.tapestry5.ioc.test.StringTransformerImpl."
e.message.contains "Please provide this class, or bind the service interface to a specific implementation class."
}
@@ -151,7 +151,7 @@ class AutobuildSpec extends AbstractRegistrySpecification {
RuntimeException e = thrown()
- e.message.contains "Class org.apache.tapestry5.ioc.UnbuildablePingable does not contain a public constructor needed to autobuild."
+ e.message.contains "Class org.apache.tapestry5.ioc.test.UnbuildablePingable does not contain a public constructor needed to autobuild."
}
def "verify exception when autobuild class has not valid constructor"() {
@@ -165,7 +165,7 @@ class AutobuildSpec extends AbstractRegistrySpecification {
RuntimeException e = thrown()
- e.message.contains "Class org.apache.tapestry5.ioc.UnbuildablePingable does not contain a public constructor needed to autobuild."
+ e.message.contains "Class org.apache.tapestry5.ioc.test.UnbuildablePingable does not contain a public constructor needed to autobuild."
}
def "a service build method may include a parameter with @Autobuild"() {
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/BridgeBuilderSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/BridgeBuilderSpec.groovy
index df7f259..57339a1 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/BridgeBuilderSpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/BridgeBuilderSpec.groovy
@@ -36,7 +36,7 @@ class BridgeBuilderSpec extends AbstractSharedRegistrySpecification {
then:
- bridge.toString() == "<PipelineBridge from org.apache.tapestry5.ioc.internal.services.StandardService to org.apache.tapestry5.ioc.internal.services.StandardFilter>"
+ bridge.toString() == "<PipelineBridge from org.apache.tapestry5.ioc.test.internal.services.StandardService to org.apache.tapestry5.ioc.test.internal.services.StandardFilter>"
}
def "standard service and interface"() {
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/ClassNameLocatorImplSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/ClassNameLocatorImplSpec.groovy
index b86ff77..a7be3a8 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/ClassNameLocatorImplSpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/ClassNameLocatorImplSpec.groovy
@@ -51,7 +51,7 @@ class ClassNameLocatorImplSpec extends Specification {
def "can locate classes in local folder, but exclude inner classes"() {
- def packageName = "org.apache.tapestry5.ioc.services"
+ def packageName = "org.apache.tapestry5.commons.services"
when:
@@ -59,7 +59,7 @@ class ClassNameLocatorImplSpec extends Specification {
then:
- assertInList names, packageName, "SymbolSource", "CoercionTuple"
+ assertInList names, packageName, "DataTypeAnalyzer", "CoercionTuple"
// This is an inner class and those should never be provided.
assertNotInList names, packageName, 'CoercionTuple$CoercionWrapper'
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/ConfigurationsSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/ConfigurationsSpec.groovy
index 9a48842..e2a8817 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/ConfigurationsSpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/ConfigurationsSpec.groovy
@@ -122,7 +122,7 @@ class ConfigurationsSpec extends AbstractRegistrySpecification {
then:
IllegalArgumentException e = thrown()
- e.message.contains "Contribution org.apache.tapestry5.ioc.InvalidContributeDefModule.contributeDoesNotExist(Configuration)"
+ e.message.contains "Contribution org.apache.tapestry5.ioc.test.InvalidContributeDefModule.contributeDoesNotExist(Configuration)"
e.message.contains "is for service 'DoesNotExist', which does not exist."
}
@@ -152,7 +152,7 @@ class ConfigurationsSpec extends AbstractRegistrySpecification {
RuntimeException e = thrown()
- e.message.contains "Failure processing override from org.apache.tapestry5.ioc.FailedConfigurationOverrideModule.contributeOrderedNames(OrderedConfiguration)"
+ e.message.contains "Failure processing override from org.apache.tapestry5.ioc.test.FailedConfigurationOverrideModule.contributeOrderedNames(OrderedConfiguration)"
e.message.contains "Override for object 'wilma' is invalid as it does not match an existing object."
}
@@ -200,7 +200,7 @@ class ConfigurationsSpec extends AbstractRegistrySpecification {
RuntimeException e = thrown()
- e.message.contains "Override for key alley cat (at org.apache.tapestry5.ioc.util.NonmatchingMappedConfigurationOverrideModule.contributeStringLookup(MappedConfiguration)"
+ e.message.contains "Override for key alley cat (at org.apache.tapestry5.ioc.test.util.NonmatchingMappedConfigurationOverrideModule.contributeStringLookup(MappedConfiguration)"
e.message.contains "does not match an existing key"
}
@@ -267,11 +267,11 @@ class ConfigurationsSpec extends AbstractRegistrySpecification {
RuntimeException e = thrown()
- ["Contribution org.apache.tapestry5.ioc.InvalidContributeDefModule2.provideConfiguration(OrderedConfiguration)",
- "is for service 'interface org.apache.tapestry5.ioc.NameListHolder'",
+ ["Contribution org.apache.tapestry5.ioc.test.InvalidContributeDefModule2.provideConfiguration(OrderedConfiguration)",
+ "is for service 'interface org.apache.tapestry5.ioc.test.NameListHolder'",
"qualified with marker annotations [",
- "interface org.apache.tapestry5.ioc.BlueMarker",
- "interface org.apache.tapestry5.ioc.RedMarker",
+ "interface org.apache.tapestry5.ioc.test.BlueMarker",
+ "interface org.apache.tapestry5.ioc.test.RedMarker",
"], which does not exist."].every { e.message.contains it}
}
@@ -281,9 +281,9 @@ class ConfigurationsSpec extends AbstractRegistrySpecification {
then:
RuntimeException e = thrown()
- ["Contribution org.apache.tapestry5.ioc.InvalidContributeDefModule3.provideConfiguration(OrderedConfiguration)",
- "is for service 'interface org.apache.tapestry5.ioc.NameListHolder'",
- "qualified with marker annotations [interface org.apache.tapestry5.ioc.BlueMarker], which does not exist."].every
+ ["Contribution org.apache.tapestry5.ioc.test.InvalidContributeDefModule3.provideConfiguration(OrderedConfiguration)",
+ "is for service 'interface org.apache.tapestry5.ioc.test.NameListHolder'",
+ "qualified with marker annotations [interface org.apache.tapestry5.ioc.test.BlueMarker], which does not exist."].every
{ e.message.contains it}
}
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/ContributionDefImplSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/ContributionDefImplSpec.groovy
index fa08879..6088d91 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/ContributionDefImplSpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/ContributionDefImplSpec.groovy
@@ -161,7 +161,7 @@ class ContributionDefImplSpec extends Specification {
RuntimeException e = thrown()
- e.message.contains "Service 'Foo' is configured using org.apache.tapestry5.ioc.Configuration, not org.apache.tapestry5.ioc.MappedConfiguration."
+ e.message.contains "Service 'Foo' is configured using org.apache.tapestry5.commons.Configuration, not org.apache.tapestry5.commons.MappedConfiguration."
}
def "ordered configuration injects and contributes a service via @InjectService"() {
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/DefaultModuleDefImplSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/DefaultModuleDefImplSpec.groovy
index 10528b5..01e25a0 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/DefaultModuleDefImplSpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/DefaultModuleDefImplSpec.groovy
@@ -314,7 +314,7 @@ class DefaultModuleDefImplSpec extends Specification {
RuntimeException e = thrown()
- e.message.contains "Class org.apache.tapestry5.ioc.internal.RunnableServiceImpl (implementation of service 'Runnable') does not contain any public constructors."
+ e.message.contains "Class org.apache.tapestry5.ioc.test.internal.RunnableServiceImpl (implementation of service 'Runnable') does not contain any public constructors."
}
def "the bind() method of a module class must be a static method"() {
@@ -326,7 +326,7 @@ class DefaultModuleDefImplSpec extends Specification {
RuntimeException e = thrown()
- e.message.contains "Method org.apache.tapestry5.ioc.internal.NonStaticBindMethodModule.bind(ServiceBinder)"
+ e.message.contains "Method org.apache.tapestry5.ioc.test.internal.NonStaticBindMethodModule.bind(ServiceBinder)"
e.message.contains "appears to be a service binder method, but is an instance method, not a static method"
}
@@ -365,7 +365,7 @@ class DefaultModuleDefImplSpec extends Specification {
1 * logger.debug(_) >> { args ->
assert args[0].contains(
- "Invoking constructor org.apache.tapestry5.ioc.internal.MultipleConstructorsAutobuildService(StringHolder)")
+ "Invoking constructor org.apache.tapestry5.ioc.test.internal.MultipleConstructorsAutobuildService(StringHolder)")
}
0 * _
@@ -380,7 +380,7 @@ class DefaultModuleDefImplSpec extends Specification {
RuntimeException e = thrown()
- e.message.contains "Error invoking service binder method org.apache.tapestry5.ioc.internal.ExceptionInBindMethod.bind(ServiceBinder)"
+ e.message.contains "Error invoking service binder method org.apache.tapestry5.ioc.test.internal.ExceptionInBindMethod.bind(ServiceBinder)"
e.message.contains "at ExceptionInBindMethod.java"
e.message.contains "Really, how often is this going to happen?"
}
@@ -490,7 +490,7 @@ class DefaultModuleDefImplSpec extends Specification {
RuntimeException e = thrown()
- e.message.contains "Class org.apache.tapestry5.ioc.internal.AbstractRunnableService (implementation of service 'Runnable') is abstract."
+ e.message.contains "Class org.apache.tapestry5.ioc.test.internal.AbstractRunnableService (implementation of service 'Runnable') is abstract."
}
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/InjectionSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/InjectionSpec.groovy
index 2b0508e..a040264 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/InjectionSpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/InjectionSpec.groovy
@@ -21,7 +21,7 @@ class InjectionSpec extends AbstractRegistrySpecification {
then:
greeter.greeting == "Hello"
- greeter.toString() == "<Proxy for Greeter(org.apache.tapestry5.ioc.Greeter)>"
+ greeter.toString() == "<Proxy for Greeter(org.apache.tapestry5.ioc.test.Greeter)>"
}
def "injection by marker with single match"() {
@@ -50,9 +50,9 @@ class InjectionSpec extends AbstractRegistrySpecification {
RuntimeException e = thrown()
- e.message.contains "Unable to locate a single service assignable to type org.apache.tapestry5.ioc.Greeter with marker annotation(s) org.apache.tapestry5.ioc.RedMarker"
- e.message.contains "org.apache.tapestry5.ioc.GreeterModule.buildRedGreeter1()"
- e.message.contains "org.apache.tapestry5.ioc.GreeterModule.buildRedGreeter2()"
+ e.message.contains "Unable to locate a single service assignable to type org.apache.tapestry5.ioc.test.Greeter with marker annotation(s) org.apache.tapestry5.ioc.test.RedMarker"
+ e.message.contains "org.apache.tapestry5.ioc.test.GreeterModule.buildRedGreeter1()"
+ e.message.contains "org.apache.tapestry5.ioc.test.GreeterModule.buildRedGreeter2()"
}
def "verify exception for injection by marker and no matches"() {
@@ -69,7 +69,7 @@ class InjectionSpec extends AbstractRegistrySpecification {
RuntimeException e = thrown()
e.message.contains "Exception constructing service"
- e.message.contains "Unable to locate any service assignable to type org.apache.tapestry5.ioc.Greeter with marker annotation(s) org.apache.tapestry5.ioc.YellowMarker."
+ e.message.contains "Unable to locate any service assignable to type org.apache.tapestry5.ioc.test.Greeter with marker annotation(s) org.apache.tapestry5.ioc.test.YellowMarker."
}
def "recursion handling injections (due to MasterObjectProvider) is detected"() {
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/InternalUtilsSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/InternalUtilsSpec.groovy
index 2fd222a..7db6cd8 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/InternalUtilsSpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/InternalUtilsSpec.groovy
@@ -310,7 +310,7 @@ class InternalUtilsSpec extends Specification {
IllegalArgumentException e = thrown()
- e.message == "Marker annotation class org.apache.tapestry5.ioc.internal.util.NotRetainedRuntime is not valid because it is not visible at runtime. Add a @Retention(RetentionPolicy.RUNTIME) to the class."
+ e.message == "Marker annotation class org.apache.tapestry5.ioc.test.internal.util.NotRetainedRuntime is not valid because it is not visible at runtime. Add a @Retention(RetentionPolicy.RUNTIME) to the class."
}
def "close(Closable) for null does nothing"() {
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/NonParallelExecutorSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/NonParallelExecutorSpec.groovy
index 36b64e2..be8a05f 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/NonParallelExecutorSpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/NonParallelExecutorSpec.groovy
@@ -4,6 +4,7 @@ import org.apache.tapestry5.ioc.Invokable
import org.apache.tapestry5.ioc.Registry
import org.apache.tapestry5.ioc.RegistryBuilder
import org.apache.tapestry5.ioc.services.ParallelExecutor
+import org.apache.tapestry5.ioc.test.internal.services.NonParallelModule
import spock.lang.AutoCleanup
import spock.lang.Shared
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/ParallelExecutorSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/ParallelExecutorSpec.groovy
index 8060cae..0ab49e1 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/ParallelExecutorSpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/ParallelExecutorSpec.groovy
@@ -77,7 +77,7 @@ class ParallelExecutorSpec extends AbstractSharedRegistrySpecification {
then:
- thunk.toString() == "FutureThunk[org.apache.tapestry5.ioc.StringHolder]"
+ thunk.toString() == "FutureThunk[org.apache.tapestry5.ioc.test.StringHolder]"
}
def "exception inside the Invokable is rethrown by the thunk"() {
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/RegistryConstructionAndRuntimeErrorsSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/RegistryConstructionAndRuntimeErrorsSpec.groovy
index e84e353..a97dca1 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/RegistryConstructionAndRuntimeErrorsSpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/RegistryConstructionAndRuntimeErrorsSpec.groovy
@@ -80,7 +80,7 @@ class RegistryConstructionAndRuntimeErrorsSpec extends AbstractRegistrySpecifica
RuntimeException e = thrown()
- e.message.contains "Module class org.apache.tapestry5.ioc.internal.PrivateConstructorModule does not contain any public constructors."
+ e.message.contains "Module class org.apache.tapestry5.ioc.test.internal.PrivateConstructorModule does not contain any public constructors."
}
def "extra public constructors on a module class are ignored"() {
@@ -104,7 +104,7 @@ class RegistryConstructionAndRuntimeErrorsSpec extends AbstractRegistrySpecifica
RuntimeException e = thrown()
- e.message.contains "Module class org.apache.tapestry5.ioc.ExtraMethodsModule contains unrecognized public methods: "
+ e.message.contains "Module class org.apache.tapestry5.ioc.test.ExtraMethodsModule contains unrecognized public methods: "
e.message.contains "thisMethodIsInvalid()"
e.message.contains "soIsThisMethod()"
}
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/RegistrySpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/RegistrySpec.groovy
index 6cdca84..5613dfe 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/RegistrySpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/RegistrySpec.groovy
@@ -23,7 +23,7 @@ class RegistrySpec extends AbstractRegistrySpecification {
then:
greeter.greeting == "Hello"
- greeter.toString() == "<Proxy for HelloGreeter(org.apache.tapestry5.ioc.Greeter)>"
+ greeter.toString() == "<Proxy for HelloGreeter(org.apache.tapestry5.ioc.test.Greeter)>"
}
def "circular module references are ignored"() {
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/ServiceLookupSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/ServiceLookupSpec.groovy
index 6810705..d6b1612 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/ServiceLookupSpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/ServiceLookupSpec.groovy
@@ -72,7 +72,7 @@ class ServiceLookupSpec extends AbstractRegistrySpecification {
RuntimeException e = thrown()
- e.message == "Service interface org.apache.tapestry5.ioc.Pingable is matched by 2 services: Barney, Fred. Automatic dependency resolution requires that exactly one service implement the interface."
+ e.message == "Service interface org.apache.tapestry5.ioc.test.Pingable is matched by 2 services: Barney, Fred. Automatic dependency resolution requires that exactly one service implement the interface."
}
def "access to builtin service via marker annotation"() {
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/ServiceProxySpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/ServiceProxySpec.groovy
index 224e709..0d4c63c 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/ServiceProxySpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/ServiceProxySpec.groovy
@@ -88,7 +88,7 @@ class ServiceProxySpec extends AbstractRegistrySpecification {
when: "invoking toString() on the proxy"
- assert g.toString() == "<Autoreload proxy org.apache.tapestry5.ioc.CountingGreeterImpl(org.apache.tapestry5.ioc.Greeter)>"
+ assert g.toString() == "<Autoreload proxy org.apache.tapestry5.ioc.test.CountingGreeterImpl(org.apache.tapestry5.ioc.test.Greeter)>"
then: "the implementation is not yet instantiated"
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/StackSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/StackSpec.groovy
index 8579d96..ec278bf 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/StackSpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/StackSpec.groovy
@@ -1,6 +1,7 @@
package ioc.specs
import spock.lang.Specification
+import org.apache.tapestry5.commons.util.Stack
class StackSpec extends Specification {
diff --git a/tapestry-ioc/src/test/groovy/ioc/specs/TestBaseSpec.groovy b/tapestry-ioc/src/test/groovy/ioc/specs/TestBaseSpec.groovy
index 9a381e9..8010f9e 100644
--- a/tapestry-ioc/src/test/groovy/ioc/specs/TestBaseSpec.groovy
+++ b/tapestry-ioc/src/test/groovy/ioc/specs/TestBaseSpec.groovy
@@ -1,8 +1,8 @@
package ioc.specs
import org.apache.tapestry5.ioc.test.BeanSubclass
-import org.apache.tapestry5.ioc.test.internal.services.Bean
import org.apache.tapestry5.test.ioc.TestBase
+import org.apache.tapestry5.ioc.test.Bean
import spock.lang.Specification
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/test/internal/services/ServiceDecoratorImplSpec.groovy b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/test/internal/services/ServiceDecoratorImplSpec.groovy
index f163696..26ffb00 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/test/internal/services/ServiceDecoratorImplSpec.groovy
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/test/internal/services/ServiceDecoratorImplSpec.groovy
@@ -98,9 +98,9 @@ class ServiceDecoratorImplSpec extends AbstractSharedRegistrySpecification {
RuntimeException e = thrown()
- e.message.contains "Decorator method org.apache.tapestry5.ioc.internal.ServiceDecoratorFixture.decoratorUntyped(Object)"
+ e.message.contains "Decorator method org.apache.tapestry5.ioc.test.internal.ServiceDecoratorFixture.decoratorUntyped(Object)"
e.message.contains "(invoked for service '$SERVICE_ID') returned"
- e.message.contains "which is not assignable to the org.apache.tapestry5.ioc.internal.FieService service interface."
+ e.message.contains "which is not assignable to the org.apache.tapestry5.ioc.test.internal.FieService service interface."
}
@@ -126,7 +126,7 @@ class ServiceDecoratorImplSpec extends AbstractSharedRegistrySpecification {
RuntimeException e = thrown()
e.message.contains "Error invoking"
- e.message.contains "org.apache.tapestry5.ioc.internal.ServiceDecoratorFixture.decoratorThrowsException(java.lang.Object)"
+ e.message.contains "org.apache.tapestry5.ioc.test.internal.ServiceDecoratorFixture.decoratorThrowsException(java.lang.Object)"
e.message.contains "Ouch!"
}
diff --git a/tapestry-ioc/src/test/resources/org/apache/tapestry5/ioc/internal/util/TargetStrings.properties b/tapestry-ioc/src/test/resources/org/apache/tapestry5/ioc/test/internal/util/TargetStrings.properties
similarity index 100%
rename from tapestry-ioc/src/test/resources/org/apache/tapestry5/ioc/internal/util/TargetStrings.properties
rename to tapestry-ioc/src/test/resources/org/apache/tapestry5/ioc/test/internal/util/TargetStrings.properties