From 0f7f86077b946c4c9452f4166ab50470507ad824 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Tue, 17 Aug 2021 22:43:52 +0200
Subject: [PATCH] STY: ws changes
---
test/test_ccaosdb.cpp | 34 ++++++++++++++++-----------------
test/test_file_transmission.cpp | 1 -
2 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/test/test_ccaosdb.cpp b/test/test_ccaosdb.cpp
index 47b26be..6f8eb10 100644
--- a/test/test_ccaosdb.cpp
+++ b/test/test_ccaosdb.cpp
@@ -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);
@@ -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);
diff --git a/test/test_file_transmission.cpp b/test/test_file_transmission.cpp
index eab5b78..9282bf8 100644
--- a/test/test_file_transmission.cpp
+++ b/test/test_file_transmission.cpp
@@ -36,7 +36,6 @@ using caosdb::entity::v1alpha1::RegisterFileUploadResponse;
using caosdb::entity::v1alpha1::RegistrationStatus;
using caosdb::entity::v1alpha1::TransmissionStatus;
-
// TODO(tf) this file is currently not used (see CMakeLists.txt)
// Is it still necessary or is it obsolete due to test_transaction.cpp?
// RegisterFileDownloadResponse is currently not defined by proto or the h
--
GitLab