From 4fca47f94080806655aeaa6bf142b3c999f37a19 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Mon, 12 Jul 2021 20:38:43 +0200
Subject: [PATCH] ENH: basic c interface
---
test/test_connection.cpp | 27 ++++++++++++---------------
test/test_transaction.cpp | 4 ++--
2 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/test/test_connection.cpp b/test/test_connection.cpp
index c2ed89e..eb2cea1 100644
--- a/test/test_connection.cpp
+++ b/test/test_connection.cpp
@@ -20,33 +20,30 @@
*
*/
-#include <gtest/gtest-message.h> // for Message
-#include <gtest/gtest-test-part.h> // for TestPartResult, SuiteApiRes...
-#include <memory> // for allocator, operator!=, shar...
-#include "caosdb/connection.h" // for PemCACertProvider, Insecure...
-#include "grpcpp/security/credentials.h" // for ChannelCredentials
-#include "gtest/gtest_pred_impl.h" // for Test, AssertionResult, EXPE...
+#include <gtest/gtest-message.h> // for Message
+#include <gtest/gtest-test-part.h> // for TestPartResult, SuiteApiRes...
+#include <memory> // for allocator, operator!=, shar...
+#include "caosdb/connection.h" // for PemCACertProvider, Insecure...
+#include "gtest/gtest_pred_impl.h" // for Test, AssertionResult, EXPE...
namespace caosdb::connection {
TEST(test_connection, configure_insecure_localhost_8080) {
InsecureCaosDBConnectionConfig config("localhost", 8000);
- EXPECT_EQ("localhost", config.getHost());
- EXPECT_EQ(8000, config.getPort());
- std::shared_ptr<grpc::ChannelCredentials> icc =
- config.getChannelCredentials();
+ EXPECT_EQ("localhost", config.GetHost());
+ EXPECT_EQ(8000, config.GetPort());
+ auto icc = config.GetChannelCredentials();
EXPECT_TRUE(icc != nullptr);
}
TEST(test_connection, configure_ssl_localhost_8080) {
- auto cacert = std::make_shared<PemCACertProvider>("ca chain");
+ auto cacert = PemCACertProvider("ca chain");
SslCaosDBConnectionConfig config("localhost", 44300, cacert);
- EXPECT_EQ("localhost", config.getHost());
- EXPECT_EQ(44300, config.getPort());
- std::shared_ptr<grpc::ChannelCredentials> sslcc =
- config.getChannelCredentials();
+ EXPECT_EQ("localhost", config.GetHost());
+ EXPECT_EQ(44300, config.GetPort());
+ auto sslcc = config.GetChannelCredentials();
EXPECT_TRUE(sslcc != nullptr);
}
diff --git a/test/test_transaction.cpp b/test/test_transaction.cpp
index 4dcc137..7570e5c 100644
--- a/test/test_transaction.cpp
+++ b/test/test_transaction.cpp
@@ -39,8 +39,8 @@ using caosdb::transaction::UniqueResult;
using ProtoEntity = caosdb::entity::v1alpha1::Entity;
TEST(test_transaction, create_transaction) {
- const auto *pHost = "localhost";
- auto config = std::make_shared<InsecureCaosDBConnectionConfig>(pHost, 8000);
+ const auto *host = "localhost";
+ auto config = InsecureCaosDBConnectionConfig(host, 8000);
CaosDBConnection connection(config);
auto transaction = connection.CreateTransaction();
--
GitLab