diff options
| author | Eike Stepper | 2006-08-13 17:22:02 +0000 |
|---|---|---|
| committer | Eike Stepper | 2006-08-13 17:22:02 +0000 |
| commit | b26724656a798d040d10cb741a92d3aca942d3d0 (patch) | |
| tree | e26d1e521043feb1c44fa8801d09f68ca4ad12d5 /plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo | |
| parent | 9ecd682b10cf0336bd5d06e0dac7078c2c8e10b9 (diff) | |
| download | cdo-b26724656a798d040d10cb741a92d3aca942d3d0.tar.gz cdo-b26724656a798d040d10cb741a92d3aca942d3d0.tar.xz cdo-b26724656a798d040d10cb741a92d3aca942d3d0.zip | |
*** empty log message ***
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo')
2 files changed, 20 insertions, 8 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/AbstractModel1Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/AbstractModel1Test.java index d320d194bb..13257f23e3 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/AbstractModel1Test.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/model1/AbstractModel1Test.java @@ -30,7 +30,7 @@ public abstract class AbstractModel1Test extends AbstractTopologyTest protected void wipeDatabase(JdbcTemplate jdbc) { super.wipeDatabase(jdbc); - jdbc.execute("DROP TABLE TREE_NODE"); + dropTable(jdbc, "TREE_NODE"); } protected TreeNode createNode(String name) diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/AbstractTopologyTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/AbstractTopologyTest.java index 67bc9b2696..f91e45d99f 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/AbstractTopologyTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/AbstractTopologyTest.java @@ -72,13 +72,25 @@ public abstract class AbstractTopologyTest extends TestCase protected void wipeDatabase(JdbcTemplate jdbc) { - jdbc.execute("DROP TABLE CDO_ATTRIBUTE"); - jdbc.execute("DROP TABLE CDO_CLASS"); - jdbc.execute("DROP TABLE CDO_CONTENT"); - jdbc.execute("DROP TABLE CDO_OBJECT"); - jdbc.execute("DROP TABLE CDO_PACKAGE"); - jdbc.execute("DROP TABLE CDO_REFERENCE"); - jdbc.execute("DROP TABLE CDO_RESOURCE"); + dropTable(jdbc, "CDO_ATTRIBUTE"); + dropTable(jdbc, "CDO_CLASS"); + dropTable(jdbc, "CDO_CONTENT"); + dropTable(jdbc, "CDO_OBJECT"); + dropTable(jdbc, "CDO_PACKAGE"); + dropTable(jdbc, "CDO_REFERENCE"); + dropTable(jdbc, "CDO_RESOURCE"); + } + + protected void dropTable(JdbcTemplate jdbc, String tableName) + { + try + { + jdbc.execute("DROP TABLE " + tableName); + } + catch (Exception ignore) + { + ; // Intentionally left empty + } } protected ITopology getTopology() |