rsitze      2003/07/18 07:11:45

  Modified:    logging/src/test/org/apache/commons/logging/log4j
                        CustomConfigTestCase.java
                        DefaultConfigTestCase.java
               logging/src/test/org/apache/commons/logging/jdk14
                        DefaultConfigTestCase.java
                        CustomConfigTestCase.java
               logging/src/test/org/apache/commons/logging LogTest.java
                        LoadTest.java
  Log:
  Cleanup imports & some static method calls.
  
  Revision  Changes    Path
  1.4       +4 -7      
jakarta-commons/logging/src/test/org/apache/commons/logging/log4j/CustomConfigTestCase.java
  
  Index: CustomConfigTestCase.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/logging/src/test/org/apache/commons/logging/log4j/CustomConfigTestCase.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CustomConfigTestCase.java 10 Apr 2003 22:40:37 -0000      1.3
  +++ CustomConfigTestCase.java 18 Jul 2003 14:11:45 -0000      1.4
  @@ -68,11 +68,8 @@
   import java.util.Properties;
   
   import junit.framework.Test;
  -import junit.framework.TestCase;
   import junit.framework.TestSuite;
   
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
   import org.apache.log4j.Level;
   import org.apache.log4j.Logger;
   import org.apache.log4j.PropertyConfigurator;
  
  
  
  1.3       +7 -9      
jakarta-commons/logging/src/test/org/apache/commons/logging/log4j/DefaultConfigTestCase.java
  
  Index: DefaultConfigTestCase.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/logging/src/test/org/apache/commons/logging/log4j/DefaultConfigTestCase.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultConfigTestCase.java        10 Apr 2003 22:40:37 -0000      1.2
  +++ DefaultConfigTestCase.java        18 Jul 2003 14:11:45 -0000      1.3
  @@ -134,10 +134,8 @@
        */
       public void tearDown() {
           log = null;
  -        if (factory != null) {
  -            factory.releaseAll();
  -            factory = null;
  -        }
  +        factory = null;
  +        LogFactory.releaseAll();
       }
   
   
  @@ -190,7 +188,7 @@
   
       // Set up log instance
       protected void setUpLog(String name) throws Exception {
  -        log = factory.getLog(name);
  +        log = LogFactory.getLog(name);
       }
   
   
  
  
  
  1.4       +7 -9      
jakarta-commons/logging/src/test/org/apache/commons/logging/jdk14/DefaultConfigTestCase.java
  
  Index: DefaultConfigTestCase.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/logging/src/test/org/apache/commons/logging/jdk14/DefaultConfigTestCase.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultConfigTestCase.java        10 Apr 2003 22:40:37 -0000      1.3
  +++ DefaultConfigTestCase.java        18 Jul 2003 14:11:45 -0000      1.4
  @@ -134,10 +134,8 @@
        */
       public void tearDown() {
           log = null;
  -        if (factory != null) {
  -            factory.releaseAll();
  -            factory = null;
  -        }
  +        factory = null;
  +        LogFactory.releaseAll();
       }
   
   
  @@ -190,7 +188,7 @@
   
       // Set up log instance
       protected void setUpLog(String name) throws Exception {
  -        log = factory.getLog(name);
  +        log = LogFactory.getLog(name);
       }
   
   
  
  
  
  1.5       +5 -9      
jakarta-commons/logging/src/test/org/apache/commons/logging/jdk14/CustomConfigTestCase.java
  
  Index: CustomConfigTestCase.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/logging/src/test/org/apache/commons/logging/jdk14/CustomConfigTestCase.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CustomConfigTestCase.java 10 Apr 2003 22:40:37 -0000      1.4
  +++ CustomConfigTestCase.java 18 Jul 2003 14:11:45 -0000      1.5
  @@ -66,16 +66,12 @@
   import java.util.Iterator;
   import java.util.logging.Handler;
   import java.util.logging.Level;
  -import java.util.logging.Logger;
   import java.util.logging.LogManager;
   import java.util.logging.LogRecord;
  +import java.util.logging.Logger;
   
   import junit.framework.Test;
  -import junit.framework.TestCase;
   import junit.framework.TestSuite;
  -
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
   
   
   /**
  
  
  
  1.2       +2 -2      
jakarta-commons/logging/src/test/org/apache/commons/logging/LogTest.java
  
  Index: LogTest.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/logging/src/test/org/apache/commons/logging/LogTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LogTest.java      19 Oct 2002 17:14:26 -0000      1.1
  +++ LogTest.java      18 Jul 2003 14:11:45 -0000      1.2
  @@ -1,7 +1,7 @@
   package org.apache.commons.logging;
   
  -import org.apache.commons.logging.impl.SimpleLog;
  -import junit.framework.*;
  +import junit.framework.Test;
  +import junit.framework.TestSuite;
   
   /**
    * 
  
  
  
  1.2       +7 -7      
jakarta-commons/logging/src/test/org/apache/commons/logging/LoadTest.java
  
  Index: LoadTest.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/logging/src/test/org/apache/commons/logging/LoadTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LoadTest.java     1 Mar 2003 09:55:07 -0000       1.1
  +++ LoadTest.java     18 Jul 2003 14:11:45 -0000      1.2
  @@ -61,9 +61,9 @@
   
   package org.apache.commons.logging;
   
  -import junit.framework.*;
  -
  -import org.apache.commons.logging.impl.*;
  +import junit.framework.Test;
  +import junit.framework.TestCase;
  +import junit.framework.TestSuite;
   
   /**
    * testcase to emulate container and application isolated from container
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to