diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-02-17 18:32:36 +0100 | 
|---|---|---|
| committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-02-17 18:32:36 +0100 | 
| commit | 2662f67a6c3cf74bbefff26abeac2c67ee02a57c (patch) | |
| tree | ddc112172dab509cdb19522203c3c9caf792c11d /test/core/model | |
| parent | 26d2236c89017d5f9f31b90ec02600744aa5ad0f (diff) | |
| parent | adbf7bdcd62b7f8d264028260624175d504e13ed (diff) | |
Merge branch 'master' of somweyr.de:ousia
Diffstat (limited to 'test/core/model')
| -rw-r--r-- | test/core/model/TestAdvanced.hpp | 12 | 
1 files changed, 7 insertions, 5 deletions
diff --git a/test/core/model/TestAdvanced.hpp b/test/core/model/TestAdvanced.hpp index 8e81554..71379d2 100644 --- a/test/core/model/TestAdvanced.hpp +++ b/test/core/model/TestAdvanced.hpp @@ -65,8 +65,10 @@ static Rooted<Domain> constructHeadingDomain(Manager &mgr,  	                                    "paragraph"};  	for (auto &s : secclasses) {  		Rooted<StructuredClass> desc = resolveDescriptor(bookDomain, s); -		Rooted<FieldDescriptor> heading_field = desc->createFieldDescriptor( -		    logger, FieldDescriptor::FieldType::SUBTREE, "heading", true).first; +		Rooted<FieldDescriptor> heading_field = +		    desc->createFieldDescriptor(logger, +		                                FieldDescriptor::FieldType::SUBTREE, +		                                "heading", true).first;  		heading_field->addChild(heading);  	}  	return domain; @@ -139,7 +141,7 @@ static bool addHeading(Logger &logger, Handle<Document> doc,  {  	// Add the heading.  	Rooted<StructuredEntity> heading = buildStructuredEntity( -	    doc, logger, parent, {"heading"}, "heading", {}, ""); +	    doc, logger, parent, {"heading"}, "heading", Variant::mapType{}, "");  	if (heading.isNull()) {  		return false;  	} @@ -193,7 +195,7 @@ static Rooted<Document> constructAdvancedDocument(Manager &mgr, Logger &logger,  	// Add the heading.  	{  		Rooted<StructuredEntity> heading = buildStructuredEntity( -		    doc, logger, book, {"heading"}, "heading", {}, ""); +		    doc, logger, book, {"heading"}, "heading", Variant::mapType{}, "");  		if (heading.isNull()) {  			return {nullptr};  		} @@ -311,4 +313,4 @@ static Rooted<Document> constructAdvancedDocument(Manager &mgr, Logger &logger,  }  } -#endif /* _TEST_DOCUMENT_HPP_ */ +#endif /* _TEST_DOCUMENT_HPP_ */
\ No newline at end of file  | 
