[jboss-cvs] JBossAS SVN: r109608 - in branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/cluster: testutil and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: rachmatowicz at jboss.com
Date: 2010-11-30 18:42:31 -0500 (Tue, 30 Nov 2010)
New Revision: 109608

Modified:
   branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/DriverManagerPersistentStoreUnitTestCase.java
   branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/cluster/testutil/DBSetupDelegate.java
Log:
Fix up URL for database connection in DriverManagerPersistentStoreTestCase; improve logging in DBSetup (JBAS-8540)

Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/DriverManagerPersistentStoreUnitTestCase.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/DriverManagerPersistentStoreUnitTestCase.java	2010-11-30 23:40:41 UTC (rev 109607)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/cluster/defaultcfg/simpleweb/test/DriverManagerPersistentStoreUnitTestCase.java	2010-11-30 23:42:31 UTC (rev 109608)
@@ -20,6 +20,8 @@
 import org.jboss.web.tomcat.service.session.persistent.DriverManagerPersistentStore;
 import org.jboss.web.tomcat.service.session.persistent.RDBMSStoreBase;
 
+import org.jboss.test.JBossTestUtil;
+
 /**
  * Unit tests for {@link DriverManagerPersistentStore}, although really more of
  * a test of its abstract superclass RDBMSStoreBase where we use the 
@@ -32,9 +34,9 @@
 public class DriverManagerPersistentStoreUnitTestCase extends TestCase
 {
    private static final String DB_ADDRESS = System.getProperty(DBSetupDelegate.DBADDRESS_PROPERTY, DBSetupDelegate.DEFAULT_ADDRESS);
+   // JBAS-8540
+   private static final String CONNECTION_URL = "jdbc:hsqldb:hsql://" + JBossTestUtil.fixHostnameForURL(DB_ADDRESS) + ":" + DBSetupDelegate.DEFAULT_PORT;
    
-   private static final String CONNECTION_URL = "jdbc:hsqldb:hsql://" + DB_ADDRESS + ":" + DBSetupDelegate.DEFAULT_PORT;
-   
    private static final String CONTEXT_PATH = "localhost/test";
 
    private static AtomicInteger id = new AtomicInteger();

Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/cluster/testutil/DBSetupDelegate.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/cluster/testutil/DBSetupDelegate.java	2010-11-30 23:40:41 UTC (rev 109607)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/cluster/testutil/DBSetupDelegate.java	2010-11-30 23:42:31 UTC (rev 109608)
@@ -155,8 +155,15 @@
                   "-no_system_exit",
                   "true",
              };
-            System.out.println("Starting hsqldb");
+            // JBAS-8540
+            System.out.println("Starting hsqldb with command:");
+            System.out.print("org.hsqldb.Server.main ") ;
+            for (int i = 0; i < args.length; i++)
+            	System.out.print(args[i] + " ") ;
+            System.out.println("") ;
+            
             org.hsqldb.Server.main(args);
+            
             System.out.println("Done");
          }
          catch (Exception e)