Commit 85a250ed by alokp@chromium.org

Updated VersionTest to use the same pattern as other tests.

git-svn-id: https://angleproject.googlecode.com/svn/trunk@1100 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 51b96855
...@@ -10,8 +10,10 @@ ...@@ -10,8 +10,10 @@
class VersionTest : public PreprocessorTest class VersionTest : public PreprocessorTest
{ {
protected: protected:
void lex() void preprocess(const char* str)
{ {
ASSERT_TRUE(mPreprocessor.init(1, &str, NULL));
pp::Token token; pp::Token token;
mPreprocessor.lex(&token); mPreprocessor.lex(&token);
EXPECT_EQ(pp::Token::LAST, token.type); EXPECT_EQ(pp::Token::LAST, token.type);
...@@ -22,7 +24,6 @@ class VersionTest : public PreprocessorTest ...@@ -22,7 +24,6 @@ class VersionTest : public PreprocessorTest
TEST_F(VersionTest, Valid) TEST_F(VersionTest, Valid)
{ {
const char* str = "#version 200\n"; const char* str = "#version 200\n";
ASSERT_TRUE(mPreprocessor.init(1, &str, NULL));
using testing::_; using testing::_;
EXPECT_CALL(mDirectiveHandler, EXPECT_CALL(mDirectiveHandler,
...@@ -30,7 +31,7 @@ TEST_F(VersionTest, Valid) ...@@ -30,7 +31,7 @@ TEST_F(VersionTest, Valid)
// No error or warning. // No error or warning.
EXPECT_CALL(mDiagnostics, print(_, _, _)).Times(0); EXPECT_CALL(mDiagnostics, print(_, _, _)).Times(0);
lex(); preprocess(str);
} }
TEST_F(VersionTest, CommentsIgnored) TEST_F(VersionTest, CommentsIgnored)
...@@ -44,7 +45,6 @@ TEST_F(VersionTest, CommentsIgnored) ...@@ -44,7 +45,6 @@ TEST_F(VersionTest, CommentsIgnored)
"/*foo*/" "/*foo*/"
"//foo" "//foo"
"\n"; "\n";
ASSERT_TRUE(mPreprocessor.init(1, &str, NULL));
using testing::_; using testing::_;
EXPECT_CALL(mDirectiveHandler, EXPECT_CALL(mDirectiveHandler,
...@@ -52,13 +52,12 @@ TEST_F(VersionTest, CommentsIgnored) ...@@ -52,13 +52,12 @@ TEST_F(VersionTest, CommentsIgnored)
// No error or warning. // No error or warning.
EXPECT_CALL(mDiagnostics, print(_, _, _)).Times(0); EXPECT_CALL(mDiagnostics, print(_, _, _)).Times(0);
lex(); preprocess(str);
} }
TEST_F(VersionTest, MissingNewline) TEST_F(VersionTest, MissingNewline)
{ {
const char* str = "#version 200"; const char* str = "#version 200";
ASSERT_TRUE(mPreprocessor.init(1, &str, NULL));
using testing::_; using testing::_;
// Directive successfully parsed. // Directive successfully parsed.
...@@ -67,7 +66,7 @@ TEST_F(VersionTest, MissingNewline) ...@@ -67,7 +66,7 @@ TEST_F(VersionTest, MissingNewline)
// Error reported about EOF. // Error reported about EOF.
EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::EOF_IN_DIRECTIVE, _, _)); EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::EOF_IN_DIRECTIVE, _, _));
lex(); preprocess(str);
} }
struct VersionTestParam struct VersionTestParam
...@@ -84,7 +83,6 @@ class InvalidVersionTest : public VersionTest, ...@@ -84,7 +83,6 @@ class InvalidVersionTest : public VersionTest,
TEST_P(InvalidVersionTest, Identified) TEST_P(InvalidVersionTest, Identified)
{ {
VersionTestParam param = GetParam(); VersionTestParam param = GetParam();
ASSERT_TRUE(mPreprocessor.init(1, &param.str, NULL));
using testing::_; using testing::_;
// No handleVersion call. // No handleVersion call.
...@@ -92,7 +90,7 @@ TEST_P(InvalidVersionTest, Identified) ...@@ -92,7 +90,7 @@ TEST_P(InvalidVersionTest, Identified)
// Invalid version directive call. // Invalid version directive call.
EXPECT_CALL(mDiagnostics, print(param.id, pp::SourceLocation(0, 1), _)); EXPECT_CALL(mDiagnostics, print(param.id, pp::SourceLocation(0, 1), _));
lex(); preprocess(param.str);
} }
static const VersionTestParam kParams[] = { static const VersionTestParam kParams[] = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment