Skip to content
Snippets Groups Projects
Verified Commit b0d5af32 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

Change DataType::As<T> to GetAs<T>

parent 22622223
Branches
Tags
1 merge request!24API: Introduce value and datatype structs to Extern C
Pipeline #13604 passed
Stage: info
Stage: setup
Stage: test
Stage: deploy
Pipeline: caosdb-cppinttest

#13605

    Hide whitespace changes
    Inline Side-by-side
    include/caosdb/data_type.h
    + 3
    − 3
    View file @ b0d5af32
    ...@@ -179,14 +179,14 @@ public: ...@@ -179,14 +179,14 @@ public:
    [[nodiscard]] inline auto IsAtomic() const noexcept -> bool { [[nodiscard]] inline auto IsAtomic() const noexcept -> bool {
    return this->wrapped->data_type_case() == DataTypeCase::kAtomicDataType; return this->wrapped->data_type_case() == DataTypeCase::kAtomicDataType;
    } }
    [[nodiscard]] inline auto AsAtomic() const noexcept -> AtomicDataType { [[nodiscard]] inline auto GetAsAtomic() const noexcept -> AtomicDataType {
    return static_cast<AtomicDataType>(this->wrapped->atomic_data_type()); return static_cast<AtomicDataType>(this->wrapped->atomic_data_type());
    } }
    [[nodiscard]] inline auto IsReference() const noexcept -> bool { [[nodiscard]] inline auto IsReference() const noexcept -> bool {
    return this->wrapped->data_type_case() == DataTypeCase::kReferenceDataType; return this->wrapped->data_type_case() == DataTypeCase::kReferenceDataType;
    } }
    [[nodiscard]] inline auto AsReference() const noexcept -> const ReferenceDataType & { [[nodiscard]] inline auto GetAsReference() const noexcept -> const ReferenceDataType & {
    if (!IsReference()) { if (!IsReference()) {
    return ReferenceDataType::GetEmptyInstance(); return ReferenceDataType::GetEmptyInstance();
    } else if (reference_data_type == nullptr) { } else if (reference_data_type == nullptr) {
    ...@@ -200,7 +200,7 @@ public: ...@@ -200,7 +200,7 @@ public:
    return this->wrapped->data_type_case() == DataTypeCase::kListDataType; return this->wrapped->data_type_case() == DataTypeCase::kListDataType;
    } }
    [[nodiscard]] inline auto AsList() const noexcept -> const ListDataType & { [[nodiscard]] inline auto GetAsList() const noexcept -> const ListDataType & {
    if (!IsList()) { if (!IsList()) {
    return ListDataType::GetEmptyInstance(); return ListDataType::GetEmptyInstance();
    } else if (list_data_type == nullptr) { } else if (list_data_type == nullptr) {
    ......
    test/test_data_type.cpp
    + 7
    − 7
    View file @ b0d5af32
    ...@@ -53,17 +53,17 @@ TEST(test_data_type, test_atomic) { ...@@ -53,17 +53,17 @@ TEST(test_data_type, test_atomic) {
    // the different AtomicDataType are associated with integers // the different AtomicDataType are associated with integers
    entity.SetDataType(map_el.first); entity.SetDataType(map_el.first);
    EXPECT_TRUE(entity.GetDataType().IsAtomic()); EXPECT_TRUE(entity.GetDataType().IsAtomic());
    EXPECT_EQ(entity.GetDataType().AsAtomic(), map_el.first); EXPECT_EQ(entity.GetDataType().GetAsAtomic(), map_el.first);
    proto_data_type.set_atomic_data_type(static_cast<ProtoAtomicDataType>(map_el.first)); proto_data_type.set_atomic_data_type(static_cast<ProtoAtomicDataType>(map_el.first));
    DataType data_type(&proto_data_type); DataType data_type(&proto_data_type);
    entity.SetDataType(data_type); entity.SetDataType(data_type);
    EXPECT_FALSE(data_type.IsReference()); EXPECT_FALSE(data_type.IsReference());
    EXPECT_EQ(data_type.AsReference().GetName(), std::basic_string<char>("")); EXPECT_EQ(data_type.GetAsReference().GetName(), std::basic_string<char>(""));
    EXPECT_FALSE(data_type.IsList()); EXPECT_FALSE(data_type.IsList());
    EXPECT_TRUE(data_type.IsAtomic()); EXPECT_TRUE(data_type.IsAtomic());
    EXPECT_EQ(data_type.AsAtomic(), map_el.first); EXPECT_EQ(data_type.GetAsAtomic(), map_el.first);
    } }
    } }
    ...@@ -74,7 +74,7 @@ TEST(test_data_type, test_reference) { ...@@ -74,7 +74,7 @@ TEST(test_data_type, test_reference) {
    entity.SetRole(Role::PROPERTY); entity.SetRole(Role::PROPERTY);
    entity.SetDataType("Person"); entity.SetDataType("Person");
    EXPECT_TRUE(entity.GetDataType().IsReference()); EXPECT_TRUE(entity.GetDataType().IsReference());
    EXPECT_EQ(entity.GetDataType().AsReference().GetName(), "Person"); EXPECT_EQ(entity.GetDataType().GetAsReference().GetName(), "Person");
    proto_data_type.mutable_reference_data_type()->set_name("Person"); proto_data_type.mutable_reference_data_type()->set_name("Person");
    DataType data_type(&proto_data_type); DataType data_type(&proto_data_type);
    ...@@ -83,7 +83,7 @@ TEST(test_data_type, test_reference) { ...@@ -83,7 +83,7 @@ TEST(test_data_type, test_reference) {
    EXPECT_TRUE(data_type.IsReference()); EXPECT_TRUE(data_type.IsReference());
    EXPECT_FALSE(data_type.IsList()); EXPECT_FALSE(data_type.IsList());
    EXPECT_FALSE(data_type.IsAtomic()); EXPECT_FALSE(data_type.IsAtomic());
    EXPECT_EQ(data_type.AsReference().GetName(), "Person"); EXPECT_EQ(data_type.GetAsReference().GetName(), "Person");
    } }
    TEST(test_data_type, test_list_of_atomic) { TEST(test_data_type, test_list_of_atomic) {
    ...@@ -93,7 +93,7 @@ TEST(test_data_type, test_list_of_atomic) { ...@@ -93,7 +93,7 @@ TEST(test_data_type, test_list_of_atomic) {
    EXPECT_FALSE(data_type.IsReference()); EXPECT_FALSE(data_type.IsReference());
    EXPECT_FALSE(data_type.IsAtomic()); EXPECT_FALSE(data_type.IsAtomic());
    EXPECT_TRUE(data_type.IsList()); EXPECT_TRUE(data_type.IsList());
    const auto &list_data_type = data_type.AsList(); const auto &list_data_type = data_type.GetAsList();
    EXPECT_EQ(list_data_type.GetReferenceDataType().GetName(), std::basic_string<char>("")); EXPECT_EQ(list_data_type.GetReferenceDataType().GetName(), std::basic_string<char>(""));
    EXPECT_TRUE(list_data_type.IsListOfAtomic()); EXPECT_TRUE(list_data_type.IsListOfAtomic());
    EXPECT_FALSE(list_data_type.IsListOfReference()); EXPECT_FALSE(list_data_type.IsListOfReference());
    ...@@ -108,7 +108,7 @@ TEST(test_data_type, test_list_of_reference) { ...@@ -108,7 +108,7 @@ TEST(test_data_type, test_list_of_reference) {
    EXPECT_FALSE(data_type.IsAtomic()); EXPECT_FALSE(data_type.IsAtomic());
    EXPECT_TRUE(data_type.IsList()); EXPECT_TRUE(data_type.IsList());
    const auto &list_data_type = data_type.AsList(); const auto &list_data_type = data_type.GetAsList();
    EXPECT_TRUE(list_data_type.IsListOfReference()); EXPECT_TRUE(list_data_type.IsListOfReference());
    EXPECT_FALSE(list_data_type.IsListOfAtomic()); EXPECT_FALSE(list_data_type.IsListOfAtomic());
    const auto *wrapped = list_data_type.GetReferenceDataType().GetWrapped(); const auto *wrapped = list_data_type.GetReferenceDataType().GetWrapped();
    ......
    test/test_entity.cpp
    + 7
    − 7
    View file @ b0d5af32
    ...@@ -83,12 +83,12 @@ TEST(test_entity, test_property_setters) { ...@@ -83,12 +83,12 @@ TEST(test_entity, test_property_setters) {
    EXPECT_EQ(prop.GetValue().GetAsString(), "prop_value"); EXPECT_EQ(prop.GetValue().GetAsString(), "prop_value");
    EXPECT_EQ(prop.GetUnit(), "prop_unit"); EXPECT_EQ(prop.GetUnit(), "prop_unit");
    EXPECT_TRUE(prop.GetDataType().IsReference()); EXPECT_TRUE(prop.GetDataType().IsReference());
    EXPECT_EQ(prop.GetDataType().AsReference().GetName(), "prop_dtype"); EXPECT_EQ(prop.GetDataType().GetAsReference().GetName(), "prop_dtype");
    EXPECT_FALSE(prop.GetDataType().IsList()); EXPECT_FALSE(prop.GetDataType().IsList());
    prop.SetDataType(AtomicDataType::DATETIME); prop.SetDataType(AtomicDataType::DATETIME);
    EXPECT_TRUE(prop.GetDataType().IsAtomic()); EXPECT_TRUE(prop.GetDataType().IsAtomic());
    EXPECT_EQ(prop.GetDataType().AsAtomic(), AtomicDataType::DATETIME); EXPECT_EQ(prop.GetDataType().GetAsAtomic(), AtomicDataType::DATETIME);
    EXPECT_FALSE(prop.GetDataType().IsList()); EXPECT_FALSE(prop.GetDataType().IsList());
    } }
    ...@@ -97,16 +97,16 @@ TEST(test_entity, test_list_property_setters) { ...@@ -97,16 +97,16 @@ TEST(test_entity, test_list_property_setters) {
    prop.SetDataType(AtomicDataType::DATETIME); // Set as atomic first. prop.SetDataType(AtomicDataType::DATETIME); // Set as atomic first.
    EXPECT_TRUE(prop.GetDataType().IsAtomic()); EXPECT_TRUE(prop.GetDataType().IsAtomic());
    EXPECT_EQ(prop.GetDataType().AsAtomic(), AtomicDataType::DATETIME); EXPECT_EQ(prop.GetDataType().GetAsAtomic(), AtomicDataType::DATETIME);
    prop.SetDataType(AtomicDataType::DOUBLE, true); prop.SetDataType(AtomicDataType::DOUBLE, true);
    auto const &dtype = prop.GetDataType(); auto const &dtype = prop.GetDataType();
    EXPECT_FALSE(dtype.IsAtomic()); // Should not be true anymore. EXPECT_FALSE(dtype.IsAtomic()); // Should not be true anymore.
    EXPECT_FALSE(dtype.IsReference()); EXPECT_FALSE(dtype.IsReference());
    EXPECT_TRUE(dtype.IsList()); EXPECT_TRUE(dtype.IsList());
    EXPECT_NE(dtype.AsAtomic(), AtomicDataType::DATETIME); // Should be overwritten. EXPECT_NE(dtype.GetAsAtomic(), AtomicDataType::DATETIME); // Should be overwritten.
    EXPECT_TRUE(dtype.AsList().IsListOfAtomic()); EXPECT_TRUE(dtype.GetAsList().IsListOfAtomic());
    EXPECT_EQ(dtype.AsList().GetAtomicDataType(), AtomicDataType::DOUBLE); EXPECT_EQ(dtype.GetAsList().GetAtomicDataType(), AtomicDataType::DOUBLE);
    } }
    TEST(test_entity, test_append_property) { TEST(test_entity, test_append_property) {
    ...@@ -200,7 +200,7 @@ TEST(test_entity, test_insert_with_role) { ...@@ -200,7 +200,7 @@ TEST(test_entity, test_insert_with_role) {
    EXPECT_EQ(entity.GetRole(), Role::PROPERTY); EXPECT_EQ(entity.GetRole(), Role::PROPERTY);
    EXPECT_TRUE(entity.GetDataType().IsAtomic()); EXPECT_TRUE(entity.GetDataType().IsAtomic());
    EXPECT_EQ(entity.GetDataType().AsAtomic(), AtomicDataType::DOUBLE); EXPECT_EQ(entity.GetDataType().GetAsAtomic(), AtomicDataType::DOUBLE);
    EXPECT_EQ(entity.GetName(), "Length"); EXPECT_EQ(entity.GetName(), "Length");
    EXPECT_EQ(entity.GetUnit(), "m"); EXPECT_EQ(entity.GetUnit(), "m");
    EXPECT_TRUE(entity.GetValue().IsDouble()); EXPECT_TRUE(entity.GetValue().IsDouble());
    ......
    test/test_list_properties.cpp
    + 2
    − 2
    View file @ b0d5af32
    ...@@ -52,8 +52,8 @@ TEST(test_list_property, test_list_of_text) { ...@@ -52,8 +52,8 @@ TEST(test_list_property, test_list_of_text) {
    const auto &value = entity.GetProperties().at(0).GetValue(); const auto &value = entity.GetProperties().at(0).GetValue();
    EXPECT_TRUE(data_type.IsList()); EXPECT_TRUE(data_type.IsList());
    EXPECT_TRUE(data_type.AsList().IsListOfAtomic()); EXPECT_TRUE(data_type.GetAsList().IsListOfAtomic());
    EXPECT_EQ(data_type.AsList().GetAtomicDataType(), AtomicDataType::TEXT); EXPECT_EQ(data_type.GetAsList().GetAtomicDataType(), AtomicDataType::TEXT);
    EXPECT_TRUE(value.IsVector()); EXPECT_TRUE(value.IsVector());
    EXPECT_EQ(value.GetAsVector().size(), 3); EXPECT_EQ(value.GetAsVector().size(), 3);
    ......
    test/test_protobuf.cpp
    + 2
    − 2
    View file @ b0d5af32
    ...@@ -102,10 +102,10 @@ TEST(test_protobuf, test_copy_nested) { ...@@ -102,10 +102,10 @@ TEST(test_protobuf, test_copy_nested) {
    EXPECT_EQ(entity_destination.data_type().reference_data_type().name(), "src_per"); EXPECT_EQ(entity_destination.data_type().reference_data_type().name(), "src_per");
    Entity entity(&entity_destination); Entity entity(&entity_destination);
    EXPECT_EQ(entity.GetDataType().AsReference().GetName(), "src_per"); EXPECT_EQ(entity.GetDataType().GetAsReference().GetName(), "src_per");
    const Entity &copy_entity(entity); const Entity &copy_entity(entity);
    EXPECT_EQ(copy_entity.GetDataType().AsReference().GetName(), "src_per"); EXPECT_EQ(copy_entity.GetDataType().GetAsReference().GetName(), "src_per");
    } }
    } // namespace caosdb } // namespace caosdb
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment