Add segment store data density provider

Update fetchTree and fetchXY
Add tests

Signed-off-by: Yassine Ibhir <[email protected]>

Author: theibhir

analysis/org.eclipse.tracecompass.analysis.timing.core.tests/src/org/eclipse/tracecompass/analysis/timing/core/tests/segmentstore/SegmentStoreDensityDataProviderTest.java

@@ -11,24 +11,26 @@
 package org.eclipse.tracecompass.analysis.timing.core.tests.segmentstore;
 
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+
 import static org.junit.Assert.assertTrue;
 
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.tracecompass.analysis.timing.core.tests.stubs.segmentstore.StubSegmentStoreProvider;
 import org.eclipse.tracecompass.internal.analysis.timing.core.segmentstore.SegmentStoreDensityDataProvider;
-import org.eclipse.tracecompass.internal.analysis.timing.core.segmentstore.SegmentStoreDensityDataProviderFactory;
 import org.eclipse.tracecompass.internal.tmf.core.model.filters.FetchParametersUtils;
-import org.eclipse.tracecompass.tmf.core.dataprovider.IDataProviderFactory;
 import org.eclipse.tracecompass.tmf.core.exceptions.TmfAnalysisException;
-import org.eclipse.tracecompass.tmf.core.model.SeriesModel;
 import org.eclipse.tracecompass.tmf.core.model.filters.TimeQueryFilter;
 import org.eclipse.tracecompass.tmf.core.model.tree.TmfTreeDataModel;
 import org.eclipse.tracecompass.tmf.core.model.tree.TmfTreeModel;
 import org.eclipse.tracecompass.tmf.core.model.xy.ITmfTreeXYDataProvider;
 import org.eclipse.tracecompass.tmf.core.model.xy.ITmfXyModel;
+import org.eclipse.tracecompass.tmf.core.model.xy.IYModel;
 import org.eclipse.tracecompass.tmf.core.response.TmfModelResponse;
 import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
 import org.eclipse.tracecompass.tmf.tests.stubs.trace.xml.TmfXmlTraceStub;
@@ -59,14 +61,6 @@ public class SegmentStoreDensityDataProviderTest {
             4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324,
             4.9E-324, 15.0, 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324,
             4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324 };
-    private static final long[] xValues = new long[] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1,
-            1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-            3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-            5, 5, 5 };
-    private static final long[] xValuesNull = new long[] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0 };
     private static final double[] yValuesNull = new double[] { 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324,
             4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324,
             4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324, 4.9E-324,
@@ -88,16 +82,9 @@ public class SegmentStoreDensityDataProviderTest {
     @BeforeClass
     public static void init() throws TmfAnalysisException {
         StubSegmentStoreProvider fixture = getValidSegment(fTrace);
-        IDataProviderFactory fp = new SegmentStoreDensityDataProviderFactory();
-        assertNull(fp.createProvider(fTrace));
-        assertNotNull(fp.createProvider(fTrace, ID));
-        assertTrue(fp.getDescriptors(fTrace).isEmpty());
         fDataProvider = new SegmentStoreDensityDataProvider(fTrace, fixture, ID);
+
         StubSegmentStoreProvider fixtureNull = getValidNullSegment(fTrace);
-        IDataProviderFactory fpNullSegment = new SegmentStoreDensityDataProviderFactory();
-        assertNull(fpNullSegment.createProvider(fTrace));
-        assertNotNull(fpNullSegment.createProvider(fTrace, ID));
-        assertTrue(fpNullSegment.getDescriptors(fTrace).isEmpty());
         fDataProviderNullSegments = new SegmentStoreDensityDataProvider(fTrace, fixtureNull, ID);
     }
 
@@ -130,29 +117,55 @@ public static void clean() {
      */
     @Test()
     public void testDataProviderFetchXY() {
-        TimeQueryFilter timeQueryFilter = new TimeQueryFilter(0, 100, 100);
-        TmfModelResponse<@NonNull ITmfXyModel> response = fDataProvider.fetchXY(FetchParametersUtils.timeQueryToMap(timeQueryFilter), null);
+        // Get tree first to find available entries
+        TmfModelResponse<@NonNull TmfTreeModel<@NonNull TmfTreeDataModel>> treeResponse =
+            fDataProvider.fetchTree(FetchParametersUtils.timeQueryToMap(new TimeQueryFilter(0, 100, 100)), null);
+        assertNotNull(treeResponse);
+        TmfTreeModel<@NonNull TmfTreeDataModel> treeModel = treeResponse.getModel();
+        assertNotNull(treeModel);
+        List<@NonNull TmfTreeDataModel> entries = treeModel.getEntries();
+
+        // Create parameters with selected items
+        Map<String, Object> parameters = new HashMap<>();
+        parameters.put("start", 0L);
+        parameters.put("end", 100L);
+        parameters.put("nb_points", 100);
+        if (!entries.isEmpty()) {
+            parameters.put("requested_items", Collections.singletonList(entries.get(0).getId()));
+        } else {
+            parameters.put("requested_items", Collections.emptyList());
+        }
+
+        TmfModelResponse<@NonNull ITmfXyModel> response = fDataProvider.fetchXY(parameters, null);
         assertNotNull(response);
         ITmfXyModel responseModel = response.getModel();
         assertNotNull(responseModel);
-        SeriesModel seriesResponse = (SeriesModel) responseModel.getSeriesData().toArray()[0];
-        assertTrue(Arrays.equals(yValues, seriesResponse.getData()));
-        assertTrue(Arrays.equals(xValues, seriesResponse.getXAxis()));
+
+        if (!responseModel.getSeriesData().isEmpty()) {
+            IYModel yModel = (IYModel) responseModel.getSeriesData().iterator().next();
+            assertTrue(Arrays.equals(yValues, yModel.getData()));
+        }
     }
 
     /**
-     * Tests data model returned by the fetch XY
+     * Tests data model returned by the fetch XY with null segments
      */
     @Test()
     public void testDataProviderNullFetchXY() {
-        TimeQueryFilter timeQueryFilter = new TimeQueryFilter(0, 100, 100);
-        TmfModelResponse<@NonNull ITmfXyModel> response = fDataProviderNullSegments.fetchXY(FetchParametersUtils.timeQueryToMap(timeQueryFilter), null);
+        Map<String, Object> parameters = new HashMap<>();
+        parameters.put("start", 0L);
+        parameters.put("end", 100L);
+        parameters.put("nb_points", 100);
+        parameters.put("requested_items", Collections.emptyList());
+
+        TmfModelResponse<@NonNull ITmfXyModel> response = fDataProviderNullSegments.fetchXY(parameters, null);
         assertNotNull(response);
         ITmfXyModel responseModel = response.getModel();
-        assertNotNull(responseModel);
-        SeriesModel seriesResponse = (SeriesModel) responseModel.getSeriesData().toArray()[0];
-        assertTrue(Arrays.equals(yValuesNull, seriesResponse.getData()));
-        assertTrue(Arrays.equals(xValuesNull, seriesResponse.getXAxis()));
+
+        if (responseModel != null && !responseModel.getSeriesData().isEmpty()) {
+            IYModel yModel = (IYModel) responseModel.getSeriesData().iterator().next();
+            assertTrue(Arrays.equals(yValuesNull, yModel.getData()));
+        }
     }
 
     /**
@@ -170,6 +183,7 @@ public void testFetchTree() {
      */
     @Test
     public void testID() {
-        assertTrue(fDataProvider.getId().equals(ID));
+        String expectedId = SegmentStoreDensityDataProvider.ID + ":" + ID;
+        assertTrue(fDataProvider.getId().equals(expectedId));
     }
 }

analysis/org.eclipse.tracecompass.analysis.timing.core/src/org/eclipse/tracecompass/internal/analysis/timing/core/segmentstore/Messages.java

@@ -152,6 +152,11 @@ public class Messages extends NLS {
      */
     public static @Nullable String SegmentStoreDensityDataProvider_title;
 
+    /**
+     * Segment store density description
+     */
+    public static @Nullable String SegmentStoreDensityDataProvider_description;
+
     /**
      * Segment store density total
      */