From f17835cee1b85d3cd2bc7c67277998e3604bb113 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 25 Nov 2021 14:49:23 +0100
Subject: [PATCH] no unit tests for trivial getters
---
Tests/Unit/Sample/FormFactorBasicTest.cpp | 51 -----------------------
auto/Wrap/doxygenDevice.i | 10 ++---
auto/Wrap/doxygenFit.i | 47 ++-------------------
3 files changed, 9 insertions(+), 99 deletions(-)
diff --git a/Tests/Unit/Sample/FormFactorBasicTest.cpp b/Tests/Unit/Sample/FormFactorBasicTest.cpp
index 5bdf9388173..2ee9b2a2655 100644
--- a/Tests/Unit/Sample/FormFactorBasicTest.cpp
+++ b/Tests/Unit/Sample/FormFactorBasicTest.cpp
@@ -83,10 +83,6 @@ TEST_F(FormFactorBasicTest, AnisoPyramid)
FormFactorAnisoPyramid particle(length, width, height, alpha);
EXPECT_DOUBLE_EQ(volume, particle.volume());
- EXPECT_EQ(length, particle.getLength());
- EXPECT_EQ(width, particle.getWidth());
- EXPECT_EQ(height, particle.getHeight());
- EXPECT_EQ(alpha, particle.getAlpha());
EXPECT_EQ(0., particle.bottomZ(RotationZ(.42)));
EXPECT_EQ(height, particle.topZ(RotationZ(.42)));
@@ -102,9 +98,6 @@ TEST_F(FormFactorBasicTest, HemiEllipsoid)
double volume = M_TWOPI * radiusx * radiusy * height / 3.;
FormFactorHemiEllipsoid particle(radiusx, radiusy, height);
- EXPECT_EQ(radiusx, particle.getRadiusX());
- EXPECT_EQ(radiusy, particle.getRadiusY());
- EXPECT_EQ(height, particle.getHeight());
EXPECT_DOUBLE_EQ(volume, particle.volume());
test_ff(&particle);
@@ -118,8 +111,6 @@ TEST_F(FormFactorBasicTest, Box)
double volume = length * height * width;
FormFactorBox particle(length, width, height);
- EXPECT_EQ(width, particle.getWidth());
- EXPECT_EQ(height, particle.getHeight());
EXPECT_EQ(3., particle.radialExtension());
EXPECT_DOUBLE_EQ(volume, particle.volume());
@@ -146,9 +137,6 @@ TEST_F(FormFactorBasicTest, Cone)
* (1. - (1. - HdivRtga) * (1. - HdivRtga) * (1. - HdivRtga));
FormFactorCone particle(radius, height, alpha);
- EXPECT_EQ(radius, particle.getRadius());
- EXPECT_EQ(height, particle.getHeight());
- EXPECT_EQ(alpha, particle.getAlpha());
EXPECT_DOUBLE_EQ(volume, particle.volume());
EXPECT_EQ(0., particle.bottomZ(RotationZ(.42)));
EXPECT_EQ(height, particle.topZ(RotationZ(.42)));
@@ -167,9 +155,6 @@ TEST_F(FormFactorBasicTest, Cone6)
* (1. - (1. - HdivRtga) * (1. - HdivRtga) * (1. - HdivRtga));
FormFactorCone6 particle(base_edge, height, alpha);
- EXPECT_EQ(base_edge, particle.getBaseEdge());
- EXPECT_EQ(height, particle.getHeight());
- EXPECT_EQ(alpha, particle.getAlpha());
EXPECT_DOUBLE_EQ(volume, particle.volume());
test_ff(&particle);
@@ -190,10 +175,6 @@ TEST_F(FormFactorBasicTest, Cuboctahedron)
- (1. - ratioH2divLtga) * (1. - ratioH2divLtga) * (1. - ratioH2divLtga));
FormFactorCuboctahedron particle(length, height, height_ratio, alpha);
- EXPECT_EQ(height, particle.getHeight());
- EXPECT_EQ(length, particle.getLength());
- EXPECT_EQ(height_ratio, particle.getHeightRatio());
- EXPECT_EQ(alpha, particle.getAlpha());
EXPECT_DOUBLE_EQ(volume, particle.volume());
EXPECT_EQ(0., particle.bottomZ(RotationZ(.42)));
EXPECT_EQ(height * (1 + height_ratio), particle.topZ(RotationZ(.42)));
@@ -208,8 +189,6 @@ TEST_F(FormFactorBasicTest, Cylinder)
double volume = M_PI * radius * radius * height;
FormFactorCylinder particle(radius, height);
- EXPECT_EQ(height, particle.getHeight());
- EXPECT_EQ(radius, particle.getRadius());
EXPECT_DOUBLE_EQ(volume, particle.volume());
EXPECT_EQ(0., particle.bottomZ(RotationZ(.42)));
@@ -238,7 +217,6 @@ TEST_F(FormFactorBasicTest, Dodecahedron)
double volume = (15 + 7 * sqrt(5)) / 4 * pow(edge, 3);
FormFactorDodecahedron particle(edge);
- EXPECT_EQ(edge, particle.getEdge());
EXPECT_DOUBLE_EQ(volume, particle.volume());
EXPECT_EQ(0., particle.bottomZ(RotationZ(.42)));
EXPECT_NEAR(2 * 1.11352 * edge, particle.topZ(RotationZ(.42)), 1e-4);
@@ -255,9 +233,6 @@ TEST_F(FormFactorBasicTest, EllipsoidalCylinder)
double volume = M_PI * radiusx * radiusy * height;
FormFactorEllipsoidalCylinder particle(radiusx, radiusy, height);
- EXPECT_EQ(height, particle.getHeight());
- EXPECT_EQ(radiusx, particle.getRadiusX());
- EXPECT_EQ(radiusy, particle.getRadiusY());
EXPECT_DOUBLE_EQ(volume, particle.volume());
EXPECT_EQ(0., particle.bottomZ(RotationZ(.42)));
EXPECT_EQ(height, particle.topZ(RotationZ(.42)));
@@ -272,9 +247,6 @@ TEST_F(FormFactorBasicTest, CantellatedCube)
double volume = L * L * L - 6 * L * t * t + 16 * t * t * t / 3;
FormFactorCantellatedCube particle(L, t);
-
- EXPECT_EQ(L, particle.getLength());
- EXPECT_DOUBLE_EQ(t, particle.getRemovedLength());
EXPECT_DOUBLE_EQ(particle.volume(), volume);
EXPECT_EQ(0., particle.bottomZ(RotationZ(.42)));
EXPECT_EQ(L, particle.topZ(RotationZ(.42)));
@@ -288,7 +260,6 @@ TEST_F(FormFactorBasicTest, FullSphere)
double volume = 4. / 3. * M_PI * radius * radius * radius;
FormFactorFullSphere particle(radius);
- EXPECT_EQ(radius, particle.getRadius());
EXPECT_DOUBLE_EQ(volume, particle.volume());
EXPECT_EQ(0., particle.bottomZ(RotationZ(.42)));
EXPECT_EQ(2 * radius, particle.topZ(RotationZ(.42)));
@@ -303,8 +274,6 @@ TEST_F(FormFactorBasicTest, FullSpheroid)
double volume = 2. / 3. * M_PI * radius * radius * height;
FormFactorFullSpheroid particle(radius, height);
- EXPECT_EQ(radius, particle.getRadius());
- EXPECT_EQ(height, particle.getHeight());
EXPECT_DOUBLE_EQ(volume, particle.volume());
EXPECT_EQ(0., particle.bottomZ(RotationZ(.42)));
EXPECT_EQ(height, particle.topZ(RotationZ(.42)));
@@ -318,7 +287,6 @@ TEST_F(FormFactorBasicTest, Icosahedron)
double volume = 5 * (3 + sqrt(5)) / 12 * pow(edge, 3);
FormFactorIcosahedron particle(edge);
- EXPECT_EQ(edge, particle.getEdge());
EXPECT_DOUBLE_EQ(volume, particle.volume());
EXPECT_EQ(0., particle.bottomZ(RotationZ(.42)));
EXPECT_NEAR(2 * 0.755761 * edge, particle.topZ(RotationZ(.42)), 1e-4);
@@ -334,8 +302,6 @@ TEST_F(FormFactorBasicTest, Prism3)
double volume = sqrt(3.) / 4. * height * base_edge * base_edge;
FormFactorPrism3 particle(base_edge, height);
- EXPECT_EQ(height, particle.getHeight());
- EXPECT_EQ(base_edge, particle.getBaseEdge());
EXPECT_DOUBLE_EQ(volume, particle.volume());
EXPECT_EQ(0., particle.bottomZ(RotationZ(.42)));
EXPECT_EQ(height, particle.topZ(RotationZ(.42)));
@@ -350,8 +316,6 @@ TEST_F(FormFactorBasicTest, Prism6)
double volume = 3. * sqrt(3.) / 2. * height * base_edge * base_edge;
FormFactorPrism6 particle(base_edge, height);
- EXPECT_EQ(height, particle.getHeight());
- EXPECT_EQ(base_edge, particle.getBaseEdge());
EXPECT_DOUBLE_EQ(volume, particle.volume());
EXPECT_EQ(0., particle.bottomZ(RotationZ(.42)));
EXPECT_EQ(height, particle.topZ(RotationZ(.42)));
@@ -370,9 +334,6 @@ TEST_F(FormFactorBasicTest, Pyramid)
* (1. - (1. - H2divLtga) * (1. - H2divLtga) * (1. - H2divLtga));
FormFactorPyramid particle(base_edge, height, alpha);
- EXPECT_EQ(height, particle.getHeight());
- EXPECT_EQ(base_edge, particle.getBaseEdge());
- EXPECT_EQ(alpha, particle.getAlpha());
EXPECT_DOUBLE_EQ(volume, particle.volume());
EXPECT_EQ(0., particle.bottomZ(RotationZ(.42)));
EXPECT_EQ(height, particle.topZ(RotationZ(.42)));
@@ -389,7 +350,6 @@ TEST_F(FormFactorBasicTest, TruncatedSphere)
* (3. * HdivR - 1. - (HdivR - 1.) * (HdivR - 1.) * (HdivR - 1.));
FormFactorTruncatedSphere particle(radius, height, 0);
- EXPECT_EQ(height, particle.getHeight());
EXPECT_DOUBLE_EQ(volume, particle.volume());
EXPECT_EQ(0., particle.bottomZ(RotationZ(.42)));
EXPECT_EQ(height, particle.topZ(RotationZ(.42)));
@@ -406,8 +366,6 @@ TEST_F(FormFactorBasicTest, TruncatedSpheroid)
M_PI * radius * height * height / flattening * (1. - height / (3. * flattening * radius));
FormFactorTruncatedSpheroid particle(radius, height, flattening, 0);
- EXPECT_EQ(height, particle.getHeight());
- EXPECT_EQ(radius, particle.getRadius());
EXPECT_DOUBLE_EQ(volume, particle.volume());
EXPECT_EQ(0., particle.bottomZ(RotationZ(.42)));
EXPECT_EQ(height, particle.topZ(RotationZ(.42)));
@@ -426,9 +384,6 @@ TEST_F(FormFactorBasicTest, Tetrahedron)
* (1. - (1. - sqrt3H2divLtga) * (1. - sqrt3H2divLtga) * (1. - sqrt3H2divLtga));
FormFactorTetrahedron particle(base_edge, height, alpha);
- EXPECT_EQ(height, particle.getHeight());
- EXPECT_EQ(base_edge, particle.getBaseEdge());
- EXPECT_EQ(alpha, particle.getAlpha());
EXPECT_DOUBLE_EQ(volume, particle.volume());
test_ff(&particle);
@@ -442,9 +397,6 @@ TEST_F(FormFactorBasicTest, CosineRippleBox)
double volume = 0.5 * height * width * length;
FormFactorCosineRippleBox particle(length, width, height);
- EXPECT_EQ(height, particle.getHeight());
- EXPECT_EQ(width, particle.getWidth());
- EXPECT_EQ(length, particle.getLength());
EXPECT_DOUBLE_EQ(volume, particle.volume());
EXPECT_EQ(0., particle.bottomZ(RotationZ(.42)));
EXPECT_EQ(height, particle.topZ(RotationZ(.42)));
@@ -459,8 +411,6 @@ TEST_F(FormFactorBasicTest, TruncatedCube)
double volume = length * length * length - 4. / 3. * t * t * t;
FormFactorTruncatedCube particle(length, t);
- EXPECT_EQ(length, particle.getLength());
- EXPECT_DOUBLE_EQ(t, particle.getRemovedLength());
EXPECT_DOUBLE_EQ(particle.volume(), volume);
EXPECT_EQ(0., particle.bottomZ(RotationZ(.42)));
EXPECT_EQ(length, particle.topZ(RotationZ(.42)));
@@ -477,7 +427,6 @@ TEST_F(FormFactorBasicTest, SawtoothRippleBox)
double volume = 0.5 * height * width * length;
FormFactorSawtoothRippleBox particle(length, width, height, d);
- EXPECT_EQ(height, particle.getHeight());
EXPECT_DOUBLE_EQ(volume, particle.volume());
EXPECT_EQ(0., particle.bottomZ(RotationZ(.42)));
EXPECT_EQ(height, particle.topZ(RotationZ(.42)));
diff --git a/auto/Wrap/doxygenDevice.i b/auto/Wrap/doxygenDevice.i
index dab20d929ed..b534397b798 100644
--- a/auto/Wrap/doxygenDevice.i
+++ b/auto/Wrap/doxygenDevice.i
@@ -2766,10 +2766,10 @@ Returns default units to convert to.
// File: namespace_0d55.xml
-// File: namespace_0d61.xml
+// File: namespace_0d62.xml
-// File: namespace_0d63.xml
+// File: namespace_0d66.xml
// File: namespaceDataUtils.xml
@@ -3146,9 +3146,6 @@ make Swappable
// File: OutputDataReadWriteINT_8h.xml
-// File: OutputDataReadWriteNicos_8cpp.xml
-
-
// File: OutputDataReadWriteNicos_8h.xml
@@ -3164,6 +3161,9 @@ make Swappable
// File: OutputDataReadWriteTiff_8h.xml
+// File: ReadNicos_8cpp.xml
+
+
// File: Instrument_8cpp.xml
diff --git a/auto/Wrap/doxygenFit.i b/auto/Wrap/doxygenFit.i
index 462e188bf6f..746f1f661e6 100644
--- a/auto/Wrap/doxygenFit.i
+++ b/auto/Wrap/doxygenFit.i
@@ -11883,40 +11883,10 @@ C++ includes: ClassicalTestFunctions.h
%feature("docstring") ROOT::Minuit2::sym "";
-// File: classTestMinimizer.xml
-%feature("docstring") TestMinimizer "
-
-A trivial minimizer that calls the objective function once. Used to test the whole chain.
-
-C++ includes: TestMinimizer.h
-";
-
-%feature("docstring") TestMinimizer::TestMinimizer "TestMinimizer::TestMinimizer()
-";
-
-%feature("docstring") TestMinimizer::~TestMinimizer "TestMinimizer::~TestMinimizer() override
-";
-
-%feature("docstring") TestMinimizer::minimizerName "std::string TestMinimizer::minimizerName() const override
-
-return name of the minimizer
-";
-
-%feature("docstring") TestMinimizer::algorithmName "std::string TestMinimizer::algorithmName() const override
-
-return name of the minimization algorithm
-";
-
-%feature("docstring") TestMinimizer::minimize_scalar "MinimizerResult TestMinimizer::minimize_scalar(fcn_scalar_t fcn, mumufit::Parameters parameters) override
-
-run minimization
-";
-
-
// File: classTestMinimizerPlan.xml
%feature("docstring") TestMinimizerPlan "
-Special plan to test TestMinimizer.
+Special plan to test TestMinimizer.
C++ includes: PlanCases.h
";
@@ -12565,13 +12535,13 @@ Retrieve the dimension of the function
// File: namespace_0d243.xml
-// File: namespace_0d251.xml
+// File: namespace_0d249.xml
-// File: namespace_0d260.xml
+// File: namespace_0d258.xml
-// File: namespace_0d273.xml
+// File: namespace_0d271.xml
// File: namespace_0d65.xml
@@ -14641,12 +14611,6 @@ Decaying sinus from lmfit tutorial.
// File: MinimizerResult_8h.xml
-// File: TestMinimizer_8cpp.xml
-
-
-// File: TestMinimizer_8h.xml
-
-
// File: AttLimits_8cpp.xml
@@ -14738,9 +14702,6 @@ Decaying sinus from lmfit tutorial.
%feature("docstring") TEST_F "TEST_F(Minimize, LevenbergMarquardtV3)
";
-%feature("docstring") TEST_F "TEST_F(Minimize, TestMinimizerV1)
-";
-
// File: PlanCases_8cpp.xml
--
GitLab