From 86017926af1a62d8ed985a9c66cb384b7347c070 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 21 Aug 2019 09:19:28 +0200
Subject: [PATCH] Refactored Tests to use the InfoLibs.
---
Tests/CMakeLists.txt | 2 ++
Tests/FileIO/TestBoostGmlInterface.cpp | 4 ++--
Tests/FileIO/TestCsvReader.cpp | 4 ++--
Tests/FileIO/TestCsvWriter.cpp | 4 ++--
Tests/FileIO/TestGmlInterface.h | 2 --
Tests/FileIO/TestGmsInterface.cpp | 4 ++--
Tests/FileIO/TestTetGenInterface.cpp | 18 +++++++++---------
Tests/FileIO_Qt/TestFEFLOWInterface.cpp | 14 +++++++-------
Tests/FileIO_Qt/TestQtGmlInterface.cpp | 4 ++--
Tests/FileIO_Qt/TestQtPrjInterface.cpp | 6 +++---
Tests/FileIO_Qt/TestVtkRaster.cpp | 6 +++---
Tests/FileIO_SWMM/TestSwmmInterface.cpp | 4 ++--
Tests/GeoLib/IO/TestGLIReader.cpp | 18 +++++++++---------
Tests/GeoLib/TestPointToStationConversion.cpp | 4 ++--
Tests/MathLib/TestGaussLegendreIntegration.cpp | 14 +++++++-------
Tests/MeshLib/TestRasterToMesh.cpp | 4 ++--
Tests/MeshLib/TestVtkMappedMeshSource.cpp | 4 ++--
Tests/NumLib/TestComponentNorms.cpp | 4 ++--
Tests/NumLib/TestODEInt.cpp | 2 +-
Tests/testrunner.cpp | 1 -
20 files changed, 61 insertions(+), 62 deletions(-)
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 502ea4d5571..d08e3e753a0 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -47,6 +47,7 @@ target_link_libraries(testrunner
NumLib
ParameterLib
ProcessLib
+ TestInfoLib
Threads::Threads
${VTK_LIBRARIES})
@@ -72,6 +73,7 @@ endif()
if(OGS_BUILD_GUI)
target_link_libraries(testrunner
+ GitInfoLib
Qt5::Core
Qt5::Gui
Qt5::Xml
diff --git a/Tests/FileIO/TestBoostGmlInterface.cpp b/Tests/FileIO/TestBoostGmlInterface.cpp
index 8363fe52585..e2fc5457416 100644
--- a/Tests/FileIO/TestBoostGmlInterface.cpp
+++ b/Tests/FileIO/TestBoostGmlInterface.cpp
@@ -18,14 +18,14 @@
#include "Tests/FileIO/TestGmlInterface.h"
-#include "BaseLib/BuildInfo.h"
+#include "InfoLib/TestInfo.h"
#include "GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.h"
#include "GeoLib/GEOObjects.h"
TEST_F(TestGmlInterface, BoostXmlGmlWriterReaderTest)
{
// Writer test
- std::string test_data_file(BaseLib::BuildInfo::tests_tmp_path
+ std::string test_data_file(TestInfoLib::TestInfo::tests_tmp_path
+ "TestXmlGmlReader.gml");
GeoLib::IO::BoostXmlGmlInterface xml(geo_objects);
diff --git a/Tests/FileIO/TestCsvReader.cpp b/Tests/FileIO/TestCsvReader.cpp
index 2d369857170..166497a69d5 100644
--- a/Tests/FileIO/TestCsvReader.cpp
+++ b/Tests/FileIO/TestCsvReader.cpp
@@ -16,7 +16,7 @@
#include "gtest/gtest.h"
-#include "BaseLib/BuildInfo.h"
+#include "InfoLib/TestInfo.h"
#include "Applications/FileIO/CsvInterface.h"
#include "GeoLib/Point.h"
@@ -24,7 +24,7 @@ class CsvInterfaceTest : public ::testing::Test
{
public:
CsvInterfaceTest()
- : _file_name(BaseLib::BuildInfo::tests_tmp_path+"test.csv")
+ : _file_name(TestInfoLib::TestInfo::tests_tmp_path+"test.csv")
{
std::ofstream out(_file_name);
out << "id\tx\ty\tz\tname\tvalue1\tvalue_two\n";
diff --git a/Tests/FileIO/TestCsvWriter.cpp b/Tests/FileIO/TestCsvWriter.cpp
index a27f5038a14..ce35532c4cc 100644
--- a/Tests/FileIO/TestCsvWriter.cpp
+++ b/Tests/FileIO/TestCsvWriter.cpp
@@ -15,12 +15,12 @@
#include <string>
#include <vector>
-#include "BaseLib/BuildInfo.h"
+#include "InfoLib/TestInfo.h"
#include "Applications/FileIO/CsvInterface.h"
TEST(CsvWriter, WriteReadTest)
{
- std::string test_file(BaseLib::BuildInfo::tests_tmp_path + "TestData.csv");
+ std::string test_file(TestInfoLib::TestInfo::tests_tmp_path + "TestData.csv");
std::vector<std::string> str_vec {"Red", "Orange", "Yellow", "Green", "Blue", "Indigo", "Violet" };
std::vector<int> int_vec { 1, 2, 4, 8, 16, 32, 64 };
diff --git a/Tests/FileIO/TestGmlInterface.h b/Tests/FileIO/TestGmlInterface.h
index 3ecb41c5eed..29f4387ec77 100644
--- a/Tests/FileIO/TestGmlInterface.h
+++ b/Tests/FileIO/TestGmlInterface.h
@@ -16,8 +16,6 @@
#include "gtest/gtest.h"
-#include "BaseLib/BuildInfo.h"
-
#include "GeoLib/GEOObjects.h"
#include "GeoLib/Polyline.h"
#include "GeoLib/Triangle.h"
diff --git a/Tests/FileIO/TestGmsInterface.cpp b/Tests/FileIO/TestGmsInterface.cpp
index a56de29d644..6ba2abb3f29 100644
--- a/Tests/FileIO/TestGmsInterface.cpp
+++ b/Tests/FileIO/TestGmsInterface.cpp
@@ -12,14 +12,14 @@
#include "gtest/gtest.h"
-#include "BaseLib/BuildInfo.h"
+#include "InfoLib/TestInfo.h"
#include "Applications/FileIO/GMSInterface.h"
#include "MeshLib/Mesh.h"
#include "MeshLib/MeshInformation.h"
TEST(FileIO, TestGmsInterface)
{
- std::string const file_name (BaseLib::BuildInfo::data_path + "/FileIO/3DMeshData.3dm");
+ std::string const file_name (TestInfoLib::TestInfo::data_path + "/FileIO/3DMeshData.3dm");
std::unique_ptr<MeshLib::Mesh> mesh (FileIO::GMSInterface::readGMS3DMMesh(file_name));
ASSERT_TRUE(mesh != nullptr);
ASSERT_EQ(11795, mesh->getNumberOfNodes());
diff --git a/Tests/FileIO/TestTetGenInterface.cpp b/Tests/FileIO/TestTetGenInterface.cpp
index 8d7a05db85b..2388a58085d 100644
--- a/Tests/FileIO/TestTetGenInterface.cpp
+++ b/Tests/FileIO/TestTetGenInterface.cpp
@@ -19,7 +19,7 @@
#include "gtest/gtest.h"
#include "Applications/FileIO/TetGenInterface.h"
-#include "BaseLib/BuildInfo.h"
+#include "InfoLib/TestInfo.h"
#include "MeshLib/IO/readMeshFromFile.h"
#include "GeoLib/GEOObjects.h"
#include "MeshLib/Mesh.h"
@@ -29,7 +29,7 @@
// read TetGen geometry
TEST(FileIO, TetGenSmeshReader)
{
- std::string const file_name (BaseLib::BuildInfo::data_path + "/FileIO/twolayermdl.smesh");
+ std::string const file_name (TestInfoLib::TestInfo::data_path + "/FileIO/twolayermdl.smesh");
GeoLib::GEOObjects geo_objects;
FileIO::TetGenInterface tgi;
bool const result (tgi.readTetGenGeometry(file_name, geo_objects));
@@ -50,11 +50,11 @@ TEST(FileIO, TetGenSmeshInterface)
TEST(FileIO, DISABLED_TetGenSmeshInterface)
#endif
{
- std::string const file_name (BaseLib::BuildInfo::data_path + "/FileIO/AmmerSubsurfaceCoarse.vtu");
+ std::string const file_name (TestInfoLib::TestInfo::data_path + "/FileIO/AmmerSubsurfaceCoarse.vtu");
std::unique_ptr<MeshLib::Mesh const> const mesh (MeshLib::IO::readMeshFromFile(file_name));
std::string const tg_new_name ("TestSmeshWriter");
- std::string const output_name(BaseLib::BuildInfo::tests_tmp_path + tg_new_name + ".smesh");
+ std::string const output_name(TestInfoLib::TestInfo::tests_tmp_path + tg_new_name + ".smesh");
std::vector<MeshLib::Node> attr_pnts;
FileIO::TetGenInterface tgi;
bool result (tgi.writeTetGenSmesh(output_name, *mesh, attr_pnts));
@@ -63,7 +63,7 @@ TEST(FileIO, DISABLED_TetGenSmeshInterface)
GeoLib::GEOObjects geo_objects;
result = tgi.readTetGenGeometry(output_name, geo_objects);
ASSERT_TRUE(result);
- std::string const ref_name(BaseLib::BuildInfo::data_path + "/FileIO/AmmerSubsurfaceCoarse.smesh");
+ std::string const ref_name(TestInfoLib::TestInfo::data_path + "/FileIO/AmmerSubsurfaceCoarse.smesh");
result = tgi.readTetGenGeometry(ref_name, geo_objects);
ASSERT_TRUE(result);
@@ -87,8 +87,8 @@ TEST(FileIO, DISABLED_TetGenSmeshInterface)
// TetGen mesh with material array
TEST(FileIO, TetGenMeshReaderWithMaterials)
{
- std::string const node_name (BaseLib::BuildInfo::data_path + "/FileIO/twolayermdl.node");
- std::string const ele_name (BaseLib::BuildInfo::data_path + "/FileIO/twolayermdl.ele");
+ std::string const node_name (TestInfoLib::TestInfo::data_path + "/FileIO/twolayermdl.node");
+ std::string const ele_name (TestInfoLib::TestInfo::data_path + "/FileIO/twolayermdl.ele");
FileIO::TetGenInterface tgi;
std::unique_ptr<MeshLib::Mesh> mesh (tgi.readTetGenMesh(node_name, ele_name));
ASSERT_TRUE(mesh != nullptr);
@@ -105,8 +105,8 @@ TEST(FileIO, TetGenMeshReaderWithMaterials)
// TetGen mesh without additional information
TEST(FileIO, TetGenMeshReaderWithoutMaterials)
{
- std::string const node_name (BaseLib::BuildInfo::data_path + "/FileIO/tetgen_example.node");
- std::string const ele_name (BaseLib::BuildInfo::data_path + "/FileIO/tetgen_example.ele");
+ std::string const node_name (TestInfoLib::TestInfo::data_path + "/FileIO/tetgen_example.node");
+ std::string const ele_name (TestInfoLib::TestInfo::data_path + "/FileIO/tetgen_example.ele");
FileIO::TetGenInterface tgi;
std::unique_ptr<MeshLib::Mesh> mesh (tgi.readTetGenMesh(node_name, ele_name));
ASSERT_TRUE(mesh != nullptr);
diff --git a/Tests/FileIO_Qt/TestFEFLOWInterface.cpp b/Tests/FileIO_Qt/TestFEFLOWInterface.cpp
index 8aa63989568..13faa1e93dd 100644
--- a/Tests/FileIO_Qt/TestFEFLOWInterface.cpp
+++ b/Tests/FileIO_Qt/TestFEFLOWInterface.cpp
@@ -13,7 +13,7 @@
#include <gtest/gtest.h>
-#include "BaseLib/BuildInfo.h"
+#include "InfoLib/TestInfo.h"
#include "MeshLib/Elements/Element.h"
#include "MeshLib/Mesh.h"
@@ -23,7 +23,7 @@
TEST(FileIO, TestFEFLOWMeshInterface)
{
- std::string const file_name (BaseLib::BuildInfo::data_path + "/FileIO/small_cube_hex.fem");
+ std::string const file_name (TestInfoLib::TestInfo::data_path + "/FileIO/small_cube_hex.fem");
FileIO::FEFLOWMeshInterface feflowIO;
std::unique_ptr<MeshLib::Mesh const> mesh(feflowIO.readFEFLOWFile(file_name));
@@ -45,7 +45,7 @@ TEST(FileIO, TestFEFLOWMeshInterface)
TEST(FileIO, TestFEFLOWReadHexMesh)
{
- std::string const fname(BaseLib::BuildInfo::data_path +
+ std::string const fname(TestInfoLib::TestInfo::data_path +
"/FileIO/FEFLOW/hex.fem");
FileIO::FEFLOWMeshInterface feflowIO;
std::unique_ptr<MeshLib::Mesh const> mesh(
@@ -62,7 +62,7 @@ TEST(FileIO, TestFEFLOWReadHexMesh)
TEST(FileIO, TestFEFLOWReadPrismMesh)
{
- std::string const fname(BaseLib::BuildInfo::data_path +
+ std::string const fname(TestInfoLib::TestInfo::data_path +
"/FileIO/FEFLOW/prism.fem");
FileIO::FEFLOWMeshInterface feflowIO;
std::unique_ptr<MeshLib::Mesh const> mesh(
@@ -79,7 +79,7 @@ TEST(FileIO, TestFEFLOWReadPrismMesh)
TEST(FileIO, TestFEFLOWReadHexPrismMesh)
{
- std::string const fname(BaseLib::BuildInfo::data_path +
+ std::string const fname(TestInfoLib::TestInfo::data_path +
"/FileIO/FEFLOW/hex_prism.fem");
FileIO::FEFLOWMeshInterface feflowIO;
std::unique_ptr<MeshLib::Mesh const> mesh(
@@ -98,7 +98,7 @@ TEST(FileIO, TestFEFLOWReadHexPrismMesh)
TEST(FileIO, TestFEFLOWReadTetMesh)
{
- std::string const fname(BaseLib::BuildInfo::data_path +
+ std::string const fname(TestInfoLib::TestInfo::data_path +
"/FileIO/FEFLOW/tet.fem");
FileIO::FEFLOWMeshInterface feflowIO;
std::unique_ptr<MeshLib::Mesh const> mesh(
@@ -115,7 +115,7 @@ TEST(FileIO, TestFEFLOWReadTetMesh)
TEST(FileIO, TestFEFLOWReadPrismTetMesh)
{
- std::string const fname(BaseLib::BuildInfo::data_path +
+ std::string const fname(TestInfoLib::TestInfo::data_path +
"/FileIO/FEFLOW/prism_tet.fem");
FileIO::FEFLOWMeshInterface feflowIO;
std::unique_ptr<MeshLib::Mesh const> mesh(
diff --git a/Tests/FileIO_Qt/TestQtGmlInterface.cpp b/Tests/FileIO_Qt/TestQtGmlInterface.cpp
index 24883a8de54..29fd4484335 100644
--- a/Tests/FileIO_Qt/TestQtGmlInterface.cpp
+++ b/Tests/FileIO_Qt/TestQtGmlInterface.cpp
@@ -18,14 +18,14 @@
#include "Tests/FileIO/TestGmlInterface.h"
-#include "BaseLib/BuildInfo.h"
+#include "InfoLib/TestInfo.h"
#include "GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h"
#include "GeoLib/GEOObjects.h"
TEST_F(TestGmlInterface, QtXmlGmlWriterReaderTest)
{
// Writer test
- std::string test_data_file(BaseLib::BuildInfo::tests_tmp_path
+ std::string test_data_file(TestInfoLib::TestInfo::tests_tmp_path
+ "TestXmlGmlReader.gml");
GeoLib::IO::XmlGmlInterface xml(geo_objects);
diff --git a/Tests/FileIO_Qt/TestQtPrjInterface.cpp b/Tests/FileIO_Qt/TestQtPrjInterface.cpp
index 1ef972835c2..768538bf320 100644
--- a/Tests/FileIO_Qt/TestQtPrjInterface.cpp
+++ b/Tests/FileIO_Qt/TestQtPrjInterface.cpp
@@ -16,7 +16,7 @@
#include "Applications/DataHolderLib/Project.h"
#include "Applications/DataHolderLib/SourceTerm.h"
#include "Applications/FileIO/XmlIO/Qt/XmlPrjInterface.h"
-#include "BaseLib/BuildInfo.h"
+#include "InfoLib/TestInfo.h"
#include "GeoLib/GEOObjects.h"
TEST(TestQtPrjInterface, QtXmlPrjReader)
@@ -33,10 +33,10 @@ TEST(TestQtPrjInterface, QtXmlPrjReader)
std::vector<TestParams> test_files;
std::string name =
- BaseLib::BuildInfo::data_path +
+ TestInfoLib::TestInfo::data_path +
"/Elliptic/nonuniform_bc_Groundwaterflow/neumann_nonuniform.prj";
test_files.push_back({name, 0, 3, 2, 0});
- name = BaseLib::BuildInfo::data_path +
+ name = TestInfoLib::TestInfo::data_path +
"/Elliptic/nonuniform_bc_Groundwaterflow/neumann_nonuniform.prj";
test_files.push_back({name, 0, 3, 2, 0});
diff --git a/Tests/FileIO_Qt/TestVtkRaster.cpp b/Tests/FileIO_Qt/TestVtkRaster.cpp
index a5a8a1243b2..9dd1f6d23b7 100644
--- a/Tests/FileIO_Qt/TestVtkRaster.cpp
+++ b/Tests/FileIO_Qt/TestVtkRaster.cpp
@@ -19,12 +19,12 @@
#include "Applications/DataExplorer/VtkVis/VtkRaster.h"
#include "Applications/FileIO/AsciiRasterInterface.h"
-#include "BaseLib/BuildInfo.h"
+#include "InfoLib/TestInfo.h"
#include "GeoLib/Raster.h"
TEST(TestVtkRaster, TestPNGReader)
{
- std::string name = BaseLib::BuildInfo::data_path + "/FileIO/testraster.png";
+ std::string name = TestInfoLib::TestInfo::data_path + "/FileIO/testraster.png";
double x0;
double y0;
double delta;
@@ -53,7 +53,7 @@ TEST(TestVtkRaster, TestPNGReader)
TEST(TestVtkRaster, TestASCReader)
{
std::string name =
- BaseLib::BuildInfo::data_path + "/MeshGeoToolsLib/Hamburg/00-raster.asc";
+ TestInfoLib::TestInfo::data_path + "/MeshGeoToolsLib/Hamburg/00-raster.asc";
double x0;
double y0;
double delta;
diff --git a/Tests/FileIO_SWMM/TestSwmmInterface.cpp b/Tests/FileIO_SWMM/TestSwmmInterface.cpp
index e61bfeb35b9..c47e56f638a 100644
--- a/Tests/FileIO_SWMM/TestSwmmInterface.cpp
+++ b/Tests/FileIO_SWMM/TestSwmmInterface.cpp
@@ -12,7 +12,7 @@
#include "gtest/gtest.h"
-#include "BaseLib/BuildInfo.h"
+#include "InfoLib/TestInfo.h"
#include "Applications/FileIO/SWMM/SwmmInterface.h"
#include "GeoLib/GeoObjects.h"
#include "MeshLib/Mesh.h"
@@ -21,7 +21,7 @@
TEST(FileIO, TestSwmmInterface)
{
std::string const base_name ("swmm_input_example");
- std::string const file_name (BaseLib::BuildInfo::data_path + "/FileIO/" + base_name + ".inp");
+ std::string const file_name (TestInfoLib::TestInfo::data_path + "/FileIO/" + base_name + ".inp");
// testing geo conversion
GeoLib::GEOObjects geo_objects;
diff --git a/Tests/GeoLib/IO/TestGLIReader.cpp b/Tests/GeoLib/IO/TestGLIReader.cpp
index 1c404804e68..32b277aa184 100644
--- a/Tests/GeoLib/IO/TestGLIReader.cpp
+++ b/Tests/GeoLib/IO/TestGLIReader.cpp
@@ -15,7 +15,7 @@
#include "gtest/gtest.h"
-#include "BaseLib/BuildInfo.h"
+#include "InfoLib/TestInfo.h"
#include "Applications/FileIO/Legacy/OGSIOVer4.h"
#include "GeoLib/GEOObjects.h"
@@ -23,7 +23,7 @@ class OGSIOVer4InterfaceTest : public ::testing::Test
{
public:
OGSIOVer4InterfaceTest()
- : _gli_fname(BaseLib::BuildInfo::tests_tmp_path+"test.gli")
+ : _gli_fname(TestInfoLib::TestInfo::tests_tmp_path+"test.gli")
{
std::ofstream gli_out(_gli_fname);
gli_out << "#POINTS\n";
@@ -45,7 +45,7 @@ protected:
TEST_F(OGSIOVer4InterfaceTest, SimpleTIN)
{
- std::string tin_fname(BaseLib::BuildInfo::tests_tmp_path+"Surface.tin");
+ std::string tin_fname(TestInfoLib::TestInfo::tests_tmp_path+"Surface.tin");
std::ofstream tin_out (tin_fname);
tin_out << "0 0.0 0.0 0.0 1.0 0.0.0 0.0 0.0 1.0\n";
tin_out << "1 0.0 0.0 0.0 1.0 0.0.0 0.0 1.0 1.0\n";
@@ -69,7 +69,7 @@ TEST_F(OGSIOVer4InterfaceTest, SimpleTIN)
TEST_F(OGSIOVer4InterfaceTest, StillCorrectTINWihtAdditionalValueAtEndOfLine)
{
- std::string tin_fname(BaseLib::BuildInfo::tests_tmp_path+"Surface.tin");
+ std::string tin_fname(TestInfoLib::TestInfo::tests_tmp_path+"Surface.tin");
std::ofstream tin_out (tin_fname);
tin_out << "0 0.0 0.0 0.0 1.0 0.0.0 0.0 0.0 1.0 10\n";
tin_out << "1 0.0 0.0 0.0 1.0 0.0.0 0.0 0.0 1.0\n";
@@ -93,7 +93,7 @@ TEST_F(OGSIOVer4InterfaceTest, StillCorrectTINWihtAdditionalValueAtEndOfLine)
TEST_F(OGSIOVer4InterfaceTest, InvalidTIN_ZeroAreaTri)
{
- std::string tin_fname(BaseLib::BuildInfo::tests_tmp_path+"Surface.tin");
+ std::string tin_fname(TestInfoLib::TestInfo::tests_tmp_path+"Surface.tin");
std::ofstream tin_out (tin_fname);
tin_out << "0 0.0 0.0 0.0 1.0 0.0.0 0.0 0.0 0.0\n";
tin_out.close();
@@ -115,7 +115,7 @@ TEST_F(OGSIOVer4InterfaceTest, InvalidTIN_ZeroAreaTri)
TEST_F(OGSIOVer4InterfaceTest, InvalidTIN_LineDoesNotStartWithID)
{
- std::string tin_fname(BaseLib::BuildInfo::tests_tmp_path+"Surface.tin");
+ std::string tin_fname(TestInfoLib::TestInfo::tests_tmp_path+"Surface.tin");
std::ofstream tin_out (tin_fname);
tin_out << "0 0.0 0.0 0.0 1.0 0.0.0 0.0 0.0 1.0\n";
tin_out << "a\n";
@@ -139,7 +139,7 @@ TEST_F(OGSIOVer4InterfaceTest, InvalidTIN_LineDoesNotStartWithID)
TEST_F(OGSIOVer4InterfaceTest, InvalidTIN_PointIsMissing)
{
- std::string tin_fname(BaseLib::BuildInfo::tests_tmp_path+"Surface.tin");
+ std::string tin_fname(TestInfoLib::TestInfo::tests_tmp_path+"Surface.tin");
std::ofstream tin_out (tin_fname);
tin_out << "0 0.0 0.0 0.0 1.0 0.0.0 0.0 0.0 1.0\n";
tin_out << "1 0.0 0.0 0.0 1.0 0.0.0\n";
@@ -161,7 +161,7 @@ TEST_F(OGSIOVer4InterfaceTest, InvalidTIN_PointIsMissing)
TEST_F(OGSIOVer4InterfaceTest, InvalidTIN_CoordOfPointIsMissing)
{
- std::string tin_fname(BaseLib::BuildInfo::tests_tmp_path+"Surface.tin");
+ std::string tin_fname(TestInfoLib::TestInfo::tests_tmp_path+"Surface.tin");
std::ofstream tin_out (tin_fname);
tin_out << "0 0.0 0.0 0.0 1.0 0.0.0 0.0\n";
tin_out << "1 0.0 0.0 0.0 1.0 0.0.0\n";
@@ -183,7 +183,7 @@ TEST_F(OGSIOVer4InterfaceTest, InvalidTIN_CoordOfPointIsMissing)
TEST_F(OGSIOVer4InterfaceTest, SimpleTIN_AdditionalEmptyLinesAtEnd)
{
- std::string tin_fname(BaseLib::BuildInfo::tests_tmp_path+"Surface.tin");
+ std::string tin_fname(TestInfoLib::TestInfo::tests_tmp_path+"Surface.tin");
std::ofstream tin_out (tin_fname);
tin_out << "0 0.0 0.0 0.0 1.0 0.0.0 0.0 0.0 1.0 10\n";
tin_out << "1 0.0 0.0 0.0 1.0 0.0.0 0.0 0.0 1.0\n\n\n";
diff --git a/Tests/GeoLib/TestPointToStationConversion.cpp b/Tests/GeoLib/TestPointToStationConversion.cpp
index a258d1d5b9c..8f9dd209a67 100644
--- a/Tests/GeoLib/TestPointToStationConversion.cpp
+++ b/Tests/GeoLib/TestPointToStationConversion.cpp
@@ -10,14 +10,14 @@
#include "gtest/gtest.h"
-#include "BaseLib/BuildInfo.h"
+#include "InfoLib/TestInfo.h"
#include "GeoLib/GEOObjects.h"
#include "GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.h"
TEST(GeoLib, PointToStationConversion)
{
std::string const file_name(
- BaseLib::BuildInfo::data_path +
+ TestInfoLib::TestInfo::data_path +
"/MeshGeoToolsLib/Hamburg/BrunnenGOK_Outline_ModellHH.gml");
GeoLib::GEOObjects geo_obj;
GeoLib::IO::BoostXmlGmlInterface io(geo_obj);
diff --git a/Tests/MathLib/TestGaussLegendreIntegration.cpp b/Tests/MathLib/TestGaussLegendreIntegration.cpp
index ac061e9926a..c81a95926ee 100644
--- a/Tests/MathLib/TestGaussLegendreIntegration.cpp
+++ b/Tests/MathLib/TestGaussLegendreIntegration.cpp
@@ -11,7 +11,7 @@
#include <cmath>
#include <limits>
-#include "BaseLib/BuildInfo.h"
+#include "InfoLib/TestInfo.h"
#include "MathLib/Integration/GaussLegendreTet.h"
@@ -450,7 +450,7 @@ static double const eps = 10 * std::numeric_limits<double>::epsilon();
OGS_DONT_TEST_THIS_IF_PETSC(MathLib, IntegrationGaussLegendreTet)
{
std::unique_ptr<MeshLib::Mesh> mesh_tet(
- MeshLib::IO::VtuInterface::readVTUFile(BaseLib::BuildInfo::data_path +
+ MeshLib::IO::VtuInterface::readVTUFile(TestInfoLib::TestInfo::data_path +
"/MathLib/unit_cube_tet.vtu"));
for (unsigned integration_order : {1, 2, 3})
@@ -479,7 +479,7 @@ OGS_DONT_TEST_THIS_IF_PETSC(MathLib, IntegrationGaussLegendreTet)
OGS_DONT_TEST_THIS_IF_PETSC(MathLib, IntegrationGaussLegendreHex)
{
std::unique_ptr<MeshLib::Mesh> mesh_hex(
- MeshLib::IO::VtuInterface::readVTUFile(BaseLib::BuildInfo::data_path +
+ MeshLib::IO::VtuInterface::readVTUFile(TestInfoLib::TestInfo::data_path +
"/MathLib/unit_cube_hex.vtu"));
for (unsigned integration_order : {1, 2, 3})
@@ -511,7 +511,7 @@ OGS_DONT_TEST_THIS_IF_PETSC(
MathLib, DISABLED_IntegrationGaussLegendreTetSeparablePolynomial)
{
std::unique_ptr<MeshLib::Mesh> mesh_tet(
- MeshLib::IO::VtuInterface::readVTUFile(BaseLib::BuildInfo::data_path +
+ MeshLib::IO::VtuInterface::readVTUFile(TestInfoLib::TestInfo::data_path +
"/MathLib/unit_cube_tet.vtu"));
for (unsigned integration_order : {1, 2, 3})
@@ -539,7 +539,7 @@ OGS_DONT_TEST_THIS_IF_PETSC(MathLib,
IntegrationGaussLegendreHexSeparablePolynomial)
{
std::unique_ptr<MeshLib::Mesh> mesh_hex(
- MeshLib::IO::VtuInterface::readVTUFile(BaseLib::BuildInfo::data_path +
+ MeshLib::IO::VtuInterface::readVTUFile(TestInfoLib::TestInfo::data_path +
"/MathLib/unit_cube_hex.vtu"));
for (unsigned integration_order : {1, 2, 3, 4})
@@ -567,7 +567,7 @@ OGS_DONT_TEST_THIS_IF_PETSC(MathLib,
IntegrationGaussLegendreTetNonSeparablePolynomial)
{
std::unique_ptr<MeshLib::Mesh> mesh_tet(
- MeshLib::IO::VtuInterface::readVTUFile(BaseLib::BuildInfo::data_path +
+ MeshLib::IO::VtuInterface::readVTUFile(TestInfoLib::TestInfo::data_path +
"/MathLib/unit_cube_tet.vtu"));
for (unsigned integration_order : {1, 2, 3})
@@ -595,7 +595,7 @@ OGS_DONT_TEST_THIS_IF_PETSC(MathLib,
IntegrationGaussLegendreHexNonSeparablePolynomial)
{
std::unique_ptr<MeshLib::Mesh> mesh_hex(
- MeshLib::IO::VtuInterface::readVTUFile(BaseLib::BuildInfo::data_path +
+ MeshLib::IO::VtuInterface::readVTUFile(TestInfoLib::TestInfo::data_path +
"/MathLib/unit_cube_hex.vtu"));
for (unsigned integration_order : {1, 2, 3, 4})
diff --git a/Tests/MeshLib/TestRasterToMesh.cpp b/Tests/MeshLib/TestRasterToMesh.cpp
index fc633bfb59f..42424f97e25 100644
--- a/Tests/MeshLib/TestRasterToMesh.cpp
+++ b/Tests/MeshLib/TestRasterToMesh.cpp
@@ -13,7 +13,7 @@
#include "gtest/gtest.h"
-#include "BaseLib/BuildInfo.h"
+#include "InfoLib/TestInfo.h"
#include "Applications/FileIO/AsciiRasterInterface.h"
#include "GeoLib/Raster.h"
@@ -34,7 +34,7 @@ class RasterToMeshTest : public ::testing::Test
{
public:
RasterToMeshTest()
- : _file_name(BaseLib::BuildInfo::data_path + "/MeshLib/testraster_selke.asc")
+ : _file_name(TestInfoLib::TestInfo::data_path + "/MeshLib/testraster_selke.asc")
{
_raster.reset(FileIO::AsciiRasterInterface::readRaster(_file_name));
}
diff --git a/Tests/MeshLib/TestVtkMappedMeshSource.cpp b/Tests/MeshLib/TestVtkMappedMeshSource.cpp
index 8974fb035a9..888330dd28e 100644
--- a/Tests/MeshLib/TestVtkMappedMeshSource.cpp
+++ b/Tests/MeshLib/TestVtkMappedMeshSource.cpp
@@ -12,7 +12,7 @@
*
*/
-#include "BaseLib/BuildInfo.h"
+#include "InfoLib/TestInfo.h"
#include <memory>
#include <numeric>
@@ -151,7 +151,7 @@ TEST_F(InSituMesh, DISABLED_MappedMeshSourceRoundtrip)
// TODO Add more comparison criteria
ASSERT_TRUE(mesh != nullptr);
- std::string test_data_file(BaseLib::BuildInfo::tests_tmp_path + "/MappedMeshSourceRoundtrip.vtu");
+ std::string test_data_file(TestInfoLib::TestInfo::tests_tmp_path + "/MappedMeshSourceRoundtrip.vtu");
// -- Test VtkMappedMeshSource, i.e. OGS mesh to VTK mesh
vtkNew<MeshLib::VtkMappedMeshSource> vtkSource;
diff --git a/Tests/NumLib/TestComponentNorms.cpp b/Tests/NumLib/TestComponentNorms.cpp
index d6d1c30223a..b09ef5f0361 100644
--- a/Tests/NumLib/TestComponentNorms.cpp
+++ b/Tests/NumLib/TestComponentNorms.cpp
@@ -12,7 +12,7 @@
#include <logog/include/logog.hpp>
#ifdef USE_PETSC
-#include "BaseLib/BuildInfo.h"
+#include "InfoLib/TestInfo.h"
#endif
#include "MathLib/LinAlg/LinAlg.h"
#include "MathLib/LinAlg/MatrixSpecifications.h"
@@ -45,7 +45,7 @@ struct DOFTableData
NumLib::ComponentOrder const order)
#ifdef USE_PETSC
: mesh(MeshLib::IO::readMeshFromFile(
- BaseLib::BuildInfo::data_path +
+ TestInfoLib::TestInfo::data_path +
"/EllipticPETSc/quad_20x10_GroundWaterFlow.")),
#else
: mesh(MeshLib::MeshGenerator::generateRegularHexMesh(
diff --git a/Tests/NumLib/TestODEInt.cpp b/Tests/NumLib/TestODEInt.cpp
index 335b5faca35..75efc7d5b3d 100644
--- a/Tests/NumLib/TestODEInt.cpp
+++ b/Tests/NumLib/TestODEInt.cpp
@@ -16,7 +16,7 @@
#include <logog/include/logog.hpp>
#include <boost/property_tree/xml_parser.hpp>
-#include "BaseLib/BuildInfo.h"
+#include "InfoLib/TestInfo.h"
#include "NumLib/NumericsConfig.h"
#include "NumLib/ODESolver/ConvergenceCriterionDeltaX.h"
#include "MathLib/LinAlg/LinAlg.h"
diff --git a/Tests/testrunner.cpp b/Tests/testrunner.cpp
index 8ea08406c87..92ce6de48af 100644
--- a/Tests/testrunner.cpp
+++ b/Tests/testrunner.cpp
@@ -20,7 +20,6 @@
#include "Applications/ApplicationsLib/LogogSetup.h"
#include "Applications/ApplicationsLib/LinearSolverLibrarySetup.h"
#include "NumLib/DOF/GlobalMatrixProviders.h"
-#include "BaseLib/BuildInfo.h"
#include "BaseLib/TemplateLogogFormatterSuppressedGCC.h"
#ifdef OGS_BUILD_GUI
--
GitLab