CVS: plexus-components/summit/src/test/org/apache/plexus/summit/resolver ClassicResolverTest.java,1.1.1.1,1.2 ClassicResolverTest.xml,1.1.1.1,1.2
[email protected] Thu, 1 May 2003 14:28:43 -0500
| Newsgroups | gmane.comp.java.plexus.devel |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/plexus/plexus-components/summit/src/test/org/apache/plexus/summit/resolver
In directory eng.werken.com:/tmp/cvs-serv17379/src/test/org/apache/plexus/summit/resolver
Modified Files:
ClassicResolverTest.java ClassicResolverTest.xml
Log Message:
o Removed the multiple View notion.
o Using a service manager instead of the components being service managers.
Index: ClassicResolverTest.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/summit/src/test/org/apache/plexus/summit/resolver/ClassicResolverTest.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- ClassicResolverTest.java 15 Feb 2003 03:55:59 -0000 1.1.1.1
+++ ClassicResolverTest.java 1 May 2003 19:28:40 -0000 1.2
@@ -61,14 +61,13 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.plexus.service.ServiceBroker;
import org.apache.plexus.summit.AbstractTest;
import org.apache.plexus.summit.module.Module;
import org.apache.plexus.summit.view.View;
/**
* <p>
- * Test suite for the {@link org.apache.plexus.summit.resolver.ClassResolver}
+ * Test suite for the {@link org.apache.plexus.summit.resolver.ClassicResolver}
* class.
* </p>
*
@@ -116,14 +115,12 @@
{
super.setUp();
- ServiceBroker view = ( ServiceBroker ) getComponent ( ServiceBroker.ROLE );
-
// This is NOT the right way to use a Resolver. You are
// supposed to only use the ROLE's interface; however, for
// testing purposes, we cast to ClassicResolver knowing 100%
// that we are getting a ClassicResolver because this unit
// test has its own dedicated plexus conf.
- classicResolver = ( ClassicResolver ) view.lookup( Resolver.ROLE );
+ classicResolver = ( ClassicResolver ) getComponent( Resolver.ROLE );
target = "/science/biology/Mitosis.vm";
}
@@ -174,8 +171,8 @@
modulePackages.add("org.zenplex.tambora.modules");
classicResolver.setModulePackages(modulePackages);
assertEquals(2, classicResolver.getModulePackages().size());
- assertEquals("org.apache.plexus.summit.modules", (String)classicResolver.getModulePackages().get(0));
- assertEquals("org.zenplex.tambora.modules", (String)classicResolver.getModulePackages().get(1));
+ assertEquals("org.apache.plexus.summit.modules", classicResolver.getModulePackages().get(0));
+ assertEquals("org.zenplex.tambora.modules", classicResolver.getModulePackages().get(1));
}
public void testClearModulePackages()
@@ -196,9 +193,9 @@
// the plexus config for this component, the "" package is
// added by default.
assertEquals(3, classicResolver.getModulePackages().size());
- assertEquals("", (String)classicResolver.getModulePackages().get(0));
- assertEquals("org.apache.plexus.summit.modules", (String)classicResolver.getModulePackages().get(1));
- assertEquals("org.zenplex.tambora.modules", (String)classicResolver.getModulePackages().get(2));
+ assertEquals("", classicResolver.getModulePackages().get(0));
+ assertEquals("org.apache.plexus.summit.modules", classicResolver.getModulePackages().get(1));
+ assertEquals("org.zenplex.tambora.modules", classicResolver.getModulePackages().get(2));
}
/**
@@ -248,10 +245,10 @@
System.out.println(i.next());
}
- assertEquals("layouts/science/biology/Mitosis.vm", (String)possibleViews.get(0));
- assertEquals("layouts/science/biology/Default.vm", (String)possibleViews.get(1));
- assertEquals("layouts/science/Default.vm", (String)possibleViews.get(2));
- assertEquals("layouts/Default.vm", (String)possibleViews.get(3));
+ assertEquals("layouts/science/biology/Mitosis.vm", possibleViews.get(0));
+ assertEquals("layouts/science/biology/Default.vm", possibleViews.get(1));
+ assertEquals("layouts/science/Default.vm", possibleViews.get(2));
+ assertEquals("layouts/Default.vm", possibleViews.get(3));
}
@@ -266,6 +263,7 @@
classicResolver.setDefaultBaseName("Default");
classicResolver.setDefaultViewExtension("vm");
- View view = classicResolver.getView(target);
+ //View view = classicResolver.getView(target);
+ //assertNotNull( view );
}
}
Index: ClassicResolverTest.xml
===================================================================
RCS file: /cvsroot/plexus/plexus-components/summit/src/test/org/apache/plexus/summit/resolver/ClassicResolverTest.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- ClassicResolverTest.xml 15 Feb 2003 03:55:59 -0000 1.1.1.1
+++ ClassicResolverTest.xml 1 May 2003 19:28:40 -0000 1.2
@@ -12,58 +12,47 @@
<implementation>org.apache.plexus.velocity.DefaultVelocityComponent</implementation>
<configuration/>
</component>
-
+
+ <!--
+ | NOTE: This component WAS previously defined outside of
+ | the 'view'; however, PSB does not support a parent-like
+ | concept of a ServiceBroker (yet). So in the meantime,
+ | this stays here, but will be moved back outside of the
+ | block shortly.
+ |-->
<component>
- <role>org.apache.plexus.service.ServiceBroker</role>
- <implementation>org.apache.plexus.summit.DefaultSummitView</implementation>
- <configuration>
- <id>test</id>
- <name>Test Application</name>
- <exceptionHandler>org.apache.plexus.summit.exception.DefaultExceptionHandler</exceptionHandler>
- <runDataClass>org.apache.plexus.summit.rundata.DefaultRunData</runDataClass>
- <components>
+ <role>org.apache.plexus.velocity.VelocityComponent</role>
+ <implementation>org.apache.plexus.velocity.DefaultVelocityComponent</implementation>
+ <configuration/>
+ </component>
- <!--
- | NOTE: This component WAS previously defined outside of
- | the 'view'; however, PSB does not support a parent-like
- | concept of a ServiceBroker (yet). So in the meantime,
- | this stays here, but will be moved back outside of the
- | block shortly.
- |-->
- <component>
- <role>org.apache.plexus.velocity.VelocityComponent</role>
- <implementation>org.apache.plexus.velocity.DefaultVelocityComponent</implementation>
- <configuration/>
- </component>
+ <component>
+ <role>org.apache.plexus.summit.resolver.Resolver</role>
+ <implementation>org.apache.plexus.summit.resolver.ClassicResolver</implementation>
+ <configuration>
+ <!-- AbstractResolver Configuration -->
+ <viewPath>templates</viewPath>
+ <errorView>Error.vm</errorView>
+ <defaultBaseName>Default</defaultBaseName>
+ <defaultViewExtension>vm</defaultViewExtension>
+ </configuration>
+ </component>
- <component>
- <role>org.apache.plexus.summit.resolver.Resolver</role>
- <implementation>org.apache.plexus.summit.resolver.ClassicResolver</implementation>
- <configuration>
- <!-- AbstractResolver Configuration -->
- <viewPath>templates</viewPath>
- <errorView>Error.vm</errorView>
- <defaultBaseName>Default</defaultBaseName>
- <defaultViewExtension>vm</defaultViewExtension>
- </configuration>
- </component>
- <component>
- <role>org.apache.plexus.summit.renderer.Renderer</role>
- <implementation>org.apache.plexus.summit.renderer.VelocityRenderer</implementation>
- <configuration>
- <properties>
- <property name="resource.loader" value="file"/>
- <property name="rile.resource.loader.class" value="org.apache.velocity.runtime.resource.loader.FileResourceLoader"/>
- <property name="file.resource.loader.path" value="${plexus.home}/application-views/summit-demo/templates/"/>
- <property name="file.resource.loader.cache " value="false"/>
- <property name="runtime.log.logsystem.class" value="org.apache.plexus.velocity.CommonsLoggingSystem"/>
- <property name="runtime.log.logsystem.log4j.category" value="org.apache.plexus.velocity.RuntimeVelocityComponentTest"/>
- </properties>
- </configuration>
- </component>
- </components>
+ <component>
+ <role>org.apache.plexus.summit.renderer.Renderer</role>
+ <implementation>org.apache.plexus.summit.renderer.VelocityRenderer</implementation>
+ <configuration>
+ <properties>
+ <property name="resource.loader" value="file"/>
+ <property name="rile.resource.loader.class" value="org.apache.velocity.runtime.resource.loader.FileResourceLoader"/>
+ <property name="file.resource.loader.path" value="${plexus.home}/application-views/summit-demo/templates/"/>
+ <property name="file.resource.loader.cache " value="false"/>
+ <property name="runtime.log.logsystem.class" value="org.apache.plexus.velocity.CommonsLoggingSystem"/>
+ <property name="runtime.log.logsystem.log4j.category" value="org.apache.plexus.velocity.RuntimeVelocityComponentTest"/>
+ </properties>
</configuration>
</component>
</components>
+
</plexus>