Move uti/utils.h to gather.h

KarlsruheGraphGeneration · Nov 30, 2023 · 7362fce · 7362fce
1 parent 4ace8ef
commit 7362fce
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 234 deletions.
diff --git a/tests/file/generic_file_generator_test.cpp b/tests/file/generic_file_generator_test.cpp
@@ -1,16 +1,14 @@
+#include "kagen/context.h"
+#include "kagen/generators/file/file_graph.h"
+
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
-
 #include <mpi.h>
 
+#include "tests/gather.h"
 #include <numeric>
 #include <utility>
 
-#include "kagen/context.h"
-#include "kagen/generators/file/file_graph.h"
-
-#include "tests/util/utils.h"
-
 const char* EMPTY_GRAPH         = "tests/data/graphs/empty";
 const char* REAL_WORLD_GRAPH    = "tests/data/graphs/144";
 const char* EDGE_WEIGHTED_K3    = "tests/data/graphs/edge_weighted_K3";

diff --git a/tests/geometric/hyperbolic_test.cpp b/tests/geometric/hyperbolic_test.cpp
@@ -4,8 +4,8 @@
 
 #include <gtest/gtest.h>
 
+#include "tests/gather.h"
 #include "tests/geometric/utils.h"
-#include "tests/util/utils.h"
 
 using namespace kagen;
 

diff --git a/tests/geometric/rgg2d_test.cpp b/tests/geometric/rgg2d_test.cpp
@@ -5,8 +5,8 @@
 
 #include <gtest/gtest.h>
 
+#include "tests/gather.h"
 #include "tests/geometric/utils.h"
-#include "tests/util/utils.h"
 
 using namespace kagen;
 

diff --git a/tests/geometric/rgg3d_test.cpp b/tests/geometric/rgg3d_test.cpp
@@ -5,8 +5,8 @@
 
 #include <gtest/gtest.h>
 
+#include "tests/gather.h"
 #include "tests/geometric/utils.h"
-#include "tests/util/utils.h"
 
 using namespace kagen;
 

diff --git a/tests/path/general_path_generator_test.cpp b/tests/path/general_path_generator_test.cpp
@@ -3,7 +3,7 @@
 
 #include <gtest/gtest.h>
 
-#include "tests/util/utils.h"
+#include "tests/gather.h"
 
 class PathGeneratorTestFixture : public ::testing::TestWithParam<kagen::SInt> {};
 INSTANTIATE_TEST_SUITE_P(PathGenerationTests, PathGeneratorTestFixture, ::testing::Values(10, 500, 16384, 30001));

diff --git a/tests/util/utils.h b/tests/util/utils.h