[jboss-svn-commits] JBoss Portal SVN: r5649 - in branches/JBoss_Portal_Branch_2_4: core/src/main/org/jboss/portal/test/core core/src/main/org/jboss/portal/test/core/model/instance identity/src/main/org/jboss/portal/test/identity test/src/etc test/src/main/org/jboss/portal/test/framework/embedded

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

Author: julien at jboss.com
Date: 2006-11-14 11:34:42 -0500 (Tue, 14 Nov 2006)
New Revision: 5649

Modified:
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java
   branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java
   branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/test/identity/UserTestCase.java
   branches/JBoss_Portal_Branch_2_4/test/src/etc/datasources.xml
   branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/DataSourceSupport.java
Log:
added display-name in datasource configuration for testing and use it in the test name instead of the driver class

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java	2006-11-14 16:09:47 UTC (rev 5648)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java	2006-11-14 16:34:42 UTC (rev 5649)
@@ -92,7 +92,7 @@
 
    public String getName()
    {
-      return super.getName() + "_" + dsCfg.getDriverClass().replaceAll("\\.", "_");
+      return super.getName() + "_" + dsCfg;
    }
 
    protected Set getDefaultSecurityConstraints()

Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java	2006-11-14 16:09:47 UTC (rev 5648)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java	2006-11-14 16:34:42 UTC (rev 5649)
@@ -132,7 +132,7 @@
 
    public String getName()
    {
-      return super.getName() + "_" + dsCfg.getDriverClass().replaceAll("\\.", "_");
+      return super.getName() + "_" + dsCfg;
    }
 
    public HibernateSupport getInstanceHibernateSupport()

Modified: branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/test/identity/UserTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/test/identity/UserTestCase.java	2006-11-14 16:09:47 UTC (rev 5648)
+++ branches/JBoss_Portal_Branch_2_4/identity/src/main/org/jboss/portal/test/identity/UserTestCase.java	2006-11-14 16:34:42 UTC (rev 5649)
@@ -101,7 +101,7 @@
 
    public String getName()
    {
-      return super.getName() + "_" + dsCfg.getDriverClass().replaceAll("\\.", "_");
+      return super.getName() + "_" + dsCfg;
    }
 
    protected void setUp() throws Exception

Modified: branches/JBoss_Portal_Branch_2_4/test/src/etc/datasources.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/etc/datasources.xml	2006-11-14 16:09:47 UTC (rev 5648)
+++ branches/JBoss_Portal_Branch_2_4/test/src/etc/datasources.xml	2006-11-14 16:34:42 UTC (rev 5649)
@@ -23,6 +23,7 @@
 
 <datasources>
    <datasource>
+      <display-name>hsqldb</display-name>
       <connection-url>jdbc:hsqldb:file:test</connection-url>
       <driver-class>org.hsqldb.jdbcDriver</driver-class>
       <user-name>sa</user-name>

Modified: branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/DataSourceSupport.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/DataSourceSupport.java	2006-11-14 16:09:47 UTC (rev 5648)
+++ branches/JBoss_Portal_Branch_2_4/test/src/main/org/jboss/portal/test/framework/embedded/DataSourceSupport.java	2006-11-14 16:34:42 UTC (rev 5649)
@@ -69,7 +69,7 @@
 
    public DataSourceSupport()
    {
-      this(new Config("", "", "", ""));
+      this(new Config("", "", "", "", ""));
    }
 
    public void create()
@@ -205,19 +205,26 @@
    public static class Config
    {
 
+      private String displayName;
       private String connectionURL;
       private String driverClass;
       private String userName;
       private String password;
 
-      public Config(String connectionURL, String driverClass, String userName, String password)
+      public Config(String displayName, String connectionURL, String driverClass, String userName, String password)
       {
+         this.displayName = displayName;
          this.connectionURL = connectionURL;
          this.driverClass = driverClass;
          this.userName = userName;
          this.password = password;
       }
 
+      public String getDisplayName()
+      {
+         return displayName;
+      }
+
       public String getConnectionURL()
       {
          return connectionURL;
@@ -238,6 +245,11 @@
          return password;
       }
 
+      public String toString()
+      {
+         return "DataSource[" + displayName + "]";
+      }
+
       public static Config[] fromXML(URL url) throws Exception
       {
          ArrayList configs = new ArrayList();
@@ -249,15 +261,18 @@
             for (Iterator i = XML.getChildrenIterator(doc.getDocumentElement(), "datasource"); i.hasNext();)
             {
                Element childElt = (Element)i.next();
+               Element displayNameURLElt = XML.getUniqueChild(childElt, "display-name", true);
                Element connectionURLElt = XML.getUniqueChild(childElt, "connection-url", true);
                Element driverClassElt = XML.getUniqueChild(childElt, "driver-class", true);
                Element userNameElt = XML.getUniqueChild(childElt, "user-name", true);
                Element passwordElt = XML.getUniqueChild(childElt, "password", true);
+               String displayName = XML.asString(displayNameURLElt);
                String connectionURL = XML.asString(connectionURLElt);
                String driverClass = XML.asString(driverClassElt);
                String userName = XML.asString(userNameElt);
                String password = XML.asString(passwordElt);
                Config dsCfg = new Config(
+                  displayName,
                   connectionURL,
                   driverClass,
                   userName,