From 7f5ab8633e7bc47a299b45f63db6d6ab93b40c3b Mon Sep 17 00:00:00 2001
From: florian <f.spreckelsen@inidscale.com>
Date: Thu, 19 Aug 2021 17:26:00 +0200
Subject: [PATCH] ENH: Use correct string getters
---
test/test_ccaosdb.cpp | 46 +++++++++++++++++++++----------------------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/test/test_ccaosdb.cpp b/test/test_ccaosdb.cpp
index 6f8eb10..859f7d3 100644
--- a/test/test_ccaosdb.cpp
+++ b/test/test_ccaosdb.cpp
@@ -37,7 +37,7 @@ TEST(test_ccaosdb, connection_ssl_authentication_success) {
auto major = caosdb_constants_COMPATIBLE_SERVER_VERSION_MAJOR();
auto minor = caosdb_constants_COMPATIBLE_SERVER_VERSION_MINOR();
const auto *const pre_release =
- caosdb_constants_COMPATIBLE_SERVER_VERSION_PRE_RELEASE();
+ caosdb_constants_COMPATIBLE_SERVER_VERSION_PRE_RELEASE();
EXPECT_EQ(major, version_info.major);
EXPECT_EQ(minor, version_info.minor);
@@ -48,12 +48,12 @@ TEST(test_ccaosdb, test_count_query) {
caosdb_connection_connection connection;
int return_code(
- caosdb_connection_connection_manager_get_default_connection(&connection));
+ 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);
+ return_code =
+ caosdb_connection_connection_create_transaction(&connection, &transaction);
EXPECT_EQ(return_code, 0);
// COUNT query with an empty result
@@ -67,7 +67,7 @@ TEST(test_ccaosdb, test_count_query) {
long dummy(-1); // NOLINT
long *count = &dummy; // NOLINT
return_code =
- caosdb_transaction_transaction_get_count_result(&transaction, count);
+ caosdb_transaction_transaction_get_count_result(&transaction, count);
EXPECT_EQ(return_code, 0);
EXPECT_EQ(*count, 0);
@@ -78,12 +78,12 @@ TEST(test_ccaosdb, test_count_query) {
TEST(test_ccaosdb, test_query) {
caosdb_connection_connection connection;
int return_code(
- caosdb_connection_connection_manager_get_default_connection(&connection));
+ 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);
+ return_code =
+ caosdb_connection_connection_create_transaction(&connection, &transaction);
EXPECT_EQ(return_code, 0);
return_code = caosdb_transaction_transaction_query(&transaction,
@@ -95,7 +95,7 @@ TEST(test_ccaosdb, test_query) {
caosdb_transaction_result_set result_set;
return_code =
- caosdb_transaction_transaction_get_result_set(&transaction, &result_set);
+ caosdb_transaction_transaction_get_result_set(&transaction, &result_set);
EXPECT_EQ(return_code, 0);
int dummy(-1);
@@ -111,16 +111,16 @@ TEST(test_ccaosdb, test_query) {
TEST(test_ccaosdb, test_single_id_retrieve) {
caosdb_connection_connection connection;
int return_code(
- caosdb_connection_connection_manager_get_default_connection(&connection));
+ 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);
+ return_code =
+ caosdb_connection_connection_create_transaction(&connection, &transaction);
EXPECT_EQ(return_code, 0);
return_code =
- caosdb_transaction_transaction_retrieve_by_id(&transaction, "21");
+ caosdb_transaction_transaction_retrieve_by_id(&transaction, "21");
EXPECT_EQ(return_code, caosdb::StatusCode::GO_ON);
return_code = caosdb_transaction_transaction_execute(&transaction);
@@ -128,7 +128,7 @@ TEST(test_ccaosdb, test_single_id_retrieve) {
caosdb_transaction_result_set result_set;
return_code =
- caosdb_transaction_transaction_get_result_set(&transaction, &result_set);
+ caosdb_transaction_transaction_get_result_set(&transaction, &result_set);
EXPECT_EQ(return_code, 0);
int dummy(-1);
@@ -145,8 +145,8 @@ TEST(test_ccaosdb, test_single_id_retrieve) {
EXPECT_EQ(return_code, 0);
EXPECT_EQ(*count, 0);
- char out[255] = {"255"}; // NOLINT
- return_code = caosdb_entity_entity_get_name(&entity, out);
+ char *out = nullptr; // NOLINT
+ return_code = caosdb_entity_entity_get_name(&entity, &out);
EXPECT_EQ(return_code, 0);
EXPECT_STREQ(out, "unit");
@@ -157,17 +157,17 @@ TEST(test_ccaosdb, test_single_id_retrieve) {
TEST(test_ccaosdb, test_multi_id_retrieve) {
caosdb_connection_connection connection;
int return_code(
- caosdb_connection_connection_manager_get_default_connection(&connection));
+ 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);
+ 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);
+ caosdb_transaction_transaction_retrieve_by_ids(&transaction, ids, 3);
EXPECT_EQ(return_code, caosdb::StatusCode::GO_ON);
return_code = caosdb_transaction_transaction_execute(&transaction);
@@ -176,7 +176,7 @@ TEST(test_ccaosdb, test_multi_id_retrieve) {
caosdb_transaction_result_set result_set;
return_code =
- caosdb_transaction_transaction_get_result_set(&transaction, &result_set);
+ caosdb_transaction_transaction_get_result_set(&transaction, &result_set);
EXPECT_EQ(return_code, 0);
int dummy(-1);
@@ -193,8 +193,8 @@ TEST(test_ccaosdb, test_multi_id_retrieve) {
EXPECT_EQ(return_code, 0);
EXPECT_EQ(*count, 0);
- char out[255] = {"255"}; // NOLINT
- return_code = caosdb_entity_entity_get_name(&entity, out);
+ char *out = nullptr; // NOLINT
+ return_code = caosdb_entity_entity_get_name(&entity, &out);
EXPECT_EQ(return_code, 0);
EXPECT_STREQ(out, "unit");
--
GitLab