Fixing Test Resources

swhitty · swhitty · commit fb4322ca02cf · 2022-02-26T10:56:49.000+11:00
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.0
+// swift-tools-version:5.4
 
 import PackageDescription
 
@@ -29,7 +29,10 @@ let package = Package(
         .testTarget(
             name: "SwiftDrawTests",
             dependencies: ["SwiftDraw"],
-            path: "SwiftDrawTests"
+            path: "SwiftDrawTests",
+            resources: [
+                .process("Resources")
+            ]
 		)
     ]
 )
diff --git a/SwiftDraw.xcodeproj/project.pbxproj b/SwiftDraw.xcodeproj/project.pbxproj
@@ -177,12 +177,9 @@
 		D93BAB9121AD21E4005ADFBE /* Renderer.LayerTreeProviderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D93BAB8F21AD21E4005ADFBE /* Renderer.LayerTreeProviderTests.swift */; };
 		D93BAB9421AD5517005ADFBE /* NSImage+ImageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D93BAB9221AD5517005ADFBE /* NSImage+ImageTests.swift */; };
 		D93BAB9621AD56FC005ADFBE /* UIImage+ImageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D93BAB9521AD56FC005ADFBE /* UIImage+ImageTests.swift */; };
-		D9494F49224C9AF60015ACE1 /* gradient.svg in Resources */ = {isa = PBXBuildFile; fileRef = D9494F47224C9AF30015ACE1 /* gradient.svg */; };
 		D9494F4A224C9AF60015ACE1 /* gradient.svg in Resources */ = {isa = PBXBuildFile; fileRef = D9494F47224C9AF30015ACE1 /* gradient.svg */; };
 		D962D2761E6ECD5C00B825C6 /* SwiftDraw.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D962D26D1E6ECD5C00B825C6 /* SwiftDraw.framework */; };
 		D962D2A21E6ECE2000B825C6 /* SwiftDraw-macOS.h in Headers */ = {isa = PBXBuildFile; fileRef = D962D2A11E6ECE2000B825C6 /* SwiftDraw-macOS.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		D965B5821E3C48C6003E859E /* shapes.svg in Resources */ = {isa = PBXBuildFile; fileRef = D965B5811E3C48C6003E859E /* shapes.svg */; };
-		D965B5871E3C5CF8003E859E /* starry.svg in Resources */ = {isa = PBXBuildFile; fileRef = D965B5851E3C5C87003E859E /* starry.svg */; };
 		D9693D7E224C42C000A82949 /* CGPattern+Closure.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9693D7D224C42C000A82949 /* CGPattern+Closure.swift */; };
 		D9693D7F224C42C000A82949 /* CGPattern+Closure.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9693D7D224C42C000A82949 /* CGPattern+Closure.swift */; };
 		D96E22FB21C2690D00CCD17E /* LayerTree.CommandGeneratorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D96E22FA21C2690D00CCD17E /* LayerTree.CommandGeneratorTests.swift */; };
@@ -192,9 +189,13 @@
 		D97AD81A21BE40A700F7DD10 /* Parser.XML.GradientTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D97AD81921BE40A700F7DD10 /* Parser.XML.GradientTests.swift */; };
 		D97AD81B21BE40A700F7DD10 /* Parser.XML.GradientTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D97AD81921BE40A700F7DD10 /* Parser.XML.GradientTests.swift */; };
 		D97C36582212194F006D28D2 /* LayerTree.Builder.Path.Arc.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9ACD7A4220FDF79009717CF /* LayerTree.Builder.Path.Arc.swift */; };
-		D9A843931E85F1C1002A804B /* quad.svg in Resources */ = {isa = PBXBuildFile; fileRef = D9A843921E85F1C1002A804B /* quad.svg */; };
+		D9A4E19227C9A42B008F69ED /* curves.svg in Resources */ = {isa = PBXBuildFile; fileRef = D9A4E18C27C9A42B008F69ED /* curves.svg */; };
+		D9A4E19327C9A42B008F69ED /* shapes.svg in Resources */ = {isa = PBXBuildFile; fileRef = D9A4E18D27C9A42B008F69ED /* shapes.svg */; };
+		D9A4E19427C9A42B008F69ED /* lines.svg in Resources */ = {isa = PBXBuildFile; fileRef = D9A4E18E27C9A42B008F69ED /* lines.svg */; };
+		D9A4E19527C9A42B008F69ED /* starry.svg in Resources */ = {isa = PBXBuildFile; fileRef = D9A4E18F27C9A42B008F69ED /* starry.svg */; };
+		D9A4E19627C9A42B008F69ED /* quad.svg in Resources */ = {isa = PBXBuildFile; fileRef = D9A4E19027C9A42B008F69ED /* quad.svg */; };
+		D9A4E19727C9A42B008F69ED /* invalid.svg in Resources */ = {isa = PBXBuildFile; fileRef = D9A4E19127C9A42B008F69ED /* invalid.svg */; };
 		D9A843941E85F1C1002A804B /* quad.svg in Resources */ = {isa = PBXBuildFile; fileRef = D9A843921E85F1C1002A804B /* quad.svg */; };
-		D9A843951E8611D6002A804B /* curves.svg in Resources */ = {isa = PBXBuildFile; fileRef = D9A843901E855672002A804B /* curves.svg */; };
 		D9A843961E8611D7002A804B /* curves.svg in Resources */ = {isa = PBXBuildFile; fileRef = D9A843901E855672002A804B /* curves.svg */; };
 		D9ACD7A5220FDF79009717CF /* LayerTree.Builder.Path.Arc.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9ACD7A4220FDF79009717CF /* LayerTree.Builder.Path.Arc.swift */; };
 		D9B75C82224C9F0200C6BEE7 /* LayerTree.Gradient.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9B75C81224C9F0200C6BEE7 /* LayerTree.Gradient.swift */; };
@@ -206,11 +207,8 @@
 		D9BA810921BA94A4005159E7 /* CommandLine.ConfigurationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9BA810821BA94A4005159E7 /* CommandLine.ConfigurationTests.swift */; };
 		D9BEDC3F2250CBBC00F51648 /* CGImage+Mask.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9BEDC3E2250CBBC00F51648 /* CGImage+Mask.swift */; };
 		D9BEDC402250CBBE00F51648 /* CGImage+Mask.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9BEDC3E2250CBBC00F51648 /* CGImage+Mask.swift */; };
-		D9C47AC21ED54FA100178D06 /* mask.svg in Resources */ = {isa = PBXBuildFile; fileRef = D9C47ABF1ED54FA100178D06 /* mask.svg */; };
 		D9C47AC31ED54FA100178D06 /* mask.svg in Resources */ = {isa = PBXBuildFile; fileRef = D9C47ABF1ED54FA100178D06 /* mask.svg */; };
-		D9C47AC41ED54FA100178D06 /* transform.svg in Resources */ = {isa = PBXBuildFile; fileRef = D9C47AC01ED54FA100178D06 /* transform.svg */; };
 		D9C47AC51ED54FA100178D06 /* transform.svg in Resources */ = {isa = PBXBuildFile; fileRef = D9C47AC01ED54FA100178D06 /* transform.svg */; };
-		D9C47AC61ED54FA100178D06 /* viewbox.svg in Resources */ = {isa = PBXBuildFile; fileRef = D9C47AC11ED54FA100178D06 /* viewbox.svg */; };
 		D9C47AC71ED54FA100178D06 /* viewbox.svg in Resources */ = {isa = PBXBuildFile; fileRef = D9C47AC11ED54FA100178D06 /* viewbox.svg */; };
 		D9D9EB27224A3B4F006CF83C /* DOM.Pattern.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9D9EB26224A3B4F006CF83C /* DOM.Pattern.swift */; };
 		D9D9EB28224A3B4F006CF83C /* DOM.Pattern.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9D9EB26224A3B4F006CF83C /* DOM.Pattern.swift */; };
@@ -219,7 +217,6 @@
 		D9D9EB32224A3E7D006CF83C /* Parser.XML.PatternTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9D9EB31224A3E7D006CF83C /* Parser.XML.PatternTests.swift */; };
 		D9D9EB33224A3E7D006CF83C /* Parser.XML.PatternTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9D9EB31224A3E7D006CF83C /* Parser.XML.PatternTests.swift */; };
 		D9D9EB34224A4660006CF83C /* pattern.svg in Resources */ = {isa = PBXBuildFile; fileRef = D9D9EB29224A3BA9006CF83C /* pattern.svg */; };
-		D9D9EB35224A4661006CF83C /* pattern.svg in Resources */ = {isa = PBXBuildFile; fileRef = D9D9EB29224A3BA9006CF83C /* pattern.svg */; };
 		D9D9EB37224AD524006CF83C /* LayerTree.Pattern.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9D9EB36224AD524006CF83C /* LayerTree.Pattern.swift */; };
 		D9D9EB38224AD524006CF83C /* LayerTree.Pattern.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9D9EB36224AD524006CF83C /* LayerTree.Pattern.swift */; };
 		D9ECAF9821AADA00006A5328 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9CFB5D021A73E84000D2875 /* main.swift */; };
@@ -234,9 +231,7 @@
 		D9F3AD5F21A218CF00BAFA55 /* ImageTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9F3AD5D21A218CF00BAFA55 /* ImageTests.swift */; };
 		D9F3AD6121A21B7800BAFA55 /* Bundle+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9F3AD6021A21B7800BAFA55 /* Bundle+Extensions.swift */; };
 		D9F3AD6221A21B7800BAFA55 /* Bundle+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9F3AD6021A21B7800BAFA55 /* Bundle+Extensions.swift */; };
-		D9F3AD6421A21CD200BAFA55 /* invalid.svg in Resources */ = {isa = PBXBuildFile; fileRef = D9F3AD6321A21CD100BAFA55 /* invalid.svg */; };
 		D9F3AD6521A21CD200BAFA55 /* invalid.svg in Resources */ = {isa = PBXBuildFile; fileRef = D9F3AD6321A21CD100BAFA55 /* invalid.svg */; };
-		D9F3AD6721A2A73F00BAFA55 /* lines.svg in Resources */ = {isa = PBXBuildFile; fileRef = D9F3AD6621A2A73F00BAFA55 /* lines.svg */; };
 		D9F3AD6821A2A73F00BAFA55 /* lines.svg in Resources */ = {isa = PBXBuildFile; fileRef = D9F3AD6621A2A73F00BAFA55 /* lines.svg */; };
 		D9F3EBBB1DFF5BA3006691A1 /* SwiftDraw.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D9F3EBB11DFF5BA3006691A1 /* SwiftDraw.framework */; };
 		D9F3EBC21DFF5BA3006691A1 /* SwiftDraw.h in Headers */ = {isa = PBXBuildFile; fileRef = D9F3EBB41DFF5BA3006691A1 /* SwiftDraw.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -371,6 +366,12 @@
 		D9693D7D224C42C000A82949 /* CGPattern+Closure.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CGPattern+Closure.swift"; sourceTree = "<group>"; };
 		D96E22FA21C2690D00CCD17E /* LayerTree.CommandGeneratorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LayerTree.CommandGeneratorTests.swift; sourceTree = "<group>"; };
 		D97AD81921BE40A700F7DD10 /* Parser.XML.GradientTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Parser.XML.GradientTests.swift; sourceTree = "<group>"; };
+		D9A4E18C27C9A42B008F69ED /* curves.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = curves.svg; sourceTree = "<group>"; };
+		D9A4E18D27C9A42B008F69ED /* shapes.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = shapes.svg; sourceTree = "<group>"; };
+		D9A4E18E27C9A42B008F69ED /* lines.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = lines.svg; sourceTree = "<group>"; };
+		D9A4E18F27C9A42B008F69ED /* starry.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = starry.svg; sourceTree = "<group>"; };
+		D9A4E19027C9A42B008F69ED /* quad.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = quad.svg; sourceTree = "<group>"; };
+		D9A4E19127C9A42B008F69ED /* invalid.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = invalid.svg; sourceTree = "<group>"; };
 		D9A843901E855672002A804B /* curves.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = curves.svg; sourceTree = "<group>"; };
 		D9A843921E85F1C1002A804B /* quad.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = quad.svg; sourceTree = "<group>"; };
 		D9ACD7A4220FDF79009717CF /* LayerTree.Builder.Path.Arc.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LayerTree.Builder.Path.Arc.swift; sourceTree = "<group>"; };
@@ -697,6 +698,19 @@
 			path = Samples;
 			sourceTree = "<group>";
 		};
+		D9A4E18B27C9A42B008F69ED /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				D9A4E18C27C9A42B008F69ED /* curves.svg */,
+				D9A4E18D27C9A42B008F69ED /* shapes.svg */,
+				D9A4E18E27C9A42B008F69ED /* lines.svg */,
+				D9A4E18F27C9A42B008F69ED /* starry.svg */,
+				D9A4E19027C9A42B008F69ED /* quad.svg */,
+				D9A4E19127C9A42B008F69ED /* invalid.svg */,
+			);
+			path = Resources;
+			sourceTree = "<group>";
+		};
 		D9BA80FE21B9C5C1005159E7 /* CommandLine */ = {
 			isa = PBXGroup;
 			children = (
@@ -786,6 +800,7 @@
 		D9F3EBBE1DFF5BA3006691A1 /* SwiftDrawTests */ = {
 			isa = PBXGroup;
 			children = (
+				D9A4E18B27C9A42B008F69ED /* Resources */,
 				D9BA810321B9C645005159E7 /* CommandLine */,
 				D90DB3F2219CCF1A00D374D2 /* Extensions */,
 				D9F3AD5C21A2172800BAFA55 /* Image */,
@@ -1004,17 +1019,12 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D9F3AD6421A21CD200BAFA55 /* invalid.svg in Resources */,
-				D9C47AC61ED54FA100178D06 /* viewbox.svg in Resources */,
-				D9F3AD6721A2A73F00BAFA55 /* lines.svg in Resources */,
-				D9A843951E8611D6002A804B /* curves.svg in Resources */,
-				D965B5821E3C48C6003E859E /* shapes.svg in Resources */,
-				D9494F49224C9AF60015ACE1 /* gradient.svg in Resources */,
-				D9C47AC21ED54FA100178D06 /* mask.svg in Resources */,
-				D9A843931E85F1C1002A804B /* quad.svg in Resources */,
-				D965B5871E3C5CF8003E859E /* starry.svg in Resources */,
-				D9C47AC41ED54FA100178D06 /* transform.svg in Resources */,
-				D9D9EB35224A4661006CF83C /* pattern.svg in Resources */,
+				D9A4E19327C9A42B008F69ED /* shapes.svg in Resources */,
+				D9A4E19527C9A42B008F69ED /* starry.svg in Resources */,
+				D9A4E19727C9A42B008F69ED /* invalid.svg in Resources */,
+				D9A4E19627C9A42B008F69ED /* quad.svg in Resources */,
+				D9A4E19227C9A42B008F69ED /* curves.svg in Resources */,
+				D9A4E19427C9A42B008F69ED /* lines.svg in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/SwiftDrawTests/Bundle+Extensions.swift b/SwiftDrawTests/Bundle+Extensions.swift
@@ -35,7 +35,11 @@ import Foundation
 extension Bundle {
   
   static var test: Bundle {
-    return Bundle(for: Marker.self)
+#if SWIFT_PACKAGE
+      return .module
+#else
+      return Bundle(for: Marker.self)
+#endif
   }
   
   func url(forResource named: String) throws -> URL {
diff --git a/SwiftDrawTests/ParserSVGImageTests.swift b/SwiftDrawTests/ParserSVGImageTests.swift
@@ -35,10 +35,7 @@ import Foundation
 
 final class ParserSVGImageTests: XCTestCase {
   
-  func loadSVG(_ filename: String) -> DOM.SVG? {
-    
-    let bundle = Bundle(for: ParserSVGImageTests.self)
-    
+  func loadSVG(_ filename: String, in bundle: Bundle = .test) -> DOM.SVG? {
     guard let url = bundle.url(forResource: filename, withExtension: nil) else {
       return nil
     }
diff --git a/SwiftDrawTests/Resources/curves.svg b/SwiftDrawTests/Resources/curves.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:ns="http://www.w3.org/2000/svg" width="550" height="350" viewBox="0 0 550 350" >
+	  	
+	<g fill="none">
+
+    <path d="M100,300
+    		 q150,-100 300,0"
+			 stroke="black" stroke-width="15" />
+
+    <path d="M100,300
+    		 Q250, 200, 400, 300"
+    		 stroke="yellow" stroke-width="10"/>
+			 
+    <path d="M100,300
+    		 C200, 233.34, 300, 233.34 400, 300"
+    		 stroke="green" stroke-width="5"/>
+			 
+    <path d="M100,300
+    		 c100,-66.66, 200,-66.66 300,0"
+    		 stroke="white" stroke-width="2" />
+ 
+  	</g>
+	
+	<g fill="none">
+
+    <path d="M0,50
+    		 Q50,0 100,50 150,100, 200, 50 T300,50 400 50 500 50"
+			 stroke="black" stroke-width="15" />
+			 
+     <path d="M0,50
+     		 q50,-50 100,0 q50,50 100,0 t100,0 100 0 100 0"
+ 			 stroke="yellow" stroke-width="10" />
+	
+    <path d="M0,50
+    		 C33.34,16.667 66.666,16.667 100,50
+			 c 33.34,33.34, 66.666,33.34 100,0
+			 c 33.34,-33.34, 66.666,-33.34 100,0
+			 s 66.666, 33.34 100,0
+			 s 66.666, -33.34 100,0"
+			 stroke="green" stroke-width="5" />
+  	</g>
+	
+
+			 
+	<!--	 
+	 http://stackoverflow.com/questions/3162645/convert-a-quadratic-bezier-to-a-cubic
+	 
+	 Any quadratic spline can be expressed as a cubic (where the cubic term is zero). The end points of the cubic will be the same as the quadratic's.
+
+	 CP0 = QP0
+	 CP3 = QP2
+
+	 The two control points for the cubic are:
+
+	 CP1 = QP0 + 2/3 *(QP1-QP0)
+	 CP2 = QP2 + 2/3 *(QP1-QP2)
+
+	 ...There is a slight error introduced due to rounding, but it is unlikely to be noticeable.
+	 -->	  
+</svg>
+
+
diff --git a/SwiftDrawTests/Resources/invalid.svg b/SwiftDrawTests/Resources/invalid.svg
@@ -0,0 +1,3 @@
+<svg>
+	 <i am not a valid SVG Image>
+</svg>
diff --git a/SwiftDrawTests/Resources/lines.svg b/SwiftDrawTests/Resources/lines.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="100" height="100" stroke="black">
+	<line x1="0" y1="0" x2="100" y2="100" />
+	<line x1="100" y1="0" x2="0" y2="100" />
+</svg>
diff --git a/SwiftDrawTests/Resources/quad.svg b/SwiftDrawTests/Resources/quad.svg
@@ -0,0 +1,106 @@
+<?xml version="1.0"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:ns="http://www.w3.org/2000/svg" width="1000" height="500" viewBox="0 0 1000 500" >
+	  		
+			
+	<g fill="none">
+    		<path d="M0,50
+  				 q50,-50 200,0 t100,0"
+			 	 stroke="black" stroke-width="15" />
+			 
+		     <path d="M0,50
+					 c 33.33 ,-33.34, 100,-33.34 200,0
+		 			 c 100,33.34, 133.33,33.34 100,0"
+		 			
+		 			 stroke="yellowgreen" stroke-width="5" /> 
+  	</g>
+	
+	<g fill="none" transform="translate(400, 0)">
+    <path d="M0,50
+    		 t100,0 q50,-50 100,0 t100,0"
+			 stroke="black" stroke-width="15" />
+			 
+		     <path d="M0,50
+		     		 l100,0
+					 c 33.33 ,-33.34, 66.66,-33.34 100,0
+		 			 c 33.34,33.34, 66.666,33.34 100,0"
+		 			
+		 			 stroke="pink" stroke-width="5" /> 
+  	</g>
+	
+	<g fill="none" transform="translate(0, 100)">
+    		<path d="M0,50
+  				 q150,-50 200,0 t100,0"
+			 	 stroke="black" stroke-width="15" />
+			 
+		     <path d="M0,50
+					 c 100 ,-33.34, 166.66,-33.34 200,0
+		 			 c 33.33,33.34, 66.66,33.34 100,0"
+		 			 stroke="magenta" stroke-width="5" /> 
+  	</g>
+	
+	<g fill="none" transform="translate(400, 100)">
+    <path d="M0,50
+    		 Q100,0 300, 50
+			 Q500,0 600, 50"
+			 stroke="black" stroke-width="15" />
+			 
+		     <path d="M0,50
+					 c 66.66,-33.34, 166.66,-33.34 300,0
+		 			 c 133.33,-33.34, 233.33,-33.34 300,0"
+		 			
+		 			 stroke="gainsboro" stroke-width="5" /> 
+  	</g>
+	
+	<g fill="none" transform="translate(0, 200)">
+
+    <path d="M0,50
+    		 Q50,0 100,50T200,50 400,50 600,50 800,50 900,50"
+			 stroke="black" stroke-width="15" />
+	
+    <path d="M0,50
+    		 C33.34,16.667 66.666,16.667 100,50
+			 c 33.34,33.34, 66.666,33.34 100,0
+			 c 33.33 ,-33.34, 100,-33.34 200,0
+			 c 100,33.34, 166.66,33.34 200,0
+			 c 33.33 ,-33.34, 100,-33.34 200,0
+			 c 100 ,33.34, 133.3,33.34 100,0"
+			 stroke="salmon" stroke-width="5" /> 
+  	</g>
+	
+	<g fill="none" transform="translate(0, 300)">
+
+    <path d="M0,50
+    		 Q50,0 100,50T200,50 500,50 800,50 900,50"
+			 stroke="black" stroke-width="15" />
+	
+    <path d="M0,50
+    		 C33.34,16.667 66.666,16.667 100,50
+			 c 33.34,33.34, 66.666,33.34 100,0
+			 c 33.33 ,-33.34, 133.33,-33.34 300,0
+			 c 166.66 ,33.34, 266.66,33.34 300,0
+			 c 33.33 ,-33.34, 66.66, -33.34 100,0"
+			 stroke="cornflowerblue" stroke-width="5" /> 
+  	</g>
+	
+	<g fill="none" transform="translate(0, 400)">
+
+    <path d="M0,50
+    		 Q50,0 100,50T200,50 600,50, 700,50"
+			 stroke="black" stroke-width="15" />
+	
+    <path d="M0,50
+    		 C33.34,16.667 66.666,16.667 100,50
+			 c 33.34,33.34, 66.666,33.34 100,0
+			 c 33.33 ,-33.34, 166.66,-33.34 400,0
+			 c 233.33 ,33.34, 266.66,33.34 100,0"
+			 stroke="yellow" stroke-width="5" /> 
+  	</g>
+	
+	
+	
+
+			 
+  
+</svg>
+
+
diff --git a/SwiftDrawTests/Resources/shapes.svg b/SwiftDrawTests/Resources/shapes.svg
diff --git a/SwiftDrawTests/Resources/starry.svg b/SwiftDrawTests/Resources/starry.svg

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// swift-tools-version:5.0`
	`1`	`+// swift-tools-version:5.4`
`2`	`2`
`3`	`3`	`import PackageDescription`
`4`	`4`
`@@ -29,7 +29,10 @@ let package = Package(`
`29`	`29`	`.testTarget(`
`30`	`30`	`name: "SwiftDrawTests",`
`31`	`31`	`dependencies: ["SwiftDraw"],`
`32`		`- path: "SwiftDrawTests"`
	`32`	`+ path: "SwiftDrawTests",`
	`33`	`+ resources: [`
	`34`	`+ .process("Resources")`
	`35`	`+ ]`
`33`	`36`	`)`
`34`	`37`	`]`
`35`	`38`	`)`