From 5f4697ed3da61bee18f70ec72fa657e4d63e3433 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmat@mail.ru>
Date: Mon, 30 Nov 2020 18:19:23 +0700
Subject: [PATCH] little tests refactoring

---
 untests/CMakeLists.txt                            |  2 +-
 untests/doctest/doctest.cpp                       |  2 ++
 untests/doctest/doctest.hpp                       | 11 +++++++++++
 untests/{flat_tests.cpp => flat_detail_tests.cpp} |  4 +---
 untests/flat_map_tests.cpp                        |  4 +---
 untests/flat_multimap_tests.cpp                   |  4 +---
 untests/flat_multiset_tests.cpp                   |  4 +---
 untests/flat_set_tests.cpp                        |  4 +---
 untests/flat_tests.hpp                            | 13 -------------
 9 files changed, 19 insertions(+), 29 deletions(-)
 create mode 100644 untests/doctest/doctest.cpp
 create mode 100644 untests/doctest/doctest.hpp
 rename untests/{flat_tests.cpp => flat_detail_tests.cpp} (96%)
 delete mode 100644 untests/flat_tests.hpp

diff --git a/untests/CMakeLists.txt b/untests/CMakeLists.txt
index 122bad4..609eda6 100644
--- a/untests/CMakeLists.txt
+++ b/untests/CMakeLists.txt
@@ -16,7 +16,7 @@ endif()
 # executable
 #
 
-file(GLOB UNTESTS_SOURCES "*.cpp" "*.hpp")
+file(GLOB_RECURSE UNTESTS_SOURCES "*.cpp" "*.hpp")
 add_executable(${PROJECT_NAME} ${UNTESTS_SOURCES})
 target_link_libraries(${PROJECT_NAME} flat.hpp)
 
diff --git a/untests/doctest/doctest.cpp b/untests/doctest/doctest.cpp
new file mode 100644
index 0000000..a3f832e
--- /dev/null
+++ b/untests/doctest/doctest.cpp
@@ -0,0 +1,2 @@
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "doctest.h"
diff --git a/untests/doctest/doctest.hpp b/untests/doctest/doctest.hpp
new file mode 100644
index 0000000..c1fc7ee
--- /dev/null
+++ b/untests/doctest/doctest.hpp
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "doctest.h"
+
+#define STATIC_REQUIRE(...)\
+    static_assert(__VA_ARGS__, #__VA_ARGS__);\
+    REQUIRE(__VA_ARGS__);
+
+#define STATIC_REQUIRE_FALSE(...)\
+    static_assert(!(__VA_ARGS__), "!(" #__VA_ARGS__ ")");\
+    REQUIRE(!(__VA_ARGS__));
diff --git a/untests/flat_tests.cpp b/untests/flat_detail_tests.cpp
similarity index 96%
rename from untests/flat_tests.cpp
rename to untests/flat_detail_tests.cpp
index 24c8c3d..4c0c821 100644
--- a/untests/flat_tests.cpp
+++ b/untests/flat_detail_tests.cpp
@@ -5,9 +5,7 @@
  ******************************************************************************/
 
 #include <flat.hpp/flat.hpp>
-
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "doctest/doctest.h"
+#include "doctest/doctest.hpp"
 
 namespace
 {
diff --git a/untests/flat_map_tests.cpp b/untests/flat_map_tests.cpp
index 7a4d455..86d1733 100644
--- a/untests/flat_map_tests.cpp
+++ b/untests/flat_map_tests.cpp
@@ -5,9 +5,7 @@
  ******************************************************************************/
 
 #include <flat.hpp/flat_map.hpp>
-
-#include "doctest/doctest.h"
-#include "flat_tests.hpp"
+#include "doctest/doctest.hpp"
 
 #include <deque>
 #include <string>
diff --git a/untests/flat_multimap_tests.cpp b/untests/flat_multimap_tests.cpp
index 3a33260..f6fb609 100644
--- a/untests/flat_multimap_tests.cpp
+++ b/untests/flat_multimap_tests.cpp
@@ -5,9 +5,7 @@
  ******************************************************************************/
 
 #include <flat.hpp/flat_multimap.hpp>
-
-#include "doctest/doctest.h"
-#include "flat_tests.hpp"
+#include "doctest/doctest.hpp"
 
 #include <deque>
 #include <string>
diff --git a/untests/flat_multiset_tests.cpp b/untests/flat_multiset_tests.cpp
index 8b71d39..4a15b9e 100644
--- a/untests/flat_multiset_tests.cpp
+++ b/untests/flat_multiset_tests.cpp
@@ -5,9 +5,7 @@
  ******************************************************************************/
 
 #include <flat.hpp/flat_multiset.hpp>
-
-#include "doctest/doctest.h"
-#include "flat_tests.hpp"
+#include "doctest/doctest.hpp"
 
 #include <deque>
 #include <string>
diff --git a/untests/flat_set_tests.cpp b/untests/flat_set_tests.cpp
index 1a72d28..dee3781 100644
--- a/untests/flat_set_tests.cpp
+++ b/untests/flat_set_tests.cpp
@@ -5,9 +5,7 @@
  ******************************************************************************/
 
 #include <flat.hpp/flat_set.hpp>
-
-#include "doctest/doctest.h"
-#include "flat_tests.hpp"
+#include "doctest/doctest.hpp"
 
 #include <deque>
 #include <string>
diff --git a/untests/flat_tests.hpp b/untests/flat_tests.hpp
deleted file mode 100644
index e730366..0000000
--- a/untests/flat_tests.hpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*******************************************************************************
- * This file is part of the "https://github.com/blackmatov/flat.hpp"
- * For conditions of distribution and use, see copyright notice in LICENSE.md
- * Copyright (C) 2019-2020, by Matvey Cherevko (blackmatov@gmail.com)
- ******************************************************************************/
-
-#define STATIC_REQUIRE(...)\
-    static_assert(__VA_ARGS__, #__VA_ARGS__);\
-    REQUIRE(__VA_ARGS__);
-
-#define STATIC_REQUIRE_FALSE(...)\
-    static_assert(!(__VA_ARGS__), "!(" #__VA_ARGS__ ")");\
-    REQUIRE(!(__VA_ARGS__));