Mercurial > hg > release > thermostat-1.2

changeset 1652:858fb834ffbd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix vm-memory tab to update with correct intervals. PR2232 Reviewed-by: omajid Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2015-January/012424.html
author Jie Kang <jkang@redhat.com>
date Wed, 11 Feb 2015 16:01:33 -0500
parents dd07cbe3cbbf
children 4f393ed9542c
files vm-memory/client-core/src/main/java/com/redhat/thermostat/vm/memory/client/core/internal/MemoryStatsController.java vm-memory/client-core/src/test/java/com/redhat/thermostat/vm/memory/client/core/internal/MemoryStatsControllerTest.java
diffstat 2 files changed, 11 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/vm-memory/client-core/src/main/java/com/redhat/thermostat/vm/memory/client/core/internal/MemoryStatsController.java	Thu Feb 05 19:53:31 2015 -0700
+++ b/vm-memory/client-core/src/main/java/com/redhat/thermostat/vm/memory/client/core/internal/MemoryStatsController.java	Wed Feb 11 16:01:33 2015 -0500
@@ -105,8 +105,6 @@
 
             Range<Long> newAvailableRange = new Range<>(oldest.getTimeStamp(), latest.getTimeStamp());
 
-            timeRangeController = new TimeRangeController<>();
-
             TimeRangeController.StatsSupplier<VmMemoryStat> statsSupplier = new TimeRangeController.StatsSupplier<VmMemoryStat>() {
                 @Override
                 public List<VmMemoryStat> getStats(VmRef ref, long since, long to) {
@@ -288,6 +286,7 @@
             view.setEnableGCAction(false);
         }
 
+        timeRangeController = new TimeRangeController<>();
     }
     
     // for testing
--- a/vm-memory/client-core/src/test/java/com/redhat/thermostat/vm/memory/client/core/internal/MemoryStatsControllerTest.java	Thu Feb 05 19:53:31 2015 -0700
+++ b/vm-memory/client-core/src/test/java/com/redhat/thermostat/vm/memory/client/core/internal/MemoryStatsControllerTest.java	Wed Feb 11 16:01:33 2015 -0500
@@ -283,16 +283,21 @@
         when(memoryStatDao.getVmMemoryStats(any(VmRef.class), anyLong(), anyLong())).thenReturn(Arrays.asList(stat));
         when(memoryStatDao.getLatestMemoryStat(any(VmRef.class))).thenReturn(stat);
 
-        Thread.sleep(100l);
         timerAction.run();
 
         verify(memoryStatDao, times(2)).getVmMemoryStats(isA(VmRef.class), timeStampCaptor.capture(), timeStampCaptor.capture());
 
-        long timeStamp1 = timeStampCaptor.getAllValues().get(0);
-        assertTimeStampIsAround(timestamps[0], timeStamp1);
+        List<Long> times = timeStampCaptor.getAllValues();
+
+        long start1 = times.get(0);
+        assertTimeStampIsAround(timestamps[0], start1);
 
-        long timeStamp2 = timeStampCaptor.getAllValues().get(3);
-        assertTimeStampIsAround(DATA_TIMESTAMP, timeStamp2);
+        long end1 = times.get(1);
+        long start2 = times.get(2);
+        assertEquals(end1, start2);
+
+        long end2 = times.get(3);
+        assertTimeStampIsAround(DATA_TIMESTAMP, end2);
     }