renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix lint issues.

Browse Source
This commit is contained in:
Brent Simmons
2025-01-22 22:13:20 -08:00
parent d210692d7d
commit 72a5e46dcc
115 changed files with 584 additions and 711 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Modules/Parser/Tests/ParserTests/AtomParserTests.swift
View File

@@ -14,15 +14,15 @@ final class AtomParserTests: XCTestCase {
func testDaringFireballPerformance() {
// 0.009 sec on my 2012 iMac.
let d = parserData("DaringFireball", "atom", "http://daringfireball.net/") //It’s actually an Atom feed
let d = parserData("DaringFireball", "atom", "http://daringfireball.net/") // It’s actually an Atom feed
self.measure {
let _ = try! FeedParser.parse(d)
_ = try! FeedParser.parse(d)
}
}
func testDaringFireball() {
let d = parserData("DaringFireball", "atom", "http://daringfireball.net/") //It’s actually an Atom feed
let d = parserData("DaringFireball", "atom", "http://daringfireball.net/") // It’s actually an Atom feed
let parsedFeed = try! FeedParser.parse(d)!
for article in parsedFeed.items {
@@ -35,8 +35,7 @@ final class AtomParserTests: XCTestCase {
let author = article.authors!.first!
if author.name == "Daring Fireball Department of Commerce" {
XCTAssertNil(author.url)
}
else {
} else {
XCTAssertEqual(author.name, "John Gruber")
XCTAssertEqual(author.url, "http://daringfireball.net/")
}
@@ -78,7 +77,7 @@ final class AtomParserTests: XCTestCase {
guard let attachments = article.attachments else {
continue
}
XCTAssertEqual(attachments.count, 1)
let attachment = attachments.first!

6
Modules/Parser/Tests/ParserTests/DateParserTests.swift
View File

@@ -13,7 +13,7 @@ final class DateParserTests: XCTestCase {
func testDateWithString() {
var expectedDateResult = dateWithValues(2010, 5, 28, 21, 3, 38)
var d = date("Fri, 28 May 2010 21:03:38 +0000")
XCTAssertEqual(d, expectedDateResult)
@@ -78,7 +78,7 @@ final class DateParserTests: XCTestCase {
let d = date("2010-11-17 08:40:07-05:00")
XCTAssertEqual(d, expectedDateResult)
}
func testFeedbinDate() {
let expectedDateResult = dateWithValues(2019, 9, 27, 21, 01, 48)
let d = date("2019-09-27T21:01:48.000000Z")
@@ -106,7 +106,7 @@ final class DateParserTests: XCTestCase {
}
func testPubDateParsingPerformance() {
// 0.0001 seconds on my Mac Studio M1
self.measure {
_ = date("21 May 2010 21:22:53 GMT")

18
Modules/Parser/Tests/ParserTests/FeedParserTypeTests.swift
View File

@@ -26,7 +26,7 @@ final class FeedParserTypeTests: XCTestCase {
let type = FeedType.feedType(d.data)
XCTAssertTrue(type == .notAFeed)
}
func testInessentialHTMLType() {
let d = parserData("inessential", "html", "http://inessential.com/")
@@ -40,7 +40,7 @@ final class FeedParserTypeTests: XCTestCase {
let type = FeedType.feedType(d.data)
XCTAssertTrue(type == .notAFeed)
}
// MARK: RSS
func testEMarleyRSSType() {
@@ -56,7 +56,7 @@ final class FeedParserTypeTests: XCTestCase {
let type = FeedType.feedType(d.data)
XCTAssertTrue(type == .rss)
}
func testKatieFloydRSSType() {
let d = parserData("KatieFloyd", "rss", "https://katiefloyd.com/")
@@ -186,21 +186,21 @@ final class FeedParserTypeTests: XCTestCase {
// In the case of this feed, the partial data isn’t enough to detect that it’s a JSON Feed.
// The type detector should return .unknown rather than .notAFeed.
let d = parserData("allthis-partial", "json", "http://leancrew.com/allthis/")
let type = FeedType.feedType(d.data, isPartialData: true)
XCTAssertEqual(type, .unknown)
}
// MARK: Performance
func testFeedTypePerformance() {
// 0.000 on my 2012 iMac.
let d = parserData("EMarley", "rss", "https://medium.com/@emarley")
self.measure {
let _ = FeedType.feedType(d.data)
_ = FeedType.feedType(d.data)
}
}
@@ -210,7 +210,7 @@ final class FeedParserTypeTests: XCTestCase {
let d = parserData("inessential", "json", "http://inessential.com/")
self.measure {
let _ = FeedType.feedType(d.data)
_ = FeedType.feedType(d.data)
}
}
@@ -220,7 +220,7 @@ final class FeedParserTypeTests: XCTestCase {
let d = parserData("DaringFireball", "html", "http://daringfireball.net/")
self.measure {
let _ = FeedType.feedType(d.data)
_ = FeedType.feedType(d.data)
}
}
@@ -230,7 +230,7 @@ final class FeedParserTypeTests: XCTestCase {
let d = parserData("DaringFireball", "rss", "http://daringfireball.net/")
self.measure {
let _ = FeedType.feedType(d.data)
_ = FeedType.feedType(d.data)
}
}
}

2
Modules/Parser/Tests/ParserTests/HTMLLinkTests.swift
View File

@@ -16,7 +16,7 @@ final class HTMLLinkTests: XCTestCase {
// 0.003 sec on my 2012 iMac
let d = parserData("sixcolors", "html", "http://sixcolors.com/")
self.measure {
let _ = HTMLLinkParser.htmlLinks(with: d)
_ = HTMLLinkParser.htmlLinks(with: d)
}
}

38
Modules/Parser/Tests/ParserTests/HTMLMetadataTests.swift
View File

@@ -31,7 +31,7 @@ final class HTMLMetadataTests: XCTestCase {
// 0.002 sec on my 2012 iMac
let d = parserData("DaringFireball", "html", "http://daringfireball.net/")
self.measure {
let _ = HTMLMetadataParser.metadata(with: d)
_ = HTMLMetadataParser.metadata(with: d)
}
}
@@ -54,7 +54,7 @@ final class HTMLMetadataTests: XCTestCase {
// 0.001 sec on my 2012 iMac
let d = parserData("furbo", "html", "http://furbo.org/")
self.measure {
let _ = HTMLMetadataParser.metadata(with: d)
_ = HTMLMetadataParser.metadata(with: d)
}
}
@@ -71,7 +71,7 @@ final class HTMLMetadataTests: XCTestCase {
XCTAssertEqual(feedLink.type, "application/rss+xml")
XCTAssertEqual(feedLink.urlString, "http://inessential.com/xml/rss.xml")
XCTAssertEqual(metadata.appleTouchIcons?.count ?? 0, 0);
XCTAssertEqual(metadata.appleTouchIcons?.count ?? 0, 0)
}
func testInessentialPerformance() {
@@ -79,7 +79,7 @@ final class HTMLMetadataTests: XCTestCase {
// 0.001 sec on my 2012 iMac
let d = parserData("inessential", "html", "http://inessential.com/")
self.measure {
let _ = HTMLMetadataParser.metadata(with: d)
_ = HTMLMetadataParser.metadata(with: d)
}
}
@@ -88,7 +88,7 @@ final class HTMLMetadataTests: XCTestCase {
// 0.004 sec on my 2012 iMac
let d = parserData("coco", "html", "https://www.theatlantic.com/entertainment/archive/2017/11/coco-is-among-pixars-best-movies-in-years/546695/")
self.measure {
let _ = HTMLMetadataParser.metadata(with: d)
_ = HTMLMetadataParser.metadata(with: d)
}
}
@@ -99,17 +99,17 @@ final class HTMLMetadataTests: XCTestCase {
XCTAssertEqual(metadata.favicons?.first?.urlString, "https://sixcolors.com/images/favicon.ico")
XCTAssertEqual(metadata.feedLinks?.count, 1);
XCTAssertEqual(metadata.feedLinks?.count, 1)
let feedLink = (metadata.feedLinks?.first!)!
XCTAssertEqual(feedLink.title, "RSS");
XCTAssertEqual(feedLink.type, "application/rss+xml");
XCTAssertEqual(feedLink.urlString, "http://feedpress.me/sixcolors");
XCTAssertEqual(feedLink.title, "RSS")
XCTAssertEqual(feedLink.type, "application/rss+xml")
XCTAssertEqual(feedLink.urlString, "http://feedpress.me/sixcolors")
XCTAssertEqual(metadata.appleTouchIcons!.count, 6);
let icon = metadata.appleTouchIcons![3];
XCTAssertEqual(icon.rel, "apple-touch-icon");
XCTAssertEqual(icon.sizes, "120x120");
XCTAssertEqual(icon.urlString, "https://sixcolors.com/apple-touch-icon-120.png");
XCTAssertEqual(metadata.appleTouchIcons!.count, 6)
let icon = metadata.appleTouchIcons![3]
XCTAssertEqual(icon.rel, "apple-touch-icon")
XCTAssertEqual(icon.sizes, "120x120")
XCTAssertEqual(icon.urlString, "https://sixcolors.com/apple-touch-icon-120.png")
}
func testSixColorsPerformance() {
@@ -117,7 +117,7 @@ final class HTMLMetadataTests: XCTestCase {
// 0.002 sec on my 2012 iMac
let d = parserData("sixcolors", "html", "http://sixcolors.com/")
self.measure {
let _ = HTMLMetadataParser.metadata(with: d)
_ = HTMLMetadataParser.metadata(with: d)
}
}
@@ -144,10 +144,10 @@ final class HTMLMetadataTests: XCTestCase {
let d = parserData("YouTubeTheVolvoRocks", "html", "https://www.youtube.com/user/TheVolvorocks")
let metadata = HTMLMetadataParser.metadata(with: d)
XCTAssertEqual(metadata.feedLinks!.count, 1);
XCTAssertEqual(metadata.feedLinks!.count, 1)
let feedLink = metadata.feedLinks!.first!
XCTAssertEqual(feedLink.title, "RSS");
XCTAssertEqual(feedLink.type, "application/rss+xml");
XCTAssertEqual(feedLink.urlString, "https://www.youtube.com/feeds/videos.xml?channel_id=UCct7QF2jcWRY6dhXWMSq9LQ");
XCTAssertEqual(feedLink.title, "RSS")
XCTAssertEqual(feedLink.type, "application/rss+xml")
XCTAssertEqual(feedLink.urlString, "https://www.youtube.com/feeds/videos.xml?channel_id=UCct7QF2jcWRY6dhXWMSq9LQ")
}
}

6
Modules/Parser/Tests/ParserTests/JSONFeedParserTests.swift
View File

@@ -16,7 +16,7 @@ final class JSONFeedParserTests: XCTestCase {
// 0.001 sec on my 2012 iMac.
let d = parserData("inessential", "json", "http://inessential.com/")
self.measure {
let _ = try! FeedParser.parse(d)
_ = try! FeedParser.parse(d)
}
}
@@ -25,7 +25,7 @@ final class JSONFeedParserTests: XCTestCase {
// 0.009 sec on my 2012 iMac.
let d = parserData("DaringFireball", "json", "http://daringfireball.net/")
self.measure {
let _ = try! FeedParser.parse(d)
_ = try! FeedParser.parse(d)
}
}
@@ -83,7 +83,7 @@ final class JSONFeedParserTests: XCTestCase {
let parsedFeed = try! FeedParser.parse(d)!
XCTAssertEqual(parsedFeed.items.count, 20)
XCTAssertEqual(parsedFeed.language, "de-DE")
for item in parsedFeed.items {
XCTAssertEqual(item.language, "de-DE")
}

6
Modules/Parser/Tests/ParserTests/OPMLTests.swift
View File

@@ -17,7 +17,7 @@ final class OPMLTests: XCTestCase {
// 0.003 sec on my M1 Mac Studio 2022
self.measure {
let _ = OPMLParser.document(with: self.subsData)
_ = OPMLParser.document(with: self.subsData)
}
}
@@ -36,7 +36,6 @@ final class OPMLTests: XCTestCase {
recursivelyCheckOPMLStructure(opmlDocument!)
}
func testFindingTitles() {
// https://github.com/brentsimmons/NetNewsWire/issues/527
// Fix a bug where titles aren’t found when there’s no title attribute in the OPML,
@@ -66,8 +65,7 @@ private extension OPMLTests {
if !isFolder {
XCTAssertNotNil(feedSpecifier!.title)
XCTAssertNotNil(feedSpecifier!.feedURL)
}
else {
} else {
XCTAssertNil(feedSpecifier)
}

2
Modules/Parser/Tests/ParserTests/RSSInJSONParserTests.swift
View File

@@ -16,7 +16,7 @@ final class RSSInJSONParserTests: XCTestCase {
// 0.003 sec on my 2012 iMac.
let d = parserData("ScriptingNews", "json", "http://scripting.com/")
self.measure {
let _ = try! FeedParser.parse(d)
_ = try! FeedParser.parse(d)
}
}

13
Modules/Parser/Tests/ParserTests/RSSParserTests.swift
View File

@@ -17,7 +17,7 @@ final class RSSParserTests: XCTestCase {
// 0.002 2022 Mac Studio
let d = parserData("scriptingNews", "rss", "http://scripting.com/")
self.measure {
let _ = try! FeedParser.parse(d)
_ = try! FeedParser.parse(d)
}
}
@@ -27,7 +27,7 @@ final class RSSParserTests: XCTestCase {
// 0.001 2022 Mac Studio
let d = parserData("KatieFloyd", "rss", "http://katiefloyd.com/")
self.measure {
let _ = try! FeedParser.parse(d)
_ = try! FeedParser.parse(d)
}
}
@@ -37,7 +37,7 @@ final class RSSParserTests: XCTestCase {
// 0.0004 2022 Mac Studio
let d = parserData("EMarley", "rss", "https://medium.com/@emarley")
self.measure {
let _ = try! FeedParser.parse(d)
_ = try! FeedParser.parse(d)
}
}
@@ -47,7 +47,7 @@ final class RSSParserTests: XCTestCase {
// 0.0006 2022 Mac Studio
let d = parserData("manton", "rss", "http://manton.org/")
self.measure {
let _ = try! FeedParser.parse(d)
_ = try! FeedParser.parse(d)
}
}
@@ -57,7 +57,7 @@ final class RSSParserTests: XCTestCase {
// 0.002 2022 Mac Studio
let d = parserData("allthis", "rss", "http://leancrew.com/all-this")
self.measure {
let _ = try! FeedParser.parse(d)
_ = try! FeedParser.parse(d)
}
}
@@ -241,8 +241,7 @@ final class RSSParserTests: XCTestCase {
// Tue, 07 Mar 2023 15:15:29 -0500
let expectedDatePublished = dateWithValues(2023, 3, 7, 20, 15, 29)
XCTAssertEqual(article.datePublished, expectedDatePublished)
}
else if article.title == "Ventura’s System Settings" {
} else if article.title == "Ventura’s System Settings" {
didFindSecondTestArticle = true
// Sun, 30 Oct 2022 11:58:26 -0500
let expectedDatePublished = dateWithValues(2022, 10, 30, 16, 58, 26)