<identify>、<number>、<boolean>を解釈するそれぞれの部分字句解析を行うLexerを追加。

[simplecms/utakata.git] / test / string_lexer_test.cpp

diff --git a/test/string_lexer_test.cpp b/test/string_lexer_test.cpp
index 4c0bd1d..6cf338f 100755 (executable)
--- a/test/string_lexer_test.cpp
+++ b/test/string_lexer_test.cpp
@@ -19,9 +19,9 @@ class StringLexerTest : public ::testing::Test {
   virtual void SetUp() {
     gen.reset(new textarrayformat::TextArrayGenerator("========="));
     gen->Punctuate("\"hoge\"");
-    gen->Punctuate("\"norma#\\x60;\"");
+    gen->Punctuate("\"norma\\x61;\"");
     gen->Punctuate("\"start \\   \nhoge\"");
-    gen->Punctuate("\"start\\\n huga");
+    gen->Punctuate("\"start\\\n huga\"");
     gen->Punctuate("#\\backspace");
     gen->Punctuate("#\\tab #\\linefeed");
     gen->Punctuate("#\\newline #\\vtab #\\page");
@@ -76,13 +76,13 @@ TEST_F(StringLexerTest, InitialWhitespaceRead) {
 TEST_F(StringLexerTest, InitialWhitespaceRead2) {
   textarrayformat::TextArrayReader textarray(*gen);
 
-  reader::StringReader sr(textarray.GetBlockAt(2));
+  reader::StringReader sr(textarray.GetBlockAt(3));
   reader::EncodingReader reader(&sr, new transcoder::UTF8Transcoder);
   lexer::StringLexer lexer;
 
   akebono::scoped_ptr<lexer::Lexeme> l(lexer.Lex(&reader));
   EXPECT_TRUE(l.get() != NULL);
-  EXPECT_TRUE(l->string() == unicode::Convert("starthoge"));
+  EXPECT_TRUE(l->string() == unicode::Convert("starthuga"));
   EXPECT_EQ(l->string().GetSize(), 9);
 }