X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=tst%2Fio%2FTokenTest.hpp;h=9671d3191b827bdbbcda87381c38b56ff9ce817e;hb=3b617c12da216c2d1744c5fbb62a7ef381e1e0b3;hp=0b78952af623873f83ce75960aad78ef09c6e509;hpb=7d462272350926dca8e1a8c94fdb527d0c9f6dc1;p=blank.git

diff --git a/tst/io/TokenTest.hpp b/tst/io/TokenTest.hpp
index 0b78952..9671d31 100644
--- a/tst/io/TokenTest.hpp
+++ b/tst/io/TokenTest.hpp
@@ -2,6 +2,7 @@
 #define BLANK_TEST_IO_TOKENTEST_HPP
 
 #include "io/Token.hpp"
+#include "io/Tokenizer.hpp"
 
 #include <string>
 #include <cppunit/extensions/HelperMacros.h>
@@ -18,6 +19,11 @@ CPPUNIT_TEST_SUITE(TokenTest);
 
 CPPUNIT_TEST(testTypeIO);
 CPPUNIT_TEST(testTokenIO);
+CPPUNIT_TEST(testTokenizer);
+CPPUNIT_TEST(testTokenizerBrokenComment);
+CPPUNIT_TEST(testReader);
+CPPUNIT_TEST(testReaderEmpty);
+CPPUNIT_TEST(testReaderMalformed);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -27,12 +33,25 @@ public:
 
 	void testTypeIO();
 	void testTokenIO();
+	void testTokenizer();
+	void testTokenizerBrokenComment();
+
+	void testReader();
+	void testReaderEmpty();
+	void testReaderMalformed();
 
 	static void AssertStreamOutput(
 		Token::Type, std::string expected);
 	static void AssertStreamOutput(
 		const Token &, std::string expected);
 
+	static void AssertHasMore(Tokenizer &);
+	static void AssertToken(
+		Token::Type expected_type, const Token &actual_token);
+	static void AssertToken(
+		Token::Type expected_type, std::string expected_value,
+		const Token &actual_token);
+
 };
 
 }