You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mp...@apache.org on 2017/02/01 15:05:41 UTC
[1/4] ambari git commit: AMBARI-19799. Optimize DB initialization for
Ambari Server Unit Tests. (mpapirkovskyy)
Repository: ambari
Updated Branches:
refs/heads/trunk 727a31875 -> 3a7906c84
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersTest.java
index 974b49a..5b54af4 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersTest.java
@@ -23,6 +23,7 @@ import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
import static org.junit.Assert.fail;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -39,6 +40,7 @@ import javax.persistence.EntityManager;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.ClusterNotFoundException;
import org.apache.ambari.server.DuplicateResourceException;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.HostNotFoundException;
import org.apache.ambari.server.agent.AgentEnv;
import org.apache.ambari.server.agent.HostInfo;
@@ -86,7 +88,6 @@ import com.google.common.collect.Maps;
import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.Injector;
-import com.google.inject.persist.PersistService;
import junit.framework.Assert;
@@ -115,8 +116,8 @@ public class ClustersTest {
}
@After
- public void teardown() {
- injector.getInstance(PersistService.class).stop();
+ public void teardown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
private void setOsFamily(Host host, String osFamily, String osVersion) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ConcurrentServiceConfigVersionTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ConcurrentServiceConfigVersionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ConcurrentServiceConfigVersionTest.java
index 2500a16..8b56004 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ConcurrentServiceConfigVersionTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ConcurrentServiceConfigVersionTest.java
@@ -18,12 +18,14 @@
package org.apache.ambari.server.state.cluster;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.ServiceComponentNotFoundException;
import org.apache.ambari.server.ServiceNotFoundException;
import org.apache.ambari.server.controller.ServiceConfigVersionResponse;
@@ -55,7 +57,6 @@ import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Module;
-import com.google.inject.persist.PersistService;
import com.google.inject.util.Modules;
/**
@@ -126,8 +127,8 @@ public class ConcurrentServiceConfigVersionTest {
}
@After
- public void teardown() {
- injector.getInstance(PersistService.class).stop();
+ public void teardown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ServiceComponentHostConcurrentWriteDeadlockTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ServiceComponentHostConcurrentWriteDeadlockTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ServiceComponentHostConcurrentWriteDeadlockTest.java
index 96dbf26..eecf347 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ServiceComponentHostConcurrentWriteDeadlockTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ServiceComponentHostConcurrentWriteDeadlockTest.java
@@ -18,6 +18,7 @@
package org.apache.ambari.server.state.cluster;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -26,6 +27,7 @@ import java.util.List;
import java.util.Map;
import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.ServiceComponentNotFoundException;
import org.apache.ambari.server.ServiceNotFoundException;
import org.apache.ambari.server.events.listeners.upgrade.HostVersionOutOfSyncListener;
@@ -58,7 +60,6 @@ import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Module;
-import com.google.inject.persist.PersistService;
import com.google.inject.util.Modules;
/**
@@ -132,8 +133,8 @@ public class ServiceComponentHostConcurrentWriteDeadlockTest {
}
@After
- public void teardown() {
- injector.getInstance(PersistService.class).stop();
+ public void teardown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/state/host/HostTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/host/HostTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/host/HostTest.java
index 5c8d174..d418a80 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/host/HostTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/host/HostTest.java
@@ -23,12 +23,14 @@ import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.mock;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.actionmanager.ActionManager;
import org.apache.ambari.server.agent.ActionQueue;
import org.apache.ambari.server.agent.AgentEnv;
@@ -64,7 +66,6 @@ import org.junit.Test;
import com.google.inject.Guice;
import com.google.inject.Injector;
-import com.google.inject.persist.PersistService;
public class HostTest {
@@ -84,8 +85,8 @@ public class HostTest {
}
@After
- public void teardown() throws AmbariException {
- injector.getInstance(PersistService.class).stop();
+ public void teardown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
@Test
@@ -369,7 +370,6 @@ public class HostTest {
c1.createClusterVersion(stackId, stackId.getStackVersion(), "admin",
RepositoryVersionState.INSTALLING);
Assert.assertEquals("c1", c1.getClusterName());
- Assert.assertEquals(1, c1.getClusterId());
clusters.addHost("h1");
Host host = clusters.getHost("h1");
host.setIPv4("ipv4");
@@ -425,7 +425,6 @@ public class HostTest {
clusters.addCluster("c1", stackId);
Cluster c1 = clusters.getCluster("c1");
Assert.assertEquals("c1", c1.getClusterName());
- Assert.assertEquals(1, c1.getClusterId());
clusters.addHost("h1");
Host host = clusters.getHost("h1");
host.setIPv4("ipv4");
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/state/services/RetryUpgradeActionServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/services/RetryUpgradeActionServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/services/RetryUpgradeActionServiceTest.java
index 7dd9932..ed95b0b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/services/RetryUpgradeActionServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/services/RetryUpgradeActionServiceTest.java
@@ -17,12 +17,14 @@
*/
package org.apache.ambari.server.state.services;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.Role;
import org.apache.ambari.server.RoleCommand;
import org.apache.ambari.server.actionmanager.HostRoleStatus;
@@ -47,6 +49,7 @@ import org.apache.ambari.server.state.RepositoryVersionState;
import org.apache.ambari.server.state.StackId;
import org.apache.ambari.server.state.stack.upgrade.Direction;
import org.apache.ambari.server.state.stack.upgrade.UpgradeType;
+import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -93,6 +96,11 @@ public class RetryUpgradeActionServiceTest {
helper = injector.getInstance(OrmTestHelper.class);
}
+ @After
+ public void teardown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
+ }
+
/**
* Test the gauva service allows retrying certain failed actions during a stack upgrade.
* Case 1: No cluster => no-op
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/state/stack/ConfigUpgradePackTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/ConfigUpgradePackTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/ConfigUpgradePackTest.java
index 52603d0..d6fdb7f 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/ConfigUpgradePackTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/ConfigUpgradePackTest.java
@@ -23,9 +23,12 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Map;
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.orm.GuiceJpaInitializer;
import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
@@ -38,7 +41,6 @@ import org.junit.experimental.categories.Category;
import com.google.inject.Guice;
import com.google.inject.Injector;
-import com.google.inject.persist.PersistService;
/**
* Tests for the config upgrade pack
@@ -58,8 +60,8 @@ public class ConfigUpgradePackTest {
}
@After
- public void teardown() {
- injector.getInstance(PersistService.class).stop();
+ public void teardown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
@Test
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/state/stack/ConfigUpgradeValidityTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/ConfigUpgradeValidityTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/ConfigUpgradeValidityTest.java
index ee1b05e..44f72bd 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/ConfigUpgradeValidityTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/ConfigUpgradeValidityTest.java
@@ -18,11 +18,14 @@
package org.apache.ambari.server.state.stack;
import java.io.File;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.configuration.Configuration;
import org.apache.ambari.server.controller.internal.UpgradeResourceProvider.ConfigurationPackBuilder;
@@ -51,7 +54,6 @@ import org.slf4j.LoggerFactory;
import com.google.inject.Guice;
import com.google.inject.Injector;
-import com.google.inject.persist.PersistService;
import junit.framework.Assert;
@@ -86,8 +88,8 @@ public class ConfigUpgradeValidityTest {
}
@After
- public void teardown() {
- injector.getInstance(PersistService.class).stop();
+ public void teardown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/state/stack/OSFamilyTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/OSFamilyTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/OSFamilyTest.java
index 99de92d..8ffc594 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/OSFamilyTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/OSFamilyTest.java
@@ -19,13 +19,18 @@ package org.apache.ambari.server.state.stack;
import java.lang.reflect.Method;
+import java.sql.SQLException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.H2DatabaseCleaner;
+import org.apache.ambari.server.orm.GuiceJpaInitializer;
import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -44,10 +49,15 @@ public class OSFamilyTest {
@Before
public void setup() throws Exception {
injector = Guice.createInjector(new InMemoryDefaultTestModule());
-
+ injector.getInstance(GuiceJpaInitializer.class);
os_family = injector.getInstance(OsFamily.class);
}
+ @After
+ public void teardown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
+ }
+
@Test
public void testOSListing() throws Exception{
Set<String> actual_oslist = os_family.os_list();
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/state/stack/UpgradePackTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/UpgradePackTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/UpgradePackTest.java
index 2d9a95f..e628c80 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/stack/UpgradePackTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/stack/UpgradePackTest.java
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import java.sql.SQLException;
import java.util.Arrays;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -31,6 +32,8 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.orm.GuiceJpaInitializer;
import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
@@ -61,7 +64,6 @@ import org.slf4j.LoggerFactory;
import com.google.common.collect.Sets;
import com.google.inject.Guice;
import com.google.inject.Injector;
-import com.google.inject.persist.PersistService;
/**
* Tests for the upgrade pack
@@ -83,8 +85,8 @@ public class UpgradePackTest {
}
@After
- public void teardown() {
- injector.getInstance(PersistService.class).stop();
+ public void teardown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
@Test
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java
index 6bd9a09..854a163 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostTest.java
@@ -18,6 +18,7 @@
package org.apache.ambari.server.state.svccomphost;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -27,6 +28,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.ServiceComponentNotFoundException;
import org.apache.ambari.server.ServiceNotFoundException;
import org.apache.ambari.server.controller.ServiceComponentHostResponse;
@@ -74,7 +76,6 @@ import org.slf4j.LoggerFactory;
import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.Injector;
-import com.google.inject.persist.PersistService;
public class ServiceComponentHostTest {
private static Logger LOG = LoggerFactory.getLogger(ServiceComponentHostTest.class);
@@ -130,8 +131,8 @@ public class ServiceComponentHostTest {
}
@After
- public void teardown() {
- injector.getInstance(PersistService.class).stop();
+ public void teardown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
private ClusterEntity createCluster(StackId stackId, String clusterName) throws AmbariException {
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/upgrade/StackUpgradeUtilTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/StackUpgradeUtilTest.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/StackUpgradeUtilTest.java
index 5435b30..3ebf4e7 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/StackUpgradeUtilTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/StackUpgradeUtilTest.java
@@ -21,6 +21,7 @@ import java.util.Collection;
import java.util.List;
import java.util.Map.Entry;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.orm.GuiceJpaInitializer;
import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
@@ -34,7 +35,6 @@ import org.junit.Test;
import com.google.inject.Guice;
import com.google.inject.Injector;
-import com.google.inject.persist.PersistService;
/**
* Tests the StackUpgradeHelper
@@ -51,7 +51,7 @@ public class StackUpgradeUtilTest {
@After
public void teardown() throws Exception {
- injector.getInstance(PersistService.class).stop();
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
private void reset(String stackName, String stackVersion) throws Exception {
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java
index 87cea1b..729340f 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog200Test.java
@@ -52,6 +52,7 @@ import java.util.Map;
import javax.persistence.EntityManager;
import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.configuration.Configuration;
import org.apache.ambari.server.controller.AmbariManagementController;
@@ -97,7 +98,6 @@ import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Module;
import com.google.inject.Provider;
-import com.google.inject.persist.PersistService;
/**
* {@link UpgradeCatalog200} unit tests.
@@ -125,8 +125,8 @@ public class UpgradeCatalog200Test {
}
@After
- public void tearDown() {
- injector.getInstance(PersistService.class).stop();
+ public void tearDown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
@Test
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog210Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog210Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog210Test.java
index 7106021..0d4eb43 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog210Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog210Test.java
@@ -52,6 +52,7 @@ import java.util.Set;
import javax.persistence.EntityManager;
import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.configuration.Configuration;
import org.apache.ambari.server.controller.AmbariManagementController;
@@ -98,7 +99,6 @@ import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Module;
import com.google.inject.Provider;
-import com.google.inject.persist.PersistService;
/**
* {@link org.apache.ambari.server.upgrade.UpgradeCatalog210} unit tests.
@@ -125,8 +125,8 @@ public class UpgradeCatalog210Test {
desiredStackEntity = stackDAO.find("HDP", "2.2.0");
}
- public void tearDown() {
- injector.getInstance(PersistService.class).stop();
+ public void tearDown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
@Test
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121Test.java
index 8f0f66b..7ae3f42 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121Test.java
@@ -28,6 +28,7 @@ import static org.easymock.EasyMock.reset;
import static org.easymock.EasyMock.verify;
import java.lang.reflect.Method;
+import java.sql.SQLException;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -35,6 +36,8 @@ import java.util.Set;
import javax.persistence.EntityManager;
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.controller.AmbariManagementController;
import org.apache.ambari.server.orm.DBAccessor;
@@ -56,7 +59,6 @@ import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Provider;
-import com.google.inject.persist.PersistService;
@PrepareForTest(UpgradeCatalog2121.class)
public class UpgradeCatalog2121Test {
@@ -83,8 +85,8 @@ public class UpgradeCatalog2121Test {
}
@After
- public void tearDown() {
- injector.getInstance(PersistService.class).stop();
+ public void tearDown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
@Test
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java
index d15ca25..3f7bcc8 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java
@@ -43,6 +43,8 @@ import java.util.Map;
import javax.persistence.EntityManager;
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.configuration.Configuration;
import org.apache.ambari.server.controller.AmbariManagementController;
@@ -76,7 +78,6 @@ import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Module;
import com.google.inject.Provider;
-import com.google.inject.persist.PersistService;
/**
* {@link org.apache.ambari.server.upgrade.UpgradeCatalog212} unit tests.
@@ -138,9 +139,9 @@ public class UpgradeCatalog212Test {
}
@After
- public void tearDown() {
+ public void tearDown() throws AmbariException, SQLException {
if (injector != null) {
- injector.getInstance(PersistService.class).stop();
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog220Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog220Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog220Test.java
index e687b10..0160d86 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog220Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog220Test.java
@@ -50,6 +50,7 @@ import java.util.Map;
import javax.persistence.EntityManager;
import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.actionmanager.ActionManager;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.configuration.Configuration;
@@ -111,7 +112,6 @@ import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Module;
import com.google.inject.Provider;
-import com.google.inject.persist.PersistService;
/**
* {@link org.apache.ambari.server.upgrade.UpgradeCatalog220} unit tests.
*/
@@ -148,8 +148,8 @@ public class UpgradeCatalog220Test {
}
@AfterClass
- public static void tearDown() {
- injector.getInstance(PersistService.class).stop();
+ public static void tearDown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
@Test
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog240Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog240Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog240Test.java
index 496a8ef..d1b2eb8 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog240Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog240Test.java
@@ -57,6 +57,7 @@ import java.util.Map;
import javax.persistence.EntityManager;
import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.actionmanager.ActionManager;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.configuration.Configuration;
@@ -119,7 +120,7 @@ import org.easymock.Capture;
import org.easymock.CaptureType;
import org.easymock.EasyMock;
import org.easymock.EasyMockSupport;
-import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -168,8 +169,9 @@ public class UpgradeCatalog240Test {
stackDAO.find("HDP", "2.2.0");
}
- @After
- public void tearDown() {
+ @AfterClass
+ public static void tearDown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
@Test
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog242Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog242Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog242Test.java
index 4c1a27b..0cd4f12f 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog242Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog242Test.java
@@ -43,6 +43,7 @@ import java.util.Set;
import javax.persistence.EntityManager;
import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.configuration.Configuration;
import org.apache.ambari.server.controller.AmbariManagementController;
@@ -82,7 +83,6 @@ import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Module;
import com.google.inject.Provider;
-import com.google.inject.persist.PersistService;
import junit.framework.Assert;
/**
@@ -121,8 +121,8 @@ public class UpgradeCatalog242Test {
}
@After
- public void tearDown() {
- injector.getInstance(PersistService.class).stop();
+ public void tearDown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
@Test
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalogTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalogTest.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalogTest.java
index cca27b1..fa40db9 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalogTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalogTest.java
@@ -22,6 +22,7 @@ import java.util.List;
import java.util.Set;
import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.orm.GuiceJpaInitializer;
import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
@@ -35,7 +36,6 @@ import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.multibindings.Multibinder;
-import com.google.inject.persist.PersistService;
import junit.framework.Assert;
@@ -99,8 +99,8 @@ public class UpgradeCatalogTest {
}
@After
- public void teardown() throws AmbariException {
- injector.getInstance(PersistService.class).stop();
+ public void teardown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
// Clear the authenticated user
SecurityContextHolder.getContext().setAuthentication(null);
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 232e4a9..3f5a884 100644
--- a/pom.xml
+++ b/pom.xml
@@ -393,6 +393,8 @@
<exclude>ambari-metrics/*/target/**</exclude>
<!-- ignore .settings and .project -->
<exclude>ambari-metrics/**/.*/**</exclude>
+ <!-- generated DDL-->
+ <exclude>**/createDDL.jdbc</exclude>
</excludes>
</configuration>
<executions>
[3/4] ambari git commit: AMBARI-19799. Optimize DB initialization for
Ambari Server Unit Tests. (mpapirkovskyy)
Posted by mp...@apache.org.
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() {
[4/4] ambari git commit: AMBARI-19799. Optimize DB initialization for
Ambari Server Unit Tests. (mpapirkovskyy)
Posted by mp...@apache.org.
AMBARI-19799. Optimize DB initialization for Ambari Server Unit Tests. (mpapirkovskyy)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3a7906c8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3a7906c8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3a7906c8
Branch: refs/heads/trunk
Commit: 3a7906c84737511475e718a0da50397b31ef7b52
Parents: 727a318
Author: Myroslav Papirkovskyi <mp...@hortonworks.com>
Authored: Tue Jan 31 17:54:23 2017 +0200
Committer: Myroslav Papirkovskyi <mp...@hortonworks.com>
Committed: Wed Feb 1 16:44:47 2017 +0200
----------------------------------------------------------------------
.gitignore | 1 +
ambari-project/pom.xml | 2 +-
ambari-server/pom.xml | 12 +-
.../ambari/server/agent/HeartBeatHandler.java | 4 +
.../server/configuration/Configuration.java | 40 +++-
.../server/controller/ControllerModule.java | 5 +-
.../apache/ambari/server/orm/DBAccessor.java | 1 +
.../ambari/server/orm/DBAccessorImpl.java | 5 +
.../server/orm/entities/UpgradeEntity.java | 2 +-
.../server/orm/helpers/dbms/H2Helper.java | 74 +++++++
.../src/main/resources/META-INF/persistence.xml | 12 +-
.../apache/ambari/annotations/LockAreaTest.java | 7 +-
.../TransactionalLockInterceptorTest.java | 7 +-
.../apache/ambari/server/H2DatabaseCleaner.java | 124 +++++++++++
.../ambari/server/StateRecoveryManagerTest.java | 6 +-
.../ExecutionCommandWrapperTest.java | 8 +
.../ambari/server/actionmanager/StageTest.java | 11 +-
.../actionmanager/TestActionDBAccessorImpl.java | 8 +-
.../server/actionmanager/TestActionManager.java | 9 +-
.../actionmanager/TestActionScheduler.java | 7 +-
.../TestActionSchedulerThreading.java | 8 +-
.../ambari/server/actionmanager/TestStage.java | 9 +
.../server/agent/HeartbeatProcessorTest.java | 10 +-
.../server/agent/TestHeartbeatHandler.java | 5 +-
.../server/agent/TestHeartbeatMonitor.java | 7 +-
.../server/api/query/JpaSortBuilderTest.java | 7 +
.../server/api/services/AmbariMetaInfoTest.java | 12 +-
.../api/services/PersistKeyValueImplTest.java | 4 +-
.../server/api/services/PersistServiceTest.java | 4 +-
.../configuration/RecoveryConfigHelperTest.java | 4 +-
.../AmbariCustomCommandExecutionHelperTest.java | 7 +-
.../AmbariManagementControllerTest.java | 7 +-
.../server/controller/AmbariServerTest.java | 5 +-
.../BackgroundCustomCommandExecutionTest.java | 7 +-
...hYarnCapacitySchedulerReleaseConfigTest.java | 7 +-
.../RootServiceResponseFactoryTest.java | 9 +
.../internal/ActionResourceProviderTest.java | 7 +-
.../internal/AlertResourceProviderTest.java | 4 +-
.../internal/CalculatedStatusTest.java | 8 +
...ClusterStackVersionResourceProviderTest.java | 214 ++++++++++---------
...leRepositoryVersionResourceProviderTest.java | 8 +-
.../internal/ComponentResourceProviderTest.java | 2 +
.../HostStackVersionResourceProviderTest.java | 8 +-
.../internal/JMXHostProviderTest.java | 8 +-
.../RepositoryVersionResourceProviderTest.java | 8 +-
.../StackArtifactResourceProviderTest.java | 8 +-
.../StackDefinedPropertyProviderTest.java | 4 +-
.../UpgradeResourceProviderHDP22Test.java | 8 +-
.../internal/UpgradeResourceProviderTest.java | 9 +-
.../UpgradeSummaryResourceProviderTest.java | 10 +-
.../internal/UserResourceProviderDBTest.java | 7 +-
.../VersionDefinitionResourceProviderTest.java | 4 +-
.../LogSearchDataRetrievalServiceTest.java | 1 -
.../RestMetricsPropertyProviderTest.java | 9 +
.../utilities/DatabaseCheckerTest.java | 6 +-
.../GeneralServiceCalculatedStateTest.java | 10 +-
.../apache/ambari/server/events/EventsTest.java | 6 +-
.../HostVersionOutOfSyncListenerTest.java | 7 +-
.../metadata/AgentAlertDefinitionsTest.java | 11 +
.../server/metadata/RoleCommandOrderTest.java | 7 +-
.../ambari/server/metadata/RoleGraphTest.java | 7 +-
.../ambari/server/orm/DBAccessorImplTest.java | 20 +-
.../ambari/server/orm/JdbcPropertyTest.java | 4 +-
.../apache/ambari/server/orm/OrmTestHelper.java | 12 +-
.../apache/ambari/server/orm/TestOrmImpl.java | 8 +-
.../server/orm/dao/AlertDefinitionDAOTest.java | 6 +-
.../server/orm/dao/AlertDispatchDAOTest.java | 6 +-
.../ambari/server/orm/dao/AlertsDAOTest.java | 8 +-
.../server/orm/dao/ClusterVersionDAOTest.java | 12 +-
.../server/orm/dao/ConfigGroupDAOTest.java | 19 +-
.../ambari/server/orm/dao/CrudDAOTest.java | 11 +-
.../orm/dao/HostConfigMappingDAOTest.java | 7 +-
.../server/orm/dao/HostRoleCommandDAOTest.java | 9 +-
.../server/orm/dao/HostVersionDAOTest.java | 11 +-
.../orm/dao/RepositoryVersionDAOTest.java | 7 +-
.../ambari/server/orm/dao/RequestDAOTest.java | 7 +-
.../server/orm/dao/RequestScheduleDAOTest.java | 7 +-
.../server/orm/dao/ServiceConfigDAOTest.java | 64 ++++--
.../ambari/server/orm/dao/SettingDAOTest.java | 7 +
.../ambari/server/orm/dao/StageDAOTest.java | 10 +-
.../orm/dao/TopologyLogicalRequestDAOTest.java | 7 +-
.../server/orm/dao/TopologyRequestDAOTest.java | 7 +-
.../ambari/server/orm/dao/UpgradeDAOTest.java | 9 +-
.../ambari/server/orm/dao/WidgetDAOTest.java | 8 +-
.../server/orm/dao/WidgetLayoutDAOTest.java | 8 +-
.../scheduler/ExecutionScheduleManagerTest.java | 4 +-
.../server/security/AmbariLdapUtilsTest.java | 1 -
.../AmbariBasicAuthenticationFilterTest.java | 6 +-
...uthenticationProviderForDNWithSpaceTest.java | 4 +-
.../AmbariLdapAuthenticationProviderTest.java | 4 +-
.../AmbariLocalUserProviderTest.java | 7 +
.../AmbariPamAuthenticationProviderTest.java | 4 +-
.../security/authorization/TestUsers.java | 7 +-
.../security/ldap/LdapPerformanceTest.java | 8 +
.../serveraction/ServerActionExecutorTest.java | 11 +-
.../kerberos/KerberosServerActionTest.java | 2 +-
.../AutoSkipFailedSummaryActionTest.java | 6 +-
.../ComponentVersionCheckActionTest.java | 6 +-
.../upgrades/ConfigureActionTest.java | 6 +-
.../upgrades/UpgradeActionTest.java | 6 +-
.../server/stageplanner/TestStagePlanner.java | 7 +-
.../ambari/server/state/ConfigGroupTest.java | 17 +-
.../ambari/server/state/ConfigHelperTest.java | 7 +-
.../server/state/ConfigMergeHelperTest.java | 8 +-
.../server/state/RequestExecutionTest.java | 4 +-
.../server/state/ServiceComponentTest.java | 7 +-
.../apache/ambari/server/state/ServiceTest.java | 7 +-
.../ambari/server/state/UpgradeHelperTest.java | 9 +-
.../alerts/AggregateAlertListenerTest.java | 6 +-
.../state/alerts/AlertEventPublisherTest.java | 22 +-
.../state/alerts/AlertReceivedListenerTest.java | 10 +-
.../alerts/AlertStateChangedEventTest.java | 4 +-
.../state/alerts/InitialAlertEventTest.java | 6 +-
.../state/cluster/AlertDataManagerTest.java | 10 +-
.../state/cluster/ClusterDeadlockTest.java | 7 +-
.../server/state/cluster/ClusterImplTest.java | 11 +-
.../server/state/cluster/ClusterTest.java | 15 +-
.../state/cluster/ClustersDeadlockTest.java | 7 +-
.../server/state/cluster/ClustersTest.java | 7 +-
.../ConcurrentServiceConfigVersionTest.java | 7 +-
...omponentHostConcurrentWriteDeadlockTest.java | 7 +-
.../ambari/server/state/host/HostTest.java | 9 +-
.../services/RetryUpgradeActionServiceTest.java | 8 +
.../state/stack/ConfigUpgradePackTest.java | 8 +-
.../state/stack/ConfigUpgradeValidityTest.java | 8 +-
.../ambari/server/state/stack/OSFamilyTest.java | 12 +-
.../server/state/stack/UpgradePackTest.java | 8 +-
.../svccomphost/ServiceComponentHostTest.java | 7 +-
.../server/upgrade/StackUpgradeUtilTest.java | 4 +-
.../server/upgrade/UpgradeCatalog200Test.java | 6 +-
.../server/upgrade/UpgradeCatalog210Test.java | 6 +-
.../server/upgrade/UpgradeCatalog2121Test.java | 8 +-
.../server/upgrade/UpgradeCatalog212Test.java | 7 +-
.../server/upgrade/UpgradeCatalog220Test.java | 6 +-
.../server/upgrade/UpgradeCatalog240Test.java | 8 +-
.../server/upgrade/UpgradeCatalog242Test.java | 6 +-
.../server/upgrade/UpgradeCatalogTest.java | 6 +-
pom.xml | 2 +
138 files changed, 1029 insertions(+), 469 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 43edfd9..a40e61a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ ambari-metrics/ambari-metrics-host-monitoring/src/main/python/psutil/build/
rebel.xml
rebel-remote.xml
out
+createDDL.jdbc
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-project/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml
index 0eab275..6e8ef0e 100644
--- a/ambari-project/pom.xml
+++ b/ambari-project/pom.xml
@@ -553,7 +553,7 @@
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<forkedProcessTimeoutInSeconds>900</forkedProcessTimeoutInSeconds>
<reuseForks>false</reuseForks>
- <forkCount>1C</forkCount>
+ <forkCount>1</forkCount>
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 90c6b61..a9518e1 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -272,7 +272,6 @@
<configuration>
<excludes>
<exclude>pass.txt</exclude>
- <exclude>derby.log</exclude>
<exclude>src/test/resources/version</exclude>
<exclude>src/test/resources/users.ldif</exclude>
<exclude>src/test/resources/gsInstaller-hosts.txt</exclude>
@@ -1066,14 +1065,9 @@
<version>3.0</version>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>10.11.1.1</version>
- <scope>test</scope>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>1.4.193</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
index b7d7476..7c833f6 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
@@ -664,4 +664,8 @@ public class HeartBeatHandler {
}
}
+ public void stop() {
+ heartbeatMonitor.shutdown();
+ heartbeatProcessor.stopAsync();
+ }
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index 0c51576..5020790 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -237,17 +237,36 @@ public class Configuration {
public static final String DEFAULT_DERBY_SCHEMA = "ambari";
/**
- * The JDBC URL to use when creating a {@link DatabaseType#DERBY} database for
+ * The schema to use when creating a {@link DatabaseType#H2} database for
+ * unit tests.
+ */
+ public static final String DEFAULT_H2_SCHEMA = "ambari";
+
+ /**
+ * The JDBC URL to use when creating a {@link DatabaseType#H2} database for
* unit tests.
*/
public static final String JDBC_IN_MEMORY_URL = String.format(
- "jdbc:derby:memory:myDB/%s;create=true", DEFAULT_DERBY_SCHEMA);
+ "jdbc:h2:mem:%1$s;ALIAS_COLUMN_NAME=TRUE;INIT=CREATE SCHEMA IF NOT EXISTS %1$s\\;SET SCHEMA %1$s;",
+ DEFAULT_DERBY_SCHEMA);
+
+ /**
+ * The H2 driver to use when creating a {@link DatabaseType#H2} database
+ * for unit tests.
+ */
+ public static final String JDBC_IN_MEMORY_DRIVER = "org.h2.Driver";
/**
- * The Derby driver to use when creating a {@link DatabaseType#DERBY} database
+ * The H2 default user driver to use when creating a {@link DatabaseType#H2} database
* for unit tests.
*/
- public static final String JDBC_IN_MEMORY_DRIVER = "org.apache.derby.jdbc.EmbeddedDriver";
+ public static final String JDBC_IN_MEMORY_USER = "sa";
+
+ /**
+ * The H2 default password to use when creating a {@link DatabaseType#H2} database
+ * for unit tests.
+ */
+ public static final String JDBC_IN_MEMORY_PASSWORD = "";
/**
* The JSSE property which governs the location of the keystore file
@@ -2673,7 +2692,8 @@ public class Configuration {
MYSQL("mysql"),
DERBY("derby"),
SQL_SERVER("sqlserver"),
- SQL_ANYWHERE("sqlanywhere");
+ SQL_ANYWHERE("sqlanywhere"),
+ H2("h2");
private static final Map<String, DatabaseType> m_mappedTypes =
new HashMap<String, Configuration.DatabaseType>(5);
@@ -3824,10 +3844,16 @@ public class Configuration {
}
public String getDatabaseUser() {
+ if (getPersistenceType() == PersistenceType.IN_MEMORY) {
+ return JDBC_IN_MEMORY_USER;
+ }
return getProperty(SERVER_JDBC_USER_NAME);
}
public String getDatabasePassword() {
+ if (getPersistenceType() == PersistenceType.IN_MEMORY) {
+ return JDBC_IN_MEMORY_PASSWORD;
+ }
String passwdProp = properties.getProperty(SERVER_JDBC_USER_PASSWD.getKey());
String dbpasswd = null;
boolean isPasswordAlias = false;
@@ -4819,6 +4845,8 @@ public class Configuration {
databaseType = DatabaseType.SQL_SERVER;
} else if (dbUrl.contains(DatabaseType.SQL_ANYWHERE.getName())) {
databaseType = DatabaseType.SQL_ANYWHERE;
+ } else if (dbUrl.contains(DatabaseType.H2.getName())) {
+ databaseType = DatabaseType.H2;
} else {
throw new RuntimeException(
"The database type could be not determined from the JDBC URL "
@@ -4845,6 +4873,8 @@ public class Configuration {
databaseSchema = getDatabaseUser();
} else if (databaseType.equals(DatabaseType.DERBY)) {
databaseSchema = DEFAULT_DERBY_SCHEMA;
+ } else if (databaseType.equals(DatabaseType.H2)) {
+ databaseSchema = DEFAULT_H2_SCHEMA;
} else {
databaseSchema = null;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
index b7c9e85..b634a62 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
@@ -226,7 +226,10 @@ public class ControllerModule extends AbstractModule {
case IN_MEMORY:
properties.setProperty(JDBC_URL, Configuration.JDBC_IN_MEMORY_URL);
properties.setProperty(JDBC_DRIVER, Configuration.JDBC_IN_MEMORY_DRIVER);
- properties.setProperty(DDL_GENERATION, DROP_AND_CREATE);
+ properties.setProperty(JDBC_USER, Configuration.JDBC_IN_MEMORY_USER);
+ properties.setProperty(JDBC_PASSWORD, Configuration.JDBC_IN_MEMORY_PASSWORD);
+ properties.setProperty(DDL_GENERATION, CREATE_ONLY);
+ properties.setProperty(DDL_GENERATION_MODE, DDL_BOTH_GENERATION);
properties.setProperty(THROW_EXCEPTIONS, "true");
break;
case REMOTE:
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
index b8a760f..5d9eb6c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
@@ -623,6 +623,7 @@ public interface DBAccessor {
MYSQL,
POSTGRES,
DERBY,
+ H2,
UNKNOWN
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
index c645d6d..1c0ab30 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
@@ -43,6 +43,7 @@ import org.apache.ambari.server.orm.helpers.ScriptRunner;
import org.apache.ambari.server.orm.helpers.dbms.DbmsHelper;
import org.apache.ambari.server.orm.helpers.dbms.DerbyHelper;
import org.apache.ambari.server.orm.helpers.dbms.GenericDbmsHelper;
+import org.apache.ambari.server.orm.helpers.dbms.H2Helper;
import org.apache.ambari.server.orm.helpers.dbms.MySqlHelper;
import org.apache.ambari.server.orm.helpers.dbms.OracleHelper;
import org.apache.ambari.server.orm.helpers.dbms.PostgresHelper;
@@ -55,6 +56,7 @@ import org.eclipse.persistence.logging.AbstractSessionLog;
import org.eclipse.persistence.logging.SessionLogEntry;
import org.eclipse.persistence.platform.database.DatabasePlatform;
import org.eclipse.persistence.platform.database.DerbyPlatform;
+import org.eclipse.persistence.platform.database.H2Platform;
import org.eclipse.persistence.platform.database.MySQLPlatform;
import org.eclipse.persistence.platform.database.OraclePlatform;
import org.eclipse.persistence.platform.database.PostgreSQLPlatform;
@@ -130,6 +132,9 @@ public class DBAccessorImpl implements DBAccessor {
} else if (databasePlatform instanceof DerbyPlatform) {
dbType = DbType.DERBY;
return new DerbyHelper(databasePlatform);
+ } else if (databasePlatform instanceof H2Platform) {
+ dbType = DbType.H2;
+ return new H2Helper(databasePlatform);
} else {
dbType = DbType.UNKNOWN;
return new GenericDbmsHelper(databasePlatform);
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java
index 2c5cbfb..7421ca1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java
@@ -54,7 +54,7 @@ import org.apache.ambari.server.state.stack.upgrade.UpgradeType;
@NamedQuery(name = "UpgradeEntity.findUpgrade",
query = "SELECT u FROM UpgradeEntity u WHERE u.upgradeId = :upgradeId"),
@NamedQuery(name = "UpgradeEntity.findLatestForClusterInDirection",
- query = "SELECT u FROM UpgradeEntity u JOIN RequestEntity r ON u.requestId = r.requestId WHERE u.clusterId = :clusterId AND u.direction = :direction ORDER BY r.startTime DESC"),
+ query = "SELECT u FROM UpgradeEntity u JOIN RequestEntity r ON u.requestId = r.requestId WHERE u.clusterId = :clusterId AND u.direction = :direction ORDER BY r.startTime DESC, u.upgradeId DESC"),
@NamedQuery(name = "UpgradeEntity.findLatestForCluster",
query = "SELECT u FROM UpgradeEntity u JOIN RequestEntity r ON u.requestId = r.requestId WHERE u.clusterId = :clusterId ORDER BY r.startTime DESC"),
})
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/H2Helper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/H2Helper.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/H2Helper.java
new file mode 100644
index 0000000..e6cb8ab
--- /dev/null
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/H2Helper.java
@@ -0,0 +1,74 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server.orm.helpers.dbms;
+
+import org.apache.ambari.server.orm.DBAccessor;
+import org.eclipse.persistence.platform.database.DatabasePlatform;
+
+public class H2Helper extends GenericDbmsHelper {
+ public H2Helper(DatabasePlatform databasePlatform) {
+ super(databasePlatform);
+ }
+
+ @Override
+ public boolean supportsColumnTypeChange() {
+ return false; //type change is dramatically limited to varchar length increase only, almost useless
+ }
+
+ //+
+ @Override
+ public String getRenameColumnStatement(String tableName, String oldName, DBAccessor.DBColumnInfo columnInfo) {
+ StringBuilder builder = new StringBuilder();
+
+ builder.append("ALTER TABLE ").append(tableName).append(" ALTER COLUMN ").append(oldName);
+ builder.append(" RENAME TO ").append(columnInfo.getName());
+
+ return builder.toString();
+ }
+
+ @Override
+ public StringBuilder writeColumnModifyString(StringBuilder builder, DBAccessor.DBColumnInfo columnInfo) {
+ builder.append(" ALTER COLUMN ").append(columnInfo.getName())
+ .append(" SET DATA TYPE ");
+ writeColumnType(builder, columnInfo);
+
+ return builder;
+ }
+
+ //+
+ @Override
+ public StringBuilder writeSetNullableString(StringBuilder builder,
+ String tableName, DBAccessor.DBColumnInfo columnInfo, boolean nullable) {
+ builder.append(" ALTER COLUMN ").append(columnInfo.getName()).append(" SET");
+ String nullStatement = nullable ? " NULL" : " NOT NULL";
+ builder.append(nullStatement);
+ return builder;
+ }
+
+ @Override
+ public String writeGetTableConstraints(String databaseName, String tableName){
+ StringBuilder statement = new StringBuilder()
+ .append("SELECT")
+ .append(" C.CONSTRAINTNAME AS CONSTRAINT_NAME,")
+ .append(" C.TYPE AS CONSTRAINT_TYPE")
+ .append(" FROM SYS.SYSCONSTRAINTS AS C, SYS.SYSTABLES AS T")
+ .append(" WHERE C.TABLEID = T.TABLEID AND T.TABLENAME = '").append(tableName).append("'");
+ return statement.toString();
+ }
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/main/resources/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/META-INF/persistence.xml b/ambari-server/src/main/resources/META-INF/persistence.xml
index 0375650..3aa7689 100644
--- a/ambari-server/src/main/resources/META-INF/persistence.xml
+++ b/ambari-server/src/main/resources/META-INF/persistence.xml
@@ -106,8 +106,8 @@
<property name="eclipselink.connection-pool.sequence" value="true" />
<property name="eclipselink.weaving" value="static" />
<property name="eclipselink.session.customizer" value="org.apache.ambari.server.orm.EclipseLinkSessionCustomizer"/>
- <property name="eclipselink.logging.logger" value="org.apache.ambari.server.logging.EclipseLinkLogger"/>
- <property name="eclipselink.logging.level" value="INFO"/>
+ <!--<property name="eclipselink.logging.logger" value="org.apache.ambari.server.logging.EclipseLinkLogger"/>-->
+ <!--<property name="eclipselink.logging.level" value="INFO"/>-->
</properties>
</persistence-unit>
@@ -119,8 +119,8 @@
<property name="eclipselink.cache.size.default" value="10000" />
<property name="eclipselink.jdbc.batch-writing" value="JDBC"/>
<property name="eclipselink.weaving" value="static" />
- <property name="eclipselink.logging.logger" value="org.apache.ambari.server.logging.EclipseLinkLogger"/>
- <property name="eclipselink.logging.level" value="INFO"/>
+ <!--<property name="eclipselink.logging.logger" value="org.apache.ambari.server.logging.EclipseLinkLogger"/>-->
+ <!--<property name="eclipselink.logging.level" value="INFO"/>-->
</properties>
</persistence-unit>
<persistence-unit name="ambari-view-migration" transaction-type="RESOURCE_LOCAL">
@@ -130,8 +130,8 @@
<property name="eclipselink.cache.size.default" value="10000" />
<property name="eclipselink.jdbc.batch-writing" value="JDBC"/>
<property name="eclipselink.weaving" value="static" />
- <property name="eclipselink.logging.logger" value="org.apache.ambari.server.logging.EclipseLinkLogger"/>
- <property name="eclipselink.logging.level" value="INFO"/>
+ <!--<property name="eclipselink.logging.logger" value="org.apache.ambari.server.logging.EclipseLinkLogger"/>-->
+ <!--<property name="eclipselink.logging.level" value="INFO"/>-->
</properties>
</persistence-unit>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/annotations/LockAreaTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/annotations/LockAreaTest.java b/ambari-server/src/test/java/org/apache/ambari/annotations/LockAreaTest.java
index 2208ce4..fc5e81a 100644
--- a/ambari-server/src/test/java/org/apache/ambari/annotations/LockAreaTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/annotations/LockAreaTest.java
@@ -17,6 +17,7 @@
*/
package org.apache.ambari.annotations;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
@@ -26,6 +27,7 @@ import java.util.concurrent.locks.ReadWriteLock;
import org.apache.ambari.annotations.TransactionalLock.LockArea;
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.TransactionalLocks;
@@ -35,7 +37,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;
@@ -53,8 +54,8 @@ public class LockAreaTest {
}
@After
- public void teardown() throws AmbariException {
- m_injector.getInstance(PersistService.class).stop();
+ public void teardown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(m_injector);
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/annotations/TransactionalLockInterceptorTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/annotations/TransactionalLockInterceptorTest.java b/ambari-server/src/test/java/org/apache/ambari/annotations/TransactionalLockInterceptorTest.java
index 7d7f47b..dcd1546 100644
--- a/ambari-server/src/test/java/org/apache/ambari/annotations/TransactionalLockInterceptorTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/annotations/TransactionalLockInterceptorTest.java
@@ -17,6 +17,7 @@
*/
package org.apache.ambari.annotations;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
@@ -24,6 +25,7 @@ import java.util.concurrent.locks.ReadWriteLock;
import org.apache.ambari.annotations.TransactionalLock.LockArea;
import org.apache.ambari.annotations.TransactionalLock.LockType;
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.TransactionalLocks;
@@ -38,7 +40,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.persist.Transactional;
import com.google.inject.util.Modules;
@@ -58,8 +59,8 @@ public class TransactionalLockInterceptorTest {
}
@After
- public void teardown() throws AmbariException {
- m_injector.getInstance(PersistService.class).stop();
+ public void teardown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(m_injector);
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/H2DatabaseCleaner.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/H2DatabaseCleaner.java b/ambari-server/src/test/java/org/apache/ambari/server/H2DatabaseCleaner.java
new file mode 100644
index 0000000..91477eb
--- /dev/null
+++ b/ambari-server/src/test/java/org/apache/ambari/server/H2DatabaseCleaner.java
@@ -0,0 +1,124 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server;
+
+import static org.eclipse.persistence.config.PersistenceUnitProperties.DEFAULT_CREATE_JDBC_FILE_NAME;
+
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import javax.persistence.metamodel.EntityType;
+
+import org.apache.ambari.server.configuration.Configuration;
+import org.apache.ambari.server.orm.DBAccessorImpl;
+import org.apache.commons.collections.CollectionUtils;
+
+import com.google.inject.Injector;
+import com.google.inject.persist.PersistService;
+
+public class H2DatabaseCleaner {
+ private static final String SEQ_INSERT_PREFIX = "INSERT INTO ambari_sequences";
+ private static List<String> seqInsertStatements;
+
+ public static void clearDatabaseAndStopPersistenceService(Injector injector) throws AmbariException, SQLException {
+ clearDatabase(injector.getProvider(EntityManager.class).get());
+ injector.getInstance(PersistService.class).stop();
+ }
+
+ public static void clearDatabase(EntityManager entityManager) throws AmbariException, SQLException {
+ clearDatabase(entityManager, Configuration.JDBC_IN_MEMORY_URL,
+ Configuration.JDBC_IN_MEMORY_USER, Configuration.JDBC_IN_MEMORY_PASSWORD);
+ }
+
+ private static List<String> collectSequenceInserts() {
+ try {
+ ArrayList<String> statementList = new ArrayList<>();
+ for (String s : Files.readAllLines(Paths.get(DEFAULT_CREATE_JDBC_FILE_NAME), Charset.defaultCharset())) {
+ if (s.startsWith(SEQ_INSERT_PREFIX)) {
+ statementList.add(s);
+ }
+ }
+ return statementList;
+ } catch (IOException e) {
+ return Collections.emptyList();
+ }
+ }
+
+ //TODO all tests this method is used in should be modified to remove hardcoded IDs
+ public static void resetSequences(Injector injector) {
+ DBAccessorImpl dbAccessor = injector.getInstance(DBAccessorImpl.class);
+ try {
+ if (dbAccessor.tableExists("ambari_sequences")) {
+ if (seqInsertStatements == null) {
+ seqInsertStatements = collectSequenceInserts();
+ }
+ if (!CollectionUtils.isEmpty(seqInsertStatements)) {
+ dbAccessor.truncateTable("ambari_sequences");
+
+ for (String insert : seqInsertStatements) {
+ dbAccessor.executeUpdate(insert);
+ }
+ }
+
+ }
+ } catch (SQLException ignored) {
+ }
+ }
+
+ public static void clearDatabase(EntityManager entityManager, String dbURL, String dbUser, String dbPass) throws SQLException {
+ Connection connection = DriverManager.getConnection(dbURL, dbUser, dbPass);
+ Statement s = connection.createStatement();
+
+ try {
+ // Disable FK
+ s.execute("SET REFERENTIAL_INTEGRITY FALSE");
+
+ entityManager.getTransaction().begin();
+ // Truncate tables for all entities
+ for (EntityType<?> entity : entityManager.getMetamodel().getEntities()) {
+ Query query = entityManager.createQuery("DELETE FROM " + entity.getName() + " em");
+ query.executeUpdate();
+// final String tableName = entity.getBindableJavaType().getAnnotation(Table.class).name();
+// s.executeUpdate("TRUNCATE TABLE " + tableName);
+ }
+
+ entityManager.getTransaction().commit();
+
+ // Enable FK
+ s.execute("SET REFERENTIAL_INTEGRITY TRUE");
+
+ //reset shared cache
+ entityManager.getEntityManagerFactory().getCache().evictAll();
+ } finally {
+ s.close();
+ connection.close();
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/StateRecoveryManagerTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/StateRecoveryManagerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/StateRecoveryManagerTest.java
index a413ce3..c5be8f4 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/StateRecoveryManagerTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/StateRecoveryManagerTest.java
@@ -26,6 +26,7 @@ import static org.easymock.EasyMock.replay;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import java.sql.SQLException;
import java.util.ArrayList;
import org.apache.ambari.server.orm.GuiceJpaInitializer;
@@ -46,7 +47,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;
public class StateRecoveryManagerTest {
@@ -67,8 +67,8 @@ public class StateRecoveryManagerTest {
}
@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/actionmanager/ExecutionCommandWrapperTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperTest.java
index 62ce93b..893c3fb 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperTest.java
@@ -19,6 +19,7 @@
package org.apache.ambari.server.actionmanager;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -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.Role;
import org.apache.ambari.server.RoleCommand;
import org.apache.ambari.server.agent.AgentCommand.AgentCommandType;
@@ -42,6 +44,7 @@ import org.apache.ambari.server.state.StackId;
import org.apache.ambari.server.state.svccomphost.ServiceComponentHostStartEvent;
import org.apache.ambari.server.utils.StageUtils;
import org.codehaus.jettison.json.JSONException;
+import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -262,4 +265,9 @@ public class ExecutionCommandWrapperTest {
Assert.assertEquals(SERVICE_SITE_VAL5, mergedConfig.get(SERVICE_SITE_NAME5));
Assert.assertEquals(SERVICE_SITE_VAL6_H, mergedConfig.get(SERVICE_SITE_NAME6));
}
+
+ @AfterClass
+ public static 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/actionmanager/StageTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/StageTest.java b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/StageTest.java
index 331f4fb..89627f7 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/StageTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/StageTest.java
@@ -20,9 +20,12 @@ package org.apache.ambari.server.actionmanager;
import static org.junit.Assert.assertEquals;
+import java.sql.SQLException;
import java.util.Collections;
import java.util.List;
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.Role;
import org.apache.ambari.server.RoleCommand;
import org.apache.ambari.server.orm.GuiceJpaInitializer;
@@ -31,6 +34,7 @@ import org.apache.ambari.server.serveraction.ServerAction;
import org.apache.ambari.server.serveraction.upgrades.ConfigureAction;
import org.apache.ambari.server.state.svccomphost.ServiceComponentHostServerActionEvent;
import org.apache.ambari.server.utils.StageUtils;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -79,4 +83,9 @@ public class StageTest {
assertEquals("user1", actionUserName);
}
-}
\ No newline at end of file
+
+ @After
+ 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/actionmanager/TestActionDBAccessorImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionDBAccessorImpl.java b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionDBAccessorImpl.java
index 1ca777d..177ac70 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionDBAccessorImpl.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionDBAccessorImpl.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.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -30,6 +31,7 @@ import javax.persistence.EntityManager;
import javax.persistence.NamedQuery;
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.agent.CommandReport;
@@ -63,7 +65,6 @@ import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Singleton;
-import com.google.inject.persist.PersistService;
import com.google.inject.util.Modules;
import junit.framework.Assert;
@@ -103,6 +104,7 @@ public class TestActionDBAccessorImpl {
injector = Guice.createInjector(Modules.override(defaultTestModule)
.with(new TestActionDBAccessorModule()));
+ H2DatabaseCleaner.resetSequences(injector);
injector.getInstance(GuiceJpaInitializer.class);
// initialize AmbariMetaInfo so that the stacks are populated into the DB
@@ -124,8 +126,8 @@ public class TestActionDBAccessorImpl {
}
@After
- public void tearDown() throws AmbariException {
- 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/actionmanager/TestActionManager.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionManager.java b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionManager.java
index da54789..d5f2475 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionManager.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionManager.java
@@ -27,11 +27,13 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
+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.Role;
import org.apache.ambari.server.RoleCommand;
import org.apache.ambari.server.agent.ActionQueue;
@@ -53,7 +55,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;
@@ -73,7 +74,9 @@ public class TestActionManager {
@Before
public void setup() throws AmbariException {
injector = Guice.createInjector(new InMemoryDefaultTestModule());
+ H2DatabaseCleaner.resetSequences(injector);
injector.getInstance(GuiceJpaInitializer.class);
+
clusters = injector.getInstance(Clusters.class);
stageFactory = injector.getInstance(StageFactory.class);
@@ -86,8 +89,8 @@ public class TestActionManager {
}
@After
- public void teardown() throws AmbariException {
- 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/actionmanager/TestActionScheduler.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java
index 6cc511e..ade625a 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionScheduler.java
@@ -41,6 +41,7 @@ import static org.mockito.Mockito.when;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -57,6 +58,7 @@ import java.util.concurrent.TimeUnit;
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.ServiceComponentHostNotFoundException;
@@ -114,7 +116,6 @@ import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Provider;
-import com.google.inject.persist.PersistService;
import com.google.inject.persist.UnitOfWork;
import junit.framework.Assert;
@@ -161,8 +162,8 @@ public class TestActionScheduler {
}
@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/actionmanager/TestActionSchedulerThreading.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionSchedulerThreading.java b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionSchedulerThreading.java
index 246c8b3..217f95e 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionSchedulerThreading.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionSchedulerThreading.java
@@ -20,6 +20,7 @@ package org.apache.ambari.server.actionmanager;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import java.sql.SQLException;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
@@ -27,6 +28,8 @@ import java.util.concurrent.Semaphore;
import javax.persistence.EntityManager;
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.events.publishers.JPAEventPublisher;
import org.apache.ambari.server.orm.GuiceJpaInitializer;
import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
@@ -46,7 +49,6 @@ import com.google.common.collect.Sets;
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;
import junit.framework.Assert;
@@ -78,8 +80,8 @@ public class TestActionSchedulerThreading {
* Cleanup test methods.
*/
@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/actionmanager/TestStage.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestStage.java b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestStage.java
index 1047a73..c388d08 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestStage.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestStage.java
@@ -19,15 +19,19 @@ package org.apache.ambari.server.actionmanager;
import static org.junit.Assert.assertEquals;
+import java.sql.SQLException;
import java.util.Map;
import java.util.TreeMap;
+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.agent.ExecutionCommand;
import org.apache.ambari.server.orm.GuiceJpaInitializer;
import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
import org.apache.ambari.server.utils.StageUtils;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -75,4 +79,9 @@ public class TestStage {
assertEquals("My Context", stage.getRequestContext());
assertEquals(CLUSTER_HOST_INFO, stage.getClusterHostInfo());
}
+
+ @After
+ 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/agent/HeartbeatProcessorTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java
index 4a5cb06..4a888f0 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java
@@ -36,6 +36,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -43,6 +44,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.Role;
import org.apache.ambari.server.RoleCommand;
import org.apache.ambari.server.actionmanager.ActionDBAccessor;
@@ -92,7 +94,6 @@ import com.google.gson.JsonObject;
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;
import junit.framework.Assert;
@@ -143,14 +144,15 @@ public class HeartbeatProcessorTest {
@Before
public void setup() throws Exception {
+ H2DatabaseCleaner.resetSequences(injector);
injector.getInstance(GuiceJpaInitializer.class);
injector.injectMembers(this);
EasyMock.replay(injector.getInstance(AuditLogger.class));
}
@After
- public void teardown() throws AmbariException {
- injector.getInstance(PersistService.class).stop();
+ public void teardown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
@Test
@@ -1364,4 +1366,4 @@ public class HeartbeatProcessorTest {
-}
\ 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/agent/TestHeartbeatHandler.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
index e7588c7..ba03ae1 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
@@ -57,6 +57,7 @@ import java.util.Map;
import javax.xml.bind.JAXBException;
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.ActionDBAccessor;
@@ -107,7 +108,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;
import junit.framework.Assert;
@@ -161,7 +161,7 @@ public class TestHeartbeatHandler {
@After
public void teardown() throws Exception {
- injector.getInstance(PersistService.class).stop();
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
EasyMock.reset(auditLogger);
}
@@ -444,6 +444,7 @@ public class TestHeartbeatHandler {
HeartBeatResponse hbr = handler.handleHeartBeat(hb);
assertNull(hbr.getRecoveryConfig());
+ handler.stop();
}
//
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java
index 4d129a9..1b9c28b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java
@@ -25,6 +25,7 @@ import static org.mockito.Mockito.atLeast;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
+import java.sql.SQLException;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -33,6 +34,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.actionmanager.ActionManager;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
@@ -65,7 +67,6 @@ import org.slf4j.LoggerFactory;
import com.google.inject.Guice;
import com.google.inject.Injector;
-import com.google.inject.persist.PersistService;
public class TestHeartbeatMonitor {
@@ -92,8 +93,8 @@ public class TestHeartbeatMonitor {
}
@After
- public void teardown() {
- injector.getInstance(PersistService.class).stop();
+ public void teardown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
private void setOsFamily(Host host, String osFamily, String osVersion) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/api/query/JpaSortBuilderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/query/JpaSortBuilderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/query/JpaSortBuilderTest.java
index b9bfc50..adbcd32 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/query/JpaSortBuilderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/query/JpaSortBuilderTest.java
@@ -27,6 +27,7 @@ import javax.persistence.criteria.Order;
import javax.persistence.criteria.Root;
import javax.persistence.metamodel.SingularAttribute;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.controller.internal.AlertHistoryResourceProvider;
import org.apache.ambari.server.controller.internal.SortRequestImpl;
import org.apache.ambari.server.controller.spi.Predicate;
@@ -38,6 +39,7 @@ import org.apache.ambari.server.orm.GuiceJpaInitializer;
import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
import org.apache.ambari.server.orm.entities.AlertHistoryEntity;
import org.apache.ambari.server.orm.entities.AlertHistoryEntity_;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -60,6 +62,11 @@ public class JpaSortBuilderTest {
m_injector.injectMembers(this);
}
+ @After
+ public void teardown() throws Exception {
+ H2DatabaseCleaner.clearDatabase(m_injector.getProvider(EntityManager.class).get());
+ }
+
/**
* Tests that adding a sort does not create another {@link Root} in the
* {@link CriteriaQuery}. A duplicate root will cause a cartesian product
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
index d93953c..d3ccf33 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
@@ -46,6 +46,7 @@ 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.StackAccessException;
import org.apache.ambari.server.configuration.Configuration;
import org.apache.ambari.server.controller.spi.Resource;
@@ -92,6 +93,7 @@ import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
import org.easymock.Capture;
import org.easymock.EasyMock;
+import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
@@ -131,7 +133,7 @@ public class AmbariMetaInfoTest {
private static final int PROPERTIES_CNT = 62;
private static final int OS_CNT = 4;
- private static AmbariMetaInfo metaInfo = null;
+ private static TestAmbariMetaInfo metaInfo = null;
private final static Logger LOG =
LoggerFactory.getLogger(AmbariMetaInfoTest.class);
private static final String FILE_NAME = "hbase-site.xml";
@@ -157,6 +159,11 @@ public class AmbariMetaInfoTest {
metaInfo = createAmbariMetaInfo(stacks, version);
}
+ @AfterClass
+ public static void tearDown() throws Exception {
+ H2DatabaseCleaner.clearDatabase(metaInfo.injector.getProvider(EntityManager.class).get());
+ }
+
public class MockModule extends AbstractModule {
@Override
protected void configure() {
@@ -2141,11 +2148,12 @@ public class AmbariMetaInfoTest {
AlertDefinitionDAO alertDefinitionDAO;
AlertDefinitionFactory alertDefinitionFactory;
OsFamily osFamily;
+ Injector injector;
public TestAmbariMetaInfo(Configuration configuration) throws Exception {
super(configuration);
- Injector injector = Guice.createInjector(Modules.override(
+ injector = Guice.createInjector(Modules.override(
new InMemoryDefaultTestModule()).with(new MockModule()));
injector.getInstance(GuiceJpaInitializer.class);
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/api/services/PersistKeyValueImplTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/PersistKeyValueImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/PersistKeyValueImplTest.java
index 63f269d..d6815fd 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/PersistKeyValueImplTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/PersistKeyValueImplTest.java
@@ -20,6 +20,7 @@ package org.apache.ambari.server.api.services;
import java.util.Map;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.orm.GuiceJpaInitializer;
import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
import org.junit.After;
@@ -29,7 +30,6 @@ import org.junit.Test;
import com.google.inject.Guice;
import com.google.inject.Injector;
-import com.google.inject.persist.PersistService;
public class PersistKeyValueImplTest extends Assert {
@@ -46,7 +46,7 @@ public class PersistKeyValueImplTest extends Assert {
@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/api/services/PersistServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/PersistServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/PersistServiceTest.java
index 7576501..57ccdb9 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/PersistServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/PersistServiceTest.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.api.services;
import java.io.IOException;
import java.util.Map;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.RandomPortJerseyTest;
import org.apache.ambari.server.orm.GuiceJpaInitializer;
import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
@@ -35,7 +36,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.sun.jersey.api.client.Client;
import com.sun.jersey.api.client.UniformInterfaceException;
import com.sun.jersey.api.client.WebResource;
@@ -80,7 +80,7 @@ public class PersistServiceTest extends RandomPortJerseyTest {
@After
public void tearDown() throws Exception {
super.tearDown();
- 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/configuration/RecoveryConfigHelperTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/configuration/RecoveryConfigHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/configuration/RecoveryConfigHelperTest.java
index 6640837..3a93fbf 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/configuration/RecoveryConfigHelperTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/configuration/RecoveryConfigHelperTest.java
@@ -32,6 +32,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.agent.HeartbeatTestHelper;
import org.apache.ambari.server.agent.RecoveryConfig;
import org.apache.ambari.server.agent.RecoveryConfigHelper;
@@ -52,7 +53,6 @@ import com.google.common.eventbus.EventBus;
import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.Injector;
-import com.google.inject.persist.PersistService;
/**
* Test RecoveryConfigHelper class
@@ -87,7 +87,7 @@ public class RecoveryConfigHelperTest {
@After
public void teardown() throws Exception {
- 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/AmbariCustomCommandExecutionHelperTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelperTest.java
index 8c87f0f..0f5a388 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelperTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelperTest.java
@@ -17,6 +17,7 @@
*/
package org.apache.ambari.server.controller;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -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.Role;
import org.apache.ambari.server.RoleCommand;
import org.apache.ambari.server.actionmanager.ActionManager;
@@ -73,7 +75,6 @@ import org.springframework.security.core.context.SecurityContextHolder;
import com.google.inject.Guice;
import com.google.inject.Injector;
-import com.google.inject.persist.PersistService;
import junit.framework.Assert;
@@ -137,9 +138,9 @@ public class AmbariCustomCommandExecutionHelperTest {
}
@After
- public void teardown() {
+ public void teardown() throws AmbariException, SQLException {
SecurityContextHolder.getContext().setAuthentication(null);
- 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/AmbariManagementControllerTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
index 6e2190b..af67f05 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
@@ -58,6 +58,7 @@ import javax.persistence.EntityManager;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.ClusterNotFoundException;
import org.apache.ambari.server.DuplicateResourceException;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.HostNotFoundException;
import org.apache.ambari.server.ObjectNotFoundException;
import org.apache.ambari.server.ParentObjectNotFoundException;
@@ -171,7 +172,6 @@ import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.google.inject.Guice;
import com.google.inject.Injector;
-import com.google.inject.persist.PersistService;
import junit.framework.Assert;
@@ -241,6 +241,7 @@ public class AmbariManagementControllerTest {
InMemoryDefaultTestModule module = new InMemoryDefaultTestModule();
backingProperties = module.getProperties();
injector = Guice.createInjector(module);
+ H2DatabaseCleaner.resetSequences(injector);
injector.getInstance(GuiceJpaInitializer.class);
ambariMetaInfo = injector.getInstance(AmbariMetaInfo.class);
ambariMetaInfo.init();
@@ -257,7 +258,7 @@ public class AmbariManagementControllerTest {
@Before
public void setup() throws Exception {
- entityManager = injector.getInstance(EntityManager.class);
+ entityManager = injector.getProvider(EntityManager.class).get();
actionDB = injector.getInstance(ActionDBAccessor.class);
serviceFactory = injector.getInstance(ServiceFactory.class);
serviceComponentFactory = injector.getInstance(
@@ -284,7 +285,7 @@ public class AmbariManagementControllerTest {
@AfterClass
public static void afterClass() throws Exception {
- injector.getInstance(PersistService.class).stop();
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
private static String getUniqueName() {
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariServerTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariServerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariServerTest.java
index ff5d1bf..85c47fc 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariServerTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariServerTest.java
@@ -31,6 +31,7 @@ import java.net.InetAddress;
import java.net.PasswordAuthentication;
import java.sql.Connection;
import java.sql.ResultSet;
+import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.EnumSet;
@@ -41,6 +42,7 @@ import javax.servlet.DispatcherType;
import javax.servlet.SessionCookieConfig;
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.checks.DatabaseConsistencyCheckHelper;
import org.apache.ambari.server.configuration.Configuration;
@@ -81,7 +83,8 @@ public class AmbariServerTest {
}
@After
- public void teardown() throws AmbariException {
+ 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/controller/BackgroundCustomCommandExecutionTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/BackgroundCustomCommandExecutionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/BackgroundCustomCommandExecutionTest.java
index 58f597f..30816a5 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/BackgroundCustomCommandExecutionTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/BackgroundCustomCommandExecutionTest.java
@@ -19,6 +19,7 @@ package org.apache.ambari.server.controller;
import static org.mockito.Matchers.any;
+import java.sql.SQLException;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -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.actionmanager.ActionManager;
import org.apache.ambari.server.actionmanager.ExecutionCommandWrapper;
import org.apache.ambari.server.actionmanager.Request;
@@ -61,7 +63,6 @@ import org.springframework.security.core.context.SecurityContextHolder;
import com.google.inject.Guice;
import com.google.inject.Injector;
-import com.google.inject.persist.PersistService;
import junit.framework.Assert;
@@ -112,8 +113,8 @@ public class BackgroundCustomCommandExecutionTest {
SecurityContextHolder.getContext().setAuthentication(TestAuthenticationFactory.createAdministrator());
}
@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/RefreshYarnCapacitySchedulerReleaseConfigTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/RefreshYarnCapacitySchedulerReleaseConfigTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/RefreshYarnCapacitySchedulerReleaseConfigTest.java
index a54fb98..0b4c81d 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/RefreshYarnCapacitySchedulerReleaseConfigTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/RefreshYarnCapacitySchedulerReleaseConfigTest.java
@@ -18,6 +18,7 @@
package org.apache.ambari.server.controller;
+import java.sql.SQLException;
import java.util.Collections;
import java.util.HashMap;
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.controller.internal.ComponentResourceProviderTest;
import org.apache.ambari.server.controller.internal.ServiceResourceProviderTest;
import org.apache.ambari.server.orm.GuiceJpaInitializer;
@@ -48,7 +50,6 @@ import org.springframework.security.core.context.SecurityContextHolder;
import com.google.inject.Guice;
import com.google.inject.Injector;
-import com.google.inject.persist.PersistService;
import junit.framework.Assert;
@@ -76,8 +77,8 @@ public class RefreshYarnCapacitySchedulerReleaseConfigTest {
}
@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/RootServiceResponseFactoryTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/RootServiceResponseFactoryTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/RootServiceResponseFactoryTest.java
index 9fc51bd..e9b4aa7 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/RootServiceResponseFactoryTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/RootServiceResponseFactoryTest.java
@@ -21,14 +21,18 @@ package org.apache.ambari.server.controller;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertTrue;
+import java.sql.SQLException;
import java.util.Collections;
import java.util.Set;
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.ObjectNotFoundException;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.controller.RootServiceResponseFactory.Components;
import org.apache.ambari.server.orm.GuiceJpaInitializer;
import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -52,6 +56,11 @@ public class RootServiceResponseFactoryTest {
injector.injectMembers(this);
}
+ @After
+ public void teardown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
+ }
+
@Test
public void testGetRootServices() throws Exception {
// Request a null service name
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ActionResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ActionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ActionResourceProviderTest.java
index e29c047..061f06a 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ActionResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ActionResourceProviderTest.java
@@ -24,12 +24,14 @@ 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.Set;
import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.actionmanager.ActionType;
import org.apache.ambari.server.actionmanager.TargetHostType;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
@@ -52,7 +54,6 @@ import org.junit.Test;
import com.google.inject.Guice;
import com.google.inject.Injector;
-import com.google.inject.persist.PersistService;
public class ActionResourceProviderTest {
@@ -84,8 +85,8 @@ public class ActionResourceProviderTest {
}
@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/controller/internal/AlertResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertResourceProviderTest.java
index 9f6591c..4b2bb7a 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertResourceProviderTest.java
@@ -735,8 +735,8 @@ public class AlertResourceProviderTest {
expect(configuration.getDatabaseUrl()).andReturn(JDBC_IN_MEMORY_URL).anyTimes();
expect(configuration.getDatabaseDriver()).andReturn(JDBC_IN_MEMORY_DRIVER).anyTimes();
- expect(configuration.getDatabaseUser()).andReturn("test").anyTimes();
- expect(configuration.getDatabasePassword()).andReturn("test").anyTimes();
+ expect(configuration.getDatabaseUser()).andReturn("sa").anyTimes();
+ expect(configuration.getDatabasePassword()).andReturn("").anyTimes();
expect(configuration.getAlertEventPublisherPoolSize()).andReturn(Integer.valueOf(Configuration.ALERTS_EXECUTION_SCHEDULER_THREADS.getDefaultValue())).anyTimes();
expect(configuration.getMasterKeyLocation()).andReturn(new File("/test")).anyTimes();
expect(configuration.getTemporaryKeyStoreRetentionMinutes()).andReturn(2l).anyTimes();
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CalculatedStatusTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CalculatedStatusTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CalculatedStatusTest.java
index a96f395..cd2f99e 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CalculatedStatusTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CalculatedStatusTest.java
@@ -34,6 +34,9 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import javax.persistence.EntityManager;
+
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.Role;
import org.apache.ambari.server.RoleCommand;
import org.apache.ambari.server.actionmanager.ExecutionCommandWrapperFactory;
@@ -46,6 +49,7 @@ import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
import org.apache.ambari.server.orm.dao.HostRoleCommandStatusSummaryDTO;
import org.apache.ambari.server.orm.entities.HostRoleCommandEntity;
import org.apache.ambari.server.orm.entities.StageEntity;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -82,6 +86,10 @@ public class CalculatedStatusTest {
s_field.setAccessible(true);
}
+ @After
+ public void after() throws Exception {
+ H2DatabaseCleaner.clearDatabase(m_injector.getProvider(EntityManager.class).get());
+ }
@Test
public void testGetStatus() throws Exception {
[2/4] ambari git commit: AMBARI-19799. Optimize DB initialization for
Ambari Server Unit Tests. (mpapirkovskyy)
Posted by mp...@apache.org.
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ServiceConfigDAOTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ServiceConfigDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ServiceConfigDAOTest.java
index 5890c35..e29c276 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ServiceConfigDAOTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ServiceConfigDAOTest.java
@@ -17,12 +17,14 @@
*/
package org.apache.ambari.server.orm.dao;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
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;
@@ -47,7 +49,6 @@ import org.junit.Test;
import com.google.inject.Guice;
import com.google.inject.Injector;
-import com.google.inject.persist.PersistService;
public class ServiceConfigDAOTest {
private static final StackId HDP_01 = new StackId("HDP", "0.1");
@@ -78,8 +79,8 @@ public class ServiceConfigDAOTest {
}
@After
- public void teardown() throws AmbariException {
- injector.getInstance(PersistService.class).stop();
+ public void teardown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
private ServiceConfigEntity createServiceConfig(String serviceName,
@@ -156,9 +157,11 @@ public class ServiceConfigDAOTest {
ServiceConfigEntity serviceConfigEntity =
createServiceConfig("HDFS", "admin", 1L, 1L, 1111L, null);
+ Long clusterId = clusterDAO.findByName("c1").getClusterId();
+
Assert.assertNotNull(serviceConfigEntity);
Assert.assertEquals("c1", serviceConfigEntity.getClusterEntity().getClusterName());
- Assert.assertEquals(Long.valueOf(1), serviceConfigEntity.getClusterEntity()
+ Assert.assertEquals(clusterId, serviceConfigEntity.getClusterEntity()
.getClusterId());
Assert.assertEquals("HDFS", serviceConfigEntity.getServiceName());
Assert.assertEquals(Long.valueOf(1111L), serviceConfigEntity.getCreateTimestamp());
@@ -175,9 +178,11 @@ public class ServiceConfigDAOTest {
ServiceConfigEntity serviceConfigEntity = serviceConfigDAO.find(sce.getServiceConfigId());
+ Long clusterId = clusterDAO.findByName("c1").getClusterId();
+
Assert.assertNotNull(serviceConfigEntity);
Assert.assertEquals("c1", serviceConfigEntity.getClusterEntity().getClusterName());
- Assert.assertEquals(Long.valueOf(1), serviceConfigEntity.getClusterEntity()
+ Assert.assertEquals(clusterId, serviceConfigEntity.getClusterEntity()
.getClusterId());
Assert.assertEquals("HDFS", serviceConfigEntity.getServiceName());
Assert.assertEquals(Long.valueOf(1111L), serviceConfigEntity.getCreateTimestamp());
@@ -195,9 +200,11 @@ public class ServiceConfigDAOTest {
ServiceConfigEntity serviceConfigEntity =
serviceConfigDAO.findByServiceAndVersion("HDFS", 1L);
+ Long clusterId = clusterDAO.findByName("c1").getClusterId();
+
Assert.assertNotNull(serviceConfigEntity);
Assert.assertEquals("c1", serviceConfigEntity.getClusterEntity().getClusterName());
- Assert.assertEquals(Long.valueOf(1), serviceConfigEntity.getClusterEntity()
+ Assert.assertEquals(clusterId, serviceConfigEntity.getClusterEntity()
.getClusterId());
Assert.assertEquals("HDFS", serviceConfigEntity.getServiceName());
Assert.assertEquals(Long.valueOf(1111L), serviceConfigEntity.getCreateTimestamp());
@@ -235,10 +242,12 @@ public class ServiceConfigDAOTest {
Assert.assertNotNull(serviceConfigEntities);
Assert.assertEquals(2, serviceConfigEntities.size());
+ Long clusterId = clusterDAO.findByName("c1").getClusterId();
+
for (ServiceConfigEntity sce: serviceConfigEntities) {
if ("HDFS".equals(sce.getServiceName())) {
Assert.assertEquals("c1", sce.getClusterEntity().getClusterName());
- Assert.assertEquals(Long.valueOf(1), sce.getClusterEntity()
+ Assert.assertEquals(clusterId, sce.getClusterEntity()
.getClusterId());
Assert.assertEquals(Long.valueOf(2222L), sce.getCreateTimestamp());
Assert.assertEquals(Long.valueOf(2), sce.getVersion());
@@ -247,7 +256,7 @@ public class ServiceConfigDAOTest {
}
if ("YARN".equals(sce.getServiceName())) {
Assert.assertEquals("c1", sce.getClusterEntity().getClusterName());
- Assert.assertEquals(Long.valueOf(1), sce.getClusterEntity()
+ Assert.assertEquals(clusterId, sce.getClusterEntity()
.getClusterId());
Assert.assertEquals(Long.valueOf(3333L), sce.getCreateTimestamp());
Assert.assertEquals(Long.valueOf(1), sce.getVersion());
@@ -265,7 +274,7 @@ public class ServiceConfigDAOTest {
Clusters clusters = injector.getInstance(Clusters.class);
clusters.addCluster("c1", HDP_01);
ConfigGroupEntity configGroupEntity1 = new ConfigGroupEntity();
- ClusterEntity clusterEntity = clusterDAO.findById(1L);
+ ClusterEntity clusterEntity = clusterDAO.findByName("c1");
configGroupEntity1.setClusterEntity(clusterEntity);
configGroupEntity1.setClusterId(clusterEntity.getClusterId());
configGroupEntity1.setGroupName("group1");
@@ -309,12 +318,14 @@ public class ServiceConfigDAOTest {
createServiceConfig("HDFS", "admin", 2L, 2L, 2222L, null);
createServiceConfig("YARN", "admin", 1L, 3L, 3333L, null);
+ Long clusterId = clusterDAO.findByName("c1").getClusterId();
+
ServiceConfigEntity serviceConfigEntity =
- serviceConfigDAO.getLastServiceConfig(1L, "HDFS");
+ serviceConfigDAO.getLastServiceConfig(clusterId, "HDFS");
Assert.assertNotNull(serviceConfigEntity);
Assert.assertEquals("c1", serviceConfigEntity.getClusterEntity().getClusterName());
- Assert.assertEquals(Long.valueOf(1), serviceConfigEntity.getClusterEntity()
+ Assert.assertEquals(clusterId, serviceConfigEntity.getClusterEntity()
.getClusterId());
Assert.assertEquals("HDFS", serviceConfigEntity.getServiceName());
Assert.assertEquals(Long.valueOf(2222L), serviceConfigEntity.getCreateTimestamp());
@@ -330,8 +341,10 @@ public class ServiceConfigDAOTest {
createServiceConfig("HDFS", "admin", 2L, 2L, 2222L, null);
createServiceConfig("YARN", "admin", 1L, 3L, 3333L, null);
+ Long clusterId = clusterDAO.findByName("c1").getClusterId();
+
List<ServiceConfigEntity> serviceConfigEntities =
- serviceConfigDAO.getServiceConfigs(clusterDAO.findByName("c1").getClusterId());
+ serviceConfigDAO.getServiceConfigs(clusterId);
Assert.assertNotNull(serviceConfigEntities);
Assert.assertEquals(3, serviceConfigEntities.size());
@@ -339,21 +352,21 @@ public class ServiceConfigDAOTest {
for (ServiceConfigEntity sce: serviceConfigEntities) {
if ("HDFS".equals(sce.getServiceName()) && (sce.getVersion() == 1)) {
Assert.assertEquals("c1", sce.getClusterEntity().getClusterName());
- Assert.assertEquals(Long.valueOf(1), sce.getClusterEntity()
+ Assert.assertEquals(clusterId, sce.getClusterEntity()
.getClusterId());
Assert.assertEquals(Long.valueOf(1111L), sce.getCreateTimestamp());
Assert.assertTrue(sce.getClusterConfigEntities().isEmpty());
Assert.assertNotNull(sce.getServiceConfigId());
} else if ("HDFS".equals(sce.getServiceName()) && (sce.getVersion() == 2)) {
Assert.assertEquals("c1", sce.getClusterEntity().getClusterName());
- Assert.assertEquals(Long.valueOf(1), sce.getClusterEntity()
+ Assert.assertEquals(clusterId, sce.getClusterEntity()
.getClusterId());
Assert.assertEquals(Long.valueOf(2222L), sce.getCreateTimestamp());
Assert.assertTrue(sce.getClusterConfigEntities().isEmpty());
Assert.assertNotNull(sce.getServiceConfigId());
} else if ("YARN".equals(sce.getServiceName())) {
Assert.assertEquals("c1", sce.getClusterEntity().getClusterName());
- Assert.assertEquals(Long.valueOf(1), sce.getClusterEntity()
+ Assert.assertEquals(clusterId, sce.getClusterEntity()
.getClusterId());
Assert.assertEquals(Long.valueOf(3333L), sce.getCreateTimestamp());
Assert.assertEquals(Long.valueOf(1), sce.getVersion());
@@ -457,11 +470,13 @@ public class ServiceConfigDAOTest {
List<ConfigGroupEntity> configGroupEntities = configGroupDAO.findAllByTag("OOZIE");
+ 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("oozie_server", configGroupEntity.getGroupName());
Assert.assertEquals("OOZIE", configGroupEntity.getTag());
@@ -551,7 +566,8 @@ public class ServiceConfigDAOTest {
clusters.addCluster("c1", HDP_01);
initClusterEntitiesWithConfigGroups();
ConfigGroupEntity configGroupEntity1 = new ConfigGroupEntity();
- ClusterEntity clusterEntity = clusterDAO.findById(1L);
+ ClusterEntity clusterEntity = clusterDAO.findByName("c1");
+ Long clusterId = clusterEntity.getClusterId();
configGroupEntity1.setClusterEntity(clusterEntity);
configGroupEntity1.setClusterId(clusterEntity.getClusterId());
configGroupEntity1.setGroupName("toTestDeleteGroup_OOZIE");
@@ -562,11 +578,11 @@ public class ServiceConfigDAOTest {
ConfigGroupEntity testDeleteGroup_OOZIE = configGroupDAO.findByName("toTestDeleteGroup_OOZIE");
createServiceConfigWithGroup("OOZIE", "", 2L, 2L, System.currentTimeMillis(), null,
testDeleteGroup_OOZIE.getGroupId());
- Collection<ServiceConfigEntity> serviceConfigEntityList = serviceConfigDAO.getLastServiceConfigsForService(1L,
+ Collection<ServiceConfigEntity> serviceConfigEntityList = serviceConfigDAO.getLastServiceConfigsForService(clusterId,
"OOZIE");
Assert.assertEquals(2, serviceConfigEntityList.size());
configGroupDAO.remove(configGroupEntity1);
- serviceConfigEntityList = serviceConfigDAO.getLastServiceConfigsForService(1L, "OOZIE");
+ serviceConfigEntityList = serviceConfigDAO.getLastServiceConfigsForService(clusterId, "OOZIE");
Assert.assertEquals(1, serviceConfigEntityList.size());
}
private void initClusterEntities() throws Exception{
@@ -589,6 +605,7 @@ public class ServiceConfigDAOTest {
String oozieSite = "oozie-site";
for (int i = 1; i < 6; i++){
+ Thread.sleep(1);
ClusterConfigEntity entity = new ClusterConfigEntity();
entity.setClusterEntity(clusterEntity);
entity.setClusterId(clusterEntity.getClusterId());
@@ -613,6 +630,7 @@ public class ServiceConfigDAOTest {
clusterEntity.setConfigMappingEntities(entities);
}
+ Thread.sleep(1);
ClusterConfigMappingEntity e1 = new ClusterConfigMappingEntity();
e1.setClusterEntity(clusterEntity);
e1.setClusterId(clusterEntity.getClusterId());
@@ -624,6 +642,7 @@ public class ServiceConfigDAOTest {
entities.add(e1);
clusterDAO.merge(clusterEntity);
+ Thread.sleep(1);
ClusterConfigMappingEntity e2 = new ClusterConfigMappingEntity();
e2.setClusterEntity(clusterEntity);
e2.setClusterId(clusterEntity.getClusterId());
@@ -635,6 +654,7 @@ public class ServiceConfigDAOTest {
entities.add(e2);
clusterDAO.merge(clusterEntity);
+ Thread.sleep(1);
ClusterConfigMappingEntity e3 = new ClusterConfigMappingEntity();
e3.setClusterEntity(clusterEntity);
e3.setClusterId(clusterEntity.getClusterId());
@@ -666,6 +686,7 @@ public class ServiceConfigDAOTest {
int count = 3;
for (int i = 1; i < count; i++){
+ Thread.sleep(1);
ClusterConfigEntity entity = new ClusterConfigEntity();
entity.setClusterEntity(clusterEntity);
entity.setClusterId(clusterEntity.getClusterId());
@@ -686,6 +707,7 @@ public class ServiceConfigDAOTest {
clusterEntity.setConfigMappingEntities(entities);
}
+ Thread.sleep(1);
ClusterConfigMappingEntity e1 = new ClusterConfigMappingEntity();
e1.setClusterEntity(clusterEntity);
e1.setClusterId(clusterEntity.getClusterId());
@@ -697,6 +719,7 @@ public class ServiceConfigDAOTest {
entities.add(e1);
clusterDAO.merge(clusterEntity);
+ Thread.sleep(1);
ClusterConfigMappingEntity e2 = new ClusterConfigMappingEntity();
e2.setClusterEntity(clusterEntity);
e2.setClusterId(clusterEntity.getClusterId());
@@ -749,6 +772,7 @@ public class ServiceConfigDAOTest {
config.setClusterId(clusterEntity.getClusterId());
clusterDAO.createConfig(config);
+ Thread.sleep(1);
ConfigGroupConfigMappingEntity configMappingEntity = new
ConfigGroupConfigMappingEntity();
configMappingEntity.setClusterId(clusterEntity.getClusterId());
@@ -766,4 +790,4 @@ public class ServiceConfigDAOTest {
configGroupDAO.merge(configGroupEntity);
}
}
-}
\ 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/SettingDAOTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/SettingDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/SettingDAOTest.java
index 4029bae..b96a7b2 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/SettingDAOTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/SettingDAOTest.java
@@ -24,10 +24,12 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
+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;
import org.apache.ambari.server.orm.entities.SettingEntity;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -46,6 +48,11 @@ public class SettingDAOTest {
injector.getInstance(OrmTestHelper.class).createCluster();
}
+ @After
+ public void teardown() throws Exception {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
+ }
+
@Test
public void testCRUD() {
Map<String, SettingEntity> entities = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/StageDAOTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/StageDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/StageDAOTest.java
index 0215a0e..1f71af2 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/StageDAOTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/StageDAOTest.java
@@ -21,11 +21,14 @@ 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.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.controller.internal.SortRequestImpl;
import org.apache.ambari.server.controller.internal.StageResourceProvider;
import org.apache.ambari.server.controller.spi.Predicate;
@@ -45,7 +48,6 @@ import org.junit.Test;
import com.google.inject.Guice;
import com.google.inject.Injector;
-import com.google.inject.persist.PersistService;
/**
* StageDAO tests.
@@ -90,8 +92,8 @@ public class StageDAOTest {
}
@After
- public void teardown() {
- injector.getInstance(PersistService.class).stop();
+ public void teardown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
injector = null;
}
@@ -174,4 +176,4 @@ public class StageDAOTest {
lastInfo = currentInfo;
}
}
-}
\ 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/TopologyLogicalRequestDAOTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/TopologyLogicalRequestDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/TopologyLogicalRequestDAOTest.java
index 3e7ba68..fef76c8 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/TopologyLogicalRequestDAOTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/TopologyLogicalRequestDAOTest.java
@@ -17,11 +17,13 @@
*/
package org.apache.ambari.server.orm.dao;
+import java.sql.SQLException;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
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;
@@ -39,7 +41,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;
@@ -63,8 +64,8 @@ public class TopologyLogicalRequestDAOTest {
}
@After
- public void teardown() throws AmbariException {
- injector.getInstance(PersistService.class).stop();
+ public void teardown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
private void create() {
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/TopologyRequestDAOTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/TopologyRequestDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/TopologyRequestDAOTest.java
index c85dceb..5f1490c 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/TopologyRequestDAOTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/TopologyRequestDAOTest.java
@@ -17,11 +17,13 @@
*/
package org.apache.ambari.server.orm.dao;
+import java.sql.SQLException;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
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;
@@ -34,7 +36,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;
@@ -54,8 +55,8 @@ public class TopologyRequestDAOTest {
}
@After
- public void teardown() throws AmbariException {
- injector.getInstance(PersistService.class).stop();
+ public void teardown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
private void create() {
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/UpgradeDAOTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/UpgradeDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/UpgradeDAOTest.java
index ae85241..3c5970d 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/UpgradeDAOTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/UpgradeDAOTest.java
@@ -22,10 +22,13 @@ 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.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.actionmanager.HostRoleStatus;
import org.apache.ambari.server.orm.GuiceJpaInitializer;
import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
@@ -46,7 +49,6 @@ import org.junit.Test;
import com.google.inject.Guice;
import com.google.inject.Injector;
-import com.google.inject.persist.PersistService;
/**
* Tests {@link AlertDefinitionDAO} for interacting with
@@ -68,6 +70,7 @@ public class UpgradeDAOTest {
@Before
public void setup() throws Exception {
injector = Guice.createInjector(new InMemoryDefaultTestModule());
+ H2DatabaseCleaner.resetSequences(injector);
injector.getInstance(GuiceJpaInitializer.class);
dao = injector.getInstance(UpgradeDAO.class);
@@ -107,8 +110,8 @@ public class UpgradeDAOTest {
}
@After
- public void teardown() {
- injector.getInstance(PersistService.class).stop();
+ public void teardown() 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/WidgetDAOTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/WidgetDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/WidgetDAOTest.java
index 8be805a..1f03f8f 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/WidgetDAOTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/WidgetDAOTest.java
@@ -18,9 +18,12 @@
package org.apache.ambari.server.orm.dao;
+import java.sql.SQLException;
import java.util.LinkedList;
import java.util.List;
+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;
@@ -34,7 +37,6 @@ import org.junit.Test;
import com.google.inject.Guice;
import com.google.inject.Injector;
-import com.google.inject.persist.PersistService;
/**
* WidgetDAO unit tests.
@@ -121,8 +123,8 @@ public class WidgetDAOTest {
}
@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/WidgetLayoutDAOTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/WidgetLayoutDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/WidgetLayoutDAOTest.java
index f50ae44..dc79b6f 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/WidgetLayoutDAOTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/WidgetLayoutDAOTest.java
@@ -18,9 +18,12 @@
package org.apache.ambari.server.orm.dao;
+import java.sql.SQLException;
import java.util.LinkedList;
import java.util.List;
+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;
@@ -34,7 +37,6 @@ import org.junit.Test;
import com.google.inject.Guice;
import com.google.inject.Injector;
-import com.google.inject.persist.PersistService;
/**
* WidgetLayoutDAO unit tests.
@@ -130,8 +132,8 @@ public class WidgetLayoutDAOTest {
}
@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/scheduler/ExecutionScheduleManagerTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/scheduler/ExecutionScheduleManagerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/scheduler/ExecutionScheduleManagerTest.java
index aa6ab1c..726972b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/scheduler/ExecutionScheduleManagerTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/scheduler/ExecutionScheduleManagerTest.java
@@ -38,6 +38,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.actionmanager.ActionDBAccessor;
import org.apache.ambari.server.actionmanager.HostRoleStatus;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
@@ -82,7 +83,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;
@@ -131,7 +131,7 @@ public class ExecutionScheduleManagerTest {
@AfterClass
public static void teardown() throws Exception {
executionScheduleManager.stop();
- injector.getInstance(PersistService.class).stop();
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
public static class TestExecutionScheduler extends ExecutionSchedulerImpl {
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/security/AmbariLdapUtilsTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/AmbariLdapUtilsTest.java b/ambari-server/src/test/java/org/apache/ambari/server/security/AmbariLdapUtilsTest.java
index 46f9689..1f2010d 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/security/AmbariLdapUtilsTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/security/AmbariLdapUtilsTest.java
@@ -29,7 +29,6 @@ import static org.easymock.EasyMock.verify;
import javax.naming.Name;
import javax.naming.NamingException;
-
import org.apache.ambari.server.security.authorization.AmbariLdapUtils;
import org.junit.Assert;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/security/authentication/AmbariBasicAuthenticationFilterTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/authentication/AmbariBasicAuthenticationFilterTest.java b/ambari-server/src/test/java/org/apache/ambari/server/security/authentication/AmbariBasicAuthenticationFilterTest.java
index 1e1c72f..18c4cce 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/security/authentication/AmbariBasicAuthenticationFilterTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/security/authentication/AmbariBasicAuthenticationFilterTest.java
@@ -41,6 +41,7 @@ import org.junit.Before;
import org.junit.Test;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.crypto.codec.Base64;
public class AmbariBasicAuthenticationFilterTest extends EasyMockSupport {
@@ -63,13 +64,14 @@ public class AmbariBasicAuthenticationFilterTest extends EasyMockSupport {
@Test
public void testDoFilter() throws IOException, ServletException {
+ SecurityContextHolder.getContext().setAuthentication(null);
// GIVEN
HttpServletRequest request = createMock(HttpServletRequest.class);
HttpServletResponse response = createMock(HttpServletResponse.class);
FilterChain filterChain = createMock(FilterChain.class);
expect(request.getHeader("Authorization")).andReturn("Basic ").andReturn(null);
- expect(request.getHeader("X-Forwarded-For")).andReturn("1.2.3.4");
- expect(mockedAuditLogger.isEnabled()).andReturn(true);
+ expect(request.getHeader("X-Forwarded-For")).andReturn("1.2.3.4").anyTimes();
+ expect(mockedAuditLogger.isEnabled()).andReturn(true).anyTimes();
mockedAuditLogger.log(anyObject(AuditEvent.class));
expectLastCall().times(1);
filterChain.doFilter(request, response);
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariLdapAuthenticationProviderForDNWithSpaceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariLdapAuthenticationProviderForDNWithSpaceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariLdapAuthenticationProviderForDNWithSpaceTest.java
index c18eef5..819668a 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariLdapAuthenticationProviderForDNWithSpaceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariLdapAuthenticationProviderForDNWithSpaceTest.java
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertTrue;
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;
@@ -45,7 +46,6 @@ import org.springframework.security.core.Authentication;
import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.Injector;
-import com.google.inject.persist.PersistService;
@RunWith(FrameworkRunner.class)
@CreateDS(allowAnonAccess = true,
@@ -93,7 +93,7 @@ public class AmbariLdapAuthenticationProviderForDNWithSpaceTest extends AmbariLd
@After
public void tearDown() throws Exception {
- injector.getInstance(PersistService.class).stop();
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
@Test(expected = InvalidUsernamePasswordCombinationException.class)
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariLdapAuthenticationProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariLdapAuthenticationProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariLdapAuthenticationProviderTest.java
index 2a2e2a3..37c6cb3 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariLdapAuthenticationProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariLdapAuthenticationProviderTest.java
@@ -26,6 +26,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+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.orm.GuiceJpaInitializer;
@@ -51,7 +52,6 @@ import org.springframework.security.core.Authentication;
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;
@@ -101,7 +101,7 @@ public class AmbariLdapAuthenticationProviderTest extends AmbariLdapAuthenticati
@After
public void tearDown() throws Exception {
- injector.getInstance(PersistService.class).stop();
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
@Test(expected = InvalidUsernamePasswordCombinationException.class)
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariLocalUserProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariLocalUserProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariLocalUserProviderTest.java
index 4ab7a5a..9ff381f 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariLocalUserProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariLocalUserProviderTest.java
@@ -25,12 +25,14 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.audit.AuditLoggerModule;
import org.apache.ambari.server.orm.GuiceJpaInitializer;
import org.apache.ambari.server.orm.OrmTestHelper;
import org.apache.ambari.server.orm.dao.UserDAO;
import org.apache.ambari.server.orm.entities.PrincipalEntity;
import org.apache.ambari.server.orm.entities.UserEntity;
+import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -65,6 +67,11 @@ public class AmbariLocalUserProviderTest {
SecurityContextHolder.getContext().setAuthentication(null);
}
+ @AfterClass
+ public static void tearDown() throws Exception {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
+ }
+
@Test
public void testSuccessfulAuth() {
Users users = createMock(Users.class);
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariPamAuthenticationProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariPamAuthenticationProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariPamAuthenticationProviderTest.java
index 2a6c754..99d0055 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariPamAuthenticationProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariPamAuthenticationProviderTest.java
@@ -24,6 +24,7 @@ import static org.easymock.EasyMock.expect;
import java.util.Arrays;
import java.util.HashSet;
+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.orm.GuiceJpaInitializer;
@@ -41,7 +42,6 @@ import org.springframework.security.core.AuthenticationException;
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;
@@ -65,7 +65,7 @@ public class AmbariPamAuthenticationProviderTest {
@After
public void tearDown() throws Exception {
- injector.getInstance(PersistService.class).stop();
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
@Test(expected = AuthenticationException.class)
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/TestUsers.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/TestUsers.java b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/TestUsers.java
index e15c648..2ca5396 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/TestUsers.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/TestUsers.java
@@ -23,9 +23,11 @@ import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+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.orm.GuiceJpaInitializer;
import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
import org.apache.ambari.server.orm.dao.GroupDAO;
@@ -54,7 +56,6 @@ import org.springframework.security.crypto.password.PasswordEncoder;
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;
@@ -117,8 +118,8 @@ public class TestUsers {
}
@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/security/ldap/LdapPerformanceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/LdapPerformanceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/LdapPerformanceTest.java
index f770f4c..02e67f5 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/LdapPerformanceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/security/ldap/LdapPerformanceTest.java
@@ -18,15 +18,18 @@
package org.apache.ambari.server.security.ldap;
+import java.sql.SQLException;
import java.util.HashSet;
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.orm.GuiceJpaInitializer;
import org.apache.ambari.server.security.ClientSecurityType;
import org.apache.ambari.server.security.authorization.AuthorizationTestModule;
import org.apache.ambari.server.security.authorization.Users;
+import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
@@ -74,6 +77,11 @@ public class LdapPerformanceTest {
configuration.setProperty(Configuration.LDAP_MANAGER_PASSWORD.getKey(), "hdfs");
}
+ @After
+ public void tearDown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
+ }
+
@Test
public void testLdapSync() throws AmbariException, InterruptedException {
long time = System.currentTimeMillis();
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/serveraction/ServerActionExecutorTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/ServerActionExecutorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/ServerActionExecutorTest.java
index c3ada2b..44d5b63 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/ServerActionExecutorTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/ServerActionExecutorTest.java
@@ -31,6 +31,7 @@ import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -38,6 +39,8 @@ 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.ActionDBAccessor;
@@ -53,6 +56,7 @@ import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.svccomphost.ServiceComponentHostServerActionEvent;
import org.apache.ambari.server.utils.StageUtils;
import org.easymock.IAnswer;
+import org.junit.After;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
@@ -83,6 +87,11 @@ public class ServerActionExecutorTest {
injector = Guice.createInjector(new MockModule());
}
+ @After
+ public void tearDown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
+ }
+
/**
* Test a normal server action
*/
@@ -339,4 +348,4 @@ public class ServerActionExecutorTest {
bind(Clusters.class).toInstance(mock(Clusters.class));
}
}
-}
\ 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/serveraction/kerberos/KerberosServerActionTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosServerActionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosServerActionTest.java
index 140277e..863e4f5 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosServerActionTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosServerActionTest.java
@@ -227,4 +227,4 @@ public class KerberosServerActionTest {
verify(kerberosHelper);
}
-}
\ 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/serveraction/upgrades/AutoSkipFailedSummaryActionTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/AutoSkipFailedSummaryActionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/AutoSkipFailedSummaryActionTest.java
index 8dc4c1b..9f27257 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/AutoSkipFailedSummaryActionTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/AutoSkipFailedSummaryActionTest.java
@@ -32,6 +32,9 @@ import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import javax.persistence.EntityManager;
+
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.Role;
import org.apache.ambari.server.RoleCommand;
import org.apache.ambari.server.actionmanager.ExecutionCommandWrapper;
@@ -66,7 +69,6 @@ import com.google.inject.AbstractModule;
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;
import com.google.inject.util.Modules;
@@ -120,7 +122,7 @@ public class AutoSkipFailedSummaryActionTest {
@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());
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ComponentVersionCheckActionTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ComponentVersionCheckActionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ComponentVersionCheckActionTest.java
index 80a3bc5..ffbb6f7 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ComponentVersionCheckActionTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ComponentVersionCheckActionTest.java
@@ -26,7 +26,10 @@ import java.util.HashMap;
import java.util.List;
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.ServiceComponentNotFoundException;
import org.apache.ambari.server.ServiceNotFoundException;
import org.apache.ambari.server.actionmanager.ExecutionCommandWrapper;
@@ -69,7 +72,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 com.google.inject.persist.UnitOfWork;
/**
@@ -126,7 +128,7 @@ public class ComponentVersionCheckActionTest {
@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 makeUpgradeCluster(StackId sourceStack, String sourceRepo, StackId targetStack, String targetRepo) throws Exception {
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ConfigureActionTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ConfigureActionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ConfigureActionTest.java
index cd8327b..976dea4 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ConfigureActionTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ConfigureActionTest.java
@@ -28,7 +28,10 @@ import java.util.HashMap;
import java.util.List;
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.ServiceNotFoundException;
import org.apache.ambari.server.actionmanager.ExecutionCommandWrapper;
import org.apache.ambari.server.actionmanager.HostRoleCommand;
@@ -72,7 +75,6 @@ import com.google.gson.Gson;
import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.Injector;
-import com.google.inject.persist.PersistService;
/**
* Tests upgrade-related server side actions
@@ -118,7 +120,7 @@ public class ConfigureActionTest {
@After
public void teardown() throws Exception {
- m_injector.getInstance(PersistService.class).stop();
+ 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/serveraction/upgrades/UpgradeActionTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeActionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeActionTest.java
index 72d0f13..42a4ac5 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeActionTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeActionTest.java
@@ -29,7 +29,10 @@ import java.util.HashMap;
import java.util.List;
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.ServiceComponentNotFoundException;
import org.apache.ambari.server.ServiceNotFoundException;
import org.apache.ambari.server.actionmanager.ExecutionCommandWrapper;
@@ -94,7 +97,6 @@ import com.google.gson.JsonObject;
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;
/**
@@ -174,7 +176,7 @@ public class UpgradeActionTest {
@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 makeDowngradeCluster(StackId sourceStack, String sourceRepo, StackId targetStack, String targetRepo) throws Exception {
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/stageplanner/TestStagePlanner.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stageplanner/TestStagePlanner.java b/ambari-server/src/test/java/org/apache/ambari/server/stageplanner/TestStagePlanner.java
index 7a37224..7063147 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/stageplanner/TestStagePlanner.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/stageplanner/TestStagePlanner.java
@@ -21,9 +21,11 @@ import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+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.Role;
import org.apache.ambari.server.RoleCommand;
import org.apache.ambari.server.actionmanager.CommandExecutionType;
@@ -45,7 +47,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;
public class TestStagePlanner {
@@ -68,8 +69,8 @@ public class TestStagePlanner {
}
@After
- public void teardown() {
- injector.getInstance(PersistService.class).stop();
+ public void teardown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
@Test
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigGroupTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigGroupTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigGroupTest.java
index f55bf62..c70dcc6 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigGroupTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigGroupTest.java
@@ -17,11 +17,13 @@
*/
package org.apache.ambari.server.state;
+import java.sql.SQLException;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
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.dao.ConfigGroupDAO;
@@ -37,7 +39,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.Transactional;
import junit.framework.Assert;
@@ -75,8 +76,8 @@ public class ConfigGroupTest {
}
@After
- public void teardown() throws AmbariException {
- injector.getInstance(PersistService.class).stop();
+ public void teardown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
@Transactional
@@ -97,7 +98,7 @@ public class ConfigGroupTest {
Map<Long, Host> hosts = new HashMap<Long, Host>();
configs.put(config.getType(), config);
- hosts.put(1L, host);
+ hosts.put(host.getHostId(), host);
ConfigGroup configGroup = configGroupFactory.createNew(cluster, "cg-test",
"HDFS", "New HDFS configs for h1", configs, hosts);
@@ -213,13 +214,15 @@ public class ConfigGroupTest {
configGroup = cluster.getConfigGroups().get(id);
Assert.assertNotNull(configGroup);
+ long hostId = clusters.getHost("h1").getHostId();
+
clusters.unmapHostFromCluster("h1", clusterName);
Assert.assertNull(clusters.getHostsForCluster(clusterName).get("h1"));
// Assumes that 1L is the id of host h1, as specified in createConfigGroup
- Assert.assertNotNull(configGroupHostMappingDAO.findByHostId(1L));
- Assert.assertTrue(configGroupHostMappingDAO.findByHostId(1L).isEmpty());
- Assert.assertFalse(configGroup.getHosts().containsKey(1L));
+ Assert.assertNotNull(configGroupHostMappingDAO.findByHostId(hostId));
+ Assert.assertTrue(configGroupHostMappingDAO.findByHostId(hostId).isEmpty());
+ Assert.assertFalse(configGroup.getHosts().containsKey(hostId));
}
@Test
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigHelperTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigHelperTest.java
index 1e65fc2..5d849c9 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigHelperTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigHelperTest.java
@@ -23,6 +23,7 @@ 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.Arrays;
import java.util.Collection;
@@ -36,6 +37,7 @@ import java.util.Set;
import javax.persistence.EntityManager;
import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.actionmanager.RequestFactory;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.controller.AmbariCustomCommandExecutionHelper;
@@ -69,7 +71,6 @@ import org.springframework.security.core.context.SecurityContextHolder;
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.persist.Transactional;
import junit.framework.Assert;
@@ -222,8 +223,8 @@ public class ConfigHelperTest {
}
@AfterClass
- public static void tearDown() {
- injector.getInstance(PersistService.class).stop();
+ public static 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/state/ConfigMergeHelperTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigMergeHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigMergeHelperTest.java
index 112d3c5..b821976 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigMergeHelperTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigMergeHelperTest.java
@@ -26,11 +26,14 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
+import java.sql.SQLException;
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.api.services.AmbariMetaInfo;
import org.apache.ambari.server.orm.GuiceJpaInitializer;
import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
@@ -42,7 +45,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;
/**
@@ -76,8 +78,8 @@ public class ConfigMergeHelperTest {
}
@After
- public void teardown() {
- injector.getInstance(PersistService.class).stop();
+ public void teardown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
@Test
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/state/RequestExecutionTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/RequestExecutionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/RequestExecutionTest.java
index 31d3028..55aefb4 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/RequestExecutionTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/RequestExecutionTest.java
@@ -21,6 +21,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.controller.RequestScheduleResponse;
import org.apache.ambari.server.orm.GuiceJpaInitializer;
@@ -41,7 +42,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.Transactional;
import junit.framework.Assert;
@@ -78,7 +78,7 @@ public class RequestExecutionTest {
@After
public void teardown() throws Exception {
- injector.getInstance(PersistService.class).stop();
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
@Transactional
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceComponentTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceComponentTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceComponentTest.java
index 0f615ee..e7572f4 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceComponentTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceComponentTest.java
@@ -22,11 +22,13 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
+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.api.services.AmbariMetaInfo;
import org.apache.ambari.server.controller.ServiceComponentResponse;
import org.apache.ambari.server.orm.GuiceJpaInitializer;
@@ -54,7 +56,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;
@@ -107,8 +108,8 @@ public class ServiceComponentTest {
}
@After
- public void teardown() throws AmbariException {
- injector.getInstance(PersistService.class).stop();
+ public void teardown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
@Test
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceTest.java
index ff6dfc9..7cb9a74 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/ServiceTest.java
@@ -21,10 +21,12 @@ package org.apache.ambari.server.state;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
+import java.sql.SQLException;
import java.util.HashMap;
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.controller.ServiceResponse;
import org.apache.ambari.server.orm.GuiceJpaInitializer;
@@ -37,7 +39,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 ServiceTest {
}
@After
- public void teardown() throws AmbariException {
- injector.getInstance(PersistService.class).stop();
+ public void teardown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
@Test
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java
index 7be9419..8e5ad0a 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/UpgradeHelperTest.java
@@ -25,6 +25,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.lang.reflect.Field;
+import java.sql.SQLException;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -38,6 +39,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
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;
@@ -86,7 +88,6 @@ import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Module;
import com.google.inject.assistedinject.FactoryModuleBuilder;
-import com.google.inject.persist.PersistService;
import com.google.inject.util.Modules;
/**
@@ -140,7 +141,9 @@ public class UpgradeHelperTest {
// create an injector which will inject the mocks
injector = Guice.createInjector(Modules.override(injectorModule).with(mockModule));
+ H2DatabaseCleaner.resetSequences(injector);
injector.getInstance(GuiceJpaInitializer.class);
+
EventBusSynchronizer.synchronizeAmbariEventPublisher(injector);
EventBusSynchronizer.synchronizeAlertEventPublisher(injector);
@@ -158,8 +161,8 @@ public class UpgradeHelperTest {
}
@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/state/alerts/AggregateAlertListenerTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AggregateAlertListenerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AggregateAlertListenerTest.java
index 4c49ab3..c4c97d1 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AggregateAlertListenerTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AggregateAlertListenerTest.java
@@ -17,6 +17,9 @@
*/
package org.apache.ambari.server.state.alerts;
+import javax.persistence.EntityManager;
+
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.events.AlertReceivedEvent;
import org.apache.ambari.server.events.AlertStateChangeEvent;
import org.apache.ambari.server.events.MockEventListener;
@@ -45,7 +48,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;
import junit.framework.Assert;
@@ -84,7 +86,7 @@ public class AggregateAlertListenerTest {
*/
@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/state/alerts/AlertEventPublisherTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertEventPublisherTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertEventPublisherTest.java
index 015660c..e50dba5 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertEventPublisherTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertEventPublisherTest.java
@@ -19,6 +19,7 @@ package org.apache.ambari.server.state.alerts;
import java.util.UUID;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.events.AlertDefinitionChangedEvent;
import org.apache.ambari.server.events.AlertDefinitionDeleteEvent;
import org.apache.ambari.server.events.AmbariEvent;
@@ -54,7 +55,6 @@ import org.junit.experimental.categories.Category;
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;
@@ -105,7 +105,7 @@ public class AlertEventPublisherTest {
*/
@After
public void teardown() throws Exception {
- injector.getInstance(PersistService.class).stop();
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
injector = null;
}
@@ -161,7 +161,7 @@ public class AlertEventPublisherTest {
installHdfsService();
int definitionCount = definitionDao.findAll().size();
- AlertDefinitionEntity definition = ormHelper.createAlertDefinition(1L);
+ AlertDefinitionEntity definition = ormHelper.createAlertDefinition(cluster.getClusterId());
Assert.assertEquals(definitionCount + 1, definitionDao.findAll().size());
AggregateSource source = new AggregateSource();
@@ -175,7 +175,7 @@ public class AlertEventPublisherTest {
source.setType(SourceType.AGGREGATE);
AlertDefinitionEntity aggregateEntity = new AlertDefinitionEntity();
- aggregateEntity.setClusterId(1L);
+ aggregateEntity.setClusterId(cluster.getClusterId());
aggregateEntity.setComponentName("DATANODE");
aggregateEntity.setEnabled(true);
aggregateEntity.setDefinitionName("datanode_aggregate");
@@ -190,7 +190,7 @@ public class AlertEventPublisherTest {
definitionDao.create(aggregateEntity);
// pull it out of the mapping and compare fields
- AlertDefinition aggregate = aggregateMapping.getAggregateDefinition(1L,
+ AlertDefinition aggregate = aggregateMapping.getAggregateDefinition(cluster.getClusterId(),
source.getAlertName());
Assert.assertNotNull(aggregate);
@@ -207,7 +207,7 @@ public class AlertEventPublisherTest {
definitionDao.merge(aggregateEntity);
// check the aggregate mapping for the new value
- aggregate = aggregateMapping.getAggregateDefinition(1L,
+ aggregate = aggregateMapping.getAggregateDefinition(cluster.getClusterId(),
source.getAlertName());
Assert.assertNotNull(aggregate);
@@ -272,14 +272,14 @@ public class AlertEventPublisherTest {
@Test
public void testAlertDefinitionRemoval() throws Exception {
Assert.assertEquals(0, definitionDao.findAll().size());
- AlertDefinitionEntity definition = ormHelper.createAlertDefinition(1L);
+ AlertDefinitionEntity definition = ormHelper.createAlertDefinition(cluster.getClusterId());
Assert.assertEquals(1, definitionDao.findAll().size());
AggregateSource source = new AggregateSource();
source.setAlertName(definition.getDefinitionName());
AlertDefinition aggregate = new AlertDefinition();
- aggregate.setClusterId(1L);
+ aggregate.setClusterId(cluster.getClusterId());
aggregate.setComponentName("DATANODE");
aggregate.setEnabled(true);
aggregate.setInterval(1);
@@ -290,13 +290,13 @@ public class AlertEventPublisherTest {
aggregate.setSource(source);
aggregate.setUuid("uuid");
- aggregateMapping.registerAggregate(1L, aggregate);
- Assert.assertNotNull(aggregateMapping.getAggregateDefinition(1L,
+ aggregateMapping.registerAggregate(cluster.getClusterId(), aggregate);
+ Assert.assertNotNull(aggregateMapping.getAggregateDefinition(cluster.getClusterId(),
source.getAlertName()));
definitionDao.remove(definition);
- Assert.assertNull(aggregateMapping.getAggregateDefinition(1L,
+ Assert.assertNull(aggregateMapping.getAggregateDefinition(cluster.getClusterId(),
source.getAlertName()));
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertReceivedListenerTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertReceivedListenerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertReceivedListenerTest.java
index ede94dc..68395b5 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertReceivedListenerTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertReceivedListenerTest.java
@@ -19,6 +19,7 @@ package org.apache.ambari.server.state.alerts;
import static org.junit.Assert.assertEquals;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -26,6 +27,10 @@ import java.util.List;
import java.util.Map;
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.RootServiceResponseFactory.Components;
import org.apache.ambari.server.controller.RootServiceResponseFactory.Services;
import org.apache.ambari.server.events.AlertReceivedEvent;
@@ -60,7 +65,6 @@ import org.junit.experimental.categories.Category;
import com.google.inject.Guice;
import com.google.inject.Injector;
-import com.google.inject.persist.PersistService;
import com.google.inject.persist.UnitOfWork;
/**
@@ -131,9 +135,9 @@ public class AlertReceivedListenerTest {
}
@After
- public void teardown() {
+ public void teardown() throws AmbariException, SQLException {
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/state/alerts/AlertStateChangedEventTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertStateChangedEventTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertStateChangedEventTest.java
index 5dd04d7..c21ed6b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertStateChangedEventTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertStateChangedEventTest.java
@@ -23,6 +23,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.controller.RootServiceResponseFactory.Services;
import org.apache.ambari.server.events.AggregateAlertRecalculateEvent;
import org.apache.ambari.server.events.AlertEvent;
@@ -58,7 +59,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;
import junit.framework.Assert;
@@ -101,7 +101,7 @@ public class AlertStateChangedEventTest extends EasyMockSupport {
*/
@After
public void teardown() throws Exception {
- 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/state/alerts/InitialAlertEventTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/InitialAlertEventTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/InitialAlertEventTest.java
index 85d13a6..483aac5 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/InitialAlertEventTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/InitialAlertEventTest.java
@@ -19,6 +19,9 @@ package org.apache.ambari.server.state.alerts;
import java.util.List;
+import javax.persistence.EntityManager;
+
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.events.AlertReceivedEvent;
import org.apache.ambari.server.events.InitialAlertEvent;
import org.apache.ambari.server.events.MockEventListener;
@@ -48,7 +51,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;
import junit.framework.Assert;
@@ -112,7 +114,7 @@ public class InitialAlertEventTest {
*/
@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/state/cluster/AlertDataManagerTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/AlertDataManagerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/AlertDataManagerTest.java
index 4f56d77..05aeddb 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/AlertDataManagerTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/AlertDataManagerTest.java
@@ -23,12 +23,17 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.lang.reflect.Field;
+import java.sql.SQLException;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicReference;
+import javax.persistence.EntityManager;
+
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.events.AlertEvent;
import org.apache.ambari.server.events.AlertReceivedEvent;
import org.apache.ambari.server.events.AlertStateChangeEvent;
@@ -75,7 +80,6 @@ import com.google.common.eventbus.Subscribe;
import com.google.gson.Gson;
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;
@@ -146,9 +150,9 @@ public class AlertDataManagerTest {
}
@After
- public void teardown() {
+ public void teardown() throws AmbariException, SQLException {
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/state/cluster/ClusterDeadlockTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterDeadlockTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterDeadlockTest.java
index 9dc405e..76146b5 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterDeadlockTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterDeadlockTest.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;
@@ -27,6 +28,7 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
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;
@@ -60,7 +62,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;
/**
@@ -147,8 +148,8 @@ public class ClusterDeadlockTest {
}
@After
- public void teardown() {
- injector.getInstance(PersistService.class).stop();
+ public void teardown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterImplTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterImplTest.java
index 401527a..3172571 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterImplTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterImplTest.java
@@ -29,10 +29,13 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.sql.SQLException;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.H2DatabaseCleaner;
import org.apache.ambari.server.HostNotFoundException;
import org.apache.ambari.server.controller.AmbariSessionManager;
import org.apache.ambari.server.orm.GuiceJpaInitializer;
@@ -44,6 +47,7 @@ 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.StackId;
+import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -59,11 +63,16 @@ public class ClusterImplTest {
@BeforeClass
public static void setUpClass() throws Exception {
- Injector injector = Guice.createInjector(new InMemoryDefaultTestModule());
+ injector = Guice.createInjector(new InMemoryDefaultTestModule());
injector.getInstance(GuiceJpaInitializer.class);
clusters = injector.getInstance(Clusters.class);
}
+ @AfterClass
+ public static void teardown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
+ }
+
@Test
public void testAddSessionAttributes() throws Exception {
Map<String, Object> attributes = new HashMap<String, Object>();
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java
index 44c5f29..6cdfbad 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java
@@ -30,6 +30,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import java.lang.reflect.Field;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -48,6 +49,7 @@ 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.agent.AgentEnv;
import org.apache.ambari.server.agent.AgentEnv.Directory;
import org.apache.ambari.server.agent.DiskInfo;
@@ -123,7 +125,6 @@ import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Singleton;
-import com.google.inject.persist.PersistService;
import com.google.inject.persist.Transactional;
import com.google.inject.persist.UnitOfWork;
import com.google.inject.util.Modules;
@@ -214,9 +215,9 @@ public class ClusterTest {
}
@After
- public void teardown() {
+ public void teardown() throws AmbariException, SQLException {
injector.getInstance(UnitOfWork.class).end();
- injector.getInstance(PersistService.class).stop();
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
private void createDefaultCluster() throws Exception {
@@ -354,7 +355,7 @@ public class ClusterTest {
clusters.addCluster(clusterName, stackId);
Cluster cluster = clusters.getCluster(clusterName);
Assert.assertEquals(clusterName, cluster.getClusterName());
- Assert.assertEquals(1, cluster.getClusterId());
+ //Assert.assertEquals(1, cluster.getClusterId());
// Add Hosts
List<String> hostNames = new ArrayList<String>() {{ add("h-1"); add("h-2"); add("h-3"); }};
@@ -981,6 +982,7 @@ public class ClusterTest {
res = c1.getDesiredConfigByType("core-site");
Assert.assertNull("Expected null config", res);
+ Thread.sleep(1);
c1.addDesiredConfig("_test", Collections.singleton(config2));
res = c1.getDesiredConfigByType("global");
Assert.assertEquals("Expected version tag to be 'version2'", "version2", res.getTag());
@@ -1009,6 +1011,7 @@ public class ClusterTest {
}
c1.addDesiredConfig("_test1", Collections.singleton(config1));
+ Thread.sleep(1);
c1.addDesiredConfig("_test3", Collections.singleton(config3));
Map<String, DesiredConfig> desiredConfigs = c1.getDesiredConfigs();
@@ -1023,9 +1026,11 @@ public class ClusterTest {
Assert.assertTrue("Expect no host-level overrides",
(null == dc.getHostOverrides() || dc.getHostOverrides().size() == 0));
+ Thread.sleep(1);
c1.addDesiredConfig("_test2", Collections.singleton(config2));
Assert.assertEquals("_test2", c1.getDesiredConfigs().get(config2.getType()).getUser());
+ Thread.sleep(1);
c1.addDesiredConfig("_test1", Collections.singleton(config1));
// setup a host that also has a config override
@@ -2165,7 +2170,6 @@ public class ClusterTest {
clusters.addCluster(clusterName, stackId);
Cluster c1 = clusters.getCluster(clusterName);
Assert.assertEquals(clusterName, c1.getClusterName());
- Assert.assertEquals(1, c1.getClusterId());
clusters.addHost("h-1");
clusters.addHost("h-2");
@@ -2234,7 +2238,6 @@ public class ClusterTest {
clusters.addCluster(clusterName, stackId);
final Cluster c1 = clusters.getCluster(clusterName);
Assert.assertEquals(clusterName, c1.getClusterName());
- Assert.assertEquals(1, c1.getClusterId());
clusters.addHost("h-1");
clusters.addHost("h-2");
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a7906c8/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersDeadlockTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersDeadlockTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersDeadlockTest.java
index 27e6e13..2f289bb 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersDeadlockTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClustersDeadlockTest.java
@@ -18,6 +18,7 @@
package org.apache.ambari.server.state.cluster;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -26,6 +27,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
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;
@@ -55,7 +57,6 @@ import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Module;
import com.google.inject.Provider;
-import com.google.inject.persist.PersistService;
import com.google.inject.util.Modules;
import junit.framework.Assert;
@@ -120,8 +121,8 @@ public class ClustersDeadlockTest {
}
@After
- public void teardown() {
- injector.getInstance(PersistService.class).stop();
+ public void teardown() throws AmbariException, SQLException {
+ H2DatabaseCleaner.clearDatabaseAndStopPersistenceService(injector);
}
/**