diff options
author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-01-28 01:04:28 +0100 |
---|---|---|
committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-01-28 01:04:28 +0100 |
commit | 87a89145c476713fa5716bf1a15b8b4d498d0a61 (patch) | |
tree | c99534c8205f0bb0b2a7455e8c0bfe1c52cb753c /test/core | |
parent | 4c3d0cd465a4445e1fbd851e975727be064a92f4 (diff) |
Renamed add* and include* methods for referencing another Typesystem/Domain description to "reference*" to have a consistent nomenclature
Diffstat (limited to 'test/core')
-rw-r--r-- | test/core/model/DocumentTest.cpp | 16 | ||||
-rw-r--r-- | test/core/model/TestAdvanced.hpp | 2 | ||||
-rw-r--r-- | test/core/model/TestDocument.hpp | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/test/core/model/DocumentTest.cpp b/test/core/model/DocumentTest.cpp index 563f1b4..c629bf5 100644 --- a/test/core/model/DocumentTest.cpp +++ b/test/core/model/DocumentTest.cpp @@ -126,7 +126,7 @@ TEST(Document, validate) { // first an invalid one, which is empty. Rooted<Document> doc{new Document(mgr, "myDoc.oxd")}; - doc->addDomain(domain); + doc->referenceDomain(domain); ASSERT_EQ(ValidationState::UNKNOWN, doc->getValidationState()); ASSERT_FALSE(doc->validate(logger)); // then add a root, which should make it valid. @@ -138,7 +138,7 @@ TEST(Document, validate) { // A root with an invalid name, however, should make it invalid Rooted<Document> doc{new Document(mgr, "myDoc.oxd")}; - doc->addDomain(domain); + doc->referenceDomain(domain); Rooted<StructuredEntity> root = buildRootStructuredEntity( doc, logger, {"root"}, {}, "my invalid root"); ASSERT_EQ(ValidationState::UNKNOWN, doc->getValidationState()); @@ -157,7 +157,7 @@ TEST(Document, validate) * document should be invalid again. */ Rooted<Document> doc{new Document(mgr, "myDoc.oxd")}; - doc->addDomain(domain); + doc->referenceDomain(domain); Rooted<StructuredEntity> root = buildRootStructuredEntity(doc, logger, {"root"}); ASSERT_EQ(ValidationState::UNKNOWN, doc->getValidationState()); @@ -181,7 +181,7 @@ TEST(Document, validate) * A document with one instance of the Child subclass should be valid. */ Rooted<Document> doc{new Document(mgr, "myDoc.oxd")}; - doc->addDomain(domain); + doc->referenceDomain(domain); Rooted<StructuredEntity> root = buildRootStructuredEntity(doc, logger, {"root"}); buildStructuredEntity(doc, logger, root, {"childSub"}); @@ -200,7 +200,7 @@ TEST(Document, validate) * invalid, because it has no children of itself. */ Rooted<Document> doc{new Document(mgr, "myDoc.oxd")}; - doc->addDomain(domain); + doc->referenceDomain(domain); Rooted<StructuredEntity> root = buildRootStructuredEntity(doc, logger, {"root"}); buildStructuredEntity(doc, logger, root, {"childSub"}); @@ -218,7 +218,7 @@ TEST(Document, validate) * valid, because of the override. */ Rooted<Document> doc{new Document(mgr, "myDoc.oxd")}; - doc->addDomain(domain); + doc->referenceDomain(domain); Rooted<StructuredEntity> root = buildRootStructuredEntity(doc, logger, {"root"}); buildStructuredEntity(doc, logger, root, {"childSub"}); @@ -234,7 +234,7 @@ TEST(Document, validate) * invalid again, because we are missing the primitive content. */ Rooted<Document> doc{new Document(mgr, "myDoc.oxd")}; - doc->addDomain(domain); + doc->referenceDomain(domain); Rooted<StructuredEntity> root = buildRootStructuredEntity(doc, logger, {"root"}); Rooted<StructuredEntity> child = @@ -259,7 +259,7 @@ TEST(Document, validate) * Create a valid document in itself. */ Rooted<Document> doc{new Document(mgr, "myDoc.oxd")}; - doc->addDomain(domain); + doc->referenceDomain(domain); Rooted<StructuredEntity> root = buildRootStructuredEntity(doc, logger, {"root"}); Rooted<Anchor> start{new Anchor(mgr, "start", root)}; diff --git a/test/core/model/TestAdvanced.hpp b/test/core/model/TestAdvanced.hpp index 035ee8e..d90f917 100644 --- a/test/core/model/TestAdvanced.hpp +++ b/test/core/model/TestAdvanced.hpp @@ -186,7 +186,7 @@ static Rooted<Document> constructAdvancedDocument(Manager &mgr, Logger &logger, { // Start with the (empty) document. Rooted<Document> doc{new Document(mgr, "kant_was_ist_aufklaerung.oxd")}; - doc->addDomains({bookDom, headingDom, listDom, emphasisDom}); + doc->referenceDomains({bookDom, headingDom, listDom, emphasisDom}); // Add the root. Rooted<StructuredEntity> book = diff --git a/test/core/model/TestDocument.hpp b/test/core/model/TestDocument.hpp index 243672b..0cb52a3 100644 --- a/test/core/model/TestDocument.hpp +++ b/test/core/model/TestDocument.hpp @@ -36,7 +36,7 @@ static Rooted<Document> constructBookDocument(Manager &mgr, Logger &logger, { // Start with the (empty) document. Rooted<Document> doc{new Document(mgr, "myDoc.oxd")}; - doc->addDomain(bookDomain); + doc->referenceDomain(bookDomain); // Add the root. Rooted<StructuredEntity> root = |