More testing

src/test/java/com/insightfullogic/honest_profiler/core/FlatGenerator.java

@@ -1,5 +1,6 @@
 package com.insightfullogic.honest_profiler.core;
 
+import static com.insightfullogic.honest_profiler.core.aggregation.AggregationUtil.nano;
 import static com.insightfullogic.honest_profiler.core.aggregation.grouping.CombinedGrouping.combine;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -47,7 +48,7 @@ public void accept(LeanProfile profile)
 
     // Assertions
 
-    public void assertSizeEquals(int size)
+    public void assertAggregationSizeEquals(int size)
     {
         assertEquals("Wrong size of the Flat aggregation.", size, flat.getData().size());
     }
@@ -67,4 +68,9 @@ public void assertContains(String key, int selfCount, int totalCount, long selfT
         assertEquals("Wrong self time for entry " + key, selfTime, entry.getSelfTime());
         assertEquals("Wrong total time for entry " + key, totalTime, entry.getTotalTime());
     }
+
+    public void assertContains(String key, int selfCount, int totalCount)
+    {
+        assertContains(key, selfCount, totalCount, nano(selfCount), nano(totalCount));
+    }
 }

src/test/java/com/insightfullogic/honest_profiler/core/LeanLogCollectorDriver.java

@@ -84,6 +84,7 @@ else if (event instanceof ThreadMeta)
         });
     }
 
+
     public void endOfLog()
     {
         collector.endOfLog();

src/test/java/com/insightfullogic/honest_profiler/core/aggregation/AggregationProfileTest.java

@@ -23,7 +23,7 @@ public class AggregationProfileTest
     public void checkThreadInfoLogic()
     {
         LeanProfileGenerator gen = new LeanProfileGenerator();
-        LogEventFactory.applyScenario(gen);
+        LogEventFactory.applyScenario09(gen);
         LeanProfile leanProfile = gen.getProfile();
 
         // Check initial state of ThreadNode ThreadInfo
@@ -50,13 +50,13 @@ public void checkThreadInfoLogic()
     public void checkGlobalAggregation()
     {
         LeanProfileGenerator gen = new LeanProfileGenerator();
-        LogEventFactory.applyScenario(gen);
+        LogEventFactory.applyScenario09(gen);
         AggregationProfile profile = new AggregationProfile(gen.getProfile());
         NumericInfo global = profile.getGlobalData();
 
         assertEquals("Global Self Count should be 0", 0, global.getSelfCnt());
-        assertEquals("Global Total Count wrong", 53, global.getTotalCnt());
+        assertEquals("Global Total Count wrong", 91, global.getTotalCnt());
         assertEquals("Global Self Time should be 0", ZERO, global.getSelfTime());
-        assertEquals("Global Total Time wrong", valueOf(nano(53)), global.getTotalTime());
+        assertEquals("Global Total Time wrong", valueOf(nano(91)), global.getTotalTime());
     }
 }

src/test/java/com/insightfullogic/honest_profiler/core/aggregation/AggregationUtil.java

@@ -3,6 +3,7 @@
 import static java.util.concurrent.TimeUnit.SECONDS;
 
 import com.insightfullogic.honest_profiler.core.parser.Method;
+import com.insightfullogic.honest_profiler.core.parser.StackFrame;
 
 public class AggregationUtil
 {
@@ -19,17 +20,17 @@ public static final String getFqmn(Method method)
         return result.toString();
     }
 
-    public static final String getFqmnPlusBci(Method method)
+    public static final String getFqmnPlusBci(Method method, StackFrame frame)
     {
         StringBuilder result = new StringBuilder(getFqmn(method));
-        result.append(":").append(method.getBci());
+        result.append(":").append(frame.getBci());
         return result.toString();
     }
 
-    public static final String getFqmnPlusLineNr(Method method)
+    public static final String getFqmnPlusLineNr(Method method, StackFrame frame)
     {
         StringBuilder result = new StringBuilder(getFqmn(method));
-        result.append(":").append(method.getLine());
+        result.append(":").append(frame.getLineNumber());
         return result.toString();
     }