diff --git a/src/main/java/github/weichware10/analyse/Client.java b/src/main/java/github/weichware10/analyse/Client.java index 32d1cf1..b6f4833 100644 --- a/src/main/java/github/weichware10/analyse/Client.java +++ b/src/main/java/github/weichware10/analyse/Client.java @@ -72,7 +72,7 @@ public boolean getData(DateTime start, DateTime end, ToolType dataType) { new DateTime(2021, 11, 28, 19, 0, 0), new DateTime(2021, 11, 28, 18, 0, 0), new DateTime(2021, 11, 28, 20, 0, 0))); List dataToolType = new ArrayList(Arrays.asList( - ToolType.ZOOM, ToolType.EYETRACKING, ToolType.CODECHARTS)); + ToolType.ZOOMMAPS, ToolType.EYETRACKING, ToolType.CODECHARTS)); for (int id = 0; id < amountData; id++) { if (dataStart.get(id).equals(start) && dataEnd.get(id).equals(end) diff --git a/src/test/java/github/weichware10/analyse/ClientTest.java b/src/test/java/github/weichware10/analyse/ClientTest.java index a59d007..6ca3c50 100644 --- a/src/test/java/github/weichware10/analyse/ClientTest.java +++ b/src/test/java/github/weichware10/analyse/ClientTest.java @@ -61,7 +61,7 @@ public void dataShouldBeSet() { Client client1 = new Client(); assertTrue("getData sollte True zurückgeben", client1.getData( new DateTime(2021, 11, 28, 16, 0, 0), - new DateTime(2021, 11, 28, 19, 0, 0), ToolType.ZOOM)); + new DateTime(2021, 11, 28, 19, 0, 0), ToolType.ZOOMMAPS)); Client client2 = new Client(); assertTrue("getData sollte True zurückgeben", client2.getData( @@ -76,7 +76,7 @@ public void dataShouldBeSet() { // * Korrekte Zeiteingabe, aber Daten zu Tool-Typ nicht vorhanden Client client4 = new Client(); assertFalse(client4.getData(new DateTime(2021, 11, 28, 15, 0, 0), - new DateTime(2021, 11, 28, 16, 0, 0), ToolType.ZOOM)); + new DateTime(2021, 11, 28, 16, 0, 0), ToolType.ZOOMMAPS)); Client client5 = new Client(); assertFalse(client5.getData(new DateTime(2021, 11, 28, 15, 0, 0), @@ -90,7 +90,7 @@ public void dataShouldBeSet() { Client client7 = new Client(); assertFalse("getData sollte False zurückgeben", client7.getData( new DateTime(2021, 11, 28, 18, 0, 0), - new DateTime(2021, 11, 28, 17, 0, 0), ToolType.ZOOM)); + new DateTime(2021, 11, 28, 17, 0, 0), ToolType.ZOOMMAPS)); Client client8 = new Client(); assertFalse("getData sollte False zurückgeben", client8.getData( @@ -106,7 +106,7 @@ public void dataShouldBeSet() { Client client10 = new Client(); assertFalse("getData sollte False zurückgeben", client10.getData( new DateTime(2021, 11, 28, 18, 0, 0), - DateTime.now().plusMinutes(5), ToolType.ZOOM)); + DateTime.now().plusMinutes(5), ToolType.ZOOMMAPS)); Client client11 = new Client(); assertFalse("getData sollte False zurückgeben", client11.getData( diff --git a/src/test/java/github/weichware10/analyse/DiagrammTest.java b/src/test/java/github/weichware10/analyse/DiagrammTest.java index ac2ca17..6d9c2d5 100644 --- a/src/test/java/github/weichware10/analyse/DiagrammTest.java +++ b/src/test/java/github/weichware10/analyse/DiagrammTest.java @@ -15,10 +15,10 @@ public class DiagrammTest { */ @Test public void createRelFreqImgAreaShouldWork() { - Diagramm dia1 = new Diagramm(new Data(ToolType.ZOOM, 1), new ConfigDiagramm()); + Diagramm dia1 = new Diagramm(new Data(ToolType.ZOOMMAPS, 1), new ConfigDiagramm()); assertEquals( - "createRelFreqImgAre sollte .../diagramm/RELFRQIMGAREA_ZOOM_1 zurückgeben", - ".../diagramm/RELFRQIMGAREA_ZOOM_1.jpg", + "createRelFreqImgAre sollte .../diagramm/RELFRQIMGAREA_ZOOMMAPS_1 zurückgeben", + ".../diagramm/RELFRQIMGAREA_ZOOMMAPS_1.jpg", dia1.createRelFreqImgArea()); Diagramm dia2 = new Diagramm(new Data(ToolType.EYETRACKING, 5), new ConfigDiagramm()); @@ -39,9 +39,9 @@ public void createRelFreqImgAreaShouldWork() { */ @Test public void createViewTimeDistrSouldWork() { - Diagramm dia1 = new Diagramm(new Data(ToolType.ZOOM, 1), new ConfigDiagramm()); - assertEquals("createViewTimeDistr sollte .../diagramm/VIEWTIMEDISTR_ZOOM_1 zurückgeben", - ".../diagramm/VIEWTIMEDISTR_ZOOM_1.jpg", + Diagramm dia1 = new Diagramm(new Data(ToolType.ZOOMMAPS, 1), new ConfigDiagramm()); + assertEquals("createViewTimeDistr sollte .../diagramm/VIEWTIMEDISTR_ZOOMMAPS_1 zurückgeben", + ".../diagramm/VIEWTIMEDISTR_ZOOMMAPS_1.jpg", dia1.createViewTimeDistr()); Diagramm dia2 = new Diagramm(new Data(ToolType.EYETRACKING, 5), new ConfigDiagramm()); diff --git a/src/test/java/github/weichware10/analyse/HeatmapTest.java b/src/test/java/github/weichware10/analyse/HeatmapTest.java index d968f75..ca36cf1 100644 --- a/src/test/java/github/weichware10/analyse/HeatmapTest.java +++ b/src/test/java/github/weichware10/analyse/HeatmapTest.java @@ -15,9 +15,9 @@ public class HeatmapTest { */ @Test public void createHeatmapShouldWork() { - Heatmap hm1 = new Heatmap(new Data(ToolType.ZOOM, 1), new ConfigHeatmap()); - assertEquals("createHeatMap sollte .../heatmap/HEATMAP_ZOOM_1.jpg ausgeben", - ".../heatmap/HEATMAP_ZOOM_1.jpg", hm1.createHeatmap()); + Heatmap hm1 = new Heatmap(new Data(ToolType.ZOOMMAPS, 1), new ConfigHeatmap()); + assertEquals("createHeatMap sollte .../heatmap/HEATMAP_ZOOMMAPS_1.jpg ausgeben", + ".../heatmap/HEATMAP_ZOOMMAPS_1.jpg", hm1.createHeatmap()); Heatmap hm2 = new Heatmap(new Data(ToolType.EYETRACKING, 7), new ConfigHeatmap()); assertEquals("createHeatMap sollte .../heatmap/HEATMAP_EYETRACKING_7.jpg ausgeben", @@ -40,18 +40,18 @@ public void compHeatmapsShouldWork() { ".../heatmap/COMPHEATMAP_CODECHARTS_4_EYETRACKING_2.jpg", Heatmap.compHeatmaps(hm1, hm2)); - Heatmap hm3 = new Heatmap(new Data(ToolType.ZOOM, 1), new ConfigHeatmap()); + Heatmap hm3 = new Heatmap(new Data(ToolType.ZOOMMAPS, 1), new ConfigHeatmap()); Heatmap hm4 = new Heatmap(new Data(ToolType.CODECHARTS, 6), new ConfigHeatmap()); assertEquals( - "compHeatmaps sollte .../heatmap/COMPHEATMAP_ZOOM_1_CODECHARTS_6.jpg ausgeben", - ".../heatmap/COMPHEATMAP_ZOOM_1_CODECHARTS_6.jpg", + "compHeatmaps sollte .../heatmap/COMPHEATMAP_ZOOMMAPS_1_CODECHARTS_6.jpg ausgeben", + ".../heatmap/COMPHEATMAP_ZOOMMAPS_1_CODECHARTS_6.jpg", Heatmap.compHeatmaps(hm3, hm4)); Heatmap hm5 = new Heatmap(new Data(ToolType.EYETRACKING, 8), new ConfigHeatmap()); - Heatmap hm6 = new Heatmap(new Data(ToolType.ZOOM, 12), new ConfigHeatmap()); + Heatmap hm6 = new Heatmap(new Data(ToolType.ZOOMMAPS, 12), new ConfigHeatmap()); assertEquals( - "compHeatmaps sollte .../heatmap/COMPHEATMAP_EYETRACKING_8_ZOOM_12.jpg ausgeben", - ".../heatmap/COMPHEATMAP_EYETRACKING_8_ZOOM_12.jpg", + "sollte .../heatmap/COMPHEATMAP_EYETRACKING_8_ZOOMMAPS_12.jpg ausgeben", + ".../heatmap/COMPHEATMAP_EYETRACKING_8_ZOOMMAPS_12.jpg", Heatmap.compHeatmaps(hm5, hm6)); } } diff --git a/src/test/java/github/weichware10/analyse/VerlaufTest.java b/src/test/java/github/weichware10/analyse/VerlaufTest.java index 34edc3f..fa4f71f 100644 --- a/src/test/java/github/weichware10/analyse/VerlaufTest.java +++ b/src/test/java/github/weichware10/analyse/VerlaufTest.java @@ -15,9 +15,9 @@ public class VerlaufTest { */ @Test public void createVerlaufShouldWork() { - Verlauf verlauf1 = new Verlauf(new Data(ToolType.ZOOM, 1)); - assertEquals("createVerlauf sollte .../verlauf/VERLAUF_ZOOM_1.jpg ausgeben", - ".../verlauf/VERLAUF_ZOOM_1.jpg", verlauf1.createVerlauf()); + Verlauf verlauf1 = new Verlauf(new Data(ToolType.ZOOMMAPS, 1)); + assertEquals("createVerlauf sollte .../verlauf/VERLAUF_ZOOMMAPS_1.jpg ausgeben", + ".../verlauf/VERLAUF_ZOOMMAPS_1.jpg", verlauf1.createVerlauf()); Verlauf verlauf2 = new Verlauf(new Data(ToolType.EYETRACKING, 6)); assertEquals("createVerlauf sollte .../verlauf/VERLAUF_EYETRACKING_6.jpg ausgeben",