From 10bc63c2de2f8793a2ac1ad54e73142136e0de1a Mon Sep 17 00:00:00 2001
From: Daniel <d.hornung@indiscale.com>
Date: Wed, 25 Aug 2021 16:27:07 +0200
Subject: [PATCH] ENH: Tests now also clean before tests.
---
test/test_ccaosdb.cpp | 11 ++++++++---
test/test_list_properties.cpp | 6 ++++--
test/test_transaction.cpp | 5 +++++
3 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/test/test_ccaosdb.cpp b/test/test_ccaosdb.cpp
index a9b023c..ecc3eb5 100644
--- a/test/test_ccaosdb.cpp
+++ b/test/test_ccaosdb.cpp
@@ -39,6 +39,7 @@ protected:
fs::path test_download_file_1;
void SetUp() override {
+ DeleteEntities();
test_upload_file_1 = fs::path("test_upload_file_1_delete_me.dat");
test_download_file_1 = fs::path("test_download_file_1_delete_me.dat");
@@ -50,14 +51,18 @@ protected:
}
}
- /**
- * Delete everything with id>99, C style
- */
void TearDown() override {
// delete files
fs::remove(test_upload_file_1);
fs::remove(test_download_file_1);
+ DeleteEntities();
+ }
+
+ /**
+ * Delete everything with id>99, C style
+ */
+ static void DeleteEntities() {
caosdb_connection_connection connection;
caosdb_connection_connection_manager_get_default_connection(&connection);
diff --git a/test/test_list_properties.cpp b/test/test_list_properties.cpp
index fdbd352..ace6a93 100644
--- a/test/test_list_properties.cpp
+++ b/test/test_list_properties.cpp
@@ -36,9 +36,11 @@ namespace caosdb::entity {
class test_list_properties : public ::testing::Test {
protected:
- void SetUp() override {}
+ void SetUp() override { DeleteEntities(); }
- void TearDown() override {
+ void TearDown() override { DeleteEntities(); }
+
+ static void DeleteEntities() {
const auto &connection =
caosdb::connection::ConnectionManager::GetDefaultConnection();
auto query_transaction(connection->CreateTransaction());
diff --git a/test/test_transaction.cpp b/test/test_transaction.cpp
index ce4632d..c5daf6d 100644
--- a/test/test_transaction.cpp
+++ b/test/test_transaction.cpp
@@ -54,6 +54,8 @@ protected:
fs::path test_download_file_1;
void SetUp() override {
+ DeleteEntities();
+
test_upload_file_1 = fs::path("test_upload_file_1_delete_me.dat");
test_download_file_1 = fs::path("test_download_file_1_delete_me.dat");
@@ -69,7 +71,10 @@ protected:
// delete files
fs::remove(test_upload_file_1);
fs::remove(test_download_file_1);
+ DeleteEntities();
+ }
+ static void DeleteEntities() {
// delete all entities
const auto &connection =
caosdb::connection::ConnectionManager::GetDefaultConnection();
--
GitLab