[teiid-commits] teiid SVN: r1745 - in trunk/test-integration/db/src/main: resources and 1 other directories.

Author: vhalbert(a)redhat.com Date: 2010-01-14 11:38:15 -0500 (Thu, 14 Jan 2010) New Revision: 1745 Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/TransactionFactory.java trunk/test-integration/db/src/main/resources/ctc_tests/deploy.properties trunk/test-integration/db/src/main/resources/qe-test.properties Log: Teiid 781 - changed the txnautowrap to "off" Modified: trunk/test-integration/db/src/main/java/org/teiid/test/client/TransactionFactory.java =================================================================== --- trunk/test-integration/db/src/main/java/org/teiid/test/client/TransactionFactory.java 2010-01-14 16:15:49 UTC (rev 1744) +++ trunk/test-integration/db/src/main/java/org/teiid/test/client/TransactionFactory.java 2010-01-14 16:38:15 UTC (rev 1745) @@ -22,6 +22,7 @@ package org.teiid.test.client; import org.teiid.test.framework.ConfigPropertyLoader; +import org.teiid.test.framework.TestLogger; import org.teiid.test.framework.TransactionContainer; import org.teiid.test.framework.ConfigPropertyNames.TXN_AUTO_WRAP_OPTIONS; import org.teiid.test.framework.exception.QueryTestFailedException; @@ -54,9 +55,9 @@ public static final String LOCAL_TRANSACTION = "local"; //$NON-NLS-1$ public static final String XATRANSACTION = "xa"; //$NON-NLS-1$ public static final String JNDI_TRANSACTION = "jndi"; //$NON-NLS-1$ - public static final String OFFWRAP_TRANSACTION = "offwrap"; //$NON-NLS-1$ - public static final String ONWRAP_TRANSACTION = "onwrap"; //$NON-NLS-1$ - public static final String AUTOWRAP_TRANSACTION = "autowrap"; //$NON-NLS-1$ + public static final String OFFWRAP_TRANSACTION = "off"; //$NON-NLS-1$ + public static final String ONWRAP_TRANSACTION = "on"; //$NON-NLS-1$ + public static final String AUTOWRAP_TRANSACTION = "auto"; //$NON-NLS-1$ } @@ -72,7 +73,8 @@ throw new TransactionRuntimeException(TRANSACTION_TYPE + " property was not specified" ); } - System.out.println("Create TransactionContainer: " + type); + + TestLogger.log("==== Create Transaction-Option: " + type); if (type.equalsIgnoreCase(TRANSACTION_TYPES.LOCAL_TRANSACTION)) { transacton = new LocalTransaction(); @@ -96,6 +98,7 @@ throw new TransactionRuntimeException("Invalid property value of " + type + " for " + TRANSACTION_TYPE ); } + TestLogger.log("==== TransactionContainer: " + transacton.getClass().getName()); return transacton; } Modified: trunk/test-integration/db/src/main/resources/ctc_tests/deploy.properties =================================================================== --- trunk/test-integration/db/src/main/resources/ctc_tests/deploy.properties 2010-01-14 16:15:49 UTC (rev 1744) +++ trunk/test-integration/db/src/main/resources/ctc_tests/deploy.properties 2010-01-14 16:38:15 UTC (rev 1745) @@ -6,7 +6,7 @@ #vdb.definition=./${vdb} -teiid.home=./teiid_home +teiid.home=./target/teiid_home ---- Modified: trunk/test-integration/db/src/main/resources/qe-test.properties =================================================================== --- trunk/test-integration/db/src/main/resources/qe-test.properties 2010-01-14 16:15:49 UTC (rev 1744) +++ trunk/test-integration/db/src/main/resources/qe-test.properties 2010-01-14 16:38:15 UTC (rev 1745) @@ -41,8 +41,8 @@ # transaction types # See the TransactionFactory for the list of types -transaction-option=autowrap -#transaction-option=local +#transaction-option=auto +transaction-option=off # resultmode options: # - compare : compare actual results to expected results @@ -108,6 +108,6 @@ # # -BQT2=1 -BQT1=2 -SP=3 +#BQT2=1 +#BQT1=2 +#SP=3