From 3c4ab32feeb57f8c4bd082c8b047702ff52aedd9 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Fri, 10 Jun 2016 17:52:53 +0200
Subject: [PATCH] sectioning
---
Core/TestMachinery/FutestSuite.cpp | 21 ++++++++++++++-------
Core/TestMachinery/FutestSuite.h | 1 -
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/Core/TestMachinery/FutestSuite.cpp b/Core/TestMachinery/FutestSuite.cpp
index 9d2b78cea4e..2a44cc0f468 100644
--- a/Core/TestMachinery/FutestSuite.cpp
+++ b/Core/TestMachinery/FutestSuite.cpp
@@ -28,6 +28,10 @@
#include "FTDistributions.h"
#include "FutestSuite.h"
+// ************************************************************************** //
+// Test execution
+// ************************************************************************** //
+
//! Runs test (name given as command-line argument), and returns 0 for SUCCESS, or error code.
int FutestSuite::execute(int argc, char** argv) {
@@ -98,6 +102,10 @@ int FutestSuite::execute_subtests()
return number_of_failed_tests>0;
}
+// ************************************************************************** //
+// Callback functions, called from tests
+// ************************************************************************** //
+
//! Returns a form factor from the registry, for use in certain subtests.
IFormFactor* FutestSuite::getFormFactor() const
@@ -116,21 +124,20 @@ IFTDistribution2D* FutestSuite::getFTDistribution2D() const
return result->clone();
}
+// ************************************************************************** //
+// Functions called by getFutest() in *Suite.cpp
+// ************************************************************************** //
+
GISASSimulation* FutestSuite::getSimulation() const
{
SimulationFactory sim_registry;
GISASSimulation* result = sim_registry.createItem(m_info->m_simulation_name);
- result->setSampleBuilder(getSampleBuilder());
- return result;
-}
-
-std::shared_ptr<class ISampleBuilder> FutestSuite::getSampleBuilder() const
-{
SampleBuilderFactory sample_factory;
std::shared_ptr<class ISampleBuilder> sample_builder(
sample_factory.createItem(m_info->m_sample_builder_name) );
sample_builder->init_from(this);
- return sample_builder;
+ result->setSampleBuilder(sample_builder);
+ return result;
}
OutputData<double>* FutestSuite::getReferenceData() const
diff --git a/Core/TestMachinery/FutestSuite.h b/Core/TestMachinery/FutestSuite.h
index e2ab2e850f2..746789d9e85 100644
--- a/Core/TestMachinery/FutestSuite.h
+++ b/Core/TestMachinery/FutestSuite.h
@@ -48,7 +48,6 @@ public:
protected:
virtual class GISASSimulation* getSimulation() const;
- virtual std::shared_ptr<class ISampleBuilder> getSampleBuilder() const;
virtual OutputData<double>* getReferenceData() const;
std::string getReferenceFileName() const;
const class FutestInfo* getTestInfo() const { return m_info; }
--
GitLab