relikd/RSXML2
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixed bugs: canParse & expected type error & html entities method name

Browse Source
This commit is contained in:
relikd
2019-01-15 22:08:23 +01:00
parent ca9452bc18
commit 8e5938972d
5 changed files with 53 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
RSXMLTests/RSEntityTests.m
View File

@@ -34,56 +34,56 @@
NSString *expectedResult = @"A&P";
NSString *result = [@"A&P" rs_stringByDecodingHTMLEntities];
NSString *result = [@"A&P" rsxml_stringByDecodingHTMLEntities];
XCTAssertEqualObjects(result, expectedResult);
result = [@"A&P" rs_stringByDecodingHTMLEntities];
result = [@"A&P" rsxml_stringByDecodingHTMLEntities];
XCTAssertEqualObjects(result, expectedResult);
result = [@"A&P" rs_stringByDecodingHTMLEntities];
result = [@"A&P" rsxml_stringByDecodingHTMLEntities];
XCTAssertEqualObjects(result, expectedResult);
}
- (void)testSingleEntity {
NSString *result = [@"∞" rs_stringByDecodingHTMLEntities];
NSString *result = [@"∞" rsxml_stringByDecodingHTMLEntities];
XCTAssertEqualObjects(result, @"∞");
result = [@"&" rs_stringByDecodingHTMLEntities];
result = [@"&" rsxml_stringByDecodingHTMLEntities];
XCTAssertEqualObjects(result, @"&");
result = [@"’" rs_stringByDecodingHTMLEntities];
result = [@"’" rsxml_stringByDecodingHTMLEntities];
XCTAssertEqualObjects(result, @"’");
}
- (void)testNotEntities {
NSString *s = @"&&\t\nFoo & Bar &0; Baz & 1238 4948 More things &foobar;&";
XCTAssertEqualObjects([s rs_stringByDecodingHTMLEntities], s);
XCTAssertEqualObjects([s rsxml_stringByDecodingHTMLEntities], s);
}
- (void)testURLs {
NSString *s = @"http://www.nytimes.com/2015/09/05/us/at-west-point-annual-pillow-fight-becomes-weaponized.html?mwrsm=Email&_r=1&pagewanted=all";
NSString *expectedResult = @"http://www.nytimes.com/2015/09/05/us/at-west-point-annual-pillow-fight-becomes-weaponized.html?mwrsm=Email&_r=1&pagewanted=all";
XCTAssertEqualObjects([s rs_stringByDecodingHTMLEntities], expectedResult);
XCTAssertEqualObjects([s rsxml_stringByDecodingHTMLEntities], expectedResult);
}
- (void)testEntityPlusWhitespace {
NSString *s = @"∞ Permalink";
NSString *expectedResult = @"∞ Permalink";
XCTAssertEqualObjects([s rs_stringByDecodingHTMLEntities], expectedResult);
XCTAssertEqualObjects([s rsxml_stringByDecodingHTMLEntities], expectedResult);
}
- (void)testNonBreakingSpace {
NSString *s = @"   -- just some spaces";
NSString *expectedResult = [NSString stringWithFormat:@"%C%C -- just some spaces", 160, 160];
XCTAssertEqualObjects([s rs_stringByDecodingHTMLEntities], expectedResult);
XCTAssertEqualObjects([s rsxml_stringByDecodingHTMLEntities], expectedResult);
}
- (void)test39encoding {
NSString *s = @"These are the times that try men's souls.";
NSString *expectedResult = @"These are the times that try men's souls.";
XCTAssertEqualObjects([s rs_stringByDecodingHTMLEntities], expectedResult);
XCTAssertEqualObjects([s rsxml_stringByDecodingHTMLEntities], expectedResult);
}
@end

45
RSXMLTests/RSXMLTests.m
View File

@@ -95,9 +95,8 @@
RSXMLData *xmlData = [self xmlFile:@"OneFootTsunami" extension:@"atom"];
XCTAssertEqual(xmlData.parserClass, [RSAtomParser class]);
RSFeedParser *parser = [RSFeedParser parserWithXMLData:xmlData];
NSError *error = nil;
RSParsedFeed *parsedFeed = [parser parseSync:&error];
RSParsedFeed *parsedFeed = [[xmlData getParser] parseSync:&error];
XCTAssertEqualObjects(parsedFeed.title, @"One Foot Tsunami");
XCTAssertEqualObjects(parsedFeed.subtitle, @"Slightly less disappointing than it sounds");
XCTAssertEqualObjects(parsedFeed.link, @"http://onefoottsunami.com");
@@ -237,6 +236,35 @@
#pragma mark - Variety Test & Other
- (void)testCorrectParserSelection {
RSXMLData *xmlData = [self xmlFile:@"OneFootTsunami" extension:@"atom"];
RSFeedParser *rightParser = [RSFeedParser parserWithXMLData:xmlData];
RSOPMLParser *wrongParser = [RSOPMLParser parserWithXMLData:xmlData];
XCTAssertTrue([rightParser canParse]);
XCTAssertFalse([wrongParser canParse]);
NSError *error;
[rightParser parseSync:&error];
XCTAssertNil(error);
[wrongParser parseSync:&error];
XCTAssertNotNil(error);
XCTAssertEqual(error.code, RSXMLErrorExpectingOPML);
XCTAssertEqualObjects(error, RSXMLMakeErrorWrongParser(RSXMLErrorExpectingOPML, RSXMLErrorExpectingFeed));
XCTAssertEqualObjects(error.localizedDescription, @"Can't parse XML. OPML data expected, but RSS or Atom feed found.");
}
- (void)testDetermineParserClassPerformance {
RSXMLData *xmlData = [self xmlFile:@"DaringFireball" extension:@"atom"];
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wundeclared-selector"
[self measureBlock:^{
for (NSInteger i = 0; i < 100; i++) {
[xmlData performSelector:@selector(determineParserClass)];
}
}];
#pragma clang diagnostic pop
}
- (void)testDownloadedFeeds {
NSError *error = nil;
int i = 0;
@@ -268,17 +296,4 @@
XCTAssertNil(error);
}
- (void)testDetermineParserClassPerformance {
RSXMLData *xmlData = [self xmlFile:@"DaringFireball" extension:@"atom"];
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wundeclared-selector"
[self measureBlock:^{
for (NSInteger i = 0; i < 100; i++) {
[xmlData performSelector:@selector(determineParserClass)];
}
}];
#pragma clang diagnostic pop
}
@end