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 2010/04/19 15:58:19 UTC
svn commit: r935573 -
/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentClassResolverImplTest.java
Author: hlship
Date: Mon Apr 19 13:58:19 2010
New Revision: 935573
URL: http://svn.apache.org/viewvc?rev=935573&view=rev
Log:
Strip out some tests that required a library mapping containing a slash in the prefix name.
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentClassResolverImplTest.java
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=935573&r1=935572&r2=935573&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 Mon Apr 19 13:58:19 2010
@@ -566,7 +566,7 @@ public class ComponentClassResolverImplT
replay();
- ComponentClassResolver resolver = create(logger, source, locator, new LibraryMapping("/" + LIB_PREFIX + "/",
+ ComponentClassResolver resolver = create(logger, source, locator, new LibraryMapping(LIB_PREFIX,
LIB_ROOT_PACKAGE), new LibraryMapping(CORE_PREFIX, CORE_ROOT_PACKAGE));
assertEquals(resolver.resolvePageNameToClassName("lib/MyLibPage"), className);
@@ -625,34 +625,6 @@ public class ComponentClassResolverImplT
}
@Test
- public void name_stripping_for_complex_library_folder_name()
- {
- String libPrefix = "lib/deep";
-
- String className = LIB_ROOT_PACKAGE + ".pages.LibDeepPage";
-
- 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(libPrefix,
- LIB_ROOT_PACKAGE), new LibraryMapping(CORE_PREFIX, CORE_ROOT_PACKAGE));
-
- assertEquals(resolver.resolvePageNameToClassName("lib/deep/Page"), className);
- assertEquals(resolver.resolvePageNameToClassName("lib/deep/LibDeepPage"), className);
-
- verify();
- }
-
- @Test
public void class_name_does_not_resolve_to_page_name()
{
ComponentInstantiatorSource source = mockComponentInstantiatorSource();
@@ -771,40 +743,6 @@ public class ComponentClassResolverImplT
verify();
}
- @Test
- public void complex_prefix_search_fails()
- {
- String deepPackage = "org.deep";
-
- ComponentInstantiatorSource source = mockComponentInstantiatorSource();
- ClassNameLocator locator = newClassNameLocator();
- Logger logger = mockLogger();
-
- train_for_packages(source, deepPackage);
- train_for_packages(source, LIB_ROOT_PACKAGE);
- train_for_packages(source, CORE_ROOT_PACKAGE);
- train_for_app_packages(source);
-
- // Is this test even needed any more with the new algorithm?
-
- replay();
-
- ComponentClassResolver resolver = create(logger, source, locator, new LibraryMapping("lib/deep", deepPackage),
- new LibraryMapping(LIB_PREFIX, LIB_ROOT_PACKAGE), new LibraryMapping(CORE_PREFIX, CORE_ROOT_PACKAGE));
-
- try
- {
- resolver.resolvePageNameToClassName("lib/deep/DeepPage");
- unreachable();
- }
- catch (UnknownValueException ex)
- {
- assertMessageContains(ex, "Unable to resolve 'lib/deep/DeepPage' to a page class name.");
- }
-
- verify();
- }
-
private void train_for_packages(ComponentInstantiatorSource source, String packageName)
{
source.addPackage(packageName + ".pages");