diff --git a/Package.swift b/Package.swift index 7f5e8f7..d6236eb 100644 --- a/Package.swift +++ b/Package.swift @@ -20,6 +20,12 @@ let package = Package( name: "SVGView", path: "Source", exclude: ["Info.plist"] + ), + .testTarget( + name: "SVGViewTests", + dependencies: ["SVGView"], + path: "SVGViewTests", + resources: [.copy("w3c")] ) ], swiftLanguageVersions: [.v5] diff --git a/SVGViewTests/BaseTestCase.swift b/SVGViewTests/BaseTestCase.swift index 3f772e8..88b6b99 100644 --- a/SVGViewTests/BaseTestCase.swift +++ b/SVGViewTests/BaseTestCase.swift @@ -15,7 +15,7 @@ class BaseTestCase : XCTestCase { } func compareToReference(_ fileName: String) { - let bundle = Bundle(for: type(of: self)) + let bundle = Bundle.module let svgURL = bundle.url(forResource: fileName, withExtension: "svg", subdirectory: "w3c/\(dir)/svg/")! let refURL = bundle.url(forResource: fileName, withExtension: "ref", subdirectory: "w3c/\(dir)/refs/")! diff --git a/SVGViewTests/SVGRefGenerator.swift b/SVGViewTests/SVGRefGenerator.swift index 60f2009..277f134 100644 --- a/SVGViewTests/SVGRefGenerator.swift +++ b/SVGViewTests/SVGRefGenerator.swift @@ -147,7 +147,7 @@ class SVGRefGenerator: XCTestCase { } func createReference(name: String, version: String) { - let bundle = Bundle(for: type(of: self)) + let bundle = Bundle.module let url = bundle.url(forResource: name, withExtension: "svg", subdirectory: version)! let versionNumber = String(version.split(separator: "/")[1]) let testDirectory = getTestDir(version: versionNumber) diff --git a/Source/Model/Nodes/SVGText.swift b/Source/Model/Nodes/SVGText.swift index 930ee46..07b2e16 100644 --- a/Source/Model/Nodes/SVGText.swift +++ b/Source/Model/Nodes/SVGText.swift @@ -58,6 +58,7 @@ struct SVGTextView: View { .alignmentGuide(VerticalAlignment.top) { d in d[VerticalAlignment.firstTextBaseline] } .position(x: 0, y: 0) // just to specify that positioning is global, actual coords are in transform .apply(paint: fill) + .frame(alignment: .topLeading) .transformEffect(model.transform) .frame(alignment: .topLeading) }