summaryrefslogtreecommitdiff
path: root/test/core/common
diff options
context:
space:
mode:
Diffstat (limited to 'test/core/common')
-rw-r--r--test/core/common/ArgumentTest.cpp12
-rw-r--r--test/core/common/PropertyTest.cpp6
-rw-r--r--test/core/common/RttiTest.cpp102
-rw-r--r--test/core/common/VariantConverterTest.cpp74
-rw-r--r--test/core/common/VariantTest.cpp16
5 files changed, 105 insertions, 105 deletions
diff --git a/test/core/common/ArgumentTest.cpp b/test/core/common/ArgumentTest.cpp
index 43574c1..0a2dcfa 100644
--- a/test/core/common/ArgumentTest.cpp
+++ b/test/core/common/ArgumentTest.cpp
@@ -367,7 +367,7 @@ TEST(Argument, validateStringDefault)
TEST(Argument, validateObject)
{
Manager mgr;
- Argument a = Argument::Object("a", RttiTypes::TestManaged1);
+ Argument a = Argument::Object("a", &RttiTypes::TestManaged1);
ASSERT_FALSE(a.hasDefault());
@@ -419,7 +419,7 @@ TEST(Argument, validateObject)
TEST(Argument, validateObjectDefault)
{
Manager mgr;
- Argument a = Argument::Object("a", RttiTypes::TestManaged1, nullptr);
+ Argument a = Argument::Object("a", &RttiTypes::TestManaged1, nullptr);
ASSERT_TRUE(a.hasDefault());
ASSERT_TRUE(a.getDefaultValue().isObject());
@@ -578,7 +578,7 @@ TEST(Argument, validateArrayDefault)
TEST(Argument, validateArrayInner)
{
- Argument a = Argument::Array("a", RttiTypes::String);
+ Argument a = Argument::Array("a", &RttiTypes::String);
ASSERT_FALSE(a.hasDefault());
@@ -612,7 +612,7 @@ TEST(Argument, validateArrayInner)
TEST(Argument, validateArrayInnerDefault)
{
Variant::arrayType arrDefault{1, "a", nullptr};
- Argument a = Argument::Array("a", RttiTypes::String, arrDefault);
+ Argument a = Argument::Array("a", &RttiTypes::String, arrDefault);
ASSERT_TRUE(a.hasDefault());
ASSERT_TRUE(a.getDefaultValue().isArray());
@@ -698,7 +698,7 @@ TEST(Argument, validateMapDefault)
TEST(Argument, validateMapInnerType)
{
- Argument a = Argument::Map("a", RttiTypes::String);
+ Argument a = Argument::Map("a", &RttiTypes::String);
ASSERT_FALSE(a.hasDefault());
@@ -737,7 +737,7 @@ TEST(Argument, validateMapInnerType)
TEST(Argument, validateMapInnerTypeDefault)
{
Variant::mapType mapDefault{{"key1", "1"}};
- Argument a = Argument::Map("a", RttiTypes::String, mapDefault);
+ Argument a = Argument::Map("a", &RttiTypes::String, mapDefault);
ASSERT_TRUE(a.hasDefault());
ASSERT_TRUE(a.getDefaultValue().isMap());
diff --git a/test/core/common/PropertyTest.cpp b/test/core/common/PropertyTest.cpp
index 0f3d74e..f57b4c0 100644
--- a/test/core/common/PropertyTest.cpp
+++ b/test/core/common/PropertyTest.cpp
@@ -62,7 +62,7 @@ TEST(Getter, construction)
TEST(Getter, validation)
{
std::shared_ptr<PropertyType> type =
- std::make_shared<PropertyType>(RttiTypes::Int);
+ std::make_shared<PropertyType>(&RttiTypes::Int);
TestObject obj{123};
{
@@ -111,7 +111,7 @@ TEST(Setter, construction)
TEST(Setter, validation)
{
std::shared_ptr<PropertyType> type =
- std::make_shared<PropertyType>(RttiTypes::Int);
+ std::make_shared<PropertyType>(&RttiTypes::Int);
TestObject obj{123};
Setter<TestObject> setter{TestObject::setA};
@@ -164,7 +164,7 @@ TEST(Property, construction)
}
{
- Property<TestObject> property{RttiTypes::Int, TestObject::getA,
+ Property<TestObject> property{&RttiTypes::Int, TestObject::getA,
TestObject::setA};
ASSERT_FALSE(property.isReadonly());
diff --git a/test/core/common/RttiTest.cpp b/test/core/common/RttiTest.cpp
index 019750a..7fcfd11 100644
--- a/test/core/common/RttiTest.cpp
+++ b/test/core/common/RttiTest.cpp
@@ -59,63 +59,63 @@ const Rtti Type7 = RttiBuilder<RttiTestClass7>{"Type7"}.parent(&Type6);
TEST(Rtti, isa)
{
- ASSERT_TRUE(Type1.isa(Type1));
- ASSERT_FALSE(Type1.isa(Type2));
- ASSERT_FALSE(Type1.isa(Type3));
- ASSERT_FALSE(Type1.isa(Type4));
-
- ASSERT_FALSE(Type2.isa(Type1));
- ASSERT_TRUE(Type2.isa(Type2));
- ASSERT_FALSE(Type2.isa(Type3));
- ASSERT_FALSE(Type2.isa(Type4));
-
- ASSERT_TRUE(Type3.isa(Type1));
- ASSERT_FALSE(Type3.isa(Type2));
- ASSERT_TRUE(Type3.isa(Type3));
- ASSERT_FALSE(Type3.isa(Type4));
-
- ASSERT_TRUE(Type4.isa(Type1));
- ASSERT_TRUE(Type4.isa(Type2));
- ASSERT_TRUE(Type4.isa(Type3));
- ASSERT_TRUE(Type4.isa(Type4));
+ ASSERT_TRUE(Type1.isa(&Type1));
+ ASSERT_FALSE(Type1.isa(&Type2));
+ ASSERT_FALSE(Type1.isa(&Type3));
+ ASSERT_FALSE(Type1.isa(&Type4));
+
+ ASSERT_FALSE(Type2.isa(&Type1));
+ ASSERT_TRUE(Type2.isa(&Type2));
+ ASSERT_FALSE(Type2.isa(&Type3));
+ ASSERT_FALSE(Type2.isa(&Type4));
+
+ ASSERT_TRUE(Type3.isa(&Type1));
+ ASSERT_FALSE(Type3.isa(&Type2));
+ ASSERT_TRUE(Type3.isa(&Type3));
+ ASSERT_FALSE(Type3.isa(&Type4));
+
+ ASSERT_TRUE(Type4.isa(&Type1));
+ ASSERT_TRUE(Type4.isa(&Type2));
+ ASSERT_TRUE(Type4.isa(&Type3));
+ ASSERT_TRUE(Type4.isa(&Type4));
}
TEST(Rtti, composedOf)
{
std::vector<const Rtti *> types{&Type1, &Type2, &Type3, &Type4};
for (auto t : types) {
- ASSERT_FALSE(t->composedOf(Type1));
- ASSERT_FALSE(t->composedOf(Type2));
- ASSERT_FALSE(t->composedOf(Type3));
- ASSERT_FALSE(t->composedOf(Type4));
- ASSERT_FALSE(t->composedOf(Type5));
- ASSERT_FALSE(t->composedOf(Type6));
- ASSERT_FALSE(t->composedOf(Type7));
+ ASSERT_FALSE(t->composedOf(&Type1));
+ ASSERT_FALSE(t->composedOf(&Type2));
+ ASSERT_FALSE(t->composedOf(&Type3));
+ ASSERT_FALSE(t->composedOf(&Type4));
+ ASSERT_FALSE(t->composedOf(&Type5));
+ ASSERT_FALSE(t->composedOf(&Type6));
+ ASSERT_FALSE(t->composedOf(&Type7));
}
- ASSERT_TRUE(Type5.composedOf(Type1));
- ASSERT_FALSE(Type5.composedOf(Type2));
- ASSERT_FALSE(Type5.composedOf(Type3));
- ASSERT_FALSE(Type5.composedOf(Type4));
- ASSERT_FALSE(Type5.composedOf(Type5));
- ASSERT_TRUE(Type5.composedOf(Type6));
- ASSERT_TRUE(Type5.composedOf(Type7));
-
- ASSERT_TRUE(Type6.composedOf(Type1));
- ASSERT_FALSE(Type6.composedOf(Type2));
- ASSERT_FALSE(Type6.composedOf(Type3));
- ASSERT_FALSE(Type6.composedOf(Type4));
- ASSERT_FALSE(Type6.composedOf(Type5));
- ASSERT_FALSE(Type6.composedOf(Type6));
- ASSERT_FALSE(Type6.composedOf(Type7));
-
- ASSERT_TRUE(Type7.composedOf(Type1));
- ASSERT_FALSE(Type7.composedOf(Type2));
- ASSERT_FALSE(Type7.composedOf(Type3));
- ASSERT_FALSE(Type7.composedOf(Type4));
- ASSERT_FALSE(Type7.composedOf(Type5));
- ASSERT_FALSE(Type7.composedOf(Type6));
- ASSERT_FALSE(Type7.composedOf(Type7));
+ ASSERT_TRUE(Type5.composedOf(&Type1));
+ ASSERT_FALSE(Type5.composedOf(&Type2));
+ ASSERT_FALSE(Type5.composedOf(&Type3));
+ ASSERT_FALSE(Type5.composedOf(&Type4));
+ ASSERT_FALSE(Type5.composedOf(&Type5));
+ ASSERT_TRUE(Type5.composedOf(&Type6));
+ ASSERT_TRUE(Type5.composedOf(&Type7));
+
+ ASSERT_TRUE(Type6.composedOf(&Type1));
+ ASSERT_FALSE(Type6.composedOf(&Type2));
+ ASSERT_FALSE(Type6.composedOf(&Type3));
+ ASSERT_FALSE(Type6.composedOf(&Type4));
+ ASSERT_FALSE(Type6.composedOf(&Type5));
+ ASSERT_FALSE(Type6.composedOf(&Type6));
+ ASSERT_FALSE(Type6.composedOf(&Type7));
+
+ ASSERT_TRUE(Type7.composedOf(&Type1));
+ ASSERT_FALSE(Type7.composedOf(&Type2));
+ ASSERT_FALSE(Type7.composedOf(&Type3));
+ ASSERT_FALSE(Type7.composedOf(&Type4));
+ ASSERT_FALSE(Type7.composedOf(&Type5));
+ ASSERT_FALSE(Type7.composedOf(&Type6));
+ ASSERT_FALSE(Type7.composedOf(&Type7));
}
class RttiMethodTestClass1 {
@@ -218,12 +218,12 @@ public:
};
static const Rtti PType1 = RttiBuilder<RttiPropertyTestClass1>{
- "PType1"}.property("a", {RttiTypes::Int, RttiPropertyTestClass1::getA,
+ "PType1"}.property("a", {&RttiTypes::Int, RttiPropertyTestClass1::getA,
RttiPropertyTestClass1::setA});
static const Rtti PType2 =
RttiBuilder<RttiPropertyTestClass2>{"PType2"}.parent(&PType1).property(
- "b", {RttiTypes::Int, RttiPropertyTestClass2::getB,
+ "b", {&RttiTypes::Int, RttiPropertyTestClass2::getB,
RttiPropertyTestClass2::setB});
TEST(Rtti, properties)
diff --git a/test/core/common/VariantConverterTest.cpp b/test/core/common/VariantConverterTest.cpp
index ab18f14..9654a7b 100644
--- a/test/core/common/VariantConverterTest.cpp
+++ b/test/core/common/VariantConverterTest.cpp
@@ -249,7 +249,7 @@ TEST(VariantConverter, toString)
}
static void assertArrayConversion(Variant conv, Variant expected,
- bool expectedSuccess, const Rtti &innerType,
+ bool expectedSuccess, const Rtti *innerType,
VariantConverter::Mode mode, Logger &logger)
{
EXPECT_EQ(expectedSuccess,
@@ -276,48 +276,48 @@ TEST(VariantConverter, toArray)
Variant C = card;
// in safe mode only array to array conversion should be possible.
- assertArrayConversion(n, nullptr, false, RttiTypes::None,
+ assertArrayConversion(n, nullptr, false, &RttiTypes::None,
VariantConverter::Mode::SAFE, logger);
- assertArrayConversion(b, nullptr, false, RttiTypes::None,
+ assertArrayConversion(b, nullptr, false, &RttiTypes::None,
VariantConverter::Mode::SAFE, logger);
- assertArrayConversion(i, nullptr, false, RttiTypes::None,
+ assertArrayConversion(i, nullptr, false, &RttiTypes::None,
VariantConverter::Mode::SAFE, logger);
- assertArrayConversion(d, nullptr, false, RttiTypes::None,
+ assertArrayConversion(d, nullptr, false, &RttiTypes::None,
VariantConverter::Mode::SAFE, logger);
- assertArrayConversion(s, nullptr, false, RttiTypes::None,
+ assertArrayConversion(s, nullptr, false, &RttiTypes::None,
VariantConverter::Mode::SAFE, logger);
- assertArrayConversion(A, A, true, RttiTypes::None,
+ assertArrayConversion(A, A, true, &RttiTypes::None,
VariantConverter::Mode::SAFE, logger);
- assertArrayConversion(M, nullptr, false, RttiTypes::None,
+ assertArrayConversion(M, nullptr, false, &RttiTypes::None,
VariantConverter::Mode::SAFE, logger);
- assertArrayConversion(C, nullptr, false, RttiTypes::None,
+ assertArrayConversion(C, nullptr, false, &RttiTypes::None,
VariantConverter::Mode::SAFE, logger);
// in all mode more should be possible.
- assertArrayConversion(n, Variant::arrayType{n}, true, RttiTypes::None,
+ assertArrayConversion(n, Variant::arrayType{n}, true, &RttiTypes::None,
VariantConverter::Mode::ALL, logger);
- assertArrayConversion(b, Variant::arrayType{b}, true, RttiTypes::None,
+ assertArrayConversion(b, Variant::arrayType{b}, true, &RttiTypes::None,
VariantConverter::Mode::ALL, logger);
- assertArrayConversion(i, Variant::arrayType{i}, true, RttiTypes::None,
+ assertArrayConversion(i, Variant::arrayType{i}, true, &RttiTypes::None,
VariantConverter::Mode::ALL, logger);
- assertArrayConversion(d, Variant::arrayType{d}, true, RttiTypes::None,
+ assertArrayConversion(d, Variant::arrayType{d}, true, &RttiTypes::None,
VariantConverter::Mode::ALL, logger);
- assertArrayConversion(s, Variant::arrayType{s}, true, RttiTypes::None,
+ assertArrayConversion(s, Variant::arrayType{s}, true, &RttiTypes::None,
VariantConverter::Mode::ALL, logger);
- assertArrayConversion(A, A, true, RttiTypes::None,
+ assertArrayConversion(A, A, true, &RttiTypes::None,
VariantConverter::Mode::ALL, logger);
- assertArrayConversion(M, Variant::arrayType{M}, true, RttiTypes::None,
+ assertArrayConversion(M, Variant::arrayType{M}, true, &RttiTypes::None,
VariantConverter::Mode::ALL, logger);
- assertArrayConversion(C, Variant::arrayType{C}, true, RttiTypes::None,
+ assertArrayConversion(C, Variant::arrayType{C}, true, &RttiTypes::None,
VariantConverter::Mode::ALL, logger);
// as an example also check the inner type converion
assertArrayConversion(
A, Variant::arrayType{Variant(1), Variant(6), Variant(2), Variant(9)},
- true, RttiTypes::Int, VariantConverter::Mode::ALL, logger);
+ true, &RttiTypes::Int, VariantConverter::Mode::ALL, logger);
}
static void assertMapConversion(Variant conv, Variant expected,
- bool expectedSuccess, const Rtti &innerType,
+ bool expectedSuccess, const Rtti *innerType,
VariantConverter::Mode mode, Logger &logger)
{
EXPECT_EQ(expectedSuccess,
@@ -344,39 +344,39 @@ TEST(VariantConverter, toMap)
Variant C = card;
// in safe mode only map to map conversion should be possible.
- assertMapConversion(n, nullptr, false, RttiTypes::None,
+ assertMapConversion(n, nullptr, false, &RttiTypes::None,
VariantConverter::Mode::SAFE, logger);
- assertMapConversion(b, nullptr, false, RttiTypes::None,
+ assertMapConversion(b, nullptr, false, &RttiTypes::None,
VariantConverter::Mode::SAFE, logger);
- assertMapConversion(i, nullptr, false, RttiTypes::None,
+ assertMapConversion(i, nullptr, false, &RttiTypes::None,
VariantConverter::Mode::SAFE, logger);
- assertMapConversion(d, nullptr, false, RttiTypes::None,
+ assertMapConversion(d, nullptr, false, &RttiTypes::None,
VariantConverter::Mode::SAFE, logger);
- assertMapConversion(s, nullptr, false, RttiTypes::None,
+ assertMapConversion(s, nullptr, false, &RttiTypes::None,
VariantConverter::Mode::SAFE, logger);
- assertMapConversion(A, nullptr, false, RttiTypes::None,
+ assertMapConversion(A, nullptr, false, &RttiTypes::None,
VariantConverter::Mode::SAFE, logger);
- assertMapConversion(M, M, true, RttiTypes::None,
+ assertMapConversion(M, M, true, &RttiTypes::None,
VariantConverter::Mode::SAFE, logger);
- assertMapConversion(C, nullptr, false, RttiTypes::None,
+ assertMapConversion(C, nullptr, false, &RttiTypes::None,
VariantConverter::Mode::SAFE, logger);
// in all mode that should be the same.
- assertMapConversion(n, nullptr, false, RttiTypes::None,
+ assertMapConversion(n, nullptr, false, &RttiTypes::None,
VariantConverter::Mode::ALL, logger);
- assertMapConversion(b, nullptr, false, RttiTypes::None,
+ assertMapConversion(b, nullptr, false, &RttiTypes::None,
VariantConverter::Mode::ALL, logger);
- assertMapConversion(i, nullptr, false, RttiTypes::None,
+ assertMapConversion(i, nullptr, false, &RttiTypes::None,
VariantConverter::Mode::ALL, logger);
- assertMapConversion(d, nullptr, false, RttiTypes::None,
+ assertMapConversion(d, nullptr, false, &RttiTypes::None,
VariantConverter::Mode::ALL, logger);
- assertMapConversion(s, nullptr, false, RttiTypes::None,
+ assertMapConversion(s, nullptr, false, &RttiTypes::None,
VariantConverter::Mode::ALL, logger);
- assertMapConversion(A, nullptr, false, RttiTypes::None,
+ assertMapConversion(A, nullptr, false, &RttiTypes::None,
VariantConverter::Mode::ALL, logger);
- assertMapConversion(M, M, true, RttiTypes::None,
+ assertMapConversion(M, M, true, &RttiTypes::None,
VariantConverter::Mode::ALL, logger);
- assertMapConversion(C, nullptr, false, RttiTypes::None,
+ assertMapConversion(C, nullptr, false, &RttiTypes::None,
VariantConverter::Mode::ALL, logger);
// but we should be able to convert the inner type.
@@ -384,14 +384,14 @@ TEST(VariantConverter, toMap)
{"i", Variant(6)},
{"d", Variant(2)},
{"s", Variant(9)}},
- true, RttiTypes::Int, VariantConverter::Mode::ALL,
+ true, &RttiTypes::Int, VariantConverter::Mode::ALL,
logger);
// which should not work in SAFE mode.
assertMapConversion(M, Variant::mapType{{"b", Variant(1)},
{"i", Variant(6)},
{"d", Variant(2)},
{"s", Variant(9)}},
- false, RttiTypes::Int, VariantConverter::Mode::SAFE,
+ false, &RttiTypes::Int, VariantConverter::Mode::SAFE,
logger);
}
diff --git a/test/core/common/VariantTest.cpp b/test/core/common/VariantTest.cpp
index 6381607..ee04034 100644
--- a/test/core/common/VariantTest.cpp
+++ b/test/core/common/VariantTest.cpp
@@ -40,7 +40,7 @@ TEST(Variant, nullValue)
ASSERT_TRUE(v.isNull());
ASSERT_EQ(VariantType::NULLPTR, v.getType());
- ASSERT_EQ(&RttiTypes::Nullptr, &v.getRtti());
+ ASSERT_EQ(&RttiTypes::Nullptr, v.getRtti());
}
TEST(Variant, booleanValue)
@@ -57,7 +57,7 @@ TEST(Variant, booleanValue)
ASSERT_TRUE(v.isBool());
ASSERT_TRUE(v.asBool());
ASSERT_EQ(VariantType::BOOL, v.getType());
- ASSERT_EQ(&RttiTypes::Bool, &v.getRtti());
+ ASSERT_EQ(&RttiTypes::Bool, v.getRtti());
v = nullptr;
ASSERT_FALSE(v.isBool());
@@ -73,7 +73,7 @@ TEST(Variant, intValue)
ASSERT_TRUE(v.isInt());
ASSERT_EQ(43, v.asInt());
ASSERT_EQ(VariantType::INT, v.getType());
- ASSERT_EQ(&RttiTypes::Int, &v.getRtti());
+ ASSERT_EQ(&RttiTypes::Int, v.getRtti());
v = false;
ASSERT_FALSE(v.isInt());
@@ -92,7 +92,7 @@ TEST(Variant, doubleValue)
ASSERT_TRUE(v.isDouble());
ASSERT_EQ(43.5, v.asDouble());
ASSERT_EQ(VariantType::DOUBLE, v.getType());
- ASSERT_EQ(&RttiTypes::Double, &v.getRtti());
+ ASSERT_EQ(&RttiTypes::Double, v.getRtti());
}
TEST(Variant, stringValue)
@@ -105,7 +105,7 @@ TEST(Variant, stringValue)
ASSERT_TRUE(v.isString());
ASSERT_EQ("Goodbye Cruel World", v.asString());
ASSERT_EQ(VariantType::STRING, v.getType());
- ASSERT_EQ(&RttiTypes::String, &v.getRtti());
+ ASSERT_EQ(&RttiTypes::String, v.getRtti());
v = 42;
ASSERT_FALSE(v.isString());
@@ -134,7 +134,7 @@ TEST(Variant, cardinalityValue)
ASSERT_TRUE(v.isCardinality());
ASSERT_EQ(VariantType::CARDINALITY, v.getType());
- ASSERT_EQ(&RttiTypes::Cardinality, &v.getRtti());
+ ASSERT_EQ(&RttiTypes::Cardinality, v.getRtti());
}
@@ -147,7 +147,7 @@ TEST(Variant, arrayValue)
ASSERT_TRUE(v.isArray());
ASSERT_EQ(VariantType::ARRAY, v.getType());
- ASSERT_EQ(&RttiTypes::Array, &v.getRtti());
+ ASSERT_EQ(&RttiTypes::Array, v.getRtti());
}
TEST(Variant, mapValue)
@@ -165,7 +165,7 @@ TEST(Variant, mapValue)
ASSERT_TRUE(v.isMap());
ASSERT_EQ(VariantType::MAP, v.getType());
- ASSERT_EQ(&RttiTypes::Map, &v.getRtti());
+ ASSERT_EQ(&RttiTypes::Map, v.getRtti());
}
TEST(Variant, relationalOperators)
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-01 04:24:43 +0000