Fix problems in tests after rebase with main

Author: adriazalvarez

qt/scientific_interfaces/Inelastic/test/Processor/ElwinModelTest.h

@@ -101,10 +101,6 @@ class ElwinModelTest : public CxxTest::TestSuite {
     m_model->setOutputWorkspaceNames(wsBaseName);
     auto const elwinAlg = m_model->setupElasticWindowMultiple("Workspace_name_sqw", "sampleLogName", "sampleLogValue");
     batch.setQueue(std::deque<MantidQt::API::IConfiguredAlgorithm_sptr>{elwinAlg});
-
-    m_model->setOutputWorkspaceNames(wsBaseName);
-    m_model->setupElasticWindowMultiple(&batch, "Workspace_name_sqw", "sampleLogName", "sampleLogValue");
-
     batch.executeBatch();
 
     ITableWorkspace_sptr outputWS =

qt/scientific_interfaces/Inelastic/test/QENSFitting/MockObjects.h

@@ -491,7 +491,7 @@ class MockElwinModel : public IElwinModel {
   MOCK_CONST_METHOD2(setupGroupAlgorithm,
                      MantidQt::API::IConfiguredAlgorithm_sptr(std::string const &inputWorkspacesString,
                                                               std::string const &inputGroupWsName));
-  MOCK_METHOD4(setupElasticWindowMultiple,
+  MOCK_METHOD3(setupElasticWindowMultiple,
                MantidQt::API::IConfiguredAlgorithm_sptr(std::string const &inputGroupWsName,
                                                         std::string const &sampleEnvironmentLogName,
                                                         std::string const &sampleEnvironmentLogValue));