Merge branch 'master' of somweyr.de:ousia

3 files changed, 14 insertions, 14 deletions

diff --git a/test/core/common/ArgumentTest.cpp b/test/core/common/ArgumentTest.cpp
index 85f99a1..e580986 100644
--- a/test/core/common/ArgumentTest.cpp
+++ b/test/core/common/ArgumentTest.cpp
@@ -374,7 +374,7 @@ TEST(Argument, validateObject)
 
 	{
 		Rooted<Managed> m{new Managed(mgr)};
-		Variant v(m);
+		Variant v = Variant::fromObject(m);
 
 		ASSERT_FALSE(a.validate(v, logger));
 		ASSERT_TRUE(v.isObject());
@@ -383,7 +383,7 @@ TEST(Argument, validateObject)
 
 	{
 		Rooted<TestManaged1> m{new TestManaged1(mgr)};
-		Variant v(m);
+		Variant v = Variant::fromObject(m);
 
 		ASSERT_TRUE(a.validate(v, logger));
 		ASSERT_TRUE(v.isObject());
@@ -392,7 +392,7 @@ TEST(Argument, validateObject)
 
 	{
 		Rooted<TestManaged2> m{new TestManaged2(mgr)};
-		Variant v(m);
+		Variant v = Variant::fromObject(m);
 
 		ASSERT_TRUE(a.validate(v, logger));
 		ASSERT_TRUE(v.isObject());
@@ -401,7 +401,7 @@ TEST(Argument, validateObject)
 
 	{
 		Rooted<TestManaged1> m1{nullptr};
-		Variant v(m1);
+		Variant v = Variant::fromObject(m1);
 
 		ASSERT_FALSE(a.validate(v, logger));
 		ASSERT_TRUE(v.isObject());
@@ -428,7 +428,7 @@ TEST(Argument, validateObjectDefault)
 
 	{
 		Rooted<Managed> m{new Managed(mgr)};
-		Variant v(m);
+		Variant v = Variant::fromObject(m);
 
 		ASSERT_FALSE(a.validate(v, logger));
 		ASSERT_TRUE(v.isObject());
@@ -437,7 +437,7 @@ TEST(Argument, validateObjectDefault)
 
 	{
 		Rooted<TestManaged1> m{new TestManaged1(mgr)};
-		Variant v(m);
+		Variant v = Variant::fromObject(m);
 
 		ASSERT_TRUE(a.validate(v, logger));
 		ASSERT_TRUE(v.isObject());
@@ -446,7 +446,7 @@ TEST(Argument, validateObjectDefault)
 
 	{
 		Rooted<TestManaged2> m{new TestManaged2(mgr)};
-		Variant v(m);
+		Variant v = Variant::fromObject(m);
 
 		ASSERT_TRUE(a.validate(v, logger));
 		ASSERT_TRUE(v.isObject());
@@ -455,7 +455,7 @@ TEST(Argument, validateObjectDefault)
 
 	{
 		Rooted<TestManaged1> m1{nullptr};
-		Variant v(m1);
+		Variant v = Variant::fromObject(m1);
 
 		ASSERT_FALSE(a.validate(v, logger));
 		ASSERT_TRUE(v.isObject());
diff --git a/test/core/managed/VariantObjectTest.cpp b/test/core/managed/VariantObjectTest.cpp
index f590637..575b7ac 100644
--- a/test/core/managed/VariantObjectTest.cpp
+++ b/test/core/managed/VariantObjectTest.cpp
@@ -31,7 +31,7 @@ TEST(Variant, simpleManagedObject)
 	bool a = false;
 	{
 		Handle<TestManaged> p{new TestManaged{mgr, a}};
-		Variant v(p);
+		Variant v = Variant::fromObject(p);
 		ASSERT_TRUE(v.isObject());
 		ASSERT_EQ(p, v.asObject());
 		ASSERT_TRUE(a);
@@ -45,7 +45,7 @@ TEST(Variant, managedObjectCopy)
 	bool a = false;
 	{
 		Handle<TestManaged> p{new TestManaged{mgr, a}};
-		Variant v1(p);
+		Variant v1 = Variant::fromObject(p);
 		{
 			Variant v2 = v1;
 			ASSERT_TRUE(v2.isObject());
@@ -63,7 +63,7 @@ TEST(Variant, managedObjectMove)
 	bool a = false;
 	{
 		Handle<TestManaged> p{new TestManaged{mgr, a}};
-		Variant v1(p);
+		Variant v1 = Variant::fromObject(p);
 		{
 			Variant v2 = std::move(v1);
 			ASSERT_TRUE(v2.isObject());
diff --git a/test/core/model/TypesystemTest.cpp b/test/core/model/TypesystemTest.cpp
index 5a2efdd..a408700 100644
--- a/test/core/model/TypesystemTest.cpp
+++ b/test/core/model/TypesystemTest.cpp
@@ -846,7 +846,7 @@ TEST(ArrayType, conversion)
 TEST(UnknownType, rtti)
 {
 	Manager mgr;
-	Rooted<UnknownType> unknownType{new UnknownType(mgr, "unknown")};
+	Rooted<UnknownType> unknownType{new UnknownType(mgr)};
 	ASSERT_TRUE(unknownType->isa(RttiTypes::UnknownType));
 	ASSERT_TRUE(unknownType->isa(typeOf<Type>()));
 	ASSERT_TRUE(unknownType->isa(typeOf<Node>()));
@@ -868,7 +868,7 @@ TEST(UnknownType, rtti)
 TEST(UnknownType, creation)
 {
 	Manager mgr;
-	Rooted<UnknownType> unknownType{new UnknownType(mgr, "unknown")};
+	Rooted<UnknownType> unknownType{new UnknownType(mgr)};
 
 	Variant val = unknownType->create();
 	ASSERT_TRUE(val.isNull());
@@ -877,7 +877,7 @@ TEST(UnknownType, creation)
 TEST(UnknownType, conversion)
 {
 	Manager mgr;
-	Rooted<UnknownType> unknownType{new UnknownType(mgr, "unknown")};
+	Rooted<UnknownType> unknownType{new UnknownType(mgr)};
 
 	{
 		Variant val1{{1, "test", false, 42.5}};