[teiid-commits] teiid SVN: r1422 - in trunk/test-integration/db: src/main/java/org/teiid/test/framework/datasource and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: vhalbert at redhat.com
Date: 2009-09-18 23:29:55 -0400 (Fri, 18 Sep 2009)
New Revision: 1422

Modified:
   trunk/test-integration/db/pom.xml
   trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSourceMgr.java
Log:
Teiid 773 - organize integration test - added option to specify  which datasources (narrow the available datasources) to include in the test 

Modified: trunk/test-integration/db/pom.xml
===================================================================
--- trunk/test-integration/db/pom.xml	2009-09-19 02:46:38 UTC (rev 1421)
+++ trunk/test-integration/db/pom.xml	2009-09-19 03:29:55 UTC (rev 1422)
@@ -101,6 +101,13 @@
 		                <additionalClasspathElement>${basedir}/lib/db2jcc4.jar</additionalClasspathElement>
 
 		          </additionalClasspathElements>
+		          <systemProperties>
+		            <property>
+		              <name>usedatasources</name>
+		              <value>${usedatasources}</value>
+		            </property>
+		          </systemProperties>
+
 <!--
 					<forkMode>always</forkMode>
 					<forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>

Modified: trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSourceMgr.java
===================================================================
--- trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSourceMgr.java	2009-09-19 02:46:38 UTC (rev 1421)
+++ trunk/test-integration/db/src/main/java/org/teiid/test/framework/datasource/DataSourceMgr.java	2009-09-19 03:29:55 UTC (rev 1422)
@@ -42,7 +42,7 @@
 	 * This enables one to test between certain datasources without having to remove 
 	 * connection.properties files.
 	 */
-	static final String USE_DATASOURCES_PROP = "usedataources";
+	static final String USE_DATASOURCES_PROP = "usedatasources";
 
 	static final String RELATIVE_DIRECTORY = "datasources/";
 	static final String DATASOURCE_MAPPING_FILE = "datasource_mapping.xml";
@@ -222,6 +222,7 @@
 		Set<String> limitds = new HashSet<String>();
         String limitdsprop = System.getProperty(USE_DATASOURCES_PROP);
         if (limitdsprop != null && limitdsprop.length() > 0) { 
+        	System.out.println("Limit datasources to: " + limitdsprop);
         	List<String> dss = StringUtil.split(limitdsprop, ",");
         	limitds.addAll(dss);
         }
@@ -283,6 +284,7 @@
 			
 			if (include.size() > 0) {
 				if (!include.contains(name)) {
+					System.out.println("Excluded datasource: " + name);
 					return;
 				}
 			}