From dc92da025d555486083c6fd8538d9cdc4d9e336a Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Mon, 3 Aug 2020 21:55:37 +0200
Subject: [PATCH] mv NewStd -> Std
---
Tests/Functional/Core/Std/CMakeLists.txt | 2 +-
Tests/Functional/Core/Std/macros.cpp | 4 ++--
Tests/Functional/GUI/Std/CMakeLists.txt | 2 +-
Tests/Functional/GUI/Std/macros.cpp | 4 ++--
Tests/Functional/Python/Std/CMakeLists.txt | 2 +-
Tests/Functional/Python/Std/macros.cpp | 4 ++--
Tests/Functional/{NewStd => Std}/Run.cpp | 2 +-
Tests/Functional/{NewStd => Std}/Run.h | 2 +-
Tests/Functional/{NewStd => Std}/StandardTests.h | 2 +-
9 files changed, 12 insertions(+), 12 deletions(-)
rename Tests/Functional/{NewStd => Std}/Run.cpp (98%)
rename Tests/Functional/{NewStd => Std}/Run.h (93%)
rename Tests/Functional/{NewStd => Std}/StandardTests.h (99%)
diff --git a/Tests/Functional/Core/Std/CMakeLists.txt b/Tests/Functional/Core/Std/CMakeLists.txt
index 28503d31b96..4946afcc715 100644
--- a/Tests/Functional/Core/Std/CMakeLists.txt
+++ b/Tests/Functional/Core/Std/CMakeLists.txt
@@ -2,7 +2,7 @@ include(GoogleTest) # provides gtest_discover_tests
set(test TestCoreStd)
-file(GLOB source_files "*.cpp" "../../NewStd/Run.cpp")
+file(GLOB source_files "*.cpp" "../../Std/Run.cpp")
add_executable(${test} ${source_files} ${CMAKE_SOURCE_DIR}/Tests/GTestWrapper/TestAll.cpp)
target_include_directories(${test} PUBLIC
diff --git a/Tests/Functional/Core/Std/macros.cpp b/Tests/Functional/Core/Std/macros.cpp
index 165b8a89bcf..4b5eead7809 100644
--- a/Tests/Functional/Core/Std/macros.cpp
+++ b/Tests/Functional/Core/Std/macros.cpp
@@ -12,5 +12,5 @@
//
// ************************************************************************** //
-#include "Tests/Functional/NewStd/Run.h"
-#include "Tests/Functional/NewStd/StandardTests.h" // contains macros that are executed by gtest
+#include "Tests/Functional/Std/Run.h"
+#include "Tests/Functional/Std/StandardTests.h" // contains macros that are executed by gtest
diff --git a/Tests/Functional/GUI/Std/CMakeLists.txt b/Tests/Functional/GUI/Std/CMakeLists.txt
index f3c9b2b0189..bc9bd07e762 100644
--- a/Tests/Functional/GUI/Std/CMakeLists.txt
+++ b/Tests/Functional/GUI/Std/CMakeLists.txt
@@ -2,7 +2,7 @@ include(GoogleTest) # provides gtest_discover_tests
set(test TestGuiStd)
-file(GLOB source_files "*.cpp" "../../NewStd/Run.cpp")
+file(GLOB source_files "*.cpp" "../../Std/Run.cpp")
add_executable(${test} ${source_files} ${CMAKE_SOURCE_DIR}/Tests/GTestWrapper/TestAll.cpp)
target_include_directories(${test} PUBLIC
diff --git a/Tests/Functional/GUI/Std/macros.cpp b/Tests/Functional/GUI/Std/macros.cpp
index 1b91fe78245..43e3e119d34 100644
--- a/Tests/Functional/GUI/Std/macros.cpp
+++ b/Tests/Functional/GUI/Std/macros.cpp
@@ -12,7 +12,7 @@
//
// ************************************************************************** //
-#include "Tests/Functional/NewStd/Run.h"
+#include "Tests/Functional/Std/Run.h"
#define GUI_STD_TEST
-#include "Tests/Functional/NewStd/StandardTests.h" // contains macros that are executed by gtest
+#include "Tests/Functional/Std/StandardTests.h" // contains macros that are executed by gtest
diff --git a/Tests/Functional/Python/Std/CMakeLists.txt b/Tests/Functional/Python/Std/CMakeLists.txt
index 8a02ac3ca18..31493895bb7 100644
--- a/Tests/Functional/Python/Std/CMakeLists.txt
+++ b/Tests/Functional/Python/Std/CMakeLists.txt
@@ -2,7 +2,7 @@ include(GoogleTest) # provides gtest_discover_tests
set(test TestPyStd)
-file(GLOB source_files "*.cpp" "../../NewStd/Run.cpp")
+file(GLOB source_files "*.cpp" "../../Std/Run.cpp")
add_executable(${test} ${source_files} ${CMAKE_SOURCE_DIR}/Tests/GTestWrapper/TestAll.cpp)
target_include_directories(${test} PUBLIC
diff --git a/Tests/Functional/Python/Std/macros.cpp b/Tests/Functional/Python/Std/macros.cpp
index af16aa0960c..2612de48a60 100644
--- a/Tests/Functional/Python/Std/macros.cpp
+++ b/Tests/Functional/Python/Std/macros.cpp
@@ -12,7 +12,7 @@
//
// ************************************************************************** //
-#include "Tests/Functional/NewStd/Run.h"
+#include "Tests/Functional/Std/Run.h"
#define PYTHON_STD_TEST
-#include "Tests/Functional/NewStd/StandardTests.h" // contains macros that are executed by gtest
+#include "Tests/Functional/Std/StandardTests.h" // contains macros that are executed by gtest
diff --git a/Tests/Functional/NewStd/Run.cpp b/Tests/Functional/Std/Run.cpp
similarity index 98%
rename from Tests/Functional/NewStd/Run.cpp
rename to Tests/Functional/Std/Run.cpp
index cf299959b86..aae837f12f1 100644
--- a/Tests/Functional/NewStd/Run.cpp
+++ b/Tests/Functional/Std/Run.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Tests/Functional/NewStd/Run.cpp
+//! @file Tests/Functional/Std/Run.cpp
//! @brief Implements function run for use in standard tests.
//!
//! @homepage http://www.bornagainproject.org
diff --git a/Tests/Functional/NewStd/Run.h b/Tests/Functional/Std/Run.h
similarity index 93%
rename from Tests/Functional/NewStd/Run.h
rename to Tests/Functional/Std/Run.h
index 64ecef012c7..6da551c5006 100644
--- a/Tests/Functional/NewStd/Run.h
+++ b/Tests/Functional/Std/Run.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Tests/Functional/NewStd/Run.h
+//! @file Tests/Functional/Std/Run.h
//! @brief Declares function run for use in standard tests.
//!
//! @homepage http://www.bornagainproject.org
diff --git a/Tests/Functional/NewStd/StandardTests.h b/Tests/Functional/Std/StandardTests.h
similarity index 99%
rename from Tests/Functional/NewStd/StandardTests.h
rename to Tests/Functional/Std/StandardTests.h
index a50f2b34f88..03ab19b8731 100644
--- a/Tests/Functional/NewStd/StandardTests.h
+++ b/Tests/Functional/Std/StandardTests.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file Tests/Functional/NewStd/StandardTests.h
+//! @file Tests/Functional/Std/StandardTests.h
//! @brief Implements class StandardTestCatalog.
//!
//! @homepage http://www.bornagainproject.org
--
GitLab