From 1cf64773d7194da593f9e3c52c85668bb9938cbd Mon Sep 17 00:00:00 2001 From: Gennady Pospelov <g.pospelov@fz-juelich.de> Date: Thu, 15 Nov 2018 11:29:44 +0100 Subject: [PATCH] Move Core unit tests in C++ files --- .../Axes/{CVectorTest.h => CVectorTest.cpp} | 0 ...stKBinAxisTest.h => ConstKBinAxisTest.cpp} | 0 ...tomBinAxisTest.h => CustomBinAxisTest.cpp} | 0 ...rterTest.h => DepthProbeConverterTest.cpp} | 0 ...ixedBinAxisTest.h => FixedBinAxisTest.cpp} | 0 ...{Histogram1DTest.h => Histogram1DTest.cpp} | 0 ...{Histogram2DTest.h => Histogram2DTest.cpp} | 0 .../Axes/{KVectorTest.h => KVectorTest.cpp} | 0 ...ntwiseAxisTest.h => PointwiseAxisTest.cpp} | 0 ...verter1DTest.h => UnitConverter1DTest.cpp} | 0 ...eBinAxisTest.h => VariableBinAxisTest.cpp} | 0 Tests/UnitTests/Core/Axes/testlist.h | 13 ------ Tests/UnitTests/Core/CMakeLists.txt | 42 +++++++++++++------ .../{ArrayUtilsTest.h => ArrayUtilsTest.cpp} | 0 .../{IOStrategyTest.h => IOStrategyTest.cpp} | 0 ...sTest.h => IntensityDataFunctionsTest.cpp} | 0 .../{LLDataTest.h => LLDataTest.cpp} | 0 ...ratorTest.h => OutputDataIteratorTest.cpp} | 0 .../{OutputDataTest.h => OutputDataTest.cpp} | 0 Tests/UnitTests/Core/DataStructure/testlist.h | 8 ---- ...etectorMaskTest.h => DetectorMaskTest.cpp} | 0 ...terTest.h => OffSpecularConverterTest.cpp} | 0 .../{PolygonTest.h => PolygonTest.cpp} | 0 ...{PrecomputedTest.h => PrecomputedTest.cpp} | 0 ...terTest.h => RectangularConverterTest.cpp} | 0 ...ctorTest.h => RectangularDetectorTest.cpp} | 0 ...nterestTest.h => RegionOfInterestTest.cpp} | 0 ...ationAreaTest.h => SimulationAreaTest.cpp} | 0 ...nctionsTest.h => SpecialFunctionsTest.cpp} | 0 ...tor1DTest.h => SpecularDetector1DTest.cpp} | 0 ...erterTest.h => SphericalConverterTest.cpp} | 0 ...tectorTest.h => SphericalDetectorTest.cpp} | 0 Tests/UnitTests/Core/Detector/testlist.h | 14 ------- ...mattingTest.h => PythonFormattingTest.cpp} | 0 .../UnitTests/Core/ExportToPython/testlist.h | 3 -- ...itObjectiveTest.h => FitObjectiveTest.cpp} | 0 ...{FitObserverTest.h => FitObserverTest.cpp} | 0 ...{SimDataPairTest.h => SimDataPairTest.cpp} | 0 Tests/UnitTests/Core/Fitting/testlist.h | 4 -- ...ionTest.h => DepthProbeSimulationTest.cpp} | 0 ...ntsTest.h => MatrixRTCoefficientsTest.cpp} | 0 ...ntsTest.h => ScalarRTCoefficientsTest.cpp} | 0 ...agneticTest.h => SpecularMagneticTest.cpp} | 0 ...larMatrixTest.h => SpecularMatrixTest.cpp} | 0 ...ationTest.h => SpecularSimulationTest.cpp} | 0 Tests/UnitTests/Core/Fresnel/testlist.h | 10 ----- ...est.h => FormFactorSpecializationTest.cpp} | 0 Tests/UnitTests/Core/Numeric0/testlist.h | 3 -- ...metryTest.h => FormFactorSymmetryTest.cpp} | 0 Tests/UnitTests/Core/Numeric1/testlist.h | 4 -- ...mFootprintTest.h => BeamFootprintTest.cpp} | 0 .../Core/Other/{BeamTest.h => BeamTest.cpp} | 0 ...dModuleTest.h => ChiSquaredModuleTest.cpp} | 0 ...iveValueTest.h => CumulativeValueTest.cpp} | 0 ...temUtilsTest.h => FileSystemUtilsTest.cpp} | 0 ...ansformTest.h => FourierTransformTest.cpp} | 0 ...mulationTest.h => GISASSimulationTest.cpp} | 0 .../{InstrumentTest.h => InstrumentTest.cpp} | 0 ...llLimitsTest.h => LayerFillLimitsTest.cpp} | 0 .../{MaterialTest.h => MaterialTest.cpp} | 0 .../{OrderedMapTest.h => OrderedMapTest.cpp} | 0 .../Other/{RelDiffTest.h => RelDiffTest.cpp} | 0 .../{RotationTest.h => RotationTest.cpp} | 0 ...erNoteTest.h => SampleBuilderNoteTest.cpp} | 0 ...eProviderTest.h => SampleProviderTest.cpp} | 0 .../Other/{Shape2DTest.h => Shape2DTest.cpp} | 0 ...nResultTest.h => SimulationResultTest.cpp} | 0 .../Other/{TRangeTest.h => TRangeTest.cpp} | 0 .../{ThreadInfoTest.h => ThreadInfoTest.cpp} | 0 .../Other/{ZLimitsTest.h => ZLimitsTest.cpp} | 0 Tests/UnitTests/Core/Other/testlist.h | 23 ---------- ...dlerTest.h => DistributionHandlerTest.cpp} | 0 ...tributionsTest.h => DistributionsTest.cpp} | 0 ...ibutionsTest.h => FTDistributionsTest.cpp} | 1 + ...meterizedTest.h => IParameterizedTest.cpp} | 0 ...onTest.h => ParameterDistributionTest.cpp} | 0 ...PatternTest.h => ParameterPatternTest.cpp} | 0 ...ameterPoolTest.h => ParameterPoolTest.cpp} | 0 ...lParameterTest.h => RealParameterTest.cpp} | 0 Tests/UnitTests/Core/Parameters/testlist.h | 10 ----- .../Sample/{CrystalTest.h => CrystalTest.cpp} | 0 ...torBasicTest.h => FormFactorBasicTest.cpp} | 0 ...umTest.h => FormFactorCoherentSumTest.cpp} | 0 ...eTest.h => FormFactorSoftParticleTest.cpp} | 0 .../Sample/{INodeTest.h => INodeTest.cpp} | 0 .../{Lattice2DTest.h => Lattice2DTest.cpp} | 0 .../Sample/{LatticeTest.h => LatticeTest.cpp} | 0 ...atticeUtilsTest.h => LatticeUtilsTest.cpp} | 0 ...InterfaceTest.h => LayerInterfaceTest.cpp} | 0 ...RoughnessTest.h => LayerRoughnessTest.cpp} | 0 .../Sample/{LayerTest.h => LayerTest.cpp} | 0 ...{MesoCrystalTest.h => MesoCrystalTest.cpp} | 0 .../{MultiLayerTest.h => MultiLayerTest.cpp} | 0 ...tionTest.h => ParticleCompositionTest.cpp} | 0 ...eShellTest.h => ParticleCoreShellTest.cpp} | 1 + ...ionTest.h => ParticleDistributionTest.cpp} | 0 ...cleLayoutTest.h => ParticleLayoutTest.cpp} | 2 + .../{ParticleTest.h => ParticleTest.cpp} | 0 .../Core/Sample/{RTTest.h => RTTest.cpp} | 0 Tests/UnitTests/Core/Sample/testlist.h | 22 ---------- ...lementTest.h => DepthProbeElementTest.cpp} | 0 ...dlerTest.h => PolarizationHandlerTest.cpp} | 0 ...st.h => SpecularSimulationElementTest.cpp} | 0 .../Core/SimulationElement/testlist.h | 6 --- Tests/UnitTests/Core/TestAll.cpp | 9 ++++ Tests/UnitTests/Fit/CMakeLists.txt | 1 - Tests/UnitTests/utilities/FormFactorTest.cpp | 40 ++++++++++++++++++ Tests/UnitTests/utilities/FormFactorTest.h | 39 ----------------- 108 files changed, 82 insertions(+), 173 deletions(-) rename Tests/UnitTests/Core/Axes/{CVectorTest.h => CVectorTest.cpp} (100%) rename Tests/UnitTests/Core/Axes/{ConstKBinAxisTest.h => ConstKBinAxisTest.cpp} (100%) rename Tests/UnitTests/Core/Axes/{CustomBinAxisTest.h => CustomBinAxisTest.cpp} (100%) rename Tests/UnitTests/Core/Axes/{DepthProbeConverterTest.h => DepthProbeConverterTest.cpp} (100%) rename Tests/UnitTests/Core/Axes/{FixedBinAxisTest.h => FixedBinAxisTest.cpp} (100%) rename Tests/UnitTests/Core/Axes/{Histogram1DTest.h => Histogram1DTest.cpp} (100%) rename Tests/UnitTests/Core/Axes/{Histogram2DTest.h => Histogram2DTest.cpp} (100%) rename Tests/UnitTests/Core/Axes/{KVectorTest.h => KVectorTest.cpp} (100%) rename Tests/UnitTests/Core/Axes/{PointwiseAxisTest.h => PointwiseAxisTest.cpp} (100%) rename Tests/UnitTests/Core/Axes/{UnitConverter1DTest.h => UnitConverter1DTest.cpp} (100%) rename Tests/UnitTests/Core/Axes/{VariableBinAxisTest.h => VariableBinAxisTest.cpp} (100%) delete mode 100644 Tests/UnitTests/Core/Axes/testlist.h rename Tests/UnitTests/Core/DataStructure/{ArrayUtilsTest.h => ArrayUtilsTest.cpp} (100%) rename Tests/UnitTests/Core/DataStructure/{IOStrategyTest.h => IOStrategyTest.cpp} (100%) rename Tests/UnitTests/Core/DataStructure/{IntensityDataFunctionsTest.h => IntensityDataFunctionsTest.cpp} (100%) rename Tests/UnitTests/Core/DataStructure/{LLDataTest.h => LLDataTest.cpp} (100%) rename Tests/UnitTests/Core/DataStructure/{OutputDataIteratorTest.h => OutputDataIteratorTest.cpp} (100%) rename Tests/UnitTests/Core/DataStructure/{OutputDataTest.h => OutputDataTest.cpp} (100%) delete mode 100644 Tests/UnitTests/Core/DataStructure/testlist.h rename Tests/UnitTests/Core/Detector/{DetectorMaskTest.h => DetectorMaskTest.cpp} (100%) rename Tests/UnitTests/Core/Detector/{OffSpecularConverterTest.h => OffSpecularConverterTest.cpp} (100%) rename Tests/UnitTests/Core/Detector/{PolygonTest.h => PolygonTest.cpp} (100%) rename Tests/UnitTests/Core/Detector/{PrecomputedTest.h => PrecomputedTest.cpp} (100%) rename Tests/UnitTests/Core/Detector/{RectangularConverterTest.h => RectangularConverterTest.cpp} (100%) rename Tests/UnitTests/Core/Detector/{RectangularDetectorTest.h => RectangularDetectorTest.cpp} (100%) rename Tests/UnitTests/Core/Detector/{RegionOfInterestTest.h => RegionOfInterestTest.cpp} (100%) rename Tests/UnitTests/Core/Detector/{SimulationAreaTest.h => SimulationAreaTest.cpp} (100%) rename Tests/UnitTests/Core/Detector/{SpecialFunctionsTest.h => SpecialFunctionsTest.cpp} (100%) rename Tests/UnitTests/Core/Detector/{SpecularDetector1DTest.h => SpecularDetector1DTest.cpp} (100%) rename Tests/UnitTests/Core/Detector/{SphericalConverterTest.h => SphericalConverterTest.cpp} (100%) rename Tests/UnitTests/Core/Detector/{SphericalDetectorTest.h => SphericalDetectorTest.cpp} (100%) delete mode 100644 Tests/UnitTests/Core/Detector/testlist.h rename Tests/UnitTests/Core/ExportToPython/{PythonFormattingTest.h => PythonFormattingTest.cpp} (100%) delete mode 100644 Tests/UnitTests/Core/ExportToPython/testlist.h rename Tests/UnitTests/Core/Fitting/{FitObjectiveTest.h => FitObjectiveTest.cpp} (100%) rename Tests/UnitTests/Core/Fitting/{FitObserverTest.h => FitObserverTest.cpp} (100%) rename Tests/UnitTests/Core/Fitting/{SimDataPairTest.h => SimDataPairTest.cpp} (100%) delete mode 100644 Tests/UnitTests/Core/Fitting/testlist.h rename Tests/UnitTests/Core/Fresnel/{DepthProbeSimulationTest.h => DepthProbeSimulationTest.cpp} (100%) rename Tests/UnitTests/Core/Fresnel/{MatrixRTCoefficientsTest.h => MatrixRTCoefficientsTest.cpp} (100%) rename Tests/UnitTests/Core/Fresnel/{ScalarRTCoefficientsTest.h => ScalarRTCoefficientsTest.cpp} (100%) rename Tests/UnitTests/Core/Fresnel/{SpecularMagneticTest.h => SpecularMagneticTest.cpp} (100%) rename Tests/UnitTests/Core/Fresnel/{SpecularMatrixTest.h => SpecularMatrixTest.cpp} (100%) rename Tests/UnitTests/Core/Fresnel/{SpecularSimulationTest.h => SpecularSimulationTest.cpp} (100%) delete mode 100644 Tests/UnitTests/Core/Fresnel/testlist.h rename Tests/UnitTests/Core/Numeric0/{FormFactorSpecializationTest.h => FormFactorSpecializationTest.cpp} (100%) delete mode 100644 Tests/UnitTests/Core/Numeric0/testlist.h rename Tests/UnitTests/Core/Numeric1/{FormFactorSymmetryTest.h => FormFactorSymmetryTest.cpp} (100%) delete mode 100644 Tests/UnitTests/Core/Numeric1/testlist.h rename Tests/UnitTests/Core/Other/{BeamFootprintTest.h => BeamFootprintTest.cpp} (100%) rename Tests/UnitTests/Core/Other/{BeamTest.h => BeamTest.cpp} (100%) rename Tests/UnitTests/Core/Other/{ChiSquaredModuleTest.h => ChiSquaredModuleTest.cpp} (100%) rename Tests/UnitTests/Core/Other/{CumulativeValueTest.h => CumulativeValueTest.cpp} (100%) rename Tests/UnitTests/Core/Other/{FileSystemUtilsTest.h => FileSystemUtilsTest.cpp} (100%) rename Tests/UnitTests/Core/Other/{FourierTransformTest.h => FourierTransformTest.cpp} (100%) rename Tests/UnitTests/Core/Other/{GISASSimulationTest.h => GISASSimulationTest.cpp} (100%) rename Tests/UnitTests/Core/Other/{InstrumentTest.h => InstrumentTest.cpp} (100%) rename Tests/UnitTests/Core/Other/{LayerFillLimitsTest.h => LayerFillLimitsTest.cpp} (100%) rename Tests/UnitTests/Core/Other/{MaterialTest.h => MaterialTest.cpp} (100%) rename Tests/UnitTests/Core/Other/{OrderedMapTest.h => OrderedMapTest.cpp} (100%) rename Tests/UnitTests/Core/Other/{RelDiffTest.h => RelDiffTest.cpp} (100%) rename Tests/UnitTests/Core/Other/{RotationTest.h => RotationTest.cpp} (100%) rename Tests/UnitTests/Core/Other/{SampleBuilderNoteTest.h => SampleBuilderNoteTest.cpp} (100%) rename Tests/UnitTests/Core/Other/{SampleProviderTest.h => SampleProviderTest.cpp} (100%) rename Tests/UnitTests/Core/Other/{Shape2DTest.h => Shape2DTest.cpp} (100%) rename Tests/UnitTests/Core/Other/{SimulationResultTest.h => SimulationResultTest.cpp} (100%) rename Tests/UnitTests/Core/Other/{TRangeTest.h => TRangeTest.cpp} (100%) rename Tests/UnitTests/Core/Other/{ThreadInfoTest.h => ThreadInfoTest.cpp} (100%) rename Tests/UnitTests/Core/Other/{ZLimitsTest.h => ZLimitsTest.cpp} (100%) delete mode 100644 Tests/UnitTests/Core/Other/testlist.h rename Tests/UnitTests/Core/Parameters/{DistributionHandlerTest.h => DistributionHandlerTest.cpp} (100%) rename Tests/UnitTests/Core/Parameters/{DistributionsTest.h => DistributionsTest.cpp} (100%) rename Tests/UnitTests/Core/Parameters/{FTDistributionsTest.h => FTDistributionsTest.cpp} (99%) rename Tests/UnitTests/Core/Parameters/{IParameterizedTest.h => IParameterizedTest.cpp} (100%) rename Tests/UnitTests/Core/Parameters/{ParameterDistributionTest.h => ParameterDistributionTest.cpp} (100%) rename Tests/UnitTests/Core/Parameters/{ParameterPatternTest.h => ParameterPatternTest.cpp} (100%) rename Tests/UnitTests/Core/Parameters/{ParameterPoolTest.h => ParameterPoolTest.cpp} (100%) rename Tests/UnitTests/Core/Parameters/{RealParameterTest.h => RealParameterTest.cpp} (100%) delete mode 100644 Tests/UnitTests/Core/Parameters/testlist.h rename Tests/UnitTests/Core/Sample/{CrystalTest.h => CrystalTest.cpp} (100%) rename Tests/UnitTests/Core/Sample/{FormFactorBasicTest.h => FormFactorBasicTest.cpp} (100%) rename Tests/UnitTests/Core/Sample/{FormFactorCoherentSumTest.h => FormFactorCoherentSumTest.cpp} (100%) rename Tests/UnitTests/Core/Sample/{FormFactorSoftParticleTest.h => FormFactorSoftParticleTest.cpp} (100%) rename Tests/UnitTests/Core/Sample/{INodeTest.h => INodeTest.cpp} (100%) rename Tests/UnitTests/Core/Sample/{Lattice2DTest.h => Lattice2DTest.cpp} (100%) rename Tests/UnitTests/Core/Sample/{LatticeTest.h => LatticeTest.cpp} (100%) rename Tests/UnitTests/Core/Sample/{LatticeUtilsTest.h => LatticeUtilsTest.cpp} (100%) rename Tests/UnitTests/Core/Sample/{LayerInterfaceTest.h => LayerInterfaceTest.cpp} (100%) rename Tests/UnitTests/Core/Sample/{LayerRoughnessTest.h => LayerRoughnessTest.cpp} (100%) rename Tests/UnitTests/Core/Sample/{LayerTest.h => LayerTest.cpp} (100%) rename Tests/UnitTests/Core/Sample/{MesoCrystalTest.h => MesoCrystalTest.cpp} (100%) rename Tests/UnitTests/Core/Sample/{MultiLayerTest.h => MultiLayerTest.cpp} (100%) rename Tests/UnitTests/Core/Sample/{ParticleCompositionTest.h => ParticleCompositionTest.cpp} (100%) rename Tests/UnitTests/Core/Sample/{ParticleCoreShellTest.h => ParticleCoreShellTest.cpp} (99%) rename Tests/UnitTests/Core/Sample/{ParticleDistributionTest.h => ParticleDistributionTest.cpp} (100%) rename Tests/UnitTests/Core/Sample/{ParticleLayoutTest.h => ParticleLayoutTest.cpp} (99%) rename Tests/UnitTests/Core/Sample/{ParticleTest.h => ParticleTest.cpp} (100%) rename Tests/UnitTests/Core/Sample/{RTTest.h => RTTest.cpp} (100%) delete mode 100644 Tests/UnitTests/Core/Sample/testlist.h rename Tests/UnitTests/Core/SimulationElement/{DepthProbeElementTest.h => DepthProbeElementTest.cpp} (100%) rename Tests/UnitTests/Core/SimulationElement/{PolarizationHandlerTest.h => PolarizationHandlerTest.cpp} (100%) rename Tests/UnitTests/Core/SimulationElement/{SpecularSimulationElementTest.h => SpecularSimulationElementTest.cpp} (100%) delete mode 100644 Tests/UnitTests/Core/SimulationElement/testlist.h create mode 100644 Tests/UnitTests/Core/TestAll.cpp create mode 100644 Tests/UnitTests/utilities/FormFactorTest.cpp diff --git a/Tests/UnitTests/Core/Axes/CVectorTest.h b/Tests/UnitTests/Core/Axes/CVectorTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Axes/CVectorTest.h rename to Tests/UnitTests/Core/Axes/CVectorTest.cpp diff --git a/Tests/UnitTests/Core/Axes/ConstKBinAxisTest.h b/Tests/UnitTests/Core/Axes/ConstKBinAxisTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Axes/ConstKBinAxisTest.h rename to Tests/UnitTests/Core/Axes/ConstKBinAxisTest.cpp diff --git a/Tests/UnitTests/Core/Axes/CustomBinAxisTest.h b/Tests/UnitTests/Core/Axes/CustomBinAxisTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Axes/CustomBinAxisTest.h rename to Tests/UnitTests/Core/Axes/CustomBinAxisTest.cpp diff --git a/Tests/UnitTests/Core/Axes/DepthProbeConverterTest.h b/Tests/UnitTests/Core/Axes/DepthProbeConverterTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Axes/DepthProbeConverterTest.h rename to Tests/UnitTests/Core/Axes/DepthProbeConverterTest.cpp diff --git a/Tests/UnitTests/Core/Axes/FixedBinAxisTest.h b/Tests/UnitTests/Core/Axes/FixedBinAxisTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Axes/FixedBinAxisTest.h rename to Tests/UnitTests/Core/Axes/FixedBinAxisTest.cpp diff --git a/Tests/UnitTests/Core/Axes/Histogram1DTest.h b/Tests/UnitTests/Core/Axes/Histogram1DTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Axes/Histogram1DTest.h rename to Tests/UnitTests/Core/Axes/Histogram1DTest.cpp diff --git a/Tests/UnitTests/Core/Axes/Histogram2DTest.h b/Tests/UnitTests/Core/Axes/Histogram2DTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Axes/Histogram2DTest.h rename to Tests/UnitTests/Core/Axes/Histogram2DTest.cpp diff --git a/Tests/UnitTests/Core/Axes/KVectorTest.h b/Tests/UnitTests/Core/Axes/KVectorTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Axes/KVectorTest.h rename to Tests/UnitTests/Core/Axes/KVectorTest.cpp diff --git a/Tests/UnitTests/Core/Axes/PointwiseAxisTest.h b/Tests/UnitTests/Core/Axes/PointwiseAxisTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Axes/PointwiseAxisTest.h rename to Tests/UnitTests/Core/Axes/PointwiseAxisTest.cpp diff --git a/Tests/UnitTests/Core/Axes/UnitConverter1DTest.h b/Tests/UnitTests/Core/Axes/UnitConverter1DTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Axes/UnitConverter1DTest.h rename to Tests/UnitTests/Core/Axes/UnitConverter1DTest.cpp diff --git a/Tests/UnitTests/Core/Axes/VariableBinAxisTest.h b/Tests/UnitTests/Core/Axes/VariableBinAxisTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Axes/VariableBinAxisTest.h rename to Tests/UnitTests/Core/Axes/VariableBinAxisTest.cpp diff --git a/Tests/UnitTests/Core/Axes/testlist.h b/Tests/UnitTests/Core/Axes/testlist.h deleted file mode 100644 index d957aa9830a..00000000000 --- a/Tests/UnitTests/Core/Axes/testlist.h +++ /dev/null @@ -1,13 +0,0 @@ -// To renew this file, run /G/ba/dev-tools/code-tools/update-gtestlist.py <directory> - -#include "CustomBinAxisTest.h" -#include "DepthProbeConverterTest.h" -#include "Histogram1DTest.h" -#include "VariableBinAxisTest.h" -#include "Histogram2DTest.h" -#include "KVectorTest.h" -#include "ConstKBinAxisTest.h" -#include "FixedBinAxisTest.h" -#include "CVectorTest.h" -#include "UnitConverter1DTest.h" -#include "PointwiseAxisTest.h" diff --git a/Tests/UnitTests/Core/CMakeLists.txt b/Tests/UnitTests/Core/CMakeLists.txt index 4801071c1f5..b15c58413cd 100644 --- a/Tests/UnitTests/Core/CMakeLists.txt +++ b/Tests/UnitTests/Core/CMakeLists.txt @@ -3,18 +3,34 @@ ############################################################################ set(test UnitTestCore) -set(libs BornAgainCore) +if(POLICY CMP0020) + cmake_policy(SET CMP0020 NEW) +endif() -ADD_GTEST(${test} "Axes" ${libs} 0) -ADD_GTEST(${test} "Sample" ${libs} 0) -ADD_GTEST(${test} "Fresnel" ${libs} 0) -ADD_GTEST(${test} "Detector" ${libs} 0) -ADD_GTEST(${test} "ExportToPython" ${libs} 0) -ADD_GTEST(${test} "Parameters" ${libs} 0) -ADD_GTEST(${test} "DataStructure" ${libs} 0) -ADD_GTEST(${test} "Other" ${libs} 0) -ADD_GTEST(${test} "SimulationElement" ${libs} 0) -ADD_GTEST(${test} "Fitting" ${libs} 0) -ADD_GTEST(${test} "Numeric0" ${libs} 2) -ADD_GTEST(${test} "Numeric1" ${libs} 2) +if(POLICY CMP0043) + cmake_policy(SET CMP0043 NEW) +endif() +#ADD_GTEST(${test} "Axes" ${libs} 0) +#ADD_GTEST(${test} "Sample" ${libs} 0) +#ADD_GTEST(${test} "Fresnel" ${libs} 0) +#ADD_GTEST(${test} "Detector" ${libs} 0) +#ADD_GTEST(${test} "ExportToPython" ${libs} 0) +#ADD_GTEST(${test} "Parameters" ${libs} 0) +#ADD_GTEST(${test} "DataStructure" ${libs} 0) +#ADD_GTEST(${test} "Other" ${libs} 0) +#ADD_GTEST(${test} "SimulationElement" ${libs} 0) +#ADD_GTEST(${test} "Fitting" ${libs} 0) +#ADD_GTEST(${test} "Numeric0" ${libs} 2) +#ADD_GTEST(${test} "Numeric1" ${libs} 2) + + +file(GLOB source_files "*/*.cpp") +file(GLOB include_files "*/*.h") +list(APPEND source_files "TestAll.cpp" "../utilities/FormFactorTest.cpp") + +add_executable(${test} ${source_files} ${include_files}) +target_link_libraries(${test} ${BornAgainCore_LIBRARY} gtest) + +# add execution of TestCore just after compilation +add_custom_target(${test}_run ALL DEPENDS ${test} COMMAND ${test}) diff --git a/Tests/UnitTests/Core/DataStructure/ArrayUtilsTest.h b/Tests/UnitTests/Core/DataStructure/ArrayUtilsTest.cpp similarity index 100% rename from Tests/UnitTests/Core/DataStructure/ArrayUtilsTest.h rename to Tests/UnitTests/Core/DataStructure/ArrayUtilsTest.cpp diff --git a/Tests/UnitTests/Core/DataStructure/IOStrategyTest.h b/Tests/UnitTests/Core/DataStructure/IOStrategyTest.cpp similarity index 100% rename from Tests/UnitTests/Core/DataStructure/IOStrategyTest.h rename to Tests/UnitTests/Core/DataStructure/IOStrategyTest.cpp diff --git a/Tests/UnitTests/Core/DataStructure/IntensityDataFunctionsTest.h b/Tests/UnitTests/Core/DataStructure/IntensityDataFunctionsTest.cpp similarity index 100% rename from Tests/UnitTests/Core/DataStructure/IntensityDataFunctionsTest.h rename to Tests/UnitTests/Core/DataStructure/IntensityDataFunctionsTest.cpp diff --git a/Tests/UnitTests/Core/DataStructure/LLDataTest.h b/Tests/UnitTests/Core/DataStructure/LLDataTest.cpp similarity index 100% rename from Tests/UnitTests/Core/DataStructure/LLDataTest.h rename to Tests/UnitTests/Core/DataStructure/LLDataTest.cpp diff --git a/Tests/UnitTests/Core/DataStructure/OutputDataIteratorTest.h b/Tests/UnitTests/Core/DataStructure/OutputDataIteratorTest.cpp similarity index 100% rename from Tests/UnitTests/Core/DataStructure/OutputDataIteratorTest.h rename to Tests/UnitTests/Core/DataStructure/OutputDataIteratorTest.cpp diff --git a/Tests/UnitTests/Core/DataStructure/OutputDataTest.h b/Tests/UnitTests/Core/DataStructure/OutputDataTest.cpp similarity index 100% rename from Tests/UnitTests/Core/DataStructure/OutputDataTest.h rename to Tests/UnitTests/Core/DataStructure/OutputDataTest.cpp diff --git a/Tests/UnitTests/Core/DataStructure/testlist.h b/Tests/UnitTests/Core/DataStructure/testlist.h deleted file mode 100644 index 2b550833010..00000000000 --- a/Tests/UnitTests/Core/DataStructure/testlist.h +++ /dev/null @@ -1,8 +0,0 @@ -// To renew this file, run /G/ba/dev-tools/code-tools/update-gtestlist.py <directory> - -#include "IntensityDataFunctionsTest.h" -#include "IOStrategyTest.h" -#include "OutputDataTest.h" -#include "OutputDataIteratorTest.h" -#include "LLDataTest.h" -#include "ArrayUtilsTest.h" diff --git a/Tests/UnitTests/Core/Detector/DetectorMaskTest.h b/Tests/UnitTests/Core/Detector/DetectorMaskTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Detector/DetectorMaskTest.h rename to Tests/UnitTests/Core/Detector/DetectorMaskTest.cpp diff --git a/Tests/UnitTests/Core/Detector/OffSpecularConverterTest.h b/Tests/UnitTests/Core/Detector/OffSpecularConverterTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Detector/OffSpecularConverterTest.h rename to Tests/UnitTests/Core/Detector/OffSpecularConverterTest.cpp diff --git a/Tests/UnitTests/Core/Detector/PolygonTest.h b/Tests/UnitTests/Core/Detector/PolygonTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Detector/PolygonTest.h rename to Tests/UnitTests/Core/Detector/PolygonTest.cpp diff --git a/Tests/UnitTests/Core/Detector/PrecomputedTest.h b/Tests/UnitTests/Core/Detector/PrecomputedTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Detector/PrecomputedTest.h rename to Tests/UnitTests/Core/Detector/PrecomputedTest.cpp diff --git a/Tests/UnitTests/Core/Detector/RectangularConverterTest.h b/Tests/UnitTests/Core/Detector/RectangularConverterTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Detector/RectangularConverterTest.h rename to Tests/UnitTests/Core/Detector/RectangularConverterTest.cpp diff --git a/Tests/UnitTests/Core/Detector/RectangularDetectorTest.h b/Tests/UnitTests/Core/Detector/RectangularDetectorTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Detector/RectangularDetectorTest.h rename to Tests/UnitTests/Core/Detector/RectangularDetectorTest.cpp diff --git a/Tests/UnitTests/Core/Detector/RegionOfInterestTest.h b/Tests/UnitTests/Core/Detector/RegionOfInterestTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Detector/RegionOfInterestTest.h rename to Tests/UnitTests/Core/Detector/RegionOfInterestTest.cpp diff --git a/Tests/UnitTests/Core/Detector/SimulationAreaTest.h b/Tests/UnitTests/Core/Detector/SimulationAreaTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Detector/SimulationAreaTest.h rename to Tests/UnitTests/Core/Detector/SimulationAreaTest.cpp diff --git a/Tests/UnitTests/Core/Detector/SpecialFunctionsTest.h b/Tests/UnitTests/Core/Detector/SpecialFunctionsTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Detector/SpecialFunctionsTest.h rename to Tests/UnitTests/Core/Detector/SpecialFunctionsTest.cpp diff --git a/Tests/UnitTests/Core/Detector/SpecularDetector1DTest.h b/Tests/UnitTests/Core/Detector/SpecularDetector1DTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Detector/SpecularDetector1DTest.h rename to Tests/UnitTests/Core/Detector/SpecularDetector1DTest.cpp diff --git a/Tests/UnitTests/Core/Detector/SphericalConverterTest.h b/Tests/UnitTests/Core/Detector/SphericalConverterTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Detector/SphericalConverterTest.h rename to Tests/UnitTests/Core/Detector/SphericalConverterTest.cpp diff --git a/Tests/UnitTests/Core/Detector/SphericalDetectorTest.h b/Tests/UnitTests/Core/Detector/SphericalDetectorTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Detector/SphericalDetectorTest.h rename to Tests/UnitTests/Core/Detector/SphericalDetectorTest.cpp diff --git a/Tests/UnitTests/Core/Detector/testlist.h b/Tests/UnitTests/Core/Detector/testlist.h deleted file mode 100644 index 818c8115f6f..00000000000 --- a/Tests/UnitTests/Core/Detector/testlist.h +++ /dev/null @@ -1,14 +0,0 @@ -// To renew this file, run ./dev-tools/code-tools/update-gtestlist.py <directory> - -#include "SphericalDetectorTest.h" -#include "DetectorMaskTest.h" -#include "PrecomputedTest.h" -#include "RectangularDetectorTest.h" -#include "SpecularDetector1DTest.h" -#include "SpecialFunctionsTest.h" -#include "RegionOfInterestTest.h" -#include "PolygonTest.h" -#include "SphericalConverterTest.h" -#include "RectangularConverterTest.h" -#include "OffSpecularConverterTest.h" -#include "SimulationAreaTest.h" diff --git a/Tests/UnitTests/Core/ExportToPython/PythonFormattingTest.h b/Tests/UnitTests/Core/ExportToPython/PythonFormattingTest.cpp similarity index 100% rename from Tests/UnitTests/Core/ExportToPython/PythonFormattingTest.h rename to Tests/UnitTests/Core/ExportToPython/PythonFormattingTest.cpp diff --git a/Tests/UnitTests/Core/ExportToPython/testlist.h b/Tests/UnitTests/Core/ExportToPython/testlist.h deleted file mode 100644 index 9273387bccd..00000000000 --- a/Tests/UnitTests/Core/ExportToPython/testlist.h +++ /dev/null @@ -1,3 +0,0 @@ -// To renew this file, run /G/ba/dev-tools/code-tools/update-gtestlist.py <directory> - -#include "PythonFormattingTest.h" diff --git a/Tests/UnitTests/Core/Fitting/FitObjectiveTest.h b/Tests/UnitTests/Core/Fitting/FitObjectiveTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Fitting/FitObjectiveTest.h rename to Tests/UnitTests/Core/Fitting/FitObjectiveTest.cpp diff --git a/Tests/UnitTests/Core/Fitting/FitObserverTest.h b/Tests/UnitTests/Core/Fitting/FitObserverTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Fitting/FitObserverTest.h rename to Tests/UnitTests/Core/Fitting/FitObserverTest.cpp diff --git a/Tests/UnitTests/Core/Fitting/SimDataPairTest.h b/Tests/UnitTests/Core/Fitting/SimDataPairTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Fitting/SimDataPairTest.h rename to Tests/UnitTests/Core/Fitting/SimDataPairTest.cpp diff --git a/Tests/UnitTests/Core/Fitting/testlist.h b/Tests/UnitTests/Core/Fitting/testlist.h deleted file mode 100644 index 9499e1dcbaa..00000000000 --- a/Tests/UnitTests/Core/Fitting/testlist.h +++ /dev/null @@ -1,4 +0,0 @@ -#include "SimDataPairTest.h" -#include "FitObjectiveTest.h" -#include "FitObserverTest.h" - diff --git a/Tests/UnitTests/Core/Fresnel/DepthProbeSimulationTest.h b/Tests/UnitTests/Core/Fresnel/DepthProbeSimulationTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Fresnel/DepthProbeSimulationTest.h rename to Tests/UnitTests/Core/Fresnel/DepthProbeSimulationTest.cpp diff --git a/Tests/UnitTests/Core/Fresnel/MatrixRTCoefficientsTest.h b/Tests/UnitTests/Core/Fresnel/MatrixRTCoefficientsTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Fresnel/MatrixRTCoefficientsTest.h rename to Tests/UnitTests/Core/Fresnel/MatrixRTCoefficientsTest.cpp diff --git a/Tests/UnitTests/Core/Fresnel/ScalarRTCoefficientsTest.h b/Tests/UnitTests/Core/Fresnel/ScalarRTCoefficientsTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Fresnel/ScalarRTCoefficientsTest.h rename to Tests/UnitTests/Core/Fresnel/ScalarRTCoefficientsTest.cpp diff --git a/Tests/UnitTests/Core/Fresnel/SpecularMagneticTest.h b/Tests/UnitTests/Core/Fresnel/SpecularMagneticTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Fresnel/SpecularMagneticTest.h rename to Tests/UnitTests/Core/Fresnel/SpecularMagneticTest.cpp diff --git a/Tests/UnitTests/Core/Fresnel/SpecularMatrixTest.h b/Tests/UnitTests/Core/Fresnel/SpecularMatrixTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Fresnel/SpecularMatrixTest.h rename to Tests/UnitTests/Core/Fresnel/SpecularMatrixTest.cpp diff --git a/Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.h b/Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.h rename to Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.cpp diff --git a/Tests/UnitTests/Core/Fresnel/testlist.h b/Tests/UnitTests/Core/Fresnel/testlist.h deleted file mode 100644 index 7a89b5700ba..00000000000 --- a/Tests/UnitTests/Core/Fresnel/testlist.h +++ /dev/null @@ -1,10 +0,0 @@ -// To renew this file, run /G/ba/dev-tools/code-tools/update-gtestlist.py <directory> - -//#include "ScalarSpecularInfoMapTest.h" -//#include "MatrixSpecularInfoMapTest.h" -#include "ScalarRTCoefficientsTest.h" -#include "MatrixRTCoefficientsTest.h" -#include "DepthProbeSimulationTest.h" -#include "SpecularSimulationTest.h" -#include "SpecularMatrixTest.h" -#include "SpecularMagneticTest.h" diff --git a/Tests/UnitTests/Core/Numeric0/FormFactorSpecializationTest.h b/Tests/UnitTests/Core/Numeric0/FormFactorSpecializationTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Numeric0/FormFactorSpecializationTest.h rename to Tests/UnitTests/Core/Numeric0/FormFactorSpecializationTest.cpp diff --git a/Tests/UnitTests/Core/Numeric0/testlist.h b/Tests/UnitTests/Core/Numeric0/testlist.h deleted file mode 100644 index 6afe1799450..00000000000 --- a/Tests/UnitTests/Core/Numeric0/testlist.h +++ /dev/null @@ -1,3 +0,0 @@ -// To renew this file, run /G/ba/dev-tools/code-tools/update-gtestlist.py <directory> - -#include "FormFactorSpecializationTest.h" diff --git a/Tests/UnitTests/Core/Numeric1/FormFactorSymmetryTest.h b/Tests/UnitTests/Core/Numeric1/FormFactorSymmetryTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Numeric1/FormFactorSymmetryTest.h rename to Tests/UnitTests/Core/Numeric1/FormFactorSymmetryTest.cpp diff --git a/Tests/UnitTests/Core/Numeric1/testlist.h b/Tests/UnitTests/Core/Numeric1/testlist.h deleted file mode 100644 index b7b4f983c36..00000000000 --- a/Tests/UnitTests/Core/Numeric1/testlist.h +++ /dev/null @@ -1,4 +0,0 @@ -// To renew this file, run /G/ba/dev-tools/code-tools/update-gtestlist.py <directory> - -#include "FormFactorSymmetryTest.h" - diff --git a/Tests/UnitTests/Core/Other/BeamFootprintTest.h b/Tests/UnitTests/Core/Other/BeamFootprintTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Other/BeamFootprintTest.h rename to Tests/UnitTests/Core/Other/BeamFootprintTest.cpp diff --git a/Tests/UnitTests/Core/Other/BeamTest.h b/Tests/UnitTests/Core/Other/BeamTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Other/BeamTest.h rename to Tests/UnitTests/Core/Other/BeamTest.cpp diff --git a/Tests/UnitTests/Core/Other/ChiSquaredModuleTest.h b/Tests/UnitTests/Core/Other/ChiSquaredModuleTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Other/ChiSquaredModuleTest.h rename to Tests/UnitTests/Core/Other/ChiSquaredModuleTest.cpp diff --git a/Tests/UnitTests/Core/Other/CumulativeValueTest.h b/Tests/UnitTests/Core/Other/CumulativeValueTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Other/CumulativeValueTest.h rename to Tests/UnitTests/Core/Other/CumulativeValueTest.cpp diff --git a/Tests/UnitTests/Core/Other/FileSystemUtilsTest.h b/Tests/UnitTests/Core/Other/FileSystemUtilsTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Other/FileSystemUtilsTest.h rename to Tests/UnitTests/Core/Other/FileSystemUtilsTest.cpp diff --git a/Tests/UnitTests/Core/Other/FourierTransformTest.h b/Tests/UnitTests/Core/Other/FourierTransformTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Other/FourierTransformTest.h rename to Tests/UnitTests/Core/Other/FourierTransformTest.cpp diff --git a/Tests/UnitTests/Core/Other/GISASSimulationTest.h b/Tests/UnitTests/Core/Other/GISASSimulationTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Other/GISASSimulationTest.h rename to Tests/UnitTests/Core/Other/GISASSimulationTest.cpp diff --git a/Tests/UnitTests/Core/Other/InstrumentTest.h b/Tests/UnitTests/Core/Other/InstrumentTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Other/InstrumentTest.h rename to Tests/UnitTests/Core/Other/InstrumentTest.cpp diff --git a/Tests/UnitTests/Core/Other/LayerFillLimitsTest.h b/Tests/UnitTests/Core/Other/LayerFillLimitsTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Other/LayerFillLimitsTest.h rename to Tests/UnitTests/Core/Other/LayerFillLimitsTest.cpp diff --git a/Tests/UnitTests/Core/Other/MaterialTest.h b/Tests/UnitTests/Core/Other/MaterialTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Other/MaterialTest.h rename to Tests/UnitTests/Core/Other/MaterialTest.cpp diff --git a/Tests/UnitTests/Core/Other/OrderedMapTest.h b/Tests/UnitTests/Core/Other/OrderedMapTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Other/OrderedMapTest.h rename to Tests/UnitTests/Core/Other/OrderedMapTest.cpp diff --git a/Tests/UnitTests/Core/Other/RelDiffTest.h b/Tests/UnitTests/Core/Other/RelDiffTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Other/RelDiffTest.h rename to Tests/UnitTests/Core/Other/RelDiffTest.cpp diff --git a/Tests/UnitTests/Core/Other/RotationTest.h b/Tests/UnitTests/Core/Other/RotationTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Other/RotationTest.h rename to Tests/UnitTests/Core/Other/RotationTest.cpp diff --git a/Tests/UnitTests/Core/Other/SampleBuilderNoteTest.h b/Tests/UnitTests/Core/Other/SampleBuilderNoteTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Other/SampleBuilderNoteTest.h rename to Tests/UnitTests/Core/Other/SampleBuilderNoteTest.cpp diff --git a/Tests/UnitTests/Core/Other/SampleProviderTest.h b/Tests/UnitTests/Core/Other/SampleProviderTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Other/SampleProviderTest.h rename to Tests/UnitTests/Core/Other/SampleProviderTest.cpp diff --git a/Tests/UnitTests/Core/Other/Shape2DTest.h b/Tests/UnitTests/Core/Other/Shape2DTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Other/Shape2DTest.h rename to Tests/UnitTests/Core/Other/Shape2DTest.cpp diff --git a/Tests/UnitTests/Core/Other/SimulationResultTest.h b/Tests/UnitTests/Core/Other/SimulationResultTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Other/SimulationResultTest.h rename to Tests/UnitTests/Core/Other/SimulationResultTest.cpp diff --git a/Tests/UnitTests/Core/Other/TRangeTest.h b/Tests/UnitTests/Core/Other/TRangeTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Other/TRangeTest.h rename to Tests/UnitTests/Core/Other/TRangeTest.cpp diff --git a/Tests/UnitTests/Core/Other/ThreadInfoTest.h b/Tests/UnitTests/Core/Other/ThreadInfoTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Other/ThreadInfoTest.h rename to Tests/UnitTests/Core/Other/ThreadInfoTest.cpp diff --git a/Tests/UnitTests/Core/Other/ZLimitsTest.h b/Tests/UnitTests/Core/Other/ZLimitsTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Other/ZLimitsTest.h rename to Tests/UnitTests/Core/Other/ZLimitsTest.cpp diff --git a/Tests/UnitTests/Core/Other/testlist.h b/Tests/UnitTests/Core/Other/testlist.h deleted file mode 100644 index def09abf7d8..00000000000 --- a/Tests/UnitTests/Core/Other/testlist.h +++ /dev/null @@ -1,23 +0,0 @@ -// To renew this file, run ./dev-tools/code-tools/update-gtestlist.py <directory> - -#include "LayerFillLimitsTest.h" -#include "RelDiffTest.h" -#include "TRangeTest.h" -#include "Shape2DTest.h" -#include "MaterialTest.h" -#include "GISASSimulationTest.h" -#include "ZLimitsTest.h" -#include "ThreadInfoTest.h" -#include "InstrumentTest.h" -#include "CumulativeValueTest.h" -#include "ChiSquaredModuleTest.h" -#include "BeamTest.h" -#include "OrderedMapTest.h" -#include "SampleBuilderNoteTest.h" -#include "SampleProviderTest.h" -#include "FourierTransformTest.h" -#include "BeamFootprintTest.h" -#include "FileSystemUtilsTest.h" -#include "SimulationResultTest.h" -#include "RotationTest.h" - diff --git a/Tests/UnitTests/Core/Parameters/DistributionHandlerTest.h b/Tests/UnitTests/Core/Parameters/DistributionHandlerTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Parameters/DistributionHandlerTest.h rename to Tests/UnitTests/Core/Parameters/DistributionHandlerTest.cpp diff --git a/Tests/UnitTests/Core/Parameters/DistributionsTest.h b/Tests/UnitTests/Core/Parameters/DistributionsTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Parameters/DistributionsTest.h rename to Tests/UnitTests/Core/Parameters/DistributionsTest.cpp diff --git a/Tests/UnitTests/Core/Parameters/FTDistributionsTest.h b/Tests/UnitTests/Core/Parameters/FTDistributionsTest.cpp similarity index 99% rename from Tests/UnitTests/Core/Parameters/FTDistributionsTest.h rename to Tests/UnitTests/Core/Parameters/FTDistributionsTest.cpp index 4e8d9a74c90..c8d28c04fcf 100644 --- a/Tests/UnitTests/Core/Parameters/FTDistributionsTest.h +++ b/Tests/UnitTests/Core/Parameters/FTDistributionsTest.cpp @@ -3,6 +3,7 @@ #include "FTDistributions1D.h" #include "FTDistributions2D.h" #include "MathConstants.h" +#include "RealParameter.h" #include <memory> class FTDistributionsTest : public ::testing::Test diff --git a/Tests/UnitTests/Core/Parameters/IParameterizedTest.h b/Tests/UnitTests/Core/Parameters/IParameterizedTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Parameters/IParameterizedTest.h rename to Tests/UnitTests/Core/Parameters/IParameterizedTest.cpp diff --git a/Tests/UnitTests/Core/Parameters/ParameterDistributionTest.h b/Tests/UnitTests/Core/Parameters/ParameterDistributionTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Parameters/ParameterDistributionTest.h rename to Tests/UnitTests/Core/Parameters/ParameterDistributionTest.cpp diff --git a/Tests/UnitTests/Core/Parameters/ParameterPatternTest.h b/Tests/UnitTests/Core/Parameters/ParameterPatternTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Parameters/ParameterPatternTest.h rename to Tests/UnitTests/Core/Parameters/ParameterPatternTest.cpp diff --git a/Tests/UnitTests/Core/Parameters/ParameterPoolTest.h b/Tests/UnitTests/Core/Parameters/ParameterPoolTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Parameters/ParameterPoolTest.h rename to Tests/UnitTests/Core/Parameters/ParameterPoolTest.cpp diff --git a/Tests/UnitTests/Core/Parameters/RealParameterTest.h b/Tests/UnitTests/Core/Parameters/RealParameterTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Parameters/RealParameterTest.h rename to Tests/UnitTests/Core/Parameters/RealParameterTest.cpp diff --git a/Tests/UnitTests/Core/Parameters/testlist.h b/Tests/UnitTests/Core/Parameters/testlist.h deleted file mode 100644 index e1e8bb8b502..00000000000 --- a/Tests/UnitTests/Core/Parameters/testlist.h +++ /dev/null @@ -1,10 +0,0 @@ -// To renew this file, run /G/ba/dev-tools/code-tools/update-gtestlist.py <directory> - -#include "IParameterizedTest.h" -#include "ParameterDistributionTest.h" -#include "DistributionHandlerTest.h" -#include "DistributionsTest.h" -#include "FTDistributionsTest.h" -#include "ParameterPoolTest.h" -#include "RealParameterTest.h" -#include "ParameterPatternTest.h" diff --git a/Tests/UnitTests/Core/Sample/CrystalTest.h b/Tests/UnitTests/Core/Sample/CrystalTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Sample/CrystalTest.h rename to Tests/UnitTests/Core/Sample/CrystalTest.cpp diff --git a/Tests/UnitTests/Core/Sample/FormFactorBasicTest.h b/Tests/UnitTests/Core/Sample/FormFactorBasicTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Sample/FormFactorBasicTest.h rename to Tests/UnitTests/Core/Sample/FormFactorBasicTest.cpp diff --git a/Tests/UnitTests/Core/Sample/FormFactorCoherentSumTest.h b/Tests/UnitTests/Core/Sample/FormFactorCoherentSumTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Sample/FormFactorCoherentSumTest.h rename to Tests/UnitTests/Core/Sample/FormFactorCoherentSumTest.cpp diff --git a/Tests/UnitTests/Core/Sample/FormFactorSoftParticleTest.h b/Tests/UnitTests/Core/Sample/FormFactorSoftParticleTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Sample/FormFactorSoftParticleTest.h rename to Tests/UnitTests/Core/Sample/FormFactorSoftParticleTest.cpp diff --git a/Tests/UnitTests/Core/Sample/INodeTest.h b/Tests/UnitTests/Core/Sample/INodeTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Sample/INodeTest.h rename to Tests/UnitTests/Core/Sample/INodeTest.cpp diff --git a/Tests/UnitTests/Core/Sample/Lattice2DTest.h b/Tests/UnitTests/Core/Sample/Lattice2DTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Sample/Lattice2DTest.h rename to Tests/UnitTests/Core/Sample/Lattice2DTest.cpp diff --git a/Tests/UnitTests/Core/Sample/LatticeTest.h b/Tests/UnitTests/Core/Sample/LatticeTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Sample/LatticeTest.h rename to Tests/UnitTests/Core/Sample/LatticeTest.cpp diff --git a/Tests/UnitTests/Core/Sample/LatticeUtilsTest.h b/Tests/UnitTests/Core/Sample/LatticeUtilsTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Sample/LatticeUtilsTest.h rename to Tests/UnitTests/Core/Sample/LatticeUtilsTest.cpp diff --git a/Tests/UnitTests/Core/Sample/LayerInterfaceTest.h b/Tests/UnitTests/Core/Sample/LayerInterfaceTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Sample/LayerInterfaceTest.h rename to Tests/UnitTests/Core/Sample/LayerInterfaceTest.cpp diff --git a/Tests/UnitTests/Core/Sample/LayerRoughnessTest.h b/Tests/UnitTests/Core/Sample/LayerRoughnessTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Sample/LayerRoughnessTest.h rename to Tests/UnitTests/Core/Sample/LayerRoughnessTest.cpp diff --git a/Tests/UnitTests/Core/Sample/LayerTest.h b/Tests/UnitTests/Core/Sample/LayerTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Sample/LayerTest.h rename to Tests/UnitTests/Core/Sample/LayerTest.cpp diff --git a/Tests/UnitTests/Core/Sample/MesoCrystalTest.h b/Tests/UnitTests/Core/Sample/MesoCrystalTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Sample/MesoCrystalTest.h rename to Tests/UnitTests/Core/Sample/MesoCrystalTest.cpp diff --git a/Tests/UnitTests/Core/Sample/MultiLayerTest.h b/Tests/UnitTests/Core/Sample/MultiLayerTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Sample/MultiLayerTest.h rename to Tests/UnitTests/Core/Sample/MultiLayerTest.cpp diff --git a/Tests/UnitTests/Core/Sample/ParticleCompositionTest.h b/Tests/UnitTests/Core/Sample/ParticleCompositionTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Sample/ParticleCompositionTest.h rename to Tests/UnitTests/Core/Sample/ParticleCompositionTest.cpp diff --git a/Tests/UnitTests/Core/Sample/ParticleCoreShellTest.h b/Tests/UnitTests/Core/Sample/ParticleCoreShellTest.cpp similarity index 99% rename from Tests/UnitTests/Core/Sample/ParticleCoreShellTest.h rename to Tests/UnitTests/Core/Sample/ParticleCoreShellTest.cpp index 312ec38d292..6bb783a4c6d 100644 --- a/Tests/UnitTests/Core/Sample/ParticleCoreShellTest.h +++ b/Tests/UnitTests/Core/Sample/ParticleCoreShellTest.cpp @@ -6,6 +6,7 @@ #include "Particle.h" #include "ParticleCoreShell.h" #include "Rotations.h" +#include "Units.h" class ParticleCoreShellTest : public ::testing::Test { diff --git a/Tests/UnitTests/Core/Sample/ParticleDistributionTest.h b/Tests/UnitTests/Core/Sample/ParticleDistributionTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Sample/ParticleDistributionTest.h rename to Tests/UnitTests/Core/Sample/ParticleDistributionTest.cpp diff --git a/Tests/UnitTests/Core/Sample/ParticleLayoutTest.h b/Tests/UnitTests/Core/Sample/ParticleLayoutTest.cpp similarity index 99% rename from Tests/UnitTests/Core/Sample/ParticleLayoutTest.h rename to Tests/UnitTests/Core/Sample/ParticleLayoutTest.cpp index 4538e3edd51..38281eadd2c 100644 --- a/Tests/UnitTests/Core/Sample/ParticleLayoutTest.h +++ b/Tests/UnitTests/Core/Sample/ParticleLayoutTest.cpp @@ -6,6 +6,8 @@ #include "InterferenceFunctionNone.h" #include "ParticleLayout.h" #include "Particle.h" +#include "Units.h" +#include "MaterialFactoryFuncs.h" class ParticleLayoutTest : public ::testing::Test { diff --git a/Tests/UnitTests/Core/Sample/ParticleTest.h b/Tests/UnitTests/Core/Sample/ParticleTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Sample/ParticleTest.h rename to Tests/UnitTests/Core/Sample/ParticleTest.cpp diff --git a/Tests/UnitTests/Core/Sample/RTTest.h b/Tests/UnitTests/Core/Sample/RTTest.cpp similarity index 100% rename from Tests/UnitTests/Core/Sample/RTTest.h rename to Tests/UnitTests/Core/Sample/RTTest.cpp diff --git a/Tests/UnitTests/Core/Sample/testlist.h b/Tests/UnitTests/Core/Sample/testlist.h deleted file mode 100644 index 87915a10116..00000000000 --- a/Tests/UnitTests/Core/Sample/testlist.h +++ /dev/null @@ -1,22 +0,0 @@ -// To renew this file, run /G/ba/dev-tools/code-tools/update-gtestlist.py <directory> - -#include "FormFactorBasicTest.h" -#include "FormFactorCoherentSumTest.h" -#include "FormFactorSoftParticleTest.h" -#include "LayerTest.h" -#include "MultiLayerTest.h" -#include "RTTest.h" -#include "ParticleCoreShellTest.h" -#include "LayerRoughnessTest.h" -#include "ParticleTest.h" -#include "ParticleCompositionTest.h" -#include "ParticleLayoutTest.h" -#include "LayerInterfaceTest.h" -#include "ParticleDistributionTest.h" -#include "CrystalTest.h" -#include "MesoCrystalTest.h" -#include "INodeTest.h" -#include "Lattice2DTest.h" -#include "LatticeTest.h" -#include "LatticeUtilsTest.h" - diff --git a/Tests/UnitTests/Core/SimulationElement/DepthProbeElementTest.h b/Tests/UnitTests/Core/SimulationElement/DepthProbeElementTest.cpp similarity index 100% rename from Tests/UnitTests/Core/SimulationElement/DepthProbeElementTest.h rename to Tests/UnitTests/Core/SimulationElement/DepthProbeElementTest.cpp diff --git a/Tests/UnitTests/Core/SimulationElement/PolarizationHandlerTest.h b/Tests/UnitTests/Core/SimulationElement/PolarizationHandlerTest.cpp similarity index 100% rename from Tests/UnitTests/Core/SimulationElement/PolarizationHandlerTest.h rename to Tests/UnitTests/Core/SimulationElement/PolarizationHandlerTest.cpp diff --git a/Tests/UnitTests/Core/SimulationElement/SpecularSimulationElementTest.h b/Tests/UnitTests/Core/SimulationElement/SpecularSimulationElementTest.cpp similarity index 100% rename from Tests/UnitTests/Core/SimulationElement/SpecularSimulationElementTest.h rename to Tests/UnitTests/Core/SimulationElement/SpecularSimulationElementTest.cpp diff --git a/Tests/UnitTests/Core/SimulationElement/testlist.h b/Tests/UnitTests/Core/SimulationElement/testlist.h deleted file mode 100644 index 1ba77c36741..00000000000 --- a/Tests/UnitTests/Core/SimulationElement/testlist.h +++ /dev/null @@ -1,6 +0,0 @@ -// To renew this file, run /dev-tools/code-tools/update-gtestlist.py <directory> -// from BornAgain project directory - -#include "PolarizationHandler.h" -#include "SpecularSimulationElementTest.h" -#include "DepthProbeElementTest.h" diff --git a/Tests/UnitTests/Core/TestAll.cpp b/Tests/UnitTests/Core/TestAll.cpp new file mode 100644 index 00000000000..46186b6aa12 --- /dev/null +++ b/Tests/UnitTests/Core/TestAll.cpp @@ -0,0 +1,9 @@ +#include "google_test.h" + +int main(int argc, char** argv) +{ + ::testing::InitGoogleTest(&argc, argv); + + // run all google tests + return RUN_ALL_TESTS(); +} diff --git a/Tests/UnitTests/Fit/CMakeLists.txt b/Tests/UnitTests/Fit/CMakeLists.txt index 645de418b21..0f1543d2254 100644 --- a/Tests/UnitTests/Fit/CMakeLists.txt +++ b/Tests/UnitTests/Fit/CMakeLists.txt @@ -3,7 +3,6 @@ ############################################################################ set(test UnitTestFit) -set(libs BornAgainCore BornAgainFit) if(POLICY CMP0020) cmake_policy(SET CMP0020 NEW) diff --git a/Tests/UnitTests/utilities/FormFactorTest.cpp b/Tests/UnitTests/utilities/FormFactorTest.cpp new file mode 100644 index 00000000000..f74a7c0b2e5 --- /dev/null +++ b/Tests/UnitTests/utilities/FormFactorTest.cpp @@ -0,0 +1,40 @@ +#include "FormFactorTest.h" + +namespace TestData{ + +const complex_t I(0,1); + +auto qlist = testing::Combine( + testing::Values( + cvector_t({ 1, 0, 0 }), + cvector_t({ 0, 1, 0 }), + cvector_t({ 0, 0, 1 }), + cvector_t({ 1, 1, 0 }), + cvector_t({ 1, 0, 1 }), + cvector_t({ 1, 0, 1 }), + cvector_t({ 1, 1, 1 }) + ), + testing::Values( + cvector_t({ 1, 0, 0 }), + cvector_t({ 0, 1, 0 }), + cvector_t({ 0, 0, 1 }), + cvector_t({ 1, 1, 0 }), + cvector_t({ 1, 0, 1 }), + cvector_t({ 1, 0, 1 }), + cvector_t({ 1, 1, 1 }) + ), + testing::Values( + 1e-19, 1e-17, 1e-15, 1e-13, 1e-11, 1e-9, 1e-7, 1e-5, 1e-4, 1e-3, 1e-2, .1, + 1., 1e1, 1e2, 1e3, 1e4 ), + testing::Values( + -1e-15, +1e-14, -1e-13*I, +1e-12*I, + -1e-11, +1e-10, -1e-9*I, +1e-8*I, + -1e-7, +1e-6, -1e-5*I, +1e-4*I, + -1e-3, +1e-2, -1e-1*I, +1e-1*I, + .9, -.99, .999, -.9999 ) + ); + +} + +FormFactorTest::~FormFactorTest() = default; +ParamGenerator<std::tuple<cvector_t, cvector_t, double, complex_t>> FormFactorTest::gen = TestData::qlist; diff --git a/Tests/UnitTests/utilities/FormFactorTest.h b/Tests/UnitTests/utilities/FormFactorTest.h index 9d6369a78b8..9e048e49e8b 100644 --- a/Tests/UnitTests/utilities/FormFactorTest.h +++ b/Tests/UnitTests/utilities/FormFactorTest.h @@ -8,42 +8,6 @@ using ::testing::Values; using ::testing::internal::ParamGenerator; using ::testing::Combine; -namespace TestData{ - -const complex_t I(0,1); - -auto qlist = testing::Combine( - testing::Values( - cvector_t({ 1, 0, 0 }), - cvector_t({ 0, 1, 0 }), - cvector_t({ 0, 0, 1 }), - cvector_t({ 1, 1, 0 }), - cvector_t({ 1, 0, 1 }), - cvector_t({ 1, 0, 1 }), - cvector_t({ 1, 1, 1 }) - ), - testing::Values( - cvector_t({ 1, 0, 0 }), - cvector_t({ 0, 1, 0 }), - cvector_t({ 0, 0, 1 }), - cvector_t({ 1, 1, 0 }), - cvector_t({ 1, 0, 1 }), - cvector_t({ 1, 0, 1 }), - cvector_t({ 1, 1, 1 }) - ), - testing::Values( - 1e-19, 1e-17, 1e-15, 1e-13, 1e-11, 1e-9, 1e-7, 1e-5, 1e-4, 1e-3, 1e-2, .1, - 1., 1e1, 1e2, 1e3, 1e4 ), - testing::Values( - -1e-15, +1e-14, -1e-13*I, +1e-12*I, - -1e-11, +1e-10, -1e-9*I, +1e-8*I, - -1e-7, +1e-6, -1e-5*I, +1e-4*I, - -1e-3, +1e-2, -1e-1*I, +1e-1*I, - .9, -.99, .999, -.9999 ) - ); - -} - class FormFactorTest : public ::testing::Test { protected: @@ -72,6 +36,3 @@ protected: cvector_t m_q; static ParamGenerator<std::tuple<cvector_t, cvector_t, double, complex_t>> gen; }; - -FormFactorTest::~FormFactorTest() = default; -ParamGenerator<std::tuple<cvector_t, cvector_t, double, complex_t>> FormFactorTest::gen = TestData::qlist; -- GitLab