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:
@@ -103,14 +103,6 @@
|
||||
return nextToken;
|
||||
}
|
||||
|
||||
- (NSArray *)allObjects
|
||||
{
|
||||
while (_eof == NO) {
|
||||
[self read];
|
||||
}
|
||||
return _tokens;
|
||||
}
|
||||
|
||||
- (void)read
|
||||
{
|
||||
SEL selector = [[_states objectForKey:@(_currentState)] pointerValue];
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user