[Proxool-cvs] proxool/src/java-test/org/logicalcobwebs/proxool GlobalTest.java,1.19,1.20

[<bre...@us...>]

Update of /cvsroot/proxool/proxool/src/java-test/org/logicalcobwebs/proxool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9231/src/java-test/org/logicalcobwebs/proxool

Modified Files:
	GlobalTest.java 
Log Message:
Fix issue where testConfig env property was not correctly handled

Index: GlobalTest.java
===================================================================
RCS file: /cvsroot/proxool/proxool/src/java-test/org/logicalcobwebs/proxool/GlobalTest.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** GlobalTest.java	26 May 2004 17:19:09 -0000	1.19
--- GlobalTest.java	26 May 2004 22:30:21 -0000	1.20
***************
*** 63,67 ****
  
          // initialise test configuration
!         initTestConstants(defaultConfig);
  
          // remember we are correctly initialized
--- 63,67 ----
  
          // initialise test configuration
!         initTestConstants();
  
          // remember we are correctly initialized
***************
*** 76,88 ****
      private static void initTestConstants() throws Exception
  	{
!     	String resourceName = System.getProperty("testConfig");
!     	if( resourceName==null || resourceName.length()==0 )
!     	{
!     		LOG.info("Test configuration set to default value");
!     	}
!     	else
!     	{
!     		initTestConstants(resourceName);
!     	}
  	}
      
--- 76,81 ----
      private static void initTestConstants() throws Exception
  	{
!     	String resourceName = System.getProperty("testConfig", defaultConfig);
!    		initTestConstants(resourceName);
  	}
      
***************
*** 136,140 ****
      
      public static synchronized void globalTeardown(String alias) {
!         ProxoolFacade.shutdown(alias + ":teardown", 10000);
      }
  
--- 129,133 ----
      
      public static synchronized void globalTeardown(String alias) {
!         ProxoolFacade.shutdown(alias + ":teardown", 0); //, 10000);
      }
  
***************
*** 172,175 ****
--- 165,171 ----
   Revision history:
   $Log$
+  Revision 1.20  2004/05/26 22:30:21  brenuart
+  Fix issue where testConfig env property was not correctly handled
+ 
   Revision 1.19  2004/05/26 17:19:09  brenuart
   Allow JUnit tests to be executed against another database.