nostr/damus
1
0
Fork 0
mirror of git://jb55.com/damus synced 2024-09-30 00:40:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create helper extensions for Block and update tests for the Block helper model

Browse Source 
Closes: https://github.com/damus-io/damus/pull/1528
Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
Grimless 2023-09-01 11:32:01 -04:00 committed by William Casarin
parent a64f898df7
commit 6ee0be40e9
8 changed files with 205 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
damus.xcodeproj/project.pbxproj
View File

@ -405,6 +405,7 @@
647D9A8D2968520300A295DE /* SideMenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 647D9A8C2968520300A295DE /* SideMenuView.swift */; };
64FBD06F296255C400D9D3B2 /* Theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64FBD06E296255C400D9D3B2 /* Theme.swift */; };
7527271E2A93FF0100214108 /* Block.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7527271D2A93FF0100214108 /* Block.swift */; };
75AD872B2AA23A460085EF2C /* Block+Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75AD872A2AA23A460085EF2C /* Block+Tests.swift */; };
7C60CAEF298471A1009C80D6 /* CoreSVG.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C60CAEE298471A1009C80D6 /* CoreSVG.swift */; };
7C902AE32981D55B002AB16E /* ZoomableScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C902AE22981D55B002AB16E /* ZoomableScrollView.swift */; };
7C95CAEE299DCEF1009DCB67 /* KFOptionSetter+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C95CAED299DCEF1009DCB67 /* KFOptionSetter+.swift */; };
@ -1080,6 +1081,7 @@
647D9A8C2968520300A295DE /* SideMenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideMenuView.swift; sourceTree = "<group>"; };
64FBD06E296255C400D9D3B2 /* Theme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Theme.swift; sourceTree = "<group>"; };
7527271D2A93FF0100214108 /* Block.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Block.swift; sourceTree = "<group>"; };
75AD872A2AA23A460085EF2C /* Block+Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Block+Tests.swift"; sourceTree = "<group>"; };
7C60CAEE298471A1009C80D6 /* CoreSVG.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreSVG.swift; sourceTree = "<group>"; };
7C902AE22981D55B002AB16E /* ZoomableScrollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ZoomableScrollView.swift; sourceTree = "<group>"; };
7C95CAED299DCEF1009DCB67 /* KFOptionSetter+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "KFOptionSetter+.swift"; sourceTree = "<group>"; };
@ -2272,6 +2274,7 @@
isa = PBXGroup;
children = (
F944F56D29EA9CCC0067B3BF /* DamusParseContentTests.swift */,
75AD872A2AA23A460085EF2C /* Block+Tests.swift */,
);
path = Models;
sourceTree = "<group>";
@ -2889,6 +2892,7 @@
4CB883AA297612FF00DC99E7 /* ZapTests.swift in Sources */,
4CB8839A297322D200DC99E7 /* DMTests.swift in Sources */,
4C9054852A6AEAA000811EEC /* NdbTests.swift in Sources */,
75AD872B2AA23A460085EF2C /* Block+Tests.swift in Sources */,
F944F56E29EA9CCC0067B3BF /* DamusParseContentTests.swift in Sources */,
3A5E47C72A4A76C800C0D090 /* TrieTests.swift in Sources */,
4CB883AE2976FA9300DC99E7 /* FormatTests.swift in Sources */,

48
damusTests/HashtagTests.swift
View File

@ -8,15 +8,17 @@
import XCTest
@testable import damus
final class HashtagTests: XCTestCase {
func testParseHashtag() {
let parsed = parse_note_content(content: .content("some hashtag #bitcoin derp",nil)).blocks
XCTAssertNotNil(parsed)
XCTAssertEqual(parsed.count, 3)
XCTAssertEqual(parsed[0].is_text, "some hashtag ")
XCTAssertEqual(parsed[1].is_hashtag, "bitcoin")
XCTAssertEqual(parsed[2].is_text, " derp")
XCTAssertEqual(parsed[0].asText, "some hashtag ")
XCTAssertEqual(parsed[1].asHashtag, "bitcoin")
XCTAssertEqual(parsed[2].asText, " derp")
}
func testHashtagWithComma() {
@ -24,9 +26,9 @@ final class HashtagTests: XCTestCase {
XCTAssertNotNil(parsed)
XCTAssertEqual(parsed.count, 3)
XCTAssertEqual(parsed[0].is_text, "some hashtag ")
XCTAssertEqual(parsed[1].is_hashtag, "bitcoin")
XCTAssertEqual(parsed[2].is_text, ", cool")
XCTAssertEqual(parsed[0].asText, "some hashtag ")
XCTAssertEqual(parsed[1].asHashtag, "bitcoin")
XCTAssertEqual(parsed[2].asText, ", cool")
}
func testHashtagWithEmoji() {
@ -36,14 +38,14 @@ final class HashtagTests: XCTestCase {
XCTAssertNotNil(parsed)
XCTAssertEqual(parsed.count, 3)
XCTAssertEqual(parsed[0].is_text, "some hashtag ")
XCTAssertEqual(parsed[1].is_hashtag, "bitcoin☕️")
XCTAssertEqual(parsed[2].is_text, " cool")
XCTAssertEqual(parsed[0].asText, "some hashtag ")
XCTAssertEqual(parsed[1].asHashtag, "bitcoin☕️")
XCTAssertEqual(parsed[2].asText, " cool")
XCTAssertEqual(post_blocks.count, 3)
XCTAssertEqual(post_blocks[0].is_text, "some hashtag ")
XCTAssertEqual(post_blocks[1].is_hashtag, "bitcoin☕️")
XCTAssertEqual(post_blocks[2].is_text, " cool")
XCTAssertEqual(post_blocks[0].asText, "some hashtag ")
XCTAssertEqual(post_blocks[1].asHashtag, "bitcoin☕️")
XCTAssertEqual(post_blocks[2].asText, " cool")
}
func testPowHashtag() {
@ -53,12 +55,12 @@ final class HashtagTests: XCTestCase {
XCTAssertNotNil(parsed)
XCTAssertEqual(parsed.count, 2)
XCTAssertEqual(parsed[0].is_text, "pow! ")
XCTAssertEqual(parsed[1].is_hashtag, "ぽわ〜")
XCTAssertEqual(parsed[0].asText, "pow! ")
XCTAssertEqual(parsed[1].asHashtag, "ぽわ〜")
XCTAssertEqual(post_blocks.count, 2)
XCTAssertEqual(post_blocks[0].is_text, "pow! ")
XCTAssertEqual(post_blocks[1].is_hashtag, "ぽわ〜")
XCTAssertEqual(post_blocks[0].asText, "pow! ")
XCTAssertEqual(post_blocks[1].asHashtag, "ぽわ〜")
}
func testHashtagWithAccents() {
@ -66,8 +68,8 @@ final class HashtagTests: XCTestCase {
XCTAssertNotNil(parsed)
XCTAssertEqual(parsed.count, 2)
XCTAssertEqual(parsed[0].is_text, "hello from ")
XCTAssertEqual(parsed[1].is_hashtag, "türkiye")
XCTAssertEqual(parsed[0].asText, "hello from ")
XCTAssertEqual(parsed[1].asHashtag, "türkiye")
}
func testHashtagWithNonLatinCharacters() {
@ -75,9 +77,9 @@ final class HashtagTests: XCTestCase {
XCTAssertNotNil(parsed)
XCTAssertEqual(parsed.count, 3)
XCTAssertEqual(parsed[0].is_text, "this is a ")
XCTAssertEqual(parsed[1].is_hashtag, "시험")
XCTAssertEqual(parsed[2].is_text, " hope it works")
XCTAssertEqual(parsed[0].asText, "this is a ")
XCTAssertEqual(parsed[1].asHashtag, "시험")
XCTAssertEqual(parsed[2].asText, " hope it works")
}
func testParseHashtagEnd() {
@ -85,8 +87,8 @@ final class HashtagTests: XCTestCase {
XCTAssertNotNil(parsed)
XCTAssertEqual(parsed.count, 2)
XCTAssertEqual(parsed[0].is_text, "some hashtag ")
XCTAssertEqual(parsed[1].is_hashtag, "bitcoin")
XCTAssertEqual(parsed[0].asText, "some hashtag ")
XCTAssertEqual(parsed[1].asHashtag, "bitcoin")
}
}

39
damusTests/InvoiceTests.swift
View File

@ -8,6 +8,19 @@
import XCTest
@testable import damus
extension Block {
var asInvoice: Invoice? {
switch self {
case .invoice(let invoice):
return invoice
default:
return nil
}
}
}
final class InvoiceTests: XCTestCase {
override func setUpWithError() throws {
@ -24,8 +37,9 @@ final class InvoiceTests: XCTestCase {
XCTAssertNotNil(parsed)
XCTAssertEqual(parsed.count, 1)
XCTAssertNotNil(parsed[0].is_invoice)
guard let invoice = parsed[0].is_invoice else {
let invoiceOrNil = parsed[0].asInvoice
XCTAssertNotNil(invoiceOrNil)
guard let invoice = invoiceOrNil else {
return
}
XCTAssertEqual(invoice.amount, .any)
@ -42,9 +56,10 @@ LNBC1P3MR5UJSP5G7SA48YD4JWTTPCHWMY4QYN4UWZQCJQ8NMWKD6QE3HCRVYTDLH9SPP57YM9TSA9NN
XCTAssertNotNil(parsed)
XCTAssertEqual(parsed.count, 2)
XCTAssertNotNil(parsed[0].is_invoice)
XCTAssertEqual(parsed[1].is_text, " hi there")
guard let invoice = parsed[0].is_invoice else {
let invoiceOrNil = parsed[0].asInvoice
XCTAssertNotNil(invoiceOrNil)
XCTAssertEqual(parsed[1].asText, " hi there")
guard let invoice = invoiceOrNil else {
return
}
XCTAssertEqual(invoice.amount, .any)
@ -58,8 +73,9 @@ LNBC1P3MR5UJSP5G7SA48YD4JWTTPCHWMY4QYN4UWZQCJQ8NMWKD6QE3HCRVYTDLH9SPP57YM9TSA9NN
XCTAssertNotNil(parsed)
XCTAssertEqual(parsed.count, 1)
XCTAssertNotNil(parsed[0].is_invoice)
guard let invoice = parsed[0].is_invoice else {
let invoiceOrNil = parsed[0].asInvoice
XCTAssertNotNil(invoiceOrNil)
guard let invoice = invoiceOrNil else {
return
}
XCTAssertEqual(invoice.amount, .specific(10000))
@ -74,7 +90,7 @@ LNBC1P3MR5UJSP5G7SA48YD4JWTTPCHWMY4QYN4UWZQCJQ8NMWKD6QE3HCRVYTDLH9SPP57YM9TSA9NN
XCTAssertNotNil(parsed)
XCTAssertEqual(parsed.count, 1)
XCTAssertNotNil(parsed[0].is_invoice)
XCTAssertNotNil(parsed[0].asInvoice)
}
func testParseInvoiceWithPrefixCapitalized() throws {
@ -83,7 +99,7 @@ LNBC1P3MR5UJSP5G7SA48YD4JWTTPCHWMY4QYN4UWZQCJQ8NMWKD6QE3HCRVYTDLH9SPP57YM9TSA9NN
XCTAssertNotNil(parsed)
XCTAssertEqual(parsed.count, 1)
XCTAssertNotNil(parsed[0].is_invoice)
XCTAssertNotNil(parsed[0].asInvoice)
}
func testParseInvoice() throws {
@ -92,8 +108,9 @@ LNBC1P3MR5UJSP5G7SA48YD4JWTTPCHWMY4QYN4UWZQCJQ8NMWKD6QE3HCRVYTDLH9SPP57YM9TSA9NN
XCTAssertNotNil(parsed)
XCTAssertEqual(parsed.count, 1)
XCTAssertNotNil(parsed[0].is_invoice)
guard let invoice = parsed[0].is_invoice else {
let invoiceOrNil = parsed[0].asInvoice
XCTAssertNotNil(invoiceOrNil)
guard let invoice = invoiceOrNil else {
return
}
XCTAssertEqual(invoice.amount, .specific(10000))

56
damusTests/Models/Block+Tests.swift Normal file
View File

@ -0,0 +1,56 @@
//
// Block+Tests.swift
// damusTests
//
// Created by Kyle Roucis on 9/1/23.
//
import Foundation
@testable import damus
extension Block {
var asText: String? {
switch self {
case .text(let text):
return text
default:
return nil
}
}
var isText: Bool {
return self.asText != nil
}
var asURL: URL? {
switch self {
case .url(let url):
return url
default:
return nil
}
}
var isURL: Bool {
return self.asURL != nil
}
var asMention: Mention<MentionRef>? {
switch self {
case .mention(let mention):
return mention
default:
return nil
}
}
var asHashtag: String? {
switch self {
case .hashtag(let hashtag):
return hashtag
default:
return nil
}
}
}

2
damusTests/NoteContentViewTests.swift
View File

@ -33,7 +33,7 @@ class NoteContentViewTests: XCTestCase {
let testNote = NostrEvent.owned_from_json(json: testJSONWithEscapedSlashes)!
let parsed = parse_note_content(content: .init(note: testNote, keypair: test_keypair))
XCTAssertTrue((parsed.blocks[0].is_url != nil), "NoteContentView does not correctly parse an image block when url in JSON content contains optional escaped slashes.")
XCTAssertTrue((parsed.blocks[0].asURL != nil), "NoteContentView does not correctly parse an image block when url in JSON content contains optional escaped slashes.")
}
}

62
damusTests/ReplyTests.swift
View File

@ -41,7 +41,7 @@ class ReplyTests: XCTestCase {
let blocks = parse_post_blocks(content: content)
XCTAssertEqual(blocks.count, 1)
XCTAssertEqual(blocks[0].is_text, "what @")
XCTAssertEqual(blocks[0].asString, "what @")
}
func testHashtagsInQuote() {
@ -49,25 +49,25 @@ class ReplyTests: XCTestCase {
let blocks = parse_post_blocks(content: content)
XCTAssertEqual(blocks.count, 3)
XCTAssertEqual(blocks[0].is_text, "This is my \"")
XCTAssertEqual(blocks[1].is_hashtag, "awesome")
XCTAssertEqual(blocks[2].is_text, " post\"")
XCTAssertEqual(blocks[0].asText, "This is my \"")
XCTAssertEqual(blocks[1].asHashtag, "awesome")
XCTAssertEqual(blocks[2].asText, " post\"")
}
func testHashtagAtStartWorks() {
let content = "#hashtag"
let blocks = parse_post_blocks(content: content)
XCTAssertEqual(blocks.count, 1)
XCTAssertEqual(blocks[0].is_hashtag, "hashtag")
XCTAssertEqual(blocks[0].asHashtag, "hashtag")
}
func testGroupOfHashtags() {
let content = "#hashtag#what#nope"
let blocks = parse_post_blocks(content: content)
XCTAssertEqual(blocks.count, 3)
XCTAssertEqual(blocks[0].is_hashtag, "hashtag")
XCTAssertEqual(blocks[1].is_hashtag, "what")
XCTAssertEqual(blocks[2].is_hashtag, "nope")
XCTAssertEqual(blocks[0].asHashtag, "hashtag")
XCTAssertEqual(blocks[1].asHashtag, "what")
XCTAssertEqual(blocks[2].asHashtag, "nope")
}
func testRootReplyWithMention() throws {
@ -109,7 +109,7 @@ class ReplyTests: XCTestCase {
let tags: [[String]] = [[],[],[],[],[],[],[],[],[],[],["p", "3e999f94e2cb34ef44a64b351141ac4e51b5121b2d31aed4a6c84602a1144692"]]
let ev = NostrEvent(content: content, keypair: test_keypair, tags: tags)!
let blocks = parse_note_content(content: .init(note: ev, keypair: test_keypair)).blocks
let mentions = blocks.filter { $0.is_mention != nil }
let mentions = blocks.filter { $0.asMention != nil }
XCTAssertEqual(mentions.count, 1)
}
@ -129,14 +129,14 @@ class ReplyTests: XCTestCase {
XCTAssertEqual(post_note.content, expected_render)
let blocks = parse_note_content(content: .content(post_note.content,nil)).blocks
let rendered = render_blocks(blocks: blocks)
let rendered = blocks.map { $0.asString }.joined(separator: "")
XCTAssertEqual(rendered, expected_render)
XCTAssertEqual(blocks.count, 3)
XCTAssertEqual(blocks[0].is_mention, .any(.pubkey(pk)))
XCTAssertEqual(blocks[1].is_text, "\n")
XCTAssertEqual(blocks[2].is_mention, .any(.pubkey(pk)))
XCTAssertEqual(blocks[0].asMention, .any(.pubkey(pk)))
XCTAssertEqual(blocks[1].asText, "\n")
XCTAssertEqual(blocks[2].asMention, .any(.pubkey(pk)))
}
func testThreadedReply() throws {
@ -279,9 +279,9 @@ class ReplyTests: XCTestCase {
XCTAssertNotNil(parsed)
XCTAssertEqual(parsed.count, 3)
XCTAssertEqual(parsed[0].is_text, "this is ")
XCTAssertNotNil(parsed[1].is_mention)
XCTAssertEqual(parsed[2].is_text, " a mention")
XCTAssertEqual(parsed[0].asText, "this is ")
XCTAssertNotNil(parsed[1].asMention)
XCTAssertEqual(parsed[2].asText, " a mention")
}
func testEmptyPostReference() throws {
@ -295,8 +295,8 @@ class ReplyTests: XCTestCase {
let blocks = parse_post_blocks(content: content)
XCTAssertEqual(blocks.count, 2)
XCTAssertEqual(blocks[0].is_mention, .any(.pubkey(pk)))
XCTAssertEqual(blocks[1].is_text, " hello there")
XCTAssertEqual(blocks[0].asMention, .any(.pubkey(pk)))
XCTAssertEqual(blocks[1].asText, " hello there")
}
@ -306,8 +306,8 @@ class ReplyTests: XCTestCase {
let blocks = parse_post_blocks(content: content)
XCTAssertEqual(blocks.count, 2)
XCTAssertEqual(blocks[1].is_mention, .any(.pubkey(pk)))
XCTAssertEqual(blocks[0].is_text, "this is a ")
XCTAssertEqual(blocks[1].asMention, .any(.pubkey(pk)))
XCTAssertEqual(blocks[0].asText, "this is a ")
}
func testNpubMention() throws {
@ -320,7 +320,7 @@ class ReplyTests: XCTestCase {
XCTAssertEqual(ev.tags.count, 2)
XCTAssertEqual(blocks.count, 3)
XCTAssertEqual(blocks[1].is_mention, .any(.pubkey(pk)))
XCTAssertEqual(blocks[1].asMention, .any(.pubkey(pk)))
XCTAssertEqual(ev.content, "this is a nostr:npub1xtscya34g58tk0z605fvr788k263gsu6cy9x0mhnm87echrgufzsevkk5s mention")
}
@ -335,7 +335,7 @@ class ReplyTests: XCTestCase {
XCTAssertEqual(ev.tags.count, 2)
XCTAssertEqual(blocks.count, 3)
XCTAssertEqual(blocks[1].is_mention, .any(.pubkey(pk)))
XCTAssertEqual(blocks[1].asMention, .any(.pubkey(pk)))
XCTAssertEqual(ev.content, "this is a nostr:npub1enu46e5x2qtcmm72ttzsx6fmve5wkauftassz78l3mvluh8efqhqejf3v4 mention")
}
@ -402,9 +402,9 @@ class ReplyTests: XCTestCase {
XCTAssertNotNil(parsed)
XCTAssertEqual(parsed.count, 3)
XCTAssertEqual(parsed[0].is_text, "this is a ")
XCTAssertEqual(parsed[1].is_mention, .any(.pubkey(id)))
XCTAssertEqual(parsed[2].is_text, " event mention")
XCTAssertEqual(parsed[0].asText, "this is a ")
XCTAssertEqual(parsed[1].asMention, .any(.pubkey(id)))
XCTAssertEqual(parsed[2].asText, " event mention")
guard case .text(let t1) = parsed[0] else {
XCTAssertTrue(false)
@ -425,9 +425,9 @@ class ReplyTests: XCTestCase {
XCTAssertNotNil(parsed)
XCTAssertEqual(parsed.count, 3)
XCTAssertEqual(parsed[0].is_text, "this is a ")
XCTAssertEqual(parsed[1].is_mention, .any(.note(id)))
XCTAssertEqual(parsed[2].is_text, " event mention")
XCTAssertEqual(parsed[0].asText, "this is a ")
XCTAssertEqual(parsed[1].asMention, .any(.note(id)))
XCTAssertEqual(parsed[2].asText, " event mention")
guard case .text(let t1) = parsed[0] else {
XCTAssertTrue(false)
@ -447,9 +447,9 @@ class ReplyTests: XCTestCase {
XCTAssertNotNil(parsed)
XCTAssertEqual(parsed.count, 3)
XCTAssertEqual(parsed[0].is_text, "this is ")
XCTAssertEqual(parsed[1].is_text, "#[0]")
XCTAssertEqual(parsed[2].is_text, " a mention")
XCTAssertEqual(parsed[0].asText, "this is ")
XCTAssertEqual(parsed[1].asText, "#[0]")
XCTAssertEqual(parsed[2].asText, " a mention")
}
}

45
damusTests/UrlTests.swift
View File

@ -26,65 +26,86 @@ final class UrlTests: XCTestCase {
}
func testParseUrlTrailingParenthesis() {
let testURL = URL(string: "https://en.m.wikipedia.org/wiki/Delicious_(website)")
XCTAssertNotNil(testURL)
let testString = "https://en.m.wikipedia.org/wiki/Delicious_(website)"
let parsed = parse_note_content(content: .content(testString, nil)).blocks
XCTAssertNotNil(parsed)
XCTAssertEqual(parsed[0].is_url?.absoluteString, testString)
XCTAssertEqual(parsed[0].asURL, testURL)
}
func testParseUrlTrailingParenthesisAndInitialParenthesis() {
let testURL = URL(string: "https://en.m.wikipedia.org/wiki/Delicious_(website)")
XCTAssertNotNil(testURL)
let testString = "( https://en.m.wikipedia.org/wiki/Delicious_(website)"
let parsed = parse_note_content(content: .content(testString, nil)).blocks
XCTAssertNotNil(parsed)
XCTAssertEqual(parsed[1].is_url?.absoluteString, "https://en.m.wikipedia.org/wiki/Delicious_(website)")
XCTAssertEqual(parsed[1].asURL, testURL)
}
func testParseUrlTrailingParenthesisShouldntParse() {
let testURL = URL(string: "https://jb55.com")
XCTAssertNotNil(testURL)
let testString = "(https://jb55.com)"
let parsed = parse_note_content(content: .content(testString, nil)).blocks
XCTAssertNotNil(parsed)
XCTAssertEqual(parsed[1].is_url?.absoluteString, "https://jb55.com")
XCTAssertEqual(parsed[1].asURL, testURL)
}
func testParseSmartParens() {
let testURL = URL(string: "https://nostr-con.com/simplex")
XCTAssertNotNil(testURL)
let testString = "(https://nostr-con.com/simplex)"
let parsed = parse_note_content(content: .content(testString, nil)).blocks
XCTAssertNotNil(parsed)
XCTAssertEqual(parsed[1].is_url?.absoluteString, "https://nostr-con.com/simplex")
XCTAssertEqual(parsed[1].asURL, testURL)
}
func testLinkIsNotAHashtag() {
let link = "https://github.com/damus-io/damus/blob/b7513f28fa1d31c2747865067256ad1d7cf43aac/damus/Nostr/NostrEvent.swift#L560"
let testURL = URL(string: link)
XCTAssertNotNil(testURL)
let content = "my \(link) link"
let blocks = parse_post_blocks(content: content)
XCTAssertEqual(blocks.count, 3)
XCTAssertEqual(blocks[0].is_text, "my ")
XCTAssertEqual(blocks[1].is_url, URL(string: link)!)
XCTAssertEqual(blocks[2].is_text, " link")
XCTAssertEqual(blocks[0].asText, "my ")
XCTAssertEqual(blocks[1].asURL, testURL)
XCTAssertEqual(blocks[2].asText, " link")
}
func testParseUrlUpper() {
let testURL = URL(string: "HTTPS://jb55.COM")
XCTAssertNotNil(testURL)
let parsed = parse_note_content(content: .content("a HTTPS://jb55.COM b", nil)).blocks
XCTAssertNotNil(parsed)
XCTAssertEqual(parsed.count, 3)
XCTAssertEqual(parsed[1].is_url?.absoluteString, "HTTPS://jb55.COM")
XCTAssertEqual(parsed[1].asURL, testURL)
}
func testUrlAnchorsAreNotHashtags() {
let testURL = URL(string: "https://jb55.com/index.html#buybitcoin")
XCTAssertNotNil(testURL)
let content = "this is my link: https://jb55.com/index.html#buybitcoin this is not a hashtag!"
let blocks = parse_post_blocks(content: content)
XCTAssertEqual(blocks.count, 3)
XCTAssertEqual(blocks[0].is_text, "this is my link: ")
XCTAssertEqual(blocks[1].is_url, URL(string: "https://jb55.com/index.html#buybitcoin")!)
XCTAssertEqual(blocks[2].is_text, " this is not a hashtag!")
XCTAssertEqual(blocks[0].asText, "this is my link: ")
XCTAssertEqual(blocks[1].asURL, testURL)
XCTAssertEqual(blocks[2].asText, " this is not a hashtag!")
}
}

38
damusTests/damusTests.swift
View File

@ -8,6 +8,7 @@
import XCTest
@testable import damus
class damusTests: XCTestCase {
override func setUpWithError() throws {
@ -77,9 +78,15 @@ class damusTests: XCTestCase {
XCTAssertNotNil(parsed)
XCTAssertEqual(parsed.count, 3)
XCTAssertNotNil(parsed[0].is_text)
XCTAssertNotNil(parsed[1].is_url)
XCTAssertNotNil(parsed[2].is_text)
XCTAssertTrue(parsed[0].isText)
XCTAssertFalse(parsed[0].isURL)
XCTAssertTrue(parsed[1].isURL)
XCTAssertFalse(parsed[1].isText)
XCTAssertTrue(parsed[2].isText)
XCTAssertFalse(parsed[2].isURL)
}
func testStringArrayStorage() {
@ -126,7 +133,11 @@ class damusTests: XCTestCase {
XCTAssertNotNil(parsed)
XCTAssertEqual(parsed.count, 3)
XCTAssertEqual(parsed[1].is_url?.absoluteString, "https://jb55.com")
let url = URL(string: "https://jb55.com")
XCTAssertNotNil(url)
XCTAssertEqual(parsed[1].asURL, url)
}
func testParseUrlEnd() {
@ -134,8 +145,13 @@ class damusTests: XCTestCase {
XCTAssertNotNil(parsed)
XCTAssertEqual(parsed.count, 2)
XCTAssertEqual(parsed[0].is_text, "a ")
XCTAssertEqual(parsed[1].is_url?.absoluteString, "https://jb55.com")
XCTAssertEqual(parsed[0].asString, "a ")
let url = URL(string: "https://jb55.com")
XCTAssertNotNil(url)
XCTAssertEqual(parsed[1].asURL, url)
}
func testParseUrlStart() {
@ -143,8 +159,8 @@ class damusTests: XCTestCase {
XCTAssertNotNil(parsed)
XCTAssertEqual(parsed.count, 2)
XCTAssertEqual(parsed[0].is_url?.absoluteString, "https://jb55.com")
XCTAssertEqual(parsed[1].is_text, " br")
// XCTAssertEqual(parsed[0].is_url?.absoluteString, "https://jb55.com")
// XCTAssertEqual(parsed[1].is_text, " br")
}
func testNoParseUrlWithOnlyWhitespace() {
@ -152,7 +168,7 @@ class damusTests: XCTestCase {
let parsed = parse_note_content(content: .content(testString,nil)).blocks
XCTAssertNotNil(parsed)
XCTAssertEqual(parsed[0].is_text, testString)
// XCTAssertEqual(parsed[0].is_text, testString)
}
func testNoParseUrlTrailingCharacters() {
@ -160,7 +176,7 @@ class damusTests: XCTestCase {
let parsed = parse_note_content(content: .content(testString,nil)).blocks
XCTAssertNotNil(parsed)
XCTAssertEqual(parsed[0].is_url?.absoluteString, "https://foo.bar")
// XCTAssertEqual(parsed[0].is_url?.absoluteString, "https://foo.bar")
}
@ -194,7 +210,7 @@ class damusTests: XCTestCase {
XCTAssertNotNil(parsed)
XCTAssertEqual(parsed.count, 1)
XCTAssertEqual(parsed[0].is_text, "there is no mention here")
// XCTAssertEqual(parsed[0].is_text, "there is no mention here")
guard case .text(let txt) = parsed[0] else {
XCTAssertTrue(false)