You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ad...@apache.org on 2017/05/23 10:34:37 UTC
[39/49] ambari git commit: AMBARI-21035. Integrate ClusterService
with Swagger (adoroszlai)
http://git-wip-us.apache.org/repos/asf/ambari/blob/275525b2/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
----------------------------------------------------------------------
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 d613a2e..7e4c4c2 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
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -636,45 +636,29 @@ public class AmbariManagementControllerTest {
// TODO implement after configs integration
}
- @Test
- public void testCreateClusterWithInvalidRequest() {
+ @Test(expected = IllegalArgumentException.class)
+ public void testCreateClusterWithInvalidRequest1() throws Exception {
ClusterRequest r = new ClusterRequest(null, null, null, null);
- r.toString();
-
- try {
- controller.createCluster(r);
- fail("Expected create cluster for invalid request");
- } catch (Exception e) {
- // Expected
- }
-
- r.setClusterId(1L);
- try {
- controller.createCluster(r);
- fail("Expected create cluster for invalid request");
- } catch (Exception e) {
- // Expected
- }
- r.setClusterId(null);
+ controller.createCluster(r);
+ }
- r.setClusterName(getUniqueName());
- try {
- controller.createCluster(r);
- fail("Expected create cluster for invalid request - no stack version");
- } catch (Exception e) {
- // Expected
- }
+ @Test(expected = IllegalArgumentException.class)
+ public void testCreateClusterWithInvalidRequest2() throws Exception {
+ ClusterRequest r = new ClusterRequest(1L, null, null, null);
+ controller.createCluster(r);
+ }
- r.setStackVersion("HDP-1.2.0");
- r.setProvisioningState(State.INSTALLING.name());
- try {
- controller.createCluster(r);
- controller.updateClusters(Collections.singleton(r), null);
+ @Test(expected = IllegalArgumentException.class)
+ public void testCreateClusterWithInvalidRequest3() throws Exception {
+ ClusterRequest r = new ClusterRequest(null, getUniqueName(), null, null);
+ controller.createCluster(r);
+ }
- fail("Expected create cluster for invalid request - invalid provisioning state");
- } catch (Exception e) {
- // Expected
- }
+ @Test(expected = IllegalArgumentException.class)
+ public void testCreateClusterWithInvalidRequest4() throws Exception {
+ ClusterRequest r = new ClusterRequest(null, null, State.INSTALLING.name(), null, "HDP-1.2.0", null);
+ controller.createCluster(r);
+ controller.updateClusters(Collections.singleton(r), null);
}
@Test
@@ -2219,7 +2203,7 @@ public class AmbariManagementControllerTest {
boolean found = false;
for (ClusterResponse cr : resp) {
if (cr.getClusterName().equals(cluster1)) {
- Assert.assertEquals(c1.getClusterId(), cr.getClusterId().longValue());
+ Assert.assertEquals(c1.getClusterId(), cr.getClusterId());
Assert.assertEquals(c1.getDesiredStackVersion().getStackId(), cr.getDesiredStackVersion());
found = true;
break;
@@ -2241,19 +2225,15 @@ public class AmbariManagementControllerTest {
clusters.addCluster(cluster3, new StackId("HDP-1.2.0"));
clusters.addCluster(cluster4, new StackId("HDP-0.1"));
- Cluster c1 = clusters.getCluster(cluster1);
- Cluster c2 = clusters.getCluster(cluster2);
- Cluster c3 = clusters.getCluster(cluster3);
- Cluster c4 = clusters.getCluster(cluster4);
-
ClusterRequest r = new ClusterRequest(null, null, null, null);
Set<ClusterResponse> resp = controller.getClusters(Collections.singleton(r));
+ Assert.assertTrue(resp.size() >= 4);
r = new ClusterRequest(null, cluster1, null, null);
resp = controller.getClusters(Collections.singleton(r));
Assert.assertEquals(1, resp.size());
- Assert.assertEquals(c1.getClusterId(),
- resp.iterator().next().getClusterId().longValue());
+ Cluster c1 = clusters.getCluster(cluster1);
+ Assert.assertEquals(c1.getClusterId(), resp.iterator().next().getClusterId());
r = new ClusterRequest(null, null, "HDP-0.1", null);
resp = controller.getClusters(Collections.singleton(r));
@@ -9297,13 +9277,13 @@ public class AmbariManagementControllerTest {
ClusterRequest cr = new ClusterRequest(null, CLUSTER_NAME, STACK_ID, null);
amc.createCluster(cr);
- Long CLUSTER_ID = clusters.getCluster(CLUSTER_NAME).getClusterId();
+ long clusterId = clusters.getCluster(CLUSTER_NAME).getClusterId();
ConfigurationRequest configRequest = new ConfigurationRequest(CLUSTER_NAME, "global", "version1",
new HashMap<String, String>() {{ put("a", "b"); }}, null);
- cr.setDesiredConfig(Collections.singletonList(configRequest));
- cr.setClusterId(CLUSTER_ID);
- amc.updateClusters(Collections.singleton(cr), new HashMap<String, String>());
+ ClusterRequest ur = new ClusterRequest(clusterId, CLUSTER_NAME, STACK_ID, null);
+ ur.setDesiredConfig(Collections.singletonList(configRequest));
+ amc.updateClusters(Collections.singleton(ur), new HashMap<String, String>());
// add some hosts
Set<HostRequest> hrs = new HashSet<>();
@@ -9348,8 +9328,8 @@ public class AmbariManagementControllerTest {
// change mind, delete the cluster
amc.deleteCluster(cr);
- assertNotNull(clusters.getHost(HOST1));
- assertNotNull(clusters.getHost(HOST2));
+ assertNotNull(clusters.getHost(HOST1));
+ assertNotNull(clusters.getHost(HOST2));
HostDAO dao = injector.getInstance(HostDAO.class);
http://git-wip-us.apache.org/repos/asf/ambari/blob/275525b2/ambari-server/src/test/java/org/apache/ambari/server/controller/ClusterRequestTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/ClusterRequestTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/ClusterRequestTest.java
index 084e36b..0d5dd19 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/ClusterRequestTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/ClusterRequestTest.java
@@ -50,22 +50,6 @@ public class ClusterRequestTest {
Assert.assertEquals(stackVersion.getStackId(),
r1.getStackVersion());
Assert.assertArrayEquals(hostNames.toArray(), r1.getHostNames().toArray());
-
- r1.setClusterId(++clusterId);
- r1.setHostNames(hostNames);
- r1.setClusterName("foo1");
- r1.setStackVersion("HDP-1.2.0");
- r1.setProvisioningState(State.INSTALLED.name());
- r1.setSecurityType(SecurityType.KERBEROS);
-
- hostNames.add("h2");
-
- Assert.assertEquals(clusterId, r1.getClusterId());
- Assert.assertEquals("foo1", r1.getClusterName());
- Assert.assertEquals(State.INSTALLED.name(), r1.getProvisioningState());
- Assert.assertEquals(SecurityType.KERBEROS, r1.getSecurityType());
- Assert.assertEquals("HDP-1.2.0", r1.getStackVersion());
- Assert.assertArrayEquals(hostNames.toArray(), r1.getHostNames().toArray());
}
@Test
http://git-wip-us.apache.org/repos/asf/ambari/blob/275525b2/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 cfb2611..c3f8f18 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
@@ -30,7 +30,7 @@ public class ClusterResponseTest {
@Test
public void testBasicGetAndSet() {
- Long clusterId = new Long(10);
+ long clusterId = 10L;
String clusterName = "foo";
State provisioningState = State.INSTALLED;
SecurityType securityType = SecurityType.KERBEROS;
@@ -43,17 +43,16 @@ public class ClusterResponseTest {
Assert.assertEquals(clusterId, r1.getClusterId());
Assert.assertEquals(clusterName, r1.getClusterName());
- Assert.assertEquals(provisioningState.name(), r1.getProvisioningState());
- Assert.assertEquals(securityType.name(), r1.getSecurityType());
- Assert.assertArrayEquals(hostNames.toArray(), r1.getHostNames().toArray());
- Assert.assertEquals(Integer.valueOf(1), r1.getTotalHosts());
+ Assert.assertEquals(provisioningState, r1.getProvisioningState());
+ Assert.assertEquals(securityType, r1.getSecurityType());
+ Assert.assertEquals(1, r1.getTotalHosts());
Assert.assertEquals("bar", r1.getDesiredStackVersion());
}
@Test
public void testToString() {
ClusterResponse r =
- new ClusterResponse(null, null, null, null, null, null, null, null);
+ new ClusterResponse(0, null, null, null, null, 0, null, null);
r.toString();
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/275525b2/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java
index 49127d8..4a786b7 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java
@@ -333,17 +333,17 @@ public class ClusterResourceProviderTest {
Clusters clusters = createMock(Clusters.class);
Set<ClusterResponse> allResponse = new HashSet<>();
- allResponse.add(new ClusterResponse(100L, "Cluster100", State.INSTALLED, SecurityType.NONE, null, null, null, null));
- allResponse.add(new ClusterResponse(101L, "Cluster101", State.INSTALLED, SecurityType.NONE, null, null, null, null));
- allResponse.add(new ClusterResponse(102L, "Cluster102", State.INSTALLED, SecurityType.NONE, null, null, null, null));
- allResponse.add(new ClusterResponse(103L, "Cluster103", State.INSTALLED, SecurityType.NONE, null, null, null, null));
- allResponse.add(new ClusterResponse(104L, "Cluster104", State.INSTALLED, SecurityType.NONE, null, null, null, null));
+ allResponse.add(new ClusterResponse(100L, "Cluster100", State.INSTALLED, SecurityType.NONE, null, 0, null, null));
+ allResponse.add(new ClusterResponse(101L, "Cluster101", State.INSTALLED, SecurityType.NONE, null, 0, null, null));
+ allResponse.add(new ClusterResponse(102L, "Cluster102", State.INSTALLED, SecurityType.NONE, null, 0, null, null));
+ allResponse.add(new ClusterResponse(103L, "Cluster103", State.INSTALLED, SecurityType.NONE, null, 0, null, null));
+ allResponse.add(new ClusterResponse(104L, "Cluster104", State.INSTALLED, SecurityType.NONE, null, 0, null, null));
Set<ClusterResponse> nameResponse = new HashSet<>();
- nameResponse.add(new ClusterResponse(102L, "Cluster102", State.INSTALLED, SecurityType.NONE, null, null, null, null));
+ nameResponse.add(new ClusterResponse(102L, "Cluster102", State.INSTALLED, SecurityType.NONE, null, 0, null, null));
Set<ClusterResponse> idResponse = new HashSet<>();
- idResponse.add(new ClusterResponse(103L, "Cluster103", State.INSTALLED, SecurityType.NONE, null, null, null, null));
+ idResponse.add(new ClusterResponse(103L, "Cluster103", State.INSTALLED, SecurityType.NONE, null, 0, null, null));
// set expectations
Capture<Set<ClusterRequest>> captureClusterRequests = EasyMock.newCapture();
@@ -456,7 +456,7 @@ public class ClusterResourceProviderTest {
Map<String, Object> properties = new LinkedHashMap<>();
properties.put(ClusterResourceProvider.CLUSTER_NAME_PROPERTY_ID, clusterName);
- properties.put(ClusterResourceProvider.BLUEPRINT_PROPERTY_ID, blueprintName);
+ properties.put(ClusterResourceProvider.BLUEPRINT, blueprintName);
propertySet.add(properties);
Collection<Map<String, Object>> hostGroups = new ArrayList<>();
@@ -594,7 +594,7 @@ public class ClusterResourceProviderTest {
RequestStatusResponse response = createNiceMock(RequestStatusResponse.class);
Set<ClusterResponse> nameResponse = new HashSet<>();
- nameResponse.add(new ClusterResponse(102L, "Cluster102", State.INIT, SecurityType.NONE, null, null, null, null));
+ nameResponse.add(new ClusterResponse(102L, "Cluster102", State.INIT, SecurityType.NONE, null, 0, null, null));
Map<String, String> mapRequestProps = new HashMap<>();
mapRequestProps.put("context", "Called from a test");
@@ -662,7 +662,7 @@ public class ClusterResourceProviderTest {
RequestStatusResponse response = createNiceMock(RequestStatusResponse.class);
Set<ClusterResponse> nameResponse = new HashSet<>();
- nameResponse.add(new ClusterResponse(100L, "Cluster100", State.INSTALLED, SecurityType.NONE, null, null, null, null));
+ nameResponse.add(new ClusterResponse(100L, "Cluster100", State.INSTALLED, SecurityType.NONE, null, 0, null, null));
Map<String, String> mapRequestProps = new HashMap<>();
mapRequestProps.put("context", "Called from a test");
http://git-wip-us.apache.org/repos/asf/ambari/blob/275525b2/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ProvisionClusterRequestTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ProvisionClusterRequestTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ProvisionClusterRequestTest.java
index 73a80f6..055e1b5 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ProvisionClusterRequestTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ProvisionClusterRequestTest.java
@@ -498,7 +498,7 @@ public class ProvisionClusterRequestTest {
Map<String, Object> properties = new LinkedHashMap<>();
properties.put(ClusterResourceProvider.CLUSTER_NAME_PROPERTY_ID, clusterName);
- properties.put(ClusterResourceProvider.BLUEPRINT_PROPERTY_ID, blueprintName);
+ properties.put(ClusterResourceProvider.BLUEPRINT, blueprintName);
Collection<Map<String, Object>> hostGroups = new ArrayList<>();
properties.put("host_groups", hostGroups);
@@ -553,7 +553,7 @@ public class ProvisionClusterRequestTest {
Map<String, Object> properties = new LinkedHashMap<>();
properties.put(ClusterResourceProvider.CLUSTER_NAME_PROPERTY_ID, clusterName);
- properties.put(ClusterResourceProvider.BLUEPRINT_PROPERTY_ID, blueprintName);
+ properties.put(ClusterResourceProvider.BLUEPRINT, blueprintName);
Collection<Map<String, Object>> hostGroups = new ArrayList<>();
properties.put("host_groups", hostGroups);
@@ -592,7 +592,7 @@ public class ProvisionClusterRequestTest {
Map<String, Object> properties = new LinkedHashMap<>();
properties.put(ClusterResourceProvider.CLUSTER_NAME_PROPERTY_ID, clusterName);
- properties.put(ClusterResourceProvider.BLUEPRINT_PROPERTY_ID, blueprintName);
+ properties.put(ClusterResourceProvider.BLUEPRINT, blueprintName);
Collection<Map<String, Object>> hostGroups = new ArrayList<>();
properties.put("host_groups", hostGroups);
http://git-wip-us.apache.org/repos/asf/ambari/blob/275525b2/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 345c463..aecc031 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
@@ -1048,9 +1048,9 @@ public class ClusterTest {
createDefaultCluster();
ClusterResponse r = c1.convertToResponse();
- Assert.assertEquals(c1.getClusterId(), r.getClusterId().longValue());
+ Assert.assertEquals(c1.getClusterId(), r.getClusterId());
Assert.assertEquals(c1.getClusterName(), r.getClusterName());
- Assert.assertEquals(Integer.valueOf(2), r.getTotalHosts());
+ Assert.assertEquals(2, r.getTotalHosts());
Assert.assertEquals(0, r.getClusterHealthReport().getAlertStatusHosts());
Assert.assertEquals(0, r.getClusterHealthReport().getHealthyStatusHosts());
Assert.assertEquals(0, r.getClusterHealthReport().getUnhealthyStatusHosts());
@@ -1079,7 +1079,7 @@ public class ClusterTest {
r = c1.convertToResponse();
- Assert.assertEquals(Integer.valueOf(3), r.getTotalHosts());
+ Assert.assertEquals(3, r.getTotalHosts());
Assert.assertEquals(0, r.getClusterHealthReport().getAlertStatusHosts());
Assert.assertEquals(1, r.getClusterHealthReport().getHealthyStatusHosts());
Assert.assertEquals(0, r.getClusterHealthReport().getUnhealthyStatusHosts());