Mercurial > hg > release > thermostat-1.0
changeset 399:91c63bd31a77
Populate histogram id in the heap info when retrivied from database
reviewed-by: rkennke
review-thread: http://icedtea.classpath.org/pipermail/thermostat/2012-June/001923.html
| author | Mario Torre <neugens.limasoftware@gmail.com> |
|---|---|
| date | Wed, 20 Jun 2012 15:24:41 +0200 |
| parents | 146714814131 |
| children | 7abc9720846b 482711d7ef3f |
| files | common/core/src/main/java/com/redhat/thermostat/common/dao/HeapDAOImpl.java common/core/src/test/java/com/redhat/thermostat/common/dao/HeapDAOTest.java |
| diffstat | 2 files changed, 10 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/common/core/src/main/java/com/redhat/thermostat/common/dao/HeapDAOImpl.java Wed Jun 20 13:31:58 2012 +0200 +++ b/common/core/src/main/java/com/redhat/thermostat/common/dao/HeapDAOImpl.java Wed Jun 20 15:24:41 2012 +0200 @@ -99,6 +99,7 @@ private HeapInfo convertChunkToHeapInfo(VmRef vm, Chunk chunk) { HeapInfo info = new HeapInfo(vm, chunk.get(Key.TIMESTAMP)); info.setHeapDumpId(chunk.get(HeapDAO.heapDumpIdKey)); + info.setHistogramId(chunk.get(HeapDAO.histogramIdKey)); return info; }
--- a/common/core/src/test/java/com/redhat/thermostat/common/dao/HeapDAOTest.java Wed Jun 20 13:31:58 2012 +0200 +++ b/common/core/src/test/java/com/redhat/thermostat/common/dao/HeapDAOTest.java Wed Jun 20 15:24:41 2012 +0200 @@ -96,11 +96,15 @@ info1.put(Key.VM_ID, 234); info1.put(Key.TIMESTAMP, 12345l); info1.put(HeapDAO.heapDumpIdKey, "test1"); + info1.put(HeapDAO.histogramIdKey, "histotest1"); + Chunk info2 = new Chunk(HeapDAO.heapInfoCategory, false); info2.put(Key.AGENT_ID, "123"); info2.put(Key.VM_ID, 234); info2.put(Key.TIMESTAMP, 23456l); info2.put(HeapDAO.heapDumpIdKey, "test2"); + info2.put(HeapDAO.histogramIdKey, "histotest2"); + when(cursor.hasNext()).thenReturn(true).thenReturn(true).thenReturn(false); when(cursor.next()).thenReturn(info1).thenReturn(info2).thenReturn(null); when(storage.findAll(findAllQuery)).thenReturn(cursor); @@ -170,10 +174,15 @@ HostRef host = new HostRef("123", "test-host"); VmRef vm = new VmRef(host, 234, "test-vm"); Collection<HeapInfo> heapInfos = dao.getAllHeapInfo(vm); + HeapInfo info1 = new HeapInfo(vm, 12345); info1.setHeapDumpId("test1"); + info1.setHistogramId("histotest1"); + HeapInfo info2 = new HeapInfo(vm, 23456); info2.setHeapDumpId("test2"); + info2.setHistogramId("histotest2"); + assertEquals(2, heapInfos.size()); assertTrue(heapInfos.contains(info1)); assertTrue(heapInfos.contains(info2));