Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-18901 b74905495 -> 333c70150
AMBARI-18974. A number of Ambari Server Unit Test failures on branch-2.5 (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/92823a75 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/92823a75 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/92823a75 Branch: refs/heads/branch-feature-AMBARI-18901 Commit: 92823a75d38cb5649ed6edddfbc29796f5853ab9 Parents: c538cd8 Author: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Authored: Thu Nov 24 11:51:54 2016 +0200 Committer: Lisnichenko Dmitro <dlysniche...@hortonworks.com> Committed: Thu Nov 24 11:52:32 2016 +0200 ---------------------------------------------------------------------- .../controller/internal/StackDefinedPropertyProviderTest.java | 2 ++ .../server/controller/metrics/RestMetricsPropertyProviderTest.java | 2 ++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/92823a75/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java index 958957b..75d5bd8 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java @@ -52,6 +52,7 @@ import org.apache.ambari.server.controller.spi.Resource; import org.apache.ambari.server.controller.spi.SystemException; import org.apache.ambari.server.controller.spi.TemporalInfo; import org.apache.ambari.server.controller.utilities.PropertyHelper; +import org.apache.ambari.server.events.publishers.AmbariEventPublisher; import org.apache.ambari.server.orm.GuiceJpaInitializer; import org.apache.ambari.server.orm.InMemoryDefaultTestModule; import org.apache.ambari.server.orm.OrmTestHelper; @@ -157,6 +158,7 @@ public class StackDefinedPropertyProviderTest { field.set(null, amc); Clusters clustersMock = createNiceMock(Clusters.class); Cluster clusterMock = createNiceMock(Cluster.class); + expect(amc.getAmbariEventPublisher()).andReturn(createNiceMock(AmbariEventPublisher.class)).anyTimes(); expect(amc.getClusters()).andReturn(clustersMock).anyTimes(); expect(clustersMock.getCluster(CLUSTER_NAME_PROPERTY_ID)).andReturn(clusterMock).anyTimes(); expect(clusterMock.getResourceId()).andReturn(2L).anyTimes(); http://git-wip-us.apache.org/repos/asf/ambari/blob/92823a75/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java index a9934a2..410e2f1 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java @@ -46,6 +46,7 @@ import org.apache.ambari.server.controller.spi.SystemException; import org.apache.ambari.server.controller.spi.TemporalInfo; import org.apache.ambari.server.controller.utilities.PropertyHelper; import org.apache.ambari.server.controller.utilities.StreamProvider; +import org.apache.ambari.server.events.publishers.AmbariEventPublisher; import org.apache.ambari.server.orm.GuiceJpaInitializer; import org.apache.ambari.server.orm.InMemoryDefaultTestModule; import org.apache.ambari.server.security.TestAuthenticationFactory; @@ -135,6 +136,7 @@ public class RestMetricsPropertyProviderTest { ConfigHelper configHelperMock = createNiceMock(ConfigHelper.class); expect(amc.getClusters()).andReturn(clusters).anyTimes(); + expect(amc.getAmbariEventPublisher()).andReturn(createNiceMock(AmbariEventPublisher.class)).anyTimes(); expect(amc.findConfigurationTagsWithOverrides(eq(c1), anyString())).andReturn(Collections.singletonMap("storm-site", Collections.singletonMap("tag", "version1"))).anyTimes(); expect(amc.getConfigHelper()).andReturn(configHelperMock).anyTimes();
