Repository: ambari Updated Branches: refs/heads/branch-2.0.0 9b86ebdb6 -> c9e901bc2
http://git-wip-us.apache.org/repos/asf/ambari/blob/c9e901bc/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesUpCheckTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesUpCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesUpCheckTest.java index ad60f1c..65b8e7f 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesUpCheckTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesUpCheckTest.java @@ -19,6 +19,7 @@ package org.apache.ambari.server.checks; import java.util.Collections; +import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.controller.PrereqCheckRequest; import org.apache.ambari.server.state.Cluster; import org.apache.ambari.server.state.Clusters; @@ -54,6 +55,15 @@ public class ServicesUpCheckTest { return clusters; } }; + + servicesUpCheck.ambariMetaInfo = new Provider<AmbariMetaInfo>() { + @Override + public AmbariMetaInfo get() { + return Mockito.mock(AmbariMetaInfo.class); + } + }; + + final Cluster cluster = Mockito.mock(Cluster.class); Mockito.when(cluster.getClusterId()).thenReturn(1L); Mockito.when(clusters.getCluster("cluster")).thenReturn(cluster); @@ -62,12 +72,12 @@ public class ServicesUpCheckTest { Mockito.when(service.isClientOnlyService()).thenReturn(false); Mockito.when(service.getDesiredState()).thenReturn(State.UNKNOWN); - PrerequisiteCheck check = new PrerequisiteCheck(null, null, null, null); + PrerequisiteCheck check = new PrerequisiteCheck(null, null); servicesUpCheck.perform(check, new PrereqCheckRequest("cluster")); Assert.assertEquals(PrereqCheckStatus.FAIL, check.getStatus()); Mockito.when(service.getDesiredState()).thenReturn(State.STARTED); - check = new PrerequisiteCheck(null, null, null, null); + check = new PrerequisiteCheck(null, null); servicesUpCheck.perform(check, new PrereqCheckRequest("cluster")); Assert.assertEquals(PrereqCheckStatus.PASS, check.getStatus()); } http://git-wip-us.apache.org/repos/asf/ambari/blob/c9e901bc/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesYarnWorkPreservingCheckTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesYarnWorkPreservingCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesYarnWorkPreservingCheckTest.java index 2135c19..721320d 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesYarnWorkPreservingCheckTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesYarnWorkPreservingCheckTest.java @@ -85,12 +85,12 @@ public class ServicesYarnWorkPreservingCheckTest { final Map<String, String> properties = new HashMap<String, String>(); Mockito.when(config.getProperties()).thenReturn(properties); - PrerequisiteCheck check = new PrerequisiteCheck(null, null, null, null); + PrerequisiteCheck check = new PrerequisiteCheck(null, null); servicesYarnWorkPreservingCheck.perform(check, new PrereqCheckRequest("cluster")); Assert.assertEquals(PrereqCheckStatus.FAIL, check.getStatus()); properties.put("yarn.resourcemanager.work-preserving-recovery.enabled", "true"); - check = new PrerequisiteCheck(null, null, null, null); + check = new PrerequisiteCheck(null, null); servicesYarnWorkPreservingCheck.perform(check, new PrereqCheckRequest("cluster")); Assert.assertEquals(PrereqCheckStatus.PASS, check.getStatus()); } http://git-wip-us.apache.org/repos/asf/ambari/blob/c9e901bc/ambari-server/src/test/java/org/apache/ambari/server/state/CheckHelperTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/CheckHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/CheckHelperTest.java index 72b89ca..17a8abe 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/CheckHelperTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/CheckHelperTest.java @@ -27,6 +27,7 @@ import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.ClusterNotFoundException; import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.checks.AbstractCheckDescriptor; +import org.apache.ambari.server.checks.CheckDescription; import org.apache.ambari.server.checks.ServicesUpCheck; import org.apache.ambari.server.controller.PrereqCheckRequest; import org.apache.ambari.server.orm.dao.HostVersionDAO; @@ -88,9 +89,11 @@ public class CheckHelperTest { final CheckHelper helper = new CheckHelper(); List<AbstractCheckDescriptor> updateChecksRegistry = new ArrayList<AbstractCheckDescriptor>(); AbstractCheckDescriptor descriptor = EasyMock.createNiceMock(AbstractCheckDescriptor.class); + descriptor.perform(EasyMock.<PrerequisiteCheck> anyObject(), EasyMock.<PrereqCheckRequest> anyObject()); EasyMock.expectLastCall().andThrow(new AmbariException("error")); EasyMock.expect(descriptor.isApplicable(EasyMock.<PrereqCheckRequest> anyObject())).andReturn(true); + EasyMock.expect(descriptor.getDescription()).andReturn(CheckDescription.HOSTS_HEARTBEAT).anyTimes(); EasyMock.replay(descriptor); updateChecksRegistry.add(descriptor); final List<PrerequisiteCheck> upgradeChecks = helper.performChecks(new PrereqCheckRequest("cluster"), updateChecksRegistry);
