tmf: Drop the use of TmfFixedArray for statistics

[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf.ui.tests / src / org / eclipse / linuxtools / tmf / ui / tests / statistics / TmfBaseStatisticsDataTest.java

diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseStatisticsDataTest.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseStatisticsDataTest.java
index ef2c5b578a39d06a6a2cfc2b2c340887c5390831..a25c70c0ca7eb11f2a6a738c3c3e974f833487ab 100755 (executable)
--- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseStatisticsDataTest.java
+++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseStatisticsDataTest.java
@@ -24,7 +24,6 @@ import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.TmfEventField;
 import org.eclipse.linuxtools.tmf.core.event.TmfEventType;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
-import org.eclipse.linuxtools.tmf.core.util.TmfFixedArray;
 import org.eclipse.linuxtools.tmf.ui.viewers.statistics.model.AbsTmfStatisticsTree;
 import org.eclipse.linuxtools.tmf.ui.viewers.statistics.model.Messages;
 import org.eclipse.linuxtools.tmf.ui.viewers.statistics.model.TmfBaseStatisticsTree;
@@ -117,7 +116,7 @@ public class TmfBaseStatisticsDataTest extends TestCase {
         assertEquals("getChildren", fTestName, treeNode.getKey());
 
         // Getting children of the trace
-        childrenTreeNode = fStatsData.getChildren(new TmfFixedArray<String>(fTestName));
+        childrenTreeNode = fStatsData.getChildren(fTestName);
         assertEquals("getChildren", 1, childrenTreeNode.size());
         treeNode = childrenTreeNode.iterator().next();
         assertEquals("getChildren", Messages.TmfStatisticsData_EventTypes, treeNode.getKey());
@@ -161,7 +160,7 @@ public class TmfBaseStatisticsDataTest extends TestCase {
         assertEquals("getChildren", fTestName, treeNode.getKey());
 
         // Getting children of the trace
-        childrenTreeNode = fStatsData.getAllChildren(new TmfFixedArray<String>(fTestName));
+        childrenTreeNode = fStatsData.getAllChildren(fTestName);
         assertEquals("getChildren", 1, childrenTreeNode.size());
         treeNode = childrenTreeNode.iterator().next();
         assertEquals("getChildren", Messages.TmfStatisticsData_EventTypes, treeNode.getKey());
@@ -173,7 +172,7 @@ public class TmfBaseStatisticsDataTest extends TestCase {
          * It should return the eventType even though the number of events
          * equals 0
          */
-        fStatsData.get(new TmfFixedArray<String>(fTestName, Messages.TmfStatisticsData_EventTypes, fEvent1.getType().getName())).reset();
+        fStatsData.get(fTestName, Messages.TmfStatisticsData_EventTypes, fEvent1.getType().getName()).reset();
         // Getting children of a category
         childrenTreeNode = fStatsData.get(treeNode.getPath()).getAllChildren();
         assertEquals("getChildren", 2, childrenTreeNode.size());
@@ -203,10 +202,10 @@ public class TmfBaseStatisticsDataTest extends TestCase {
      * Test registering of events.
      */
     public void testRegisterEvent() {
-        TmfStatisticsTreeNode trace = fStatsData.get(new TmfFixedArray<String>(fTestName));
+        TmfStatisticsTreeNode trace = fStatsData.get(fTestName);
         assertEquals("registerEvent", 3, trace.getValues().getTotal());
 
-        Collection<TmfStatisticsTreeNode> childrenTreeNode = fStatsData.getChildren(new TmfFixedArray<String>(fTestName, Messages.TmfStatisticsData_EventTypes));
+        Collection<TmfStatisticsTreeNode> childrenTreeNode = fStatsData.getChildren(fTestName, Messages.TmfStatisticsData_EventTypes);
         for (TmfStatisticsTreeNode child : childrenTreeNode) {
             if (child.getKey().compareTo(fEvent1.getType().getName()) == 0) {
                 assertEquals("registerEvent", 1, child.getValues().getTotal());
@@ -224,9 +223,9 @@ public class TmfBaseStatisticsDataTest extends TestCase {
      * Test getter.
      */
     public void testGet() {
-        TmfStatisticsTreeNode traceRoot = fStatsData.get(new TmfFixedArray<String>(fTestName));
+        TmfStatisticsTreeNode traceRoot = fStatsData.get(fTestName);
         assertNotNull("get", traceRoot);
-        assertEquals("get", 0, traceRoot.getPath().toString().compareTo("[" + fTestName + "]"));
+        assertEquals("get", 0, traceRoot.getPath()[0].compareTo(fTestName));
         assertEquals("get", 3, traceRoot.getValues().getTotal());
         assertEquals("get", 1, traceRoot.getNbChildren());
     }
@@ -239,7 +238,7 @@ public class TmfBaseStatisticsDataTest extends TestCase {
      * Test getting or creating of node entries.
      */
     public void testGetOrCreate() {
-        TmfFixedArray<String> newEventType = new TmfFixedArray<String>(fTestName, Messages.TmfStatisticsData_EventTypes, "Fancy Type");
+        String[] newEventType = new String[] { fTestName, Messages.TmfStatisticsData_EventTypes, "Fancy Type" };
         TmfStatisticsTreeNode newEventTypeNode;
 
         // newEventType is not in the tree
@@ -271,22 +270,22 @@ public class TmfBaseStatisticsDataTest extends TestCase {
         TmfStatisticsTreeNode parentNode = fStatsData.getParent(AbsTmfStatisticsTree.ROOT);
         assertNull("getParent", parentNode);
 
-        parentNode = fStatsData.getParent(new TmfFixedArray<String>("TreeRootNode that should not exist"));
+        parentNode = fStatsData.getParent("TreeRootNode that should not exist");
         assertNotNull("getParent", parentNode);
         assertEquals("getParent", 0, parentNode.getKey().compareTo(fStatsData.get(AbsTmfStatisticsTree.ROOT).getKey().toString()));
 
-        parentNode = fStatsData.getParent(new TmfFixedArray<String>("TreeNode", Messages.TmfStatisticsData_EventTypes, "TreeNode that should not exist"));
+        parentNode = fStatsData.getParent("TreeNode", Messages.TmfStatisticsData_EventTypes, "TreeNode that should not exist");
         assertNull("getParent", parentNode);
-        parentNode = fStatsData.getParent(new TmfFixedArray<String>(fTestName, Messages.TmfStatisticsData_EventTypes, fEvent1.getType().getName()));
+        parentNode = fStatsData.getParent(fTestName, Messages.TmfStatisticsData_EventTypes, fEvent1.getType().getName());
         assertNull("getParent", parentNode);
 
-        parentNode = fStatsData.getParent(new TmfFixedArray<String>(fTestName));
+        parentNode = fStatsData.getParent(fTestName);
         assertNotNull("getParent", parentNode);
         assertEquals("getParent", 0, parentNode.getPath().toString().compareTo(AbsTmfStatisticsTree.ROOT.toString()));
 
-        parentNode = fStatsData.getParent(new TmfFixedArray<String>(fTestName, Messages.TmfStatisticsData_EventTypes));
+        parentNode = fStatsData.getParent(fTestName, Messages.TmfStatisticsData_EventTypes);
         assertNotNull("getParent", parentNode);
-        assertEquals("getParent", 0, parentNode.getPath().toString().compareTo(fStatsData.get(new TmfFixedArray<String>(fTestName)).getPath().toString()));
+        assertEquals("getParent", 0, parentNode.getPath().toString().compareTo(fStatsData.get(fTestName).getPath().toString()));
     }
 
     // ------------------------------------------------------------------------
@@ -297,15 +296,15 @@ public class TmfBaseStatisticsDataTest extends TestCase {
      * Test reset method
      */
     public void testReset() {
-        fStatsData.reset(new TmfFixedArray<String>(fTestName, Messages.TmfStatisticsData_EventTypes));
+        fStatsData.reset(fTestName, Messages.TmfStatisticsData_EventTypes);
 
-        assertEquals("reset", 0, fStatsData.getChildren(new TmfFixedArray<String>(fTestName, Messages.TmfStatisticsData_EventTypes)).size());
-        assertNull("reset", fStatsData.get(new TmfFixedArray<String>(fTestName, Messages.TmfStatisticsData_EventTypes, fType1.getName())));
-        assertNull("reset", fStatsData.get(new TmfFixedArray<String>(fTestName, Messages.TmfStatisticsData_EventTypes, fType3.getName())));
+        assertEquals("reset", 0, fStatsData.getChildren(fTestName, Messages.TmfStatisticsData_EventTypes).size());
+        assertNull("reset", fStatsData.get(fTestName, Messages.TmfStatisticsData_EventTypes, fType1.getName()));
+        assertNull("reset", fStatsData.get(fTestName, Messages.TmfStatisticsData_EventTypes, fType3.getName()));
 
-        fStatsData.reset(new TmfFixedArray<String>(fTestName));
+        fStatsData.reset(fTestName);
 
-        // A rootz should always have at least one child that is eventType
-        assertEquals("reset", 1, fStatsData.getChildren(new TmfFixedArray<String>(fTestName)).size());
+        // A root should always have at least one child that is eventType
+        assertEquals("reset", 1, fStatsData.getChildren(fTestName).size());
     }
 }