Skip to content
Snippets Groups Projects
Commit e66d7408 authored by Pospelov, Gennady's avatar Pospelov, Gennady
Browse files

GUIReferencedTest -> GUIStandardTest

parent 179309ad
No related branches found
No related tags found
No related merge requests found
...@@ -53,7 +53,7 @@ set(test_cases ...@@ -53,7 +53,7 @@ set(test_cases
ConesWithLimitsDistribution ConesWithLimitsDistribution
) )
add_executable(GUIStandardTest main.cpp GUIReferencedTest.cpp GUIReferencedTest.h ) add_executable(GUIStandardTest main.cpp GUIStandardTest.cpp GUIStandardTest.h )
target_link_libraries(GUIStandardTest BornAgainCore BornAgainGUI BornAgainTestMachinery) target_link_libraries(GUIStandardTest BornAgainCore BornAgainGUI BornAgainTestMachinery)
qt5_use_modules(GUIStandardTest Widgets Core Gui Designer PrintSupport Network) qt5_use_modules(GUIStandardTest Widgets Core Gui Designer PrintSupport Network)
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// //
// BornAgain: simulate and fit scattering at grazing incidence // BornAgain: simulate and fit scattering at grazing incidence
// //
//! @file Tests/Functional/GUI/GUIStandardTest/GUIReferencedTest.cpp //! @file Tests/Functional/GUI/GUIStandardTest/GUIStandardTest.cpp
//! @brief Implements class GUIReferencedTest //! @brief Implements class GUIStandardTest
//! //!
//! @homepage http://www.bornagainproject.org //! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING) //! @license GNU General Public License v3 or higher (see COPYING)
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
// //
// ************************************************************************** // // ************************************************************************** //
#include "GUIReferencedTest.h" #include "GUIStandardTest.h"
#include "DocumentModel.h" #include "DocumentModel.h"
#include "DomainSimulationBuilder.h" #include "DomainSimulationBuilder.h"
#include "GISASSimulation.h" #include "GISASSimulation.h"
...@@ -25,20 +25,20 @@ ...@@ -25,20 +25,20 @@
#include "MaterialSvc.h" #include "MaterialSvc.h"
#include "SampleModel.h" #include "SampleModel.h"
GUIReferencedTest::GUIReferencedTest(const std::string &name, const std::string &description, GUIStandardTest::GUIStandardTest(const std::string &name, const std::string &description,
GISASSimulation *reference_simulation, double threshold) GISASSimulation *reference_simulation, double threshold)
: IReferencedTest(name, description, threshold) : IReferencedTest(name, description, threshold)
, m_reference_simulation(reference_simulation) , m_reference_simulation(reference_simulation)
, m_domain_simulation(nullptr) , m_domain_simulation(nullptr)
{} {}
GUIReferencedTest::~GUIReferencedTest() GUIStandardTest::~GUIStandardTest()
{ {
delete m_reference_simulation; delete m_reference_simulation;
delete m_domain_simulation; delete m_domain_simulation;
} }
bool GUIReferencedTest::runTest() bool GUIStandardTest::runTest()
{ {
if (!m_reference_simulation) if (!m_reference_simulation)
throw Exceptions::NullPointerException( throw Exceptions::NullPointerException(
...@@ -57,7 +57,7 @@ bool GUIReferencedTest::runTest() ...@@ -57,7 +57,7 @@ bool GUIReferencedTest::runTest()
} }
//! returns new simulation from //! returns new simulation from
void GUIReferencedTest::createDomainSimulation() void GUIStandardTest::createDomainSimulation()
{ {
assert(m_reference_simulation->sample()); assert(m_reference_simulation->sample());
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// //
// BornAgain: simulate and fit scattering at grazing incidence // BornAgain: simulate and fit scattering at grazing incidence
// //
//! @file Tests/Functional/GUI/GUIStandardTest/GUIReferencedTest.h //! @file Tests/Functional/GUI/GUIStandardTest/GUIStandardTest.h
//! @brief Defines class GUIReferencedTest //! @brief Defines class GUIStandardTest
//! //!
//! @homepage http://www.bornagainproject.org //! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING) //! @license GNU General Public License v3 or higher (see COPYING)
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
// //
// ************************************************************************** // // ************************************************************************** //
#ifndef GUIREFERENCEDTEST_H #ifndef GUISTANDARDTEST_H
#define GUIREFERENCEDTEST_H #define GUISTANDARDTEST_H
#include "IReferencedTest.h" #include "IReferencedTest.h"
#include "OutputData.h" #include "OutputData.h"
...@@ -27,12 +27,12 @@ class GISASSimulation; ...@@ -27,12 +27,12 @@ class GISASSimulation;
//! and compares results. //! and compares results.
//! Invoked by GUIStandardTest. //! Invoked by GUIStandardTest.
class GUIReferencedTest : public IReferencedTest class GUIStandardTest : public IReferencedTest
{ {
public: public:
GUIReferencedTest(const std::string& name, const std::string& description, GUIStandardTest(const std::string& name, const std::string& description,
GISASSimulation* reference_simulation, double threshold); GISASSimulation* reference_simulation, double threshold);
virtual ~GUIReferencedTest(); virtual ~GUIStandardTest();
bool runTest() final; bool runTest() final;
...@@ -43,4 +43,4 @@ private: ...@@ -43,4 +43,4 @@ private:
GISASSimulation* m_domain_simulation; GISASSimulation* m_domain_simulation;
}; };
#endif // GUIREFERENCEDTEST_H #endif // GUISTANDARDTEST_H
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
// ************************************************************************** // // ************************************************************************** //
#include "TestService.h" #include "TestService.h"
#include "GUIReferencedTest.h" #include "GUIStandardTest.h"
//! Runs GUITest on a standard simulation indicated by argv[1]. //! Runs GUITest on a standard simulation indicated by argv[1].
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
return TestService<GUIReferencedTest>().execute(argc, argv) ? 0 : 1; return TestService<GUIStandardTest>().execute(argc, argv) ? 0 : 1;
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment