|
From: <fel...@us...> - 2006-05-23 02:27:53
|
Update of /cvsroot/dbunit/dbunit/src/test/org/dbunit/ext/mssql In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv655/src/test/org/dbunit/ext/mssql Modified Files: AllTests.java InsertIdentityOperationTest.java Log Message: refactored test case base classes so the tests are not run if the environment does not support it. Also, fixed the XMLProducer (whose test was failing) and downgraded HSQDLB version on pom.xml Index: AllTests.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/ext/mssql/AllTests.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** AllTests.java 14 May 2006 20:15:06 -0000 1.5 --- AllTests.java 23 May 2006 02:27:43 -0000 1.6 *************** *** 23,28 **** import junit.framework.Test; import junit.framework.TestSuite; - import org.dbunit.DatabaseEnvironment; - import org.dbunit.TestFeature; /** --- 23,26 ---- *************** *** 37,45 **** TestSuite suite = new TestSuite(); ! DatabaseEnvironment environment = DatabaseEnvironment.getInstance(); ! if (environment.support(TestFeature.INSERT_IDENTITY)) ! { ! suite.addTest(new TestSuite(InsertIdentityOperationTest.class)); ! } suite.addTest(new TestSuite(MsSqlDataTypeFactoryTest.class)); --- 35,39 ---- TestSuite suite = new TestSuite(); ! suite.addTest(new TestSuite(InsertIdentityOperationTest.class)); suite.addTest(new TestSuite(MsSqlDataTypeFactoryTest.class)); Index: InsertIdentityOperationTest.java =================================================================== RCS file: /cvsroot/dbunit/dbunit/src/test/org/dbunit/ext/mssql/InsertIdentityOperationTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** InsertIdentityOperationTest.java 15 Mar 2004 16:44:21 -0000 1.3 --- InsertIdentityOperationTest.java 23 May 2006 02:27:43 -0000 1.4 *************** *** 24,27 **** --- 24,28 ---- import org.dbunit.AbstractDatabaseTest; import org.dbunit.Assertion; + import org.dbunit.TestFeature; import org.dbunit.dataset.*; import org.dbunit.dataset.xml.FlatXmlDataSet; *************** *** 43,46 **** --- 44,51 ---- super(s); } + + protected boolean runTest(String testName) { + return environmentHasFeature(TestFeature.INSERT_IDENTITY); + } public void testExecuteXML() throws Exception |