Repository: ambari Updated Branches: refs/heads/branch-2.5 d605a201e -> 8aecca202
http://git-wip-us.apache.org/repos/asf/ambari/blob/8aecca20/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/8aecca20/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/8aecca20/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/8aecca20/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 2fb57d7..7b1aa1d 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 @@ -20,6 +20,7 @@ package org.apache.ambari.server.state.services; import com.google.inject.Guice; import com.google.inject.Injector; 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; @@ -44,10 +45,12 @@ 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; +import java.sql.SQLException; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; @@ -92,6 +95,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/8aecca20/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 27ee146..eb1d49c 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 @@ -19,7 +19,6 @@ package org.apache.ambari.server.state.stack; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.inject.persist.PersistService; import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.orm.GuiceJpaInitializer; import org.apache.ambari.server.orm.InMemoryDefaultTestModule; @@ -30,6 +29,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; +import java.sql.SQLException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -37,6 +37,8 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +import org.apache.ambari.server.AmbariException; +import org.apache.ambari.server.H2DatabaseCleaner; import static org.apache.ambari.server.state.stack.ConfigUpgradePack.AffectedService; import static org.apache.ambari.server.state.stack.ConfigUpgradePack.AffectedComponent; import static org.junit.Assert.*; @@ -59,8 +61,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/8aecca20/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/8aecca20/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 ba41687..18659a1 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 @@ -21,13 +21,18 @@ package org.apache.ambari.server.state.stack; import com.google.inject.Guice; import com.google.inject.Injector; +import org.apache.ambari.server.AmbariException; +import org.apache.ambari.server.H2DatabaseCleaner; +import org.apache.ambari.server.orm.GuiceJpaInitializer; import junit.framework.Assert; 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; import java.lang.reflect.Method; +import java.sql.SQLException; import java.util.*; @@ -39,10 +44,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/8aecca20/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/8aecca20/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/8aecca20/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 35650a1..a15d05d 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/8aecca20/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 fa3e224..7f03992 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; @@ -96,7 +97,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. @@ -124,8 +124,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/8aecca20/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 f19288f..71bf6b7 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 @@ -51,6 +51,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.api.services.AmbariMetaInfo; import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.controller.AmbariManagementController; @@ -96,7 +97,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. @@ -123,8 +123,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/8aecca20/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 249647b..1499fd1 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 @@ -31,6 +31,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; @@ -38,6 +39,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; @@ -58,7 +61,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; import org.powermock.core.classloader.annotations.PrepareForTest; @PrepareForTest(UpgradeCatalog2121.class) @@ -86,8 +88,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/8aecca20/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 572a65c..fc52dd9 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 @@ -24,7 +24,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 org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.controller.AmbariManagementController; @@ -51,6 +50,8 @@ import org.junit.Assert; import org.junit.Rule; import org.junit.Test; +import org.apache.ambari.server.AmbariException; +import org.apache.ambari.server.H2DatabaseCleaner; import javax.persistence.EntityManager; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -135,9 +136,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/8aecca20/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 2b3764b..731b0b5 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 @@ -26,8 +26,8 @@ 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 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; @@ -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/8aecca20/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 701d8b1..b9f37d5 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 @@ -29,6 +29,7 @@ import com.google.inject.Module; import com.google.inject.Provider; import junit.framework.Assert; 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; @@ -91,7 +92,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; @@ -165,8 +166,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/8aecca20/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 265aa10..823455e 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.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.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; /** * {@link org.apache.ambari.server.upgrade.UpgradeCatalog242} unit tests. */ @@ -119,8 +119,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/8aecca20/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 554cd99..4f0e7b0 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 @@ -21,9 +21,9 @@ 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; 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.controller.ClusterRequest; @@ -107,8 +107,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/8aecca20/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 08d01d0..c48d49a 100644 --- a/pom.xml +++ b/pom.xml @@ -392,6 +392,8 @@ <exclude>ambari-metrics/*/target/**</exclude> <!-- ignore .settings and .project --> <exclude>ambari-metrics/**/.*/**</exclude> + <!-- generated DDL--> + <exclude>**/createDDL.jdbc</exclude> </excludes> </configuration> <executions>
