Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-18456 fbfcf98ab -> 0de69e10b
http://git-wip-us.apache.org/repos/asf/ambari/blob/0de69e10/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java index 84f8124..f99b5ff 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java @@ -18,6 +18,31 @@ package org.apache.ambari.server.controller.internal; +import static org.easymock.EasyMock.anyBoolean; +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.createStrictMock; +import static org.easymock.EasyMock.eq; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.expectLastCall; +import static org.easymock.EasyMock.isNull; +import static org.easymock.EasyMock.newCapture; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; + +import java.lang.reflect.Field; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.RoleCommand; import org.apache.ambari.server.api.services.AmbariMetaInfo; @@ -57,31 +82,6 @@ import org.junit.Test; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; -import java.lang.reflect.Field; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import static org.easymock.EasyMock.anyBoolean; -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.createStrictMock; -import static org.easymock.EasyMock.eq; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.expectLastCall; -import static org.easymock.EasyMock.isNull; -import static org.easymock.EasyMock.newCapture; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; - /** * ServiceResourceProvider tests. */ @@ -117,9 +117,8 @@ public class ServiceResourceProviderTest { expect(managementController.getClusters()).andReturn(clusters).anyTimes(); expect(managementController.getAmbariMetaInfo()).andReturn(ambariMetaInfo); - expect(managementController.getServiceFactory()).andReturn(serviceFactory); - expect(serviceFactory.createNew(cluster, "Service100")).andReturn(service); + expect(cluster.addService("Service100")).andReturn(service); expect(clusters.getCluster("Cluster100")).andReturn(cluster).anyTimes(); @@ -202,7 +201,6 @@ public class ServiceResourceProviderTest { // set expectations expect(managementController.getClusters()).andReturn(clusters).anyTimes(); expect(managementController.getAmbariMetaInfo()).andReturn(ambariMetaInfo).anyTimes(); - expect(managementController.getServiceFactory()).andReturn(serviceFactory).anyTimes(); expect(managementController.getHostComponents(EasyMock.<Set<ServiceComponentHostRequest>>anyObject())). andReturn(Collections.<ServiceComponentHostResponse>emptySet()).anyTimes(); @@ -321,7 +319,6 @@ public class ServiceResourceProviderTest { // set expectations expect(managementController.getClusters()).andReturn(clusters).anyTimes(); expect(managementController.getAmbariMetaInfo()).andReturn(ambariMetaInfo).anyTimes(); - expect(managementController.getServiceFactory()).andReturn(serviceFactory).anyTimes(); expect(managementController.getHostComponents(EasyMock.<Set<ServiceComponentHostRequest>>anyObject())). andReturn(Collections.<ServiceComponentHostResponse>emptySet()).anyTimes(); @@ -390,7 +387,6 @@ public class ServiceResourceProviderTest { // set expectations expect(managementController.getClusters()).andReturn(clusters).anyTimes(); expect(managementController.getAmbariMetaInfo()).andReturn(ambariMetaInfo).anyTimes(); - expect(managementController.getServiceFactory()).andReturn(serviceFactory).anyTimes(); expect(managementController.getHostComponents(EasyMock.<Set<ServiceComponentHostRequest>>anyObject())). andReturn(Collections.<ServiceComponentHostResponse>emptySet()).anyTimes(); @@ -458,7 +454,6 @@ public class ServiceResourceProviderTest { // set expectations expect(managementController.getClusters()).andReturn(clusters).anyTimes(); expect(managementController.getAmbariMetaInfo()).andReturn(ambariMetaInfo).anyTimes(); - expect(managementController.getServiceFactory()).andReturn(serviceFactory).anyTimes(); expect(managementController.getHostComponents(EasyMock.<Set<ServiceComponentHostRequest>>anyObject())). andReturn(Collections.<ServiceComponentHostResponse>emptySet()).anyTimes(); @@ -528,7 +523,6 @@ public class ServiceResourceProviderTest { // set expectations expect(managementController.getClusters()).andReturn(clusters).anyTimes(); expect(managementController.getAmbariMetaInfo()).andReturn(ambariMetaInfo).anyTimes(); - expect(managementController.getServiceFactory()).andReturn(serviceFactory).anyTimes(); expect(managementController.getHostComponents((Set<ServiceComponentHostRequest>) anyObject())). andReturn(Collections.<ServiceComponentHostResponse>emptySet()).anyTimes(); @@ -612,7 +606,6 @@ public class ServiceResourceProviderTest { // set expectations expect(managementController.getClusters()).andReturn(clusters).anyTimes(); expect(managementController.getAmbariMetaInfo()).andReturn(ambariMetaInfo).anyTimes(); - expect(managementController.getServiceFactory()).andReturn(serviceFactory).anyTimes(); expect(clusters.getCluster("Cluster100")).andReturn(cluster).anyTimes(); @@ -824,7 +817,7 @@ public class ServiceResourceProviderTest { Clusters clusters = createNiceMock(Clusters.class); Cluster cluster = createNiceMock(Cluster.class); Service service = createNiceMock(Service.class); - + String serviceName = "Service100"; // set expectations @@ -912,7 +905,7 @@ public class ServiceResourceProviderTest { // verify verify(managementController, clusters, cluster, service); - } + } @Test public void testDeleteResourcesBadComponentState() throws Exception{ http://git-wip-us.apache.org/repos/asf/ambari/blob/0de69e10/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 a0940ba..96810cf 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 @@ -180,7 +180,6 @@ public class UpgradeResourceProviderHDP22Test { // add a single HIVE server Service service = cluster.addService("HIVE"); service.setDesiredStackVersion(cluster.getDesiredStackVersion()); - service.persist(); ServiceComponent component = service.addServiceComponent("HIVE_SERVER"); ServiceComponentHost sch = component.addServiceComponentHost("h1"); http://git-wip-us.apache.org/repos/asf/ambari/blob/0de69e10/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 c2c8ced..0649191 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 @@ -238,7 +238,6 @@ public class UpgradeResourceProviderTest { // add a single ZK server Service service = cluster.addService("ZOOKEEPER"); service.setDesiredStackVersion(cluster.getDesiredStackVersion()); - service.persist(); ServiceComponent component = service.addServiceComponent("ZOOKEEPER_SERVER"); ServiceComponentHost sch = component.addServiceComponentHost("h1"); @@ -734,7 +733,6 @@ public class UpgradeResourceProviderTest { // add additional service for the test Service service = cluster.addService("HIVE"); service.setDesiredStackVersion(cluster.getDesiredStackVersion()); - service.persist(); ServiceComponent component = service.addServiceComponent("HIVE_SERVER"); ServiceComponentHost sch = component.addServiceComponentHost("h1"); http://git-wip-us.apache.org/repos/asf/ambari/blob/0de69e10/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 8efec98..baec7df 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 @@ -178,7 +178,6 @@ public class UpgradeSummaryResourceProviderTest { // add a single ZOOKEEPER server Service service = cluster.addService("ZOOKEEPER"); service.setDesiredStackVersion(cluster.getDesiredStackVersion()); - service.persist(); ServiceComponent component = service.addServiceComponent("ZOOKEEPER_SERVER"); ServiceComponentHost sch = component.addServiceComponentHost("h1"); http://git-wip-us.apache.org/repos/asf/ambari/blob/0de69e10/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 710c723..6374be0 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,30 +18,32 @@ package org.apache.ambari.server.controller.utilities.state; - 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.util.Modules; - import org.apache.ambari.server.actionmanager.ActionManager; - 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.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.apache.ambari.server.topology.TopologyManager; - import org.apache.ambari.server.utils.StageUtils; - import org.junit.After; - import org.junit.Before; - import org.junit.Test; import java.util.Map; +import org.apache.ambari.server.actionmanager.ActionManager; +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.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.apache.ambari.server.topology.TopologyManager; +import org.apache.ambari.server.utils.StageUtils; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +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.util.Modules; + public abstract class GeneralServiceCalculatedStateTest { final protected String[] hosts = {"h1", "h2"}; @@ -76,7 +78,6 @@ public abstract class GeneralServiceCalculatedStateTest { service = cluster.addService(getServiceName()); service.setDesiredStackVersion(cluster.getDesiredStackVersion()); - service.persist(); createComponentsAndHosts(); http://git-wip-us.apache.org/repos/asf/ambari/blob/0de69e10/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 bdbaf9b..4066d8f 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 @@ -381,7 +381,6 @@ public class EventsTest { private void installHdfsService() throws Exception { String serviceName = "HDFS"; Service service = m_serviceFactory.createNew(m_cluster, serviceName); - service.persist(); service = m_cluster.getService(serviceName); Assert.assertNotNull(service); http://git-wip-us.apache.org/repos/asf/ambari/blob/0de69e10/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 5280ae6..1d1f77e 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 @@ -431,7 +431,6 @@ public class OrmTestHelper { ServiceComponentHostFactory schFactory, String hostName) throws Exception { String serviceName = "HDFS"; Service service = serviceFactory.createNew(cluster, serviceName); - service.persist(); service = cluster.getService(serviceName); assertNotNull(service); @@ -476,7 +475,6 @@ public class OrmTestHelper { ServiceComponentHostFactory schFactory, String hostName) throws Exception { String serviceName = "YARN"; Service service = serviceFactory.createNew(cluster, serviceName); - service.persist(); service = cluster.getService(serviceName); assertNotNull(service); http://git-wip-us.apache.org/repos/asf/ambari/blob/0de69e10/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostComponentDesiredStateDAOTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostComponentDesiredStateDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostComponentDesiredStateDAOTest.java index 28adb8c..f993bec 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostComponentDesiredStateDAOTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostComponentDesiredStateDAOTest.java @@ -18,22 +18,19 @@ package org.apache.ambari.server.orm.dao; -import com.google.inject.Provider; -import junit.framework.Assert; -import org.apache.ambari.server.orm.entities.HostComponentDesiredStateEntity; -import org.apache.ambari.server.orm.entities.HostEntity; -import org.junit.Test; - -import javax.persistence.EntityManager; - -import java.util.Collection; -import java.util.HashSet; - 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 javax.persistence.EntityManager; + +import org.apache.ambari.server.orm.entities.HostComponentDesiredStateEntity; +import org.apache.ambari.server.orm.entities.HostEntity; +import org.junit.Test; + +import com.google.inject.Provider; + /** * HostComponentDesiredStateDAO tests. */ @@ -46,19 +43,17 @@ public class HostComponentDesiredStateDAOTest { EntityManager entityManager = createNiceMock(EntityManager.class); HostDAO hostDAO = createNiceMock(HostDAO.class); HostEntity hostEntity = createNiceMock(HostEntity.class); - + HostComponentDesiredStateEntity hostComponentDesiredStateEntity = createNiceMock(HostComponentDesiredStateEntity.class); - expect(hostComponentDesiredStateEntity.getHostId()).andReturn(1L).anyTimes(); expect(entityManagerProvider.get()).andReturn(entityManager).anyTimes(); - expect(entityManager.merge(hostComponentDesiredStateEntity)).andReturn(hostComponentDesiredStateEntity).anyTimes(); entityManager.remove(hostComponentDesiredStateEntity); hostEntity.removeHostComponentDesiredStateEntity(hostComponentDesiredStateEntity); - expect(hostDAO.merge(hostEntity)).andReturn(hostEntity).anyTimes(); + expect(hostDAO.merge(hostEntity)).andReturn(hostEntity).atLeastOnce(); - expect(hostDAO.findById(1L)).andReturn(hostEntity).anyTimes(); + expect(hostComponentDesiredStateEntity.getHostEntity()).andReturn(hostEntity).atLeastOnce(); replay(entityManagerProvider, entityManager, hostDAO, hostEntity, hostComponentDesiredStateEntity); http://git-wip-us.apache.org/repos/asf/ambari/blob/0de69e10/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostComponentStateDAOTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostComponentStateDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostComponentStateDAOTest.java index 7c7d0ce..5ea0b1e 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostComponentStateDAOTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostComponentStateDAOTest.java @@ -18,21 +18,19 @@ package org.apache.ambari.server.orm.dao; -import com.google.inject.Provider; -import junit.framework.Assert; -import org.apache.ambari.server.orm.entities.HostComponentStateEntity; -import org.apache.ambari.server.orm.entities.HostEntity; -import org.junit.Test; - -import javax.persistence.EntityManager; -import java.util.Collection; -import java.util.HashSet; - 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 javax.persistence.EntityManager; + +import org.apache.ambari.server.orm.entities.HostComponentStateEntity; +import org.apache.ambari.server.orm.entities.HostEntity; +import org.junit.Test; + +import com.google.inject.Provider; + /** * HostComponentStateDAO tests. */ @@ -48,22 +46,12 @@ public class HostComponentStateDAOTest { HostComponentStateEntity hostComponentStateEntity = createNiceMock(HostComponentStateEntity.class); - expect(hostComponentStateEntity.getHostName()).andReturn("host1"); - expect(hostDAO.findByName("host1")).andReturn(hostEntity); expect(entityManagerProvider.get()).andReturn(entityManager).anyTimes(); - - expect(entityManager.merge(hostComponentStateEntity)).andReturn(hostComponentStateEntity).anyTimes(); entityManager.remove(hostComponentStateEntity); - - hostEntity.removeHostComponentStateEntity(hostComponentStateEntity); - - expect(hostDAO.merge(hostEntity)).andReturn(hostEntity).anyTimes(); - replay(entityManagerProvider, entityManager, hostDAO, hostEntity, hostComponentStateEntity); - HostComponentStateDAO dao = new HostComponentStateDAO(); dao.entityManagerProvider = entityManagerProvider; dao.hostDAO = hostDAO; http://git-wip-us.apache.org/repos/asf/ambari/blob/0de69e10/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 d12adde..3a597fd 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 @@ -375,7 +375,6 @@ public class ComponentVersionCheckActionTest { } catch (ServiceNotFoundException e) { service = serviceFactory.createNew(cluster, serviceName); cluster.addService(service); - service.persist(); } return service; http://git-wip-us.apache.org/repos/asf/ambari/blob/0de69e10/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 480dfb3..7ab2856 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 @@ -1741,7 +1741,6 @@ public class ConfigureActionTest { } catch (ServiceNotFoundException e) { service = serviceFactory.createNew(cluster, serviceName); cluster.addService(service); - service.persist(); } return service; http://git-wip-us.apache.org/repos/asf/ambari/blob/0de69e10/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 d3d8b4c..30eb149 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 @@ -1020,7 +1020,6 @@ public class UpgradeActionTest { } catch (ServiceNotFoundException e) { service = serviceFactory.createNew(cluster, serviceName); cluster.addService(service); - service.persist(); } return service; http://git-wip-us.apache.org/repos/asf/ambari/blob/0de69e10/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 cfe5d61..ac6a5dd 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 @@ -100,7 +100,6 @@ public class ServiceComponentTest { Service s = serviceFactory.createNew(cluster, serviceName); cluster.addService(s); - s.persist(); service = cluster.getService(serviceName); Assert.assertNotNull(service); } http://git-wip-us.apache.org/repos/asf/ambari/blob/0de69e10/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 65751af..0f5c432 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 @@ -120,7 +120,6 @@ public class ServiceTest { String serviceName = "HDFS"; Service s = serviceFactory.createNew(cluster, serviceName); cluster.addService(s); - s.persist(); Service service = cluster.getService(serviceName); Assert.assertNotNull(service); @@ -142,7 +141,6 @@ public class ServiceTest { String serviceName = "HDFS"; Service s = serviceFactory.createNew(cluster, serviceName); cluster.addService(s); - s.persist(); Service service = cluster.getService(serviceName); @@ -268,7 +266,6 @@ public class ServiceTest { String serviceName = "HDFS"; Service s = serviceFactory.createNew(cluster, serviceName); cluster.addService(s); - s.persist(); Service service = cluster.getService(serviceName); Assert.assertNotNull(service); @@ -292,7 +289,6 @@ public class ServiceTest { String serviceName = "HDFS"; Service s = serviceFactory.createNew(cluster, serviceName); cluster.addService(s); - s.persist(); Service service = cluster.getService(serviceName); Assert.assertNotNull(service); http://git-wip-us.apache.org/repos/asf/ambari/blob/0de69e10/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 c511f1a..015660c 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,8 +19,6 @@ package org.apache.ambari.server.state.alerts; import java.util.UUID; -import junit.framework.Assert; - import org.apache.ambari.server.events.AlertDefinitionChangedEvent; import org.apache.ambari.server.events.AlertDefinitionDeleteEvent; import org.apache.ambari.server.events.AmbariEvent; @@ -51,12 +49,14 @@ import org.apache.ambari.server.utils.EventBusSynchronizer; import org.junit.After; import org.junit.Before; import org.junit.Test; +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 org.junit.experimental.categories.Category; + +import junit.framework.Assert; /** * Tests that {@link AmbariEvent} instances are fired correctly and that alert @@ -306,7 +306,6 @@ public class AlertEventPublisherTest { private void installHdfsService() throws Exception { String serviceName = "HDFS"; Service service = serviceFactory.createNew(cluster, serviceName); - service.persist(); service = cluster.getService(serviceName); Assert.assertNotNull(service); http://git-wip-us.apache.org/repos/asf/ambari/blob/0de69e10/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 c7a5915..85d13a6 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 @@ -41,6 +41,7 @@ import org.apache.ambari.server.utils.EventBusSynchronizer; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import com.google.common.eventbus.EventBus; import com.google.inject.Binder; @@ -51,7 +52,6 @@ import com.google.inject.persist.PersistService; import com.google.inject.util.Modules; import junit.framework.Assert; -import org.junit.experimental.categories.Category; /** * Tests that {@link InitialAlertEventTest} instances are fired correctly. @@ -177,7 +177,6 @@ public class InitialAlertEventTest { private void installHdfsService() throws Exception { String serviceName = "HDFS"; Service service = m_serviceFactory.createNew(m_cluster, serviceName); - service.persist(); service = m_cluster.getService(serviceName); Assert.assertNotNull(service); http://git-wip-us.apache.org/repos/asf/ambari/blob/0de69e10/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 ab2628b..e5eb942 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 @@ -595,7 +595,6 @@ public class ClusterDeadlockTest { } catch (ServiceNotFoundException e) { service = serviceFactory.createNew(cluster, serviceName); cluster.addService(service); - service.persist(); } return service; http://git-wip-us.apache.org/repos/asf/ambari/blob/0de69e10/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 ba0ff11..811d98b 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 @@ -214,7 +214,6 @@ public class ClusterImplTest { clusters.mapHostsToCluster(Sets.newHashSet(hostName1, hostName2), clusterName); Service hdfs = cluster.addService("HDFS"); - hdfs.persist(); ServiceComponent nameNode = hdfs.addServiceComponent("NAMENODE"); nameNode.persist(); @@ -231,7 +230,6 @@ public class ClusterImplTest { hdfsClient.addServiceComponentHost(hostName2).persist(); Service tez = cluster.addService(serviceToDelete); - tez.persist(); ServiceComponent tezClient = tez.addServiceComponent("TEZ_CLIENT"); tezClient.persist(); http://git-wip-us.apache.org/repos/asf/ambari/blob/0de69e10/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 4d39f71..fed9b98 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 @@ -383,9 +383,6 @@ public class ClusterTest { cluster.addService(s1); cluster.addService(s2); cluster.addService(s3); - s1.persist(); - s2.persist(); - s3.persist(); // Add HDFS components ServiceComponent sc1CompA = serviceComponentFactory.createNew(s1, "NAMENODE"); @@ -666,9 +663,6 @@ public class ClusterTest { Service s1 = serviceFactory.createNew(c1, "HDFS"); Service s2 = serviceFactory.createNew(c1, "MAPREDUCE"); - s1.persist(); - s2.persist(); - Service s = c1.getService("HDFS"); Assert.assertNotNull(s); Assert.assertEquals("HDFS", s.getName()); @@ -696,7 +690,6 @@ public class ClusterTest { Service s = serviceFactory.createNew(c1, "HDFS"); c1.addService(s); - s.persist(); ServiceComponent sc = serviceComponentFactory.createNew(s, "NAMENODE"); s.addServiceComponent(sc); sc.persist(); @@ -716,7 +709,6 @@ public class ClusterTest { iterator.next(); Service s1 = serviceFactory.createNew(c1, "PIG"); c1.addService(s1); - s1.persist(); ServiceComponent sc1 = serviceComponentFactory.createNew(s1, "PIG"); s1.addServiceComponent(sc1); sc1.persist(); @@ -738,7 +730,6 @@ public class ClusterTest { Service s = serviceFactory.createNew(c1, "HDFS"); c1.addService(s); - s.persist(); ServiceComponent scNN = serviceComponentFactory.createNew(s, "NAMENODE"); s.addServiceComponent(scNN); @@ -772,7 +763,6 @@ public class ClusterTest { Service s = serviceFactory.createNew(c1, "HDFS"); c1.addService(s); - s.persist(); ServiceComponent scNN = serviceComponentFactory.createNew(s, "NAMENODE"); s.addServiceComponent(scNN); @@ -812,7 +802,6 @@ public class ClusterTest { Service s = serviceFactory.createNew(c1, "HDFS"); c1.addService(s); - s.persist(); ServiceComponent scNN = serviceComponentFactory.createNew(s, "NAMENODE"); s.addServiceComponent(scNN); @@ -850,11 +839,9 @@ public class ClusterTest { Service sfHDFS = serviceFactory.createNew(c1, "HDFS"); c1.addService(sfHDFS); - sfHDFS.persist(); Service sfMR = serviceFactory.createNew(c1, "MAPREDUCE"); c1.addService(sfMR); - sfMR.persist(); ServiceComponent scNN = serviceComponentFactory.createNew(sfHDFS, "NAMENODE"); sfHDFS.addServiceComponent(scNN); @@ -915,11 +902,9 @@ public class ClusterTest { Service sfHDFS = serviceFactory.createNew(c1, "HDFS"); c1.addService(sfHDFS); - sfHDFS.persist(); Service sfMR = serviceFactory.createNew(c1, "MAPREDUCE"); c1.addService(sfMR); - sfMR.persist(); ServiceComponent scNN = serviceComponentFactory.createNew(sfHDFS, "NAMENODE"); sfHDFS.addServiceComponent(scNN); @@ -981,11 +966,9 @@ public class ClusterTest { Service sfHDFS = serviceFactory.createNew(c1, "HDFS"); c1.addService(sfHDFS); - sfHDFS.persist(); Service sfMR = serviceFactory.createNew(c1, "MAPREDUCE"); c1.addService(sfMR); - sfMR.persist(); ServiceComponent scNN = serviceComponentFactory.createNew(sfHDFS, "NAMENODE"); sfHDFS.addServiceComponent(scNN); @@ -1185,10 +1168,9 @@ public class ClusterTest { public void testDeleteService() throws Exception { createDefaultCluster(); - c1.addService("MAPREDUCE").persist(); + c1.addService("MAPREDUCE"); Service hdfs = c1.addService("HDFS"); - hdfs.persist(); ServiceComponent nameNode = hdfs.addServiceComponent("NAMENODE"); nameNode.persist(); @@ -1208,7 +1190,7 @@ public class ClusterTest { public void testDeleteServiceWithConfigHistory() throws Exception { createDefaultCluster(); - c1.addService("HDFS").persist(); + c1.addService("HDFS"); Config config1 = configFactory.createNew(c1, "hdfs-site", new HashMap<String, String>() {{ put("a", "b"); }}, new HashMap<String, Map<String,String>>()); http://git-wip-us.apache.org/repos/asf/ambari/blob/0de69e10/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 d2d07b5..1012534 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 @@ -385,7 +385,6 @@ public class ClustersDeadlockTest { } catch (ServiceNotFoundException e) { service = serviceFactory.createNew(cluster, serviceName); cluster.addService(service); - service.persist(); } return service; http://git-wip-us.apache.org/repos/asf/ambari/blob/0de69e10/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 2f2be0c..94bd6d4 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 @@ -440,7 +440,6 @@ public class ClustersTest { host1.addDesiredConfig(cluster.getClusterId(), true, "_test", config2); Service hdfs = cluster.addService("HDFS"); - hdfs.persist(); Assert.assertNotNull(injector.getInstance(ClusterServiceDAO.class).findByClusterAndServiceNames(c1, "HDFS")); http://git-wip-us.apache.org/repos/asf/ambari/blob/0de69e10/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 992b8fe..9106ec3 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 @@ -224,7 +224,6 @@ public class ConcurrentServiceConfigVersionTest { } catch (ServiceNotFoundException e) { service = serviceFactory.createNew(cluster, serviceName); cluster.addService(service); - service.persist(); } return service; http://git-wip-us.apache.org/repos/asf/ambari/blob/0de69e10/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 0f272f6..4c87613 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 @@ -253,7 +253,6 @@ public class ServiceComponentHostConcurrentWriteDeadlockTest { } catch (ServiceNotFoundException e) { service = serviceFactory.createNew(cluster, serviceName); cluster.addService(service); - service.persist(); } return service; http://git-wip-us.apache.org/repos/asf/ambari/blob/0de69e10/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 7f12eb7..080886e 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 @@ -182,7 +182,6 @@ public class ServiceComponentHostTest { + ", serviceName=" + svc); s = serviceFactory.createNew(c, svc); c.addService(s); - s.persist(); } ServiceComponent sc = null;
