svn commit: rev 22315 - in avalon/trunk/planet/facilities/finder: impl test test/src/test/org/apache/avalon/finder/test

Author: mcconnell
Date: Wed Jun 30 03:12:45 2004
New Revision: 22315

Added:
   avalon/trunk/planet/facilities/finder/test/build.xml
Removed:
   avalon/trunk/planet/facilities/finder/test/index.ent
Modified:
   avalon/trunk/planet/facilities/finder/impl/build.xml
   avalon/trunk/planet/facilities/finder/test/src/test/org/apache/avalon/finder/test/StandardTestCase.java
Log:
Update to complete the total automation of block generation as a deliverable and embeded block generation for the testcase.

Modified: avalon/trunk/planet/facilities/finder/impl/build.xml
==============================================================================
--- avalon/trunk/planet/facilities/finder/impl/build.xml	(original)
+++ avalon/trunk/planet/facilities/finder/impl/build.xml	Wed Jun 30 03:12:45 2004
@@ -6,5 +6,15 @@
   <property file="build.properties"/>
   <import file="${project.system}/build/standard.xml"/>
 
-</project>
+  <target name="build" depends="standard.build">
+    <x:block name="finder">
+      <x:component name="finder" 
+         class="org.apache.avalon.finder.impl.DefaultFinder"/>
+    </x:block>
+    <x:block name="finder" embed="MAIN">
+      <x:component name="finder" 
+         class="org.apache.avalon.finder.impl.DefaultFinder"/>
+    </x:block>
+  </target>
 
+</project>

Added: avalon/trunk/planet/facilities/finder/test/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/planet/facilities/finder/test/build.xml	Wed Jun 30 03:12:45 2004
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-finder-test" default="install" basedir="." 
+    xmlns:x="antlib:org.apache.avalon.tools">
+
+  <property file="build.properties"/>
+  <import file="${project.system}/build/standard.xml"/>
+
+  <target name="build" depends="standard.build">
+    <x:block name="test" embed="MAIN">
+      <x:component name="finder" 
+         class="org.apache.avalon.finder.impl.DefaultFinder"/>
+    </x:block>
+  </target>
+
+</project>
+

Modified: avalon/trunk/planet/facilities/finder/test/src/test/org/apache/avalon/finder/test/StandardTestCase.java
==============================================================================
--- avalon/trunk/planet/facilities/finder/test/src/test/org/apache/avalon/finder/test/StandardTestCase.java	(original)
+++ avalon/trunk/planet/facilities/finder/test/src/test/org/apache/avalon/finder/test/StandardTestCase.java	Wed Jun 30 03:12:45 2004
@@ -52,17 +52,14 @@
         assertNotNull( "finder", finder );
         try
         {
-            Widget widget = (Widget) finder.find( Widget.class );
+            Widget widget = (Widget) finder.find( Widget.class );
+            System.out.println( "located widget: " + widget );
         }
         catch( Throwable notOk )
         {
             fail( "Unexpected error: " + notOk );
         }
-    }
-
-    public void testJunkResolution() throws Exception
-    {
-        Finder finder = (Finder) resolve( "/test/finder" );
+
         try
         {
             Object object = finder.find( StandardTestCase.class );
@@ -76,5 +73,4 @@
             fail( "Unexpected error: " + e );
         }
     }
-
 }