massively reworked demo html output.

2 files changed, 19 insertions, 14 deletions

diff --git a/test/core/model/DocumentTest.cpp b/test/core/model/DocumentTest.cpp
index 8ae9475..135ba19 100644
--- a/test/core/model/DocumentTest.cpp
+++ b/test/core/model/DocumentTest.cpp
@@ -249,7 +249,8 @@ TEST(Document, construct)
 TEST(Document, validate)
 {
 	// Let's start with a trivial ontology and a trivial document.
-	TerminalLogger logger{std::cerr, true};
+// 	TerminalLogger logger{std::cerr, true};
+	Logger logger;
 	Manager mgr{1};
 	Rooted<SystemTypesystem> sys{new SystemTypesystem(mgr)};
 	Rooted<Ontology> ontology{new Ontology(mgr, sys, "trivial")};
@@ -403,7 +404,7 @@ TEST(Document, validate)
 	    new AnnotationClass(mgr, "anno", ontology)};
 	{
 		/*
-		 * Create a valid document in itself.
+		 * Create a document with anchors.
 		 */
 		Rooted<Document> doc{new Document(mgr, "myDoc.oxd")};
 		doc->referenceOntology(ontology);
@@ -416,7 +417,8 @@ TEST(Document, validate)
 		    new DocumentPrimitive(mgr, child, {2}, "int")};
 		Rooted<Anchor> end{new Anchor(mgr, root)};
 		ASSERT_EQ(ValidationState::UNKNOWN, doc->getValidationState());
-		ASSERT_TRUE(doc->validate(logger));
+		// This should be invalid due to disconnected Anchors
+		ASSERT_FALSE(doc->validate(logger));
 		// then add an AnnotationEntity without Anchors.
 		Rooted<AnnotationEntity> anno =
 		    buildAnnotationEntity(doc, logger, {"anno"}, nullptr, nullptr);
diff --git a/test/core/model/TestAdvanced.hpp b/test/core/model/TestAdvanced.hpp
index c92effa..58eb965 100644
--- a/test/core/model/TestAdvanced.hpp
+++ b/test/core/model/TestAdvanced.hpp
@@ -45,9 +45,9 @@ static Rooted<StructuredClass> resolveDescriptor(Handle<Ontology> ontology,
  * This constructs the "heading" ontology given the book ontology.
  */
 static Rooted<Ontology> constructHeadingOntology(Manager &mgr,
-                                             Handle<SystemTypesystem> sys,
-                                             Handle<Ontology> bookOntology,
-                                             Logger &logger)
+                                                 Handle<SystemTypesystem> sys,
+                                                 Handle<Ontology> bookOntology,
+                                                 Logger &logger)
 {
 	// set up ontology node.
 	Rooted<Ontology> ontology{new Ontology(mgr, sys, "headings")};
@@ -78,9 +78,9 @@ static Rooted<Ontology> constructHeadingOntology(Manager &mgr,
  * This constructs the "list" ontology given the book ontology.
  */
 static Rooted<Ontology> constructListOntology(Manager &mgr,
-                                          Handle<SystemTypesystem> sys,
-                                          Handle<Ontology> bookOntology,
-                                          Logger &logger)
+                                              Handle<SystemTypesystem> sys,
+                                              Handle<Ontology> bookOntology,
+                                              Logger &logger)
 {
 	// set up ontology node.
 	Rooted<Ontology> ontology{new Ontology(mgr, sys, "list")};
@@ -97,7 +97,8 @@ static Rooted<Ontology> constructListOntology(Manager &mgr,
 	for (auto &listType : listTypes) {
 		Rooted<StructuredClass> list{new StructuredClass(
 		    mgr, listType, ontology, Cardinality::any(), p, false)};
-		Rooted<FieldDescriptor> list_field{new FieldDescriptor(mgr, list)};
+		Rooted<FieldDescriptor> list_field =
+		    list->createFieldDescriptor(logger).first;
 		list_field->addChild(item);
 	}
 	return ontology;
@@ -107,15 +108,17 @@ static Rooted<Ontology> constructListOntology(Manager &mgr,
  * This constructs the "emphasis" ontology.
  */
 static Rooted<Ontology> constructEmphasisOntology(Manager &mgr,
-                                              Handle<SystemTypesystem> sys,
-                                              Logger &logger)
+                                                  Handle<SystemTypesystem> sys,
+                                                  Logger &logger)
 {
 	// set up ontology node.
 	Rooted<Ontology> ontology{new Ontology(mgr, sys, "emphasis")};
 	// create AnnotationClasses
-	Rooted<AnnotationClass> em{new AnnotationClass(mgr, "emphasized", ontology)};
+	Rooted<AnnotationClass> em{
+	    new AnnotationClass(mgr, "emphasized", ontology)};
 
-	Rooted<AnnotationClass> strong{new AnnotationClass(mgr, "strong", ontology)};
+	Rooted<AnnotationClass> strong{
+	    new AnnotationClass(mgr, "strong", ontology)};
 
 	return ontology;
 }