-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Fix crashes in XMPPvCardTempEmail and XMPPvCardTempTel initialize #1162
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
chrisballinger
merged 3 commits into
robbiehanson:master
from
beribas:fix_crashing_vcardtemp_types
Apr 8, 2020
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| // | ||
| // XMPPvCardTempTests.swift | ||
| // XMPPFrameworkSwiftTests | ||
| // | ||
| // Created by Oleg Langer on 07.04.20. | ||
| // | ||
|
|
||
| import XCTest | ||
|
|
||
| class XMPPvCardTempTests: XCTestCase { | ||
| var xmlString: String! | ||
| var sut: XMPPvCardTemp! | ||
|
|
||
| override func setUp() { | ||
| xmlString = """ | ||
| <vCard xmlns="vcard-temp"> | ||
| <NICKNAME>DESKTOP</NICKNAME> | ||
| <EMAIL> | ||
| <INTERNET/> | ||
| <USERID>[email protected]</USERID> | ||
| </EMAIL> | ||
| <TEL> | ||
| <WORK/> | ||
| <VOICE/> | ||
| <NUMBER>303-308-3282</NUMBER> | ||
| </TEL> | ||
| </vCard> | ||
| """ | ||
| let element = try! XMLElement(xmlString: xmlString) | ||
| sut = XMPPvCardTemp.vCardTemp(from: element) | ||
| } | ||
|
|
||
| func testCreateFromXMLString() { | ||
| XCTAssertNotNil(sut) | ||
| } | ||
|
|
||
| func testGetEmailAddress() { | ||
| XCTAssertEqual(sut.emailAddresses.count, 1) | ||
| let email = sut.emailAddresses.first | ||
| XCTAssertNotNil(email) | ||
| XCTAssertEqual(email?.userid, "[email protected]") | ||
| XCTAssertEqual(email?.isInternet, true) | ||
| } | ||
|
|
||
| func testRemoveEmailAddress() { | ||
| let email = sut.emailAddresses.first! | ||
| sut.removeEmailAddress(email) | ||
|
|
||
| XCTAssertEqual(sut.emailAddresses.count, 0) | ||
| } | ||
|
|
||
| func testAddEmailAddress() { | ||
| // Remove all first | ||
| sut.clearEmailAddresses() | ||
|
|
||
| let element = XMLElement(name: "EMAIL") | ||
| let newMail = XMPPvCardTempEmail.vCardEmail(from: element) | ||
| newMail.isWork = true | ||
| newMail.userid = "[email protected]" | ||
| sut.addEmailAddress(newMail) | ||
|
|
||
| XCTAssertEqual(sut.emailAddresses.first, newMail) | ||
| } | ||
|
|
||
| func testGetTelecomAddress() { | ||
| XCTAssertEqual(sut.telecomsAddresses.count, 1) | ||
| let tel = sut.telecomsAddresses.first! | ||
| XCTAssertTrue(tel.isWork) | ||
| XCTAssertTrue(tel.isVoice) | ||
| XCTAssertEqual(tel.number, "303-308-3282") | ||
| } | ||
|
|
||
| func testRemoveTelecomAddresses() { | ||
| let tel = sut.telecomsAddresses.first! | ||
| sut.removeTelecomsAddress(tel) | ||
| XCTAssertEqual(sut.telecomsAddresses.count, 0) | ||
| } | ||
|
|
||
| func testAddTelecomAddress() { | ||
| sut.clearTelecomsAddresses() | ||
|
|
||
| let element = XMLElement(name: "TEL") | ||
| let newTel = XMPPvCardTempTel.vCardTel(from: element) | ||
| newTel.isCell = true | ||
| newTel.number = "101" | ||
| sut.addTelecomsAddress(newTel) | ||
|
|
||
| XCTAssertEqual(sut.telecomsAddresses.count, 1) | ||
| XCTAssertEqual(sut.telecomsAddresses.first!, newTel) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
import KissXMLThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems like I don't have to import anything at all.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah yeah, it's probably implicitly re-exported by XMPPFramework.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, hm that's weird that you don't even need to import XMPPFramework.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I also don't really understand why. :)