fixed StructType::cast signature, more unit tests

3 files changed, 43 insertions, 3 deletions

diff --git a/src/core/model/Typesystem.cpp b/src/core/model/Typesystem.cpp
index 8d5654c..0078022 100644
--- a/src/core/model/Typesystem.cpp
+++ b/src/core/model/Typesystem.cpp
@@ -385,7 +385,7 @@ bool StructType::derivedFrom(Handle<StructType> other) const
 	return false;
 }
 
-Variant StructType::cast(Variant &data, Logger &logger) const
+bool StructType::cast(Variant &data, Logger &logger) const
 {
 	return buildFromArrayOrMap(data, logger, true);
 }
diff --git a/src/core/model/Typesystem.hpp b/src/core/model/Typesystem.hpp
index c279b5d..cc29d4c 100644
--- a/src/core/model/Typesystem.hpp
+++ b/src/core/model/Typesystem.hpp
@@ -607,8 +607,9 @@ public:
 	 * @param data is the data that should be cast to this type. The data must
 	 * have been built by a derived type of this type instance.
 	 * @param logger is the Logger instance to which errors should be logged.
+	 * @return true if the operation is successful, false otherwise.
 	 */
-	Variant cast(Variant &data, Logger &logger) const;
+	bool cast(Variant &data, Logger &logger) const;
 
 	/**
 	 * Returns a handle pointing at the parent type.
diff --git a/test/core/model/TypesystemTest.cpp b/test/core/model/TypesystemTest.cpp
index fd6e38f..9cbc5bc 100644
--- a/test/core/model/TypesystemTest.cpp
+++ b/test/core/model/TypesystemTest.cpp
@@ -496,7 +496,7 @@ TEST(StructType, cast)
 
 	Variant val = structWithParentType->create();
 
-	Variant casted = structType->cast(val, logger);
+	ASSERT_TRUE(structType->cast(val, logger));
 	ASSERT_EQ(4U, val.asArray().size());
 
 	const auto &arr = val.asArray();
@@ -523,6 +523,45 @@ TEST(StructType, indexOf)
 	ASSERT_EQ(-1, structType->indexOf("#0"));
 }
 
+TEST(StructType, buildWithDefaults)
+{
+	Logger logger;
+	Manager mgr;
+	Rooted<StructType> structType = createStructType(mgr, logger);
+
+	{
+		Variant var{{{"b", 42}, {"a", 5}}};
+		ASSERT_TRUE(structType->build(var, logger));
+
+		const auto &arr = var.asArray();
+		ASSERT_EQ(4U, arr.size());
+		ASSERT_EQ("attr1default", arr[0].asString());
+		ASSERT_EQ("42", arr[1].asString());
+		ASSERT_EQ(3, arr[2].asInt());
+		ASSERT_EQ(5, arr[3].asInt());
+	}
+}
+
+TEST(StructType, buildWithIndicesAndDefaults)
+{
+	Logger logger;
+	Manager mgr;
+	Rooted<StructType> structType = createStructType(mgr, logger);
+
+	{
+		Variant var{{{"b", 42}, {"#3", 5}, {"#0", "foo"}}};
+		ASSERT_TRUE(structType->build(var, logger));
+
+		const auto &arr = var.asArray();
+		ASSERT_EQ(4U, arr.size());
+		ASSERT_EQ("foo", arr[0].asString());
+		ASSERT_EQ("42", arr[1].asString());
+		ASSERT_EQ(3, arr[2].asInt());
+		ASSERT_EQ(5, arr[3].asInt());
+	}
+}
+
+
 /* Class ArrayType */
 
 TEST(ArrayType, rtti)