Author: van.halbert Date: 2011-12-07 15:31:15 -0500 (Wed, 07 Dec 2011) New Revision: 3723 Added: branches/7.1.x/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/test_queries/xa_transaction/ branches/7.1.x/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/test_queries/xa_transaction/TestPhysicalQueries.xml branches/7.1.x/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/test_queries/xa_transaction/TestVirtualQueries.xml Modified: branches/7.1.x/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/test_queries/TestPhysicalQueries.xml Log: adding xa transaction tests Modified: branches/7.1.x/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/test_queries/TestPhysicalQueries.xml =================================================================== --- branches/7.1.x/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/test_queries/TestPhysicalQueries.xml 2011-12-07 16:55:59 UTC (rev 3722) +++ branches/7.1.x/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/test_queries/TestPhysicalQueries.xml 2011-12-07 20:31:15 UTC (rev 3723) @@ -5,58 +5,65 @@ <!-- * Testing simple transactions * --> <!-- * =====================================================================* --> -<query name="TestQuery1">select * from pm1.g1 order by e1 -</query> +<query name="TestQuery1">delete from pm1.g2</query> +<query name="TestQuery2">delete from pm1.g1</query> -<query name="TestQuery2">select * from pm1.g2 where e1 >= 0 order by e1</query> -<query name="TestQuery3">select * from pm2.g1 where e1 >= 0 order by e1</query> -<query name="TestQuery4">select * from pm2.g2 where e1 >= 0 order by e1</query> +<query name="TestQuery3">delete from pm2.G2</query> +<query name="TestQuery4">delete from pm2.G1</query> - <query name="TestQuery5"> <sql updatecnt="1">insert into pm1.g1 (e1, e2) values(?, ?) <parm type="integer">1000</parm> - <parm type="string">'1000'</parm> + <parm type="string">'blah'</parm> </sql> <sql>select * from pm1.g1 where e1 = 1000</sql> </query> <query name="TestQuery6"> <sql updatecnt="1">insert into pm1.g1 (e1, e2) values(?, ?) - <parm type="integer">1000</parm> - <parm type="string">'1000'</parm> + <parm type="integer">2000</parm> + <parm type="string">'blah2'</parm> </sql> - <sql updatecnt="1">update pm1.g1 set e2='blah' where e1 = ? - <parm type="integer">1000</parm> + <sql updatecnt="1">update pm1.g1 set e2='blah2_updated' where e1 = ? + <parm type="integer">2000</parm> </sql> - <sql>select * from pm1.g1 where e2 = 'blah'</sql> + <sql>select * from pm1.g1 where e2 = 'blah_updated'</sql> </query> <query name="TestQuery7"> <sql updatecnt="1">insert into pm1.g1 (e1, e2) values(?, ?) - <parm type="integer">1000</parm> - <parm type="string">'1000'</parm> + <parm type="integer">3000</parm> + <parm type="string">'USA'</parm> </sql> - <sql rowCount="1">select * from pm1.g1 where e1 = 1000</sql> - <sql updatecnt="1">delete from pm1.g1 where pm1.g1.e1 = 1000</sql> - <sql>select * from pm1.g1 where e1 > 999</sql> + <sql rowCount="1">select * from pm1.g1 where e1 = 3000</sql> + <sql updatecnt="1">delete from pm1.g1 where pm1.g1.e1 = 3000</sql> + <sql rowCount="0">select * from pm1.g1 where e1 = 3000</sql> </query> <query name="TestQuery8"> <sql updatecnt="1">insert into pm1.g1 (e1, e2) values(?, ?) - <parm type="integer">1100</parm> - <parm type="string">'1100'</parm> + <parm type="integer">4000</parm> + <parm type="string">'USA'</parm> </sql> <sql updatecnt="1">insert into pm1.g2 (e1, e2) values(?, ?) - <parm type="integer">1100</parm> - <parm type="string">'1100'</parm> + <parm type="integer">4000</parm> + <parm type="string">'Missouri'</parm> </sql> - <sql rowCount="1">select a.* from pm1.g1 as a, pm1.g2 as b where a.e1 = 1100 and a.e1=b.e1</sql> + <sql rowCount="1">select a.* from pm1.g1 as a, pm1.g2 as b where a.e1 = 4000 and a.e1=b.e1</sql> </query> - +<query name="TestQuery9"> + <sql rowCount="1">select a.* from pm1.g1 as a, pm1.g2 as b where a.e1 = 4000 and a.e1=b.e1</sql> + <sql updatecnt="1">delete from pm1.g2 where pm1.g2.e1 = 4000</sql> + <sql updatecnt="1">delete from pm1.g1 where pm1.g1.e1 = 4000</sql> + <sql rowCount="0">select a.* from pm1.g1 as a, pm1.g2 as b where a.e1 = 4000 and a.e1=b.e1</sql> +</query> + +<xquery name="TestQuery10"> + <sql rowCount="1">select a.* from pm1.g1 as a, pm1.g2 as b where a.e1 = 4000 and a.e1=b.e1</sql> +</xquery> </root> Added: branches/7.1.x/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/test_queries/xa_transaction/TestPhysicalQueries.xml =================================================================== --- branches/7.1.x/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/test_queries/xa_transaction/TestPhysicalQueries.xml (rev 0) +++ branches/7.1.x/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/test_queries/xa_transaction/TestPhysicalQueries.xml 2011-12-07 20:31:15 UTC (rev 3723) @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<root> + +<!-- * =====================================================================* --> +<!-- * Testing simple transactions * --> +<!-- * =====================================================================* --> + +<query name="TestQuery1">delete from pm1.g2</query> +<query name="TestQuery2">delete from pm1.g1</query> + + +<query name="TestQuery5"> + <sql updatecnt="1">insert into pm1.g1 (e1, e2) values(?, ?) + <parm type="integer">1000</parm> + <parm type="string">'blah'</parm> + </sql> + <sql>select * from pm1.g1 where e1 = 1000</sql> +</query> + +<query name="TestQuery6"> + <sql updatecnt="1">insert into pm1.g1 (e1, e2) values(?, ?) + <parm type="integer">2000</parm> + <parm type="string">'blah2'</parm> + </sql> + <sql updatecnt="1">update pm1.g1 set e2='blah2_updated' where e1 = ? + <parm type="integer">2000</parm> + </sql> + <sql>select * from pm1.g1 where e2 = 'blah_updated'</sql> +</query> + + +<query name="TestQuery7"> + <sql updatecnt="1">insert into pm1.g1 (e1, e2) values(?, ?) + <parm type="integer">3000</parm> + <parm type="string">'USA'</parm> + </sql> + <sql rowCount="1">select * from pm1.g1 where e1 = 3000</sql> + <sql updatecnt="1">delete from pm1.g1 where pm1.g1.e1 = 3000</sql> + <sql rowCount="0">select * from pm1.g1 where e1 = 3000</sql> +</query> + +<query name="TestQuery8"> + <sql updatecnt="1">insert into pm1.g1 (e1, e2) values(?, ?) + <parm type="integer">4000</parm> + <parm type="string">'USA'</parm> + </sql> + <sql updatecnt="1">insert into pm1.g2 (e1, e2) values(?, ?) + <parm type="integer">4000</parm> + <parm type="string">'Missouri'</parm> + </sql> + + <sql rowCount="1">select a.* from pm1.g1 as a, pm1.g2 as b where a.e1 = 4000 and a.e1=b.e1</sql> + +</query> + +<query name="TestQuery9"> + <sql rowCount="1">select a.* from pm1.g1 as a, pm1.g2 as b where a.e1 = 4000 and a.e1=b.e1</sql> + <sql updatecnt="1">delete from pm1.g2 where pm1.g2.e1 = 4000</sql> + <sql updatecnt="1">delete from pm1.g1 where pm1.g1.e1 = 4000</sql> + <sql rowCount="0">select a.* from pm1.g1 as a, pm1.g2 as b where a.e1 = 4000 and a.e1=b.e1</sql> +</query> + +<xquery name="TestQuery10"> + <sql rowCount="1">select a.* from pm1.g1 as a, pm1.g2 as b where a.e1 = 4000 and a.e1=b.e1</sql> +</xquery> +</root> + Added: branches/7.1.x/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/test_queries/xa_transaction/TestVirtualQueries.xml =================================================================== --- branches/7.1.x/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/test_queries/xa_transaction/TestVirtualQueries.xml (rev 0) +++ branches/7.1.x/test-integration/db/src/main/resources/ctc_tests/queries/rdbms/test_queries/xa_transaction/TestVirtualQueries.xml 2011-12-07 20:31:15 UTC (rev 3723) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<root> + +<!-- * =====================================================================* --> +<!-- * Testing simple transactions * --> +<!-- * =====================================================================* --> + +<query name="TestQuery1">delete from vm.g2</query> +<query name="TestQuery2">delete from vm.g1</query> + + +<query name="TestQuery5"> + <sql updatecnt="1">insert into vm.g1 (pm1e1, pm1e2, pm2e1, pm2e2) values(?, ?, ?, ?) + <parm type="integer">1000</parm> + <parm type="string">blah1</parm> + <parm type="integer">1000</parm> + <parm type="string">blah2</parm> + </sql> +</query> + +<!-- revalidating the commit was successful --> +<query name="TestQuery6"> + <sql rowCount="1" >select * from pm1.g1 where e2 = 'blah1'</sql> + <sql rowCount="1" >select * from pm2.g1 where e2 = 'blah2'</sql> + +</query> + +<query numtimes="10" name="TestQuery7"> + <sql>delete from vm.g2</sql> + <sql>delete from vm.g1</sql> + + <sql updatecnt="1">insert into vm.g1 (pm1e1, pm1e2, pm2e1, pm2e2) values(?, ?, ?, ?) + <parm type="integer">1000</parm> + <parm type="string">blaha</parm> + <parm type="integer">1000</parm> + <parm type="string">blahb</parm> + </sql> + + <sql rowCount="1" >select * from pm1.g1 where e2 = 'blaha'</sql> + <sql rowCount="1" >select * from pm2.g1 where e2 = 'blahb'</sql> + +</query> + + +</root> +