fixing LayerTree tests

Author: swhitty

SwiftDraw.xcodeproj/project.pbxproj

@@ -31,6 +31,7 @@
 		D933D0A81E5D1F7F00937A59 /* DOM.Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = D933D0A71E5D1F7F00937A59 /* DOM.Element.swift */; };
 		D933D0AC1E5E85D000937A59 /* TransformTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D933D0AB1E5E85D000937A59 /* TransformTests.swift */; };
 		D933D0AE1E5E868400937A59 /* Parser.XML.Transform.swift in Sources */ = {isa = PBXBuildFile; fileRef = D933D0AD1E5E868400937A59 /* Parser.XML.Transform.swift */; };
+		D93F02DE1EEEC7E200AA27C5 /* LayerTree.TransformTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D978A4491EE287D200727106 /* LayerTree.TransformTests.swift */; };
 		D949F3E61EE3A62A006700C5 /* LayerTree.Builder.swift in Sources */ = {isa = PBXBuildFile; fileRef = D949F3E51EE3A62A006700C5 /* LayerTree.Builder.swift */; };
 		D949F3E71EE3A62A006700C5 /* LayerTree.Builder.swift in Sources */ = {isa = PBXBuildFile; fileRef = D949F3E51EE3A62A006700C5 /* LayerTree.Builder.swift */; };
 		D949F3EC1EE3CD34006700C5 /* LayerTree.Builder.Path.swift in Sources */ = {isa = PBXBuildFile; fileRef = D949F3EB1EE3CD34006700C5 /* LayerTree.Builder.Path.swift */; };
@@ -848,6 +849,7 @@
 				D978A43F1EE2730500727106 /* LayerTree.ColorTests.swift in Sources */,
 				D9778E481E6ED3EF00FF6EBB /* ValueParserTests.swift in Sources */,
 				D9778E561E6ED3F500FF6EBB /* CharacterSetTests.swift in Sources */,
+				D93F02DE1EEEC7E200AA27C5 /* LayerTree.TransformTests.swift in Sources */,
 				D9778E571E6ED3F500FF6EBB /* ScannerTests.swift in Sources */,
 				D9778E591E6ED3FC00FF6EBB /* DOM.ElementTests.swift in Sources */,
 				D9778E4B1E6ED3EF00FF6EBB /* Scanner1Tests.swift in Sources */,

SwiftDrawTests/LayerTree/LayerTree.LayerTests.swift

@@ -41,6 +41,7 @@ class LayerTreeLayerTests: XCTestCase {
     typealias Contents = LayerTree.Layer.Contents
     typealias Point = LayerTree.Point
     typealias Transform = LayerTree.Transform
+    typealias Matrix = LayerTree.Transform.Matrix
 
     func testStrokeAttributesEquality() {
         let a1 = StrokeAttributes(color: .black, width: 1.0, cap: .butt, join: .bevel, miterLimit: 1.0)
@@ -167,9 +168,9 @@ class LayerTreeLayerTests: XCTestCase {
         l2.contents = [shape, text]
         XCTAssertEqual(l1, l2)
 
-        l1.transform = Transform(a: 10, b: 20, c: 30, d: 40, tx: 50, ty: 60)
+        l1.transform = [.matrix(Matrix(a: 10, b: 20, c: 30, d: 40, tx: 50, ty: 60))]
         XCTAssertNotEqual(l1, l2)
-        l2.transform = Transform(a: 10, b: 20, c: 30, d: 40, tx: 50, ty: 60)
+        l2.transform = [.matrix(Matrix(a: 10, b: 20, c: 30, d: 40, tx: 50, ty: 60))]
         XCTAssertEqual(l1, l2)
 
         l1.clip = [.path(path)]

SwiftDrawTests/LayerTree/LayerTree.TransformTests.swift

@@ -31,16 +31,18 @@ import XCTest
 
 class LayerTreeTransformTests: XCTestCase {
 
+    typealias Matrix = LayerTree.Transform.Matrix
+    
     func testTransformEquality() {
-        let t1 = LayerTree.Transform(a: 0, b: 1, c: 2, d: 3, tx: 4, ty: 5)
-        let t2 = LayerTree.Transform(a: 5, b: 4, c: 3, d: 2, tx: 1, ty: 0)
-        let t3 = LayerTree.Transform.identity
+        let t1 = Matrix(a: 0, b: 1, c: 2, d: 3, tx: 4, ty: 5)
+        let t2 = Matrix(a: 5, b: 4, c: 3, d: 2, tx: 1, ty: 0)
+        let t3 = LayerTree.Transform.identity.toMatrix()
 
-        XCTAssertEqual(t1, LayerTree.Transform(a: 0, b: 1, c: 2, d: 3, tx: 4, ty: 5))
+        XCTAssertEqual(t1, Matrix(a: 0, b: 1, c: 2, d: 3, tx: 4, ty: 5))
         XCTAssertEqual(t1, t1)
-        XCTAssertEqual(t2, LayerTree.Transform(a: 5, b: 4, c: 3, d: 2, tx: 1, ty: 0))
+        XCTAssertEqual(t2, Matrix(a: 5, b: 4, c: 3, d: 2, tx: 1, ty: 0))
         XCTAssertEqual(t2, t2)
-        XCTAssertEqual(t3, .identity)
+        XCTAssertEqual(t3, Matrix(a: 1, b: 0, c: 0, d: 1, tx: 0, ty: 0))
         XCTAssertEqual(t3, t3)
 
         XCTAssertNotEqual(t1, t2)

SwiftDrawTests/Renderer/Renderer.CoreGraphicsTypesTests.swift

@@ -75,9 +75,9 @@ class RendererCoreGraphicsTypesTests: XCTestCase {
     }
 
     func testTransform() {
-        let t1 = LayerTree.Transform(a: 10, b: 20, c: 30, d: 40, tx: 50, ty: 60)
+        let m = LayerTree.Transform.Matrix(a: 10, b: 20, c: 30, d: 40, tx: 50, ty: 60)
         let expected = CGAffineTransform(a: 10, b: 20, c: 30, d: 40, tx: 50, ty: 60)
-        XCTAssertEqual(CGProvider().createTransform(from: t1), expected)
+        XCTAssertEqual(CGProvider().createTransform(from: m), expected)
     }
 
     func testBlendMode() {