From b5170bf6c5794127218d533a9b45e2de1e3364c3 Mon Sep 17 00:00:00 2001
From: Florian Spreckelsen <f.spreckelsen@indiscale.com>
Date: Tue, 17 Aug 2021 08:46:41 +0000
Subject: [PATCH] ENH: Add test for extended extern C interface
---
test/CMakeLists.txt | 2 +-
test/test_ccaosdb.cpp | 176 ++++++++++++++++++++++++++++++++++++++
test/test_transaction.cpp | 15 +++-
3 files changed, 189 insertions(+), 4 deletions(-)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 4074d6b..62c9504 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -82,7 +82,7 @@ if(LINTING)
"--warnings-as-errors=*"
"--fix")
set(_CMAKE_CXX_CLANG_TIDY_CHECKS
- "--checks=*,-fuchsia-*,-llvmlibc-*,-cert-err58-cpp,-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-owning-memory,-modernize-use-trailing-return-type,-google-readability-avoid-underscore-in-googletest-name,-cppcoreguidelines-avoid-magic-numbers,-readability-magic-numbers,-cppcoreguidelines-avoid-goto,-hicpp-avoid-goto,-readability-function-cognitive-complexity,-cppcoreguidelines-non-private-member-variables-in-classes,-misc-non-private-member-variables-in-classes")
+ "--checks=*,-fuchsia-*,-llvmlibc-*,-cert-err58-cpp,-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-owning-memory,-modernize-use-trailing-return-type,-google-readability-avoid-underscore-in-googletest-name,-cppcoreguidelines-avoid-magic-numbers,-readability-magic-numbers,-cppcoreguidelines-avoid-goto,-hicpp-avoid-goto,-readability-function-cognitive-complexity,-cppcoreguidelines-non-private-member-variables-in-classes,-misc-non-private-member-variables-in-classes,-cppcoreguidelines-pro-type-vararg,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-hicpp-no-array-decay")
endif()
else()
message(STATUS "LINTING is OFF")
diff --git a/test/test_ccaosdb.cpp b/test/test_ccaosdb.cpp
index 1bf3342..dbd5c48 100644
--- a/test/test_ccaosdb.cpp
+++ b/test/test_ccaosdb.cpp
@@ -2,6 +2,7 @@
* This file is a part of the CaosDB Project.
*
* Copyright (C) 2021 Timm Fitschen <t.fitschen@indiscale.com>
+ * Copyright (C) 2021 Florian Spreckelsen <f.spreckelsen@indiscale.com>
* Copyright (C) 2021 IndiScale GmbH <info@indiscale.com>
*
* This program is free software: you can redistribute it and/or modify
@@ -17,6 +18,8 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
+#include "caosdb/message_code.h" // for MessageCode
+#include "caosdb/status_code.h" // for StatusCode
#include "ccaosdb.h" // for caosdb_info_version_info, caosdb_...
#include "gtest/gtest-message.h" // for Message
#include "gtest/gtest-test-part.h" // for TestPartResult
@@ -40,3 +43,176 @@ TEST(test_ccaosdb, connection_ssl_authentication_success) {
EXPECT_EQ(minor, version_info.minor);
EXPECT_STREQ(pre_release, version_info.pre_release);
}
+
+TEST(test_ccaosdb, test_count_query) {
+
+ caosdb_connection_connection connection;
+ int return_code(
+ caosdb_connection_connection_manager_get_default_connection(&connection));
+ EXPECT_EQ(return_code, 0);
+
+ caosdb_transaction_transaction transaction;
+ return_code =
+ caosdb_connection_connection_create_transaction(&connection, &transaction);
+ EXPECT_EQ(return_code, 0);
+
+ // COUNT query with an empty result
+ return_code = caosdb_transaction_transaction_query(&transaction,
+ "COUNT ENTITY WITH id=-1");
+ EXPECT_EQ(return_code, caosdb::StatusCode::GO_ON);
+
+ return_code = caosdb_transaction_transaction_execute(&transaction);
+ EXPECT_EQ(return_code, 0);
+
+ long dummy(-1); // NOLINT
+ long *count = &dummy; // NOLINT
+ return_code =
+ caosdb_transaction_transaction_get_count_result(&transaction, count);
+ EXPECT_EQ(return_code, 0);
+ EXPECT_EQ(*count, 0);
+
+ return_code = caosdb_transaction_delete_transaction(&transaction);
+ EXPECT_EQ(return_code, 0);
+}
+
+TEST(test_ccaosdb, test_query) {
+ caosdb_connection_connection connection;
+ int return_code(
+ caosdb_connection_connection_manager_get_default_connection(&connection));
+ EXPECT_EQ(return_code, 0);
+
+ caosdb_transaction_transaction transaction;
+ return_code =
+ caosdb_connection_connection_create_transaction(&connection, &transaction);
+ EXPECT_EQ(return_code, 0);
+
+ return_code = caosdb_transaction_transaction_query(&transaction,
+ "FIND ENTITY WITH id=-1");
+ EXPECT_EQ(return_code, caosdb::StatusCode::GO_ON);
+
+ return_code = caosdb_transaction_transaction_execute(&transaction);
+ EXPECT_EQ(return_code, 0);
+
+ caosdb_transaction_result_set result_set;
+ return_code =
+ caosdb_transaction_transaction_get_result_set(&transaction, &result_set);
+ EXPECT_EQ(return_code, 0);
+
+ int dummy(-1);
+ int *count = &dummy; // NOLINT
+ return_code = caosdb_transaction_result_set_size(&result_set, count);
+ EXPECT_EQ(return_code, 0);
+ EXPECT_EQ(*count, 0);
+
+ return_code = caosdb_transaction_delete_transaction(&transaction);
+ EXPECT_EQ(return_code, 0);
+}
+
+TEST(test_ccaosdb, test_single_id_retrieve) {
+ caosdb_connection_connection connection;
+ int return_code(
+ caosdb_connection_connection_manager_get_default_connection(&connection));
+ EXPECT_EQ(return_code, 0);
+
+ caosdb_transaction_transaction transaction;
+ return_code =
+ caosdb_connection_connection_create_transaction(&connection, &transaction);
+ EXPECT_EQ(return_code, 0);
+
+ return_code =
+ caosdb_transaction_transaction_retrieve_by_id(&transaction, "21");
+ EXPECT_EQ(return_code, caosdb::StatusCode::GO_ON);
+
+ return_code = caosdb_transaction_transaction_execute(&transaction);
+ EXPECT_EQ(return_code, 0);
+
+ caosdb_transaction_result_set result_set;
+ return_code =
+ caosdb_transaction_transaction_get_result_set(&transaction, &result_set);
+ EXPECT_EQ(return_code, 0);
+
+ int dummy(-1);
+ int *count = &dummy; // NOLINT
+ return_code = caosdb_transaction_result_set_size(&result_set, count);
+ EXPECT_EQ(return_code, 0);
+ EXPECT_EQ(*count, 1);
+
+ caosdb_entity_entity entity;
+ return_code = caosdb_transaction_result_set_at(&result_set, &entity, 0);
+ EXPECT_EQ(return_code, 0);
+
+ return_code = caosdb_entity_entity_get_errors_size(&entity, count);
+ EXPECT_EQ(return_code, 0);
+ EXPECT_EQ(*count, 0);
+
+ char out[255] = {"255"}; // NOLINT
+ return_code = caosdb_entity_entity_get_name(&entity, out);
+ EXPECT_EQ(return_code, 0);
+ EXPECT_STREQ(out, "unit");
+
+ return_code = caosdb_transaction_delete_transaction(&transaction);
+ EXPECT_EQ(return_code, 0);
+}
+
+TEST(test_ccaosdb, test_multi_id_retrieve) {
+ caosdb_connection_connection connection;
+ int return_code(
+ caosdb_connection_connection_manager_get_default_connection(&connection));
+ EXPECT_EQ(return_code, 0);
+
+ caosdb_transaction_transaction transaction;
+ return_code =
+ caosdb_connection_connection_create_transaction(&connection, &transaction);
+ EXPECT_EQ(return_code, 0);
+
+ const char *ids[] = {"20", "21", "22"}; // NOLINT
+ return_code =
+ caosdb_transaction_transaction_retrieve_by_ids(&transaction, ids, 3);
+ EXPECT_EQ(return_code, caosdb::StatusCode::GO_ON);
+
+ return_code = caosdb_transaction_transaction_execute(&transaction);
+ // Should have an error since entity 22 doesn't exist
+ EXPECT_TRUE((return_code > 0));
+
+ caosdb_transaction_result_set result_set;
+ return_code =
+ caosdb_transaction_transaction_get_result_set(&transaction, &result_set);
+ EXPECT_EQ(return_code, 0);
+
+ int dummy(-1);
+ int *count = &dummy; // NOLINT
+ return_code = caosdb_transaction_result_set_size(&result_set, count);
+ EXPECT_EQ(return_code, 0);
+ EXPECT_EQ(*count, 3);
+
+ caosdb_entity_entity entity;
+ return_code = caosdb_transaction_result_set_at(&result_set, &entity, 1);
+ EXPECT_EQ(return_code, 0);
+
+ return_code = caosdb_entity_entity_get_errors_size(&entity, count);
+ EXPECT_EQ(return_code, 0);
+ EXPECT_EQ(*count, 0);
+
+ char out[255] = {"255"}; // NOLINT
+ return_code = caosdb_entity_entity_get_name(&entity, out);
+ EXPECT_EQ(return_code, 0);
+ EXPECT_STREQ(out, "unit");
+
+ caosdb_entity_entity other_entity;
+ return_code = caosdb_transaction_result_set_at(&result_set, &other_entity, 2);
+ EXPECT_EQ(return_code, 0);
+ return_code = caosdb_entity_entity_get_errors_size(&other_entity, count);
+ EXPECT_EQ(return_code, 0);
+ EXPECT_EQ(*count, 1);
+
+ caosdb_entity_message err_msg;
+ return_code = caosdb_entity_entity_get_error(&other_entity, &err_msg, 0);
+ EXPECT_EQ(return_code, 0);
+
+ return_code = caosdb_entity_message_get_code(&err_msg, count);
+ EXPECT_EQ(return_code, 0);
+ EXPECT_EQ(*count, caosdb::entity::MessageCode::ENTITY_DOES_NOT_EXIST);
+
+ return_code = caosdb_transaction_delete_transaction(&transaction);
+ EXPECT_EQ(return_code, 0);
+}
diff --git a/test/test_transaction.cpp b/test/test_transaction.cpp
index 75f2c52..e51ccd6 100644
--- a/test/test_transaction.cpp
+++ b/test/test_transaction.cpp
@@ -31,9 +31,10 @@
#include <gtest/gtest-message.h> // for Message
#include <gtest/gtest-test-part.h> // for TestPartResult, SuiteApiResolver
#include <gtest/gtest_pred_impl.h> // for Test, EXPECT_EQ, AssertionResult
-#include <memory> // for unique_ptr, allocator, __shar...
-#include <string> // for string
-#include <vector> // for vector
+#include <iostream>
+#include <memory> // for unique_ptr, allocator, __shar...
+#include <string> // for string
+#include <vector> // for vector
namespace fs = boost::filesystem;
namespace caosdb::transaction {
@@ -316,6 +317,7 @@ TEST_F(test_transaction, insert_delete_with_property) {
Entity rt;
rt.SetRole("RecordType");
rt.SetName("TestRT");
+ rt.SetDescription("Some description");
rt.AppendProperty(prop_rt);
auto rt_insertion(connection->CreateTransaction());
@@ -346,6 +348,7 @@ TEST_F(test_transaction, insert_delete_with_property) {
const auto &retrieved_rt = rt_retrieve_results.at(0);
EXPECT_EQ(inserted_rt.GetId(), retrieved_rt.GetId());
EXPECT_EQ(rt.GetName(), retrieved_rt.GetName());
+ EXPECT_EQ(rt.GetDescription(), retrieved_rt.GetDescription());
EXPECT_EQ(retrieved_rt.GetProperties().size(), 1);
const auto &retrieved_prop_rt = retrieved_rt.GetProperties().at(0);
@@ -405,6 +408,7 @@ TEST_F(test_transaction, insert_delete_with_property) {
const auto &retrieved_parent_rec = retrieved_rec.GetParents().at(0);
EXPECT_EQ(retrieved_parent_rec.GetName(), rt.GetName());
EXPECT_EQ(retrieved_parent_rec.GetId(), inserted_rt.GetId());
+ EXPECT_EQ(retrieved_parent_rec.GetDescription(), rt.GetDescription());
const auto &retrieved_prop_rec = retrieved_rec.GetProperties().at(0);
EXPECT_EQ(retrieved_prop_rec.GetName(), prop_ent.GetName());
@@ -426,6 +430,7 @@ TEST_F(test_transaction, test_multi_retrieve) {
auto status = transaction->WaitForIt();
ASSERT_TRUE(status.IsTerminated());
+ // Should have an error since entity 22 doesn't exist
ASSERT_TRUE(status.IsError());
const auto &result_set = transaction->GetResultSet();
@@ -433,8 +438,10 @@ TEST_F(test_transaction, test_multi_retrieve) {
EXPECT_EQ(result_set.size(), 3);
EXPECT_EQ(result_set.at(1).GetId(), "21");
EXPECT_EQ(result_set.at(1).GetName(), "unit");
+ // Exists so should be fine ...
EXPECT_FALSE(result_set.at(1).HasErrors());
+ // ... but this does not
EXPECT_EQ(result_set.at(2).GetId(), "22");
EXPECT_TRUE(result_set.at(2).HasErrors());
EXPECT_EQ(result_set.at(2).GetErrors().at(0).GetCode(),
@@ -539,7 +546,9 @@ TEST_F(test_transaction, test_query) {
EXPECT_TRUE((query_transaction->GetCountResult() < 0));
auto count_query_trans(connection->CreateTransaction());
+ std::cout << "Creating count query ..." << std::endl;
count_query_trans->Query("COUNT ENTITY WITH id = " + new_entity.GetId());
+ std::cout << "Executing count query ..." << std::endl;
count_query_trans->Execute();
// No result set in a count query
EXPECT_EQ(count_query_trans->GetResultSet().size(), 0);
--
GitLab