diff --git a/Tests/Unit/Resample/MaterialTest.cpp b/Tests/Unit/Resample/MaterialTest.cpp
index c559096d9c1ae94a81da853066a33c283950dfed..2f0625c896964739a87ef0ade80666df73c99b41 100644
--- a/Tests/Unit/Resample/MaterialTest.cpp
+++ b/Tests/Unit/Resample/MaterialTest.cpp
@@ -7,9 +7,7 @@
#include "Tests/GTestWrapper/google_test.h"
#include <iostream>
-class MaterialTest : public ::testing::Test {};
-
-TEST_F(MaterialTest, MaterialConstruction)
+TEST(MaterialTest, MaterialConstruction)
{
complex_t material_data = complex_t(0.0, 2.0);
complex_t refIndex = complex_t(1.0 - material_data.real(), material_data.imag());
@@ -43,7 +41,7 @@ TEST_F(MaterialTest, MaterialConstruction)
EXPECT_EQ(default_magnetism, material6.magnetization());
}
-TEST_F(MaterialTest, MaterialTransform)
+TEST(MaterialTest, MaterialTransform)
{
complex_t material_data = complex_t(1.0, 0.0);
complex_t refIndex = complex_t(1.0 - material_data.real(), material_data.imag());
@@ -63,7 +61,7 @@ TEST_F(MaterialTest, MaterialTransform)
EXPECT_EQ(transformed_mag, material4.magnetization());
}
-TEST_F(MaterialTest, DefaultMaterials)
+TEST(MaterialTest, DefaultMaterials)
{
Material material = Vacuum();
const double dummy_wavelength = 1.0;
@@ -82,7 +80,7 @@ TEST_F(MaterialTest, DefaultMaterials)
EXPECT_FALSE(material.typeID() == MaterialBySLD().typeID());
}
-TEST_F(MaterialTest, ComputationTest)
+TEST(MaterialTest, ComputationTest)
{
// Reference data for Fe taken from
// https://sld-calculator.appspot.com
@@ -135,7 +133,7 @@ TEST_F(MaterialTest, ComputationTest)
EXPECT_NEAR(subtrSLD.imag(), subtrSLDWlIndep.imag(), 1e-10);
}
-TEST_F(MaterialTest, AverageRefractiveMaterialsTest)
+TEST(MaterialTest, AverageRefractiveMaterialsTest)
{
R3 magnetization = R3{1.0, 0.0, 0.0};
const Material material = RefractiveMaterial("Material", 0.5, 0.5, magnetization);
@@ -151,7 +149,7 @@ TEST_F(MaterialTest, AverageRefractiveMaterialsTest)
EXPECT_THROW(MaterialUtils::averagedMaterial(material3, regions), std::runtime_error);
}
-TEST_F(MaterialTest, AverageSLDMaterialsTest)
+TEST(MaterialTest, AverageSLDMaterialsTest)
{
R3 magnetization = R3{1.0, 0.0, 0.0};
const Material material = MaterialBySLD("Material", 0.5, 0.5, magnetization);
@@ -164,7 +162,7 @@ TEST_F(MaterialTest, AverageSLDMaterialsTest)
EXPECT_TRUE(material_avr.typeID() == MATERIAL_TYPES::MaterialBySLD);
}
-TEST_F(MaterialTest, AverageMixedMaterialsTest)
+TEST(MaterialTest, AverageMixedMaterialsTest)
{
R3 magnetization = R3{1.0, 0.0, 0.0};
const Material material = RefractiveMaterial("Material", 0.5, 0.5, magnetization);
@@ -174,7 +172,7 @@ TEST_F(MaterialTest, AverageMixedMaterialsTest)
EXPECT_THROW(MaterialUtils::averagedMaterial(material3, regions), std::runtime_error);
}
-TEST_F(MaterialTest, TypeIdsTest)
+TEST(MaterialTest, TypeIdsTest)
{
Material material = MaterialBySLD("Material", 1.0, 1.0);
Material material2 = RefractiveMaterial("Material", 1.0, 1.0);
@@ -185,7 +183,7 @@ TEST_F(MaterialTest, TypeIdsTest)
EXPECT_TRUE(material.typeID() == material3.typeID());
}
-TEST_F(MaterialTest, MaterialComparison)
+TEST(MaterialTest, MaterialComparison)
{
Material material = MaterialBySLD("Material", 1.0, 1.0);
Material material2 = RefractiveMaterial("Material", 1.0, 1.0);
@@ -205,7 +203,7 @@ TEST_F(MaterialTest, MaterialComparison)
EXPECT_TRUE(Vacuum() != MaterialBySLD());
}
-TEST_F(MaterialTest, MaterialCopy)
+TEST(MaterialTest, MaterialCopy)
{
complex_t material_data = complex_t(0.0, 2.0);
complex_t refIndex = complex_t(1.0 - material_data.real(), material_data.imag());
@@ -218,7 +216,7 @@ TEST_F(MaterialTest, MaterialCopy)
EXPECT_TRUE(material == copy);
}
-TEST_F(MaterialTest, MaterialMove)
+TEST(MaterialTest, MaterialMove)
{
complex_t material_data = complex_t(0.0, 2.0);
complex_t refIndex = complex_t(1.0 - material_data.real(), material_data.imag());
diff --git a/Tests/Unit/Resample/MatrixFluxTest.cpp b/Tests/Unit/Resample/MatrixFluxTest.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..171503f359c0a7501f8e66b429afd2aa9746287d
--- /dev/null
+++ b/Tests/Unit/Resample/MatrixFluxTest.cpp
@@ -0,0 +1,46 @@
+#include "Resample/Flux/MatrixFlux.h"
+#include "Tests/GTestWrapper/google_test.h"
+
+static const MatrixFlux defaultFlux{-1., {0., 0.}, R3{0.0, 0.0, 0.0}, 0.};
+
+TEST(MatrixFluxTest, Components)
+{
+ Spinor s1 = defaultFlux.T1plus();
+ EXPECT_EQ(s1.u, 0.);
+ EXPECT_EQ(s1.v, 0.);
+
+ Spinor s2 = defaultFlux.T1min();
+ EXPECT_EQ(s2.u, 0.);
+ EXPECT_EQ(s2.v, complex_t(1., 0.));
+
+ Spinor s3 = defaultFlux.T2plus();
+ EXPECT_EQ(s3.u, complex_t(1.0, 0.0));
+ EXPECT_EQ(s3.v, 0.);
+
+ Spinor s4 = defaultFlux.T2min();
+ EXPECT_EQ(s4.u, 0.);
+ EXPECT_EQ(s4.v, 0.);
+
+ Spinor s5 = defaultFlux.R1plus();
+ EXPECT_EQ(s5.u, 0.);
+ EXPECT_EQ(s5.v, 0.);
+
+ Spinor s6 = defaultFlux.R1min();
+ EXPECT_EQ(s6.u, 0.);
+ EXPECT_EQ(s6.v, complex_t(-1., 0.));
+
+ Spinor s7 = defaultFlux.R2plus();
+ EXPECT_EQ(s7.u, complex_t(-1.0, 0.0));
+ EXPECT_EQ(s7.v, 0.);
+
+ Spinor s8 = defaultFlux.R2min();
+ EXPECT_EQ(s8.u, 0.);
+ EXPECT_EQ(s8.v, 0.);
+}
+
+TEST(MatrixFluxTest, getKz)
+{
+ Spinor s = defaultFlux.getKz();
+ EXPECT_EQ(complex_t(0.0, 0.0), s.u);
+ EXPECT_EQ(complex_t(0.0, 0.0), s.v);
+}
diff --git a/Tests/Unit/Resample/MatrixRTCoefficientsTest.cpp b/Tests/Unit/Resample/MatrixRTCoefficientsTest.cpp
deleted file mode 100644
index 3dad9e3c275008602dc61ea552a457f4c3ad493f..0000000000000000000000000000000000000000
--- a/Tests/Unit/Resample/MatrixRTCoefficientsTest.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-#include "Resample/Flux/MatrixFlux.h"
-#include "Tests/GTestWrapper/google_test.h"
-
-class MatrixFluxTest : public ::testing::Test {
-protected:
- MatrixFlux mrtcDefault{-1., {0., 0.}, R3{0.0, 0.0, 0.0}, 0.};
-};
-
-TEST_F(MatrixFluxTest, T1plus)
-{
- Spinor s = mrtcDefault.T1plus();
- EXPECT_EQ(0.0, s.u);
- EXPECT_EQ(0.0, s.v);
-}
-
-TEST_F(MatrixFluxTest, T1min)
-{
- Spinor s = mrtcDefault.T1min();
- EXPECT_EQ(0.0, s.u);
- EXPECT_EQ(complex_t(1.0, 0.0), s.v);
-}
-
-TEST_F(MatrixFluxTest, T2plus)
-{
- Spinor s = mrtcDefault.T2plus();
- EXPECT_EQ(complex_t(1.0, 0.0), s.u);
- EXPECT_EQ(0.0, s.v);
-}
-
-TEST_F(MatrixFluxTest, T2min)
-{
- Spinor s = mrtcDefault.T2min();
- EXPECT_EQ(0.0, s.u);
- EXPECT_EQ(0.0, s.v);
-}
-
-TEST_F(MatrixFluxTest, R1plus)
-{
- Spinor s = mrtcDefault.R1plus();
- EXPECT_EQ(0.0, s.u);
- EXPECT_EQ(0.0, s.v);
-}
-
-TEST_F(MatrixFluxTest, R1min)
-{
- Spinor s = mrtcDefault.R1min();
- EXPECT_EQ(0.0, s.u);
- EXPECT_EQ(complex_t(-1.0, 0.0), s.v);
-}
-
-TEST_F(MatrixFluxTest, R2plus)
-{
- Spinor s = mrtcDefault.R2plus();
- EXPECT_EQ(complex_t(-1.0, 0.0), s.u);
- EXPECT_EQ(0.0, s.v);
-}
-
-TEST_F(MatrixFluxTest, R2min)
-{
- Spinor s = mrtcDefault.R2min();
- EXPECT_EQ(0.0, s.u);
- EXPECT_EQ(0.0, s.v);
-}
-
-TEST_F(MatrixFluxTest, getKz)
-{
- Spinor s = mrtcDefault.getKz();
- EXPECT_EQ(complex_t(0.0, 0.0), s.u);
- EXPECT_EQ(complex_t(0.0, 0.0), s.v);
-}