From 4020a9851a572d4780db13c4ff2047933106d0da Mon Sep 17 00:00:00 2001 From: kawoou Date: Mon, 15 Apr 2019 13:35:33 +0900 Subject: [PATCH] Test: SIL issues, #file as String --- Tests/StencilTests/EnvironmentSpec.swift | 6 ++---- Tests/StencilTests/IncludeSpec.swift | 5 +---- Tests/StencilTests/InheritanceSpec.swift | 5 +---- Tests/StencilTests/LexerSpec.swift | 3 +-- Tests/StencilTests/LoaderSpec.swift | 3 +-- 5 files changed, 6 insertions(+), 16 deletions(-) diff --git a/Tests/StencilTests/EnvironmentSpec.swift b/Tests/StencilTests/EnvironmentSpec.swift index 6d8affe..f5b829f 100644 --- a/Tests/StencilTests/EnvironmentSpec.swift +++ b/Tests/StencilTests/EnvironmentSpec.swift @@ -215,8 +215,7 @@ final class EnvironmentIncludeTemplateTests: XCTestCase { override func setUp() { super.setUp() - let basePath: String = #file - let path = Path(basePath) + ".." + "fixtures" + let path = Path(#file as String) + ".." + "fixtures" let loader = FileSystemLoader(paths: [path]) environment = Environment(loader: loader) template = "" @@ -292,8 +291,7 @@ final class EnvironmentBaseAndChildTemplateTests: XCTestCase { override func setUp() { super.setUp() - let basePath: String = #file - let path = Path(basePath) + ".." + "fixtures" + let path = Path(#file as String) + ".." + "fixtures" let loader = FileSystemLoader(paths: [path]) environment = Environment(loader: loader) childTemplate = "" diff --git a/Tests/StencilTests/IncludeSpec.swift b/Tests/StencilTests/IncludeSpec.swift index 1b1493f..4743a94 100644 --- a/Tests/StencilTests/IncludeSpec.swift +++ b/Tests/StencilTests/IncludeSpec.swift @@ -4,10 +4,7 @@ import Spectre import XCTest final class IncludeTests: XCTestCase { - let path: Path = { - let basePath: String = #file - return Path(basePath) + ".." + "fixtures" - }() + let path = Path(#file as String) + ".." + "fixtures" lazy var loader = FileSystemLoader(paths: [path]) lazy var environment = Environment(loader: loader) diff --git a/Tests/StencilTests/InheritanceSpec.swift b/Tests/StencilTests/InheritanceSpec.swift index da716c3..4f91aff 100644 --- a/Tests/StencilTests/InheritanceSpec.swift +++ b/Tests/StencilTests/InheritanceSpec.swift @@ -4,10 +4,7 @@ import Stencil import XCTest final class InheritanceTests: XCTestCase { - let path: Path = { - let basePath: String = #file - return Path(basePath) + ".." + "fixtures" - }() + let path = Path(#file as String) + ".." + "fixtures" lazy var loader = FileSystemLoader(paths: [path]) lazy var environment = Environment(loader: loader) diff --git a/Tests/StencilTests/LexerSpec.swift b/Tests/StencilTests/LexerSpec.swift index 483be51..adf6a92 100644 --- a/Tests/StencilTests/LexerSpec.swift +++ b/Tests/StencilTests/LexerSpec.swift @@ -117,8 +117,7 @@ final class LexerTests: XCTestCase { } func testPerformance() throws { - let basePath: String = #file - let path = Path(basePath) + ".." + "fixtures" + "huge.html" + let path = Path(#file as String) + ".." + "fixtures" + "huge.html" let content: String = try path.read() measure { diff --git a/Tests/StencilTests/LoaderSpec.swift b/Tests/StencilTests/LoaderSpec.swift index b3dc79a..3cd189b 100644 --- a/Tests/StencilTests/LoaderSpec.swift +++ b/Tests/StencilTests/LoaderSpec.swift @@ -5,8 +5,7 @@ import XCTest final class TemplateLoaderTests: XCTestCase { func testFileSystemLoader() { - let basePath: String = #file - let path = Path(basePath) + ".." + "fixtures" + let path = Path(#file as String) + ".." + "fixtures" let loader = FileSystemLoader(paths: [path]) let environment = Environment(loader: loader)