Remove the superfluous allObjects method from the tokenizer class

Being a NSEnumerator, the tokenizer cannot be reset, hence the change in the tests to create a new
instance for each iteration.
This commit is contained in:
iska
2015-04-11 21:47:55 +02:00
parent 8bfccb124f
commit 936c76d142
2 changed files with 3 additions and 11 deletions
-8
View File
@@ -103,14 +103,6 @@
return nextToken;
}
- (NSArray *)allObjects
{
while (_eof == NO) {
[self read];
}
return _tokens;
}
- (void)read
{
SEL selector = [[_states objectForKey:@(_currentState)] pointerValue];
+3 -3
View File
@@ -90,15 +90,15 @@
- (void)testTokenizer
{
for (HTML5LibTokenizerTest *test in self.testsList) {
HTMLTokenizer *tokenizer = [[HTMLTokenizer alloc] initWithString:test.input];
[tokenizer setValue:test.lastStartTag forKey:@"_lastStartTagName"];
for (NSNumber *state in test.initialStates) {
HTMLTokenizer *tokenizer = [[HTMLTokenizer alloc] initWithString:test.input];
[tokenizer setValue:test.lastStartTag forKey:@"_lastStartTagName"];
tokenizer.state = [state integerValue];
NSArray *expectedTokens = test.output;
NSArray *tokens = [tokenizer allObjects];
NSArray *tokens = tokenizer.allObjects;
XCTAssertEqualObjects(tokens, expectedTokens, @"%@", test.title);
}
}