DistributionHandlerTest repaired.

Core/Algorithms/src/DistributionHandler.cpp

@@ -18,6 +18,7 @@
 DistributionHandler::DistributionHandler()
 : m_nbr_combinations(1)
 {
+    setName("DistributionHandler");
 }
 
 DistributionHandler::~DistributionHandler()

Tests/UnitTests/TestCore/DistributionHandlerTest.h

@@ -3,32 +3,41 @@
 
 #include "DistributionHandler.h"
 #include "Distributions.h"
+#include "ParameterPool.h"
 #include <cmath>
 
 class DistributionHandlerTest : public ::testing::Test
 {
-
 protected:
-   DistributionHandlderTest(){}
+    DistributionHandlerTest() : m_value(99.0) {}
     virtual ~DistributionHandlerTest(){}
+    double m_value;
 };
 
 TEST_F(DistributionHandlerTest, DistributionHandlerConstructor)
 {
-    DistributionHandler handler();
+    DistributionHandler handler;
     DistributionGate distribution(1.0, 2.0);
-    std::string paraName = 'DistributionGate';
-    EXPECT_EQ(0, handler.getTotalNumberOfSamples());
-    handler().addParameterDistribution(paraName, distribution, 1.0, 1.0);
+    std::string paraName = "value";
     EXPECT_EQ(1, handler.getTotalNumberOfSamples());
-    EXPECT_EQ("",handler.getName());
-    std::vector distributions = handler.getDistributions();
-    DistributionGate distribution1 = distributions[0];
-    EXPECT_EQ(distribution1.getMax(), distribution.getMax());
-    EXPECT_EQ(distribution1.getMin(), distribution.getMin());
-    EXPECT_EQ(distribution1.getMean(), distribution.getMean());
-    EXPECT_EQ(distribution1.getName(), distribution.getName());
+    handler.addParameterDistribution(paraName, distribution, 2.0, 1.0);
+    EXPECT_EQ(2, handler.getTotalNumberOfSamples());
+    EXPECT_EQ("DistributionHandler",handler.getName());
+
+    const DistributionHandler::Distributions_t &distr = handler.getDistributions();
+    ParameterDistribution distribution1 = distr[0];
+    EXPECT_EQ(distribution1.getName(), "ParameterDistribution");
+    EXPECT_EQ(distribution1.getNbrSamples(),2);
+    EXPECT_EQ(distribution1.getSigmaFactor(), 1);
+
+    ParameterPool* parameterPool = new ParameterPool();
+    parameterPool->registerParameter("value",&m_value);
+    handler.setParameterValues(parameterPool, 0);
+    EXPECT_EQ(m_value, 1.0);
+    handler.setParameterValues(parameterPool, 1);
+    EXPECT_EQ(m_value, 2.0);
 
+    delete parameterPool;
 }
 
 

Tests/UnitTests/TestCore/LatticeBasisTest.h

@@ -25,17 +25,8 @@ TEST_F(LatticeBasisTest, LatticeBasisDefaultConstructor)
     std::vector<kvector_t > positions;
     positions.push_back(kvector_t(0.0,0.0,0.0));
     EXPECT_EQ("LatticeBasis",lb->getName());
-    lb->addParticle(particle, positions);
-    EXPECT_EQ(particle.getMaterial(),lb->getParticle(0)->getAmbientMaterial());
-    EXPECT_EQ(particle.getName(),lb->getParticle(0)->getName());
-    EXPECT_EQ(particle.getTransform3D(),lb->getParticle(0)->getTransform3D());
-    EXPECT_EQ(positions, lb->getParticlePositions(0));
-
-    HomogeneousMaterial material("Air",0.0,0.0);
-    lb->setAmbientMaterial(material);
-    EXPECT_EQ("Air", lb->getAmbientMaterial()->getName());
-    EXPECT_EQ(1.0, lb->getAmbientMaterial()->getRefractiveIndex());
-
+    EXPECT_EQ(0, lb->getAmbientMaterial());
+    EXPECT_EQ(0, lb->getNbrParticles());
 
     delete lb;
 

Tests/UnitTests/TestCore/main.cpp

@@ -8,6 +8,7 @@
 #include "CVectorTest.h"
 #include "DetectorTest.h"
 #include "DistributionsTest.h"
+#include "DistributionHandlerTest.h"
 #include "DWBASimulationTest.h"
 #include "FormFactorTest.h"
 #include "InstrumentTest.h"