Skip to content

Commit 1a0da0e

Browse files
committed
Remove the unsuitable test case
Also apply suggestions from code review.
1 parent 0c6d03a commit 1a0da0e

File tree

3 files changed

+2
-21
lines changed

3 files changed

+2
-21
lines changed

Sources/SwiftDocC/Model/Rendering/RenderContentCompiler.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,7 @@ struct RenderContentCompiler: MarkupVisitor {
4646
}
4747

4848
mutating func visitHeading(_ heading: Heading) -> [RenderContent] {
49-
let fragment = urlReadableFragment(heading.plainText)
50-
var components = URLComponents()
51-
components.fragment = fragment
52-
let anchor = components.url?.fragment ?? fragment
53-
return [RenderBlockContent.heading(.init(level: heading.level, text: heading.plainText, anchor: anchor))]
49+
return [RenderBlockContent.heading(.init(level: heading.level, text: heading.plainText, anchor: urlReadableFragment(heading.plainText).addingPercentEncoding(withAllowedCharacters: .urlFragmentAllowed)))]
5450
}
5551

5652
mutating func visitListItem(_ listItem: ListItem) -> [RenderContent] {

Tests/SwiftDocCTests/Infrastructure/NodeURLGeneratorTests.swift

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -77,19 +77,6 @@ class NodeURLGeneratorTests: XCTestCase {
7777
XCTAssertEqual(generator.urlForReference(classIdentifier).absoluteString, "file:///path/to/bundle/_testbundle-ctlj/products/documentation.builtbundle/com.example.testbundle/data/folder/_privateclass/_privatesubclass")
7878
}
7979

80-
func testsafeURLWithEncodableFragment() throws {
81-
// This is a realist DerivedData folder.
82-
let baseURL = URL(string: "file:///path/to/bundle/_testbundle-ctlj/products/documentation.builtbundle/com.example.testbundle/data/")!
83-
let generator = NodeURLGenerator(baseURL: baseURL)
84-
85-
let basicIdentifier = ResolvedTopicReference(bundleIdentifier: "com.example.testbundle",
86-
path: "/folder/class/symbol",
87-
fragment: "テスト", // Non-ASCII; E3 83 86 E3 82 B9 E3 83 88 in UTF-8
88-
sourceLanguage: .swift)
89-
90-
XCTAssertEqual(generator.urlForReference(basicIdentifier).absoluteString, "file:///path/to/bundle/_testbundle-ctlj/products/documentation.builtbundle/com.example.testbundle/data/folder/class/symbol#%E3%83%86%E3%82%B9%E3%83%88")
91-
}
92-
9380
var inputLongPaths = [
9481
// Paths within the limits
9582
"/path/to/symbol.json",

Tests/SwiftDocCTests/Model/RenderContentMetadataTests.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,6 @@ class RenderContentMetadataTests: XCTestCase {
304304

305305
let source = """
306306
## テスト
307-
308-
Note that テスト consists of Non-ASCII characters of E3 83 86 E3 82 B9 E3 83 88 in UTF-8.
309307
"""
310308
let document = Document(parsing: source)
311309

@@ -315,7 +313,7 @@ class RenderContentMetadataTests: XCTestCase {
315313
case .heading(let heading):
316314
XCTAssertEqual(heading.level, 2)
317315
XCTAssertEqual(heading.text, "テスト")
318-
XCTAssertEqual(heading.anchor, "%E3%83%86%E3%82%B9%E3%83%88")
316+
XCTAssertEqual(heading.anchor, "%E3%83%86%E3%82%B9%E3%83%88", "The UTF-8 representation of テスト is E3 83 86 E3 82 B9 E3 83 88")
319317
default: XCTFail("Unexpected element")
320318
}
321319
}

0 commit comments

Comments
 (0)