Author: mcconnell
Date: Thu Jun 10 03:23:06 2004
New Revision: 20986
Removed:
avalon/trunk/runtime/composition/impl/etc/test/unit/block.xml
avalon/trunk/runtime/composition/impl/etc/test/unit/ext/
avalon/trunk/runtime/composition/impl/etc/test/unit/lib/
avalon/trunk/runtime/composition/impl/etc/test/unit/repository/
avalon/trunk/runtime/composition/impl/src/test/org/apache/avalon/composition/model/test/dynamics/
avalon/trunk/runtime/composition/impl/src/test/org/apache/avalon/composition/model/testa/
avalon/trunk/runtime/composition/impl/src/test/org/apache/avalon/composition/model/testb/
avalon/trunk/runtime/composition/impl/src/test/org/apache/avalon/composition/model/testc/
avalon/trunk/runtime/composition/impl/src/test/org/apache/avalon/composition/model/testd/
avalon/trunk/runtime/composition/impl/src/test/org/apache/avalon/composition/model/teste/
Modified:
avalon/trunk/runtime/composition/impl/etc/test/unit/context.xml
avalon/trunk/runtime/composition/impl/etc/test/unit/dependency.xml
avalon/trunk/runtime/composition/impl/etc/test/unit/dynamics.xml
avalon/trunk/runtime/composition/impl/etc/test/unit/includes.xml
avalon/trunk/runtime/composition/impl/etc/test/unit/playground.xml
avalon/trunk/runtime/composition/impl/etc/test/unit/targets.xml
avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLContainmentProfileCreator.java
avalon/trunk/runtime/composition/impl/src/test/org/apache/avalon/composition/model/test/AbstractTestCase.java
avalon/trunk/runtime/composition/impl/src/test/org/apache/avalon/composition/model/test/ContextTestCase.java
avalon/trunk/runtime/composition/impl/src/test/org/apache/avalon/composition/model/test/DynamicsTestCase.java
Log:
Bringing test cases into line relative to external test resources.
Modified: avalon/trunk/runtime/composition/impl/etc/test/unit/context.xml
==============================================================================
--- avalon/trunk/runtime/composition/impl/etc/test/unit/context.xml
(original)
+++ avalon/trunk/runtime/composition/impl/etc/test/unit/context.xml Thu Jun
10 03:23:06 2004
@@ -4,14 +4,12 @@
<classloader>
<classpath>
- <fileset dir="ext">
- <include>test-a.jar</include>
- </fileset>
+ <artifact>artifact:jar:avalon/test/avalon-test-testa</artifact>
</classpath>
</classloader>
- <component name="test-a"
class="org.apache.avalon.composition.model.testa.TestA">
- <context class="org.apache.avalon.composition.model.testa.DefaultFacade">
+ <component name="test-a" class="org.apache.avalon.test.testa.TestA">
+ <context class="org.apache.avalon.test.testa.DefaultFacade">
<entry key="home">
<constructor class="java.io.File">
<param class="java.io.File">${urn:avalon:home}</param>
Modified: avalon/trunk/runtime/composition/impl/etc/test/unit/dependency.xml
==============================================================================
--- avalon/trunk/runtime/composition/impl/etc/test/unit/dependency.xml
(original)
+++ avalon/trunk/runtime/composition/impl/etc/test/unit/dependency.xml Thu Jun
10 03:23:06 2004
@@ -4,6 +4,10 @@
<classloader>
<classpath>
+ <artifact>artifact:jar:avalon/test/avalon-test-testa</artifact>
+ <artifact>artifact:jar:avalon/test/avalon-test-testb</artifact>
+ <artifact>artifact:jar:avalon/test/avalon-test-testc</artifact>
+ <!--
<fileset dir="ext">
<include>test-a.jar</include>
<include>test-b.jar</include>
@@ -11,11 +15,12 @@
<fileset dir="lib">
<include>test-c.jar</include>
</fileset>
+ -->
</classpath>
</classloader>
- <component name="test-a"
class="org.apache.avalon.composition.model.testa.TestA">
- <context class="org.apache.avalon.composition.model.testa.DefaultFacade">
+ <component name="test-a" class="org.apache.avalon.test.testa.TestA">
+ <context class="org.apache.avalon.test.testa.DefaultFacade">
<entry key="home">
<constructor class="java.io.File">
<param class="java.io.File">${urn:avalon:home}</param>
@@ -33,9 +38,9 @@
<container name="fred">
- <component name="test-b"
class="org.apache.avalon.composition.model.testb.TestB"/>
+ <component name="test-b" class="org.apache.avalon.test.testb.TestB"/>
- <component name="test-c"
class="org.apache.avalon.composition.model.testc.TestC">
+ <component name="test-c" class="org.apache.avalon.test.testc.TestC">
<dependencies>
<dependency key="a" source="../test-a"/>
<dependency key="a2" source="/test-a"/>
Modified: avalon/trunk/runtime/composition/impl/etc/test/unit/dynamics.xml
==============================================================================
--- avalon/trunk/runtime/composition/impl/etc/test/unit/dynamics.xml
(original)
+++ avalon/trunk/runtime/composition/impl/etc/test/unit/dynamics.xml Thu Jun
10 03:23:06 2004
@@ -2,7 +2,7 @@
<container name="test">
<classloader>
<classpath>
- <fileset dir="../classes"/>
+ <artifact>artifact:jar:avalon/test/avalon-test-dynamics</artifact>
</classpath>
</classloader>
</container>
Modified: avalon/trunk/runtime/composition/impl/etc/test/unit/includes.xml
==============================================================================
--- avalon/trunk/runtime/composition/impl/etc/test/unit/includes.xml
(original)
+++ avalon/trunk/runtime/composition/impl/etc/test/unit/includes.xml Thu Jun
10 03:23:06 2004
@@ -1,7 +1,7 @@
<container>
- <include name="test" id="test:includes">
+ <include name="test" id="avalon/test:avalon-test-includes">
<target path="primary/block/test">
<categories priority="INFO"/>
</target>
Modified: avalon/trunk/runtime/composition/impl/etc/test/unit/playground.xml
==============================================================================
--- avalon/trunk/runtime/composition/impl/etc/test/unit/playground.xml
(original)
+++ avalon/trunk/runtime/composition/impl/etc/test/unit/playground.xml Thu Jun
10 03:23:06 2004
@@ -9,24 +9,24 @@
<classloader>
<classpath>
- <fileset dir="../test-classes"/>
+ <artifact>artifact:jar:avalon/test/avalon-test-playground</artifact>
<artifact>@FRAMEWORK-IMPL-SPEC@</artifact>
</classpath>
</classloader>
<services>
- <service type="org.apache.avalon.playground.basic.BasicService"
version="1.1"/>
+ <service type="org.apache.avalon.test.playground.basic.BasicService"
version="1.1"/>
</services>
<container name="subsidiary">
<component name="complex"
- class="org.apache.avalon.playground.ComplexComponent">
+ class="org.apache.avalon.test.playground.ComplexComponent">
<categories priority="INFO"/>
</component>
<container name="test">
- <component name="simple"
class="org.apache.avalon.playground.SimpleComponent"/>
+ <component name="simple"
class="org.apache.avalon.test.playground.SimpleComponent"/>
</container>
</container>
@@ -37,15 +37,15 @@
-->
<!--
<component name="demo"
- class="org.apache.avalon.playground.DemoManager"/>
+ class="org.apache.avalon.test.playground.DemoManager"/>
<component name="exploitation"
- class="org.apache.avalon.playground.ExploitationManager"/>
+ class="org.apache.avalon.test.playground.ExploitationManager"/>
<component name="basic"
- class="org.apache.avalon.playground.basic.BasicComponent"
+ class="org.apache.avalon.test.playground.basic.BasicComponent"
activation="startup">
- <context class="org.apache.avalon.playground.basic.BasicContextImp">
+ <context class="org.apache.avalon.test.playground.basic.BasicContextImp">
<entry key="location">
<constructor>My Place</constructor>
</entry>
Modified: avalon/trunk/runtime/composition/impl/etc/test/unit/targets.xml
==============================================================================
--- avalon/trunk/runtime/composition/impl/etc/test/unit/targets.xml
(original)
+++ avalon/trunk/runtime/composition/impl/etc/test/unit/targets.xml Thu Jun
10 03:23:06 2004
@@ -3,24 +3,22 @@
<classloader>
<classpath>
- <fileset dir="ext">
- <include>test-a.jar</include>
- </fileset>
+ <artifact>artifact:jar:avalon/test/avalon-test-testa</artifact>
</classpath>
</classloader>
<component
- class="org.apache.avalon.composition.model.testa.ConfigurableComponent"
+ class="org.apache.avalon.test.testa.ConfigurableComponent"
name="aaa"/>
<component
- class="org.apache.avalon.composition.model.testa.ConfigurableComponent"
+ class="org.apache.avalon.test.testa.ConfigurableComponent"
name="bbb"/>
<container name="ccc">
<container name="sss">
<component
-
class="org.apache.avalon.composition.model.testa.ConfigurableComponent"
+ class="org.apache.avalon.test.testa.ConfigurableComponent"
name="xxx"/>
</container>
</container>
Modified:
avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLContainmentProfileCreator.java
==============================================================================
---
avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLContainmentProfileCreator.java
(original)
+++
avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/data/builder/XMLContainmentProfileCreator.java
Thu Jun 10 03:23:06 2004
@@ -234,8 +234,15 @@
private Artifact createArtifactDirective( Configuration config )
throws ConfigurationException
{
- String spec = config.getValue();
- return Artifact.createArtifact( "artifact:" + spec.trim() );
+ String spec = config.getValue();
+ String uri = getURI( spec );
+ return Artifact.createArtifact( uri );
+ }
+
+ private String getURI( String path )
+ {
+ if( path.startsWith( "artifact:" ) ) return path;
+ return "artifact:" + path;
}
private Artifact[] createResourceDirectives( Configuration config )
Modified:
avalon/trunk/runtime/composition/impl/src/test/org/apache/avalon/composition/model/test/AbstractTestCase.java
==============================================================================
---
avalon/trunk/runtime/composition/impl/src/test/org/apache/avalon/composition/model/test/AbstractTestCase.java
(original)
+++
avalon/trunk/runtime/composition/impl/src/test/org/apache/avalon/composition/model/test/AbstractTestCase.java
Thu Jun 10 03:23:06 2004
@@ -149,9 +149,9 @@
// execution
//
- Repository repository =
- createTestRepository( context, new File( BASEDIR, "repository" ) );
- factory.setRepository( repository );
+ //Repository repository =
+ // createTestRepository( context, new File( BASEDIR, "repository" ) );
+ //factory.setRepository( repository );
//
// and create the system context and grab the model factory
Modified:
avalon/trunk/runtime/composition/impl/src/test/org/apache/avalon/composition/model/test/ContextTestCase.java
==============================================================================
---
avalon/trunk/runtime/composition/impl/src/test/org/apache/avalon/composition/model/test/ContextTestCase.java
(original)
+++
avalon/trunk/runtime/composition/impl/src/test/org/apache/avalon/composition/model/test/ContextTestCase.java
Thu Jun 10 03:23:06 2004
@@ -30,7 +30,7 @@
public class ContextTestCase extends AbstractTestCase
{
private static final String FACADE_CLASSNAME =
- "org.apache.avalon.composition.model.testa.DefaultFacade";
+ "org.apache.avalon.test.testa.DefaultFacade";
private Context context;
Modified:
avalon/trunk/runtime/composition/impl/src/test/org/apache/avalon/composition/model/test/DynamicsTestCase.java
==============================================================================
---
avalon/trunk/runtime/composition/impl/src/test/org/apache/avalon/composition/model/test/DynamicsTestCase.java
(original)
+++
avalon/trunk/runtime/composition/impl/src/test/org/apache/avalon/composition/model/test/DynamicsTestCase.java
Thu Jun 10 03:23:06 2004
@@ -23,8 +23,8 @@
import org.apache.avalon.util.exception.ExceptionHelper;
-import org.apache.avalon.composition.model.test.dynamics.Widget;
-import org.apache.avalon.composition.model.test.dynamics.Gizmo;
+import org.apache.avalon.test.dynamics.Widget;
+import org.apache.avalon.test.dynamics.Gizmo;
public class DynamicsTestCase extends AbstractTestCase
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
