add cleanup.sql to DB upgrade test

frank · frank · commit 3773b52b2fa8 · 2012-03-19T14:36:57.000-07:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public class AdvanceZone217To224UpgradeTest extends TestCase {`
`40`	`40`	`@Override`
`41`	`41`	`@Before`
`42`	`42`	`public void setUp() throws Exception {`
`43`		`- DbTestUtils.executeScript("fake.sql", false, true);`
	`43`	`+ DbTestUtils.executeScript("cleanup.sql", false, true);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public class BasicZone218To224UpgradeTest extends TestCase {`
`40`	`40`	`@Override`
`41`	`41`	`@Before`
`42`	`42`	`public void setUp() throws Exception {`
`43`		`- DbTestUtils.executeScript("fake.sql", false, true);`
	`43`	`+ DbTestUtils.executeScript("cleanup.sql", false, true);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public class HostCapacity218to22Test extends TestCase {`
`18`	`18`	`@Override`
`19`	`19`	`@Before`
`20`	`20`	`public void setUp() throws Exception {`
`21`		`- DbTestUtils.executeScript("fake.sql", false, true);`
	`21`	`+ DbTestUtils.executeScript("cleanup.sql", false, true);`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public class InstanceGroup218To224UpgradeTest extends TestCase {`
`41`	`41`	`@Override`
`42`	`42`	`@Before`
`43`	`43`	`public void setUp() throws Exception {`
`44`		`- DbTestUtils.executeScript("fake.sql", false, true);`
	`44`	`+ DbTestUtils.executeScript("cleanup.sql", false, true);`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public class PortForwarding218To224UpgradeTest extends TestCase {`
`41`	`41`	`@Override`
`42`	`42`	`@Before`
`43`	`43`	`public void setUp() throws Exception {`
`44`		`- DbTestUtils.executeScript("fake.sql", false, true);`
	`44`	`+ DbTestUtils.executeScript("cleanup.sql", false, true);`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public class Sanity220To224UpgradeTest extends TestCase {`
`39`	`39`	`@Override`
`40`	`40`	`@Before`
`41`	`41`	`public void setUp() throws Exception {`
`42`		`- DbTestUtils.executeScript("fake.sql", false, true);`
	`42`	`+ DbTestUtils.executeScript("cleanup.sql", false, true);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public class Template2214To30UpgradeTest extends TestCase {`
`42`	`42`	`@Override`
`43`	`43`	`@Before`
`44`	`44`	`public void setUp() throws Exception {`
`45`		`- DbTestUtils.executeScript("fake.sql", false,`
	`45`	`+ DbTestUtils.executeScript("cleanup.sql", false,`
`46`	`46`	`true);`
`47`	`47`	`}`
`48`	`48`