From 0b4711c86e97fa81265d0e0ef29027d5795ee8d9 Mon Sep 17 00:00:00 2001 From: Andreas Stöckel Date: Thu, 1 Jan 2015 15:13:02 +0100 Subject: Adapted unit tests --- test/core/model/TypesystemTest.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'test/core/model') diff --git a/test/core/model/TypesystemTest.cpp b/test/core/model/TypesystemTest.cpp index b2f2600..29ab5ec 100644 --- a/test/core/model/TypesystemTest.cpp +++ b/test/core/model/TypesystemTest.cpp @@ -27,7 +27,7 @@ namespace ousia { namespace model { static TerminalLogger logger(std::cerr, true); -//static Logger logger; +//static ConcreteLogger logger; /* Class StringType */ @@ -318,28 +318,28 @@ TEST(EnumType, createValidated) Manager mgr; { - logger.resetMaxEncounteredSeverity(); + logger.reset(); Rooted enumType{EnumType::createValidated( mgr, "enum", nullptr, {"a", "b", "c"}, logger)}; ASSERT_EQ(Severity::DEBUG, logger.getMaxEncounteredSeverity()); } { - logger.resetMaxEncounteredSeverity(); + logger.reset(); Rooted enumType{EnumType::createValidated( mgr, "enum", nullptr, {"a", "a", "c"}, logger)}; ASSERT_EQ(Severity::ERROR, logger.getMaxEncounteredSeverity()); } { - logger.resetMaxEncounteredSeverity(); + logger.reset(); Rooted enumType{ EnumType::createValidated(mgr, "enum", nullptr, {}, logger)}; ASSERT_EQ(Severity::ERROR, logger.getMaxEncounteredSeverity()); } { - logger.resetMaxEncounteredSeverity(); + logger.reset(); Rooted enumType{ EnumType::createValidated(mgr, "enum", nullptr, {"a a"}, logger)}; ASSERT_EQ(Severity::ERROR, logger.getMaxEncounteredSeverity()); @@ -483,7 +483,7 @@ TEST(StructType, createValidated) Rooted intType{new IntType(mgr, nullptr)}; { - logger.resetMaxEncounteredSeverity(); + logger.reset(); Rooted structType{StructType::createValidated( mgr, "struct", nullptr, nullptr, NodeVector{ @@ -496,7 +496,7 @@ TEST(StructType, createValidated) } { - logger.resetMaxEncounteredSeverity(); + logger.reset(); Rooted structType{StructType::createValidated( mgr, "struct", nullptr, nullptr, NodeVector{ @@ -509,7 +509,7 @@ TEST(StructType, createValidated) } { - logger.resetMaxEncounteredSeverity(); + logger.reset(); Rooted structType{StructType::createValidated( mgr, "struct", nullptr, nullptr, NodeVector{ -- cgit v1.2.3