From d5e2e928fa86e0248b3bb0b092ef544e7dab8a4a Mon Sep 17 00:00:00 2001 From: Timm Fitschen <t.fitschen@indiscale.com> Date: Mon, 19 Jul 2021 22:24:54 +0200 Subject: [PATCH] TST: rename ConnectionConfig to ConnectionConfiguration --- test/test_ccaosdb.cpp | 1 - test/test_connection.cpp | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/test/test_ccaosdb.cpp b/test/test_ccaosdb.cpp index 7909ab8..3b99e8e 100644 --- a/test/test_ccaosdb.cpp +++ b/test/test_ccaosdb.cpp @@ -25,7 +25,6 @@ TEST(test_ccaosdb, connection_ssl_authentication_success) { - caosdb_connection_connection connection; caosdb_connection_connection_manager_get_default_connection(&connection); diff --git a/test/test_connection.cpp b/test/test_connection.cpp index b697197..08eec66 100644 --- a/test/test_connection.cpp +++ b/test/test_connection.cpp @@ -23,7 +23,7 @@ #include <memory> // for make_shared, allocator, shared_ptr #include <string> // for string #include "caosdb/authentication.h" // for PlainPasswordAuthenticator -#include "caosdb/connection.h" // for InsecureConnectionConfig +#include "caosdb/connection.h" // for InsecureConnectionConfiguration #include "caosdb/exceptions.h" // for AuthenticationError, ConnectionError #include "caosdb/info.h" // for VersionInfo #include "caosdb/utility.h" // for get_env_var @@ -39,7 +39,7 @@ using caosdb::exceptions::ConnectionError; TEST(test_connection, config_somehost_25323) { auto port = 25323; const auto *host = "somehost"; - auto config = InsecureConnectionConfig(host, port); + auto config = InsecureConnectionConfiguration(host, port); EXPECT_EQ(host, config.GetHost()); EXPECT_EQ(port, config.GetPort()); @@ -48,7 +48,7 @@ TEST(test_connection, config_somehost_25323) { TEST(test_connection, connect_somehost_42347_fails) { auto port = 42347; const auto *host = "somehost"; - auto config = InsecureConnectionConfig(host, port); + auto config = InsecureConnectionConfiguration(host, port); Connection connection(config); EXPECT_THROW(connection.GetVersionInfo(), ConnectionError); @@ -61,7 +61,7 @@ TEST(test_connection, connection_insecure_authentication_error_anonymous) { const auto *const host = caosdb::utility::get_env_var("CAOSDB_SERVER_HOST", "localhost"); - auto config = InsecureConnectionConfig(host, port); + auto config = InsecureConnectionConfiguration(host, port); auto connection = Connection(config); EXPECT_THROW(connection.GetVersionInfo(), AuthenticationError); @@ -77,7 +77,7 @@ TEST(test_connection, connection_ssl_authentication_error_anonymous) { caosdb::utility::get_env_var("CAOSDB_SERVER_CERT", std::string()); auto cert = PemFileCertificateProvider(path); - auto config = TlsConnectionConfig(host, port, cert); + auto config = TlsConnectionConfiguration(host, port, cert); auto connection = Connection(config); EXPECT_THROW_MESSAGE(connection.GetVersionInfo(), AuthenticationError, @@ -97,7 +97,7 @@ TEST(test_connection, connection_ssl_authentication_error_wrong_credentials) { auto auth = PlainPasswordAuthenticator(user, password); auto cert = PemFileCertificateProvider(path); - auto config = TlsConnectionConfig(host, port, cert, auth); + auto config = TlsConnectionConfiguration(host, port, cert, auth); auto connection = Connection(config); EXPECT_THROW_MESSAGE(connection.GetVersionInfo(), AuthenticationError, -- GitLab