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 2011/05/03 23:12:43 UTC
svn commit: r1099253 [2/2] - in /tapestry/tapestry5/trunk:
plastic/src/main/java/org/apache/tapestry5/plastic/
plastic/src/test/groovy/org/apache/tapestry5/plastic/
plastic/src/test/java/testsubjects/
tapestry-core/src/main/java/org/apache/tapestry5/in...
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentClassResolverImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentClassResolverImplTest.java?rev=1099253&r1=1099252&r2=1099253&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentClassResolverImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentClassResolverImplTest.java Tue May 3 21:12:42 2011
@@ -14,6 +14,13 @@
package org.apache.tapestry5.internal.services;
+import static org.easymock.EasyMock.isA;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
import org.apache.tapestry5.func.F;
import org.apache.tapestry5.internal.test.InternalBaseTestCase;
import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
@@ -22,15 +29,9 @@ import org.apache.tapestry5.ioc.util.Unk
import org.apache.tapestry5.services.ComponentClassResolver;
import org.apache.tapestry5.services.LibraryMapping;
import org.easymock.EasyMock;
-import static org.easymock.EasyMock.isA;
import org.slf4j.Logger;
import org.testng.annotations.Test;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
public class ComponentClassResolverImplTest extends InternalBaseTestCase
{
private static final String APP_ROOT_PACKAGE = "org.example.app";
@@ -46,12 +47,11 @@ public class ComponentClassResolverImplT
private static final String LIB_ROOT_PACKAGE = "org.example.lib";
- private ComponentClassResolverImpl create(Logger logger, ComponentInstantiatorSource source,
- ClassNameLocator locator, LibraryMapping... mappings)
+ private ComponentClassResolverImpl create(Logger logger, ClassNameLocator locator, LibraryMapping... mappings)
{
List<LibraryMapping> full = F.flow(APP_ROOT_PACKAGE_MAPPINGS).concat(F.flow(mappings)).toList();
- return new ComponentClassResolverImpl(logger, source, locator, "Start", full);
+ return new ComponentClassResolverImpl(logger, locator, "Start", full);
}
private Logger compliantLogger()
@@ -68,19 +68,16 @@ public class ComponentClassResolverImplT
@Test
public void simple_page_name()
{
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = compliantLogger();
- train_for_app_packages(source);
-
String className = APP_ROOT_PACKAGE + ".pages.SimplePage";
train_locateComponentClassNames(locator, APP_ROOT_PACKAGE + ".pages", className);
replay();
- ComponentClassResolver resolver = create(logger, source, locator);
+ ComponentClassResolver resolver = create(logger, locator);
assertEquals(resolver.resolvePageNameToClassName("SimplePage"), className);
@@ -93,19 +90,16 @@ public class ComponentClassResolverImplT
@Test
public void get_page_names()
{
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = compliantLogger();
- train_for_app_packages(source);
-
train_locateComponentClassNames(locator, APP_ROOT_PACKAGE + ".pages", APP_ROOT_PACKAGE + ".pages.SimplePage",
APP_ROOT_PACKAGE + ".pages.nested.Other", APP_ROOT_PACKAGE + ".pages.nested.NestedPage",
APP_ROOT_PACKAGE + ".pages.nested.NestedIndex");
replay();
- ComponentClassResolver resolver = create(logger, source, locator);
+ ComponentClassResolver resolver = create(logger, locator);
List<String> pageNames = resolver.getPageNames();
@@ -120,19 +114,16 @@ public class ComponentClassResolverImplT
@Test
public void page_name_matches_containing_folder_name()
{
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = compliantLogger();
- train_for_app_packages(source);
-
String className = APP_ROOT_PACKAGE + ".pages.admin.product.ProductAdmin";
train_locateComponentClassNames(locator, APP_ROOT_PACKAGE + ".pages", className);
replay();
- ComponentClassResolver resolver = create(logger, source, locator);
+ ComponentClassResolver resolver = create(logger, locator);
assertEquals(resolver.resolvePageNameToClassName("admin/product/ProductAdmin"), className);
@@ -142,19 +133,16 @@ public class ComponentClassResolverImplT
@Test
public void canonicalize_existing_page_name()
{
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = compliantLogger();
- train_for_app_packages(source);
-
String className = APP_ROOT_PACKAGE + ".pages.SimplePage";
train_locateComponentClassNames(locator, APP_ROOT_PACKAGE + ".pages", className);
replay();
- ComponentClassResolver resolver = create(logger, source, locator);
+ ComponentClassResolver resolver = create(logger, locator);
assertEquals(resolver.canonicalizePageName("simplepage"), "SimplePage");
@@ -164,19 +152,16 @@ public class ComponentClassResolverImplT
@Test
public void canonicalize_start_page()
{
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = compliantLogger();
- train_for_app_packages(source);
-
String className = APP_ROOT_PACKAGE + ".pages.HomePage";
train_locateComponentClassNames(locator, APP_ROOT_PACKAGE + ".pages", className);
replay();
- ComponentClassResolver resolver = new ComponentClassResolverImpl(logger, source, locator, "HomePage",
+ ComponentClassResolver resolver = new ComponentClassResolverImpl(logger, locator, "HomePage",
APP_ROOT_PACKAGE_MAPPINGS);
assertEquals(resolver.canonicalizePageName("HomePage"), "HomePage");
@@ -189,19 +174,16 @@ public class ComponentClassResolverImplT
@Test
public void start_page_in_subfolder()
{
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = compliantLogger();
- train_for_app_packages(source);
-
String className = APP_ROOT_PACKAGE + ".pages.sub.HomePage";
train_locateComponentClassNames(locator, APP_ROOT_PACKAGE + ".pages", className);
replay();
- ComponentClassResolver resolver = new ComponentClassResolverImpl(logger, source, locator, "HomePage",
+ ComponentClassResolver resolver = new ComponentClassResolverImpl(logger, locator, "HomePage",
APP_ROOT_PACKAGE_MAPPINGS);
assertEquals(resolver.canonicalizePageName("sub/HomePage"), "sub/HomePage");
@@ -217,12 +199,9 @@ public class ComponentClassResolverImplT
@Test
public void index_page_precedence()
{
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = compliantLogger();
- train_for_app_packages(source);
-
String[] classNames =
{ APP_ROOT_PACKAGE + ".pages.sub.HomePage", APP_ROOT_PACKAGE + ".pages.sub.SubIndex" };
@@ -232,7 +211,7 @@ public class ComponentClassResolverImplT
List<LibraryMapping> mappings = APP_ROOT_PACKAGE_MAPPINGS;
- ComponentClassResolver resolver = new ComponentClassResolverImpl(logger, source, locator, "HomePage", mappings);
+ ComponentClassResolver resolver = new ComponentClassResolverImpl(logger, locator, "HomePage", mappings);
assertTrue(resolver.isPageName("sub/HomePage"));
assertTrue(resolver.isPageName("sub/subIndex"));
@@ -247,19 +226,16 @@ public class ComponentClassResolverImplT
@Test
public void page_name_in_subfolder()
{
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = compliantLogger();
- train_for_app_packages(source);
-
String className = APP_ROOT_PACKAGE + ".pages.subfolder.NestedPage";
train_locateComponentClassNames(locator, APP_ROOT_PACKAGE + ".pages", className);
replay();
- ComponentClassResolver resolver = create(logger, source, locator);
+ ComponentClassResolver resolver = create(logger, locator);
assertEquals(resolver.resolvePageNameToClassName("subfolder/NestedPage"), className);
@@ -269,19 +245,16 @@ public class ComponentClassResolverImplT
@Test
public void lots_of_prefixes_and_suffixes_stripped()
{
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = compliantLogger();
- train_for_app_packages(source);
-
String className = APP_ROOT_PACKAGE + ".pages.admin.edit.AdminUserEdit";
train_locateComponentClassNames(locator, APP_ROOT_PACKAGE + ".pages", className);
replay();
- ComponentClassResolver resolver = create(logger, source, locator);
+ ComponentClassResolver resolver = create(logger, locator);
assertEquals(resolver.resolvePageNameToClassName("admin/edit/User"), className);
assertEquals(resolver.resolvePageNameToClassName("admin/edit/AdminUserEdit"), className);
@@ -292,19 +265,16 @@ public class ComponentClassResolverImplT
@Test
public void page_in_subfolder()
{
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = compliantLogger();
- train_for_app_packages(source);
-
String className = APP_ROOT_PACKAGE + ".pages.subfolder.NestedPage";
train_locateComponentClassNames(locator, APP_ROOT_PACKAGE + ".pages", className);
replay();
- ComponentClassResolver resolver = create(logger, source, locator);
+ ComponentClassResolver resolver = create(logger, locator);
assertEquals(resolver.resolvePageNameToClassName("subfolder/NestedPage"), className);
@@ -314,19 +284,16 @@ public class ComponentClassResolverImplT
@Test
public void subfolder_name_as_classname_prefix_is_stripped()
{
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = compliantLogger();
- train_for_app_packages(source);
-
String className = APP_ROOT_PACKAGE + ".pages.foo.FooBar";
train_locateComponentClassNames(locator, APP_ROOT_PACKAGE + ".pages", className);
replay();
- ComponentClassResolver resolver = create(logger, source, locator);
+ ComponentClassResolver resolver = create(logger, locator);
assertEquals(resolver.resolvePageNameToClassName("foo/Bar"), className);
@@ -336,13 +303,9 @@ public class ComponentClassResolverImplT
@Test
public void core_prefix_stripped_from_exception_message()
{
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = compliantLogger();
- train_for_packages(source, CORE_ROOT_PACKAGE);
- train_for_app_packages(source);
-
train_locateComponentClassNames(locator, CORE_ROOT_PACKAGE + ".pages", CORE_ROOT_PACKAGE + ".pages.Fred",
CORE_ROOT_PACKAGE + ".pages.Barney");
train_locateComponentClassNames(locator, APP_ROOT_PACKAGE + ".pages", APP_ROOT_PACKAGE + ".pages.Wilma",
@@ -350,8 +313,7 @@ public class ComponentClassResolverImplT
replay();
- ComponentClassResolver resolver = create(logger, source, locator, new LibraryMapping(CORE_PREFIX,
- CORE_ROOT_PACKAGE));
+ ComponentClassResolver resolver = create(logger, locator, new LibraryMapping(CORE_PREFIX, CORE_ROOT_PACKAGE));
try
{
@@ -370,19 +332,16 @@ public class ComponentClassResolverImplT
@Test
public void is_page_name()
{
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = compliantLogger();
- train_for_app_packages(source);
-
String className = APP_ROOT_PACKAGE + ".pages.SimplePage";
train_locateComponentClassNames(locator, APP_ROOT_PACKAGE + ".pages", className);
replay();
- ComponentClassResolver resolver = create(logger, source, locator);
+ ComponentClassResolver resolver = create(logger, locator);
assertTrue(resolver.isPageName("SimplePage"));
assertTrue(resolver.isPageName("simplepage"));
@@ -394,19 +353,16 @@ public class ComponentClassResolverImplT
@Test
public void index_page_name_at_root()
{
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = compliantLogger();
- train_for_app_packages(source);
-
String className = APP_ROOT_PACKAGE + ".pages.Index";
train_locateComponentClassNames(locator, APP_ROOT_PACKAGE + ".pages", className);
replay();
- ComponentClassResolver resolver = create(logger, source, locator);
+ ComponentClassResolver resolver = create(logger, locator);
assertTrue(resolver.isPageName("Index"));
assertTrue(resolver.isPageName(""));
@@ -417,21 +373,16 @@ public class ComponentClassResolverImplT
@Test
public void is_page_name_for_core_page()
{
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = compliantLogger();
- train_for_app_packages(source);
- train_for_packages(source, CORE_ROOT_PACKAGE);
-
String className = CORE_ROOT_PACKAGE + ".pages.MyCorePage";
train_locateComponentClassNames(locator, CORE_ROOT_PACKAGE + ".pages", className);
replay();
- ComponentClassResolver resolver = create(logger, source, locator, new LibraryMapping(CORE_PREFIX,
- CORE_ROOT_PACKAGE));
+ ComponentClassResolver resolver = create(logger, locator, new LibraryMapping(CORE_PREFIX, CORE_ROOT_PACKAGE));
// Can look like an application page, but still resolves to the core library class name.
@@ -473,17 +424,14 @@ public class ComponentClassResolverImplT
{
String className = APP_ROOT_PACKAGE + ".pages.SimplePage";
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = compliantLogger();
- train_for_app_packages(source);
-
train_locateComponentClassNames(locator, APP_ROOT_PACKAGE + ".pages", className);
replay();
- ComponentClassResolver resolver = create(logger, source, locator);
+ ComponentClassResolver resolver = create(logger, locator);
assertEquals(resolver.resolvePageClassNameToPageName(className), "SimplePage");
@@ -498,17 +446,14 @@ public class ComponentClassResolverImplT
{
String pageClassName = APP_ROOT_PACKAGE + ".pages.SimplePage";
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = compliantLogger();
- train_for_app_packages(source);
-
train_locateComponentClassNames(locator, APP_ROOT_PACKAGE + ".pages", pageClassName);
replay();
- ComponentClassResolverImpl resolver = create(logger, source, locator);
+ ComponentClassResolverImpl resolver = create(logger, locator);
assertEquals(resolver.resolvePageNameToClassName("SimplePage"), pageClassName);
@@ -541,19 +486,14 @@ public class ComponentClassResolverImplT
{
String className = CORE_ROOT_PACKAGE + ".pages.MyCorePage";
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = compliantLogger();
- train_for_packages(source, CORE_ROOT_PACKAGE);
- train_for_app_packages(source);
-
train_locateComponentClassNames(locator, CORE_ROOT_PACKAGE + ".pages", className);
replay();
- ComponentClassResolver resolver = create(logger, source, locator, new LibraryMapping(CORE_PREFIX,
- CORE_ROOT_PACKAGE));
+ ComponentClassResolver resolver = create(logger, locator, new LibraryMapping(CORE_PREFIX, CORE_ROOT_PACKAGE));
assertEquals(resolver.resolvePageNameToClassName("MyCorePage"), className);
@@ -565,19 +505,14 @@ public class ComponentClassResolverImplT
{
String className = CORE_ROOT_PACKAGE + ".pages.MyCorePage";
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = compliantLogger();
- train_for_packages(source, CORE_ROOT_PACKAGE);
- train_for_app_packages(source);
-
train_locateComponentClassNames(locator, CORE_ROOT_PACKAGE + ".pages", className);
replay();
- ComponentClassResolver resolver = create(logger, source, locator, new LibraryMapping(CORE_PREFIX,
- CORE_ROOT_PACKAGE));
+ ComponentClassResolver resolver = create(logger, locator, new LibraryMapping(CORE_PREFIX, CORE_ROOT_PACKAGE));
assertEquals(resolver.resolvePageClassNameToPageName(className), "core/MyCorePage");
@@ -589,20 +524,15 @@ public class ComponentClassResolverImplT
{
String className = LIB_ROOT_PACKAGE + ".pages.MyLibPage";
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = compliantLogger();
- train_for_packages(source, LIB_ROOT_PACKAGE);
- train_for_packages(source, CORE_ROOT_PACKAGE);
- train_for_app_packages(source);
-
train_locateComponentClassNames(locator, LIB_ROOT_PACKAGE + ".pages", className);
replay();
- ComponentClassResolver resolver = create(logger, source, locator, new LibraryMapping(LIB_PREFIX,
- LIB_ROOT_PACKAGE), new LibraryMapping(CORE_PREFIX, CORE_ROOT_PACKAGE));
+ ComponentClassResolver resolver = create(logger, locator, new LibraryMapping(LIB_PREFIX, LIB_ROOT_PACKAGE),
+ new LibraryMapping(CORE_PREFIX, CORE_ROOT_PACKAGE));
assertEquals(resolver.resolvePageNameToClassName("lib/MyLibPage"), className);
@@ -614,20 +544,15 @@ public class ComponentClassResolverImplT
{
String className = LIB_ROOT_PACKAGE + ".pages.MyLibPage";
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = compliantLogger();
- train_for_packages(source, LIB_ROOT_PACKAGE);
- train_for_packages(source, CORE_ROOT_PACKAGE);
- train_for_app_packages(source);
-
train_locateComponentClassNames(locator, LIB_ROOT_PACKAGE + ".pages", className);
replay();
- ComponentClassResolver resolver = create(logger, source, locator, new LibraryMapping(LIB_PREFIX,
- LIB_ROOT_PACKAGE), new LibraryMapping(CORE_PREFIX, CORE_ROOT_PACKAGE));
+ ComponentClassResolver resolver = create(logger, locator, new LibraryMapping(LIB_PREFIX, LIB_ROOT_PACKAGE),
+ new LibraryMapping(CORE_PREFIX, CORE_ROOT_PACKAGE));
assertEquals(resolver.resolvePageNameToClassName("lib/MyLibPage"), className);
@@ -639,20 +564,15 @@ public class ComponentClassResolverImplT
{
String className = LIB_ROOT_PACKAGE + ".pages.MyLibPage";
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = compliantLogger();
- train_for_packages(source, LIB_ROOT_PACKAGE);
- train_for_packages(source, CORE_ROOT_PACKAGE);
- train_for_app_packages(source);
-
train_locateComponentClassNames(locator, LIB_ROOT_PACKAGE + ".pages", className);
replay();
- ComponentClassResolver resolver = create(logger, source, locator, new LibraryMapping(LIB_PREFIX,
- LIB_ROOT_PACKAGE), new LibraryMapping(CORE_PREFIX, CORE_ROOT_PACKAGE));
+ ComponentClassResolver resolver = create(logger, locator, new LibraryMapping(LIB_PREFIX, LIB_ROOT_PACKAGE),
+ new LibraryMapping(CORE_PREFIX, CORE_ROOT_PACKAGE));
assertEquals(resolver.resolvePageNameToClassName("lib/MyLibPage"), className);
@@ -664,20 +584,15 @@ public class ComponentClassResolverImplT
{
String className = LIB_ROOT_PACKAGE + ".pages.LibPage";
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = compliantLogger();
- train_for_packages(source, LIB_ROOT_PACKAGE);
- train_for_packages(source, CORE_ROOT_PACKAGE);
- train_for_app_packages(source);
-
train_locateComponentClassNames(locator, LIB_ROOT_PACKAGE + ".pages", className);
replay();
- ComponentClassResolver resolver = create(logger, source, locator, new LibraryMapping(LIB_PREFIX,
- LIB_ROOT_PACKAGE), new LibraryMapping(CORE_PREFIX, CORE_ROOT_PACKAGE));
+ ComponentClassResolver resolver = create(logger, locator, new LibraryMapping(LIB_PREFIX, LIB_ROOT_PACKAGE),
+ new LibraryMapping(CORE_PREFIX, CORE_ROOT_PACKAGE));
assertEquals(resolver.resolvePageNameToClassName("lib/Page"), className);
@@ -687,17 +602,12 @@ public class ComponentClassResolverImplT
@Test
public void class_name_does_not_resolve_to_page_name()
{
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = mockLogger();
- train_for_packages(source, CORE_ROOT_PACKAGE);
- train_for_app_packages(source);
-
replay();
- ComponentClassResolver resolver = create(logger, source, locator, new LibraryMapping(CORE_PREFIX,
- CORE_ROOT_PACKAGE));
+ ComponentClassResolver resolver = create(logger, locator, new LibraryMapping(CORE_PREFIX, CORE_ROOT_PACKAGE));
String className = LIB_ROOT_PACKAGE + ".pages.LibPage";
@@ -717,20 +627,14 @@ public class ComponentClassResolverImplT
@Test
public void page_name_to_canonicalize_does_not_exist()
{
-
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = compliantLogger();
- train_for_packages(source, CORE_ROOT_PACKAGE);
- train_for_app_packages(source);
-
train_locateComponentClassNames(locator, APP_ROOT_PACKAGE + ".pages", APP_ROOT_PACKAGE + ".pages.Start");
replay();
- ComponentClassResolver resolver = create(logger, source, locator, new LibraryMapping(CORE_PREFIX,
- CORE_ROOT_PACKAGE));
+ ComponentClassResolver resolver = create(logger, locator, new LibraryMapping(CORE_PREFIX, CORE_ROOT_PACKAGE));
try
{
@@ -748,17 +652,12 @@ public class ComponentClassResolverImplT
@Test
public void class_name_not_in_a_pages_package()
{
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = mockLogger();
- train_for_packages(source, CORE_ROOT_PACKAGE);
- train_for_app_packages(source);
-
replay();
- ComponentClassResolver resolver = create(logger, source, locator, new LibraryMapping(CORE_PREFIX,
- CORE_ROOT_PACKAGE));
+ ComponentClassResolver resolver = create(logger, locator, new LibraryMapping(CORE_PREFIX, CORE_ROOT_PACKAGE));
String className = CORE_ROOT_PACKAGE + ".foo.CorePage";
@@ -781,36 +680,21 @@ public class ComponentClassResolverImplT
String secondaryLibPackage = "org.examples.addon.lib";
String className = secondaryLibPackage + ".pages.MyLibPage";
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = compliantLogger();
- train_for_packages(source, LIB_ROOT_PACKAGE);
- train_for_packages(source, secondaryLibPackage);
- train_for_packages(source, CORE_ROOT_PACKAGE);
- train_for_app_packages(source);
-
train_locateComponentClassNames(locator, secondaryLibPackage + ".pages", className);
replay();
- ComponentClassResolver resolver = create(logger, source, locator, new LibraryMapping(LIB_PREFIX,
- LIB_ROOT_PACKAGE), new LibraryMapping(LIB_PREFIX, secondaryLibPackage), new LibraryMapping(CORE_PREFIX,
- CORE_ROOT_PACKAGE));
+ ComponentClassResolver resolver = create(logger, locator, new LibraryMapping(LIB_PREFIX, LIB_ROOT_PACKAGE),
+ new LibraryMapping(LIB_PREFIX, secondaryLibPackage), new LibraryMapping(CORE_PREFIX, CORE_ROOT_PACKAGE));
assertEquals(resolver.resolvePageNameToClassName("lib/MyLibPage"), className);
verify();
}
- private void train_for_packages(ComponentInstantiatorSource source, String packageName)
- {
- source.addPackage(packageName + ".pages");
- source.addPackage(packageName + ".components");
- source.addPackage(packageName + ".mixins");
- source.addPackage(packageName + ".base");
- }
-
/**
* The logic for searching is pretty much identical for both components and pages, so even a cursory test of
* component types should nail it.
@@ -820,17 +704,14 @@ public class ComponentClassResolverImplT
{
String className = APP_ROOT_PACKAGE + ".components.SimpleComponent";
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = compliantLogger();
- train_for_app_packages(source);
-
train_locateComponentClassNames(locator, APP_ROOT_PACKAGE + ".components", className);
replay();
- ComponentClassResolver resolver = create(logger, source, locator);
+ ComponentClassResolver resolver = create(logger, locator);
assertEquals(resolver.resolveComponentTypeToClassName("SimpleComponent"), className);
@@ -846,17 +727,14 @@ public class ComponentClassResolverImplT
{
String expectedClassName = APP_ROOT_PACKAGE + ".mixins.SimpleMixin";
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = compliantLogger();
- train_for_app_packages(source);
-
train_locateComponentClassNames(locator, APP_ROOT_PACKAGE + ".mixins", expectedClassName);
replay();
- ComponentClassResolver resolver = create(logger, source, locator);
+ ComponentClassResolver resolver = create(logger, locator);
assertEquals(resolver.resolveMixinTypeToClassName("SimpleMixin"), expectedClassName);
@@ -866,17 +744,12 @@ public class ComponentClassResolverImplT
@Test
public void mixin_type_not_found()
{
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = mockLogger();
- train_for_packages(source, CORE_ROOT_PACKAGE);
- train_for_app_packages(source);
-
replay();
- ComponentClassResolver resolver = create(logger, source, locator, new LibraryMapping(CORE_PREFIX,
- CORE_ROOT_PACKAGE));
+ ComponentClassResolver resolver = create(logger, locator, new LibraryMapping(CORE_PREFIX, CORE_ROOT_PACKAGE));
try
{
@@ -894,17 +767,12 @@ public class ComponentClassResolverImplT
@Test
public void component_type_not_found()
{
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = mockLogger();
- train_for_packages(source, CORE_ROOT_PACKAGE);
- train_for_app_packages(source);
-
replay();
- ComponentClassResolver resolver = create(logger, source, locator, new LibraryMapping(CORE_PREFIX,
- CORE_ROOT_PACKAGE));
+ ComponentClassResolver resolver = create(logger, locator, new LibraryMapping(CORE_PREFIX, CORE_ROOT_PACKAGE));
try
{
@@ -919,11 +787,6 @@ public class ComponentClassResolverImplT
verify();
}
- private void train_for_app_packages(ComponentInstantiatorSource source)
- {
- train_for_packages(source, APP_ROOT_PACKAGE);
- }
-
@Test
public void common_package_name()
{
@@ -966,12 +829,9 @@ public class ComponentClassResolverImplT
@Test
public void ignore_start_page_outside_root()
{
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
ClassNameLocator locator = newClassNameLocator();
Logger logger = compliantLogger();
- train_for_app_packages(source);
-
String[] classNames = new String[]
{ APP_ROOT_PACKAGE + ".pages.exam.ExamIndex", APP_ROOT_PACKAGE + ".pages.exam.StartExam" };
@@ -979,7 +839,7 @@ public class ComponentClassResolverImplT
replay();
- ComponentClassResolver resolver = create(logger, source, locator);
+ ComponentClassResolver resolver = create(logger, locator);
assertEquals(resolver.resolvePageNameToClassName("exam"), classNames[0]);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImplTest.java?rev=1099253&r1=1099252&r2=1099253&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImplTest.java Tue May 3 21:12:42 2011
@@ -175,13 +175,11 @@ public class ComponentInstantiatorSource
{ url }, contextLoader);
RegistryBuilder builder = new RegistryBuilder(extraLoader);
- builder.add(TapestryModule.class, ForceDevelopmentModeModule.class);
+ builder.add(TapestryModule.class, ForceDevelopmentModeModule.class, AddTransformPagesToCISModule.class);
registry = builder.build();
source = registry.getService(ComponentInstantiatorSource.class);
-
- source.addPackage("org.apache.tapestry5.internal.transform.pages");
}
@AfterClass
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ForceDevelopmentModeModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ForceDevelopmentModeModule.java?rev=1099253&r1=1099252&r2=1099253&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ForceDevelopmentModeModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ForceDevelopmentModeModule.java Tue May 3 21:12:42 2011
@@ -15,6 +15,7 @@
package org.apache.tapestry5.internal.services;
import org.apache.tapestry5.SymbolConstants;
+import org.apache.tapestry5.internal.InternalConstants;
import org.apache.tapestry5.ioc.MappedConfiguration;
import org.apache.tapestry5.ioc.annotations.Contribute;
import org.apache.tapestry5.ioc.services.ApplicationDefaults;
@@ -27,5 +28,6 @@ public class ForceDevelopmentModeModule
public static void enableDevelopmentMode(MappedConfiguration<String, Object> configuration)
{
configuration.add(SymbolConstants.PRODUCTION_MODE, false);
+ configuration.add(InternalConstants.TAPESTRY_APP_PACKAGE_PARAM, "app.root.package");
}
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticProxyFactoryImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticProxyFactoryImpl.java?rev=1099253&r1=1099252&r2=1099253&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticProxyFactoryImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PlasticProxyFactoryImpl.java Tue May 3 21:12:42 2011
@@ -55,7 +55,7 @@ public class PlasticProxyFactoryImpl imp
this.loader = parentClassLoader;
this.logger = logger;
- manager = new PlasticManager(parentClassLoader);
+ manager = PlasticManager.withClassLoader(parentClassLoader).create();
if (logger != null)
{