From 3773b52b2fa8e646f807f2f7100095f02bda86af Mon Sep 17 00:00:00 2001 From: frank Date: Mon, 19 Mar 2012 14:36:13 -0700 Subject: [PATCH] add cleanup.sql to DB upgrade test --- server/test/com/cloud/agent/manager/SearchCriteria2Test.java | 2 +- .../com/cloud/upgrade/AdvanceZone217To224UpgradeTest.java | 2 +- .../test/com/cloud/upgrade/BasicZone218To224UpgradeTest.java | 2 +- server/test/com/cloud/upgrade/HostCapacity218to22Test.java | 2 +- .../com/cloud/upgrade/InstanceGroup218To224UpgradeTest.java | 2 +- .../com/cloud/upgrade/PortForwarding218To224UpgradeTest.java | 2 +- server/test/com/cloud/upgrade/Sanity220To224UpgradeTest.java | 2 +- server/test/com/cloud/upgrade/Sanity222To224UpgradeTest.java | 2 +- server/test/com/cloud/upgrade/Sanity224To225UpgradeTest.java | 2 +- .../test/com/cloud/upgrade/Template2214To30UpgradeTest.java | 2 +- server/test/com/cloud/upgrade/Test2214To30DBUpgrade.java | 2 +- server/test/com/cloud/upgrade/Usage217To224UpgradeTest.java | 4 ++-- .../com/cloud/upgrade/UsageEvents218To224UpgradeTest.java | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/server/test/com/cloud/agent/manager/SearchCriteria2Test.java b/server/test/com/cloud/agent/manager/SearchCriteria2Test.java index 8dd4c33d907..3790decec8e 100755 --- a/server/test/com/cloud/agent/manager/SearchCriteria2Test.java +++ b/server/test/com/cloud/agent/manager/SearchCriteria2Test.java @@ -30,7 +30,7 @@ public class SearchCriteria2Test extends TestCase { @Override @Before public void setUp() throws Exception { - DbTestUtils.executeScript("fake.sql", false, true); + DbTestUtils.executeScript("cleanup.sql", false, true); MockComponentLocator locator = new MockComponentLocator("management-server"); locator.addDao("HostDao", HostDaoImpl.class); locator.addDao("VmInstance", VMInstanceDaoImpl.class); diff --git a/server/test/com/cloud/upgrade/AdvanceZone217To224UpgradeTest.java b/server/test/com/cloud/upgrade/AdvanceZone217To224UpgradeTest.java index 8208b3009ad..94fb6ea97b4 100644 --- a/server/test/com/cloud/upgrade/AdvanceZone217To224UpgradeTest.java +++ b/server/test/com/cloud/upgrade/AdvanceZone217To224UpgradeTest.java @@ -40,7 +40,7 @@ public class AdvanceZone217To224UpgradeTest extends TestCase { @Override @Before public void setUp() throws Exception { - DbTestUtils.executeScript("fake.sql", false, true); + DbTestUtils.executeScript("cleanup.sql", false, true); } @Override diff --git a/server/test/com/cloud/upgrade/BasicZone218To224UpgradeTest.java b/server/test/com/cloud/upgrade/BasicZone218To224UpgradeTest.java index c410dff5e8e..dafee7280d4 100644 --- a/server/test/com/cloud/upgrade/BasicZone218To224UpgradeTest.java +++ b/server/test/com/cloud/upgrade/BasicZone218To224UpgradeTest.java @@ -40,7 +40,7 @@ public class BasicZone218To224UpgradeTest extends TestCase { @Override @Before public void setUp() throws Exception { - DbTestUtils.executeScript("fake.sql", false, true); + DbTestUtils.executeScript("cleanup.sql", false, true); } @Override diff --git a/server/test/com/cloud/upgrade/HostCapacity218to22Test.java b/server/test/com/cloud/upgrade/HostCapacity218to22Test.java index 1ed74834096..04ea01d2286 100644 --- a/server/test/com/cloud/upgrade/HostCapacity218to22Test.java +++ b/server/test/com/cloud/upgrade/HostCapacity218to22Test.java @@ -18,7 +18,7 @@ public class HostCapacity218to22Test extends TestCase { @Override @Before public void setUp() throws Exception { - DbTestUtils.executeScript("fake.sql", false, true); + DbTestUtils.executeScript("cleanup.sql", false, true); } @Override diff --git a/server/test/com/cloud/upgrade/InstanceGroup218To224UpgradeTest.java b/server/test/com/cloud/upgrade/InstanceGroup218To224UpgradeTest.java index 12739f9b7e8..d9adf6a22b5 100644 --- a/server/test/com/cloud/upgrade/InstanceGroup218To224UpgradeTest.java +++ b/server/test/com/cloud/upgrade/InstanceGroup218To224UpgradeTest.java @@ -41,7 +41,7 @@ public class InstanceGroup218To224UpgradeTest extends TestCase { @Override @Before public void setUp() throws Exception { - DbTestUtils.executeScript("fake.sql", false, true); + DbTestUtils.executeScript("cleanup.sql", false, true); } @Override diff --git a/server/test/com/cloud/upgrade/PortForwarding218To224UpgradeTest.java b/server/test/com/cloud/upgrade/PortForwarding218To224UpgradeTest.java index e0725f48bb0..279b3e517b1 100644 --- a/server/test/com/cloud/upgrade/PortForwarding218To224UpgradeTest.java +++ b/server/test/com/cloud/upgrade/PortForwarding218To224UpgradeTest.java @@ -41,7 +41,7 @@ public class PortForwarding218To224UpgradeTest extends TestCase { @Override @Before public void setUp() throws Exception { - DbTestUtils.executeScript("fake.sql", false, true); + DbTestUtils.executeScript("cleanup.sql", false, true); } @Override diff --git a/server/test/com/cloud/upgrade/Sanity220To224UpgradeTest.java b/server/test/com/cloud/upgrade/Sanity220To224UpgradeTest.java index a6ed9180fcf..69ab7c33e10 100644 --- a/server/test/com/cloud/upgrade/Sanity220To224UpgradeTest.java +++ b/server/test/com/cloud/upgrade/Sanity220To224UpgradeTest.java @@ -39,7 +39,7 @@ public class Sanity220To224UpgradeTest extends TestCase { @Override @Before public void setUp() throws Exception { - DbTestUtils.executeScript("fake.sql", false, true); + DbTestUtils.executeScript("cleanup.sql", false, true); } @Override diff --git a/server/test/com/cloud/upgrade/Sanity222To224UpgradeTest.java b/server/test/com/cloud/upgrade/Sanity222To224UpgradeTest.java index 18eae81d95f..151b649d71c 100644 --- a/server/test/com/cloud/upgrade/Sanity222To224UpgradeTest.java +++ b/server/test/com/cloud/upgrade/Sanity222To224UpgradeTest.java @@ -39,7 +39,7 @@ public class Sanity222To224UpgradeTest extends TestCase { @Override @Before public void setUp() throws Exception { - DbTestUtils.executeScript("fake.sql", false, true); + DbTestUtils.executeScript("cleanup.sql", false, true); } @Override diff --git a/server/test/com/cloud/upgrade/Sanity224To225UpgradeTest.java b/server/test/com/cloud/upgrade/Sanity224To225UpgradeTest.java index 52edafc5a2a..d08c0c8fbd5 100644 --- a/server/test/com/cloud/upgrade/Sanity224To225UpgradeTest.java +++ b/server/test/com/cloud/upgrade/Sanity224To225UpgradeTest.java @@ -39,7 +39,7 @@ public class Sanity224To225UpgradeTest extends TestCase { @Override @Before public void setUp() throws Exception { - DbTestUtils.executeScript("fake.sql", false, true); + DbTestUtils.executeScript("cleanup.sql", false, true); } @Override diff --git a/server/test/com/cloud/upgrade/Template2214To30UpgradeTest.java b/server/test/com/cloud/upgrade/Template2214To30UpgradeTest.java index 2cfbd1cc0ed..23b7be3015f 100644 --- a/server/test/com/cloud/upgrade/Template2214To30UpgradeTest.java +++ b/server/test/com/cloud/upgrade/Template2214To30UpgradeTest.java @@ -42,7 +42,7 @@ public class Template2214To30UpgradeTest extends TestCase { @Override @Before public void setUp() throws Exception { - DbTestUtils.executeScript("fake.sql", false, + DbTestUtils.executeScript("cleanup.sql", false, true); } diff --git a/server/test/com/cloud/upgrade/Test2214To30DBUpgrade.java b/server/test/com/cloud/upgrade/Test2214To30DBUpgrade.java index f51c949c052..7eac4c421a5 100644 --- a/server/test/com/cloud/upgrade/Test2214To30DBUpgrade.java +++ b/server/test/com/cloud/upgrade/Test2214To30DBUpgrade.java @@ -42,7 +42,7 @@ public class Test2214To30DBUpgrade extends TestCase { @Override @Before public void setUp() throws Exception { - DbTestUtils.executeScript("fake.sql", false, + DbTestUtils.executeScript("cleanup.sql", false, true); } diff --git a/server/test/com/cloud/upgrade/Usage217To224UpgradeTest.java b/server/test/com/cloud/upgrade/Usage217To224UpgradeTest.java index f611407771a..ca28c41bc37 100644 --- a/server/test/com/cloud/upgrade/Usage217To224UpgradeTest.java +++ b/server/test/com/cloud/upgrade/Usage217To224UpgradeTest.java @@ -41,8 +41,8 @@ public class Usage217To224UpgradeTest extends TestCase { @Override @Before public void setUp() throws Exception { - DbTestUtils.executeScript("fake.sql", false, true); - DbTestUtils.executeUsageScript("fake.sql", false, true); + DbTestUtils.executeScript("cleanup.sql", false, true); + DbTestUtils.executeUsageScript("cleanup.sql", false, true); } @Override diff --git a/server/test/com/cloud/upgrade/UsageEvents218To224UpgradeTest.java b/server/test/com/cloud/upgrade/UsageEvents218To224UpgradeTest.java index c70a160833e..8858cb2bbc7 100644 --- a/server/test/com/cloud/upgrade/UsageEvents218To224UpgradeTest.java +++ b/server/test/com/cloud/upgrade/UsageEvents218To224UpgradeTest.java @@ -40,7 +40,7 @@ public class UsageEvents218To224UpgradeTest extends TestCase { @Override @Before public void setUp() throws Exception { - DbTestUtils.executeScript("fake.sql", false, true); + DbTestUtils.executeScript("cleanup.sql", false, true); } @Override