conf: Turn on quartz tests for annotations (#110)

* update almost all tests to use new `renderAndVerify` function turning on the quartz annotation tests that were previously off.

* don't check if files are equal if any of them does not exist in the first place

* add missing reference images for quartz

Author: odmir

Tests/SwiftPlotTests/Annotation/annotation-arrow-dart.swift

@@ -30,23 +30,6 @@ extension AnnotationTests {
                                               startAnnotation: Text(text: "relative maxima",
                                                                     direction: .west)))
 
-    let svg_renderer = SVGRenderer()
-    try lineGraph.drawGraphAndOutput(fileName: svgOutputDirectory+fileName,
-                                     renderer: svg_renderer)
-    verifyImage(name: fileName, renderer: .svg)
-    #if canImport(AGGRenderer)
-    let agg_renderer = AGGRenderer()
-    try lineGraph.drawGraphAndOutput(fileName: aggOutputDirectory+fileName,
-                                     renderer: agg_renderer)
-    verifyImage(name: fileName, renderer: .agg)
-    #endif
-    /*
-    #if canImport(QuartzRenderer)
-    let quartz_renderer = QuartzRenderer()
-    try lineGraph.drawGraphAndOutput(fileName: coreGraphicsOutputDirectory+fileName,
-                                     renderer: quartz_renderer)
-    verifyImage(name: fileName, renderer: .coreGraphics)
-    #endif
-    */
+    try renderAndVerify(lineGraph, fileName: fileName)
   }
 }

Tests/SwiftPlotTests/Annotation/annotation-arrow-double-headed.swift

@@ -26,23 +26,6 @@ extension AnnotationTests {
                                               end: Point(585.0, 585.0),
                                               isDoubleHeaded: true))
 
-    let svg_renderer = SVGRenderer()
-    try lineGraph.drawGraphAndOutput(fileName: svgOutputDirectory+fileName,
-                                     renderer: svg_renderer)
-    verifyImage(name: fileName, renderer: .svg)
-    #if canImport(AGGRenderer)
-    let agg_renderer = AGGRenderer()
-    try lineGraph.drawGraphAndOutput(fileName: aggOutputDirectory+fileName,
-                                     renderer: agg_renderer)
-    verifyImage(name: fileName, renderer: .agg)
-    #endif
-    /*
-    #if canImport(QuartzRenderer)
-    let quartz_renderer = QuartzRenderer()
-    try lineGraph.drawGraphAndOutput(fileName: coreGraphicsOutputDirectory+fileName,
-                                     renderer: quartz_renderer)
-    verifyImage(name: fileName, renderer: .coreGraphics)
-    #endif
-    */
+    try renderAndVerify(lineGraph, fileName: fileName)
   }
 }

Tests/SwiftPlotTests/Annotation/annotation-arrow-wedge.swift

@@ -29,23 +29,6 @@ extension AnnotationTests {
                                               startAnnotation: Text(text: "relative maxima",
                                                                     direction: .west)))
 
-    let svg_renderer = SVGRenderer()
-    try lineGraph.drawGraphAndOutput(fileName: svgOutputDirectory+fileName,
-                                     renderer: svg_renderer)
-    verifyImage(name: fileName, renderer: .svg)
-    #if canImport(AGGRenderer)
-    let agg_renderer = AGGRenderer()
-    try lineGraph.drawGraphAndOutput(fileName: aggOutputDirectory+fileName,
-                                     renderer: agg_renderer)
-    verifyImage(name: fileName, renderer: .agg)
-    #endif
-    /*
-    #if canImport(QuartzRenderer)
-    let quartz_renderer = QuartzRenderer()
-    try lineGraph.drawGraphAndOutput(fileName: coreGraphicsOutputDirectory+fileName,
-                                     renderer: quartz_renderer)
-    verifyImage(name: fileName, renderer: .coreGraphics)
-    #endif
-    */
+    try renderAndVerify(lineGraph, fileName: fileName)
   }
 }

Tests/SwiftPlotTests/Annotation/annotation-arrow.swift

@@ -27,23 +27,6 @@ extension AnnotationTests {
                                               startAnnotation: Text(text: "relative maxima",
                                                                     direction: .west)))
 
-    let svg_renderer = SVGRenderer()
-    try lineGraph.drawGraphAndOutput(fileName: svgOutputDirectory+fileName,
-                                     renderer: svg_renderer)
-    verifyImage(name: fileName, renderer: .svg)
-    #if canImport(AGGRenderer)
-    let agg_renderer = AGGRenderer()
-    try lineGraph.drawGraphAndOutput(fileName: aggOutputDirectory+fileName,
-                                     renderer: agg_renderer)
-    verifyImage(name: fileName, renderer: .agg)
-    #endif
-    /*
-    #if canImport(QuartzRenderer)
-    let quartz_renderer = QuartzRenderer()
-    try lineGraph.drawGraphAndOutput(fileName: coreGraphicsOutputDirectory+fileName,
-                                     renderer: quartz_renderer)
-    verifyImage(name: fileName, renderer: .coreGraphics)
-    #endif
-    */
+    try renderAndVerify(lineGraph, fileName: fileName)
   }
 }

Tests/SwiftPlotTests/Annotation/annotation-text-bounding-box.swift

@@ -31,21 +31,6 @@ extension AnnotationTests {
                                              boundingBox: Box(color: .pink),
                                              borderWidth: 5.0))
 
-    let svg_renderer = SVGRenderer()
-    try lineGraph.drawGraphAndOutput(fileName: svgOutputDirectory+fileName,
-                                     renderer: svg_renderer)
-    verifyImage(name: fileName, renderer: .svg)
-    #if canImport(AGGRenderer)
-    let agg_renderer = AGGRenderer()
-    try lineGraph.drawGraphAndOutput(fileName: aggOutputDirectory+fileName,
-                                     renderer: agg_renderer)
-    verifyImage(name: fileName, renderer: .agg)
-    #endif
-    #if canImport(QuartzRenderer)
-    let quartz_renderer = QuartzRenderer()
-    try lineGraph.drawGraphAndOutput(fileName: coreGraphicsOutputDirectory+fileName,
-                                     renderer: quartz_renderer)
-    verifyImage(name: fileName, renderer: .coreGraphics)
-    #endif
+    try renderAndVerify(lineGraph, fileName: fileName)
   }
 }

Tests/SwiftPlotTests/Annotation/annotation-text.swift

@@ -29,21 +29,6 @@ extension AnnotationTests {
                                              size: 50.0,
                                              location: Point(300, 300)))
 
-    let svg_renderer = SVGRenderer()
-    try lineGraph.drawGraphAndOutput(fileName: svgOutputDirectory+fileName,
-                                     renderer: svg_renderer)
-    verifyImage(name: fileName, renderer: .svg)
-    #if canImport(AGGRenderer)
-    let agg_renderer = AGGRenderer()
-    try lineGraph.drawGraphAndOutput(fileName: aggOutputDirectory+fileName,
-                                     renderer: agg_renderer)
-    verifyImage(name: fileName, renderer: .agg)
-    #endif
-    #if canImport(QuartzRenderer)
-    let quartz_renderer = QuartzRenderer()
-    try lineGraph.drawGraphAndOutput(fileName: coreGraphicsOutputDirectory+fileName,
-                                     renderer: quartz_renderer)
-    verifyImage(name: fileName, renderer: .coreGraphics)
-    #endif
+    try renderAndVerify(lineGraph, fileName: fileName)
   }
 }

Tests/SwiftPlotTests/BarChart/barchart-hatched-backwardslash.swift

@@ -22,21 +22,6 @@ extension BarchartTests {
     barGraph.plotTitle = PlotTitle("HATCHED BAR CHART")
     barGraph.plotLabel = PlotLabel(xLabel: "X-AXIS", yLabel: "Y-AXIS")
 
-    let svg_renderer = SVGRenderer()
-    try barGraph.drawGraphAndOutput(fileName: svgOutputDirectory+fileName,
-                                    renderer: svg_renderer)
-    verifyImage(name: fileName, renderer: .svg)
-    #if canImport(AGGRenderer)
-    let agg_renderer = AGGRenderer()
-    try barGraph.drawGraphAndOutput(fileName: aggOutputDirectory+fileName,
-                                    renderer: agg_renderer)
-    verifyImage(name: fileName, renderer: .agg)
-    #endif
-    #if canImport(QuartzRenderer)
-    let quartz_renderer = QuartzRenderer()
-    try barGraph.drawGraphAndOutput(fileName: coreGraphicsOutputDirectory+fileName,
-                                    renderer: quartz_renderer)
-    verifyImage(name: fileName, renderer: .coreGraphics)
-    #endif
+    try renderAndVerify(barGraph, fileName: fileName)
   }
 }

Tests/SwiftPlotTests/BarChart/barchart-hatched-cross.swift

@@ -24,21 +24,6 @@ extension BarchartTests {
     barGraph.plotTitle = PlotTitle("HATCHED BAR CHART")
     barGraph.plotLabel = PlotLabel(xLabel: "X-AXIS", yLabel: "Y-AXIS")
 
-    let svg_renderer = SVGRenderer()
-    try barGraph.drawGraphAndOutput(fileName: svgOutputDirectory+fileName,
-                                    renderer: svg_renderer)
-    verifyImage(name: fileName, renderer: .svg)
-    #if canImport(AGGRenderer)
-    let agg_renderer = AGGRenderer()
-    try barGraph.drawGraphAndOutput(fileName: aggOutputDirectory+fileName,
-                                    renderer: agg_renderer)
-    verifyImage(name: fileName, renderer: .agg)
-    #endif
-    #if canImport(QuartzRenderer)
-    let quartz_renderer = QuartzRenderer()
-    try barGraph.drawGraphAndOutput(fileName: coreGraphicsOutputDirectory+fileName,
-                                    renderer: quartz_renderer)
-    verifyImage(name: fileName, renderer: .coreGraphics)
-    #endif
+    try renderAndVerify(barGraph, fileName: fileName)
   }
 }

Tests/SwiftPlotTests/BarChart/barchart-hatched-filledcircle.swift

@@ -22,21 +22,6 @@ extension BarchartTests {
     barGraph.plotTitle = PlotTitle("HATCHED BAR CHART")
     barGraph.plotLabel = PlotLabel(xLabel: "X-AXIS", yLabel: "Y-AXIS")
 
-    let svg_renderer = SVGRenderer()
-    try barGraph.drawGraphAndOutput(fileName: svgOutputDirectory+fileName,
-                                    renderer: svg_renderer)
-    verifyImage(name: fileName, renderer: .svg)
-    #if canImport(AGGRenderer)
-    let agg_renderer = AGGRenderer()
-    try barGraph.drawGraphAndOutput(fileName: aggOutputDirectory+fileName,
-                                    renderer: agg_renderer)
-    verifyImage(name: fileName, renderer: .agg)
-    #endif
-    #if canImport(QuartzRenderer)
-    let quartz_renderer = QuartzRenderer()
-    try barGraph.drawGraphAndOutput(fileName: coreGraphicsOutputDirectory+fileName,
-                                    renderer: quartz_renderer)
-    verifyImage(name: fileName, renderer: .coreGraphics)
-    #endif
+    try renderAndVerify(barGraph, fileName: fileName)
   }
 }

Tests/SwiftPlotTests/BarChart/barchart-hatched-forwardsslash.swift

@@ -22,21 +22,6 @@ extension BarchartTests {
     barGraph.plotTitle = PlotTitle("HATCHED BAR CHART")
     barGraph.plotLabel = PlotLabel(xLabel: "X-AXIS", yLabel: "Y-AXIS")
 
-    let svg_renderer = SVGRenderer()
-    try barGraph.drawGraphAndOutput(fileName: svgOutputDirectory+fileName,
-                                    renderer: svg_renderer)
-    verifyImage(name: fileName, renderer: .svg)
-    #if canImport(AGGRenderer)
-    let agg_renderer = AGGRenderer()
-    try barGraph.drawGraphAndOutput(fileName: aggOutputDirectory+fileName,
-                                    renderer: agg_renderer)
-    verifyImage(name: fileName, renderer: .agg)
-    #endif
-    #if canImport(QuartzRenderer)
-    let quartz_renderer = QuartzRenderer()
-    try barGraph.drawGraphAndOutput(fileName: coreGraphicsOutputDirectory+fileName,
-                                    renderer: quartz_renderer)
-    verifyImage(name: fileName, renderer: .coreGraphics)
-    #endif
+    try renderAndVerify(barGraph, fileName: fileName)
   }
 }

Tests/SwiftPlotTests/BarChart/barchart-hatched-grid.swift

@@ -22,21 +22,6 @@ extension BarchartTests {
     barGraph.plotTitle = PlotTitle("HATCHED BAR CHART")
     barGraph.plotLabel = PlotLabel(xLabel: "X-AXIS", yLabel: "Y-AXIS")
 
-    let svg_renderer = SVGRenderer()
-    try barGraph.drawGraphAndOutput(fileName: svgOutputDirectory+fileName,
-                                    renderer: svg_renderer)
-    verifyImage(name: fileName, renderer: .svg)
-    #if canImport(AGGRenderer)
-    let agg_renderer = AGGRenderer()
-    try barGraph.drawGraphAndOutput(fileName: aggOutputDirectory+fileName,
-                                    renderer: agg_renderer)
-    verifyImage(name: fileName, renderer: .agg)
-    #endif
-    #if canImport(QuartzRenderer)
-    let quartz_renderer = QuartzRenderer()
-    try barGraph.drawGraphAndOutput(fileName: coreGraphicsOutputDirectory+fileName,
-                                    renderer: quartz_renderer)
-    verifyImage(name: fileName, renderer: .coreGraphics)
-    #endif
+    try renderAndVerify(barGraph, fileName: fileName)
   }
 }

Tests/SwiftPlotTests/BarChart/barchart-hatched-hollowcircle.swift

@@ -22,21 +22,6 @@ extension BarchartTests {
     barGraph.plotTitle = PlotTitle("HATCHED BAR CHART")
     barGraph.plotLabel = PlotLabel(xLabel: "X-AXIS", yLabel: "Y-AXIS")
 
-    let svg_renderer = SVGRenderer()
-    try barGraph.drawGraphAndOutput(fileName: svgOutputDirectory+fileName,
-                                    renderer: svg_renderer)
-    verifyImage(name: fileName, renderer: .svg)
-    #if canImport(AGGRenderer)
-    let agg_renderer = AGGRenderer()
-    try barGraph.drawGraphAndOutput(fileName: aggOutputDirectory+fileName,
-                                    renderer: agg_renderer)
-    verifyImage(name: fileName, renderer: .agg)
-    #endif
-    #if canImport(QuartzRenderer)
-    let quartz_renderer = QuartzRenderer()
-    try barGraph.drawGraphAndOutput(fileName: coreGraphicsOutputDirectory+fileName,
-                                    renderer: quartz_renderer)
-    verifyImage(name: fileName, renderer: .coreGraphics)
-    #endif
+    try renderAndVerify(barGraph, fileName: fileName)
   }
 }

Tests/SwiftPlotTests/BarChart/barchart-hatched-horizontal.swift

@@ -22,21 +22,6 @@ extension BarchartTests {
     barGraph.plotTitle = PlotTitle("HATCHED BAR CHART")
     barGraph.plotLabel = PlotLabel(xLabel: "X-AXIS", yLabel: "Y-AXIS")
 
-    let svg_renderer = SVGRenderer()
-    try barGraph.drawGraphAndOutput(fileName: svgOutputDirectory+fileName,
-                                    renderer: svg_renderer)
-    verifyImage(name: fileName, renderer: .svg)
-    #if canImport(AGGRenderer)
-    let agg_renderer = AGGRenderer()
-    try barGraph.drawGraphAndOutput(fileName: aggOutputDirectory+fileName,
-                                    renderer: agg_renderer)
-    verifyImage(name: fileName, renderer: .agg)
-    #endif
-    #if canImport(QuartzRenderer)
-    let quartz_renderer = QuartzRenderer()
-    try barGraph.drawGraphAndOutput(fileName: coreGraphicsOutputDirectory+fileName,
-                                    renderer: quartz_renderer)
-    verifyImage(name: fileName, renderer: .coreGraphics)
-    #endif
+    try renderAndVerify(barGraph, fileName: fileName)
   }
 }

Tests/SwiftPlotTests/BarChart/barchart-hatched-vertical.swift

@@ -22,21 +22,6 @@ extension BarchartTests {
     barGraph.plotTitle = PlotTitle("HATCHED BAR CHART")
     barGraph.plotLabel = PlotLabel(xLabel: "X-AXIS", yLabel: "Y-AXIS")
 
-    let svg_renderer = SVGRenderer()
-    try barGraph.drawGraphAndOutput(fileName: svgOutputDirectory+fileName,
-                                    renderer: svg_renderer)
-    verifyImage(name: fileName, renderer: .svg)
-    #if canImport(AGGRenderer)
-    let agg_renderer = AGGRenderer()
-    try barGraph.drawGraphAndOutput(fileName: aggOutputDirectory+fileName,
-                                    renderer: agg_renderer)
-    verifyImage(name: fileName, renderer: .agg)
-    #endif
-    #if canImport(QuartzRenderer)
-    let quartz_renderer = QuartzRenderer()
-    try barGraph.drawGraphAndOutput(fileName: coreGraphicsOutputDirectory+fileName,
-                                    renderer: quartz_renderer)
-    verifyImage(name: fileName, renderer: .coreGraphics)
-    #endif
+    try renderAndVerify(barGraph, fileName: fileName)
   }
 }

Tests/SwiftPlotTests/BarChart/barchart-orientation-horizontal.swift

@@ -22,21 +22,6 @@ extension BarchartTests {
     barGraph.plotTitle = PlotTitle("BAR CHART")
     barGraph.plotLabel = PlotLabel(xLabel: "X-AXIS", yLabel: "Y-AXIS")
 
-    let svg_renderer = SVGRenderer()
-    try barGraph.drawGraphAndOutput(fileName: svgOutputDirectory+fileName,
-                                    renderer: svg_renderer)
-    verifyImage(name: fileName, renderer: .svg)
-    #if canImport(AGGRenderer)
-    let agg_renderer = AGGRenderer()
-    try barGraph.drawGraphAndOutput(fileName: aggOutputDirectory+fileName,
-                                    renderer: agg_renderer)
-    verifyImage(name: fileName, renderer: .agg)
-    #endif
-    #if canImport(QuartzRenderer)
-    let quartz_renderer = QuartzRenderer()
-    try barGraph.drawGraphAndOutput(fileName: coreGraphicsOutputDirectory+fileName,
-                                    renderer: quartz_renderer)
-    verifyImage(name: fileName, renderer: .coreGraphics)
-    #endif
+    try renderAndVerify(barGraph, fileName: fileName)
   }
 }

Tests/SwiftPlotTests/BarChart/barchart-stacked-horizontal.swift

@@ -24,21 +24,6 @@ extension BarchartTests {
     barGraph.plotTitle = PlotTitle("BAR CHART")
     barGraph.plotLabel = PlotLabel(xLabel: "X-AXIS", yLabel: "Y-AXIS")
 
-    let svg_renderer = SVGRenderer()
-    try barGraph.drawGraphAndOutput(fileName: svgOutputDirectory+fileName,
-                                    renderer: svg_renderer)
-    verifyImage(name: fileName, renderer: .svg)
-    #if canImport(AGGRenderer)
-    let agg_renderer = AGGRenderer()
-    try barGraph.drawGraphAndOutput(fileName: aggOutputDirectory+fileName,
-                                    renderer: agg_renderer)
-    verifyImage(name: fileName, renderer: .agg)
-    #endif
-    #if canImport(QuartzRenderer)
-    let quartz_renderer = QuartzRenderer()
-    try barGraph.drawGraphAndOutput(fileName: coreGraphicsOutputDirectory+fileName,
-                                    renderer: quartz_renderer)
-    verifyImage(name: fileName, renderer: .coreGraphics)
-    #endif
+    try renderAndVerify(barGraph, fileName: fileName)
   }
 }

Tests/SwiftPlotTests/BarChart/barchart-stacked-vertical.swift

@@ -24,21 +24,6 @@ extension BarchartTests {
     barGraph.plotTitle = PlotTitle("BAR CHART")
     barGraph.plotLabel = PlotLabel(xLabel: "X-AXIS", yLabel: "Y-AXIS")
 
-    let svg_renderer = SVGRenderer()
-    try barGraph.drawGraphAndOutput(fileName: svgOutputDirectory+fileName,
-                                    renderer: svg_renderer)
-    verifyImage(name: fileName, renderer: .svg)
-    #if canImport(AGGRenderer)
-    let agg_renderer = AGGRenderer()
-    try barGraph.drawGraphAndOutput(fileName: aggOutputDirectory+fileName,
-                                    renderer: agg_renderer)
-    verifyImage(name: fileName, renderer: .agg)
-    #endif
-    #if canImport(QuartzRenderer)
-    let quartz_renderer = QuartzRenderer()
-    try barGraph.drawGraphAndOutput(fileName: coreGraphicsOutputDirectory+fileName,
-                                    renderer: quartz_renderer)
-    verifyImage(name: fileName, renderer: .coreGraphics)
-    #endif
+    try renderAndVerify(barGraph, fileName: fileName)
   }
 }