os.linux: Rewrite a CPU usage test in a less insane way

Change-Id: Ia694681d6faaa2ce81b8de56c6b5816408f4d0ae
Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Reviewed-on: https://git.eclipse.org/r/39632
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-by: Genevieve Bastien <gbastien+lttng@versatic.net>
Tested-by: Genevieve Bastien <gbastien+lttng@versatic.net>
Reviewed-by: Hudson CI

diff --git a/org.eclipse.tracecompass.analysis.os.linux.core.tests/src/org/eclipse/tracecompass/analysis/os/linux/core/tests/cpuusage/CpuUsageStateProviderTest.java b/org.eclipse.tracecompass.analysis.os.linux.core.tests/src/org/eclipse/tracecompass/analysis/os/linux/core/tests/cpuusage/CpuUsageStateProviderTest.java
index 4f2451beb9a48948217eb04470bd82e5b945cf3e..81d374bdca11b6e853b4f58489afbb2cbe000d17 100644 (file)
--- a/org.eclipse.tracecompass.analysis.os.linux.core.tests/src/org/eclipse/tracecompass/analysis/os/linux/core/tests/cpuusage/CpuUsageStateProviderTest.java
+++ b/org.eclipse.tracecompass.analysis.os.linux.core.tests/src/org/eclipse/tracecompass/analysis/os/linux/core/tests/cpuusage/CpuUsageStateProviderTest.java
@@ -165,21 +165,25 @@ public class CpuUsageStateProviderTest {
              * Query at the end and make sure all processes on all CPU have the
              * expected values
              */
-            Map<String, Long> expected = new HashMap<>();
-            expected.put("CPUs/0/1", 0L);
-            expected.put("CPUs/0/2", 19L);
-            expected.put("CPUs/0/3", 5L);
-            expected.put("CPUs/1/1", 5L);
-            expected.put("CPUs/1/3", 6L);
-            expected.put("CPUs/1/4", 8L);
-            List<ITmfStateInterval> intervals = ss.queryFullState(25L);
-            Map<String, Long> intervalMap = new HashMap<>();
-            for (ITmfStateInterval oneInterval : intervals) {
-                if (!oneInterval.getStateValue().isNull()) {
-                    intervalMap.put(ss.getFullAttributePath(oneInterval.getAttribute()), oneInterval.getStateValue().unboxLong());
-                }
-            }
-            assertEquals(expected, intervalMap);
+            List<ITmfStateInterval> state = ss.queryFullState(25L);
+
+            int quark = ss.getQuarkAbsolute("CPUs", "0", "1");
+            assertEquals(0L, state.get(quark).getStateValue().unboxLong());
+
+            quark = ss.getQuarkAbsolute("CPUs", "0", "2");
+            assertEquals(19L, state.get(quark).getStateValue().unboxLong());
+
+            quark = ss.getQuarkAbsolute("CPUs", "0", "3");
+            assertEquals(5L, state.get(quark).getStateValue().unboxLong());
+
+            quark = ss.getQuarkAbsolute("CPUs", "1", "1");
+            assertEquals(5L, state.get(quark).getStateValue().unboxLong());
+
+            quark = ss.getQuarkAbsolute("CPUs", "1", "3");
+            assertEquals(6L, state.get(quark).getStateValue().unboxLong());
+
+            quark = ss.getQuarkAbsolute("CPUs", "1", "4");
+            assertEquals(8L, state.get(quark).getStateValue().unboxLong());
 
         } catch (AttributeNotFoundException | StateSystemDisposedException e) {
             fail(e.getMessage());