diff --git a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.cpp index 1d54229f2f79b293865ba84b3f03cd2854332471..5e67c2f9a18652aeb2dfdec8217fbe3f174e590e 100644 --- a/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.cpp +++ b/qt/scientific_interfaces/ISISReflectometry/GUI/MainWindow/MainWindowPresenter.cpp @@ -15,8 +15,8 @@ #include "MantidAPI/MatrixWorkspace.h" #include "MantidKernel/ConfigService.h" #include "MantidQtWidgets/Common/HelpWindow.h" -#include "MantidQtWidgets/Common/QtJSONUtils.h" #include "MantidQtWidgets/Common/ISlitCalculator.h" +#include "MantidQtWidgets/Common/QtJSONUtils.h" #include "Reduction/Batch.h" #include <QFileDialog> @@ -45,8 +45,8 @@ MainWindowPresenter::MainWindowPresenter( IMainWindowView *view, IMessageHandler *messageHandler, std::unique_ptr<ISlitCalculator> slitCalculator, std::unique_ptr<IBatchPresenterFactory> batchPresenterFactory) - : m_view(view), m_messageHandler(messageHandler), - m_instrument(), m_slitCalculator(std::move(slitCalculator)), + : m_view(view), m_messageHandler(messageHandler), m_instrument(), + m_slitCalculator(std::move(slitCalculator)), m_batchPresenterFactory(std::move(batchPresenterFactory)) { view->subscribe(this); for (auto *batchView : m_view->batches()) diff --git a/qt/scientific_interfaces/test/ISISReflectometry/MainWindow/MainWindowPresenterTest.h b/qt/scientific_interfaces/test/ISISReflectometry/MainWindow/MainWindowPresenterTest.h index b31333d7751bc5ed3707611ce43ad7e653310851..ba6c15a2d1e56cc8627eb7fccbc437f521bdc2c8 100644 --- a/qt/scientific_interfaces/test/ISISReflectometry/MainWindow/MainWindowPresenterTest.h +++ b/qt/scientific_interfaces/test/ISISReflectometry/MainWindow/MainWindowPresenterTest.h @@ -25,12 +25,12 @@ using namespace MantidQt::CustomInterfaces::ISISReflectometry:: ModelCreationHelper; using MantidQt::API::IConfiguredAlgorithm_sptr; using MantidQt::MantidWidgets::ISlitCalculator; -using testing::_; using testing::AtLeast; using testing::Mock; using testing::NiceMock; using testing::Return; using testing::ReturnRef; +using testing::_; class MainWindowPresenterTest : public CxxTest::TestSuite { public: @@ -158,7 +158,7 @@ public: void testShowOptionsOpensDialog() { auto presenter = makePresenter(); // TODO Add test when options dialog is impelemented - //EXPECT_CALL(*m_optionsDialog, show()).Times(1); + // EXPECT_CALL(*m_optionsDialog, show()).Times(1); presenter.notifyShowOptionsRequested(); verifyAndClear(); } @@ -332,7 +332,7 @@ private: } std::string setupInstrument(MainWindowPresenterFriend &presenter, - std::string const& instrumentName) { + std::string const &instrumentName) { presenter.m_instrument = boost::make_shared<Mantid::Geometry::Instrument>(instrumentName); return presenter.instrumentName(); @@ -405,7 +405,8 @@ private: } void expectSlitCalculatorInstrumentUpdated() { - EXPECT_CALL(*m_slitCalculator, setCurrentInstrumentName(instrument)).Times(1); + EXPECT_CALL(*m_slitCalculator, setCurrentInstrumentName(instrument)) + .Times(1); EXPECT_CALL(*m_slitCalculator, processInstrumentHasBeenChanged()).Times(1); }