diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostServiceTest.java index 33eb12ceef8..f9cd4dc9040 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostServiceTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostServiceTest.java @@ -48,8 +48,8 @@ public List getTestInvocations() throws Exception { //getHosts service = new TestHostService("clusterName", null); - m = service.getClass().getMethod("getHosts", String.class, HttpHeaders.class, UriInfo.class); - args = new Object[] {null, getHttpHeaders(), getUriInfo()}; + m = service.getClass().getMethod("getHosts", String.class, HttpHeaders.class, UriInfo.class, String.class); + args = new Object[] {null, getHttpHeaders(), getUriInfo(), null}; listInvocations.add(new ServiceTestInvocation(Request.Type.GET, service, m, args, null)); //createHost diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java index 3c6ec165e1c..535e337e17c 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java @@ -6738,7 +6738,7 @@ public void testGetRepositories() throws Exception { public void testGetStackServices() throws Exception { StackServiceRequest request = new StackServiceRequest(STACK_NAME, NEW_STACK_VERSION, null); Set responses = controller.getStackServices(Collections.singleton(request)); - Assert.assertEquals(12, responses.size()); + Assert.assertEquals(13, responses.size()); StackServiceRequest requestWithParams = new StackServiceRequest(STACK_NAME, NEW_STACK_VERSION, SERVICE_NAME); diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MpackResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MpackResourceProviderTest.java index bb1dbec4ef3..cc92b6ba348 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MpackResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MpackResourceProviderTest.java @@ -111,9 +111,7 @@ public void testGetResourcesMpacks() throws Exception { // replay replay(m_dao); - ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( - type - ); + ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(type, m_amc); // create the request Request request = PropertyHelper.getReadRequest(); @@ -182,8 +180,7 @@ public void testGetResourcesMpackId() throws Exception { // replay replay(m_dao,m_amc); - ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( - type); + ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(type, m_amc); // create the request Request request = PropertyHelper.getReadRequest(); @@ -222,8 +219,7 @@ public void testCreateResources() throws Exception { replay(m_amc,request); // end expectations - MpackResourceProvider provider = (MpackResourceProvider) AbstractControllerResourceProvider.getResourceProvider( - Resource.Type.Mpack); + MpackResourceProvider provider = (MpackResourceProvider) AbstractControllerResourceProvider.getResourceProvider(Resource.Type.Mpack, m_amc); AbstractResourceProviderTest.TestObserver observer = new AbstractResourceProviderTest.TestObserver(); ((ObservableResourceProvider)provider).addObserver(observer); 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 d71042771f0..5573d290b84 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 @@ -18,6 +18,7 @@ package org.apache.ambari.server.stack; +import static java.util.stream.Collectors.toCollection; import static org.easymock.EasyMock.createNiceMock; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.replay; @@ -39,6 +40,8 @@ import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.TreeSet; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.Role; @@ -301,10 +304,11 @@ public void testStackVersionInheritance() { assertNotNull(si); //should include all stacks in hierarchy - assertEquals(18, services.size()); + assertEquals(19, services.size()); - HashSet expectedServices = new HashSet<>(); + Set expectedServices = new TreeSet<>(); expectedServices.add("GANGLIA"); + expectedServices.add("HADOOP_CLIENTS"); expectedServices.add("HBASE"); expectedServices.add("HCATALOG"); expectedServices.add("HDFS"); @@ -323,12 +327,13 @@ public void testStackVersionInheritance() { expectedServices.add("SPARK3"); expectedServices.add("SYSTEMML"); + assertEquals(expectedServices, services.stream().map(ServiceInfo::getName).collect(toCollection(TreeSet::new))); ServiceInfo pigService = null; for (ServiceInfo service : services) { if (service.getName().equals("PIG")) { pigService = service; } - assertTrue(expectedServices.remove(service.getName())); + assertTrue(service.getName(), expectedServices.remove(service.getName())); } assertTrue(expectedServices.isEmpty()); @@ -524,7 +529,7 @@ public void testPackageInheritance() throws Exception{ public void testMonitoringServicePropertyInheritance() throws Exception{ StackInfo stack = stackManager.getStack("HDP", "2.0.8"); Collection allServices = stack.getServices(); - assertEquals(15, allServices.size()); + assertEquals(16, allServices.size()); boolean monitoringServiceFound = false; @@ -545,9 +550,10 @@ public void testServiceDeletion() { StackInfo stack = stackManager.getStack("HDP", "2.0.6"); Collection allServices = stack.getServices(); - assertEquals(12, allServices.size()); + assertEquals(13, allServices.size()); HashSet expectedServices = new HashSet<>(); expectedServices.add("GANGLIA"); + expectedServices.add("HADOOP_CLIENTS"); expectedServices.add("HBASE"); expectedServices.add("HCATALOG"); expectedServices.add("HDFS"); diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertDefinitionHashTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertDefinitionHashTest.java index 53b0a109b56..2d21ab81b20 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertDefinitionHashTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertDefinitionHashTest.java @@ -103,6 +103,7 @@ protected void setUp() throws Exception { List serviceComponentHosts = new ArrayList<>(); ServiceComponentHost sch = EasyMock.createNiceMock(ServiceComponentHost.class); expect(sch.getServiceName()).andReturn("HDFS").anyTimes(); + expect(sch.getServiceType()).andReturn("HDFS").anyTimes(); expect(sch.getServiceComponentName()).andReturn("NAMENODE").anyTimes(); expect(sch.getHostName()).andReturn(HOSTNAME).anyTimes(); EasyMock.replay(sch); @@ -111,6 +112,7 @@ protected void setUp() throws Exception { // add HDFS/DN sch = EasyMock.createNiceMock(ServiceComponentHost.class); expect(sch.getServiceName()).andReturn("HDFS").anyTimes(); + expect(sch.getServiceType()).andReturn("HDFS").anyTimes(); expect(sch.getServiceComponentName()).andReturn("DATANODE").anyTimes(); expect(sch.getHostName()).andReturn(HOSTNAME).anyTimes(); EasyMock.replay(sch);