http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersTest.java index 974b49a..5b54af4 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersTest.java @@ -23,6 +23,7 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.junit.Assert.fail; +import java.sql.SQLException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -39,6 +40,7 @@ import javax.persistence.EntityManager; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.ClusterNotFoundException; import org.apache.ambari.server.DuplicateResourceException; +import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.HostNotFoundException; import org.apache.ambari.server.agent.AgentEnv; import org.apache.ambari.server.agent.HostInfo; @@ -86,7 +88,6 @@ import com.google.common.collect.Maps; import com.google.inject.Guice; import com.google.inject.Inject; import com.google.inject.Injector; -import com.google.inject.persist.PersistService; import junit.framework.Assert; @@ -115,8 +116,8 @@ public class ClustersTest { } @After - public void teardown() { - injector.getInstance(PersistService.class).stop(); + public void teardown() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); } private void setOsFamily(Host host, String osFamily, String osVersion) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ConcurrentServiceConfigVersionTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ConcurrentServiceConfigVersionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ConcurrentServiceConfigVersionTest.java index 2500a16..8b56004 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ConcurrentServiceConfigVersionTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ConcurrentServiceConfigVersionTest.java @@ -18,12 +18,14 @@ package org.apache.ambari.server.state.cluster; +import java.sql.SQLException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import org.apache.ambari.server.AmbariException; +import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.ServiceComponentNotFoundException; import org.apache.ambari.server.ServiceNotFoundException; import org.apache.ambari.server.controller.ServiceConfigVersionResponse; @@ -55,7 +57,6 @@ import com.google.inject.Guice; import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Module; -import com.google.inject.persist.PersistService; import com.google.inject.util.Modules; /** @@ -126,8 +127,8 @@ public class ConcurrentServiceConfigVersionTest { } @After - public void teardown() { - injector.getInstance(PersistService.class).stop(); + public void teardown() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); } /** http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ServiceComponentHostConcurrentWriteDeadlockTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ServiceComponentHostConcurrentWriteDeadlockTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ServiceComponentHostConcurrentWriteDeadlockTest.java index 96dbf26..eecf347 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ServiceComponentHostConcurrentWriteDeadlockTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ServiceComponentHostConcurrentWriteDeadlockTest.java @@ -18,6 +18,7 @@ package org.apache.ambari.server.state.cluster; +import java.sql.SQLException; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -26,6 +27,7 @@ import java.util.List; import java.util.Map; import org.apache.ambari.server.AmbariException; +import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.ServiceComponentNotFoundException; import org.apache.ambari.server.ServiceNotFoundException; import org.apache.ambari.server.events.listeners.upgrade.HostVersionOutOfSyncListener; @@ -58,7 +60,6 @@ import com.google.inject.Guice; import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Module; -import com.google.inject.persist.PersistService; import com.google.inject.util.Modules; /** @@ -132,8 +133,8 @@ public class ServiceComponentHostConcurrentWriteDeadlockTest { } @After - public void teardown() { - injector.getInstance(PersistService.class).stop(); + public void teardown() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); } /** http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/state/host/HostTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/host/HostTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/host/HostTest.java index 5c8d174..d418a80 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/host/HostTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/host/HostTest.java @@ -23,12 +23,14 @@ import static org.mockito.Matchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; +import java.sql.SQLException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import org.apache.ambari.server.AmbariException; +import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.actionmanager.ActionManager; import org.apache.ambari.server.agent.ActionQueue; import org.apache.ambari.server.agent.AgentEnv; @@ -64,7 +66,6 @@ import org.junit.Test; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.inject.persist.PersistService; public class HostTest { @@ -84,8 +85,8 @@ public class HostTest { } @After - public void teardown() throws AmbariException { - injector.getInstance(PersistService.class).stop(); + public void teardown() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); } @Test @@ -369,7 +370,6 @@ public class HostTest { c1.createClusterVersion(stackId, stackId.getStackVersion(), "admin", RepositoryVersionState.INSTALLING); Assert.assertEquals("c1", c1.getClusterName()); - Assert.assertEquals(1, c1.getClusterId()); clusters.addHost("h1"); Host host = clusters.getHost("h1"); host.setIPv4("ipv4"); @@ -425,7 +425,6 @@ public class HostTest { clusters.addCluster("c1", stackId); Cluster c1 = clusters.getCluster("c1"); Assert.assertEquals("c1", c1.getClusterName()); - Assert.assertEquals(1, c1.getClusterId()); clusters.addHost("h1"); Host host = clusters.getHost("h1"); host.setIPv4("ipv4"); http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/state/services/RetryUpgradeActionServiceTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/services/RetryUpgradeActionServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/services/RetryUpgradeActionServiceTest.java index 7dd9932..ed95b0b 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/services/RetryUpgradeActionServiceTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/services/RetryUpgradeActionServiceTest.java @@ -17,12 +17,14 @@ */ package org.apache.ambari.server.state.services; +import java.sql.SQLException; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; import java.util.List; import org.apache.ambari.server.AmbariException; +import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.Role; import org.apache.ambari.server.RoleCommand; import org.apache.ambari.server.actionmanager.HostRoleStatus; @@ -47,6 +49,7 @@ import org.apache.ambari.server.state.RepositoryVersionState; import org.apache.ambari.server.state.StackId; import org.apache.ambari.server.state.stack.upgrade.Direction; import org.apache.ambari.server.state.stack.upgrade.UpgradeType; +import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -93,6 +96,11 @@ public class RetryUpgradeActionServiceTest { helper = injector.getInstance(OrmTestHelper.class); } + @After + public void teardown() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); + } + /** * Test the gauva service allows retrying certain failed actions during a stack upgrade. * Case 1: No cluster => no-op http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/state/stack/ConfigUpgradePackTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/ConfigUpgradePackTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/ConfigUpgradePackTest.java index 52603d0..d6fdb7f 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/ConfigUpgradePackTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/ConfigUpgradePackTest.java @@ -23,9 +23,12 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import java.sql.SQLException; import java.util.ArrayList; import java.util.Map; +import org.apache.ambari.server.AmbariException; +import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.orm.GuiceJpaInitializer; import org.apache.ambari.server.orm.InMemoryDefaultTestModule; @@ -38,7 +41,6 @@ import org.junit.experimental.categories.Category; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.inject.persist.PersistService; /** * Tests for the config upgrade pack @@ -58,8 +60,8 @@ public class ConfigUpgradePackTest { } @After - public void teardown() { - injector.getInstance(PersistService.class).stop(); + public void teardown() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); } @Test http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/state/stack/ConfigUpgradeValidityTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/ConfigUpgradeValidityTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/ConfigUpgradeValidityTest.java index ee1b05e..44f72bd 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/ConfigUpgradeValidityTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/ConfigUpgradeValidityTest.java @@ -18,11 +18,14 @@ package org.apache.ambari.server.state.stack; import java.io.File; +import java.sql.SQLException; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; +import org.apache.ambari.server.AmbariException; +import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.controller.internal.UpgradeResourceProvider.ConfigurationPackBuilder; @@ -51,7 +54,6 @@ import org.slf4j.LoggerFactory; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.inject.persist.PersistService; import junit.framework.Assert; @@ -86,8 +88,8 @@ public class ConfigUpgradeValidityTest { } @After - public void teardown() { - injector.getInstance(PersistService.class).stop(); + public void teardown() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); } /** http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/state/stack/OSFamilyTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/OSFamilyTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/OSFamilyTest.java index 99de92d..8ffc594 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/OSFamilyTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/OSFamilyTest.java @@ -19,13 +19,18 @@ package org.apache.ambari.server.state.stack; import java.lang.reflect.Method; +import java.sql.SQLException; import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; +import org.apache.ambari.server.AmbariException; +import org.apache.ambari.server.H2DatabaseCleaner; +import org.apache.ambari.server.orm.GuiceJpaInitializer; import org.apache.ambari.server.orm.InMemoryDefaultTestModule; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -44,10 +49,15 @@ public class OSFamilyTest { @Before public void setup() throws Exception { injector = Guice.createInjector(new InMemoryDefaultTestModule()); - + injector.getInstance(GuiceJpaInitializer.class); os_family = injector.getInstance(OsFamily.class); } + @After + public void teardown() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); + } + @Test public void testOSListing() throws Exception{ Set<String> actual_oslist = os_family.os_list(); http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/state/stack/UpgradePackTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/UpgradePackTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/UpgradePackTest.java index 2d9a95f..e628c80 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/UpgradePackTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/UpgradePackTest.java @@ -23,6 +23,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import java.sql.SQLException; import java.util.Arrays; import java.util.Iterator; import java.util.LinkedHashMap; @@ -31,6 +32,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import org.apache.ambari.server.AmbariException; +import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.orm.GuiceJpaInitializer; import org.apache.ambari.server.orm.InMemoryDefaultTestModule; @@ -61,7 +64,6 @@ import org.slf4j.LoggerFactory; import com.google.common.collect.Sets; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.inject.persist.PersistService; /** * Tests for the upgrade pack @@ -83,8 +85,8 @@ public class UpgradePackTest { } @After - public void teardown() { - injector.getInstance(PersistService.class).stop(); + public void teardown() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); } @Test http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java index 6bd9a09..854a163 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java @@ -18,6 +18,7 @@ package org.apache.ambari.server.state.svccomphost; +import java.sql.SQLException; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -27,6 +28,7 @@ import java.util.Map; import java.util.Set; import org.apache.ambari.server.AmbariException; +import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.ServiceComponentNotFoundException; import org.apache.ambari.server.ServiceNotFoundException; import org.apache.ambari.server.controller.ServiceComponentHostResponse; @@ -74,7 +76,6 @@ import org.slf4j.LoggerFactory; import com.google.inject.Guice; import com.google.inject.Inject; import com.google.inject.Injector; -import com.google.inject.persist.PersistService; public class ServiceComponentHostTest { private static Logger LOG = LoggerFactory.getLogger(ServiceComponentHostTest.class); @@ -130,8 +131,8 @@ public class ServiceComponentHostTest { } @After - public void teardown() { - injector.getInstance(PersistService.class).stop(); + public void teardown() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); } private ClusterEntity createCluster(StackId stackId, String clusterName) throws AmbariException { http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/upgrade/StackUpgradeUtilTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/StackUpgradeUtilTest.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/StackUpgradeUtilTest.java index 5435b30..3ebf4e7 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/StackUpgradeUtilTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/StackUpgradeUtilTest.java @@ -21,6 +21,7 @@ import java.util.Collection; import java.util.List; import java.util.Map.Entry; +import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.orm.GuiceJpaInitializer; import org.apache.ambari.server.orm.InMemoryDefaultTestModule; @@ -34,7 +35,6 @@ import org.junit.Test; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.inject.persist.PersistService; /** * Tests the StackUpgradeHelper @@ -51,7 +51,7 @@ public class StackUpgradeUtilTest { @After public void teardown() throws Exception { - injector.getInstance(PersistService.class).stop(); + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); } private void reset(String stackName, String stackVersion) throws Exception { http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java index 87cea1b..729340f 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java @@ -52,6 +52,7 @@ import java.util.Map; import javax.persistence.EntityManager; import org.apache.ambari.server.AmbariException; +import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.controller.AmbariManagementController; @@ -97,7 +98,6 @@ import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.Provider; -import com.google.inject.persist.PersistService; /** * {@link UpgradeCatalog200} unit tests. @@ -125,8 +125,8 @@ public class UpgradeCatalog200Test { } @After - public void tearDown() { - injector.getInstance(PersistService.class).stop(); + public void tearDown() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); } @Test http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog210Test.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog210Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog210Test.java index 7106021..0d4eb43 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog210Test.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog210Test.java @@ -52,6 +52,7 @@ import java.util.Set; import javax.persistence.EntityManager; import org.apache.ambari.server.AmbariException; +import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.controller.AmbariManagementController; @@ -98,7 +99,6 @@ import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.Provider; -import com.google.inject.persist.PersistService; /** * {@link org.apache.ambari.server.upgrade.UpgradeCatalog210} unit tests. @@ -125,8 +125,8 @@ public class UpgradeCatalog210Test { desiredStackEntity = stackDAO.find("HDP", "2.2.0"); } - public void tearDown() { - injector.getInstance(PersistService.class).stop(); + public void tearDown() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); } @Test http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121Test.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121Test.java index 8f0f66b..7ae3f42 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121Test.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121Test.java @@ -28,6 +28,7 @@ import static org.easymock.EasyMock.reset; import static org.easymock.EasyMock.verify; import java.lang.reflect.Method; +import java.sql.SQLException; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -35,6 +36,8 @@ import java.util.Set; import javax.persistence.EntityManager; +import org.apache.ambari.server.AmbariException; +import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.controller.AmbariManagementController; import org.apache.ambari.server.orm.DBAccessor; @@ -56,7 +59,6 @@ import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Provider; -import com.google.inject.persist.PersistService; @PrepareForTest(UpgradeCatalog2121.class) public class UpgradeCatalog2121Test { @@ -83,8 +85,8 @@ public class UpgradeCatalog2121Test { } @After - public void tearDown() { - injector.getInstance(PersistService.class).stop(); + public void tearDown() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); } @Test http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java index d15ca25..3f7bcc8 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java @@ -43,6 +43,8 @@ import java.util.Map; import javax.persistence.EntityManager; +import org.apache.ambari.server.AmbariException; +import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.controller.AmbariManagementController; @@ -76,7 +78,6 @@ import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.Provider; -import com.google.inject.persist.PersistService; /** * {@link org.apache.ambari.server.upgrade.UpgradeCatalog212} unit tests. @@ -138,9 +139,9 @@ public class UpgradeCatalog212Test { } @After - public void tearDown() { + public void tearDown() throws AmbariException, SQLException { if (injector != null) { - injector.getInstance(PersistService.class).stop(); + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); } } http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog220Test.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog220Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog220Test.java index e687b10..0160d86 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog220Test.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog220Test.java @@ -50,6 +50,7 @@ import java.util.Map; import javax.persistence.EntityManager; import org.apache.ambari.server.AmbariException; +import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.actionmanager.ActionManager; import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.configuration.Configuration; @@ -111,7 +112,6 @@ import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.Provider; -import com.google.inject.persist.PersistService; /** * {@link org.apache.ambari.server.upgrade.UpgradeCatalog220} unit tests. */ @@ -148,8 +148,8 @@ public class UpgradeCatalog220Test { } @AfterClass - public static void tearDown() { - injector.getInstance(PersistService.class).stop(); + public static void tearDown() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); } @Test http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog240Test.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog240Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog240Test.java index 496a8ef..d1b2eb8 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog240Test.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog240Test.java @@ -57,6 +57,7 @@ import java.util.Map; import javax.persistence.EntityManager; import org.apache.ambari.server.AmbariException; +import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.actionmanager.ActionManager; import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.configuration.Configuration; @@ -119,7 +120,7 @@ import org.easymock.Capture; import org.easymock.CaptureType; import org.easymock.EasyMock; import org.easymock.EasyMockSupport; -import org.junit.After; +import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -168,8 +169,9 @@ public class UpgradeCatalog240Test { stackDAO.find("HDP", "2.2.0"); } - @After - public void tearDown() { + @AfterClass + public static void tearDown() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); } @Test http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog242Test.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog242Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog242Test.java index 4c1a27b..0cd4f12f 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog242Test.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog242Test.java @@ -43,6 +43,7 @@ import java.util.Set; import javax.persistence.EntityManager; import org.apache.ambari.server.AmbariException; +import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.controller.AmbariManagementController; @@ -82,7 +83,6 @@ import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.Provider; -import com.google.inject.persist.PersistService; import junit.framework.Assert; /** @@ -121,8 +121,8 @@ public class UpgradeCatalog242Test { } @After - public void tearDown() { - injector.getInstance(PersistService.class).stop(); + public void tearDown() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); } @Test http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalogTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalogTest.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalogTest.java index cca27b1..fa40db9 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalogTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalogTest.java @@ -22,6 +22,7 @@ import java.util.List; import java.util.Set; import org.apache.ambari.server.AmbariException; +import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.orm.GuiceJpaInitializer; import org.apache.ambari.server.orm.InMemoryDefaultTestModule; @@ -35,7 +36,6 @@ import com.google.inject.Guice; import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.multibindings.Multibinder; -import com.google.inject.persist.PersistService; import junit.framework.Assert; @@ -99,8 +99,8 @@ public class UpgradeCatalogTest { } @After - public void teardown() throws AmbariException { - injector.getInstance(PersistService.class).stop(); + public void teardown() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); // Clear the authenticated user SecurityContextHolder.getContext().setAuthentication(null); http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 232e4a9..3f5a884 100644 --- a/pom.xml +++ b/pom.xml @@ -393,6 +393,8 @@ <exclude>ambari-metrics/*/target/**</exclude> <!-- ignore .settings and .project --> <exclude>ambari-metrics/**/.*/**</exclude> + <!-- generated DDL--> + <exclude>**/createDDL.jdbc</exclude> </excludes> </configuration> <executions>
