From 5eb2c524e60dcdbbced5964eafc0ece1232ee19d Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Mon, 23 Sep 2024 21:37:54 -0700 Subject: [PATCH] Use StringDictionary typealias. Delete unused ParserTests.swift. --- .../Sources/FeedParser/Feeds/XML/AtomParser.swift | 9 +++++---- .../Sources/FeedParser/Feeds/XML/RSSParser.swift | 7 ++++--- Modules/Parser/Tests/ParserTests/ParserTests.swift | 12 ------------ 3 files changed, 9 insertions(+), 19 deletions(-) delete mode 100644 Modules/Parser/Tests/ParserTests/ParserTests.swift diff --git a/Modules/Parser/Sources/FeedParser/Feeds/XML/AtomParser.swift b/Modules/Parser/Sources/FeedParser/Feeds/XML/AtomParser.swift index 5d01f2479..4aaa77925 100644 --- a/Modules/Parser/Sources/FeedParser/Feeds/XML/AtomParser.swift +++ b/Modules/Parser/Sources/FeedParser/Feeds/XML/AtomParser.swift @@ -7,6 +7,7 @@ // import Foundation +import FoundationExtras import SAX import DateParser @@ -27,8 +28,8 @@ final class AtomParser { articles.last } - private var attributesStack = [SAXParser.XMLAttributesDictionary]() - private var currentAttributes: SAXParser.XMLAttributesDictionary? { + private var attributesStack = [StringDictionary]() + private var currentAttributes: StringDictionary? { attributesStack.last } @@ -241,7 +242,7 @@ private extension AtomParser { } } - func enclosure(_ urlString: String, _ attributes: SAXParser.XMLAttributesDictionary) -> RSSEnclosure? { + func enclosure(_ urlString: String, _ attributes: StringDictionary) -> RSSEnclosure? { let enclosure = RSSEnclosure(url: urlString) enclosure.title = attributes[XMLString.title] @@ -293,7 +294,7 @@ extension AtomParser: SAXParserDelegate { return } - let xmlAttributes = saxParser.attributesDictionary(attributes, attributeCount: attributeCount) ?? SAXParser.XMLAttributesDictionary() + let xmlAttributes = saxParser.attributesDictionary(attributes, attributeCount: attributeCount) ?? StringDictionary() attributesStack.append(xmlAttributes) if parsingXHTML { diff --git a/Modules/Parser/Sources/FeedParser/Feeds/XML/RSSParser.swift b/Modules/Parser/Sources/FeedParser/Feeds/XML/RSSParser.swift index e06007b59..4b06a6123 100644 --- a/Modules/Parser/Sources/FeedParser/Feeds/XML/RSSParser.swift +++ b/Modules/Parser/Sources/FeedParser/Feeds/XML/RSSParser.swift @@ -7,6 +7,7 @@ // import Foundation +import FoundationExtras import SAX import DateParser @@ -31,7 +32,7 @@ public final class RSSParser { private var parsingArticle = false private var parsingChannelImage = false private var parsingAuthor = false - private var currentAttributes: SAXParser.XMLAttributesDictionary? + private var currentAttributes: StringDictionary? static func parsedFeed(with parserData: ParserData) -> RSSFeed { @@ -265,7 +266,7 @@ private extension RSSParser { static let type = "type" } - func addEnclosure(_ attributes: SAXParser.XMLAttributesDictionary, _ currentArticle: RSSArticle) { + func addEnclosure(_ attributes: StringDictionary, _ currentArticle: RSSArticle) { guard let url = attributes[EnclosureKey.url], !url.isEmpty else { return @@ -304,7 +305,7 @@ extension RSSParser: SAXParserDelegate { return } - var xmlAttributes: SAXParser.XMLAttributesDictionary? = nil + var xmlAttributes: StringDictionary? = nil if (isRDF && SAXEqualTags(localName, XMLName.item)) || SAXEqualTags(localName, XMLName.guid) || SAXEqualTags(localName, XMLName.enclosure) { xmlAttributes = saxParser.attributesDictionary(attributes, attributeCount: attributeCount) } diff --git a/Modules/Parser/Tests/ParserTests/ParserTests.swift b/Modules/Parser/Tests/ParserTests/ParserTests.swift deleted file mode 100644 index 814773283..000000000 --- a/Modules/Parser/Tests/ParserTests/ParserTests.swift +++ /dev/null @@ -1,12 +0,0 @@ -import XCTest -import FeedParser - -final class ParserTests: XCTestCase { - func testExample() throws { - // XCTest Documentation - // https://developer.apple.com/documentation/xctest - - // Defining Test Cases and Test Methods - // https://developer.apple.com/documentation/xctest/defining_test_cases_and_test_methods - } -}