From ea46e0e72b28cf40263f0c5950a9325a069f43ed Mon Sep 17 00:00:00 2001 From: Timm Fitschen <t.fitschen@indiscale.com> Date: Mon, 9 Oct 2023 00:24:11 +0200 Subject: [PATCH] TST: update tests for string ids --- test/test_select.cpp | 4 +--- test/test_transaction.cpp | 21 --------------------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/test/test_select.cpp b/test/test_select.cpp index f880954..fa63eef 100644 --- a/test/test_select.cpp +++ b/test/test_select.cpp @@ -363,9 +363,7 @@ TEST_F(test_select, test_select_property_unit) { EXPECT_EQ(query_transaction->GetResultTable().size(), 1); for (const auto &row : query_transaction->GetResultTable().GetRows()) { - // Fails due to https://gitlab.indiscale.com/caosdb/src/caosdb-server/-/issues/264 - EXPECT_NONFATAL_FAILURE({ EXPECT_EQ(row.GetValue("TestPropDouble.unit").GetAsString(), "m"); }, - "TestPropDouble.unit"); + EXPECT_EQ(row.GetValue("TestPropDouble.unit").GetAsString(), "m"); } } diff --git a/test/test_transaction.cpp b/test/test_transaction.cpp index aff1c6e..ba8b68d 100644 --- a/test/test_transaction.cpp +++ b/test/test_transaction.cpp @@ -1328,25 +1328,4 @@ TEST_F(test_transaction, test_full_workflow) { EXPECT_EQ(retr_transaction->GetResultSet().size(), 1); } -TEST_F(test_transaction, test_delete_string_id) { - const auto &connection = caosdb::connection::ConnectionManager::GetDefaultConnection(); - auto transaction(connection->CreateTransaction()); - - transaction->DeleteById("20"); - transaction->DeleteById("string"); - transaction->DeleteById("21"); - - transaction->ExecuteAsynchronously(); - transaction->WaitForIt(); - - EXPECT_TRUE(transaction->GetStatus().IsTerminated()); - EXPECT_TRUE(transaction->GetStatus().IsError()); - const auto &results = transaction->GetResultSet(); - EXPECT_FALSE(results.at(0).HasErrors()); - EXPECT_TRUE(results.at(1).HasErrors()); - EXPECT_EQ(results.at(1).GetErrors().size(), 1); - EXPECT_EQ(results.at(1).GetErrors().at(0).GetDescription(), "Entity does not exist."); - EXPECT_FALSE(results.at(2).HasErrors()); -} - } // namespace caosdb::transaction -- GitLab