Repository: ambari Updated Branches: refs/heads/trunk cc4a9a3e0 -> 69197e630
http://git-wip-us.apache.org/repos/asf/ambari/blob/69197e63/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 6491f8d..122b9a9 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 @@ -17,6 +17,10 @@ */ package org.apache.ambari.server.controller.internal; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; + import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -44,11 +48,11 @@ import org.apache.ambari.server.orm.GuiceJpaInitializer; import org.apache.ambari.server.orm.InMemoryDefaultTestModule; import org.apache.ambari.server.state.Cluster; import org.apache.ambari.server.state.Clusters; -import org.apache.ambari.server.state.StackId; -import org.apache.ambari.server.state.State; 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.apache.ambari.server.state.State; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -58,10 +62,6 @@ import com.google.inject.Guice; import com.google.inject.Injector; import com.google.inject.persist.PersistService; -import static org.easymock.EasyMock.createNiceMock; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.expect; - public class JMXHostProviderTest { private Injector injector; private Clusters clusters; @@ -81,7 +81,6 @@ public class JMXHostProviderTest { clusters = injector.getInstance(Clusters.class); controller = injector.getInstance(AmbariManagementController.class); AmbariMetaInfo ambariMetaInfo = injector.getInstance(AmbariMetaInfo.class); - ambariMetaInfo.init(); } @After @@ -459,14 +458,16 @@ public class JMXHostProviderTest { @Override protected ResourceProvider createResourceProvider(Resource.Type type) { - if (type == Resource.Type.Cluster) + if (type == Resource.Type.Cluster) { return clusterResourceProvider; - if (type == Resource.Type.Service) + } + if (type == Resource.Type.Service) { return serviceResourceProvider; - else if (type == Resource.Type.HostComponent) + } else if (type == Resource.Type.HostComponent) { return hostCompResourceProvider; - else if (type == Resource.Type.Configuration) + } else if (type == Resource.Type.Configuration) { return configResourceProvider; + } return null; } http://git-wip-us.apache.org/repos/asf/ambari/blob/69197e63/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 1251d99..b00ca4b 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 @@ -17,9 +17,22 @@ */ package org.apache.ambari.server.controller.internal; -import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.persist.PersistService; +import static org.apache.ambari.server.controller.internal.StackArtifactResourceProvider.ARTIFACT_DATA_PROPERTY_ID; +import static org.apache.ambari.server.controller.internal.StackArtifactResourceProvider.ARTIFACT_NAME_PROPERTY_ID; +import static org.apache.ambari.server.controller.internal.StackArtifactResourceProvider.STACK_NAME_PROPERTY_ID; +import static org.apache.ambari.server.controller.internal.StackArtifactResourceProvider.STACK_SERVICE_NAME_PROPERTY_ID; +import static org.apache.ambari.server.controller.internal.StackArtifactResourceProvider.STACK_VERSION_PROPERTY_ID; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; + +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.api.services.AmbariMetaInfo; import org.apache.ambari.server.controller.AmbariManagementController; import org.apache.ambari.server.controller.spi.Predicate; @@ -35,20 +48,10 @@ import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import static org.apache.ambari.server.controller.internal.StackArtifactResourceProvider.ARTIFACT_DATA_PROPERTY_ID; -import static org.apache.ambari.server.controller.internal.StackArtifactResourceProvider.ARTIFACT_NAME_PROPERTY_ID; -import static org.apache.ambari.server.controller.internal.StackArtifactResourceProvider.STACK_NAME_PROPERTY_ID; -import static org.apache.ambari.server.controller.internal.StackArtifactResourceProvider.STACK_SERVICE_NAME_PROPERTY_ID; -import static org.apache.ambari.server.controller.internal.StackArtifactResourceProvider.STACK_VERSION_PROPERTY_ID; -import static org.easymock.EasyMock.createNiceMock; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; + +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.persist.PersistService; public class StackArtifactResourceProviderTest { private AmbariMetaInfo metaInfo; @@ -62,7 +65,6 @@ public class StackArtifactResourceProviderTest { injector = Guice.createInjector(module); injector.getInstance(GuiceJpaInitializer.class); metaInfo = injector.getInstance(AmbariMetaInfo.class); - metaInfo.init(); } @After http://git-wip-us.apache.org/repos/asf/ambari/blob/69197e63/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 f2417bd..8cb705f 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 @@ -19,10 +19,6 @@ package org.apache.ambari.server.events.listeners.upgrade; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.mock; import java.util.ArrayList; import java.util.Arrays; @@ -34,16 +30,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.persistence.RollbackException; - -import com.google.inject.AbstractModule; -import com.google.inject.Singleton; -import com.google.inject.persist.Transactional; -import com.google.inject.util.Modules; - import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.api.services.AmbariMetaInfo; -import org.apache.ambari.server.events.HostAddedEvent; import org.apache.ambari.server.orm.GuiceJpaInitializer; import org.apache.ambari.server.orm.InMemoryDefaultTestModule; import org.apache.ambari.server.orm.OrmTestHelper; @@ -52,12 +40,10 @@ 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.state.Cluster; -import org.apache.ambari.server.state.RepositoryVersionState; import org.apache.ambari.server.state.Clusters; import org.apache.ambari.server.state.Host; import org.apache.ambari.server.state.HostState; -import org.apache.ambari.server.state.Service; -import org.apache.ambari.server.state.ServiceComponent; +import org.apache.ambari.server.state.RepositoryVersionState; import org.apache.ambari.server.state.ServiceComponentHostFactory; import org.apache.ambari.server.state.StackId; import org.junit.After; @@ -92,7 +78,6 @@ public class HostVersionOutOfSyncListenerTest { helper = injector.getInstance(OrmTestHelper.class); hostVersionDAO = injector.getInstance(HostVersionDAO.class); serviceComponentHostFactory = injector.getInstance(ServiceComponentHostFactory.class); - metaInfo.init(); clusters.addCluster("c1"); c1 = clusters.getCluster("c1"); addHost("h1"); http://git-wip-us.apache.org/repos/asf/ambari/blob/69197e63/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 80c07c8..41050c6 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 @@ -17,19 +17,31 @@ */ package org.apache.ambari.server.scheduler; -import com.google.gson.Gson; -import com.google.inject.Binder; -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; +import static org.easymock.EasyMock.anyObject; +import static org.easymock.EasyMock.capture; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.createMockBuilder; +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 static org.hamcrest.CoreMatchers.instanceOf; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; + +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + import junit.framework.Assert; + import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.actionmanager.ActionDBAccessor; -import org.apache.ambari.server.actionmanager.HostRoleCommand; import org.apache.ambari.server.actionmanager.HostRoleStatus; import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.configuration.Configuration; @@ -39,12 +51,17 @@ import org.apache.ambari.server.security.authorization.internal.InternalTokenSto import org.apache.ambari.server.state.Cluster; import org.apache.ambari.server.state.Clusters; import org.apache.ambari.server.state.StackId; -import org.apache.ambari.server.state.scheduler.*; +import org.apache.ambari.server.state.scheduler.Batch; +import org.apache.ambari.server.state.scheduler.BatchRequest; +import org.apache.ambari.server.state.scheduler.BatchRequestJob; +import org.apache.ambari.server.state.scheduler.BatchRequestResponse; +import org.apache.ambari.server.state.scheduler.BatchSettings; +import org.apache.ambari.server.state.scheduler.RequestExecution; +import org.apache.ambari.server.state.scheduler.RequestExecutionFactory; +import org.apache.ambari.server.state.scheduler.Schedule; import org.easymock.Capture; -import org.easymock.IAnswer; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.quartz.CronTrigger; import org.quartz.JobDataMap; @@ -61,12 +78,15 @@ import org.quartz.impl.matchers.GroupMatcher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.*; - -import static org.easymock.EasyMock.*; -import static org.hamcrest.CoreMatchers.instanceOf; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; +import com.google.gson.Gson; +import com.google.inject.Binder; +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; public class ExecutionScheduleManagerTest { private Clusters clusters; @@ -96,7 +116,6 @@ public class ExecutionScheduleManagerTest { executionScheduler = injector.getInstance(ExecutionScheduler.class); requestExecutionFactory = injector.getInstance(RequestExecutionFactory.class); - metaInfo.init(); clusterName = "c1"; clusters.addCluster(clusterName); cluster = clusters.getCluster(clusterName); http://git-wip-us.apache.org/repos/asf/ambari/blob/69197e63/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerCommonServicesTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerCommonServicesTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerCommonServicesTest.java index 4e258e8..3aa7b72 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerCommonServicesTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerCommonServicesTest.java @@ -18,84 +18,110 @@ package org.apache.ambari.server.stack; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.metadata.ActionMetadata; import org.apache.ambari.server.orm.dao.MetainfoDAO; -import org.apache.ambari.server.state.*; +import org.apache.ambari.server.orm.dao.StackDAO; +import org.apache.ambari.server.orm.entities.StackEntity; +import org.apache.ambari.server.state.CommandScriptDefinition; +import org.apache.ambari.server.state.ComponentInfo; +import org.apache.ambari.server.state.PropertyInfo; +import org.apache.ambari.server.state.ServiceInfo; +import org.apache.ambari.server.state.ServiceOsSpecific; +import org.apache.ambari.server.state.StackInfo; import org.apache.ambari.server.state.stack.OsFamily; import org.apache.commons.lang.StringUtils; +import org.easymock.EasyMock; import org.junit.BeforeClass; import org.junit.Test; -import java.io.File; -import java.util.*; - -import static org.easymock.EasyMock.*; -import static org.junit.Assert.*; -import static org.junit.Assert.assertEquals; - /** * StackManager unit tests. */ public class StackManagerCommonServicesTest { private static StackManager stackManager; - private static MetainfoDAO dao; + private static MetainfoDAO metaInfoDao; + private static StackDAO stackDao; private static ActionMetadata actionMetadata; private static OsFamily osFamily; @BeforeClass - public static void initStack() throws Exception{ + public static void initStack() throws Exception { stackManager = createTestStackManager(); } public static StackManager createTestStackManager() throws Exception { - String stack = ClassLoader.getSystemClassLoader().getResource("stacks_with_common_services").getPath(); - String commonServices = ClassLoader.getSystemClassLoader().getResource("common-services").getPath(); + String stack = ClassLoader.getSystemClassLoader().getResource( + "stacks_with_common_services").getPath(); + + String commonServices = ClassLoader.getSystemClassLoader().getResource( + "common-services").getPath(); return createTestStackManager(stack, commonServices); } - public static StackManager createTestStackManager(String stackRoot, String commonServicesRoot) throws Exception { - try { - //todo: dao , actionMetaData expectations - dao = createNiceMock(MetainfoDAO.class); - actionMetadata = createNiceMock(ActionMetadata.class); - Configuration config = createNiceMock(Configuration.class); - expect(config.getSharedResourcesDirPath()).andReturn( - ClassLoader.getSystemClassLoader().getResource("").getPath()).anyTimes(); - replay(config); - osFamily = new OsFamily(config); - - replay(dao, actionMetadata); - StackManager stackManager = new StackManager( - new File(stackRoot), new File(commonServicesRoot), new StackContext(dao, actionMetadata, osFamily)); - return stackManager; - } catch (Exception e) { - e.printStackTrace(); - throw e; - } + public static StackManager createTestStackManager(String stackRoot, + String commonServicesRoot) throws Exception { + // todo: dao , actionMetaData expectations + metaInfoDao = createNiceMock(MetainfoDAO.class); + stackDao = createNiceMock(StackDAO.class); + actionMetadata = createNiceMock(ActionMetadata.class); + Configuration config = createNiceMock(Configuration.class); + StackEntity stackEntity = createNiceMock(StackEntity.class); + + expect(config.getSharedResourcesDirPath()).andReturn( + ClassLoader.getSystemClassLoader().getResource("").getPath()).anyTimes(); + + expect( + stackDao.find(EasyMock.anyObject(String.class), + EasyMock.anyObject(String.class))).andReturn(stackEntity).atLeastOnce(); + + replay(config, stackDao); + osFamily = new OsFamily(config); + + replay(metaInfoDao, actionMetadata); + + StackManager stackManager = new StackManager(new File(stackRoot), new File( + commonServicesRoot), osFamily, metaInfoDao, actionMetadata, stackDao); + + EasyMock.verify( config, stackDao ); + + return stackManager; } @Test - public void testGetStacks_count() throws Exception { + public void testGetStacksCount() throws Exception { Collection<StackInfo> stacks = stackManager.getStacks(); assertEquals(2, stacks.size()); } @Test - public void testGetStack_name__count() { + public void testGetStacksByName() { Collection<StackInfo> stacks = stackManager.getStacks("HDP"); assertEquals(2, stacks.size()); } @Test - public void testGetStack_basic() { + public void testGetStack() { StackInfo stack = stackManager.getStack("HDP", "0.1"); assertNotNull(stack); assertEquals("HDP", stack.getName()); assertEquals("0.1", stack.getVersion()); - Collection<ServiceInfo> services = stack.getServices(); assertEquals(3, services.size()); @@ -139,12 +165,14 @@ public class StackManagerCommonServicesTest { assertEquals(1, components.size()); CommandScriptDefinition commandScript = pigService.getCommandScript(); assertEquals("scripts/service_check.py", commandScript.getScript()); - assertEquals(CommandScriptDefinition.Type.PYTHON, commandScript.getScriptType()); + assertEquals(CommandScriptDefinition.Type.PYTHON, + commandScript.getScriptType()); assertEquals(300, commandScript.getTimeout()); List<String> configDependencies = pigService.getConfigDependencies(); assertEquals(1, configDependencies.size()); assertEquals("global", configDependencies.get(0)); - assertEquals("global", pigService.getConfigDependenciesWithComponents().get(0)); + assertEquals("global", + pigService.getConfigDependenciesWithComponents().get(0)); ComponentInfo client = pigService.getClientComponent(); assertNotNull(client); assertEquals("PIG", client.getName()); @@ -182,10 +210,11 @@ public class StackManagerCommonServicesTest { ServiceInfo hdfsService2 = stack.getService("HDFS"); assertNotNull(hdfsService2); - String packageDir1 = StringUtils.join( - new String[]{"common-services", "HDFS", "1.0", "package"}, File.separator); - String packageDir2 = StringUtils.join( - new String[]{"stacks_with_common_services", "HDP", "0.2", "services", "HDFS", "package"}, File.separator); + String packageDir1 = StringUtils.join(new String[] { "common-services", + "HDFS", "1.0", "package" }, File.separator); + String packageDir2 = StringUtils.join(new String[] { + "stacks_with_common_services", "HDP", "0.2", "services", "HDFS", + "package" }, File.separator); assertEquals(packageDir1, hdfsService1.getServicePackageFolder()); assertEquals(packageDir2, hdfsService2.getServicePackageFolder()); http://git-wip-us.apache.org/repos/asf/ambari/blob/69197e63/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerMiscTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerMiscTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerMiscTest.java index 26d7826..dda1e7a 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerMiscTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerMiscTest.java @@ -18,19 +18,27 @@ package org.apache.ambari.server.stack; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + +import java.io.File; +import java.util.Collection; + import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.metadata.ActionMetadata; import org.apache.ambari.server.orm.dao.MetainfoDAO; +import org.apache.ambari.server.orm.dao.StackDAO; +import org.apache.ambari.server.orm.entities.StackEntity; import org.apache.ambari.server.state.StackInfo; import org.apache.ambari.server.state.stack.OsFamily; +import org.easymock.EasyMock; import org.junit.Test; -import java.io.File; -import java.util.Collection; - -import static org.easymock.EasyMock.*; -import static org.junit.Assert.*; - /** * StackManager Misc unit tests. */ @@ -38,23 +46,36 @@ public class StackManagerMiscTest { @Test public void testCycleDetection() throws Exception { - MetainfoDAO dao = createNiceMock(MetainfoDAO.class); + MetainfoDAO metaInfoDao = createNiceMock(MetainfoDAO.class); + StackDAO stackDao = createNiceMock(StackDAO.class); ActionMetadata actionMetadata = createNiceMock(ActionMetadata.class); OsFamily osFamily = createNiceMock(OsFamily.class); - replay(actionMetadata); + StackEntity stackEntity = createNiceMock(StackEntity.class); + + expect( + stackDao.find(EasyMock.anyObject(String.class), + EasyMock.anyObject(String.class))).andReturn(stackEntity).atLeastOnce(); + + replay(actionMetadata, stackDao, metaInfoDao, osFamily); + try { String stacksCycle1 = ClassLoader.getSystemClassLoader().getResource("stacks_with_cycle").getPath(); - StackManager stackManager = new StackManager(new File(stacksCycle1), null, - new StackContext(dao, actionMetadata, osFamily)); + + StackManager stackManager = new StackManager(new File(stacksCycle1), + null, osFamily, metaInfoDao, actionMetadata, stackDao); + fail("Expected exception due to cyclic stack"); } catch (AmbariException e) { // expected assertEquals("Cycle detected while parsing stack definition", e.getMessage()); } try { - String stacksCycle2 = ClassLoader.getSystemClassLoader().getResource("stacks_with_cycle2").getPath(); - StackManager stackManager = new StackManager(new File(stacksCycle2), null, - new StackContext(dao, actionMetadata, osFamily)); + String stacksCycle2 = ClassLoader.getSystemClassLoader().getResource( + "stacks_with_cycle2").getPath(); + + StackManager stackManager = new StackManager(new File(stacksCycle2), + null, osFamily, metaInfoDao, actionMetadata, stackDao); + fail("Expected exception due to cyclic stack"); } catch (AmbariException e) { // expected @@ -68,24 +89,32 @@ public class StackManagerMiscTest { */ @Test public void testGetServiceInfoFromSingleStack() throws Exception { - MetainfoDAO dao = createNiceMock(MetainfoDAO.class); + MetainfoDAO metaInfoDao = createNiceMock(MetainfoDAO.class); + StackDAO stackDao = createNiceMock(StackDAO.class); ActionMetadata actionMetadata = createNiceMock(ActionMetadata.class); OsFamily osFamily = createNiceMock(OsFamily.class); + StackEntity stackEntity = createNiceMock(StackEntity.class); // ensure that service check is added for HDFS actionMetadata.addServiceCheckAction("HDFS"); - replay(dao, actionMetadata, osFamily); + + expect( + stackDao.find(EasyMock.anyObject(String.class), + EasyMock.anyObject(String.class))).andReturn(stackEntity).atLeastOnce(); + + replay(metaInfoDao, stackDao, actionMetadata, osFamily); + String singleStack = ClassLoader.getSystemClassLoader().getResource("single_stack").getPath(); - StackManager stackManager = new StackManager( - new File(singleStack.replace(StackManager.PATH_DELIMITER, File.separator)), - null, - new StackContext(dao, actionMetadata, osFamily)); + StackManager stackManager = new StackManager(new File(singleStack.replace( + StackManager.PATH_DELIMITER, File.separator)), + null, osFamily, metaInfoDao, actionMetadata, stackDao); + Collection<StackInfo> stacks = stackManager.getStacks(); assertEquals(1, stacks.size()); assertNotNull(stacks.iterator().next().getService("HDFS")); - verify(dao, actionMetadata, osFamily); + verify(metaInfoDao, stackDao, actionMetadata, osFamily); } } http://git-wip-us.apache.org/repos/asf/ambari/blob/69197e63/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java index 0f39b06..2b665f6 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java @@ -27,16 +27,19 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import java.io.File; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; -import org.apache.commons.lang.StringUtils; -import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.metadata.ActionMetadata; import org.apache.ambari.server.orm.dao.MetainfoDAO; +import org.apache.ambari.server.orm.dao.StackDAO; import org.apache.ambari.server.state.ClientConfigFileDefinition; import org.apache.ambari.server.state.CommandScriptDefinition; import org.apache.ambari.server.state.ComponentInfo; @@ -45,6 +48,7 @@ import org.apache.ambari.server.state.ServiceInfo; import org.apache.ambari.server.state.ServiceOsSpecific; import org.apache.ambari.server.state.StackInfo; import org.apache.ambari.server.state.stack.OsFamily; +import org.apache.commons.lang.StringUtils; import org.junit.BeforeClass; import org.junit.Test; @@ -54,9 +58,10 @@ import org.junit.Test; public class StackManagerTest { private static StackManager stackManager; - private static MetainfoDAO dao; + private static MetainfoDAO metaInfoDao; private static ActionMetadata actionMetadata; private static OsFamily osFamily; + private static StackDAO stackDao; @BeforeClass public static void initStack() throws Exception{ @@ -69,34 +74,35 @@ public class StackManagerTest { } public static StackManager createTestStackManager(String stackRoot) throws Exception { - try { - //todo: dao , actionMetaData expectations - dao = createNiceMock(MetainfoDAO.class); - actionMetadata = createNiceMock(ActionMetadata.class); - Configuration config = createNiceMock(Configuration.class); - expect(config.getSharedResourcesDirPath()).andReturn( - ClassLoader.getSystemClassLoader().getResource("").getPath()).anyTimes(); - replay(config); - osFamily = new OsFamily(config); - - replay(dao, actionMetadata); - StackManager stackManager = new StackManager( - new File(stackRoot), null, new StackContext(dao, actionMetadata, osFamily)); - return stackManager; - } catch (Exception e) { - e.printStackTrace(); - throw e; - } + // todo: dao , actionMetaData expectations + metaInfoDao = createNiceMock(MetainfoDAO.class); + stackDao = createNiceMock(StackDAO.class); + actionMetadata = createNiceMock(ActionMetadata.class); + Configuration config = createNiceMock(Configuration.class); + + expect(config.getSharedResourcesDirPath()).andReturn( + ClassLoader.getSystemClassLoader().getResource("").getPath()).anyTimes(); + + replay(config, metaInfoDao, stackDao, actionMetadata); + + osFamily = new OsFamily(config); + + StackManager stackManager = new StackManager(new File(stackRoot), null, + osFamily, metaInfoDao, actionMetadata, stackDao); + + verify(config, metaInfoDao, stackDao, actionMetadata); + + return stackManager; } @Test - public void testGetStacks_count() throws Exception { + public void testGetsStacks() throws Exception { Collection<StackInfo> stacks = stackManager.getStacks(); assertEquals(18, stacks.size()); } @Test - public void testGetStack_name__count() { + public void testGetStacksByName() { Collection<StackInfo> stacks = stackManager.getStacks("HDP"); assertEquals(14, stacks.size()); @@ -105,7 +111,7 @@ public class StackManagerTest { } @Test - public void testGetStack_basic() { + public void testGetStack() { StackInfo stack = stackManager.getStack("HDP", "0.1"); assertNotNull(stack); assertEquals("HDP", stack.getName()); @@ -183,7 +189,7 @@ public class StackManagerTest { } @Test - public void testStackVersionInheritance_includeAllServices() { + public void testStackVersionInheritance() { StackInfo stack = stackManager.getStack("HDP", "2.1.1"); assertNotNull(stack); assertEquals("HDP", stack.getName()); @@ -236,7 +242,7 @@ public class StackManagerTest { } @Test - public void testGetStack_explicitServiceExtension() { + public void testStackServiceExtension() { StackInfo stack = stackManager.getStack("OTHER", "1.0"); assertNotNull(stack); assertEquals("OTHER", stack.getName()); @@ -327,7 +333,7 @@ public class StackManagerTest { } @Test - public void testGetStack_versionInheritance__explicitServiceExtension() { + public void testGetStackServiceInheritance() { StackInfo baseStack = stackManager.getStack("OTHER", "1.0"); StackInfo stack = stackManager.getStack("OTHER", "2.0"); http://git-wip-us.apache.org/repos/asf/ambari/blob/69197e63/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 894126d..4d4d674 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,10 +17,9 @@ */ package org.apache.ambari.server.state; -import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.persist.PersistService; -import com.google.inject.persist.Transactional; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; import junit.framework.Assert; @@ -40,9 +39,10 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.persist.PersistService; +import com.google.inject.persist.Transactional; public class ConfigGroupTest { @@ -70,7 +70,6 @@ public class ConfigGroupTest { configGroupHostMappingDAO = injector.getInstance (ConfigGroupHostMappingDAO.class); - metaInfo.init(); clusterName = "foo"; clusters.addCluster(clusterName); cluster = clusters.getCluster(clusterName); @@ -188,7 +187,7 @@ public class ConfigGroupTest { Assert.assertEquals("NewTag", configGroupEntity.getTag()); Assert.assertEquals("NewDesc", configGroupEntity.getDescription()); Assert.assertNotNull(cluster.getConfig("test-site", "version100")); - + ConfigGroupConfigMappingEntity configMappingEntity = null; Object[] array = configGroupEntity.getConfigGroupConfigMappingEntities().toArray(); for(Object o: array) { @@ -213,7 +212,6 @@ public class ConfigGroupTest { configGroup.delete(); Assert.assertNull(configGroupDAO.findById(id)); - Assert.assertNull(cluster.getConfigGroups().get(id)); } @Test http://git-wip-us.apache.org/repos/asf/ambari/blob/69197e63/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 61652d1..751583e 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,12 +23,19 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; -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 java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.persistence.EntityManager; + import junit.framework.Assert; + import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.actionmanager.RequestFactory; import org.apache.ambari.server.api.services.AmbariMetaInfo; @@ -41,6 +48,7 @@ import org.apache.ambari.server.orm.DBAccessor; import org.apache.ambari.server.orm.GuiceJpaInitializer; import org.apache.ambari.server.orm.InMemoryDefaultTestModule; import org.apache.ambari.server.security.SecurityHelper; +import org.apache.ambari.server.stack.StackManagerFactory; import org.apache.ambari.server.state.cluster.ClusterFactory; import org.apache.ambari.server.state.cluster.ClustersImpl; import org.apache.ambari.server.state.configgroup.ConfigGroup; @@ -53,15 +61,11 @@ import org.junit.Test; import org.junit.experimental.runners.Enclosed; import org.junit.runner.RunWith; -import javax.persistence.EntityManager; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; +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; @@ -89,7 +93,6 @@ public class ConfigHelperTest { configHelper = injector.getInstance(ConfigHelper.class); managementController = injector.getInstance(AmbariManagementController.class); - metaInfo.init(); clusterName = "c1"; clusters.addCluster(clusterName); cluster = clusters.getCluster(clusterName); @@ -609,6 +612,7 @@ public class ConfigHelperTest { bind(RequestFactory.class).toInstance(createNiceMock(RequestFactory.class)); bind(Clusters.class).toInstance(createNiceMock(ClustersImpl.class)); bind(ClusterController.class).toInstance(clusterController); + bind(StackManagerFactory.class).toInstance(createNiceMock(StackManagerFactory.class)); } }); http://git-wip-us.apache.org/repos/asf/ambari/blob/69197e63/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 8759089..abbee45 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 @@ -17,11 +17,12 @@ */ package org.apache.ambari.server.state; -import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.persist.PersistService; -import com.google.inject.persist.Transactional; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + import junit.framework.Assert; + import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.controller.RequestScheduleResponse; import org.apache.ambari.server.orm.GuiceJpaInitializer; @@ -40,9 +41,10 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.persist.PersistService; +import com.google.inject.persist.Transactional; public class RequestExecutionTest { private Injector injector; @@ -62,7 +64,6 @@ public class RequestExecutionTest { requestExecutionFactory = injector.getInstance(RequestExecutionFactory.class); requestScheduleDAO = injector.getInstance(RequestScheduleDAO.class); - metaInfo.init(); clusterName = "foo"; clusters.addCluster(clusterName); cluster = clusters.getCluster(clusterName); http://git-wip-us.apache.org/repos/asf/ambari/blob/69197e63/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 c27e600..3093c2f 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 @@ -40,7 +40,6 @@ import org.apache.ambari.server.orm.entities.HostComponentStateEntity; import org.apache.ambari.server.orm.entities.HostComponentStateEntityPK; import org.apache.ambari.server.orm.entities.ServiceComponentDesiredStateEntity; import org.apache.ambari.server.orm.entities.ServiceComponentDesiredStateEntityPK; -import org.apache.ambari.server.state.RepositoryVersionState; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -75,7 +74,6 @@ public class ServiceComponentTest { ServiceComponentHostFactory.class); helper = injector.getInstance(OrmTestHelper.class); metaInfo = injector.getInstance(AmbariMetaInfo.class); - metaInfo.init(); clusterName = "foo"; serviceName = "HDFS"; http://git-wip-us.apache.org/repos/asf/ambari/blob/69197e63/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 ecfe403..552edec 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 @@ -62,7 +62,6 @@ public class ServiceTest { serviceComponentFactory = injector.getInstance( ServiceComponentFactory.class); metaInfo = injector.getInstance(AmbariMetaInfo.class); - metaInfo.init(); clusterName = "foo"; clusters.addCluster(clusterName); cluster = clusters.getCluster(clusterName); http://git-wip-us.apache.org/repos/asf/ambari/blob/69197e63/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 be39bc2..e05d16e 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 @@ -102,7 +102,6 @@ public class UpgradeHelperTest { helper = injector.getInstance(OrmTestHelper.class); ambariMetaInfo = injector.getInstance(AmbariMetaInfo.class); - ambariMetaInfo.init(); m_upgradeHelper = injector.getInstance(UpgradeHelper.class); m_masterHostResolver = EasyMock.createMock(MasterHostResolver.class); http://git-wip-us.apache.org/repos/asf/ambari/blob/69197e63/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 10535e6..19b5d46 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 @@ -112,7 +112,6 @@ public class AlertEventPublisherTest { aggregateMapping = injector.getInstance(AggregateDefinitionMapping.class); metaInfo = injector.getInstance(AmbariMetaInfo.class); - metaInfo.init(); clusterName = "foo"; clusters.addCluster(clusterName); http://git-wip-us.apache.org/repos/asf/ambari/blob/69197e63/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 25611c9..4e55c49 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 @@ -105,7 +105,6 @@ public class InitialAlertEventTest { m_serviceFactory = m_injector.getInstance(ServiceFactory.class); m_metaInfo = m_injector.getInstance(AmbariMetaInfo.class); - m_metaInfo.init(); m_clusterName = "c1"; m_clusters.addCluster(m_clusterName); http://git-wip-us.apache.org/repos/asf/ambari/blob/69197e63/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 7459bd3..766105d 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 @@ -114,8 +114,6 @@ public class ClusterDeadlockTest { cluster.createClusterVersion(stackId.getStackName(), stackId.getStackVersion(), "admin", RepositoryVersionState.UPGRADING); - metaInfo.init(); - // 100 hosts for (int i = 0; i < NUMBER_OF_HOSTS; i++) { String hostName = "c64-" + i; http://git-wip-us.apache.org/repos/asf/ambari/blob/69197e63/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 e444828..66a4ade 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 @@ -98,6 +98,7 @@ import org.apache.ambari.server.state.host.HostRegistrationRequestEvent; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.mockito.ArgumentCaptor; import com.google.gson.Gson; import com.google.inject.AbstractModule; @@ -107,7 +108,6 @@ import com.google.inject.Singleton; import com.google.inject.persist.PersistService; import com.google.inject.persist.Transactional; import com.google.inject.util.Modules; -import org.mockito.ArgumentCaptor; public class ClusterTest { @@ -179,7 +179,6 @@ public class ClusterTest { hostVersionDAO = injector.getInstance(HostVersionDAO.class); hostComponentStateDAO = injector.getInstance(HostComponentStateDAO.class); repositoryVersionDAO = injector.getInstance(RepositoryVersionDAO.class); - metaInfo.init(); } @After http://git-wip-us.apache.org/repos/asf/ambari/blob/69197e63/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 3a2773f..839b25f 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 @@ -81,7 +81,6 @@ public class ClustersDeadlockTest { cluster.setDesiredStackVersion(stackId); helper.getOrCreateRepositoryVersion(stackId.getStackName(), stackId.getStackVersion()); cluster.createClusterVersion(stackId.getStackName(), stackId.getStackVersion(), "admin", RepositoryVersionState.UPGRADING); - metaInfo.init(); } @After http://git-wip-us.apache.org/repos/asf/ambari/blob/69197e63/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 ebf742e..c2ab35f 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 @@ -49,11 +49,11 @@ import org.apache.ambari.server.orm.entities.ClusterStateEntity; import org.apache.ambari.server.orm.entities.HostComponentDesiredStateEntityPK; import org.apache.ambari.server.orm.entities.HostComponentStateEntityPK; import org.apache.ambari.server.state.Cluster; -import org.apache.ambari.server.state.RepositoryVersionState; import org.apache.ambari.server.state.Clusters; import org.apache.ambari.server.state.Config; import org.apache.ambari.server.state.ConfigFactory; import org.apache.ambari.server.state.Host; +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; @@ -83,7 +83,6 @@ public class ClustersTest { injector.getInstance(GuiceJpaInitializer.class); clusters = injector.getInstance(Clusters.class); injector.injectMembers(this); - metaInfo.init(); } @After http://git-wip-us.apache.org/repos/asf/ambari/blob/69197e63/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 cac7dd7..27b2a0e 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 @@ -44,7 +44,6 @@ import org.apache.ambari.server.orm.entities.HostEntity; import org.apache.ambari.server.orm.entities.HostStateEntity; import org.apache.ambari.server.state.AgentVersion; import org.apache.ambari.server.state.Cluster; -import org.apache.ambari.server.state.RepositoryVersionState; import org.apache.ambari.server.state.Clusters; import org.apache.ambari.server.state.Config; import org.apache.ambari.server.state.ConfigFactory; @@ -54,6 +53,7 @@ import org.apache.ambari.server.state.HostHealthStatus; import org.apache.ambari.server.state.HostHealthStatus.HealthStatus; import org.apache.ambari.server.state.HostState; import org.apache.ambari.server.state.MaintenanceState; +import org.apache.ambari.server.state.RepositoryVersionState; import org.apache.ambari.server.state.StackId; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -358,7 +358,6 @@ public class HostTest { @Test public void testHostDesiredConfig() throws Exception { AmbariMetaInfo metaInfo = injector.getInstance(AmbariMetaInfo.class); - metaInfo.init(); clusters.addCluster("c1"); Cluster c1 = clusters.getCluster("c1"); @@ -420,7 +419,6 @@ public class HostTest { @Test public void testHostMaintenance() throws Exception { AmbariMetaInfo metaInfo = injector.getInstance(AmbariMetaInfo.class); - metaInfo.init(); clusters.addCluster("c1"); Cluster c1 = clusters.getCluster("c1"); http://git-wip-us.apache.org/repos/asf/ambari/blob/69197e63/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 b37c0a7..1701a33 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 @@ -60,7 +60,6 @@ public class UpgradePackTest { injector.getInstance(GuiceJpaInitializer.class); ambariMetaInfo = injector.getInstance(AmbariMetaInfo.class); - ambariMetaInfo.init(); } @After @@ -214,8 +213,9 @@ public class UpgradePackTest { int i = 0; for (Entry<String, ?> entry : map.entrySet()) { - if (entry.getKey().equals(keyToFind)) + if (entry.getKey().equals(keyToFind)) { return i; + } i++; } http://git-wip-us.apache.org/repos/asf/ambari/blob/69197e63/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 8ebf2ce..ba19154 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 @@ -40,7 +40,6 @@ import org.apache.ambari.server.orm.entities.HostComponentDesiredStateEntityPK; import org.apache.ambari.server.orm.entities.HostComponentStateEntity; import org.apache.ambari.server.orm.entities.HostComponentStateEntityPK; import org.apache.ambari.server.state.Cluster; -import org.apache.ambari.server.state.RepositoryVersionState; import org.apache.ambari.server.state.Clusters; import org.apache.ambari.server.state.Config; import org.apache.ambari.server.state.ConfigFactory; @@ -48,6 +47,7 @@ import org.apache.ambari.server.state.ConfigHelper; import org.apache.ambari.server.state.Host; import org.apache.ambari.server.state.HostConfig; import org.apache.ambari.server.state.MaintenanceState; +import org.apache.ambari.server.state.RepositoryVersionState; import org.apache.ambari.server.state.SecurityState; import org.apache.ambari.server.state.Service; import org.apache.ambari.server.state.ServiceComponent; @@ -114,7 +114,6 @@ public class ServiceComponentHostTest { c1.setDesiredStackVersion(stackId); helper.getOrCreateRepositoryVersion(stackId.getStackName(), stackId.getStackVersion()); c1.createClusterVersion(stackId.getStackName(), stackId.getStackVersion(), "admin", RepositoryVersionState.UPGRADING); - metaInfo.init(); clusters.mapHostToCluster("h1","C1"); } @@ -722,7 +721,6 @@ public class ServiceComponentHostTest { c2.setDesiredStackVersion(stackId); helper.getOrCreateRepositoryVersion(stackId.getStackName(), stackId.getStackVersion()); c2.createClusterVersion(stackId.getStackName(), stackId.getStackVersion(), "admin", RepositoryVersionState.UPGRADING); - metaInfo.init(); clusters.mapHostToCluster(hostName, clusterName); Cluster cluster = clusters.getCluster(clusterName); @@ -950,7 +948,6 @@ public class ServiceComponentHostTest { helper.getOrCreateRepositoryVersion(stackId.getStackName(), stackId.getStackVersion()); c2.createClusterVersion(stackId.getStackName(), stackId.getStackVersion(), "admin", RepositoryVersionState.UPGRADING); - metaInfo.init(); clusters.mapHostToCluster(hostName, clusterName); Cluster cluster = clusters.getCluster(clusterName); @@ -1084,7 +1081,6 @@ public class ServiceComponentHostTest { c2.setDesiredStackVersion(stackId); helper.getOrCreateRepositoryVersion(stackId.getStackName(), stackId.getStackVersion()); c2.createClusterVersion(stackId.getStackName(), stackId.getStackVersion(), "admin", RepositoryVersionState.UPGRADING); - metaInfo.init(); clusters.mapHostToCluster(hostName, clusterName); Cluster cluster = clusters.getCluster(clusterName); @@ -1128,7 +1124,6 @@ public class ServiceComponentHostTest { c2.setDesiredStackVersion(stackId); helper.getOrCreateRepositoryVersion(stackId.getStackName(), stackId.getStackVersion()); c2.createClusterVersion(stackId.getStackName(), stackId.getStackVersion(), "admin", RepositoryVersionState.UPGRADING); - metaInfo.init(); clusters.mapHostToCluster(hostName, clusterName); Cluster cluster = clusters.getCluster(clusterName); http://git-wip-us.apache.org/repos/asf/ambari/blob/69197e63/ambari-server/src/test/java/org/apache/ambari/server/utils/TestStageUtils.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/utils/TestStageUtils.java b/ambari-server/src/test/java/org/apache/ambari/server/utils/TestStageUtils.java index 8b134c4..c411985 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/utils/TestStageUtils.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/utils/TestStageUtils.java @@ -97,8 +97,6 @@ public class TestStageUtils { injector.getInstance(GuiceJpaInitializer.class); serviceComponentHostFactory = injector.getInstance(ServiceComponentHostFactory.class); ambariMetaInfo = injector.getInstance(AmbariMetaInfo.class); - ambariMetaInfo.init(); - }
