updated unit tests

ChartsOrg · Nov 10, 2016 · 56a8712 · 56a8712
1 parent fbba515
commit 56a8712
Show file tree

Hide file tree

Showing 53 changed files with 55 additions and 6 deletions.
diff --git a/Charts.xcodeproj/project.pbxproj b/Charts.xcodeproj/project.pbxproj
@@ -160,6 +160,7 @@
 		06B3C0F81D99F85400B1DF43 /* LineChartTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B3C0F41D99F85400B1DF43 /* LineChartTests.swift */; };
 		06B3C0F91D99F85400B1DF43 /* ChartsRealmTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B3C0F61D99F85400B1DF43 /* ChartsRealmTest.swift */; };
 		5B56A9CD1D905EB300F58178 /* Description.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B56A9CC1D905EB300F58178 /* Description.swift */; };
+		D8A58A411DCE2EF8007BB012 /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D8A58A401DCE2EF8007BB012 /* Media.xcassets */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -337,6 +338,7 @@
 		06B3C0F41D99F85400B1DF43 /* LineChartTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LineChartTests.swift; sourceTree = "<group>"; };
 		06B3C0F61D99F85400B1DF43 /* ChartsRealmTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartsRealmTest.swift; sourceTree = "<group>"; };
 		5B56A9CC1D905EB300F58178 /* Description.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Description.swift; sourceTree = "<group>"; };
+		D8A58A401DCE2EF8007BB012 /* Media.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Media.xcassets; path = Charts/ChartsTests/Media.xcassets; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -737,6 +739,7 @@
 			isa = PBXGroup;
 			children = (
 				06B121111D81201C00D14B02 /* Info.plist */,
+				D8A58A401DCE2EF8007BB012 /* Media.xcassets */,
 			);
 			name = "Supporting Files";
 			sourceTree = "<group>";
@@ -891,6 +894,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				D8A58A411DCE2EF8007BB012 /* Media.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/Charts/ChartsTests/Media.xcassets/Contents.json b/Charts/ChartsTests/Media.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Charts/ChartsTests/Media.xcassets/icon.imageset/Contents.json b/Charts/ChartsTests/Media.xcassets/icon.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "star-2.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "star-1.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "star.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/Charts/ChartsTests/Media.xcassets/icon.imageset/star-1.png b/Charts/ChartsTests/Media.xcassets/icon.imageset/star-1.png
diff --git a/Charts/ChartsTests/Media.xcassets/icon.imageset/star-2.png b/Charts/ChartsTests/Media.xcassets/icon.imageset/star-2.png
diff --git a/Charts/ChartsTests/Media.xcassets/icon.imageset/star.png b/Charts/ChartsTests/Media.xcassets/icon.imageset/star.png
diff --git a/Source/Charts/Utils/ChartUtils.swift b/Source/Charts/Utils/ChartUtils.swift
@@ -95,10 +95,10 @@ open class ChartUtils
             image.draw(in: CGRect(origin: CGPoint(x: 0, y: 0), size: expectedSize))
             let scaledImage = NSUIGraphicsGetImageFromCurrentImageContext()
             NSUIGraphicsEndImageContext()
-            scaledImage?.draw(at: drawOffset)
+            scaledImage?.draw(in: CGRect(origin: point, size: expectedSize))
         }
         else {
-            image.draw(at: drawOffset)
+            image.draw(in: CGRect(origin: point, size: expectedSize))
         }
 
         NSUIGraphicsPopContext()

diff --git a/Tests/Charts/BarChartTests.swift b/Tests/Charts/BarChartTests.swift
@@ -24,11 +24,13 @@ class BarChartTests: FBSnapshotTestCase
 
         for (i, value) in values.enumerated()
         {
-            entries.append(BarChartDataEntry(x: Double(i), y: value))
+            entries.append(BarChartDataEntry(x: Double(i), y: value, data: UIImage(named: "icon", in: Bundle(for: self.classForCoder), compatibleWith: nil)))
         }
 
         dataSet = BarChartDataSet(values: entries, label: "Bar chart unit test data")
-
+        dataSet.drawIconsEnabled = false
+        dataSet.iconsOffset = CGSize(width: 0, height: -10.0)
+
         let data = BarChartData(dataSet: dataSet)
         data.barWidth = 0.85
 
@@ -80,4 +82,10 @@ class BarChartTests: FBSnapshotTestCase
         chart.xAxis.drawGridLinesEnabled = false
         FBSnapshotVerifyView(chart)
     }
+
+    func testDrawIcons()
+    {
+        dataSet.drawIconsEnabled = true
+        FBSnapshotVerifyView(chart)
+    }
 }
diff --git a/Tests/Charts/LineChartTests.swift b/Tests/Charts/LineChartTests.swift
@@ -24,11 +24,13 @@ class LineChartTests: FBSnapshotTestCase
 
         for (i, value) in values.enumerated()
         {
-            entries.append(ChartDataEntry(x: Double(i), y: value))
+            entries.append(ChartDataEntry(x: Double(i), y: value, data: UIImage(named: "icon", in: Bundle(for: self.classForCoder), compatibleWith: nil)))
         }
 
         dataSet = LineChartDataSet(values: entries, label: "First unit test data")
-
+        dataSet.drawIconsEnabled = false
+        dataSet.iconsOffset = CGSize(width: 0, height: 20.0)
+
         chart = LineChartView(frame: CGRect(x: 0, y: 0, width: 480, height: 350))
         chart.backgroundColor = NSUIColor.clear
         chart.leftAxis.axisMinimum = 0.0
@@ -70,4 +72,10 @@ class LineChartTests: FBSnapshotTestCase
         dataSet.drawCircleHoleEnabled = false
         FBSnapshotVerifyView(chart)
     }
+
+    func testDrawIcons()
+    {
+        dataSet.drawIconsEnabled = true
+        FBSnapshotVerifyView(chart)
+    }
 }
diff --git a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testDefaultValues.png b/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testDefaultValues.png
diff --git a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testDefaultValues@2x.png b/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testDefaultValues@2x.png
diff --git a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testDrawIcons.png b/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testDrawIcons.png
diff --git a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testDrawIcons@2x.png b/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testDrawIcons@2x.png
diff --git a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideHorizontalGridlines.png b/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideHorizontalGridlines.png
diff --git a/...ReferenceImages_32/ChartsTests.BarChartTests/testHideHorizontalGridlines@2x.png b/...ReferenceImages_32/ChartsTests.BarChartTests/testHideHorizontalGridlines@2x.png
diff --git a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideLeftAxis.png b/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideLeftAxis.png
diff --git a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideLeftAxis@2x.png b/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideLeftAxis@2x.png
diff --git a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideRightAxis.png b/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideRightAxis.png
diff --git a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideRightAxis@2x.png b/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideRightAxis@2x.png
diff --git a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideVerticalGridlines.png b/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHideVerticalGridlines.png
diff --git a/...s/ReferenceImages_32/ChartsTests.BarChartTests/testHideVerticalGridlines@2x.png b/...s/ReferenceImages_32/ChartsTests.BarChartTests/testHideVerticalGridlines@2x.png
diff --git a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHidesValues.png b/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHidesValues.png
diff --git a/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHidesValues@2x.png b/Tests/ReferenceImages_32/ChartsTests.BarChartTests/testHidesValues@2x.png
diff --git a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDefaultValues.png b/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDefaultValues.png
diff --git a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDefaultValues@2x.png b/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDefaultValues@2x.png
diff --git a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDoesntDrawCircleHole.png b/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDoesntDrawCircleHole.png
diff --git a/...s/ReferenceImages_32/ChartsTests.LineChartTests/testDoesntDrawCircleHole@2x.png b/...s/ReferenceImages_32/ChartsTests.LineChartTests/testDoesntDrawCircleHole@2x.png
diff --git a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDoesntDrawCircles.png b/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDoesntDrawCircles.png
diff --git a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDoesntDrawCircles@2x.png b/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDoesntDrawCircles@2x.png
diff --git a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDrawIcons.png b/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDrawIcons.png
diff --git a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDrawIcons@2x.png b/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testDrawIcons@2x.png
diff --git a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testHidesValues.png b/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testHidesValues.png
diff --git a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testHidesValues@2x.png b/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testHidesValues@2x.png
diff --git a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testIsCubic.png b/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testIsCubic.png
diff --git a/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testIsCubic@2x.png b/Tests/ReferenceImages_32/ChartsTests.LineChartTests/testIsCubic@2x.png
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDrawIcons.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDrawIcons.png
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDrawIcons@2x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDrawIcons@2x.png
diff --git a/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDrawIcons@3x.png b/Tests/ReferenceImages_64/ChartsTests.BarChartTests/testDrawIcons@3x.png
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDefaultValues.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDefaultValues.png
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDefaultValues@2x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDefaultValues@2x.png
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDefaultValues@3x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDefaultValues@3x.png
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircleHole.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircleHole.png
diff --git a/...s/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircleHole@2x.png b/...s/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircleHole@2x.png
diff --git a/...s/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircleHole@3x.png b/...s/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircleHole@3x.png
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircles.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircles.png
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircles@2x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircles@2x.png
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircles@3x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDoesntDrawCircles@3x.png
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDrawIcons.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDrawIcons.png
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDrawIcons@2x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDrawIcons@2x.png
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDrawIcons@3x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testDrawIcons@3x.png
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testIsCubic.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testIsCubic.png
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testIsCubic@2x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testIsCubic@2x.png
diff --git a/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testIsCubic@3x.png b/Tests/ReferenceImages_64/ChartsTests.LineChartTests/testIsCubic@3x.png