You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2008/11/07 18:17:42 UTC
svn commit: r712202 [2/2] - in /tapestry/tapestry5/trunk: src/site/apt/guide/
tapestry-core/src/main/java/org/apache/tapestry5/internal/
tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/
tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ tapes...
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExtraPublicConstructorsModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExtraPublicConstructorsModule.java?rev=712202&r1=712201&r2=712202&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExtraPublicConstructorsModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExtraPublicConstructorsModule.java Fri Nov 7 09:16:18 2008
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007 The Apache Software Foundation
+// Copyright 2006, 2007, 2008 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,27 +14,43 @@
package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry5.ioc.annotations.InjectService;
-import org.apache.tapestry5.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.MappedConfiguration;
+import org.apache.tapestry5.ioc.services.SymbolSource;
/**
* Used by {@link org.apache.tapestry5.ioc.internal.ModuleImplTest}.
*/
public class ExtraPublicConstructorsModule
{
+ private final SymbolSource source;
public ExtraPublicConstructorsModule()
{
-
+ throw new RuntimeException("This constructor should not be invoked.");
}
/**
* Should be the first constructor, the one that gets invoked. I'm worried that different compilers or JVMs will
* order the constructors differently.
*/
- public ExtraPublicConstructorsModule(@InjectService("ClassFactory")
- ClassFactory factory)
+ public ExtraPublicConstructorsModule(SymbolSource source)
+ {
+ this.source = source;
+ }
+
+ public UpcaseService buildUpcaser()
{
+ return new UpcaseService()
+ {
+ public String upcase(String input)
+ {
+ return source.expandSymbols(input).toUpperCase();
+ }
+ };
+ }
+ public void contributeApplicationDefaults(MappedConfiguration<String, String> configuration)
+ {
+ configuration.add("fred", "flintstone");
}
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/InterceptorStackBuilderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/InterceptorStackBuilderTest.java?rev=712202&r1=712201&r2=712202&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/InterceptorStackBuilderTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/InterceptorStackBuilderTest.java Fri Nov 7 09:16:18 2008
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007 The Apache Software Foundation
+// Copyright 2006, 2007, 2008 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
package org.apache.tapestry5.ioc.internal;
import org.apache.tapestry5.ioc.ObjectCreator;
+import org.apache.tapestry5.ioc.OperationTracker;
import org.apache.tapestry5.ioc.ServiceDecorator;
import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
import org.testng.annotations.Test;
@@ -26,6 +27,8 @@
{
private static final String SERVICE_ID = "foo.bar.Baz";
+ private final OperationTracker tracker = new QuietOperationTracker();
+
@Test
public void no_decorators()
{
@@ -40,7 +43,7 @@
replay();
- ObjectCreator isb = new InterceptorStackBuilder(module, SERVICE_ID, core);
+ ObjectCreator isb = new InterceptorStackBuilder(module, SERVICE_ID, core, tracker);
Object intercepted = isb.createObject();
@@ -67,7 +70,7 @@
replay();
- ObjectCreator isb = new InterceptorStackBuilder(module, SERVICE_ID, core);
+ ObjectCreator isb = new InterceptorStackBuilder(module, SERVICE_ID, core, tracker);
Object intercepted = isb.createObject();
@@ -100,7 +103,7 @@
replay();
- ObjectCreator isb = new InterceptorStackBuilder(module, SERVICE_ID, core);
+ ObjectCreator isb = new InterceptorStackBuilder(module, SERVICE_ID, core, tracker);
Object intercepted = isb.createObject();
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ModuleImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ModuleImplTest.java?rev=712202&r1=712201&r2=712202&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ModuleImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ModuleImplTest.java Fri Nov 7 09:16:18 2008
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007 The Apache Software Foundation
+// Copyright 2006, 2007, 2008 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -19,12 +19,7 @@
import org.apache.tapestry5.ioc.def.DecoratorDef;
import org.apache.tapestry5.ioc.def.ModuleDef;
import org.apache.tapestry5.ioc.def.ServiceDef;
-import org.apache.tapestry5.ioc.internal.services.ClassFactoryImpl;
import org.apache.tapestry5.ioc.services.ClassFactory;
-import org.apache.tapestry5.ioc.services.RegistryShutdownListener;
-import org.apache.tapestry5.ioc.services.Status;
-import static org.easymock.EasyMock.contains;
-import static org.easymock.EasyMock.isA;
import org.slf4j.Logger;
import org.testng.annotations.Test;
@@ -34,50 +29,6 @@
public class ModuleImplTest extends IOCInternalTestCase
{
- @Test
- public void get_service_by_id_exists()
- {
- InternalRegistry registry = mockInternalRegistry();
- Logger logger = mockLogger();
- ClassFactory factory = new ClassFactoryImpl();
- ServiceActivityTracker tracker = mockServiceActivityTracker();
-
- ModuleDef moduleDef = new DefaultModuleDefImpl(ModuleImplTestModule.class, logger, getClassFactory());
-
- Module module = new ModuleImpl(registry, tracker, moduleDef, null, logger);
-
- expect(registry.getServiceLogger("Upcase")).andReturn(logger);
-
- train_isDebugEnabled(logger, true);
- logger.debug("Creating service 'Upcase'.");
-
- tracker.setStatus("Upcase", Status.VIRTUAL);
-
- train_newClass(registry, factory, UpcaseService.class);
-
- registry.addRegistryShutdownListener(isA(RegistryShutdownListener.class));
-
- replay();
-
- UpcaseService service = module.getService("Upcase", UpcaseService.class);
-
- verify();
-
- train_getLifecycle(registry, "singleton", new SingletonServiceLifecycle());
-
- train_isDebugEnabled(logger, false);
-
- train_findDecoratorsForService(registry);
-
- tracker.setStatus("Upcase", Status.REAL);
-
- replay();
-
- assertEquals(service.upcase("hello"), "HELLO");
-
- verify();
- }
-
protected final void train_newClass(InternalRegistry registry, ClassFactory factory, Class serviceInterface)
{
expect(registry.newClass(serviceInterface)).andReturn(factory.newClass(serviceInterface));
@@ -136,53 +87,6 @@
verify();
}
- @Test
- public void no_public_constructor_on_module_builder_class()
- {
- InternalRegistry registry = mockInternalRegistry();
- Logger logger = mockLogger();
- ModuleDef def = new DefaultModuleDefImpl(PrivateConstructorModule.class, logger, null);
-
- replay();
-
- Module module = new ModuleImpl(registry, null, def, null, logger);
-
- try
- {
- module.getModuleBuilder();
- unreachable();
- }
- catch (RuntimeException ex)
- {
- assertEquals(ex.getMessage(),
- "Module builder class org.apache.tapestry5.ioc.internal.PrivateConstructorModule " + "does not contain any public constructors.");
- }
-
- verify();
-
- }
-
- @Test
- public void too_many_public_constructors_on_module_builder_class()
- {
- InternalRegistry registry = mockInternalRegistry();
- Logger logger = mockLogger();
- ModuleDef def = new DefaultModuleDefImpl(ExtraPublicConstructorsModule.class, logger, null);
- ClassFactory factory = newMock(ClassFactory.class);
- Module module = new ModuleImpl(registry, null, def, null, logger);
-
- logger.warn(contains("contains more than one public constructor"));
-
- train_expandSymbols(registry, "ClassFactory", "ClassFactory");
-
- train_getService(registry, "ClassFactory", ClassFactory.class, factory);
-
- replay();
-
- assertTrue(module.getModuleBuilder() instanceof ExtraPublicConstructorsModule);
-
- verify();
- }
protected void train_expandSymbols(InternalRegistry registry, String input, String expanded)
{
@@ -237,5 +141,4 @@
registry.shutdown();
}
-
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/PrivateConstructorModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/PrivateConstructorModule.java?rev=712202&r1=712201&r2=712202&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/PrivateConstructorModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/PrivateConstructorModule.java Fri Nov 7 09:16:18 2008
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007 The Apache Software Foundation
+// Copyright 2006, 2007, 2008 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -23,4 +23,6 @@
private PrivateConstructorModule()
{
}
+
+ public Runnable buildTrigger() { return null; }
}
Added: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/QuietOperationTracker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/QuietOperationTracker.java?rev=712202&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/QuietOperationTracker.java (added)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/QuietOperationTracker.java Fri Nov 7 09:16:18 2008
@@ -0,0 +1,34 @@
+// Copyright 2008 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.ioc.internal;
+
+import org.apache.tapestry5.ioc.OperationTracker;
+import org.apache.tapestry5.ioc.internal.util.Invokable;
+
+/**
+ * Minimal implementation used for testing, that does no logging, tracking, or exception catching.
+ */
+public class QuietOperationTracker implements OperationTracker
+{
+ public void run(String description, Runnable operation)
+ {
+ operation.run();
+ }
+
+ public <T> T invoke(String description, Invokable<T> operation)
+ {
+ return operation.invoke();
+ }
+}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceBuilderMethodInvokerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceBuilderMethodInvokerTest.java?rev=712202&r1=712201&r2=712202&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceBuilderMethodInvokerTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceBuilderMethodInvokerTest.java Fri Nov 7 09:16:18 2008
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007 The Apache Software Foundation
+// Copyright 2006, 2007, 2008 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
import org.apache.tapestry5.ioc.AnnotationProvider;
import org.apache.tapestry5.ioc.ObjectCreator;
+import org.apache.tapestry5.ioc.OperationTracker;
import org.apache.tapestry5.ioc.ServiceBuilderResources;
import static org.apache.tapestry5.ioc.internal.AbstractServiceCreator.findParameterizedTypeFromGenericType;
import static org.easymock.EasyMock.eq;
@@ -35,11 +36,13 @@
private static final String CREATOR_DESCRIPTION = "{CREATOR DESCRIPTION}";
+ private final OperationTracker tracker = new QuietOperationTracker();
+
@Test
public void noargs_method()
{
ServiceBuilderMethodFixture fixture = new ServiceBuilderMethodFixture();
- ServiceBuilderResources resources = mockServiceBuilderResources();
+ ServiceBuilderResources resources = mockServiceBuilderResources(tracker);
Logger logger = mockLogger();
fixture.fie = mockFieService();
@@ -76,7 +79,7 @@
{
ServiceBuilderMethodFixture fixture = new ServiceBuilderMethodFixture();
Method method = findMethod(fixture, "build_args");
- ServiceBuilderResources resources = mockServiceBuilderResources();
+ ServiceBuilderResources resources = mockServiceBuilderResources(tracker);
Logger logger = mockLogger();
@@ -111,7 +114,7 @@
{
ServiceBuilderMethodFixture fixture = new ServiceBuilderMethodFixture();
Method method = findMethod(fixture, "build_with_forced_injection");
- ServiceBuilderResources resources = mockServiceBuilderResources();
+ ServiceBuilderResources resources = mockServiceBuilderResources(tracker);
Logger logger = mockLogger();
@@ -147,7 +150,7 @@
public void injected_service_method()
{
ServiceBuilderMethodFixture fixture = new ServiceBuilderMethodFixture();
- ServiceBuilderResources resources = mockServiceBuilderResources();
+ ServiceBuilderResources resources = mockServiceBuilderResources(tracker);
Logger logger = mockLogger();
fixture.fie = mockFieService();
@@ -178,7 +181,7 @@
public void injected_ordered_collection()
{
ServiceBuilderMethodFixture fixture = new ServiceBuilderMethodFixture();
- ServiceBuilderResources resources = mockServiceBuilderResources();
+ ServiceBuilderResources resources = mockServiceBuilderResources(tracker);
Logger logger = mockLogger();
fixture.fie = mockFieService();
@@ -203,7 +206,6 @@
assertSame(actual, fixture.fie);
verify();
-
}
@SuppressWarnings("unchecked")
@@ -211,7 +213,7 @@
public void injected_unordered_collection()
{
ServiceBuilderMethodFixture fixture = new ServiceBuilderMethodFixture();
- ServiceBuilderResources resources = mockServiceBuilderResources();
+ ServiceBuilderResources resources = mockServiceBuilderResources(tracker);
Logger logger = mockLogger();
fixture.fie = mockFieService();
@@ -247,7 +249,7 @@
public void builder_method_returns_null()
{
ServiceBuilderMethodFixture fixture = new ServiceBuilderMethodFixture();
- ServiceBuilderResources resources = mockServiceBuilderResources();
+ ServiceBuilderResources resources = mockServiceBuilderResources(tracker);
Logger logger = mockLogger();
Method method = findMethod(fixture, "build_noargs");
@@ -280,7 +282,7 @@
public void builder_method_failed()
{
ServiceBuilderMethodFixture fixture = new ServiceBuilderMethodFixture();
- ServiceBuilderResources resources = mockServiceBuilderResources();
+ ServiceBuilderResources resources = mockServiceBuilderResources(tracker);
Logger logger = mockLogger();
Method method = findMethod(fixture, "build_fail");
@@ -319,7 +321,7 @@
ServiceBuilderMethodFixture fixture = new ServiceBuilderMethodFixture();
Method method = findMethod(fixture, "build_auto");
- ServiceBuilderResources resources = mockServiceBuilderResources();
+ ServiceBuilderResources resources = mockServiceBuilderResources(tracker);
Logger logger = mockLogger();
fixture.fie = mockFieService();
@@ -403,5 +405,4 @@
{
return newMock(FieService.class);
}
-
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceDecoratorImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceDecoratorImplTest.java?rev=712202&r1=712201&r2=712202&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceDecoratorImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceDecoratorImplTest.java Fri Nov 7 09:16:18 2008
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007 The Apache Software Foundation
+// Copyright 2006, 2007, 2008 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
package org.apache.tapestry5.ioc.internal;
import org.apache.tapestry5.ioc.ModuleBuilderSource;
+import org.apache.tapestry5.ioc.OperationTracker;
import org.apache.tapestry5.ioc.ServiceResources;
import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.slf4j.Logger;
@@ -26,6 +27,8 @@
{
private static final String SERVICE_ID = "ioc.Fie";
+ private final OperationTracker tracker = new QuietOperationTracker();
+
private ModuleBuilderSource newSource(final Object builder)
{
return new ModuleBuilderSource()
@@ -48,7 +51,7 @@
ServiceDecoratorFixture fixture = new ServiceDecoratorFixture();
Method m = findMethod(fixture, "decoratorReturnsInterceptor");
- ServiceResources resources = mockServiceResources();
+ ServiceResources resources = mockServiceResources(tracker);
Logger logger = mockLogger();
fixture.expectedDelegate = mockFieService();
fixture.interceptorToReturn = mockFieService();
@@ -80,7 +83,7 @@
{
ServiceDecoratorFixture fixture = new ServiceDecoratorFixture();
ModuleBuilderSource source = newSource(fixture);
- ServiceResources resources = mockServiceResources();
+ ServiceResources resources = mockServiceResources(tracker);
Logger logger = mockLogger();
Object delegate = mockFieService();
@@ -107,7 +110,7 @@
{
ServiceDecoratorFixture fixture = new ServiceDecoratorFixture();
ModuleBuilderSource source = newSource(fixture);
- ServiceResources resources = mockServiceResources();
+ ServiceResources resources = mockServiceResources(tracker);
Logger logger = mockLogger();
fixture.expectedDelegate = mockFieService();
fixture.interceptorToReturn = newMock(FoeService.class);
@@ -141,7 +144,7 @@
{
ServiceDecoratorFixture fixture = new ServiceDecoratorFixture();
ModuleBuilderSource source = newSource(fixture);
- ServiceResources resources = mockServiceResources();
+ ServiceResources resources = mockServiceResources(tracker);
Logger logger = mockLogger();
Object delegate = mockFieService();
fixture.exception = new RuntimeException("Ouch!");
@@ -188,5 +191,4 @@
train_getLogger(resources, logger);
}
-
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToStringService.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToStringService.java?rev=712202&r1=712201&r2=712202&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToStringService.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToStringService.java Fri Nov 7 09:16:18 2008
@@ -1,17 +1,17 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006, 2008 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry5.ioc.internal;
/**
@@ -19,5 +19,6 @@
*/
public interface ToStringService
{
+ @Override
String toString();
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InternalUtilsTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InternalUtilsTest.java?rev=712202&r1=712201&r2=712202&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InternalUtilsTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InternalUtilsTest.java Fri Nov 7 09:16:18 2008
@@ -14,11 +14,9 @@
package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry5.ioc.AnnotationProvider;
-import org.apache.tapestry5.ioc.Locatable;
-import org.apache.tapestry5.ioc.Location;
-import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.*;
import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.internal.QuietOperationTracker;
import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
import static org.apache.tapestry5.ioc.internal.util.InternalUtils.toList;
import org.apache.tapestry5.ioc.services.Builtin;
@@ -39,6 +37,7 @@
public class InternalUtilsTest extends IOCTestCase
{
+ private final OperationTracker tracker = new QuietOperationTracker();
private static class PrivateInnerClass
{
@@ -474,7 +473,7 @@
replay();
- InternalUtils.injectIntoFields(target, ol);
+ InternalUtils.injectIntoFields(target, ol, tracker);
assertSame(target.getFred(), fred);
@@ -508,7 +507,7 @@
replay();
- InternalUtils.injectIntoFields(target, ol);
+ InternalUtils.injectIntoFields(target, ol, tracker);
assertSame(target.getSymbolSource(), ss);
@@ -531,7 +530,7 @@
try
{
- InternalUtils.injectIntoFields(target, ol);
+ InternalUtils.injectIntoFields(target, ol, tracker);
unreachable();
}