http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java index 98ee64d..9e60dad 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java @@ -18,110 +18,112 @@ package org.apache.ambari.server.controller.internal; -import static org.easymock.EasyMock.anyLong; -import static org.easymock.EasyMock.anyObject; -import static org.easymock.EasyMock.capture; -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.createNiceMock; -import static org.easymock.EasyMock.eq; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.expectLastCall; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; - -import java.io.File; -import java.io.FileInputStream; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; - -import org.apache.ambari.annotations.Experimental; -import org.apache.ambari.annotations.ExperimentalFeature; -import org.apache.ambari.server.Role; -import org.apache.ambari.server.actionmanager.ActionManager; -import org.apache.ambari.server.actionmanager.ExecutionCommandWrapper; -import org.apache.ambari.server.actionmanager.HostRoleCommand; -import org.apache.ambari.server.actionmanager.Stage; -import org.apache.ambari.server.actionmanager.StageFactory; -import org.apache.ambari.server.agent.CommandReport; -import org.apache.ambari.server.agent.ExecutionCommand; -import org.apache.ambari.server.agent.ExecutionCommand.KeyNames; -import org.apache.ambari.server.api.services.AmbariMetaInfo; -import org.apache.ambari.server.configuration.Configuration; -import org.apache.ambari.server.controller.AmbariManagementController; -import org.apache.ambari.server.controller.ExecuteActionRequest; -import org.apache.ambari.server.controller.RequestStatusResponse; -import org.apache.ambari.server.controller.ResourceProviderFactory; -import org.apache.ambari.server.controller.spi.Request; -import org.apache.ambari.server.controller.spi.RequestStatus; -import org.apache.ambari.server.controller.spi.Resource; -import org.apache.ambari.server.controller.spi.ResourceProvider; -import org.apache.ambari.server.controller.utilities.PropertyHelper; -import org.apache.ambari.server.orm.GuiceJpaInitializer; -import org.apache.ambari.server.orm.InMemoryDefaultTestModule; -import org.apache.ambari.server.orm.dao.ClusterVersionDAO; -import org.apache.ambari.server.orm.dao.HostComponentStateDAO; -import org.apache.ambari.server.orm.dao.HostVersionDAO; -import org.apache.ambari.server.orm.dao.RepositoryVersionDAO; -import org.apache.ambari.server.orm.dao.ResourceTypeDAO; -import org.apache.ambari.server.orm.dao.StackDAO; -import org.apache.ambari.server.orm.entities.ClusterEntity; -import org.apache.ambari.server.orm.entities.ClusterVersionEntity; -import org.apache.ambari.server.orm.entities.HostVersionEntity; -import org.apache.ambari.server.orm.entities.RepositoryVersionEntity; -import org.apache.ambari.server.orm.entities.ResourceEntity; -import org.apache.ambari.server.orm.entities.ResourceTypeEntity; -import org.apache.ambari.server.orm.entities.StackEntity; -import org.apache.ambari.server.orm.entities.UpgradeEntity; -import org.apache.ambari.server.security.TestAuthenticationFactory; -import org.apache.ambari.server.security.authorization.AuthorizationException; -import org.apache.ambari.server.security.authorization.ResourceType; -import org.apache.ambari.server.serveraction.upgrades.FinalizeUpgradeAction; -import org.apache.ambari.server.state.Cluster; -import org.apache.ambari.server.state.Clusters; -import org.apache.ambari.server.state.ConfigHelper; -import org.apache.ambari.server.state.Host; -import org.apache.ambari.server.state.MaintenanceState; -import org.apache.ambari.server.state.RepositoryType; -import org.apache.ambari.server.state.RepositoryVersionState; -import org.apache.ambari.server.state.Service; -import org.apache.ambari.server.state.ServiceComponent; -import org.apache.ambari.server.state.ServiceComponentHost; -import org.apache.ambari.server.state.ServiceInfo; -import org.apache.ambari.server.state.ServiceOsSpecific; -import org.apache.ambari.server.state.StackId; -import org.apache.ambari.server.state.cluster.ClusterImpl; -import org.apache.ambari.server.state.stack.upgrade.Direction; -import org.apache.ambari.server.topology.TopologyManager; -import org.apache.ambari.server.utils.StageUtils; -import org.apache.commons.io.IOUtils; -import org.easymock.Capture; -import org.easymock.EasyMock; -import org.easymock.IAnswer; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; - -import com.google.gson.JsonArray; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; -import com.google.inject.AbstractModule; -import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.persist.PersistService; -import com.google.inject.util.Modules; + import static org.easymock.EasyMock.anyLong; + import static org.easymock.EasyMock.anyObject; + import static org.easymock.EasyMock.capture; + import static org.easymock.EasyMock.createMock; + import static org.easymock.EasyMock.createNiceMock; + import static org.easymock.EasyMock.eq; + import static org.easymock.EasyMock.expect; + import static org.easymock.EasyMock.expectLastCall; + import static org.easymock.EasyMock.replay; + import static org.easymock.EasyMock.verify; + + import java.io.File; + import java.io.FileInputStream; + import java.lang.reflect.Field; + import java.sql.SQLException; + import java.util.ArrayList; + import java.util.Arrays; + import java.util.Collections; + import java.util.HashMap; + import java.util.LinkedHashMap; + import java.util.LinkedHashSet; + import java.util.List; + import java.util.Map; + import java.util.Properties; + import java.util.Set; + + import org.apache.ambari.annotations.Experimental; + import org.apache.ambari.annotations.ExperimentalFeature; + import org.apache.ambari.server.AmbariException; + import org.apache.ambari.server.H2DatabaseCleaner; + import org.apache.ambari.server.Role; + import org.apache.ambari.server.actionmanager.ActionManager; + import org.apache.ambari.server.actionmanager.ExecutionCommandWrapper; + import org.apache.ambari.server.actionmanager.HostRoleCommand; + import org.apache.ambari.server.actionmanager.Stage; + import org.apache.ambari.server.actionmanager.StageFactory; + import org.apache.ambari.server.agent.CommandReport; + import org.apache.ambari.server.agent.ExecutionCommand; + import org.apache.ambari.server.agent.ExecutionCommand.KeyNames; + import org.apache.ambari.server.api.services.AmbariMetaInfo; + import org.apache.ambari.server.configuration.Configuration; + import org.apache.ambari.server.controller.AmbariManagementController; + import org.apache.ambari.server.controller.ExecuteActionRequest; + import org.apache.ambari.server.controller.RequestStatusResponse; + import org.apache.ambari.server.controller.ResourceProviderFactory; + import org.apache.ambari.server.controller.spi.Request; + import org.apache.ambari.server.controller.spi.RequestStatus; + import org.apache.ambari.server.controller.spi.Resource; + import org.apache.ambari.server.controller.spi.ResourceProvider; + import org.apache.ambari.server.controller.utilities.PropertyHelper; + import org.apache.ambari.server.orm.GuiceJpaInitializer; + import org.apache.ambari.server.orm.InMemoryDefaultTestModule; + import org.apache.ambari.server.orm.dao.ClusterVersionDAO; + import org.apache.ambari.server.orm.dao.HostComponentStateDAO; + import org.apache.ambari.server.orm.dao.HostVersionDAO; + import org.apache.ambari.server.orm.dao.RepositoryVersionDAO; + import org.apache.ambari.server.orm.dao.ResourceTypeDAO; + import org.apache.ambari.server.orm.dao.StackDAO; + import org.apache.ambari.server.orm.entities.ClusterEntity; + import org.apache.ambari.server.orm.entities.ClusterVersionEntity; + import org.apache.ambari.server.orm.entities.HostVersionEntity; + import org.apache.ambari.server.orm.entities.RepositoryVersionEntity; + import org.apache.ambari.server.orm.entities.ResourceEntity; + import org.apache.ambari.server.orm.entities.ResourceTypeEntity; + import org.apache.ambari.server.orm.entities.StackEntity; + import org.apache.ambari.server.orm.entities.UpgradeEntity; + import org.apache.ambari.server.security.TestAuthenticationFactory; + import org.apache.ambari.server.security.authorization.AuthorizationException; + import org.apache.ambari.server.security.authorization.ResourceType; + import org.apache.ambari.server.serveraction.upgrades.FinalizeUpgradeAction; + import org.apache.ambari.server.state.Cluster; + import org.apache.ambari.server.state.Clusters; + import org.apache.ambari.server.state.ConfigHelper; + import org.apache.ambari.server.state.Host; + import org.apache.ambari.server.state.MaintenanceState; + import org.apache.ambari.server.state.RepositoryType; + import org.apache.ambari.server.state.RepositoryVersionState; + import org.apache.ambari.server.state.Service; + import org.apache.ambari.server.state.ServiceComponent; + import org.apache.ambari.server.state.ServiceComponentHost; + import org.apache.ambari.server.state.ServiceInfo; + import org.apache.ambari.server.state.ServiceOsSpecific; + import org.apache.ambari.server.state.StackId; + import org.apache.ambari.server.state.cluster.ClusterImpl; + import org.apache.ambari.server.state.stack.upgrade.Direction; + import org.apache.ambari.server.topology.TopologyManager; + import org.apache.ambari.server.utils.StageUtils; + import org.apache.commons.io.IOUtils; + import org.easymock.Capture; + import org.easymock.EasyMock; + import org.easymock.IAnswer; + import org.junit.After; + import org.junit.Assert; + import org.junit.Before; + import org.junit.Ignore; + import org.junit.Test; + import org.springframework.security.core.Authentication; + import org.springframework.security.core.context.SecurityContextHolder; + + import com.google.gson.JsonArray; + import com.google.gson.JsonObject; + import com.google.gson.JsonParser; + import com.google.inject.AbstractModule; + import com.google.inject.Guice; + import com.google.inject.Injector; + import com.google.inject.util.Modules; /** @@ -186,8 +188,8 @@ public class ClusterStackVersionResourceProviderTest { } @After - public void teardown() { - injector.getInstance(PersistService.class).stop(); + public void teardown() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); SecurityContextHolder.getContext().setAuthentication(null); }
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProviderTest.java index dffc4f7..bf1efb7 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProviderTest.java @@ -25,6 +25,7 @@ import static junit.framework.Assert.assertTrue; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; +import java.sql.SQLException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -34,6 +35,8 @@ import java.util.List; 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.controller.ResourceProviderFactory; import org.apache.ambari.server.controller.predicate.AndPredicate; @@ -66,7 +69,6 @@ import org.springframework.security.core.context.SecurityContextHolder; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.inject.persist.PersistService; /** * CompatibleRepositoryVersionResourceProvider tests. @@ -239,8 +241,8 @@ public class CompatibleRepositoryVersionResourceProviderTest { } @After - public void after() { - injector.getInstance(PersistService.class).stop(); + public void after() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); injector = null; SecurityContextHolder.getContext().setAuthentication(null); http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java index 3529bef..c0f640b 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java @@ -74,6 +74,7 @@ import org.apache.ambari.server.state.ServiceComponentFactory; import org.apache.ambari.server.state.ServiceComponentHost; import org.apache.ambari.server.state.StackId; import org.apache.ambari.server.state.State; +import org.apache.log4j.Logger; import org.easymock.Capture; import org.easymock.EasyMock; import org.junit.Assert; @@ -89,6 +90,7 @@ import com.google.inject.Injector; * Tests for the component resource provider. */ public class ComponentResourceProviderTest { + private static final Logger LOG = Logger.getLogger(ComponentResourceProviderTest.class); private static final long CLUSTER_ID = 100; private static final String CLUSTER_NAME = "Cluster100"; http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java index 0b18e83..4bed482 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java @@ -31,6 +31,7 @@ import static org.easymock.EasyMock.newCapture; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; +import java.sql.SQLException; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; @@ -41,6 +42,8 @@ import java.util.List; 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.actionmanager.ActionManager; import org.apache.ambari.server.actionmanager.HostRoleCommand; import org.apache.ambari.server.api.services.AmbariMetaInfo; @@ -84,7 +87,6 @@ import org.junit.Test; import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.inject.persist.PersistService; import com.google.inject.util.Modules; /** @@ -158,8 +160,8 @@ public class HostStackVersionResourceProviderTest { } @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/controller/internal/JMXHostProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java index c5eb76e..270d50a 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java @@ -21,6 +21,7 @@ import static org.easymock.EasyMock.createNiceMock; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; +import java.sql.SQLException; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -28,6 +29,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.controller.AmbariManagementController; import org.apache.ambari.server.controller.ClusterRequest; import org.apache.ambari.server.controller.ConfigurationRequest; @@ -62,7 +64,6 @@ import org.springframework.security.core.context.SecurityContextHolder; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.inject.persist.PersistService; public class JMXHostProviderTest { private Injector injector; @@ -85,6 +86,7 @@ public class JMXHostProviderTest { @Before public void setup() throws Exception { injector = Guice.createInjector(new InMemoryDefaultTestModule()); + H2DatabaseCleaner.resetSequences(injector); injector.getInstance(GuiceJpaInitializer.class); clusters = injector.getInstance(Clusters.class); controller = injector.getInstance(AmbariManagementController.class); @@ -95,8 +97,8 @@ public class JMXHostProviderTest { } @After - public void teardown() { - 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/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java index b8d450b..0230a97 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java @@ -18,6 +18,7 @@ package org.apache.ambari.server.controller.internal; +import java.sql.SQLException; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -28,6 +29,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.controller.ResourceProviderFactory; import org.apache.ambari.server.controller.predicate.AndPredicate; @@ -71,7 +73,6 @@ import com.google.common.collect.Sets; import com.google.gson.Gson; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.inject.persist.PersistService; import junit.framework.Assert; @@ -226,6 +227,7 @@ public class RepositoryVersionResourceProviderTest { } }); + H2DatabaseCleaner.resetSequences(injector); injector.getInstance(GuiceJpaInitializer.class); // because AmbariMetaInfo is mocked, the stacks are never inserted into @@ -638,8 +640,8 @@ public class RepositoryVersionResourceProviderTest { @After - public void after() { - injector.getInstance(PersistService.class).stop(); + public void after() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); injector = null; SecurityContextHolder.getContext().setAuthentication(null); http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProviderTest.java index fda5e79..149a91c 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProviderTest.java @@ -27,12 +27,15 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; +import java.sql.SQLException; import java.util.ArrayList; import java.util.HashSet; import java.util.List; 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.controller.AmbariManagementController; import org.apache.ambari.server.controller.spi.Predicate; @@ -52,7 +55,6 @@ import org.junit.Test; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.inject.persist.PersistService; public class StackArtifactResourceProviderTest { private AmbariMetaInfo metaInfo; @@ -69,8 +71,8 @@ public class StackArtifactResourceProviderTest { } @After - public void tearDown() { - injector.getInstance(PersistService.class).stop(); + public void tearDown() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); } private StackArtifactResourceProvider getStackArtifactResourceProvider( http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java index 75d5bd8..dc97f9b 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java @@ -32,6 +32,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.configuration.ComponentSSLConfiguration; import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.controller.AmbariManagementController; @@ -77,7 +78,6 @@ import com.google.inject.Binder; import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Module; -import com.google.inject.persist.PersistService; import com.google.inject.util.Modules; /** @@ -172,7 +172,7 @@ public class StackDefinedPropertyProviderTest { @After public void teardown() throws Exception { - injector.getInstance(PersistService.class).stop(); + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); } @Test http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java index e803529..40c7e50 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderHDP22Test.java @@ -27,6 +27,7 @@ import static org.junit.Assert.assertTrue; import java.lang.reflect.Field; import java.lang.reflect.Method; +import java.sql.SQLException; import java.util.Collections; import java.util.EnumSet; import java.util.HashMap; @@ -35,6 +36,8 @@ import java.util.List; 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.actionmanager.ActionManager; import org.apache.ambari.server.actionmanager.ExecutionCommandWrapper; import org.apache.ambari.server.actionmanager.ExecutionCommandWrapperFactory; @@ -91,7 +94,6 @@ import com.google.common.collect.ImmutableMap; import com.google.gson.Gson; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.inject.persist.PersistService; /** * UpgradeResourceDefinition tests. @@ -205,8 +207,8 @@ public class UpgradeResourceProviderHDP22Test { } @After - public void after() { - injector.getInstance(PersistService.class).stop(); + public void after() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); injector = null; } http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java index 4d95e2b..a0701b6 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java @@ -30,6 +30,7 @@ import static org.junit.Assert.assertTrue; import java.lang.reflect.Field; import java.lang.reflect.Method; +import java.sql.SQLException; import java.util.ArrayList; import java.util.Collections; import java.util.EnumSet; @@ -40,6 +41,8 @@ import java.util.List; 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.Role; import org.apache.ambari.server.RoleCommand; import org.apache.ambari.server.actionmanager.ActionManager; @@ -125,7 +128,6 @@ import com.google.inject.Binder; import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.Module; -import com.google.inject.persist.PersistService; import com.google.inject.util.Modules; /** @@ -172,6 +174,7 @@ public class UpgradeResourceProviderTest { injector = Guice.createInjector(Modules.override( new InMemoryDefaultTestModule()).with(new MockModule())); + H2DatabaseCleaner.resetSequences(injector); injector.getInstance(GuiceJpaInitializer.class); @@ -271,8 +274,8 @@ public class UpgradeResourceProviderTest { } @After - public void after() { - injector.getInstance(PersistService.class).stop(); + public void after() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); EasyMock.reset(injector.getInstance(AuditLogger.class)); injector = null; } http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeSummaryResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeSummaryResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeSummaryResourceProviderTest.java index e398a54..619e367 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeSummaryResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeSummaryResourceProviderTest.java @@ -26,12 +26,15 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.lang.reflect.Field; +import java.sql.SQLException; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; 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.Role; import org.apache.ambari.server.RoleCommand; import org.apache.ambari.server.actionmanager.HostRoleStatus; @@ -85,7 +88,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.persist.Transactional; import com.google.inject.util.Modules; @@ -138,8 +140,8 @@ public class UpgradeSummaryResourceProviderTest { } @After - public void after() { - injector.getInstance(PersistService.class).stop(); + public void after() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); injector = null; } @@ -357,4 +359,4 @@ public class UpgradeSummaryResourceProviderTest { binder.bind(UpgradeHelper.class).toInstance(m_upgradeHelper); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserResourceProviderDBTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserResourceProviderDBTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserResourceProviderDBTest.java index d2f9b22..240f00b 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserResourceProviderDBTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserResourceProviderDBTest.java @@ -22,6 +22,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import java.sql.SQLException; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; @@ -31,6 +32,8 @@ import java.util.Map; import java.util.Properties; import java.util.Set; +import org.apache.ambari.server.AmbariException; +import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.controller.AmbariManagementController; import org.apache.ambari.server.controller.spi.Predicate; @@ -95,9 +98,9 @@ public class UserResourceProviderDBTest { * Closes the JPA connection after executing the test suite. */ @AfterClass - public static void teardownInMemoryDB() { + public static void teardownInMemoryDB() 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/controller/internal/VersionDefinitionResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProviderTest.java index 026fb33..a297d94 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProviderTest.java @@ -28,6 +28,7 @@ import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; +import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.controller.ResourceProviderFactory; import org.apache.ambari.server.controller.predicate.AndPredicate; @@ -59,7 +60,6 @@ import org.springframework.security.core.context.SecurityContextHolder; import com.google.common.collect.Sets; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.inject.persist.PersistService; /** * Tests the VersionDefinitionResourceProvider class @@ -89,7 +89,7 @@ public class VersionDefinitionResourceProviderTest { @After public void after() throws Exception { - injector.getInstance(PersistService.class).stop(); + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); } @Test http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LogSearchDataRetrievalServiceTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LogSearchDataRetrievalServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LogSearchDataRetrievalServiceTest.java index 4296004..d60596b 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LogSearchDataRetrievalServiceTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LogSearchDataRetrievalServiceTest.java @@ -28,7 +28,6 @@ import java.util.Collections; import java.util.Set; import java.util.concurrent.Executor; - import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.controller.AmbariManagementController; import org.easymock.EasyMockSupport; http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java index 410e2f1..8455484 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java @@ -25,12 +25,15 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import java.lang.reflect.Field; +import java.sql.SQLException; import java.util.Collections; 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.configuration.Configuration; import org.apache.ambari.server.controller.AmbariManagementController; import org.apache.ambari.server.controller.AmbariServer; @@ -61,6 +64,7 @@ import org.apache.ambari.server.state.stack.MetricDefinition; import org.apache.ambari.server.utils.SynchronousThreadPoolExecutor; import org.easymock.EasyMock; import org.junit.After; +import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -146,6 +150,11 @@ public class RestMetricsPropertyProviderTest { replay(amc, configHelperMock); } + @AfterClass + public static void after() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); + } + private RestMetricsPropertyProvider createRestMetricsPropertyProvider(MetricDefinition metricDefinition, HashMap<String, Map<String, PropertyInfo>> componentMetrics, StreamProvider streamProvider, TestMetricsHostProvider metricsHostProvider) throws Exception { http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/controller/utilities/DatabaseCheckerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/utilities/DatabaseCheckerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/utilities/DatabaseCheckerTest.java index f148da1..3f73657 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/utilities/DatabaseCheckerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/utilities/DatabaseCheckerTest.java @@ -23,7 +23,10 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.junit.Assert.fail; +import java.sql.SQLException; + 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.orm.GuiceJpaInitializer; @@ -60,7 +63,8 @@ public class DatabaseCheckerTest { } @After - public void teardown() throws AmbariException { + public void teardown() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); } @Ignore http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/controller/utilities/state/GeneralServiceCalculatedStateTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/utilities/state/GeneralServiceCalculatedStateTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/utilities/state/GeneralServiceCalculatedStateTest.java index 6374be0..09d5569 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/utilities/state/GeneralServiceCalculatedStateTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/utilities/state/GeneralServiceCalculatedStateTest.java @@ -18,8 +18,11 @@ package org.apache.ambari.server.controller.utilities.state; - import java.util.Map; +import java.sql.SQLException; +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.orm.GuiceJpaInitializer; import org.apache.ambari.server.orm.InMemoryDefaultTestModule; @@ -41,7 +44,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; public abstract class GeneralServiceCalculatedStateTest { @@ -107,8 +109,8 @@ public abstract class GeneralServiceCalculatedStateTest { @After - public void after() { - injector.getInstance(PersistService.class).stop(); + public void after() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); injector = null; } http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/events/EventsTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/events/EventsTest.java b/ambari-server/src/test/java/org/apache/ambari/server/events/EventsTest.java index 79d5569..90ac29f 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/events/EventsTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/events/EventsTest.java @@ -22,6 +22,9 @@ import java.util.List; import java.util.Map; import java.util.UUID; +import javax.persistence.EntityManager; + +import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.events.AmbariEvent.AmbariEventType; import org.apache.ambari.server.orm.GuiceJpaInitializer; import org.apache.ambari.server.orm.InMemoryDefaultTestModule; @@ -52,7 +55,6 @@ import org.junit.Test; import com.google.common.eventbus.EventBus; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.inject.persist.PersistService; import junit.framework.Assert; @@ -127,7 +129,7 @@ public class EventsTest { */ @After public void teardown() throws Exception { - m_injector.getInstance(PersistService.class).stop(); + H2DatabaseCleaner.clearDatabase(m_injector.getProvider(EntityManager.class).get()); m_injector = null; } http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListenerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListenerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListenerTest.java index 5abcb94..978080a 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListenerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListenerTest.java @@ -20,6 +20,7 @@ package org.apache.ambari.server.events.listeners.upgrade; import static org.junit.Assert.assertEquals; +import java.sql.SQLException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -32,6 +33,7 @@ import java.util.Set; import java.util.UUID; import org.apache.ambari.server.AmbariException; +import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.events.ServiceComponentInstalledEvent; import org.apache.ambari.server.events.ServiceComponentUninstalledEvent; import org.apache.ambari.server.events.ServiceInstalledEvent; @@ -63,7 +65,6 @@ import com.google.common.collect.Lists; import com.google.inject.Guice; import com.google.inject.Inject; import com.google.inject.Injector; -import com.google.inject.persist.PersistService; import com.google.inject.persist.UnitOfWork; public class HostVersionOutOfSyncListenerTest { @@ -109,8 +110,8 @@ public class HostVersionOutOfSyncListenerTest { } @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/metadata/AgentAlertDefinitionsTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/metadata/AgentAlertDefinitionsTest.java b/ambari-server/src/test/java/org/apache/ambari/server/metadata/AgentAlertDefinitionsTest.java index 970ceb9..cbc5e69 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/metadata/AgentAlertDefinitionsTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/metadata/AgentAlertDefinitionsTest.java @@ -19,9 +19,14 @@ package org.apache.ambari.server.metadata; import java.util.List; +import javax.persistence.EntityManager; + +import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.controller.RootServiceResponseFactory.Components; +import org.apache.ambari.server.orm.GuiceJpaInitializer; import org.apache.ambari.server.orm.InMemoryDefaultTestModule; import org.apache.ambari.server.state.alert.AlertDefinition; +import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -40,6 +45,12 @@ public class AgentAlertDefinitionsTest { @Before public void before() { m_injector = Guice.createInjector(new InMemoryDefaultTestModule()); + m_injector.getInstance(GuiceJpaInitializer.class); + } + + @After + public void tearDown() throws Exception { + H2DatabaseCleaner.clearDatabase(m_injector.getProvider(EntityManager.class).get()); } /** http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/metadata/RoleCommandOrderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/metadata/RoleCommandOrderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/metadata/RoleCommandOrderTest.java index 023d8fe..2f201c4 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/metadata/RoleCommandOrderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/metadata/RoleCommandOrderTest.java @@ -29,6 +29,7 @@ import static org.easymock.EasyMock.verify; import java.io.IOException; import java.io.InputStream; +import java.sql.SQLException; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; @@ -39,6 +40,7 @@ import java.util.Set; import java.util.regex.Pattern; 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.orm.GuiceJpaInitializer; @@ -60,7 +62,6 @@ import org.junit.Test; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.inject.persist.PersistService; import junit.framework.Assert; @@ -79,8 +80,8 @@ public class RoleCommandOrderTest { } @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/metadata/RoleGraphTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/metadata/RoleGraphTest.java b/ambari-server/src/test/java/org/apache/ambari/server/metadata/RoleGraphTest.java index 4f1432d..303ee89 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/metadata/RoleGraphTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/metadata/RoleGraphTest.java @@ -22,11 +22,13 @@ package org.apache.ambari.server.metadata; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import java.sql.SQLException; 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.Role; import org.apache.ambari.server.RoleCommand; import org.apache.ambari.server.actionmanager.HostRoleCommand; @@ -47,7 +49,6 @@ import org.junit.Test; import com.google.common.collect.Lists; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.inject.persist.PersistService; import junit.framework.Assert; @@ -68,8 +69,8 @@ public class RoleGraphTest { } @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/orm/DBAccessorImplTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/DBAccessorImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/DBAccessorImplTest.java index 9dcaeef..9522259 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/DBAccessorImplTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/DBAccessorImplTest.java @@ -37,10 +37,12 @@ import java.util.Map; import java.util.Vector; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.orm.DBAccessor.DBColumnInfo; import org.eclipse.persistence.sessions.DatabaseSession; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -61,11 +63,12 @@ public class DBAccessorImplTest { @Before public void setUp() throws Exception { injector = Guice.createInjector(new InMemoryDefaultTestModule()); + injector.getInstance(GuiceJpaInitializer.class); } @After public void tearDown() throws Exception { - + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); } private static String getFreeTableName() { @@ -90,10 +93,11 @@ public class DBAccessorImplTest { @Test public void testDbType() throws Exception { DBAccessorImpl dbAccessor = injector.getInstance(DBAccessorImpl.class); - assertEquals(DBAccessor.DbType.DERBY, dbAccessor.getDbType()); + assertEquals(DBAccessor.DbType.H2, dbAccessor.getDbType()); } @Test + @Ignore public void testAlterColumn() throws Exception { String tableName = getFreeTableName(); createMyTable(tableName); @@ -123,21 +127,21 @@ public class DBAccessorImplTest { rs.close(); // 2 - VARACHAR --> CLOB - toColumn = new DBColumnInfo("name", char[].class, 999, null, true); + toColumn = new DBColumnInfo("name", java.sql.Clob.class, 999, null, true); dbAccessor.alterColumn(tableName, toColumn); rs = statement.executeQuery( String.format("SELECT name FROM %s", tableName)); while (rs.next()) { ResultSetMetaData rsm = rs.getMetaData(); Clob clob = rs.getClob(toColumn.getName()); - assertEquals(clob.getSubString(1, (int) clob.length()), dataString); - assertEquals(rsm.getColumnTypeName(1), "CLOB"); - assertEquals(rsm.getColumnDisplaySize(1), 999); + assertEquals(dataString, clob.getSubString(1, (int) clob.length())); + assertEquals("CLOB", rsm.getColumnTypeName(1)); + //size not supported for CLOB in H2 } rs.close(); // 3 - BLOB --> CLOB - toColumn = new DBColumnInfo("name_blob_to_clob", char[].class, 567, null, + toColumn = new DBColumnInfo("name_blob_to_clob", java.sql.Clob.class, 567, null, true); fromColumn = new DBColumnInfo("name_blob_to_clob", byte[].class, 20000, null, true); @@ -239,7 +243,7 @@ public class DBAccessorImplTest { exception.expect(SQLException.class); exception.expectMessage(containsString("MYFKCONSTRAINT")); - dbAccessor.dropTable(tableName); + dbAccessor.executeQuery("DELETE FROM " + tableName); } @Test http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/orm/JdbcPropertyTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/JdbcPropertyTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/JdbcPropertyTest.java index 20c0388..873c182 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/JdbcPropertyTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/JdbcPropertyTest.java @@ -19,6 +19,7 @@ package org.apache.ambari.server.orm; import java.util.Properties; +import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.audit.AuditLoggerModule; import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.controller.ControllerModule; @@ -30,7 +31,6 @@ import org.junit.Test; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.inject.persist.PersistService; public class JdbcPropertyTest { Properties properties; @@ -48,7 +48,7 @@ public class JdbcPropertyTest { @After public void tearDown() throws Exception { - injector.getInstance(PersistService.class).stop(); + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); } @Test http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java index ead0a2d..ac8c8de 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java @@ -33,6 +33,7 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.UUID; +import java.util.concurrent.atomic.AtomicInteger; import javax.persistence.EntityManager; @@ -90,6 +91,8 @@ import org.apache.ambari.server.state.State; import org.apache.ambari.server.state.alert.Scope; import org.apache.ambari.server.state.alert.SourceType; import org.apache.ambari.server.state.cluster.ClustersImpl; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.security.crypto.password.PasswordEncoder; import com.google.inject.Inject; @@ -103,6 +106,10 @@ import junit.framework.Assert; @Singleton public class OrmTestHelper { + private static Logger LOG = LoggerFactory.getLogger(OrmTestHelper.class); + + private AtomicInteger uniqueCounter = new AtomicInteger(); + @Inject public Provider<EntityManager> entityManagerProvider; @@ -559,7 +566,7 @@ public class OrmTestHelper { Set<AlertTargetEntity> targets) throws Exception { AlertGroupEntity group = new AlertGroupEntity(); group.setDefault(false); - group.setGroupName("Group Name " + System.currentTimeMillis()); + group.setGroupName("Group Name " + System.currentTimeMillis() + uniqueCounter.incrementAndGet()); group.setClusterId(clusterId); group.setAlertTargets(targets); @@ -620,8 +627,9 @@ public class OrmTestHelper { if (repositoryVersion == null) { try { repositoryVersion = repositoryVersionDAO.create(stackEntity, version, - String.valueOf(System.currentTimeMillis()), ""); + String.valueOf(System.currentTimeMillis()) + uniqueCounter.incrementAndGet(), ""); } catch (Exception ex) { + LOG.error("Caught exception", ex); Assert.fail(MessageFormat.format("Unable to create Repo Version for Stack {0} and version {1}", stackEntity.getStackName() + "-" + stackEntity.getStackVersion(), version)); } http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/orm/TestOrmImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/TestOrmImpl.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/TestOrmImpl.java index 48fbbac..5334c51 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/TestOrmImpl.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/TestOrmImpl.java @@ -18,6 +18,7 @@ package org.apache.ambari.server.orm; +import java.sql.SQLException; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; @@ -26,6 +27,8 @@ import java.util.List; import javax.persistence.EntityManager; import javax.persistence.RollbackException; +import org.apache.ambari.server.AmbariException; +import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.Role; import org.apache.ambari.server.actionmanager.HostRoleStatus; import org.apache.ambari.server.api.services.AmbariMetaInfo; @@ -57,7 +60,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 TestOrmImpl extends Assert { private static final Logger log = LoggerFactory.getLogger(TestOrmImpl.class); @@ -95,8 +97,8 @@ public class TestOrmImpl extends Assert { } @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/orm/dao/AlertDefinitionDAOTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertDefinitionDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertDefinitionDAOTest.java index b5ef209..5b31c78 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertDefinitionDAOTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertDefinitionDAOTest.java @@ -30,6 +30,7 @@ import java.util.List; import java.util.TimeZone; import java.util.UUID; +import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.controller.RootServiceResponseFactory; import org.apache.ambari.server.orm.GuiceJpaInitializer; import org.apache.ambari.server.orm.InMemoryDefaultTestModule; @@ -53,7 +54,6 @@ import org.junit.Test; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.inject.persist.PersistService; import com.google.inject.persist.UnitOfWork; import junit.framework.Assert; @@ -161,10 +161,10 @@ public class AlertDefinitionDAOTest { } @After - public void teardown() { + public void teardown() throws Exception { injector.getInstance(UnitOfWork.class).end(); - injector.getInstance(PersistService.class).stop(); + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); injector = null; } http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertDispatchDAOTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertDispatchDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertDispatchDAOTest.java index ed4a196..1ec6d40 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertDispatchDAOTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertDispatchDAOTest.java @@ -32,7 +32,10 @@ import java.util.List; import java.util.Set; import java.util.UUID; +import javax.persistence.EntityManager; + import org.apache.ambari.server.AmbariException; +import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.controller.AlertNoticeRequest; import org.apache.ambari.server.controller.internal.AlertNoticeResourceProvider; import org.apache.ambari.server.controller.internal.PageRequestImpl; @@ -68,7 +71,6 @@ import org.junit.Test; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.inject.persist.PersistService; import com.google.inject.persist.UnitOfWork; /** @@ -125,7 +127,7 @@ public class AlertDispatchDAOTest { @After public void teardown() throws Exception { m_injector.getInstance(UnitOfWork.class).end(); - m_injector.getInstance(PersistService.class).stop(); + H2DatabaseCleaner.clearDatabase(m_injector.getProvider(EntityManager.class).get()); } private void initTestData() throws Exception { http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertsDAOTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertsDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertsDAOTest.java index 94f54d6..346d0b5 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertsDAOTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertsDAOTest.java @@ -33,6 +33,9 @@ import java.util.Map; import java.util.TimeZone; import java.util.UUID; +import javax.persistence.EntityManager; + +import org.apache.ambari.server.H2DatabaseCleaner; import org.apache.ambari.server.controller.AlertCurrentRequest; import org.apache.ambari.server.controller.AlertHistoryRequest; import org.apache.ambari.server.controller.internal.AlertHistoryResourceProvider; @@ -71,7 +74,6 @@ import org.junit.Test; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.inject.persist.PersistService; import com.google.inject.persist.UnitOfWork; /** @@ -197,9 +199,9 @@ public class AlertsDAOTest { * */ @After - public void teardown() { + public void teardown() throws Exception { m_injector.getInstance(UnitOfWork.class).end(); - m_injector.getInstance(PersistService.class).stop(); + H2DatabaseCleaner.clearDatabase(m_injector.getProvider(EntityManager.class).get()); m_injector = null; } http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ClusterVersionDAOTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ClusterVersionDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ClusterVersionDAOTest.java index 2e0c232..81fa8e1 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ClusterVersionDAOTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ClusterVersionDAOTest.java @@ -18,6 +18,10 @@ package org.apache.ambari.server.orm.dao; +import java.sql.SQLException; + +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.apache.ambari.server.orm.OrmTestHelper; @@ -32,7 +36,6 @@ import org.junit.Test; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.inject.persist.PersistService; /** * ClusterVersionDAO unit tests. @@ -63,10 +66,11 @@ public class ClusterVersionDAOTest { @Before public void before() { injector = Guice.createInjector(new InMemoryDefaultTestModule()); + injector.getInstance(GuiceJpaInitializer.class); + clusterVersionDAO = injector.getInstance(ClusterVersionDAO.class); clusterDAO = injector.getInstance(ClusterDAO.class); helper = injector.getInstance(OrmTestHelper.class); - injector.getInstance(GuiceJpaInitializer.class); } /** @@ -253,8 +257,8 @@ public class ClusterVersionDAOTest { } @After - public void after() { - injector.getInstance(PersistService.class).stop(); + public void after() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); injector = null; } } http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ConfigGroupDAOTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ConfigGroupDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ConfigGroupDAOTest.java index c73843f..a42aa63 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ConfigGroupDAOTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ConfigGroupDAOTest.java @@ -17,12 +17,14 @@ */ package org.apache.ambari.server.orm.dao; +import java.sql.SQLException; import java.util.ArrayList; import java.util.Arrays; 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; @@ -43,7 +45,6 @@ import org.junit.Test; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.inject.persist.PersistService; import junit.framework.Assert; @@ -79,8 +80,8 @@ public class ConfigGroupDAOTest { } @After - public void teardown() throws AmbariException { - injector.getInstance(PersistService.class).stop(); + public void teardown() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); } private ConfigGroupEntity createConfigGroup(String clusterName, @@ -153,9 +154,11 @@ public class ConfigGroupDAOTest { ConfigGroupEntity configGroupEntity = createConfigGroup("c1", "hdfs-1", "HDFS", "some description", null, null); + Long clusterId = clusterDAO.findByName("c1").getClusterId(); + Assert.assertNotNull(configGroupEntity); Assert.assertEquals("c1", configGroupEntity.getClusterEntity().getClusterName()); - Assert.assertEquals(Long.valueOf(1), configGroupEntity.getClusterEntity() + Assert.assertEquals(clusterId, configGroupEntity.getClusterEntity() .getClusterId()); Assert.assertEquals("hdfs-1", configGroupEntity.getGroupName()); Assert.assertEquals("HDFS", configGroupEntity.getTag()); @@ -169,11 +172,13 @@ public class ConfigGroupDAOTest { List<ConfigGroupEntity> configGroupEntities = configGroupDAO.findAllByTag ("HDFS"); + Long clusterId = clusterDAO.findByName("c1").getClusterId(); + Assert.assertNotNull(configGroupEntities); ConfigGroupEntity configGroupEntity = configGroupEntities.get(0); Assert.assertNotNull(configGroupEntity); Assert.assertEquals("c1", configGroupEntity.getClusterEntity().getClusterName()); - Assert.assertEquals(Long.valueOf(1), configGroupEntity.getClusterEntity() + Assert.assertEquals(clusterId, configGroupEntity.getClusterEntity() .getClusterId()); Assert.assertEquals("hdfs-1", configGroupEntity.getGroupName()); Assert.assertEquals("HDFS", configGroupEntity.getTag()); @@ -186,9 +191,11 @@ public class ConfigGroupDAOTest { ConfigGroupEntity configGroupEntity = configGroupDAO.findByName("hdfs-1"); + Long clusterId = clusterDAO.findByName("c1").getClusterId(); + Assert.assertNotNull(configGroupEntity); Assert.assertEquals("c1", configGroupEntity.getClusterEntity().getClusterName()); - Assert.assertEquals(Long.valueOf(1), configGroupEntity.getClusterEntity() + Assert.assertEquals(clusterId, configGroupEntity.getClusterEntity() .getClusterId()); Assert.assertEquals("hdfs-1", configGroupEntity.getGroupName()); Assert.assertEquals("HDFS", configGroupEntity.getTag()); http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/CrudDAOTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/CrudDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/CrudDAOTest.java index ac6ef63..af54653 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/CrudDAOTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/CrudDAOTest.java @@ -18,6 +18,10 @@ package org.apache.ambari.server.orm.dao; +import java.sql.SQLException; + +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; @@ -31,7 +35,6 @@ import org.junit.Test; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.inject.persist.PersistService; /** * CrudDAO unit tests. @@ -53,6 +56,7 @@ public class CrudDAOTest { injector = Guice.createInjector(new InMemoryDefaultTestModule()); stackDAO = injector.getInstance(StackDAO.class); repositoryVersionDAO = injector.getInstance(RepositoryVersionDAO.class); + H2DatabaseCleaner.resetSequences(injector); injector.getInstance(GuiceJpaInitializer.class); // required to populate stacks into the database @@ -120,8 +124,7 @@ public class CrudDAOTest { } @After - public void after() { - injector.getInstance(PersistService.class).stop(); - injector = null; + public void after() 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/orm/dao/HostConfigMappingDAOTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostConfigMappingDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostConfigMappingDAOTest.java index 6b482b4..2239835 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostConfigMappingDAOTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostConfigMappingDAOTest.java @@ -17,9 +17,11 @@ */ package org.apache.ambari.server.orm.dao; +import java.sql.SQLException; 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.apache.ambari.server.orm.cache.HostConfigMapping; @@ -32,7 +34,6 @@ import org.junit.Test; 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; @@ -59,8 +60,8 @@ public class HostConfigMappingDAOTest { } @After - public void teardown() throws AmbariException { - injector.getInstance(PersistService.class).stop(); + public void teardown() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); } private HostConfigMapping createEntity(long clusterId, String hostName, String type, String version) throws Exception { http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostRoleCommandDAOTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostRoleCommandDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostRoleCommandDAOTest.java index ba96353..d5fa793 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostRoleCommandDAOTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostRoleCommandDAOTest.java @@ -17,11 +17,15 @@ */ package org.apache.ambari.server.orm.dao; +import java.sql.SQLException; import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicLong; +import javax.persistence.EntityManager; + 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; @@ -40,7 +44,6 @@ import org.junit.Test; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.inject.persist.PersistService; import junit.framework.Assert; @@ -70,8 +73,8 @@ public class HostRoleCommandDAOTest { } @After - public void teardown() throws AmbariException { - m_injector.getInstance(PersistService.class).stop(); + public void teardown() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabase(m_injector.getProvider(EntityManager.class).get()); } /** http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostVersionDAOTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostVersionDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostVersionDAOTest.java index e2f01a4..6219a69 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostVersionDAOTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostVersionDAOTest.java @@ -18,10 +18,13 @@ package org.apache.ambari.server.orm.dao; +import java.sql.SQLException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +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; @@ -44,7 +47,6 @@ import org.junit.Test; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.inject.persist.PersistService; /** @@ -71,6 +73,7 @@ public class HostVersionDAOTest { @Before public void before() { injector = Guice.createInjector(new InMemoryDefaultTestModule()); + H2DatabaseCleaner.resetSequences(injector); injector.getInstance(GuiceJpaInitializer.class); resourceTypeDAO = injector.getInstance(ResourceTypeDAO.class); @@ -359,8 +362,8 @@ public class HostVersionDAOTest { } @After - public void after() { - injector.getInstance(PersistService.class).stop(); + public void after() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); injector = null; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAOTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAOTest.java index 6f6f05b..c7414bc 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAOTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RepositoryVersionDAOTest.java @@ -18,9 +18,11 @@ package org.apache.ambari.server.orm.dao; +import java.sql.SQLException; import java.util.UUID; 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 +40,6 @@ import org.junit.Test; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.inject.persist.PersistService; /** * RepositoryVersionDAO unit tests. @@ -234,8 +235,8 @@ public class RepositoryVersionDAOTest { } @After - public void after() { - injector.getInstance(PersistService.class).stop(); + public void after() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); injector = null; } } http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RequestDAOTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RequestDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RequestDAOTest.java index 384ef31..246c056 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RequestDAOTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RequestDAOTest.java @@ -17,6 +17,7 @@ */ package org.apache.ambari.server.orm.dao; +import java.sql.SQLException; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; @@ -25,6 +26,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.Role; import org.apache.ambari.server.RoleCommand; import org.apache.ambari.server.actionmanager.HostRoleStatus; @@ -48,7 +50,6 @@ import org.junit.Test; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.inject.persist.PersistService; /** * RequestDAO unit tests @@ -76,8 +77,8 @@ public class RequestDAOTest { } @After - public void teardown() throws AmbariException { - 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/orm/dao/RequestScheduleDAOTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RequestScheduleDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RequestScheduleDAOTest.java index daf9d5e..39f5245 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RequestScheduleDAOTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/RequestScheduleDAOTest.java @@ -17,9 +17,11 @@ */ package org.apache.ambari.server.orm.dao; +import java.sql.SQLException; import java.util.List; 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 +40,6 @@ import org.junit.Test; import com.google.inject.Guice; import com.google.inject.Injector; -import com.google.inject.persist.PersistService; import junit.framework.Assert; @@ -70,8 +71,8 @@ public class RequestScheduleDAOTest { } @After - public void teardown() throws AmbariException { - injector.getInstance(PersistService.class).stop(); + public void teardown() throws AmbariException, SQLException { + H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector); } private RequestScheduleEntity createScheduleEntity() {