diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-04-10 14:31:46 +0200 | 
|---|---|---|
| committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2016-04-25 22:24:13 +0200 | 
| commit | 579b0e14d3bc1345512cac00a83159569cfcfa00 (patch) | |
| tree | 6254767a8913487821dc3f893119d5f29cfd55c2 /test | |
| parent | e56144c7eca8b56045c769f17e157db86f47b1b1 (diff) | |
Use "emph" instead of "emphasized" for the demo html output, adapt unit tests accordingly
Diffstat (limited to 'test')
| -rw-r--r-- | test/core/model/TestAdvanced.hpp | 12 | ||||
| -rw-r--r-- | test/plugins/html/DemoOutputTest.cpp | 2 | ||||
| -rw-r--r-- | test/plugins/xml/XmlOutputTest.cpp | 10 | 
3 files changed, 12 insertions, 12 deletions
| diff --git a/test/core/model/TestAdvanced.hpp b/test/core/model/TestAdvanced.hpp index 58eb965..a4e527a 100644 --- a/test/core/model/TestAdvanced.hpp +++ b/test/core/model/TestAdvanced.hpp @@ -115,7 +115,7 @@ static Rooted<Ontology> constructEmphasisOntology(Manager &mgr,  	Rooted<Ontology> ontology{new Ontology(mgr, sys, "emphasis")};  	// create AnnotationClasses  	Rooted<AnnotationClass> em{ -	    new AnnotationClass(mgr, "emphasized", ontology)}; +	    new AnnotationClass(mgr, "emph", ontology)};  	Rooted<AnnotationClass> strong{  	    new AnnotationClass(mgr, "strong", ontology)}; @@ -206,7 +206,7 @@ static Rooted<Document> constructAdvancedDocument(Manager &mgr, Logger &logger,  			return {nullptr};  		}  		if (!addAnnotation(logger, doc, heading, "Was ist Aufklärung?", -		                   "emphasized")) { +		                   "emph")) {  			return {nullptr};  		}  	} @@ -238,7 +238,7 @@ static Rooted<Document> constructAdvancedDocument(Manager &mgr, Logger &logger,  			                   "strong")) {  				return {nullptr};  			} -			if (!addAnnotation(logger, doc, p, "Unmündigkeit", "emphasized")) { +			if (!addAnnotation(logger, doc, p, "Unmündigkeit", "emph")) {  				return {nullptr};  			}  			if (!addText(logger, doc, p, @@ -247,7 +247,7 @@ static Rooted<Document> constructAdvancedDocument(Manager &mgr, Logger &logger,  				return {nullptr};  			}  			if (!addAnnotation(logger, doc, p, "Selbstverschuldet", -			                   "emphasized")) { +			                   "emph")) {  				return {nullptr};  			}  			if (!addText(logger, doc, p, @@ -260,7 +260,7 @@ static Rooted<Document> constructAdvancedDocument(Manager &mgr, Logger &logger,  			if (!addAnnotation(logger, doc, p,  			                   "Sapere aude! Habe Mut, dich deines eigenen "  			                   "Verstandes zu bedienen!", -			                   "emphasized")) { +			                   "emph")) {  				return {nullptr};  			}  			if (!addText(logger, doc, p, @@ -316,4 +316,4 @@ static Rooted<Document> constructAdvancedDocument(Manager &mgr, Logger &logger,  }  } -#endif /* _TEST_DOCUMENT_HPP_ */
\ No newline at end of file +#endif /* _TEST_DOCUMENT_HPP_ */ diff --git a/test/plugins/html/DemoOutputTest.cpp b/test/plugins/html/DemoOutputTest.cpp index f2d0a24..e228953 100644 --- a/test/plugins/html/DemoOutputTest.cpp +++ b/test/plugins/html/DemoOutputTest.cpp @@ -98,7 +98,7 @@ TEST(DemoHTMLTransformer, AnnotationProcessing)  	Rooted<Anchor> em_end{new Anchor(mgr, p)};  	ASSERT_TRUE(addText(logger, doc, p, "bla"));  	Rooted<Anchor> strong_end{new Anchor(mgr, p)}; -	buildAnnotationEntity(doc, logger, {"emphasized"}, em_start, em_end); +	buildAnnotationEntity(doc, logger, {"emph"}, em_start, em_end);  	buildAnnotationEntity(doc, logger, {"strong"}, strong_start, strong_end);  #ifdef MANAGER_GRAPHVIZ_EXPORT diff --git a/test/plugins/xml/XmlOutputTest.cpp b/test/plugins/xml/XmlOutputTest.cpp index ac80a57..92d8a85 100644 --- a/test/plugins/xml/XmlOutputTest.cpp +++ b/test/plugins/xml/XmlOutputTest.cpp @@ -91,7 +91,7 @@ TEST(DemoHTMLTransformer, AnnotationProcessing)  	Rooted<Anchor> em_end{new Anchor(mgr, p)};  	ASSERT_TRUE(addText(logger, doc, p, "bla"));  	Rooted<Anchor> strong_end{new Anchor(mgr, p)}; -	buildAnnotationEntity(doc, logger, {"emphasized"}, em_start, em_end); +	buildAnnotationEntity(doc, logger, {"emph"}, em_start, em_end);  	buildAnnotationEntity(doc, logger, {"strong"}, strong_start, strong_end);  	// Check serialization. @@ -103,9 +103,9 @@ TEST(DemoHTMLTransformer, AnnotationProcessing)  	// In HTML the overlapping structure must be serialized as follows:  	ASSERT_TRUE(  	    res.find( -	        "<a:start:emphasized/><book:text>bla</book:text><a:start:strong/" -	        "><book:text>blub</book:text><a:end:emphasized/" -	        "><book:text>bla</book:text><a:end:strong/>") != std::string::npos); +	        "<a:start:emph/><book:text>bla</book:text><a:start:strong/>" +	        "<book:text>blub</book:text><a:end:emph/>" +	        "<book:text>bla</book:text><a:end:strong/>") != std::string::npos);  }  TEST(DemoHTMLTransformer, PrimitiveSubtreeFields) @@ -148,4 +148,4 @@ TEST(DemoHTMLTransformer, PrimitiveSubtreeFields)  	    std::string::npos);  }  } -}
\ No newline at end of file +} | 
