diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/core/model/TypesystemTest.cpp | 2 | ||||
| -rw-r--r-- | test/formats/osxml/OsxmlParserTest.cpp | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/test/core/model/TypesystemTest.cpp b/test/core/model/TypesystemTest.cpp index 9b5872c..ae6f11f 100644 --- a/test/core/model/TypesystemTest.cpp +++ b/test/core/model/TypesystemTest.cpp @@ -961,6 +961,7 @@ TEST(Typesystem, rtti) ASSERT_TRUE(typesystem->composedOf(&RttiTypes::IntType)); ASSERT_TRUE(typesystem->composedOf(&RttiTypes::DoubleType)); ASSERT_TRUE(typesystem->composedOf(&RttiTypes::BoolType)); + ASSERT_TRUE(typesystem->composedOf(&RttiTypes::CardinalityType)); ASSERT_TRUE(typesystem->composedOf(&RttiTypes::EnumType)); ASSERT_TRUE(typesystem->composedOf(&RttiTypes::StructType)); ASSERT_FALSE(typesystem->composedOf(&RttiTypes::ArrayType)); @@ -982,6 +983,7 @@ TEST(SystemTypesystem, rtti) ASSERT_TRUE(typesystem->composedOf(&RttiTypes::IntType)); ASSERT_TRUE(typesystem->composedOf(&RttiTypes::DoubleType)); ASSERT_TRUE(typesystem->composedOf(&RttiTypes::BoolType)); + ASSERT_TRUE(typesystem->composedOf(&RttiTypes::CardinalityType)); ASSERT_TRUE(typesystem->composedOf(&RttiTypes::EnumType)); ASSERT_TRUE(typesystem->composedOf(&RttiTypes::StructType)); ASSERT_FALSE(typesystem->composedOf(&RttiTypes::ArrayType)); diff --git a/test/formats/osxml/OsxmlParserTest.cpp b/test/formats/osxml/OsxmlParserTest.cpp index a2bd8b1..fe8ed34 100644 --- a/test/formats/osxml/OsxmlParserTest.cpp +++ b/test/formats/osxml/OsxmlParserTest.cpp @@ -214,15 +214,8 @@ TEST(OsxmlParser, domainParsing) // get the book struct node. Cardinality single; single.merge({1}); - Rooted<StructType> bookAuthor{ - new StructType(book_domain->getManager(), "", nullptr)}; - bookAuthor->addAttribute( - {new Attribute(book_domain->getManager(), "author", - env.project->getSystemTypesystem()->getStringType(), - "")}, - logger); Rooted<StructuredClass> book = checkStructuredClass( - "book", "book", book_domain, single, bookAuthor, nullptr, false, true); + "book", "book", book_domain, single, nullptr, nullptr, false, true); // get the chapter struct node. Rooted<StructuredClass> chapter = checkStructuredClass("chapter", "chapter", book_domain); |