diff --git a/Tests/Unit/Resample/MultilayerAveragingTest.cpp b/Tests/Unit/Resample/MultilayerAveragingTest.cpp index a0ece232fa2f4b8902c913559bad12c7f4771b5a..864754370b8ef687c612ff9e13a06cbaf0f77add 100644 --- a/Tests/Unit/Resample/MultilayerAveragingTest.cpp +++ b/Tests/Unit/Resample/MultilayerAveragingTest.cpp @@ -1,4 +1,3 @@ -#include "Resample/Options/SimulationOptions.h" #include "Resample/Processed/ReSample.h" #include "Sample/Aggregate/Interference2DLattice.h" #include "Sample/Aggregate/ParticleLayout.h" @@ -9,22 +8,15 @@ #include "Sample/Particle/Particle.h" #include "Tests/GTestWrapper/google_test.h" -class MultilayerAveragingTest : public ::testing::Test { -protected: - MultilayerAveragingTest() - : vacuum(RefractiveMaterial("vac", 0.0, 0.0)) - , stone(RefractiveMaterial("stone", 4e-4, 8e-7)) - { - } - - const Material vacuum, stone; -}; -TEST_F(MultilayerAveragingTest, AverageMultilayer) +TEST(MultilayerAveragingTest, AverageMultilayer) { + const auto mat0 = RefractiveMaterial("vac", 0.0, 0.0); + const auto mat1 = RefractiveMaterial("stone", 4e-4, 8e-7); + // particles Cylinder cylinder_ff(1.0, 3.0); - Particle particle(stone, cylinder_ff); + Particle particle(mat1, cylinder_ff); // interferences Interference2DLattice interf_1(BasicLattice2D(10.0, 10.0, 120.0, 0.0)); @@ -39,8 +31,8 @@ TEST_F(MultilayerAveragingTest, AverageMultilayer) layout_2.addParticle(particle); layout_2.setInterference(interf_2); - Layer layer_1(vacuum); - Layer layer_2(stone); + Layer layer_1(mat0); + Layer layer_2(mat1); layer_1.addLayout(layout_1); @@ -50,8 +42,8 @@ TEST_F(MultilayerAveragingTest, AverageMultilayer) const auto sample_1 = ReSample::make(m_layer); - Layer layer_21(vacuum); - Layer layer_22(stone); + Layer layer_21(mat0); + Layer layer_22(mat1); layer_21.addLayout(layout_1); layer_21.addLayout(layout_2);