http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/controller/BackgroundCustomCommandExecutionTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/BackgroundCustomCommandExecutionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/BackgroundCustomCommandExecutionTest.java index 3d8d161..0b07fb7 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/BackgroundCustomCommandExecutionTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/BackgroundCustomCommandExecutionTest.java @@ -217,8 +217,8 @@ public class BackgroundCustomCommandExecutionTest { if (desiredState != null) { dStateStr = desiredState.toString(); } - ServiceRequest r1 = new ServiceRequest(clusterName, serviceName, - m_repositoryVersion.getId(), dStateStr); + ServiceRequest r1 = new ServiceRequest(clusterName, "", serviceName, + m_repositoryVersion.getId(), dStateStr, null); Set<ServiceRequest> requests = new HashSet<>(); requests.add(r1); @@ -234,7 +234,7 @@ public class BackgroundCustomCommandExecutionTest { if (desiredState != null) { dStateStr = desiredState.toString(); } - ServiceComponentRequest r = new ServiceComponentRequest(clusterName, + ServiceComponentRequest r = new ServiceComponentRequest(clusterName, "", serviceName, componentName, dStateStr); Set<ServiceComponentRequest> requests = new HashSet<>(); @@ -248,7 +248,7 @@ public class BackgroundCustomCommandExecutionTest { if (desiredState != null) { dStateStr = desiredState.toString(); } - ServiceComponentHostRequest r = new ServiceComponentHostRequest(clusterName, + ServiceComponentHostRequest r = new ServiceComponentHostRequest(clusterName, "", serviceName, componentName, hostname, dStateStr); Set<ServiceComponentHostRequest> requests = new HashSet<>();
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/controller/ClusterResponseTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/ClusterResponseTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/ClusterResponseTest.java index c9e91e3..40d12de 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/ClusterResponseTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/ClusterResponseTest.java @@ -40,7 +40,7 @@ public class ClusterResponseTest { new ClusterResponse(clusterId, clusterName, provisioningState, securityType, hostNames, hostNames.size(), "bar", null); - Assert.assertEquals(clusterId, r1.getClusterId()); + Assert.assertTrue(clusterId == r1.getClusterId().longValue()); Assert.assertEquals(clusterName, r1.getClusterName()); Assert.assertEquals(provisioningState, r1.getProvisioningState()); Assert.assertEquals(securityType, r1.getSecurityType()); http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/controller/RefreshYarnCapacitySchedulerReleaseConfigTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/RefreshYarnCapacitySchedulerReleaseConfigTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/RefreshYarnCapacitySchedulerReleaseConfigTest.java index ef186f1..3ce6686 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/RefreshYarnCapacitySchedulerReleaseConfigTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/RefreshYarnCapacitySchedulerReleaseConfigTest.java @@ -102,12 +102,12 @@ public class RefreshYarnCapacitySchedulerReleaseConfigTest { // Start ClusterRequest cr = new ClusterRequest(cluster.getClusterId(), "c1", cluster.getDesiredStackVersion().getStackVersion(), null); - cr.setDesiredConfig(Collections.singletonList(new ConfigurationRequest("c1","capacity-scheduler","version2", new HashMap<>(), null))); + cr.setDesiredConfig(Collections.singletonList(new ConfigurationRequest("c1","capacity-scheduler","version2", new HashMap<>(), null, 1L, 1L))); controller.updateClusters(Collections.singleton(cr) , null); - ServiceComponentHostRequest r = new ServiceComponentHostRequest("c1", null, null, null, null); + ServiceComponentHostRequest r = new ServiceComponentHostRequest("c1", null, null, null, null, null); r.setStaleConfig("true"); Set<ServiceComponentHostResponse> resps = controller.getHostComponents(Collections.singleton(r)); Assert.assertEquals(1, resps.size()); @@ -123,12 +123,12 @@ public class RefreshYarnCapacitySchedulerReleaseConfigTest { // Start ClusterRequest cr = new ClusterRequest(cluster.getClusterId(), "c1", cluster.getDesiredStackVersion().getStackVersion(), null); - cr.setDesiredConfig(Collections.singletonList(new ConfigurationRequest("c1","core-site","version2", new HashMap<>(),null))); + cr.setDesiredConfig(Collections.singletonList(new ConfigurationRequest("c1","core-site","version2", new HashMap<>(),null, 1L, 1L))); controller.updateClusters(Collections.singleton(cr) , null); - ServiceComponentHostRequest r = new ServiceComponentHostRequest("c1", null, null, null, null); + ServiceComponentHostRequest r = new ServiceComponentHostRequest("c1", null, null, null, null, null); r.setStaleConfig("true"); Set<ServiceComponentHostResponse> resps = controller.getHostComponents(Collections.singleton(r)); Assert.assertEquals(4, resps.size()); @@ -213,8 +213,8 @@ public class RefreshYarnCapacitySchedulerReleaseConfigTest { RepositoryVersionEntity repositoryVersion = ormTestHelper.getOrCreateRepositoryVersion( new StackId("HDP-2.0.7"), "2.0.7-1234"); - ServiceRequest r1 = new ServiceRequest(clusterName, serviceName, - repositoryVersion.getId(), dStateStr); + ServiceRequest r1 = new ServiceRequest(clusterName, "", serviceName, + repositoryVersion.getId(), dStateStr, null); Set<ServiceRequest> requests = new HashSet<>(); requests.add(r1); @@ -230,7 +230,7 @@ public class RefreshYarnCapacitySchedulerReleaseConfigTest { if (desiredState != null) { dStateStr = desiredState.toString(); } - ServiceComponentRequest r = new ServiceComponentRequest(clusterName, + ServiceComponentRequest r = new ServiceComponentRequest(clusterName, "", serviceName, componentName, dStateStr); Set<ServiceComponentRequest> requests = new HashSet<>(); @@ -244,7 +244,7 @@ public class RefreshYarnCapacitySchedulerReleaseConfigTest { if (desiredState != null) { dStateStr = desiredState.toString(); } - ServiceComponentHostRequest r = new ServiceComponentHostRequest(clusterName, + ServiceComponentHostRequest r = new ServiceComponentHostRequest(clusterName, "", serviceName, componentName, hostname, dStateStr); Set<ServiceComponentHostRequest> requests = new HashSet<>(); http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractResourceProviderTest.java index 7165e48..0f04e74 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractResourceProviderTest.java @@ -432,7 +432,7 @@ public class AbstractResourceProviderTest { public static class ConfigurationRequestMatcher extends ConfigurationRequest implements IArgumentMatcher { public ConfigurationRequestMatcher(String clusterName, String type, String tag, Map<String, String> configs, Map<String, Map<String, String>> configsAttributes) { - super(clusterName, type, tag, configs, configsAttributes); + super(clusterName, type, tag, configs, configsAttributes, 1L, 1L); } @Override @@ -500,7 +500,7 @@ public class AbstractResourceProviderTest { public HostComponentRequestSetMatcher(String clusterName, String serviceName, String componentName, String hostName, Map<String, String> configVersions, String desiredState) { hostComponentRequest = - new ServiceComponentHostRequest(clusterName, serviceName, componentName, + new ServiceComponentHostRequest(clusterName, "", serviceName, componentName, hostName, desiredState); add(hostComponentRequest); }