From a7019614896fdd3e29b9a28f6a8cfd2c1b365983 Mon Sep 17 00:00:00 2001 From: Benjamin Paassen Date: Sun, 1 Mar 2015 20:47:25 +0100 Subject: Renamed domain to ontology. --- test/plugins/filesystem/FileLocatorTest.cpp | 22 +++++++++---------- test/plugins/html/DemoOutputTest.cpp | 24 ++++++++++---------- test/plugins/xml/XmlOutputTest.cpp | 34 ++++++++++++++--------------- 3 files changed, 40 insertions(+), 40 deletions(-) (limited to 'test/plugins') diff --git a/test/plugins/filesystem/FileLocatorTest.cpp b/test/plugins/filesystem/FileLocatorTest.cpp index 22db926..e2aacb1 100644 --- a/test/plugins/filesystem/FileLocatorTest.cpp +++ b/test/plugins/filesystem/FileLocatorTest.cpp @@ -38,12 +38,12 @@ TEST(FileLocator, addSearchPath) // Add one path for three types. instance.addSearchPath(".", - {ResourceType::DOMAIN_DESC, ResourceType::SCRIPT, + {ResourceType::ONTOLOGY, ResourceType::SCRIPT, ResourceType::TYPESYSTEM}); ASSERT_EQ(3U, instance.getSearchPaths().size()); - auto it = instance.getSearchPaths().find(ResourceType::DOMAIN_DESC); + auto it = instance.getSearchPaths().find(ResourceType::ONTOLOGY); ASSERT_EQ(1U, it->second.size()); ASSERT_EQ(canonicalPath, it->second[0]); @@ -64,12 +64,12 @@ TEST(FileLocator, addSearchPath) // Adding the path another time should not increase the number of found // paths, except for new resource types instance.addSearchPath( - canonicalPath, {ResourceType::DOMAIN_DESC, ResourceType::SCRIPT, + canonicalPath, {ResourceType::ONTOLOGY, ResourceType::SCRIPT, ResourceType::TYPESYSTEM, ResourceType::ATTRIBUTES}); ASSERT_EQ(4U, instance.getSearchPaths().size()); - it = instance.getSearchPaths().find(ResourceType::DOMAIN_DESC); + it = instance.getSearchPaths().find(ResourceType::ONTOLOGY); ASSERT_EQ(1U, it->second.size()); ASSERT_EQ(canonicalPath, it->second[0]); @@ -93,11 +93,11 @@ TEST(FileLocator, addSearchPath) std::string canonicalPath2 = fs::canonical("..").generic_string(); - instance.addSearchPath("..", {ResourceType::DOMAIN_DESC}); + instance.addSearchPath("..", {ResourceType::ONTOLOGY}); ASSERT_EQ(4U, instance.getSearchPaths().size()); - it = instance.getSearchPaths().find(ResourceType::DOMAIN_DESC); + it = instance.getSearchPaths().find(ResourceType::ONTOLOGY); ASSERT_EQ(2U, it->second.size()); ASSERT_EQ(canonicalPath, it->second[0]); @@ -106,7 +106,7 @@ TEST(FileLocator, addSearchPath) void assert_located(const FileLocator &instance, const std::string &path, const std::string &relativeTo, - ResourceType type = ResourceType::DOMAIN_DESC) + ResourceType type = ResourceType::ONTOLOGY) { Resource res; ASSERT_TRUE(instance.locate(res, path, type, relativeTo)); @@ -117,7 +117,7 @@ void assert_located(const FileLocator &instance, const std::string &path, void assert_not_located(const FileLocator &instance, const std::string &path, const std::string &relativeTo, - ResourceType type = ResourceType::DOMAIN_DESC) + ResourceType type = ResourceType::ONTOLOGY) { Resource res; ASSERT_FALSE(instance.locate(res, path, type, relativeTo)); @@ -134,7 +134,7 @@ TEST(FileLocator, locate) assert_not_located(locator, "c.txt", ""); // Add the respective search path - locator.addUnittestSearchPath("filesystem/b", ResourceType::DOMAIN_DESC); + locator.addUnittestSearchPath("filesystem/b", ResourceType::ONTOLOGY); // Now we should be able to find both. assert_located(locator, "a.txt", ""); @@ -217,8 +217,8 @@ TEST(FileLocator, testDefaultSearchPaths) locator.addDefaultSearchPaths(); assert_not_located(locator, "book.osxml", "", ResourceType::UNKNOWN); - assert_located(locator, "domain/book.osxml", "", ResourceType::UNKNOWN); - assert_located(locator, "book.osxml", "", ResourceType::DOMAIN_DESC); + assert_located(locator, "ontology/book.osxml", "", ResourceType::UNKNOWN); + assert_located(locator, "book.osxml", "", ResourceType::ONTOLOGY); assert_not_located(locator, "color.osxml", "", ResourceType::UNKNOWN); assert_located(locator, "typesystem/color.osxml", "", ResourceType::UNKNOWN); diff --git a/test/plugins/html/DemoOutputTest.cpp b/test/plugins/html/DemoOutputTest.cpp index 2f56e40..debb667 100644 --- a/test/plugins/html/DemoOutputTest.cpp +++ b/test/plugins/html/DemoOutputTest.cpp @@ -26,10 +26,10 @@ #include #include #include -#include +#include #include -#include +#include namespace ousia { namespace html { @@ -40,12 +40,12 @@ TEST(DemoHTMLTransformer, writeHTML) TerminalLogger logger{std::cerr, true}; Manager mgr{1}; Rooted sys{new SystemTypesystem(mgr)}; - // Get the domains. - Rooted bookDom = constructBookDomain(mgr, sys, logger); - Rooted headingDom = - constructHeadingDomain(mgr, sys, bookDom, logger); - Rooted listDom = constructListDomain(mgr, sys, bookDom, logger); - Rooted emDom = constructEmphasisDomain(mgr, sys, logger); + // Get the ontologies. + Rooted bookDom = constructBookOntology(mgr, sys, logger); + Rooted headingDom = + constructHeadingOntology(mgr, sys, bookDom, logger); + Rooted listDom = constructListOntology(mgr, sys, bookDom, logger); + Rooted emDom = constructEmphasisOntology(mgr, sys, logger); // Construct the document. Rooted doc = constructAdvancedDocument( mgr, logger, bookDom, headingDom, listDom, emDom); @@ -75,13 +75,13 @@ TEST(DemoHTMLTransformer, AnnotationProcessing) TerminalLogger logger{std::cerr, true}; Manager mgr{1}; Rooted sys{new SystemTypesystem(mgr)}; - // Get the domains. - Rooted bookDom = constructBookDomain(mgr, sys, logger); - Rooted emDom = constructEmphasisDomain(mgr, sys, logger); + // Get the ontologies. + Rooted bookDom = constructBookOntology(mgr, sys, logger); + Rooted emDom = constructEmphasisOntology(mgr, sys, logger); // Construct a document only containing overlapping annotations. // it has the form: blablubbla Rooted doc{new Document(mgr, "annotations.oxd")}; - doc->referenceDomains({bookDom, emDom}); + doc->referenceOntologys({bookDom, emDom}); Rooted book = buildRootStructuredEntity(doc, logger, {"book"}); ASSERT_TRUE(book != nullptr); diff --git a/test/plugins/xml/XmlOutputTest.cpp b/test/plugins/xml/XmlOutputTest.cpp index fcf72d2..ac80a57 100644 --- a/test/plugins/xml/XmlOutputTest.cpp +++ b/test/plugins/xml/XmlOutputTest.cpp @@ -26,10 +26,10 @@ #include #include #include -#include +#include #include -#include +#include namespace ousia { namespace xml { @@ -40,12 +40,12 @@ TEST(DemoHTMLTransformer, writeHTML) TerminalLogger logger{std::cerr, true}; Manager mgr{1}; Rooted sys{new SystemTypesystem(mgr)}; - // Get the domains. - Rooted bookDom = constructBookDomain(mgr, sys, logger); - Rooted headingDom = - constructHeadingDomain(mgr, sys, bookDom, logger); - Rooted listDom = constructListDomain(mgr, sys, bookDom, logger); - Rooted emDom = constructEmphasisDomain(mgr, sys, logger); + // Get the ontologies. + Rooted bookDom = constructBookOntology(mgr, sys, logger); + Rooted headingDom = + constructHeadingOntology(mgr, sys, bookDom, logger); + Rooted listDom = constructListOntology(mgr, sys, bookDom, logger); + Rooted emDom = constructEmphasisOntology(mgr, sys, logger); // Construct the document. Rooted doc = constructAdvancedDocument( mgr, logger, bookDom, headingDom, listDom, emDom); @@ -71,13 +71,13 @@ TEST(DemoHTMLTransformer, AnnotationProcessing) TerminalLogger logger{std::cerr, true}; Manager mgr{1}; Rooted sys{new SystemTypesystem(mgr)}; - // Get the domains. - Rooted bookDom = constructBookDomain(mgr, sys, logger); - Rooted emDom = constructEmphasisDomain(mgr, sys, logger); + // Get the ontologies. + Rooted bookDom = constructBookOntology(mgr, sys, logger); + Rooted emDom = constructEmphasisOntology(mgr, sys, logger); // Construct a document only containing overlapping annotations. // it has the form: blablubbla Rooted doc{new Document(mgr, "annotations.oxd")}; - doc->referenceDomains({bookDom, emDom}); + doc->referenceOntologys({bookDom, emDom}); Rooted book = buildRootStructuredEntity(doc, logger, {"book"}); ASSERT_TRUE(book != nullptr); @@ -114,11 +114,11 @@ TEST(DemoHTMLTransformer, PrimitiveSubtreeFields) TerminalLogger logger{std::cerr, true}; Manager mgr{1}; Rooted sys{new SystemTypesystem(mgr)}; - // Construct a simple domain. - Rooted domain{new Domain(mgr, sys, "myDomain")}; + // Construct a simple ontology. + Rooted ontology{new Ontology(mgr, sys, "myOntology")}; Rooted A{new StructuredClass( - mgr, "A", domain, Cardinality::any(), nullptr, false, true)}; + mgr, "A", ontology, Cardinality::any(), nullptr, false, true)}; Rooted A_a = A->createPrimitiveFieldDescriptor(sys->getStringType(), logger, FieldDescriptor::FieldType::SUBTREE, @@ -129,7 +129,7 @@ TEST(DemoHTMLTransformer, PrimitiveSubtreeFields) "b").first; Rooted A_main = A->createPrimitiveFieldDescriptor(sys->getStringType(), logger).first; - ASSERT_TRUE(domain->validate(logger)); + ASSERT_TRUE(ontology->validate(logger)); // Construct a document for it. Rooted doc{new Document(mgr, "myDoc")}; Rooted A_impl = doc->createRootStructuredEntity(A); @@ -144,7 +144,7 @@ TEST(DemoHTMLTransformer, PrimitiveSubtreeFields) transformer.writeXml(doc, out, logger, dummy, false); const std::string res = out.str(); ASSERT_TRUE( - res.find("test_atest_btest") != + res.find("test_atest_btest") != std::string::npos); } } -- cgit v1.2.3