summaryrefslogtreecommitdiff
path: root/test/core/model
diff options
context:
space:
mode:
authorAndreas Stöckel <astoecke@techfak.uni-bielefeld.de>2015-01-01 15:13:02 +0100
committerAndreas Stöckel <andreas@somweyr.de>2015-01-01 15:13:02 +0100
commit0b4711c86e97fa81265d0e0ef29027d5795ee8d9 (patch)
tree9cc05e2fb4119656c3715feae4b0cbe10f86e44a /test/core/model
parentdf0f3f2d143395b21162058c0b3ac274c7fc4df3 (diff)
Adapted unit tests
Diffstat (limited to 'test/core/model')
-rw-r--r--test/core/model/TypesystemTest.cpp16
1 files changed, 8 insertions, 8 deletions
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{EnumType::createValidated(
mgr, "enum", nullptr, {"a", "b", "c"}, logger)};
ASSERT_EQ(Severity::DEBUG, logger.getMaxEncounteredSeverity());
}
{
- logger.resetMaxEncounteredSeverity();
+ logger.reset();
Rooted<EnumType> enumType{EnumType::createValidated(
mgr, "enum", nullptr, {"a", "a", "c"}, logger)};
ASSERT_EQ(Severity::ERROR, logger.getMaxEncounteredSeverity());
}
{
- logger.resetMaxEncounteredSeverity();
+ logger.reset();
Rooted<EnumType> enumType{
EnumType::createValidated(mgr, "enum", nullptr, {}, logger)};
ASSERT_EQ(Severity::ERROR, logger.getMaxEncounteredSeverity());
}
{
- logger.resetMaxEncounteredSeverity();
+ logger.reset();
Rooted<EnumType> enumType{
EnumType::createValidated(mgr, "enum", nullptr, {"a a"}, logger)};
ASSERT_EQ(Severity::ERROR, logger.getMaxEncounteredSeverity());
@@ -483,7 +483,7 @@ TEST(StructType, createValidated)
Rooted<IntType> intType{new IntType(mgr, nullptr)};
{
- logger.resetMaxEncounteredSeverity();
+ logger.reset();
Rooted<StructType> structType{StructType::createValidated(
mgr, "struct", nullptr, nullptr,
NodeVector<Attribute>{
@@ -496,7 +496,7 @@ TEST(StructType, createValidated)
}
{
- logger.resetMaxEncounteredSeverity();
+ logger.reset();
Rooted<StructType> structType{StructType::createValidated(
mgr, "struct", nullptr, nullptr,
NodeVector<Attribute>{
@@ -509,7 +509,7 @@ TEST(StructType, createValidated)
}
{
- logger.resetMaxEncounteredSeverity();
+ logger.reset();
Rooted<StructType> structType{StructType::createValidated(
mgr, "struct", nullptr, nullptr,
NodeVector<Attribute>{