diff options
Diffstat (limited to 'test/core/parser')
| -rw-r--r-- | test/core/parser/ParserScopeTest.cpp | 6 | ||||
| -rw-r--r-- | test/core/parser/stack/StackTest.cpp | 20 | 
2 files changed, 13 insertions, 13 deletions
diff --git a/test/core/parser/ParserScopeTest.cpp b/test/core/parser/ParserScopeTest.cpp index 7f89f2c..2ead924 100644 --- a/test/core/parser/ParserScopeTest.cpp +++ b/test/core/parser/ParserScopeTest.cpp @@ -18,6 +18,7 @@  #include <gtest/gtest.h> +#include <core/common/Logger.hpp>  #include <core/managed/Manager.hpp>  #include <core/model/Node.hpp>  #include <core/parser/ParserScope.hpp> @@ -26,6 +27,7 @@ namespace ousia {  TEST(ParserScope, flags)  { +	Logger logger;  	Manager mgr;  	ParserScope scope; @@ -42,9 +44,9 @@ TEST(ParserScope, flags)  	ASSERT_TRUE(scope.getFlag(ParserFlag::POST_HEAD));  	scope.setFlag(ParserFlag::POST_HEAD, false);  	ASSERT_FALSE(scope.getFlag(ParserFlag::POST_HEAD)); -	scope.pop(); +	scope.pop(logger);  	ASSERT_TRUE(scope.getFlag(ParserFlag::POST_HEAD)); -	scope.pop(); +	scope.pop(logger);  	ASSERT_FALSE(scope.getFlag(ParserFlag::POST_HEAD));  	scope.setFlag(ParserFlag::POST_HEAD, true);  	ASSERT_TRUE(scope.getFlag(ParserFlag::POST_HEAD)); diff --git a/test/core/parser/stack/StackTest.cpp b/test/core/parser/stack/StackTest.cpp index e25f487..a93f14a 100644 --- a/test/core/parser/stack/StackTest.cpp +++ b/test/core/parser/stack/StackTest.cpp @@ -449,10 +449,10 @@ TEST(Stack, noImplicitDefaultFieldOnIncompatibleCommand)  		tracker.fieldStartResult = false;  		s.command("b", {}); -		tracker.expect(2, 1, 1, 1, 0, 0, 0);  // sc, ec, fsc, fse, asc, aec, dc +		tracker.expect(2, 1, 1, 0, 0, 0, 0);  // sc, ec, fsc, fse, asc, aec, dc  		ASSERT_EQ("b", s.currentCommandName());  	} -	tracker.expect(2, 2, 1, 1, 0, 0, 0);  // sc, ec, fsc, fse, asc, aec, dc +	tracker.expect(2, 2, 1, 0, 0, 0, 0);  // sc, ec, fsc, fse, asc, aec, dc  	ASSERT_FALSE(logger.hasError());  } @@ -563,9 +563,9 @@ TEST(Stack, invalidDefaultField)  		tracker.fieldStartResult = false;  		s.fieldStart(true);  		s.fieldEnd(); -		tracker.expect(1, 0, 1, 1, 0, 0, 0);  // sc, ec, fsc, fse, asc, aec, dc +		tracker.expect(1, 0, 1, 0, 0, 0, 0);  // sc, ec, fsc, fse, asc, aec, dc  	} -	tracker.expect(1, 1, 1, 1, 0, 0, 0);  // sc, ec, fsc, fse, asc, aec, dc +	tracker.expect(1, 1, 1, 0, 0, 0, 0);  // sc, ec, fsc, fse, asc, aec, dc  	ASSERT_FALSE(logger.hasError());  } @@ -583,9 +583,9 @@ TEST(Stack, errorInvalidDefaultFieldData)  		s.data("test");  		ASSERT_TRUE(logger.hasError());  		s.fieldEnd(); -		tracker.expect(1, 0, 1, 1, 0, 0, 0);  // sc, ec, fsc, fse, asc, aec, dc +		tracker.expect(1, 0, 1, 0, 0, 0, 0);  // sc, ec, fsc, fse, asc, aec, dc  	} -	tracker.expect(1, 1, 1, 1, 0, 0, 0);  // sc, ec, fsc, fse, asc, aec, dc +	tracker.expect(1, 1, 1, 0, 0, 0, 0);  // sc, ec, fsc, fse, asc, aec, dc  }  TEST(Stack, errorInvalidFieldData) @@ -602,9 +602,9 @@ TEST(Stack, errorInvalidFieldData)  		ASSERT_TRUE(logger.hasError());  		s.data("test");  		s.fieldEnd(); -		tracker.expect(1, 0, 1, 1, 0, 0, 0);  // sc, ec, fsc, fse, asc, aec, dc +		tracker.expect(1, 0, 1, 0, 0, 0, 0);  // sc, ec, fsc, fse, asc, aec, dc  	} -	tracker.expect(1, 1, 1, 1, 0, 0, 0);  // sc, ec, fsc, fse, asc, aec, dc +	tracker.expect(1, 1, 1, 0, 0, 0, 0);  // sc, ec, fsc, fse, asc, aec, dc  }  TEST(Stack, errorFieldStartNoCommand) @@ -743,7 +743,5 @@ TEST(Stack, fieldAfterDefaultField)  	tracker.expect(2, 2, 3, 3, 0, 0, 2);  // sc, ec, fsc, fse, asc, aec, dc  	ASSERT_FALSE(logger.hasError());  } - -}  } - +}
\ No newline at end of file  | 
