From 8f023a635b202fe210bbdd53af83251818eb09ea Mon Sep 17 00:00:00 2001 From: Timm Fitschen <t.fitschen@indiscale.com> Date: Tue, 22 Jun 2021 17:02:39 +0200 Subject: [PATCH] update tests --- test/test_connection.cpp | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/test/test_connection.cpp b/test/test_connection.cpp index 1fcb1de..4b54e5b 100644 --- a/test/test_connection.cpp +++ b/test/test_connection.cpp @@ -31,34 +31,36 @@ using caosdb::info::v1alpha1::VersionInfo; TEST(test_connection, config_somehost_25323) { int port = 25323; std::string host = "somehost"; - caosdb::CaosDBConnectionConfig config(host, port); + auto config = std::make_unique<caosdb::InsecureCaosDBConnectionConfig>(host, port); - EXPECT_EQ(host, config.getHost()); - EXPECT_EQ(port, config.getPort()); + ASSERT_EQ(host, config->getHost()); + ASSERT_EQ(port, config->getPort()); } TEST(test_connection, connect_somehost_42347_fails) { int port = 42347; std::string host = "somehost"; - caosdb::CaosDBConnectionConfig config(host, port); + auto config = std::make_shared<caosdb::InsecureCaosDBConnectionConfig>(host, port); caosdb::CaosDBConnection connection(config); - EXPECT_THROW(connection.getVersionInfo(), std::runtime_error); + ASSERT_THROW(connection.getVersionInfo(), std::runtime_error); } TEST(test_connection, connection_caosdb_server_8080_success) { int port = 8080; - std::string host = "caosdb-server"; + std::string host = "localhost"; int major = 0; - int minor = 4; + int minor = 5; int patch = 0; + std::string pre_release = "SNAPSHOT"; - caosdb::CaosDBConnectionConfig config(host, port); - caosdb::CaosDBConnection connection(config); + auto config = std::make_shared<caosdb::InsecureCaosDBConnectionConfig>(host, port); + auto connection = std::make_unique<caosdb::CaosDBConnection>(config); - const VersionInfo &v_info = connection.getVersionInfo(); - EXPECT_EQ(major, v_info.major()); - EXPECT_EQ(minor, v_info.minor()); - EXPECT_EQ(patch, v_info.patch()); - EXPECT_NE("", v_info.build()); + auto v_info = connection->getVersionInfo(); + ASSERT_EQ(major, v_info.major()); + ASSERT_EQ(minor, v_info.minor()); + ASSERT_EQ(patch, v_info.patch()); + ASSERT_EQ(pre_release, v_info.pre_release()); + ASSERT_NE("", v_info.build()); } -- GitLab