From 3883e6df939ad1ecb9a788153e087fefd9f0e838 Mon Sep 17 00:00:00 2001 From: Benjamin Paassen Date: Fri, 6 Feb 2015 16:47:49 +0100 Subject: corrected attributes descriptor handling. --- test/core/model/DocumentTest.cpp | 24 ++++++++++-------------- test/core/model/DomainTest.cpp | 32 ++++++++++++++++---------------- test/core/model/TestAdvanced.hpp | 6 +++--- test/core/model/TestDomain.hpp | 6 +++--- 4 files changed, 32 insertions(+), 36 deletions(-) (limited to 'test/core') diff --git a/test/core/model/DocumentTest.cpp b/test/core/model/DocumentTest.cpp index 5a2bcec..177f69b 100644 --- a/test/core/model/DocumentTest.cpp +++ b/test/core/model/DocumentTest.cpp @@ -123,7 +123,7 @@ TEST(Document, validate) single.merge({1}); // Set up the "root" StructuredClass. Rooted rootClass{new StructuredClass( - mgr, "root", domain, single, {nullptr}, {nullptr}, false, true)}; + mgr, "root", domain, single, {nullptr}, false, true)}; // set up a document for it. { @@ -177,8 +177,8 @@ TEST(Document, validate) /* * Add a further extension to the domain: We add a subclass to child. */ - Rooted childSubClass{new StructuredClass( - mgr, "childSub", domain, single, {nullptr}, childClass)}; + Rooted childSubClass{ + new StructuredClass(mgr, "childSub", domain, single, childClass)}; { /* * A document with one instance of the Child subclass should be valid. @@ -284,23 +284,19 @@ TEST(Document, validate) ASSERT_EQ(ValidationState::UNKNOWN, doc->getValidationState()); ASSERT_TRUE(doc->validate(logger)); // add an attribute to the root, which should make it invalid. - root->setAttributes({2}); + root->setAttributes(Variant::mapType{{"bla", 2}}); ASSERT_EQ(ValidationState::UNKNOWN, doc->getValidationState()); ASSERT_FALSE(doc->validate(logger)); - // if we reset it to null it should be valid again - root->setAttributes({}); + // if we reset it to an empty map it should be valid again + root->setAttributes(Variant::mapType{}); ASSERT_EQ(ValidationState::UNKNOWN, doc->getValidationState()); ASSERT_TRUE(doc->validate(logger)); // let's set an attribute descriptor. - Rooted structType{StructType::createValidated( - mgr, "attributes", nullptr, nullptr, - NodeVector{ - new Attribute{mgr, "myAttr", sys->getStringType(), "default"}}, - logger)}; - childSubClass->setAttributesDescriptor(structType); + childSubClass->getAttributesDescriptor()->addAttribute( + new Attribute{mgr, "myAttr", sys->getStringType(), "default"}, + logger); // the right map content should be valid now. - child->setAttributes( - std::map{{"myAttr", "content"}}); + child->setAttributes(Variant::mapType{{"myAttr", "content"}}); ASSERT_EQ(ValidationState::UNKNOWN, doc->getValidationState()); ASSERT_TRUE(doc->validate(logger)); // but an empty map as well diff --git a/test/core/model/DomainTest.cpp b/test/core/model/DomainTest.cpp index 69c6694..8fcd21d 100644 --- a/test/core/model/DomainTest.cpp +++ b/test/core/model/DomainTest.cpp @@ -154,22 +154,22 @@ TEST(Descriptor, pathToAdvanced) // Let's create the classes that we need first Rooted A{new StructuredClass( - mgr, "A", domain, AnyCardinality, {nullptr}, {nullptr}, false, true)}; + mgr, "A", domain, AnyCardinality, {nullptr}, false, true)}; Rooted start{new StructuredClass( - mgr, "start", domain, AnyCardinality, {nullptr}, A, false, false)}; + mgr, "start", domain, AnyCardinality, A, false, false)}; Rooted B{new StructuredClass( - mgr, "B", domain, AnyCardinality, {nullptr}, {nullptr}, true, false)}; + mgr, "B", domain, AnyCardinality, {nullptr}, true, false)}; - Rooted C{new StructuredClass( - mgr, "C", domain, AnyCardinality, {nullptr}, B, true, false)}; + Rooted C{ + new StructuredClass(mgr, "C", domain, AnyCardinality, B, true, false)}; Rooted D{new StructuredClass( - mgr, "D", domain, AnyCardinality, {nullptr}, {nullptr}, true, false)}; + mgr, "D", domain, AnyCardinality, {nullptr}, true, false)}; Rooted E{new StructuredClass( - mgr, "E", domain, AnyCardinality, {nullptr}, {nullptr}, true, false)}; + mgr, "E", domain, AnyCardinality, {nullptr}, true, false)}; Rooted target{ new StructuredClass(mgr, "target", domain, AnyCardinality)}; @@ -223,19 +223,19 @@ TEST(StructuredClass, isSubclassOf) Rooted sys{new SystemTypesystem(mgr)}; Rooted domain{new Domain(mgr, sys, "inheritance")}; Rooted A{new StructuredClass( - mgr, "A", domain, AnyCardinality, {nullptr}, {nullptr}, false, true)}; + mgr, "A", domain, AnyCardinality, {nullptr}, false, true)}; // first branch Rooted B{ - new StructuredClass(mgr, "B", domain, AnyCardinality, {nullptr}, A)}; + new StructuredClass(mgr, "B", domain, AnyCardinality, A)}; Rooted C{ - new StructuredClass(mgr, "C", domain, AnyCardinality, {nullptr}, B)}; + new StructuredClass(mgr, "C", domain, AnyCardinality, B)}; // second branch Rooted D{ - new StructuredClass(mgr, "D", domain, AnyCardinality, {nullptr}, A)}; + new StructuredClass(mgr, "D", domain, AnyCardinality, A)}; Rooted E{ - new StructuredClass(mgr, "E", domain, AnyCardinality, {nullptr}, D)}; + new StructuredClass(mgr, "E", domain, AnyCardinality, D)}; Rooted F{ - new StructuredClass(mgr, "F", domain, AnyCardinality, {nullptr}, D)}; + new StructuredClass(mgr, "F", domain, AnyCardinality, D)}; // check function results ASSERT_FALSE(A->isSubclassOf(A)); @@ -335,16 +335,16 @@ TEST(Domain, validate) ASSERT_EQ(ValidationState::UNKNOWN, domain->getValidationState()); ASSERT_TRUE(domain->validate(logger)); // and still if we add a superclass. - sub->setSuperclass(base); + sub->setSuperclass(base, logger); ASSERT_EQ(ValidationState::UNKNOWN, domain->getValidationState()); ASSERT_TRUE(domain->validate(logger)); // and still we we remove the subclass from the base class. - base->removeSubclass(sub); + base->removeSubclass(sub, logger); ASSERT_EQ(ValidationState::UNKNOWN, domain->getValidationState()); ASSERT_TRUE(domain->validate(logger)); ASSERT_EQ(nullptr, sub->getSuperclass()); // and still if we re-add it. - base->addSubclass(sub); + base->addSubclass(sub, logger); ASSERT_EQ(ValidationState::UNKNOWN, domain->getValidationState()); ASSERT_TRUE(domain->validate(logger)); ASSERT_EQ(base, sub->getSuperclass()); diff --git a/test/core/model/TestAdvanced.hpp b/test/core/model/TestAdvanced.hpp index 3845676..2e4a541 100644 --- a/test/core/model/TestAdvanced.hpp +++ b/test/core/model/TestAdvanced.hpp @@ -56,7 +56,7 @@ static Rooted constructHeadingDomain(Manager &mgr, card.merge({0, 1}); // set up heading StructuredClass. Rooted heading{new StructuredClass( - mgr, "heading", domain, card, {nullptr}, {nullptr}, true)}; + mgr, "heading", domain, card, {nullptr}, true)}; // as field want to copy the field of paragraph. Rooted p = resolveDescriptor(bookDomain, "paragraph"); heading->copyFieldDescriptor(p->getFieldDescriptors()[0]); @@ -86,7 +86,7 @@ static Rooted constructListDomain(Manager &mgr, Rooted p = resolveDescriptor(bookDomain, "paragraph"); // set up item StructuredClass; Rooted item{new StructuredClass( - mgr, "item", domain, AnyCardinality, {nullptr}, {nullptr}, false)}; + mgr, "item", domain, AnyCardinality, {nullptr}, false)}; // as field we want to copy the field of paragraph. item->copyFieldDescriptor(p->getFieldDescriptors()[0]); @@ -94,7 +94,7 @@ static Rooted constructListDomain(Manager &mgr, std::vector listTypes{"ol", "ul"}; for (auto &listType : listTypes) { Rooted list{new StructuredClass( - mgr, listType, domain, AnyCardinality, {nullptr}, p, false)}; + mgr, listType, domain, AnyCardinality, p, false)}; Rooted list_field{new FieldDescriptor(mgr, list)}; list_field->addChild(item); } diff --git a/test/core/model/TestDomain.hpp b/test/core/model/TestDomain.hpp index 88ab715..18c42bd 100644 --- a/test/core/model/TestDomain.hpp +++ b/test/core/model/TestDomain.hpp @@ -39,7 +39,7 @@ static Rooted constructBookDomain(Manager &mgr, // Set up the "book" node. Rooted book{new StructuredClass( - mgr, "book", domain, single, {nullptr}, {nullptr}, false, true)}; + mgr, "book", domain, single, {nullptr}, false, true)}; // The structure field of it. Rooted book_field{new FieldDescriptor(mgr, book)}; @@ -54,7 +54,7 @@ static Rooted constructBookDomain(Manager &mgr, // We also add the "paragraph", which is transparent. Rooted paragraph{new StructuredClass( - mgr, "paragraph", domain, AnyCardinality, {nullptr}, {nullptr}, true)}; + mgr, "paragraph", domain, AnyCardinality, {nullptr}, true)}; section_field->addChild(paragraph); book_field->addChild(paragraph); @@ -76,7 +76,7 @@ static Rooted constructBookDomain(Manager &mgr, // Finally we add the "text" node, which is transparent as well. Rooted text{new StructuredClass( - mgr, "text", domain, AnyCardinality, {nullptr}, {nullptr}, true)}; + mgr, "text", domain, AnyCardinality, {nullptr}, true)}; paragraph_field->addChild(text); // ... and has a primitive field. -- cgit v1.2.3