diff --git a/tests/Reader/StringReaderTest.php b/tests/Reader/StringReaderTest.php index ecaec5f..90e36f6 100644 --- a/tests/Reader/StringReaderTest.php +++ b/tests/Reader/StringReaderTest.php @@ -50,11 +50,21 @@ class StringReaderTest extends TestCase public function testMoveToNextToken() { $this->reader->reset(); + $oldCurToken = $this->reader->getCurrentToken(); + $oldNextPos = $this->reader->getNextPosition(); $this->reader->moveToNextToken(); + $this->assertNotEquals($oldCurToken, $this->reader->getCurrentPosition(), "CurToken与旧CurToken相同"); + $this->assertNotEquals($oldNextPos, $this->reader->getNextPosition(), "NextPos与旧NextPos相同"); $this->assertEquals('This', $this->reader->getCurrentToken(), "不匹配"); $this->assertEquals(7, $this->reader->getCurrentPosition(), "CurPos与预计不符"); + $this->assertNotEquals($this->reader->getNextPosition(), $this->reader->getCurrentPosition(), "CurPos与NextPos相同"); + // CJK Support $this->readerWithCn->reset(); + $oldCurTokenCn = $this->readerWithCn->getCurrentToken(); + $oldNextPosCn = $this->readerWithCn->getNextPosition(); $this->readerWithCn->moveToNextToken(); + $this->assertNotEquals($oldCurTokenCn, $this->readerWithCn->getCurrentPosition(), "CurToken与旧CurToken相同"); + $this->assertNotEquals($oldNextPosCn, $this->readerWithCn->getNextPosition(), "NextPos与旧NextPos相同"); $this->assertEquals('这是', $this->readerWithCn->getCurrentToken(), "不匹配"); $this->assertEquals(5, $this->readerWithCn->getCurrentPosition(), "CurPos与预计不符"); } @@ -68,9 +78,11 @@ class StringReaderTest extends TestCase { $this->reader->reset(); $curPos = $this->readerWithCn->getCurrentPosition(); + $nextPos = $this->reader->getNextPosition(); $string = $this->reader->getNextToken(); $this->assertEquals($string, $this->reader->getNextToken(), "不匹配"); $this->assertEquals($this->reader->getNextToken(), $this->reader->getNextToken(), "不匹配"); $this->assertEquals($curPos, $this->reader->getCurrentPosition(), "CurPos不可以发生变化"); + $this->assertEquals($nextPos, $this->reader->getNextPosition(), "NextPos不可以发生变化"); } }