From 100a24a53c862201d1fcaaf81c6faacb694d37e9 Mon Sep 17 00:00:00 2001 From: Benjamin Paassen Date: Fri, 6 Feb 2015 19:23:07 +0100 Subject: changed name of text field from content to default. --- test/core/model/DocumentTest.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'test/core/model/DocumentTest.cpp') diff --git a/test/core/model/DocumentTest.cpp b/test/core/model/DocumentTest.cpp index 177f69b..a692f73 100644 --- a/test/core/model/DocumentTest.cpp +++ b/test/core/model/DocumentTest.cpp @@ -65,11 +65,11 @@ TEST(Document, construct) foreword->getField()[0].cast(); ASSERT_FALSE(text.isNull()); ASSERT_EQ("text", text->getDescriptor()->getName()); - ASSERT_TRUE(text->hasField("content")); - ASSERT_EQ(1U, text->getField("content").size()); + ASSERT_TRUE(text->hasField()); + ASSERT_EQ(1U, text->getField().size()); ASSERT_TRUE( - text->getField("content")[0]->isa(typeOf())); - Variant content = text->getField("content")[0] + text->getField()[0]->isa(typeOf())); + Variant content = text->getField()[0] .cast() ->getContent(); ASSERT_EQ("Some introductory text", content.asString()); @@ -99,11 +99,11 @@ TEST(Document, construct) par->getField()[0].cast(); ASSERT_FALSE(text.isNull()); ASSERT_EQ("text", text->getDescriptor()->getName()); - ASSERT_TRUE(text->hasField("content")); - ASSERT_EQ(1U, text->getField("content").size()); - ASSERT_TRUE(text->getField("content")[0]->isa( + ASSERT_TRUE(text->hasField()); + ASSERT_EQ(1U, text->getField().size()); + ASSERT_TRUE(text->getField()[0]->isa( typeOf())); - Variant content = text->getField("content")[0] + Variant content = text->getField()[0] .cast() ->getContent(); ASSERT_EQ("Some actual text", content.asString()); @@ -296,7 +296,7 @@ TEST(Document, validate) new Attribute{mgr, "myAttr", sys->getStringType(), "default"}, logger); // the right map content should be valid now. - child->setAttributes(Variant::mapType{{"myAttr", "content"}}); + child->setAttributes(Variant::mapType{{"myAttr", "bla"}}); ASSERT_EQ(ValidationState::UNKNOWN, doc->getValidationState()); ASSERT_TRUE(doc->validate(logger)); // but an empty map as well -- cgit v1.2.3