Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-14714 35d704cb3 -> 1f176845e
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterInstallWithoutStartTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterInstallWithoutStartTest.java b/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterInstallWithoutStartTest.java index d89c8ca..8d58107 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterInstallWithoutStartTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterInstallWithoutStartTest.java @@ -286,7 +286,7 @@ public class ClusterInstallWithoutStartTest extends EasyMockSupport { expect(stack.getExcludedConfigurationTypes("service1")).andReturn(Collections.emptySet()).anyTimes(); expect(stack.getExcludedConfigurationTypes("service2")).andReturn(Collections.emptySet()).anyTimes(); - expect(request.getBlueprint()).andReturn(blueprint).anyTimes(); + expect(request.getBlueprint()).andReturn(null).anyTimes(); expect(request.getClusterId()).andReturn(CLUSTER_ID).anyTimes(); expect(request.getClusterName()).andReturn(CLUSTER_NAME).anyTimes(); expect(request.getDescription()).andReturn("Provision Cluster Test").anyTimes(); @@ -340,7 +340,7 @@ public class ClusterInstallWithoutStartTest extends EasyMockSupport { expect(ambariContext.getPersistedTopologyState()).andReturn(persistedState).anyTimes(); //todo: don't ignore param - ambariContext.createAmbariResources(isA(ClusterTopology.class), eq(CLUSTER_NAME), (SecurityType) isNull(), eq("1"), anyLong()); + ambariContext.createAmbariResources(isA(ClusterTopology.class), eq(CLUSTER_NAME), (SecurityType) isNull()); expectLastCall().once(); expect(ambariContext.getNextRequestId()).andReturn(1L).once(); expect(ambariContext.isClusterKerberosEnabled(CLUSTER_ID)).andReturn(false).anyTimes(); http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterTopologyImplTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterTopologyImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterTopologyImplTest.java index a8674b3..d8c266d 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterTopologyImplTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterTopologyImplTest.java @@ -104,21 +104,21 @@ public class ClusterTopologyImplTest { hostGroupMap.put("group4", group4); Set<ComponentV2> group1Components = new HashSet<>(); - group1Components.add(new ComponentV2("component1", new Service("service1", stack))); - group1Components.add(new ComponentV2("component2", new Service("service1", stack))); + group1Components.add(null); + group1Components.add(null); Set<String> group1ComponentNames = new HashSet<>(); group1ComponentNames.add("component1"); group1ComponentNames.add("component2"); Set<ComponentV2> group2Components = new HashSet<>(); - group2Components.add(new ComponentV2("component3", new Service("service1", stack))); + group2Components.add(null); Set<ComponentV2> group3Components = new HashSet<>(); - group3Components.add(new ComponentV2("component4", new Service("service2", stack))); + group3Components.add(null); Set<ComponentV2> group4Components = new HashSet<>(); - group4Components.add(new ComponentV2("component5", new Service("service2", stack))); + group4Components.add(null); - expect(blueprint.getHostGroups()).andReturn(hostGroupMap).anyTimes(); + expect(blueprint.getHostGroups()).andReturn(null).anyTimes(); expect(blueprint.getHostGroup("group1")).andReturn(group1).anyTimes(); expect(blueprint.getHostGroup("group2")).andReturn(group2).anyTimes(); expect(blueprint.getHostGroup("group3")).andReturn(group3).anyTimes(); http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/topology/LogicalRequestTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/topology/LogicalRequestTest.java b/ambari-server/src/test/java/org/apache/ambari/server/topology/LogicalRequestTest.java index a5265f6..02e4e75 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/topology/LogicalRequestTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/topology/LogicalRequestTest.java @@ -112,7 +112,7 @@ public class LogicalRequestTest extends EasyMockSupport { expect(clusterTopology.getAmbariContext()).andReturn(ambariContext).anyTimes(); expect(clusterTopology.getClusterId()).andReturn(clusterId).anyTimes(); expect(clusterTopology.getProvisionAction()).andReturn(ProvisionAction.INSTALL_ONLY).anyTimes(); - expect(clusterTopology.getBlueprint()).andReturn(blueprint).anyTimes(); + expect(clusterTopology.getBlueprint()).andReturn(null).anyTimes(); expect(blueprint.getName()).andReturn("blueprintDef").anyTimes(); expect(blueprint.shouldSkipFailure()).andReturn(true).anyTimes(); http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/topology/RequiredPasswordValidatorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/topology/RequiredPasswordValidatorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/topology/RequiredPasswordValidatorTest.java index c474493..e2b3346 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/topology/RequiredPasswordValidatorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/topology/RequiredPasswordValidatorTest.java @@ -139,7 +139,7 @@ public class RequiredPasswordValidatorTest extends EasyMockSupport { hostGroupInfo.put("group2", hostGroup2Info); expect(topology.getConfiguration()).andReturn(topoClusterConfig).anyTimes(); - expect(topology.getBlueprint()).andReturn(blueprint).anyTimes(); + expect(topology.getBlueprint()).andReturn(null).anyTimes(); expect(topology.getHostGroupInfo()).andReturn(hostGroupInfo).anyTimes(); expect(blueprint.getHostGroups()).andReturn(hostGroups).anyTimes(); http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/topology/TopologyManagerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/topology/TopologyManagerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/topology/TopologyManagerTest.java index 5f61c85..4eb29b7 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/topology/TopologyManagerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/topology/TopologyManagerTest.java @@ -18,7 +18,6 @@ package org.apache.ambari.server.topology; -import static org.easymock.EasyMock.anyLong; import static org.easymock.EasyMock.anyObject; import static org.easymock.EasyMock.capture; import static org.easymock.EasyMock.eq; @@ -59,6 +58,7 @@ import org.apache.ambari.server.controller.spi.ClusterController; import org.apache.ambari.server.controller.spi.Resource; import org.apache.ambari.server.controller.spi.ResourceProvider; import org.apache.ambari.server.events.RequestFinishedEvent; +import org.apache.ambari.server.events.publishers.AmbariEventPublisher; import org.apache.ambari.server.orm.dao.SettingDAO; import org.apache.ambari.server.orm.entities.SettingEntity; import org.apache.ambari.server.security.authorization.AuthorizationHelper; @@ -278,10 +278,10 @@ public class TopologyManagerTest { expect(stack.getConfiguration()).andReturn(stackConfig).anyTimes(); expect(stack.getName()).andReturn(STACK_NAME).anyTimes(); expect(stack.getVersion()).andReturn(STACK_VERSION).anyTimes(); - expect(stack.getExcludedConfigurationTypes("service1")).andReturn(Collections.emptySet()).anyTimes(); - expect(stack.getExcludedConfigurationTypes("service2")).andReturn(Collections.emptySet()).anyTimes(); + expect(stack.getExcludedConfigurationTypes("service1")).andReturn(new HashSet<String>()).anyTimes(); + expect(stack.getExcludedConfigurationTypes("service2")).andReturn(new HashSet<String>()).anyTimes(); - expect(request.getBlueprint()).andReturn(blueprint).anyTimes(); + expect(request.getBlueprint()).andReturn(null).anyTimes(); expect(request.getClusterId()).andReturn(CLUSTER_ID).anyTimes(); expect(request.getClusterName()).andReturn(CLUSTER_NAME).anyTimes(); expect(request.getDescription()).andReturn("Provision Cluster Test").anyTimes(); @@ -323,7 +323,7 @@ public class TopologyManagerTest { expect(ambariContext.getPersistedTopologyState()).andReturn(persistedState).anyTimes(); //todo: don't ignore param - ambariContext.createAmbariResources(isA(ClusterTopology.class), eq(CLUSTER_NAME), (SecurityType) isNull(), (String) isNull(), anyLong()); + ambariContext.createAmbariResources(isA(ClusterTopology.class), eq(CLUSTER_NAME), (SecurityType) isNull()); expectLastCall().anyTimes(); expect(ambariContext.getNextRequestId()).andReturn(1L).anyTimes(); expect(ambariContext.isClusterKerberosEnabled(CLUSTER_ID)).andReturn(false).anyTimes(); @@ -345,7 +345,8 @@ public class TopologyManagerTest { expect(clusterController.ensureResourceProvider(anyObject(Resource.Type.class))).andReturn(resourceProvider); - expect(configureClusterTaskFactory.createConfigureClusterTask(anyObject(), anyObject(), anyObject())).andReturn(configureClusterTask); + expect(configureClusterTaskFactory.createConfigureClusterTask(anyObject(ClusterTopology.class), anyObject(ClusterConfigurationRequest.class), + anyObject(AmbariEventPublisher.class))).andReturn(configureClusterTask); expect(configureClusterTask.getTimeout()).andReturn(1000L); expect(configureClusterTask.getRepeatDelay()).andReturn(50L); expect(executor.submit(anyObject(AsyncCallableService.class))).andReturn(mockFuture).anyTimes(); @@ -399,10 +400,10 @@ public class TopologyManagerTest { requestList.add(logicalRequest); expect(logicalRequest.hasPendingHostRequests()).andReturn(false).anyTimes(); allRequests.put(clusterTopologyMock, requestList); - expect(requestStatusResponse.getTasks()).andReturn(Collections.emptyList()).anyTimes(); + expect(requestStatusResponse.getTasks()).andReturn(new ArrayList<ShortTaskStatus>()).anyTimes(); expect(clusterTopologyMock.isClusterKerberosEnabled()).andReturn(true); expect(clusterTopologyMock.getClusterId()).andReturn(CLUSTER_ID).anyTimes(); - expect(clusterTopologyMock.getBlueprint()).andReturn(blueprint).anyTimes(); + expect(clusterTopologyMock.getBlueprint()).andReturn(null).anyTimes(); expect(persistedState.getAllRequests()).andReturn(allRequests).anyTimes(); expect(persistedState.getProvisionRequest(CLUSTER_ID)).andReturn(logicalRequest).anyTimes(); expect(ambariContext.isTopologyResolved(CLUSTER_ID)).andReturn(true).anyTimes(); @@ -429,7 +430,7 @@ public class TopologyManagerTest { tasks.add(t3); expect(requestStatusResponse.getTasks()).andReturn(tasks).anyTimes(); - expect(persistedState.getAllRequests()).andReturn(Collections.emptyMap()).anyTimes(); + expect(persistedState.getAllRequests()).andReturn(new HashMap<ClusterTopology, List<LogicalRequest>>()).anyTimes(); expect(persistedState.getProvisionRequest(CLUSTER_ID)).andReturn(logicalRequest).anyTimes(); replayAll(); topologyManager.provisionCluster(request); @@ -451,7 +452,7 @@ public class TopologyManagerTest { tasks.add(t3); expect(requestStatusResponse.getTasks()).andReturn(tasks).anyTimes(); - expect(persistedState.getAllRequests()).andReturn(Collections.emptyMap()).anyTimes(); + expect(persistedState.getAllRequests()).andReturn(new HashMap<ClusterTopology, List<LogicalRequest>>()).anyTimes(); expect(persistedState.getProvisionRequest(CLUSTER_ID)).andReturn(logicalRequest).anyTimes(); replayAll(); topologyManager.provisionCluster(request); @@ -473,7 +474,7 @@ public class TopologyManagerTest { tasks.add(t3); expect(requestStatusResponse.getTasks()).andReturn(tasks).anyTimes(); - expect(persistedState.getAllRequests()).andReturn(Collections.emptyMap()).anyTimes(); + expect(persistedState.getAllRequests()).andReturn(new HashMap<ClusterTopology, List<LogicalRequest>>()).anyTimes(); expect(persistedState.getProvisionRequest(CLUSTER_ID)).andReturn(logicalRequest).anyTimes(); replayAll(); topologyManager.provisionCluster(request); @@ -545,9 +546,9 @@ public class TopologyManagerTest { propertySet.add(properties); BlueprintFactory bpfMock = EasyMock.createNiceMock(BlueprintFactory.class); EasyMock.expect(bpfMock.getBlueprint(BLUEPRINT_NAME)).andReturn(blueprint).anyTimes(); - ScaleClusterRequest.init(bpfMock); + ScaleClusterRequest.init(null); replay(bpfMock); - expect(persistedState.getAllRequests()).andReturn(Collections.emptyMap()).anyTimes(); + expect(persistedState.getAllRequests()).andReturn(new HashMap<ClusterTopology, List<LogicalRequest>>()).anyTimes(); replayAll(); topologyManager.provisionCluster(request); topologyManager.scaleHosts(new ScaleClusterRequest(propertySet)); @@ -556,7 +557,7 @@ public class TopologyManagerTest { @Test public void testProvisionCluster_QuickLinkProfileIsSavedTheFirstTime() throws Exception { - expect(persistedState.getAllRequests()).andReturn(Collections.emptyMap()).anyTimes(); + expect(persistedState.getAllRequests()).andReturn(new HashMap<ClusterTopology, List<LogicalRequest>>()).anyTimes(); // request has a quicklinks profile expect(request.getQuickLinksProfileJson()).andReturn(SAMPLE_QUICKLINKS_PROFILE_1).anyTimes(); @@ -579,7 +580,7 @@ public class TopologyManagerTest { @Test public void testProvisionCluster_ExistingQuickLinkProfileIsOverwritten() throws Exception { - expect(persistedState.getAllRequests()).andReturn(Collections.emptyMap()).anyTimes(); + expect(persistedState.getAllRequests()).andReturn(new HashMap<ClusterTopology, List<LogicalRequest>>()).anyTimes(); // request has a quicklinks profile expect(request.getQuickLinksProfileJson()).andReturn(SAMPLE_QUICKLINKS_PROFILE_2).anyTimes(); http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/ClusterConfigTypeValidatorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/ClusterConfigTypeValidatorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/ClusterConfigTypeValidatorTest.java index c2fea1d..424ed63 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/ClusterConfigTypeValidatorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/ClusterConfigTypeValidatorTest.java @@ -62,7 +62,7 @@ public class ClusterConfigTypeValidatorTest extends EasyMockSupport { public void before() { EasyMock.expect(clusterTopologyMock.getConfiguration()).andReturn(clusterConfigurationMock).anyTimes(); - EasyMock.expect(clusterTopologyMock.getBlueprint()).andReturn(blueprintMock).anyTimes(); + EasyMock.expect(clusterTopologyMock.getBlueprint()).andReturn(null).anyTimes(); EasyMock.expect(blueprintMock.getStack()).andReturn(stackMock).anyTimes(); } http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/HiveServiceValidatorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/HiveServiceValidatorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/HiveServiceValidatorTest.java index 74c3ae5..e3eca17 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/HiveServiceValidatorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/HiveServiceValidatorTest.java @@ -64,7 +64,7 @@ public class HiveServiceValidatorTest extends EasyMockSupport { public void testShouldValidationPassWhenHiveServiceIsNotInBlueprint() throws Exception { // GIVEN - EasyMock.expect(clusterTopologyMock.getBlueprint()).andReturn(blueprintMock); + EasyMock.expect(clusterTopologyMock.getBlueprint()).andReturn(null); EasyMock.expect(blueprintMock.getServices()).andReturn(Collections.emptySet()); replayAll(); @@ -80,7 +80,7 @@ public class HiveServiceValidatorTest extends EasyMockSupport { // GIVEN Collection<String> blueprintServices = Arrays.asList("HIVE", "OOZIE"); - EasyMock.expect(clusterTopologyMock.getBlueprint()).andReturn(blueprintMock); + EasyMock.expect(clusterTopologyMock.getBlueprint()).andReturn(null); EasyMock.expect(blueprintMock.getServices()).andReturn(blueprintServices); EasyMock.expect(clusterTopologyMock.getConfiguration()).andReturn(configurationMock); EasyMock.expect(configurationMock.getAllConfigTypes()).andReturn(Collections.emptySet()); @@ -100,7 +100,7 @@ public class HiveServiceValidatorTest extends EasyMockSupport { // GIVEN Collection<String> blueprintServices = Arrays.asList("HIVE", "OOZIE"); Collection<String> configTypes = Arrays.asList("hive-env", "core-site", "hadoop-env"); - EasyMock.expect(clusterTopologyMock.getBlueprint()).andReturn(blueprintMock); + EasyMock.expect(clusterTopologyMock.getBlueprint()).andReturn(null); EasyMock.expect(blueprintMock.getServices()).andReturn(blueprintServices); EasyMock.expect(clusterTopologyMock.getConfiguration()).andReturn(configurationMock); EasyMock.expect(configurationMock.getAllConfigTypes()).andReturn(configTypes); @@ -120,7 +120,7 @@ public class HiveServiceValidatorTest extends EasyMockSupport { // GIVEN Collection<String> blueprintServices = Arrays.asList("HIVE", "HDFS"); Collection<String> configTypes = Arrays.asList("hive-env", "core-site", "hadoop-env"); - EasyMock.expect(clusterTopologyMock.getBlueprint()).andReturn(blueprintMock).anyTimes(); + EasyMock.expect(clusterTopologyMock.getBlueprint()).andReturn(null).anyTimes(); EasyMock.expect(blueprintMock.getServices()).andReturn(blueprintServices).anyTimes(); EasyMock.expect(blueprintMock.getComponents("HIVE")).andReturn(Collections.emptyList()).anyTimes(); EasyMock.expect(clusterTopologyMock.getConfiguration()).andReturn(configurationMock); @@ -143,7 +143,7 @@ public class HiveServiceValidatorTest extends EasyMockSupport { Collection<String> blueprintServices = Arrays.asList("HIVE", "HDFS", "MYSQL_SERVER"); Collection<String> hiveComponents = Arrays.asList("MYSQL_SERVER"); Collection<String> configTypes = Arrays.asList("hive-env", "core-site", "hadoop-env"); - EasyMock.expect(clusterTopologyMock.getBlueprint()).andReturn(blueprintMock).anyTimes(); + EasyMock.expect(clusterTopologyMock.getBlueprint()).andReturn(null).anyTimes(); EasyMock.expect(blueprintMock.getServices()).andReturn(blueprintServices).anyTimes(); EasyMock.expect(blueprintMock.getComponents("HIVE")).andReturn(hiveComponents).anyTimes(); EasyMock.expect(clusterTopologyMock.getConfiguration()).andReturn(configurationMock); http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/RequiredConfigPropertiesValidatorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/RequiredConfigPropertiesValidatorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/RequiredConfigPropertiesValidatorTest.java index 4853a4d..cfa3af1 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/RequiredConfigPropertiesValidatorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/RequiredConfigPropertiesValidatorTest.java @@ -96,7 +96,7 @@ public class RequiredConfigPropertiesValidatorTest extends EasyMockSupport { EasyMock.expect(clusterTopologyMock.getConfiguration()).andReturn(topologyConfigurationMock); EasyMock.expect(topologyConfigurationMock.getFullProperties(1)).andReturn(topologyConfigurationMap); - EasyMock.expect(clusterTopologyMock.getBlueprint()).andReturn(blueprintMock).anyTimes(); + EasyMock.expect(clusterTopologyMock.getBlueprint()).andReturn(null).anyTimes(); EasyMock.expect(blueprintMock.getHostGroups()).andReturn(hostGroups); EasyMock.expect(blueprintMock.getServices()).andReturn(bpServices); http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/StackConfigTypeValidatorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/StackConfigTypeValidatorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/StackConfigTypeValidatorTest.java index a807b42..e63ff45 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/StackConfigTypeValidatorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/StackConfigTypeValidatorTest.java @@ -62,7 +62,7 @@ public class StackConfigTypeValidatorTest extends EasyMockSupport { @Before public void before() { EasyMock.expect(clusterTopologyMock.getConfiguration()).andReturn(clusterConfigurationMock).anyTimes(); - EasyMock.expect(clusterTopologyMock.getBlueprint()).andReturn(blueprintMock).anyTimes(); + EasyMock.expect(clusterTopologyMock.getBlueprint()).andReturn(null).anyTimes(); EasyMock.expect(blueprintMock.getStack()).andReturn(stackMock).anyTimes(); } http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/UnitValidatorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/UnitValidatorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/UnitValidatorTest.java index 334ee4b..95e539e 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/UnitValidatorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/topology/validators/UnitValidatorTest.java @@ -25,7 +25,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.apache.ambari.server.controller.StackConfigurationResponse; +import org.apache.ambari.server.controller.StackLevelConfigurationResponse; import org.apache.ambari.server.controller.internal.ConfigurationTopologyException; import org.apache.ambari.server.controller.internal.Stack; import org.apache.ambari.server.state.ValueAttributesInfo; @@ -74,8 +74,8 @@ public class UnitValidatorTest extends EasyMockSupport { @Before public void setUp() throws Exception { - expect(clusterTopology.getBlueprint()).andReturn(blueprint).anyTimes(); - expect(clusterTopology.getHostGroupInfo()).andReturn(Collections.emptyMap()).anyTimes(); + expect(clusterTopology.getBlueprint()).andReturn(null).anyTimes(); + expect(clusterTopology.getHostGroupInfo()).andReturn(null).anyTimes(); expect(blueprint.getStack()).andReturn(stack).anyTimes(); expect(stack.getConfigurationPropertiesWithMetadata(SERVICE, CONFIG_TYPE)).andReturn(stackConfigWithMetadata).anyTimes(); } @@ -98,7 +98,7 @@ public class UnitValidatorTest extends EasyMockSupport { private void stackUnitIs(String name, String unit) { ValueAttributesInfo propertyValueAttributes = new ValueAttributesInfo(); propertyValueAttributes.setUnit(unit); - stackConfigWithMetadata.put(name, new Stack.ConfigProperty(new StackConfigurationResponse( + stackConfigWithMetadata.put(name, new Stack.ConfigProperty(new StackLevelConfigurationResponse( name, "any", "any", http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalogTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalogTest.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalogTest.java index 066ec34..d7ad7f2 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalogTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalogTest.java @@ -17,6 +17,7 @@ */ package org.apache.ambari.server.upgrade; +import static org.easymock.EasyMock.anyLong; import static org.easymock.EasyMock.anyObject; import static org.easymock.EasyMock.anyString; import static org.easymock.EasyMock.createNiceMock; @@ -131,7 +132,7 @@ public class AbstractUpgradeCatalogTest { mergedProperties.put("prop1", "v1-old"); mergedProperties.put("prop4", "v4"); - expect(amc.createConfig(eq(cluster), anyObject(StackId.class), eq("hdfs-site"), eq(mergedProperties), anyString(), eq(tags))).andReturn(null); + expect(amc.createConfig(eq(cluster), anyObject(StackId.class), eq("hdfs-site"), eq(mergedProperties), anyString(), eq(tags), eq(anyLong()))).andReturn(null); replay(injector, configHelper, amc, cluster, clusters, serviceInfo, oldConfig); @@ -153,7 +154,7 @@ public class AbstractUpgradeCatalogTest { mergedProperties.put("prop2", "v2"); mergedProperties.put("prop3", "v3-old"); - expect(amc.createConfig(eq(cluster), anyObject(StackId.class), eq("hdfs-site"), eq(mergedProperties), anyString(), eq(tags))).andReturn(null); + expect(amc.createConfig(eq(cluster), anyObject(StackId.class), eq("hdfs-site"), eq(mergedProperties), anyString(), eq(tags), eq(anyLong()))).andReturn(null); replay(injector, configHelper, amc, cluster, clusters, serviceInfo, oldConfig); @@ -172,7 +173,7 @@ public class AbstractUpgradeCatalogTest { Map<String, String> mergedProperties = new HashMap<>(); mergedProperties.put("prop1", "v1-old"); - expect(amc.createConfig(eq(cluster), anyObject(StackId.class), eq("hdfs-site"), eq(mergedProperties), anyString(), eq(tags))).andReturn(null); + expect(amc.createConfig(eq(cluster), anyObject(StackId.class), eq("hdfs-site"), eq(mergedProperties), anyString(), eq(tags), eq(anyLong()))).andReturn(null); replay(injector, configHelper, amc, cluster, clusters, serviceInfo, oldConfig); http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog252Test.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog252Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog252Test.java index d936c6d..07ed888 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog252Test.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog252Test.java @@ -18,10 +18,12 @@ package org.apache.ambari.server.upgrade; +import static org.easymock.EasyMock.anyLong; import static org.easymock.EasyMock.anyObject; import static org.easymock.EasyMock.anyString; import static org.easymock.EasyMock.capture; import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.createNiceMock; import static org.easymock.EasyMock.eq; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.expectLastCall; @@ -190,6 +192,8 @@ public class UpgradeCatalog252Test { final Config livyConfNew = createMock(Config.class); final Config livy2Conf = createMock(Config.class); final Config livy2ConfNew = createMock(Config.class); + final Service sparkMock = createNiceMock(Service.class); + final Service spark2Mock = createNiceMock(Service.class); final AmbariManagementController controller = createMock(AmbariManagementController.class); StackId stackId = new StackId("HDP", "2.2"); @@ -215,11 +219,11 @@ public class UpgradeCatalog252Test { expect(cluster.getClusterName()).andReturn("c1").atLeastOnce(); expect(cluster.getDesiredStackVersion()).andReturn(stackId).atLeastOnce(); expect(cluster.getDesiredConfigByType("zeppelin-env")).andReturn(zeppelinEnv).atLeastOnce(); - expect(cluster.getServiceByConfigType("livy-conf")).andReturn("SPARK").atLeastOnce(); + expect(cluster.getServiceByConfigType("livy-conf")).andReturn(sparkMock).atLeastOnce(); expect(cluster.getDesiredConfigByType("livy-conf")).andReturn(livyConf).atLeastOnce(); expect(cluster.getConfigsByType("livy-conf")).andReturn(Collections.singletonMap("tag1", livyConf)).atLeastOnce(); expect(cluster.getConfig(eq("livy-conf"), anyString())).andReturn(livyConfNew).atLeastOnce(); - expect(cluster.getServiceByConfigType("livy2-conf")).andReturn("SPARK2").atLeastOnce(); + expect(cluster.getServiceByConfigType("livy2-conf")).andReturn(spark2Mock).atLeastOnce(); expect(cluster.getDesiredConfigByType("livy2-conf")).andReturn(livy2Conf).atLeastOnce(); expect(cluster.getConfigsByType("livy2-conf")).andReturn(Collections.singletonMap("tag1", livy2Conf)).atLeastOnce(); expect(cluster.getConfig(eq("livy2-conf"), anyString())).andReturn(livy2ConfNew).atLeastOnce(); @@ -227,25 +231,28 @@ public class UpgradeCatalog252Test { expect(zeppelinEnv.getProperties()).andReturn(Collections.singletonMap("zeppelin.server.kerberos.principal", "zeppelin_user@AMBARI.LOCAL")).once(); + expect(sparkMock.getName()).andReturn("SPARK").atLeastOnce(); + expect(spark2Mock.getName()).andReturn("SPARK2").atLeastOnce(); + expect(livyConf.getProperties()).andReturn(Collections.singletonMap("livy.superusers", "zeppelin-c1, some_user")).atLeastOnce(); expect(livyConf.getPropertiesAttributes()).andReturn(Collections.<String, Map<String, String>>emptyMap()).atLeastOnce(); expect(livy2Conf.getProperties()).andReturn(Collections.<String, String>emptyMap()).atLeastOnce(); expect(livy2Conf.getPropertiesAttributes()).andReturn(Collections.<String, Map<String, String>>emptyMap()).atLeastOnce(); - expect(controller.createConfig(eq(cluster), eq(stackId), eq("livy-conf"), capture(captureLivyConfProperties), anyString(), anyObject(Map.class))) + expect(controller.createConfig(eq(cluster), eq(stackId), eq("livy-conf"), capture(captureLivyConfProperties), anyString(), anyObject(Map.class), anyLong())) .andReturn(livyConfNew) .once(); - expect(controller.createConfig(eq(cluster), eq(stackId), eq("livy2-conf"), capture(captureLivy2ConfProperties), anyString(), anyObject(Map.class))) + expect(controller.createConfig(eq(cluster), eq(stackId), eq("livy2-conf"), capture(captureLivy2ConfProperties), anyString(), anyObject(Map.class), anyLong())) .andReturn(livy2ConfNew) .once(); - replay(clusters, cluster, zeppelinEnv, livy2Conf, livyConf, controller); + replay(clusters, cluster, zeppelinEnv, livy2Conf, livyConf, controller, sparkMock, spark2Mock); Injector injector = Guice.createInjector(module); UpgradeCatalog252 upgradeCatalog252 = injector.getInstance(UpgradeCatalog252.class); upgradeCatalog252.fixLivySuperusers(); - verify(clusters, cluster, zeppelinEnv, livy2Conf, livyConf, controller); + verify(clusters, cluster, zeppelinEnv, livy2Conf, livyConf, controller, sparkMock, spark2Mock); Assert.assertTrue(captureLivyConfProperties.hasCaptured()); Assert.assertEquals("some_user,zeppelin_user", captureLivyConfProperties.getValue().get("livy.superusers")); http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog260Test.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog260Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog260Test.java index cc58988..08d6a7f 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog260Test.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog260Test.java @@ -18,6 +18,7 @@ package org.apache.ambari.server.upgrade; +import static org.easymock.EasyMock.anyLong; import static org.easymock.EasyMock.anyObject; import static org.easymock.EasyMock.anyString; import static org.easymock.EasyMock.capture; @@ -57,12 +58,14 @@ import org.apache.ambari.server.controller.AmbariManagementController; import org.apache.ambari.server.controller.AmbariManagementControllerImpl; import org.apache.ambari.server.controller.MaintenanceStateHelper; import org.apache.ambari.server.controller.ServiceConfigVersionResponse; +import org.apache.ambari.server.mpack.MpackManagerFactory; import org.apache.ambari.server.orm.DBAccessor; import org.apache.ambari.server.orm.DBAccessor.DBColumnInfo; import org.apache.ambari.server.orm.dao.ArtifactDAO; import org.apache.ambari.server.orm.dao.WidgetDAO; import org.apache.ambari.server.orm.entities.ArtifactEntity; import org.apache.ambari.server.orm.entities.WidgetEntity; +import org.apache.ambari.server.resources.RootLevelSettingsManagerFactory; import org.apache.ambari.server.stack.StackManagerFactory; import org.apache.ambari.server.state.Cluster; import org.apache.ambari.server.state.Clusters; @@ -582,6 +585,7 @@ public class UpgradeCatalog260Test { final Config zeppelinEnvConf = createMock(Config.class); final Config coreSiteConf = createMock(Config.class); final Config coreSiteConfNew = createMock(Config.class); + final Service hdfsMock = createNiceMock(Service.class); final AmbariManagementController controller = injector.getInstance(AmbariManagementController.class); Capture<? extends Map<String, String>> captureCoreSiteConfProperties = newCapture(); @@ -594,15 +598,17 @@ public class UpgradeCatalog260Test { expect(cluster.getDesiredConfigByType("core-site")).andReturn(coreSiteConf).atLeastOnce(); expect(cluster.getConfigsByType("core-site")).andReturn(Collections.singletonMap("tag1", coreSiteConf)).atLeastOnce(); expect(cluster.getConfig(eq("core-site"), anyString())).andReturn(coreSiteConfNew).atLeastOnce(); - expect(cluster.getServiceByConfigType("core-site")).andReturn("HDFS").atLeastOnce(); + expect(cluster.getServiceByConfigType("core-site")).andReturn(hdfsMock).atLeastOnce(); expect(cluster.addDesiredConfig(eq("ambari-upgrade"), anyObject(Set.class), anyString())).andReturn(null).atLeastOnce(); expect(zeppelinEnvConf.getProperties()).andReturn(Collections.singletonMap("zeppelin_user", "zeppelin_user")).once(); + expect(hdfsMock.getName()).andReturn("HDFS").atLeastOnce(); + expect(coreSiteConf.getProperties()).andReturn(Collections.singletonMap("hadoop.proxyuser.zeppelin_user.hosts", "existing_value")).atLeastOnce(); expect(coreSiteConf.getPropertiesAttributes()).andReturn(Collections.<String, Map<String, String>>emptyMap()).atLeastOnce(); - expect(controller.createConfig(eq(cluster), anyObject(StackId.class), eq("core-site"), capture(captureCoreSiteConfProperties), anyString(), anyObject(Map.class))) + expect(controller.createConfig(eq(cluster), anyObject(StackId.class), eq("core-site"), capture(captureCoreSiteConfProperties), anyString(), anyObject(Map.class), anyLong())) .andReturn(coreSiteConfNew) .once(); @@ -674,11 +680,12 @@ public class UpgradeCatalog260Test { StackId stackId = createMock(StackId.class); Cluster cluster = createMock(Cluster.class); + Service rangerMock = createNiceMock(Service.class); expect(cluster.getDesiredStackVersion()).andReturn(stackId).anyTimes(); expect(cluster.getDesiredConfigByType("dbks-site")).andReturn(config).anyTimes(); expect(cluster.getDesiredConfigByType("ranger-kms-audit")).andReturn(config).anyTimes(); expect(cluster.getConfigsByType("ranger-kms-audit")).andReturn(Collections.singletonMap("version1", config)).anyTimes(); - expect(cluster.getServiceByConfigType("ranger-kms-audit")).andReturn("RANGER").anyTimes(); + expect(cluster.getServiceByConfigType("ranger-kms-audit")).andReturn(rangerMock).anyTimes(); expect(cluster.getClusterName()).andReturn("cl1").anyTimes(); expect(cluster.getConfig(eq("ranger-kms-audit"), anyString())).andReturn(newConfig).once(); expect(cluster.addDesiredConfig("ambari-upgrade", Collections.singleton(newConfig), "Updated ranger-kms-audit during Ambari Upgrade from 2.5.2 to 2.6.0.")).andReturn(response).once(); @@ -686,10 +693,12 @@ public class UpgradeCatalog260Test { final Clusters clusters = injector.getInstance(Clusters.class); expect(clusters.getCluster(2L)).andReturn(cluster).anyTimes(); + expect(rangerMock.getName()).andReturn("RANGER").atLeastOnce(); + Capture<? extends Map<String, String>> captureProperties = newCapture(); AmbariManagementController controller = injector.getInstance(AmbariManagementController.class); - expect(controller.createConfig(eq(cluster), eq(stackId), eq("ranger-kms-audit"), capture(captureProperties), anyString(), anyObject(Map.class))) + expect(controller.createConfig(eq(cluster), eq(stackId), eq("ranger-kms-audit"), capture(captureProperties), anyString(), anyObject(Map.class), anyLong())) .andReturn(null) .once(); @@ -744,6 +753,7 @@ public class UpgradeCatalog260Test { Clusters clusters = easyMockSupport.createNiceMock(Clusters.class); final Cluster cluster = easyMockSupport.createNiceMock(Cluster.class); Config mockAmsSslClient = easyMockSupport.createNiceMock(Config.class); + Service amsMock = createNiceMock(Service.class); expect(clusters.getClusters()).andReturn(new HashMap<String, Cluster>() {{ put("normal", cluster); @@ -751,11 +761,14 @@ public class UpgradeCatalog260Test { expect(cluster.getDesiredConfigByType("ams-ssl-client")).andReturn(mockAmsSslClient).atLeastOnce(); expect(mockAmsSslClient.getProperties()).andReturn(oldProperties).anyTimes(); + expect(amsMock.getName()).andReturn("AMBARI_METRICS").atLeastOnce(); + expect(cluster.getServiceByConfigType("ams-ssl-client")).andReturn(amsMock).atLeastOnce(); + Injector injector = easyMockSupport.createNiceMock(Injector.class); expect(injector.getInstance(Gson.class)).andReturn(null).anyTimes(); expect(injector.getInstance(MaintenanceStateHelper.class)).andReturn(null).anyTimes(); - replay(injector, clusters, mockAmsSslClient, cluster); + replay(injector, clusters, mockAmsSslClient); AmbariManagementControllerImpl controller = createMockBuilder(AmbariManagementControllerImpl.class) .addMockedMethod("createConfiguration") @@ -770,9 +783,9 @@ public class UpgradeCatalog260Test { expect(injector2.getInstance(AmbariManagementController.class)).andReturn(controller).anyTimes(); expect(controller.getClusters()).andReturn(clusters).anyTimes(); expect(controller.createConfig(anyObject(Cluster.class), anyObject(StackId.class), anyString(), capture(propertiesCapture), anyString(), - anyObject(Map.class))).andReturn(createNiceMock(Config.class)).once(); + anyObject(Map.class), anyLong())).andReturn(createNiceMock(Config.class)).once(); - replay(controller, injector2); + replay(controller, injector2, cluster, amsMock); new UpgradeCatalog260(injector2).updateAmsConfigs(); easyMockSupport.verifyAll(); @@ -788,6 +801,8 @@ public class UpgradeCatalog260Test { final Gson gson = new Gson(); final WidgetDAO widgetDAO = createNiceMock(WidgetDAO.class); final AmbariMetaInfo metaInfo = createNiceMock(AmbariMetaInfo.class); + final MpackManagerFactory mmf = createNiceMock(MpackManagerFactory.class); + final RootLevelSettingsManagerFactory rootLevelSettingsManagerFactory = createNiceMock(RootLevelSettingsManagerFactory.class); WidgetEntity widgetEntity = createNiceMock(WidgetEntity.class); StackId stackId = new StackId("HDP", "2.0.0"); StackInfo stackInfo = createNiceMock(StackInfo.class); @@ -826,6 +841,8 @@ public class UpgradeCatalog260Test { bind(Gson.class).toInstance(gson); bind(WidgetDAO.class).toInstance(widgetDAO); bind(StackManagerFactory.class).toInstance(createNiceMock(StackManagerFactory.class)); + bind(MpackManagerFactory.class).toInstance(mmf); + bind(RootLevelSettingsManagerFactory.class).toInstance(rootLevelSettingsManagerFactory); bind(AmbariMetaInfo.class).toInstance(metaInfo); } }); http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog300Test.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog300Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog300Test.java index 25e9dbf..03219bf 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog300Test.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog300Test.java @@ -21,6 +21,7 @@ import static org.apache.ambari.server.upgrade.UpgradeCatalog300.COMPONENT_DESIR import static org.apache.ambari.server.upgrade.UpgradeCatalog300.COMPONENT_STATE_TABLE; import static org.apache.ambari.server.upgrade.UpgradeCatalog300.SECURITY_STATE_COLUMN; import static org.apache.ambari.server.upgrade.UpgradeCatalog300.SERVICE_DESIRED_STATE_TABLE; +import static org.easymock.EasyMock.anyLong; import static org.easymock.EasyMock.anyObject; import static org.easymock.EasyMock.anyString; import static org.easymock.EasyMock.capture; @@ -243,14 +244,14 @@ public class UpgradeCatalog300Test { expect(logFeederPropertiesConf.getProperties()).andReturn(Collections.emptyMap()).once(); Capture<Map<String, String>> logFeederPropertiesCapture = EasyMock.newCapture(); expect(controller.createConfig(anyObject(Cluster.class), anyObject(StackId.class), eq("logfeeder-properties"), capture(logFeederPropertiesCapture), - anyString(), EasyMock.anyObject())).andReturn(config).once(); + anyString(), anyObject(Map.class), anyLong())).andReturn(config).once(); Config logSearchPropertiesConf = easyMockSupport.createNiceMock(Config.class); expect(cluster.getDesiredConfigByType("logsearch-properties")).andReturn(logSearchPropertiesConf).times(2); expect(logSearchPropertiesConf.getProperties()).andReturn(oldLogSearchProperties).times(2); Capture<Map<String, String>> logSearchPropertiesCapture = EasyMock.newCapture(); expect(controller.createConfig(anyObject(Cluster.class), anyObject(StackId.class), eq("logsearch-properties"), capture(logSearchPropertiesCapture), - anyString(), EasyMock.anyObject())).andReturn(config).once(); + anyString(), anyObject(Map.class), anyLong())).andReturn(config).once(); Map<String, String> oldLogFeederLog4j = ImmutableMap.of( "content", "<!DOCTYPE log4j:configuration SYSTEM \"log4j.dtd\">"); @@ -263,7 +264,7 @@ public class UpgradeCatalog300Test { expect(logFeederLog4jConf.getProperties()).andReturn(oldLogFeederLog4j).anyTimes(); Capture<Map<String, String>> logFeederLog4jCapture = EasyMock.newCapture(); expect(controller.createConfig(anyObject(Cluster.class), anyObject(StackId.class), anyString(), capture(logFeederLog4jCapture), anyString(), - EasyMock.anyObject())).andReturn(config).once(); + anyObject(Map.class), anyLong())).andReturn(config).once(); Map<String, String> oldLogSearchLog4j = ImmutableMap.of( "content", "<!DOCTYPE log4j:configuration SYSTEM \"log4j.dtd\">"); @@ -276,7 +277,7 @@ public class UpgradeCatalog300Test { expect(logSearchLog4jConf.getProperties()).andReturn(oldLogSearchLog4j).anyTimes(); Capture<Map<String, String>> logSearchLog4jCapture = EasyMock.newCapture(); expect(controller.createConfig(anyObject(Cluster.class), anyObject(StackId.class), anyString(), capture(logSearchLog4jCapture), anyString(), - EasyMock.anyObject())).andReturn(config).once(); + anyObject(Map.class), anyLong())).andReturn(config).once(); Map<String, String> oldLogSearchServiceLogsConf = ImmutableMap.of( "content", "<before/><requestHandler name=\"/admin/\" class=\"solr.admin.AdminHandlers\" /><after/>"); @@ -289,7 +290,7 @@ public class UpgradeCatalog300Test { expect(logSearchServiceLogsConf.getProperties()).andReturn(oldLogSearchServiceLogsConf).anyTimes(); Capture<Map<String, String>> logSearchServiceLogsConfCapture = EasyMock.newCapture(); expect(controller.createConfig(anyObject(Cluster.class), anyObject(StackId.class), anyString(), capture(logSearchServiceLogsConfCapture), anyString(), - EasyMock.anyObject())).andReturn(config).once(); + anyObject(Map.class), anyLong())).andReturn(config).once(); Map<String, String> oldLogSearchAuditLogsConf = ImmutableMap.of( "content", "<before/><requestHandler name=\"/admin/\" class=\"solr.admin.AdminHandlers\" /><after/>"); @@ -302,7 +303,7 @@ public class UpgradeCatalog300Test { expect(logSearchAuditLogsConf.getProperties()).andReturn(oldLogSearchAuditLogsConf).anyTimes(); Capture<Map<String, String>> logSearchAuditLogsConfCapture = EasyMock.newCapture(); expect(controller.createConfig(anyObject(Cluster.class), anyObject(StackId.class), anyString(), capture(logSearchAuditLogsConfCapture), anyString(), - EasyMock.anyObject())).andReturn(config).once(); + anyObject(Map.class), anyLong())).andReturn(config).once(); Map<String, String> oldLogFeederOutputConf = ImmutableMap.of( "content", @@ -331,7 +332,7 @@ public class UpgradeCatalog300Test { expect(logFeederOutputConf.getProperties()).andReturn(oldLogFeederOutputConf).anyTimes(); Capture<Map<String, String>> logFeederOutputConfCapture = EasyMock.newCapture(); expect(controller.createConfig(anyObject(Cluster.class), anyObject(StackId.class), anyString(), capture(logFeederOutputConfCapture), anyString(), - EasyMock.anyObject())).andReturn(config).once(); + anyObject(Map.class), anyLong())).andReturn(config).once(); replay(clusters, cluster); replay(controller, injector2); http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/view/ViewRegistryTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/view/ViewRegistryTest.java b/ambari-server/src/test/java/org/apache/ambari/server/view/ViewRegistryTest.java index a28d419..96c8421 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/view/ViewRegistryTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/view/ViewRegistryTest.java @@ -1913,7 +1913,7 @@ public class ViewRegistryTest { replay(securityHelper, configuration, viewInstanceDAO, clusters, cluster, service, viewInstanceEntity); - ServiceInstalledEvent event = new ServiceInstalledEvent(99L, "HDP", "2.0", "HIVE"); + ServiceInstalledEvent event = new ServiceInstalledEvent(99L, "HDP", "2.0", "HIVE", "", ""); registry.onAmbariEvent(event);
