From eca2f5dca246115ca3ad287747a7140132c528fc Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 26 May 2022 13:40:59 +0200
Subject: [PATCH] rm triv test, and move fct to anon namespace
---
GUI/Model/ToDomain/ToDomain.cpp | 7 ++---
GUI/Model/ToDomain/ToDomain.h | 2 --
Tests/Unit/GUI/TestLayerRoughnessItems.cpp | 35 ----------------------
3 files changed, 3 insertions(+), 41 deletions(-)
delete mode 100644 Tests/Unit/GUI/TestLayerRoughnessItems.cpp
diff --git a/GUI/Model/ToDomain/ToDomain.cpp b/GUI/Model/ToDomain/ToDomain.cpp
index b25214d71bb..43a50f5524e 100644
--- a/GUI/Model/ToDomain/ToDomain.cpp
+++ b/GUI/Model/ToDomain/ToDomain.cpp
@@ -119,10 +119,7 @@ std::unique_ptr<Layer> buildLayer(const LayerItem& item)
return P_layer;
}
-} // namespace
-
-std::unique_ptr<LayerRoughness>
-GUI::Transform::ToDomain::itemToLayerRoughness(LayerBasicRoughnessItem* roughness)
+std::unique_ptr<LayerRoughness> itemToLayerRoughness(LayerBasicRoughnessItem* roughness)
{
if (!roughness)
return nullptr;
@@ -130,6 +127,8 @@ GUI::Transform::ToDomain::itemToLayerRoughness(LayerBasicRoughnessItem* roughnes
roughness->lateralCorrelationLength());
}
+} // namespace
+
std::unique_ptr<MultiLayer> GUI::Transform::ToDomain::itemToSample(const MultiLayerItem& sampleItem)
{
auto P_sample = createMultiLayer(sampleItem);
diff --git a/GUI/Model/ToDomain/ToDomain.h b/GUI/Model/ToDomain/ToDomain.h
index a8e252b1412..a05c23a306d 100644
--- a/GUI/Model/ToDomain/ToDomain.h
+++ b/GUI/Model/ToDomain/ToDomain.h
@@ -26,8 +26,6 @@ class LayerRoughness;
namespace GUI::Transform::ToDomain {
-std::unique_ptr<LayerRoughness> itemToLayerRoughness(LayerBasicRoughnessItem* roughness);
-
std::unique_ptr<MultiLayer> itemToSample(const MultiLayerItem& item);
} // namespace GUI::Transform::ToDomain
diff --git a/Tests/Unit/GUI/TestLayerRoughnessItems.cpp b/Tests/Unit/GUI/TestLayerRoughnessItems.cpp
deleted file mode 100644
index 1f26b5e3e79..00000000000
--- a/Tests/Unit/GUI/TestLayerRoughnessItems.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#include "GUI/Model/Descriptor/DoubleDescriptor.h"
-#include "GUI/Model/FromDomain/FromDomain.h"
-#include "GUI/Model/Sample/LayerRoughnessItems.h"
-#include "GUI/Model/ToDomain/ToDomain.h"
-#include "Sample/Interface/LayerRoughness.h"
-#include "Tests/GTestWrapper/google_test.h"
-
-class TestLayerRoughnessItems : public ::testing::Test {
-};
-
-TEST_F(TestLayerRoughnessItems, LayerRoughnessToDomain)
-{
- LayerBasicRoughnessItem roughnessItem;
- roughnessItem.sigma().set(10.0);
- roughnessItem.hurst().set(20.0);
- roughnessItem.lateralCorrelationLength().set(30.0);
-
- auto P_roughness = GUI::Transform::ToDomain::itemToLayerRoughness(&roughnessItem);
- EXPECT_EQ(P_roughness->sigma(), roughnessItem.sigma());
- EXPECT_EQ(P_roughness->hurst(), roughnessItem.hurst());
- EXPECT_EQ(P_roughness->lateralCorrLength(), roughnessItem.lateralCorrelationLength());
-
- // No roughness
- EXPECT_TRUE(GUI::Transform::ToDomain::itemToLayerRoughness(nullptr) == nullptr);
-}
-
-TEST_F(TestLayerRoughnessItems, LayerRoughnessFromDomain)
-{
- LayerRoughness roughness(10.0, 20.0, 30.0);
- LayerBasicRoughnessItem roughnessItem;
- GUI::Transform::FromDomain::setRoughnessItem(&roughnessItem, roughness);
- EXPECT_EQ(roughness.sigma(), roughnessItem.sigma());
- EXPECT_EQ(roughness.hurst(), roughnessItem.hurst());
- EXPECT_EQ(roughness.lateralCorrLength(), roughnessItem.lateralCorrelationLength());
-}
--
GitLab