svn commit: r517538 - in /tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/pagelevel: PageLinkInvoker.java PageTester.java

[hl...@apache.org]

Author: hlship
Date: Mon Mar 12 22:49:14 2007
New Revision: 517538

URL: http://svn.apache.org/viewvc?view=rev&rev=517538
Log:
Fix initialization problem in PageTester.

Modified:
    tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/pagelevel/PageLinkInvoker.java
    tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/pagelevel/PageTester.java

Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/pagelevel/PageLinkInvoker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/pagelevel/PageLinkInvoker.java?view=diff&rev=517538&r1=517537&r2=517538
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/pagelevel/PageLinkInvoker.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/pagelevel/PageLinkInvoker.java Mon Mar 12 22:49:14 2007
@@ -14,9 +14,9 @@
 
 package org.apache.tapestry.test.pagelevel;
 
+import org.apache.tapestry.MarkupWriter;
 import org.apache.tapestry.dom.Document;
 import org.apache.tapestry.internal.services.ComponentInvocation;
-import org.apache.tapestry.internal.services.MarkupWriterImpl;
 import org.apache.tapestry.internal.services.PageLinkHandler;
 import org.apache.tapestry.internal.services.PageMarkupRenderer;
 import org.apache.tapestry.internal.services.PageRenderer;
@@ -56,7 +56,8 @@
     {
         try
         {
-            final MarkupWriterImpl writer = (MarkupWriterImpl) _writerFactory.newMarkupWriter();
+            final MarkupWriter writer = _writerFactory.newMarkupWriter();
+
             _pageLinkHandler.handle(invocation, new PageRenderer()
             {
 
@@ -66,6 +67,7 @@
                 }
 
             });
+
             return writer.getDocument();
         }
         finally

Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/pagelevel/PageTester.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/pagelevel/PageTester.java?view=diff&rev=517538&r1=517537&r2=517538
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/pagelevel/PageTester.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/test/pagelevel/PageTester.java Mon Mar 12 22:49:14 2007
@@ -32,6 +32,7 @@
 import org.apache.tapestry.ioc.internal.util.Defense;
 import org.apache.tapestry.ioc.util.StrategyRegistry;
 import org.apache.tapestry.services.ApplicationGlobals;
+import org.apache.tapestry.services.ComponentClassResolver;
 
 /**
  * This class is used to run a Tapestry app in an in-process testing environment. You can ask it to
@@ -108,6 +109,10 @@
         _registry = new TapestryAppInitializer(appPackage, appName, "test",
                 addDefaultOverrides(serviceOverrides)).getRegistry();
 
+        // This is normally done by the ApplicationInitializer pipeline service.
+
+        _registry.getService(ComponentClassResolver.class).setApplicationPackage(appPackage);
+
         _localizationSetter = _registry.getService("LocalizationSetter", LocalizationSetter.class);
 
         ApplicationGlobals globals = _registry.getObject(
@@ -124,6 +129,7 @@
         Map<Class, ComponentInvoker> map = newMap();
         map.put(PageLinkTarget.class, new PageLinkInvoker(_registry));
         map.put(ActionLinkTarget.class, new ActionLinkInvoker(_registry, this, _invocationMap));
+
         _invokerRegistry = new StrategyRegistry<ComponentInvoker>(ComponentInvoker.class, map);
     }