diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 22082ab..4f21b9a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,7 +15,8 @@ jobs: image: - swift:5.9-focal - swift:5.9-jammy - - swift:5.9-amazonlinux2 + - swift:5.10-focal + - swift:5.10-jammy container: ${{ matrix.image }} steps: - name: Checkout code diff --git a/Sources/JSONAPISwiftGen/Swift Generators/Test Generators/TestFunctionName.swift b/Sources/JSONAPISwiftGen/Swift Generators/Test Generators/TestFunctionName.swift index 8dc8860..8e97eca 100644 --- a/Sources/JSONAPISwiftGen/Swift Generators/Test Generators/TestFunctionName.swift +++ b/Sources/JSONAPISwiftGen/Swift Generators/Test Generators/TestFunctionName.swift @@ -152,6 +152,7 @@ public struct TestFunctionName: Equatable, RawRepresentable { if string == "do" { return "`do`" } if string == "try" { return "`try`" } if string == "continue" { return "`continue`" } + if string == "_" { return "`_`" } return string } diff --git a/Tests/JSONAPISwiftGenTests/TestFunctionNameTests.swift b/Tests/JSONAPISwiftGenTests/TestFunctionNameTests.swift index 5564ab8..fb11533 100644 --- a/Tests/JSONAPISwiftGenTests/TestFunctionNameTests.swift +++ b/Tests/JSONAPISwiftGenTests/TestFunctionNameTests.swift @@ -95,11 +95,14 @@ final class TestFunctionNameTests: XCTestCase { func test_reservedWordsInPath() { let t1 = TestFunctionName( - path: .init(["go", "continue", "do", "try", "accept"]), + path: .init(["go", "_", "continue", "do", "try", "accept"]), endpoint: .post, direction: .request, context: TestFunctionLocalContext(functionName: "_hello_world➎")! ) + XCTAssertTrue(t1.fullyQualifiedTestFunctionName.contains("go.")) + + XCTAssertFalse(t1.fullyQualifiedTestFunctionName.contains("._.")) XCTAssertFalse(t1.fullyQualifiedTestFunctionName.contains(".do.")) XCTAssertFalse(t1.fullyQualifiedTestFunctionName.contains(".continue.")) XCTAssertFalse(t1.fullyQualifiedTestFunctionName.contains(".try."))