CVS: jcontainer/loom/engine/src/test/org/jcontainer/loom/components/logger LogManagerTestCase.java,1.16,1.17 config2.xml,1.1,1.2 config3.xml,1.1,1.2

Update of /cvsroot/jcontainer/jcontainer/loom/engine/src/test/org/jcontainer/loom/components/logger
In directory hogshead.codehaus.org:/tmp/cvs-serv11704/loom/engine/src/test/org/jcontainer/loom/components/logger

Modified Files:
	LogManagerTestCase.java config2.xml config3.xml 
Log Message:
Fix LOOM-53, LoggerStore test cases not working.

Index: LogManagerTestCase.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/test/org/jcontainer/loom/components/logger/LogManagerTestCase.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- LogManagerTestCase.java	3 Dec 2003 10:44:47 -0000	1.16
+++ LogManagerTestCase.java	15 Feb 2004 21:45:04 -0000	1.17
@@ -12,11 +12,13 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
-import junit.framework.TestCase;
+
 import org.apache.avalon.phoenix.BlockContext;
 import org.apache.avalon.phoenix.metadata.BlockListenerMetaData;
 import org.apache.avalon.phoenix.metadata.BlockMetaData;
 import org.apache.avalon.phoenix.metadata.SarMetaData;
+
+import junit.framework.TestCase;
 import org.codehaus.spice.loggerstore.LoggerStore;
 import org.codehaus.spice.salt.io.FileUtil;
 import org.jcontainer.dna.Configuration;
@@ -49,7 +51,7 @@
     {
         m_baseDirectory = generateDirectory();
         //Because log4j does not guarentee dir creation ;(
-        final File logDir = new File( generateDirectory(), "logs" );
+        final File logDir = new File( m_baseDirectory, "logs" );
         logDir.mkdirs();
     }
 
@@ -81,10 +83,11 @@
     private void runtTestForConfigFile( final int index )
         throws Exception
     {
-        final Logger hierarchy = createHierarchy( index );
-        runLoggerTest( hierarchy, DEFAULT_LOGFILE );
+        final LoggerStore hierarchy = createHierarchy( index );
+        final Logger rootLogger = hierarchy.getLogger();
+        runLoggerTest( rootLogger, DEFAULT_LOGFILE );
 
-        final Logger childLogger = hierarchy.getChildLogger( "myBlock" );
+        final Logger childLogger = hierarchy.getLogger( "myBlock" );
         runLoggerTest( childLogger, BLOCK_LOGFILE );
     }
 
@@ -99,26 +102,25 @@
     }
 
     private void assertFileGrew( final String logfile,
-                                 long before,
-                                 long after )
+                                 final long before,
+                                 final long after )
     {
-        assertTrue(
-            "Did " +
-            logfile +
-            " file grow?, Before: " +
-            before +
-            ", After: " +
-            after,
-            before < after );
+        assertTrue( "Did " +
+                    logfile +
+                    " file grow?, Before: " +
+                    before +
+                    ", After: " +
+                    after,
+                    before < after );
     }
 
     private long getFileSize( final String filename )
     {
         final File file = new File( m_baseDirectory, filename );
-        StringBuffer sb = new StringBuffer();
+        final StringBuffer sb = new StringBuffer();
         try
         {
-            FileReader fr = new FileReader( file );
+            final FileReader fr = new FileReader( file );
             int c = 0;
             while( c != -1 )
             {
@@ -133,7 +135,7 @@
         return sb.length();
     }
 
-    private Logger createHierarchy( final int index )
+    private LoggerStore createHierarchy( final int index )
         throws Exception
     {
         final Configuration logs = loadConfig( "config" + index + ".xml" );
@@ -141,18 +143,17 @@
         final SarMetaData sarMetaData =
             new SarMetaData( "test",
                              m_baseDirectory,
-                             new BlockMetaData[ 0 ],
-                             new BlockListenerMetaData[ 0 ] );
+                             new BlockMetaData[0],
+                             new BlockListenerMetaData[0] );
         cleanHomeDirectory( sarMetaData );
 
         //make sure directory is created else log4j will fail.
         if( 3 == index )
         {
             final File file =
-                new File(
-                    m_baseDirectory.getAbsolutePath() +
-                    File.separator +
-                    "logs" );
+                new File( m_baseDirectory.getAbsolutePath() +
+                          File.separator +
+                          "logs" );
             file.mkdirs();
         }
 
@@ -167,7 +168,7 @@
                                         sarMetaData.getHomeDirectory(),
                                         sarMetaData.getHomeDirectory(),
                                         context );
-        return store.getLogger();
+        return store;
     }
 
     private void cleanHomeDirectory( final SarMetaData sarMetaData )

Index: config2.xml
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/test/org/jcontainer/loom/components/logger/config2.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- config2.xml	18 Jul 2003 01:04:54 -0000	1.1
+++ config2.xml	15 Feb 2004 21:45:04 -0000	1.2
@@ -8,6 +8,7 @@
         <category name="" log-level="DEBUG">
             <log-target id-ref="default"/>
         </category>
+
         <category name="myBlock" log-level="DEBUG">
             <log-target id-ref="myBlock"/>
         </category>

Index: config3.xml
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/test/org/jcontainer/loom/components/logger/config3.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- config3.xml	18 Jul 2003 01:04:54 -0000	1.1
+++ config3.xml	15 Feb 2004 21:45:04 -0000	1.2
@@ -23,7 +23,7 @@
         <appender-ref ref="DEFAULT"/>
     </root>
 
-    <logger name="root.myBlock">
+    <logger name="myBlock">
         <priority value="debug"/>
         <appender-ref ref="MYBLOCK_FILE"/>
     </logger>