Repository: ambari Updated Branches: refs/heads/branch-dev-patch-upgrade ab031a3c8 -> fefcdf5db
AMBARI-13517. TimelineMetricsCache Unit test failure, apache infra. (swagle) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b4aaf2a3 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b4aaf2a3 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b4aaf2a3 Branch: refs/heads/branch-dev-patch-upgrade Commit: b4aaf2a3e3043e163141172ab8567b71d271dc39 Parents: d79b3d5 Author: Siddharth Wagle <[email protected]> Authored: Fri Oct 30 15:56:36 2015 -0700 Committer: Siddharth Wagle <[email protected]> Committed: Fri Oct 30 15:56:36 2015 -0700 ---------------------------------------------------------------------- .../cache/TimelineMetricCacheSizingTest.java | 8 +++--- .../timeline/cache/TimelineMetricCacheTest.java | 28 +++++++++----------- 2 files changed, 17 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b4aaf2a3/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheSizingTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheSizingTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheSizingTest.java index 9fececb..ab3cc59 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheSizingTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheSizingTest.java @@ -25,9 +25,7 @@ import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric; import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics; import org.junit.Assert; import org.junit.Test; -import java.util.HashMap; import java.util.HashSet; -import java.util.Map; import java.util.Set; import java.util.TreeMap; @@ -106,7 +104,9 @@ public class TimelineMetricCacheSizingTest { long sampleSizeInMB = bytesFromReflectionEngine / (1024 * 1024); long discrepancyInKB = Math.abs(bytesFromCustomSizeOfEngine - bytesFromReflectionEngine) / 1024; - Assert.assertTrue("Sample size is greater that 10 MB", sampleSizeInMB > 10); - Assert.assertTrue("Discrepancy in values is less than 10K", discrepancyInKB < 10); + Assert.assertTrue("Sample size is " + sampleSizeInMB + ", expected to be" + + "greater that 10 MB", sampleSizeInMB > 10); + Assert.assertTrue("Discrepancy in values is " + discrepancyInKB + ", " + + "expected to be less than 10K", discrepancyInKB < 10); } } http://git-wip-us.apache.org/repos/asf/ambari/blob/b4aaf2a3/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheTest.java index 0f727dd..ea639a7 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricCacheTest.java @@ -31,15 +31,12 @@ import org.apache.ambari.server.controller.internal.TemporalInfoImpl; import org.apache.ambari.server.controller.metrics.timeline.MetricsRequestHelper; import org.apache.ambari.server.controller.spi.TemporalInfo; import org.apache.ambari.server.state.stack.OsFamily; -import org.apache.hadoop.metrics2.sink.timeline.Precision; import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric; import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics; -import org.apache.http.client.utils.URIBuilder; import org.easymock.EasyMock; import org.easymock.IAnswer; import org.junit.After; import org.junit.Test; - import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Collections; @@ -49,8 +46,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.TreeMap; - import static org.apache.ambari.server.controller.metrics.timeline.cache.TimelineMetricCacheProvider.TIMELINE_METRIC_CACHE_INSTANCE_NAME; +import static org.apache.ambari.server.controller.metrics.timeline.cache.TimelineMetricCacheProvider.TIMELINE_METRIC_CACHE_MANAGER_NAME; import static org.easymock.EasyMock.anyObject; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.createMockBuilder; @@ -83,7 +80,7 @@ public class TimelineMetricCacheTest { // Avoids Object Exists Exception on unit tests by adding a new cache for // every provider. CacheManager manager = CacheManager.getInstance(); - manager.removeCache(TIMELINE_METRIC_CACHE_INSTANCE_NAME); + manager.removeAllCaches(); } // General cache behavior demonstration @@ -395,8 +392,7 @@ public class TimelineMetricCacheTest { } @Test - public void testTimelineMetricCachePrecisionUpdates () throws Exception { - + public void testTimelineMetricCachePrecisionUpdates() throws Exception { Configuration configuration = createNiceMock(Configuration.class); expect(configuration.getMetricCacheTTLSeconds()).andReturn(3600); expect(configuration.getMetricCacheIdleSeconds()).andReturn(100); @@ -406,10 +402,10 @@ public class TimelineMetricCacheTest { final long now = System.currentTimeMillis(); long second = 1000; - long min = 60*second; - long hour = 60*min; - long day = 24*hour; - long year = 365*day; + long min = 60 * second; + long hour = 60 * min; + long day = 24 * hour; + long year = 365 * day; //Original Values Map<String, TimelineMetric> valueMap = new HashMap<String, TimelineMetric>(); @@ -418,7 +414,7 @@ public class TimelineMetricCacheTest { timelineMetric.setAppId("app1"); TreeMap<Long, Double> metricValues = new TreeMap<Long, Double>(); - for(long i=1*year-1*day;i>=0;i-=1*day) { + for (long i = 1 * year - 1 * day; i >= 0; i -= 1 * day) { metricValues.put(now-i, 1.0); } @@ -459,7 +455,7 @@ public class TimelineMetricCacheTest { TimelineAppMetricCacheKey newKey = new TimelineAppMetricCacheKey( Collections.singleton("cpu_user"), "app1", - new TemporalInfoImpl(now-1*day, now+2*day, 1) + new TemporalInfoImpl(now - 1 * day, now + 2 * day, 1) ); newKey.setSpec(""); @@ -468,8 +464,9 @@ public class TimelineMetricCacheTest { .andReturn(metrics).andReturn(newMetrics); replay(metricsRequestHelperForGets); - TimelineMetricCacheEntryFactory cacheEntryFactory = createMockBuilder(TimelineMetricCacheEntryFactory.class) - .withConstructor(Configuration.class).withArgs(configuration).createMock(); + TimelineMetricCacheEntryFactory cacheEntryFactory = + createMockBuilder(TimelineMetricCacheEntryFactory.class) + .withConstructor(configuration).createMock(); Field requestHelperField = TimelineMetricCacheEntryFactory.class.getDeclaredField("requestHelperForGets"); requestHelperField.setAccessible(true); @@ -501,5 +498,6 @@ public class TimelineMetricCacheTest { Assert.assertEquals("app1", metric.getAppId()); Assert.assertEquals(newMetricValues,metric.getMetricValues()); + verify(configuration, metricsRequestHelperForGets, cacheEntryFactory); } }
