From 5876a77520a59e9f285af079ba99e3c283d8ea9b Mon Sep 17 00:00:00 2001
From: Steven Hahn <hahnse@ornl.gov>
Date: Wed, 22 Jun 2016 11:13:52 -0400
Subject: [PATCH] Suppress remaining -Wsuggest-override warnings.
---
.../API/test/FunctionParameterDecoratorTest.h | 11 +++++----
Framework/API/test/ILiveListenerTest.h | 5 +++-
...plicitFunctionParameterParserFactoryTest.h | 7 +++---
Framework/API/test/ModeratorModelTest.h | 3 +++
Framework/API/test/WorkspaceGroupTest.h | 10 ++++----
.../test/MCAbsorptionStrategyTest.h | 5 +++-
.../test/MaxEnt/MaxentCalculatorTest.h | 5 ++--
Framework/Algorithms/test/MonteCarloTesting.h | 3 +++
.../DataObjects/test/MDBoxIteratorTest.h | 15 ++++++++----
Framework/DataObjects/test/MDGridBoxTest.h | 23 +++++++++++--------
Framework/DataObjects/test/MockObjects.h | 4 ++--
Framework/Geometry/test/BasicHKLFiltersTest.h | 6 +++--
.../Geometry/test/BraggScattererFactoryTest.h | 5 ++--
.../BraggScattererInCrystalStructureTest.h | 4 +++-
Framework/Geometry/test/BraggScattererTest.h | 6 ++---
.../test/CompositeImplicitFunctionTest.h | 3 +++
.../test/InstrumentDefinitionParserTest.h | 11 +++++----
.../Geometry/test/MDGeometryXMLBuilderTest.h | 3 +++
.../Geometry/test/PeakTransformSelectorTest.h | 5 +++-
.../Geometry/test/SpaceGroupFactoryTest.h | 9 ++++----
.../test/StructureFactorCalculatorTest.h | 5 +++-
.../test/SymmetryElementFactoryTest.h | 6 +++--
Framework/Geometry/test/SymmetryElementTest.h | 8 ++++---
Framework/Kernel/test/MDUnitFactoryTest.h | 12 +++++-----
.../Kernel/test/NDRandomNumberGeneratorTest.h | 7 +++---
Framework/Kernel/test/TypedValidatorTest.h | 5 ++--
Framework/Kernel/test/UserCatalogInfoTest.h | 8 +++----
Framework/MDAlgorithms/test/BinMDTest.h | 12 +++++-----
.../MDAlgorithms/test/BinaryOperationMDTest.h | 7 ++++--
.../test/BooleanBinaryOperationMDTest.h | 6 ++---
.../MDAlgorithms/test/UnaryOperationMDTest.h | 5 +++-
.../inc/MantidTestHelpers/FakeGmockObjects.h | 5 ++--
.../test/ALCPeakFittingPresenterTest.h | 7 ++++--
.../test/ReflMeasureTransferStrategyTest.h | 4 +++-
.../ProgressableViewMockObject.h | 4 +++-
.../test/ConcretePeaksPresenterVsiTest.h | 17 +++++++-------
.../test/MDEWInMemoryLoadingPresenterTest.h | 7 ++++--
.../test/MDHWInMemoryLoadingPresenterTest.h | 7 ++++--
.../test/VatesKnowledgeSerializerTest.h | 18 ++++++++-------
Vates/VatesAPI/test/vtkDataSetFactoryTest.h | 19 ++++++++-------
.../vtkDataSetToPeaksFilteredDataSetTest.h | 23 ++++++++++---------
41 files changed, 206 insertions(+), 129 deletions(-)
diff --git a/Framework/API/test/FunctionParameterDecoratorTest.h b/Framework/API/test/FunctionParameterDecoratorTest.h
index 19126c2f4ca..73bd60384bf 100644
--- a/Framework/API/test/FunctionParameterDecoratorTest.h
+++ b/Framework/API/test/FunctionParameterDecoratorTest.h
@@ -3,17 +3,16 @@
#include <cxxtest/TestSuite.h>
-#include "MantidAPI/FunctionParameterDecorator.h"
#include "MantidAPI/CompositeFunction.h"
-#include "MantidAPI/ParamFunction.h"
#include "MantidAPI/FunctionFactory.h"
+#include "MantidAPI/FunctionParameterDecorator.h"
+#include "MantidAPI/ParamFunction.h"
#include "MantidAPI/WorkspaceGroup.h"
#include "MantidKernel/Exception.h"
-
+#include "MantidKernel/WarningSuppressions.h"
#include <boost/make_shared.hpp>
-
-#include <gtest/gtest.h>
#include <gmock/gmock.h>
+#include <gtest/gtest.h>
using namespace Mantid::API;
using namespace Mantid::Kernel;
@@ -432,7 +431,9 @@ private:
class MockTestableFunctionParameterDecorator
: public TestableFunctionParameterDecorator {
public:
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_METHOD1(beforeDecoratedFunctionSet, void(const IFunction_sptr &));
+ GCC_DIAG_ON_SUGGEST_OVERRIDE
};
};
diff --git a/Framework/API/test/ILiveListenerTest.h b/Framework/API/test/ILiveListenerTest.h
index c6a43ac99fd..05e2e5f4262 100644
--- a/Framework/API/test/ILiveListenerTest.h
+++ b/Framework/API/test/ILiveListenerTest.h
@@ -1,10 +1,11 @@
#ifndef ILIVELISTENER_TEST_H_
#define ILIVELISTENER_TEST_H_
+#include "MantidAPI/ILiveListener.h"
+#include "MantidKernel/WarningSuppressions.h"
#include <cxxtest/TestSuite.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
-#include "MantidAPI/ILiveListener.h"
using namespace Mantid::API;
@@ -14,6 +15,7 @@ public:
// Set this flag to true for testing
m_dataReset = true;
}
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD0(name, std::string());
MOCK_CONST_METHOD0(supportsHistory, bool());
MOCK_CONST_METHOD0(buffersEvents, bool());
@@ -23,6 +25,7 @@ public:
MOCK_METHOD0(isConnected, bool());
MOCK_METHOD0(runStatus, RunStatus());
MOCK_CONST_METHOD0(runNumber, int());
+ GCC_DIAG_ON_SUGGEST_OVERRIDE
};
class ILiveListenerTest : public CxxTest::TestSuite {
diff --git a/Framework/API/test/ImplicitFunctionParameterParserFactoryTest.h b/Framework/API/test/ImplicitFunctionParameterParserFactoryTest.h
index 1e0b1ae8bd5..faf0dc99c37 100644
--- a/Framework/API/test/ImplicitFunctionParameterParserFactoryTest.h
+++ b/Framework/API/test/ImplicitFunctionParameterParserFactoryTest.h
@@ -4,9 +4,10 @@
#include <cxxtest/TestSuite.h>
#include <vector>
+#include "MantidAPI/ImplicitFunctionParameterParser.h"
#include "MantidAPI/ImplicitFunctionParameterParserFactory.h"
#include "MantidKernel/ConfigService.h"
-#include "MantidAPI/ImplicitFunctionParameterParser.h"
+#include "MantidKernel/WarningSuppressions.h"
#include <boost/shared_ptr.hpp>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
@@ -16,11 +17,11 @@ private:
class MockImplicitFunctionParameter
: public Mantid::API::ImplicitFunctionParameter {
public:
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD0(getName, std::string());
MOCK_CONST_METHOD0(isValid, bool());
MOCK_CONST_METHOD0(toXMLString, std::string());
- ~MockImplicitFunctionParameter() override {}
-
+ GCC_DIAG_ON_SUGGEST_OVERRIDE
protected:
ImplicitFunctionParameter *clone() const override {
return new MockImplicitFunctionParameter;
diff --git a/Framework/API/test/ModeratorModelTest.h b/Framework/API/test/ModeratorModelTest.h
index e8c1c839231..3796f487eaf 100644
--- a/Framework/API/test/ModeratorModelTest.h
+++ b/Framework/API/test/ModeratorModelTest.h
@@ -2,6 +2,7 @@
#define MANTID_API_MODERATORMODELTEST_H_
#include "MantidAPI/ModeratorModel.h"
+#include "MantidKernel/WarningSuppressions.h"
#include <cxxtest/TestSuite.h>
#include <gmock/gmock.h>
@@ -12,11 +13,13 @@ public:
boost::shared_ptr<ModeratorModel> clone() const override {
return boost::shared_ptr<MockModerator>();
}
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD0(emissionTimeMean, double());
MOCK_CONST_METHOD0(emissionTimeVariance, double());
MOCK_CONST_METHOD1(sampleTimeDistribution, double(const double));
MOCK_METHOD2(setParameterValue,
void(const std::string &, const std::string &));
+ GCC_DIAG_ON_SUGGEST_OVERRIDE
};
class ModeratorModelTest : public CxxTest::TestSuite {
diff --git a/Framework/API/test/WorkspaceGroupTest.h b/Framework/API/test/WorkspaceGroupTest.h
index cad98e9c4ad..fa75cf61fde 100644
--- a/Framework/API/test/WorkspaceGroupTest.h
+++ b/Framework/API/test/WorkspaceGroupTest.h
@@ -1,11 +1,12 @@
#ifndef MANTID_API_WORKSPACEGROUPTEST_H_
#define MANTID_API_WORKSPACEGROUPTEST_H_
+#include "MantidAPI/AnalysisDataService.h"
+#include "MantidAPI/WorkspaceGroup.h"
+#include "MantidKernel/Exception.h"
#include "MantidKernel/System.h"
#include "MantidKernel/Timer.h"
-#include "MantidKernel/Exception.h"
-#include "MantidAPI/WorkspaceGroup.h"
-#include "MantidAPI/AnalysisDataService.h"
+#include "MantidKernel/WarningSuppressions.h"
#include "MantidTestHelpers/FakeObjects.h"
#include "PropertyManagerHelper.h"
@@ -54,12 +55,13 @@ private:
// Helper type, representing some concrete workspace type.
class MockWorkspace : public Mantid::API::Workspace {
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD0(id, const std::string());
MOCK_CONST_METHOD0(name, const std::string());
MOCK_CONST_METHOD0(threadSafe, bool());
MOCK_CONST_METHOD0(toString, const std::string());
MOCK_CONST_METHOD0(getMemorySize, size_t());
-
+ GCC_DIAG_ON_SUGGEST_OVERRIDE
private:
MockWorkspace *doClone() const override {
throw std::runtime_error("Cloning of MockWorkspace is not implemented.");
diff --git a/Framework/Algorithms/test/MCAbsorptionStrategyTest.h b/Framework/Algorithms/test/MCAbsorptionStrategyTest.h
index a798141dc83..df0bea3bf0e 100644
--- a/Framework/Algorithms/test/MCAbsorptionStrategyTest.h
+++ b/Framework/Algorithms/test/MCAbsorptionStrategyTest.h
@@ -3,8 +3,9 @@
#include <cxxtest/TestSuite.h>
-#include "MantidAlgorithms/SampleCorrections/MCAbsorptionStrategy.h"
#include "MantidAlgorithms/SampleCorrections/IBeamProfile.h"
+#include "MantidAlgorithms/SampleCorrections/MCAbsorptionStrategy.h"
+#include "MantidKernel/WarningSuppressions.h"
#include "MonteCarloTesting.h"
using Mantid::Algorithms::MCAbsorptionStrategy;
@@ -64,8 +65,10 @@ private:
class MockBeamProfile final : public Mantid::Algorithms::IBeamProfile {
public:
using Mantid::Algorithms::IBeamProfile::Ray;
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD1(generatePoint,
Ray(Mantid::Kernel::PseudoRandomNumberGenerator &));
+ GCC_DIAG_ON_SUGGEST_OVERRIDE
};
MCAbsorptionStrategy createTestObject() {
diff --git a/Framework/Algorithms/test/MaxEnt/MaxentCalculatorTest.h b/Framework/Algorithms/test/MaxEnt/MaxentCalculatorTest.h
index 1b4264dc768..521b4bdeebc 100644
--- a/Framework/Algorithms/test/MaxEnt/MaxentCalculatorTest.h
+++ b/Framework/Algorithms/test/MaxEnt/MaxentCalculatorTest.h
@@ -7,12 +7,13 @@
#include "MantidAlgorithms/MaxEnt/MaxentCalculator.h"
#include "MantidAlgorithms/MaxEnt/MaxentEntropy.h"
#include "MantidAlgorithms/MaxEnt/MaxentTransform.h"
+#include "MantidKernel/WarningSuppressions.h"
using namespace Mantid::Algorithms;
using namespace testing;
class MockEntropy : public MaxentEntropy {
-
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
public:
MOCK_METHOD2(derivative,
std::vector<double>(const std::vector<double> &, double));
@@ -28,7 +29,7 @@ public:
MOCK_METHOD1(imageToData, std::vector<double>(const std::vector<double> &));
MOCK_METHOD1(dataToImage, std::vector<double>(const std::vector<double> &));
};
-
+GCC_DIAG_ON_SUGGEST_OVERRIDE
using MockEntropy_sptr = std::shared_ptr<MockEntropy>;
class MaxentCalculatorTest : public CxxTest::TestSuite {
diff --git a/Framework/Algorithms/test/MonteCarloTesting.h b/Framework/Algorithms/test/MonteCarloTesting.h
index 0dad299a150..26dd5a02aed 100644
--- a/Framework/Algorithms/test/MonteCarloTesting.h
+++ b/Framework/Algorithms/test/MonteCarloTesting.h
@@ -7,6 +7,7 @@
#include "MantidGeometry/Objects/ShapeFactory.h"
#include "MantidKernel/Material.h"
#include "MantidKernel/PseudoRandomNumberGenerator.h"
+#include "MantidKernel/WarningSuppressions.h"
#include "MantidTestHelpers/ComponentCreationHelper.h"
#include <gmock/gmock.h>
@@ -22,6 +23,7 @@ namespace MonteCarloTesting {
// -----------------------------------------------------------------------------
class MockRNG final : public Mantid::Kernel::PseudoRandomNumberGenerator {
public:
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_METHOD0(nextValue, double());
MOCK_METHOD2(nextValue, double(double, double));
MOCK_METHOD2(nextInt, int(int, int));
@@ -30,6 +32,7 @@ public:
MOCK_METHOD0(restore, void());
MOCK_METHOD1(setSeed, void(size_t));
MOCK_METHOD2(setRange, void(const double, const double));
+ GCC_DIAG_ON_SUGGEST_OVERRIDE
};
// -----------------------------------------------------------------------------
diff --git a/Framework/DataObjects/test/MDBoxIteratorTest.h b/Framework/DataObjects/test/MDBoxIteratorTest.h
index c9ecdafcbf6..07c0f3db319 100644
--- a/Framework/DataObjects/test/MDBoxIteratorTest.h
+++ b/Framework/DataObjects/test/MDBoxIteratorTest.h
@@ -1,19 +1,20 @@
#ifndef MANTID_DATAOBJECTS_MDBOXITERATORTEST_H_
#define MANTID_DATAOBJECTS_MDBOXITERATORTEST_H_
+#include "MantidDataObjects/MDBox.h"
+#include "MantidDataObjects/MDBoxIterator.h"
+#include "MantidDataObjects/MDEventFactory.h"
+#include "MantidDataObjects/MDGridBox.h"
#include "MantidGeometry/MDGeometry/MDBoxImplicitFunction.h"
#include "MantidGeometry/MDGeometry/MDImplicitFunction.h"
#include "MantidGeometry/MDGeometry/MDPlane.h"
#include "MantidKernel/System.h"
#include "MantidKernel/Timer.h"
-#include "MantidDataObjects/MDBoxIterator.h"
-#include "MantidDataObjects/MDEventFactory.h"
-#include "MantidDataObjects/MDGridBox.h"
-#include "MantidDataObjects/MDBox.h"
+#include "MantidKernel/WarningSuppressions.h"
#include "MantidTestHelpers/MDEventsTestHelper.h"
+#include <boost/math/special_functions/fpclassify.hpp>
#include <cxxtest/TestSuite.h>
#include <gmock/gmock.h>
-#include <boost/math/special_functions/fpclassify.hpp>
using namespace Mantid::DataObjects;
using namespace Mantid::API;
@@ -492,7 +493,9 @@ public:
pBC(MDBox<MDLeanEvent<2>, 2>::getBoxController())
{}
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD0(getIsMasked, bool());
+ GCC_DIAG_ON_SUGGEST_OVERRIDE
~MockMDBox() override { delete pBC; }
};
@@ -568,8 +571,10 @@ public:
/// Mock Skipping Policy Type to inject.
class MockSkippingPolicy : public SkippingPolicy {
public:
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD0(keepGoing, bool());
MOCK_METHOD0(Die, void());
+ GCC_DIAG_ON_SUGGEST_OVERRIDE
~MockSkippingPolicy() override { Die(); }
};
diff --git a/Framework/DataObjects/test/MDGridBoxTest.h b/Framework/DataObjects/test/MDGridBoxTest.h
index 846cc2bb792..816cd14597a 100644
--- a/Framework/DataObjects/test/MDGridBoxTest.h
+++ b/Framework/DataObjects/test/MDGridBoxTest.h
@@ -1,10 +1,16 @@
#ifndef MDGRIDBOXTEST_H
#define MDGRIDBOXTEST_H
+#include "MDBoxTest.h"
+#include "MantidAPI/BoxController.h"
+#include "MantidDataObjects/CoordTransformDistance.h"
+#include "MantidDataObjects/MDBox.h"
+#include "MantidDataObjects/MDGridBox.h"
+#include "MantidDataObjects/MDLeanEvent.h"
#include "MantidGeometry/MDGeometry/MDBoxImplicitFunction.h"
#include "MantidGeometry/MDGeometry/MDImplicitFunction.h"
-#include "MantidKernel/ConfigService.h"
#include "MantidKernel/CPUTimer.h"
+#include "MantidKernel/ConfigService.h"
#include "MantidKernel/Memory.h"
#include "MantidKernel/MultiThreaded.h"
#include "MantidKernel/ProgressText.h"
@@ -12,14 +18,9 @@
#include "MantidKernel/ThreadScheduler.h"
#include "MantidKernel/Timer.h"
#include "MantidKernel/Utils.h"
-#include "MantidAPI/BoxController.h"
-#include "MantidDataObjects/CoordTransformDistance.h"
-#include "MantidDataObjects/MDBox.h"
-#include "MantidDataObjects/MDLeanEvent.h"
-#include "MantidDataObjects/MDGridBox.h"
-#include <nexus/NeXusFile.hpp>
+#include "MantidKernel/WarningSuppressions.h"
#include "MantidTestHelpers/MDEventsTestHelper.h"
-#include "MDBoxTest.h"
+#include <Poco/File.h>
#include <boost/random/linear_congruential.hpp>
#include <boost/random/mersenne_twister.hpp>
#include <boost/random/uniform_int.hpp>
@@ -27,11 +28,11 @@
#include <boost/random/variate_generator.hpp>
#include <cmath>
#include <cxxtest/TestSuite.h>
+#include <gmock/gmock.h>
#include <map>
#include <memory>
-#include <Poco/File.h>
+#include <nexus/NeXusFile.hpp>
#include <vector>
-#include <gmock/gmock.h>
using namespace Mantid;
using namespace Mantid::Kernel;
@@ -50,10 +51,12 @@ private:
MockMDBox()
: MDBox<MDLeanEvent<1>, 1>(new API::BoxController(1)),
pBC(MDBox<MDLeanEvent<1>, 1>::getBoxController()) {}
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD0(getIsMasked, bool());
MOCK_METHOD0(mask, void());
MOCK_METHOD0(unmask, void());
~MockMDBox() override { delete pBC; }
+ GCC_DIAG_ON_SUGGEST_OVERRIDE
};
// the sp to a box controller used as general reference to all tested
diff --git a/Framework/DataObjects/test/MockObjects.h b/Framework/DataObjects/test/MockObjects.h
index 6544bf76ad1..9e271ecd35f 100644
--- a/Framework/DataObjects/test/MockObjects.h
+++ b/Framework/DataObjects/test/MockObjects.h
@@ -10,6 +10,8 @@
namespace Mantid {
namespace DataObjects {
+GCC_DIAG_OFF_SUGGEST_OVERRIDE
+
class MockPeakShapeFactory : public PeakShapeFactory {
public:
MOCK_CONST_METHOD1(create,
@@ -20,8 +22,6 @@ public:
~MockPeakShapeFactory() override {}
};
-GCC_DIAG_OFF_SUGGEST_OVERRIDE
-
class MockPeakShape : public Mantid::Geometry::PeakShape {
public:
MOCK_CONST_METHOD0(frame, Mantid::Kernel::SpecialCoordinateSystem());
diff --git a/Framework/Geometry/test/BasicHKLFiltersTest.h b/Framework/Geometry/test/BasicHKLFiltersTest.h
index 7295290c09a..ead68b6fa11 100644
--- a/Framework/Geometry/test/BasicHKLFiltersTest.h
+++ b/Framework/Geometry/test/BasicHKLFiltersTest.h
@@ -9,6 +9,8 @@
#include "MantidGeometry/Crystal/SpaceGroupFactory.h"
#include "MantidGeometry/Crystal/StructureFactorCalculator.h"
+#include "MantidKernel/WarningSuppressions.h"
+
#include <strstream>
using namespace Mantid::Geometry;
@@ -134,7 +136,7 @@ public:
TS_ASSERT(Mock::VerifyAndClearExpectations(mock.get()))
}
-
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
private:
class MockStructureFactorCalculator : public StructureFactorCalculator {
public:
@@ -142,5 +144,5 @@ private:
MOCK_CONST_METHOD1(getFSquared, double(const V3D &));
};
};
-
+GCC_DIAG_ON_SUGGEST_OVERRIDE
#endif /* MANTID_GEOMETRY_BASICHKLFILTERSTEST_H_ */
diff --git a/Framework/Geometry/test/BraggScattererFactoryTest.h b/Framework/Geometry/test/BraggScattererFactoryTest.h
index ee2cbfce29d..34737190bef 100644
--- a/Framework/Geometry/test/BraggScattererFactoryTest.h
+++ b/Framework/Geometry/test/BraggScattererFactoryTest.h
@@ -5,7 +5,7 @@
#include <gmock/gmock.h>
#include "MantidGeometry/Crystal/BraggScattererFactory.h"
-
+#include "MantidKernel/WarningSuppressions.h"
using namespace Mantid::Geometry;
using namespace Mantid::Kernel;
@@ -56,9 +56,10 @@ private:
~MockScatterer() override {}
std::string name() const override { return "MockScatterer"; }
-
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD0(clone, BraggScatterer_sptr());
MOCK_CONST_METHOD1(calculateStructureFactor, StructureFactor(const V3D &));
+ GCC_DIAG_ON_SUGGEST_OVERRIDE
};
};
diff --git a/Framework/Geometry/test/BraggScattererInCrystalStructureTest.h b/Framework/Geometry/test/BraggScattererInCrystalStructureTest.h
index f56bc67ceaa..e39b4093bc9 100644
--- a/Framework/Geometry/test/BraggScattererInCrystalStructureTest.h
+++ b/Framework/Geometry/test/BraggScattererInCrystalStructureTest.h
@@ -6,6 +6,7 @@
#include "MantidGeometry/Crystal/BraggScattererInCrystalStructure.h"
#include "MantidGeometry/Crystal/SpaceGroupFactory.h"
+#include "MantidKernel/WarningSuppressions.h"
using namespace Mantid::Geometry;
using namespace Mantid::Kernel;
@@ -111,11 +112,12 @@ private:
public:
MockBraggScatterer() : BraggScattererInCrystalStructure() {}
~MockBraggScatterer() override {}
-
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD0(name, std::string());
MOCK_CONST_METHOD0(clone, BraggScatterer_sptr());
MOCK_CONST_METHOD1(calculateStructureFactor, StructureFactor(const V3D &));
MOCK_METHOD1(afterScattererPropertySet, void(const std::string &));
+ GCC_DIAG_ON_SUGGEST_OVERRIDE
};
};
diff --git a/Framework/Geometry/test/BraggScattererTest.h b/Framework/Geometry/test/BraggScattererTest.h
index 557ea7db380..b3e80316e10 100644
--- a/Framework/Geometry/test/BraggScattererTest.h
+++ b/Framework/Geometry/test/BraggScattererTest.h
@@ -5,6 +5,7 @@
#include <gmock/gmock.h>
#include "MantidGeometry/Crystal/BraggScatterer.h"
+#include "MantidKernel/WarningSuppressions.h"
using namespace Mantid::Geometry;
using namespace Mantid::Kernel;
@@ -42,13 +43,12 @@ private:
class MockBraggScatterer : public BraggScatterer {
public:
- MockBraggScatterer() : BraggScatterer() {}
- ~MockBraggScatterer() override {}
-
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD0(name, std::string());
MOCK_CONST_METHOD0(clone, BraggScatterer_sptr());
MOCK_CONST_METHOD1(calculateStructureFactor, StructureFactor(const V3D &));
MOCK_METHOD1(afterScattererPropertySet, void(const std::string &));
+ GCC_DIAG_ON_SUGGEST_OVERRIDE
};
};
diff --git a/Framework/Geometry/test/CompositeImplicitFunctionTest.h b/Framework/Geometry/test/CompositeImplicitFunctionTest.h
index feb4ee5f7cc..cddd6e01f8b 100644
--- a/Framework/Geometry/test/CompositeImplicitFunctionTest.h
+++ b/Framework/Geometry/test/CompositeImplicitFunctionTest.h
@@ -8,6 +8,7 @@
#include <typeinfo>
#include "MantidGeometry/MDGeometry/CompositeImplicitFunction.h"
+#include "MantidKernel/WarningSuppresssions.h"
using namespace Mantid::Geometry;
@@ -17,9 +18,11 @@ private:
// composite.
class MockImplicitFunction : public Mantid::Geometry::MDImplicitFunction {
public:
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD0(toXMLString, std::string());
MOCK_CONST_METHOD0(getName, std::string());
MOCK_METHOD1(isPointContained, bool(const Mantid::coord_t *coords));
+ GCC_DIAG_ON_SUGGEST_OVERRIDE
bool isPointContained(const std::vector<Mantid::coord_t> &) override {
return true;
}
diff --git a/Framework/Geometry/test/InstrumentDefinitionParserTest.h b/Framework/Geometry/test/InstrumentDefinitionParserTest.h
index 99bf5bf47fe..8e3a1313f5f 100644
--- a/Framework/Geometry/test/InstrumentDefinitionParserTest.h
+++ b/Framework/Geometry/test/InstrumentDefinitionParserTest.h
@@ -1,15 +1,16 @@
#ifndef MANTID_GEOMETRY_INSTRUMENTDEFINITIONPARSERTEST_H_
#define MANTID_GEOMETRY_INSTRUMENTDEFINITIONPARSERTEST_H_
-#include <cxxtest/TestSuite.h>
#include "MantidGeometry/Instrument/InstrumentDefinitionParser.h"
+#include "MantidGeometry/Instrument/RectangularDetector.h"
+#include "MantidGeometry/Instrument/ReferenceFrame.h"
#include "MantidKernel/ChecksumHelper.h"
#include "MantidKernel/ConfigService.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/Strings.h"
-#include "MantidGeometry/Instrument/RectangularDetector.h"
-#include "MantidGeometry/Instrument/ReferenceFrame.h"
+#include "MantidKernel/WarningSuppressions.h"
#include "MantidTestHelpers/ScopedFileHelper.h"
+#include <cxxtest/TestSuite.h>
#include <gmock/gmock.h>
#include <boost/algorithm/string/replace.hpp>
@@ -21,7 +22,7 @@ using namespace testing;
using ScopedFileHelper::ScopedFile;
class InstrumentDefinitionParserTest : public CxxTest::TestSuite {
-
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
private:
/// Mock Type to act as IDF files.
class MockIDFObject : public Mantid::Geometry::IDFObject {
@@ -39,7 +40,7 @@ private:
MOCK_CONST_METHOD0(exists, bool());
MOCK_CONST_METHOD0(getParentDirectory, const Poco::Path());
};
-
+ GCC_DIAG_ON_SUGGEST_OVERRIDE
/**
Helper type to pass around related IDF environment information in a
collection.
diff --git a/Framework/Geometry/test/MDGeometryXMLBuilderTest.h b/Framework/Geometry/test/MDGeometryXMLBuilderTest.h
index bd836263d1d..f7259d93810 100644
--- a/Framework/Geometry/test/MDGeometryXMLBuilderTest.h
+++ b/Framework/Geometry/test/MDGeometryXMLBuilderTest.h
@@ -10,6 +10,7 @@
#include "MantidGeometry/MDGeometry/IMDDimension.h"
#include "MantidKernel/UnitLabel.h"
+#include "MantidKernel/WarningSuppressions.h"
#include <boost/functional/hash.hpp>
#include <boost/algorithm/string.hpp>
@@ -31,6 +32,7 @@ private:
/// dependency.
class MockIMDDimension : public Mantid::Geometry::IMDDimension {
public:
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD0(getName, std::string());
MOCK_CONST_METHOD0(getUnits, const Mantid::Kernel::UnitLabel());
MOCK_CONST_METHOD0(getDimensionId, std::string());
@@ -43,6 +45,7 @@ private:
MOCK_METHOD3(setRange, void(size_t nBins, coord_t min, coord_t max));
MOCK_CONST_METHOD0(getMDUnits, const Kernel::MDUnit &());
MOCK_CONST_METHOD0(getMDFrame, const Geometry::MDFrame &());
+ GCC_DIAG_ON_SUGGEST_OVERRIDE
};
static std::string createDimensionXMLString(unsigned int nbins, int min,
diff --git a/Framework/Geometry/test/PeakTransformSelectorTest.h b/Framework/Geometry/test/PeakTransformSelectorTest.h
index 5d1a8e0feae..efd0b68cb31 100644
--- a/Framework/Geometry/test/PeakTransformSelectorTest.h
+++ b/Framework/Geometry/test/PeakTransformSelectorTest.h
@@ -1,10 +1,11 @@
#ifndef MANTIDAPI_PEAKTRANSFORMSELECTOR_TEST_H_
#define MANTIDAPI_PEAKTRANSFORMSELECTOR_TEST_H_
-#include <cxxtest/TestSuite.h>
#include "MantidGeometry/Crystal/PeakTransform.h"
#include "MantidGeometry/Crystal/PeakTransformSelector.h"
+#include "MantidKernel/WarningSuppressions.h"
#include "MockObjects.h"
+#include <cxxtest/TestSuite.h>
using namespace Mantid::Geometry;
using namespace Mantid;
@@ -22,10 +23,12 @@ private:
enum { value = I };
public:
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD0(createDefaultTransform, PeakTransform_sptr());
MOCK_CONST_METHOD2(createTransform,
PeakTransform_sptr(const std::string &,
const std::string &));
+ GCC_DIAG_ON_SUGGEST_OVERRIDE
};
typedef MockPeakTransformFactoryType<0> MockPeakTransformFactory;
diff --git a/Framework/Geometry/test/SpaceGroupFactoryTest.h b/Framework/Geometry/test/SpaceGroupFactoryTest.h
index 06b2e928bf4..116d26bc27b 100644
--- a/Framework/Geometry/test/SpaceGroupFactoryTest.h
+++ b/Framework/Geometry/test/SpaceGroupFactoryTest.h
@@ -7,9 +7,10 @@
using ::testing::Return;
-#include "MantidGeometry/Crystal/SpaceGroupFactory.h"
-#include "MantidGeometry/Crystal/PointGroupFactory.h"
#include "MantidGeometry/Crystal/CyclicGroup.h"
+#include "MantidGeometry/Crystal/PointGroupFactory.h"
+#include "MantidGeometry/Crystal/SpaceGroupFactory.h"
+#include "MantidKernel/WarningSuppresssions.h"
using namespace Mantid::Geometry;
using Mantid::Kernel::V3D;
@@ -397,9 +398,9 @@ private:
MockSpaceGroupGenerator(size_t number, const std::string &hmSymbol,
const std::string &generatorInformation)
: AbstractSpaceGroupGenerator(number, hmSymbol, generatorInformation) {}
- ~MockSpaceGroupGenerator() override {}
-
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD0(generateGroup, Group_const_sptr());
+ GCC_DIAG_ON_SUGGEST_OVERRIDE
};
/* Testing TransformationSpaceGroupGenerator is a bit hard in the sense that
diff --git a/Framework/Geometry/test/StructureFactorCalculatorTest.h b/Framework/Geometry/test/StructureFactorCalculatorTest.h
index 72421449f71..07f26d2044b 100644
--- a/Framework/Geometry/test/StructureFactorCalculatorTest.h
+++ b/Framework/Geometry/test/StructureFactorCalculatorTest.h
@@ -5,8 +5,9 @@
#include <gtest/gtest.h>
#include <gmock/gmock.h>
-#include "MantidGeometry/Crystal/StructureFactorCalculator.h"
#include "MantidGeometry/Crystal/SpaceGroupFactory.h"
+#include "MantidGeometry/Crystal/StructureFactorCalculator.h"
+#include "MantidKernel/WarningSuppressions.h"
using namespace Mantid::Geometry;
using namespace Mantid::Kernel;
@@ -98,9 +99,11 @@ private:
*/
class MockStructureFactorCalculator : public StructureFactorCalculator {
public:
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD1(getF, StructureFactor(const V3D &hkl));
MOCK_METHOD1(crystalStructureSetHook,
void(const CrystalStructure &crystalStructure));
+ GCC_DIAG_ON_SUGGEST_OVERRIDE
};
};
diff --git a/Framework/Geometry/test/SymmetryElementFactoryTest.h b/Framework/Geometry/test/SymmetryElementFactoryTest.h
index 74a8017f832..521bdb6e3aa 100644
--- a/Framework/Geometry/test/SymmetryElementFactoryTest.h
+++ b/Framework/Geometry/test/SymmetryElementFactoryTest.h
@@ -5,8 +5,9 @@
#include <gmock/gmock.h>
#include <gtest/gtest.h>
-#include "MantidGeometry/Crystal/SymmetryElementFactory.h"
#include "MantidGeometry/Crystal/SpaceGroupFactory.h"
+#include "MantidGeometry/Crystal/SymmetryElementFactory.h"
+#include "MantidKernel/WarningSuppressions.h"
using namespace Mantid::Geometry;
using namespace Mantid::Kernel;
@@ -395,11 +396,12 @@ private:
class TestableSymmetryElementWithAxisGenerator
: public SymmetryElementWithAxisGenerator {
friend class SymmetryElementFactoryTest;
-
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD1(generateElement,
SymmetryElement_sptr(const SymmetryOperation &));
MOCK_CONST_METHOD1(canProcess, bool(const SymmetryOperation &));
MOCK_CONST_METHOD1(determineSymbol, std::string(const SymmetryOperation &));
+ GCC_DIAG_ON_SUGGEST_OVERRIDE
};
class TestableSymmetryElementRotationGenerator
diff --git a/Framework/Geometry/test/SymmetryElementTest.h b/Framework/Geometry/test/SymmetryElementTest.h
index 7c9905105f8..a6dab9ede8d 100644
--- a/Framework/Geometry/test/SymmetryElementTest.h
+++ b/Framework/Geometry/test/SymmetryElementTest.h
@@ -5,9 +5,10 @@
#include <gmock/gmock.h>
#include <gtest/gtest.h>
-#include "MantidGeometry/Crystal/SymmetryElement.h"
-#include "MantidGeometry/Crystal/SpaceGroupFactory.h"
#include "MantidGeometry/Crystal/PointGroupFactory.h"
+#include "MantidGeometry/Crystal/SpaceGroupFactory.h"
+#include "MantidGeometry/Crystal/SymmetryElement.h"
+#include "MantidKernel/WarningSuppressions.h"
using namespace Mantid::Geometry;
using namespace Mantid::Kernel;
@@ -158,7 +159,7 @@ public:
private:
class MockSymmetryElement : public SymmetryElement {
friend class SymmetryElementTest;
-
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
public:
MockSymmetryElement(const std::string &hmSymbol)
: SymmetryElement(hmSymbol) {}
@@ -174,6 +175,7 @@ private:
: SymmetryElementWithAxis(symbol, axis, translation) {}
MOCK_CONST_METHOD0(clone, SymmetryElement_sptr());
};
+ GCC_DIAG_ON_SUGGEST_OVERRIDE
};
#endif /* MANTID_GEOMETRY_SYMMETRYELEMENTTEST_H_ */
diff --git a/Framework/Kernel/test/MDUnitFactoryTest.h b/Framework/Kernel/test/MDUnitFactoryTest.h
index 8a3e05e7bf0..e3846529748 100644
--- a/Framework/Kernel/test/MDUnitFactoryTest.h
+++ b/Framework/Kernel/test/MDUnitFactoryTest.h
@@ -1,11 +1,12 @@
#ifndef MANTID_KERNEL_MDUNITFACTORYTEST_H_
#define MANTID_KERNEL_MDUNITFACTORYTEST_H_
-#include <cxxtest/TestSuite.h>
-#include <gmock/gmock.h>
-#include "MantidKernel/MDUnitFactory.h"
#include "MantidKernel/MDUnit.h"
+#include "MantidKernel/MDUnitFactory.h"
#include "MantidKernel/UnitLabelTypes.h"
+#include "MantidKernel/WarningSuppressions.h"
+#include <cxxtest/TestSuite.h>
+#include <gmock/gmock.h>
using namespace Mantid::Kernel;
using namespace testing;
@@ -13,13 +14,13 @@ using namespace testing;
/**
* Helper Mock MDUnit
*/
+GCC_DIAG_OFF_SUGGEST_OVERRIDE
class MockMDUnit : public MDUnit {
public:
MOCK_CONST_METHOD0(getUnitLabel, UnitLabel());
MOCK_CONST_METHOD1(canConvertTo, bool(const MDUnit &other));
MOCK_CONST_METHOD0(isQUnit, bool());
MOCK_CONST_METHOD0(clone, MDUnit *());
- ~MockMDUnit() override {}
};
/**
@@ -29,9 +30,8 @@ class MockMDUnitFactory : public MDUnitFactory {
public:
MOCK_CONST_METHOD1(createRaw, MDUnit *(const std::string &));
MOCK_CONST_METHOD1(canInterpret, bool(const std::string &));
- ~MockMDUnitFactory() override {}
};
-
+GCC_DIAG_ON_SUGGEST_OVERRIDE
class MDUnitFactoryTest : public CxxTest::TestSuite {
public:
// This pair of boilerplate methods prevent the suite being created statically
diff --git a/Framework/Kernel/test/NDRandomNumberGeneratorTest.h b/Framework/Kernel/test/NDRandomNumberGeneratorTest.h
index 1c1e1458b4e..1921d84bddc 100644
--- a/Framework/Kernel/test/NDRandomNumberGeneratorTest.h
+++ b/Framework/Kernel/test/NDRandomNumberGeneratorTest.h
@@ -1,8 +1,9 @@
#ifndef NDRandomNumberGeneratorTEST_H_
#define NDRandomNumberGeneratorTEST_H_
-#include <cxxtest/TestSuite.h>
#include "MantidKernel/NDRandomNumberGenerator.h"
+#include "MantidKernel/WarningSuppressions.h"
+#include <cxxtest/TestSuite.h>
#include <boost/scoped_ptr.hpp>
#include <gmock/gmock.h>
@@ -14,12 +15,12 @@ private:
class Mock3DRandomNumberGenerator
: public Mantid::Kernel::NDRandomNumberGenerator {
public:
- Mock3DRandomNumberGenerator()
- : Mantid::Kernel::NDRandomNumberGenerator(3) {}
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_METHOD0(generateNextPoint, void());
MOCK_METHOD0(restart, void());
MOCK_METHOD0(save, void());
MOCK_METHOD0(restore, void());
+ GCC_DIAG_ON_SUGGEST_OVERRIDE
};
public:
diff --git a/Framework/Kernel/test/TypedValidatorTest.h b/Framework/Kernel/test/TypedValidatorTest.h
index b2a7b52de9c..d8a48b03b4e 100644
--- a/Framework/Kernel/test/TypedValidatorTest.h
+++ b/Framework/Kernel/test/TypedValidatorTest.h
@@ -1,15 +1,16 @@
#ifndef MANTID_KERNEL_TYPEDVALIDATORTEST_H_
#define MANTID_KERNEL_TYPEDVALIDATORTEST_H_
-#include "MantidKernel/TypedValidator.h"
#include "MantidKernel/DataItem.h"
+#include "MantidKernel/TypedValidator.h"
+#include "MantidKernel/WarningSuppressions.h"
#include <cxxtest/TestSuite.h>
namespace {
#define DECLARE_TEST_VALIDATOR(ClassName, HeldType) \
class ClassName : public Mantid::Kernel::TypedValidator<HeldType> { \
public: \
- Mantid::Kernel::IValidator_sptr clone() const { \
+ Mantid::Kernel::IValidator_sptr clone() const override { \
return boost::make_shared<ClassName>(); \
} \
std::string checkValidity(const HeldType &) const { return ""; } \
diff --git a/Framework/Kernel/test/UserCatalogInfoTest.h b/Framework/Kernel/test/UserCatalogInfoTest.h
index 8f8c13c21c2..34d5d9680ae 100644
--- a/Framework/Kernel/test/UserCatalogInfoTest.h
+++ b/Framework/Kernel/test/UserCatalogInfoTest.h
@@ -1,9 +1,10 @@
#ifndef MANTID_KERNEL_USERCATALOGINFOTEST_H_
#define MANTID_KERNEL_USERCATALOGINFOTEST_H_
-#include <cxxtest/TestSuite.h>
#include "MantidKernel/ICatalogInfo.h"
#include "MantidKernel/UserCatalogInfo.h"
+#include "MantidKernel/WarningSuppressions.h"
+#include <cxxtest/TestSuite.h>
#include <gmock/gmock.h>
using namespace testing;
@@ -18,7 +19,7 @@ operator<<(std::basic_ostream<CharType, CharTrait> &out,
return out;
}
}
-
+GCC_DIAG_OFF_SUGGEST_OVERRIDE
using namespace Mantid::Kernel;
class MockCatalogConfigService : public CatalogConfigService {
public:
@@ -35,9 +36,8 @@ public:
MOCK_CONST_METHOD0(macPrefix, const std::string());
MOCK_CONST_METHOD0(linuxPrefix, const std::string());
MOCK_CONST_METHOD0(clone, ICatalogInfo *());
- ~MockICatalogInfo() override {}
};
-
+GCC_DIAG_ON_SUGGEST_OVERRIDE
// Adaptee
struct UserType {
std::string getString(const std::string &) const { return "my_value"; }
diff --git a/Framework/MDAlgorithms/test/BinMDTest.h b/Framework/MDAlgorithms/test/BinMDTest.h
index 6140dee5cdb..af31cbabf82 100644
--- a/Framework/MDAlgorithms/test/BinMDTest.h
+++ b/Framework/MDAlgorithms/test/BinMDTest.h
@@ -1,17 +1,18 @@
#ifndef MANTID_MDEVENTS_BINTOMDHISTOWORKSPACETEST_H_
#define MANTID_MDEVENTS_BINTOMDHISTOWORKSPACETEST_H_
+#include "MantidAPI/FrameworkManager.h"
#include "MantidAPI/IMDEventWorkspace.h"
#include "MantidAPI/IMDHistoWorkspace.h"
-#include "MantidAPI/FrameworkManager.h"
#include "MantidAPI/ImplicitFunctionBuilder.h"
#include "MantidAPI/ImplicitFunctionFactory.h"
-#include "MantidAPI/ImplicitFunctionParser.h"
#include "MantidAPI/ImplicitFunctionParameterParserFactory.h"
+#include "MantidAPI/ImplicitFunctionParser.h"
+#include "MantidGeometry/Instrument.h"
#include "MantidGeometry/MDGeometry/MDImplicitFunction.h"
#include "MantidGeometry/MDGeometry/MDTypes.h"
#include "MantidGeometry/MDGeometry/QSample.h"
-#include "MantidGeometry/Instrument.h"
+#include "MantidKernel/WarningSuppressions.h"
#include "MantidMDAlgorithms/BinMD.h"
#include "MantidMDAlgorithms/CreateMDWorkspace.h"
#include "MantidMDAlgorithms/FakeMDEventData.h"
@@ -33,7 +34,7 @@ using namespace Mantid::MDAlgorithms;
using Mantid::coord_t;
class BinMDTest : public CxxTest::TestSuite {
-
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
private:
// Helper class. Mock Implicit function.
class MockImplicitFunction : public Mantid::Geometry::MDImplicitFunction {
@@ -43,9 +44,8 @@ private:
bool isPointContained(const Mantid::coord_t *) override { return false; }
std::string getName() const override { return "MockImplicitFunction"; }
MOCK_CONST_METHOD0(toXMLString, std::string());
- ~MockImplicitFunction() override { ; }
};
-
+ GCC_DIAG_ON_SUGGEST_OVERRIDE
// Helper class. Builds mock implicit functions.
class MockImplicitFunctionBuilder
: public Mantid::API::ImplicitFunctionBuilder {
diff --git a/Framework/MDAlgorithms/test/BinaryOperationMDTest.h b/Framework/MDAlgorithms/test/BinaryOperationMDTest.h
index 437ad6824df..93beb34914d 100644
--- a/Framework/MDAlgorithms/test/BinaryOperationMDTest.h
+++ b/Framework/MDAlgorithms/test/BinaryOperationMDTest.h
@@ -2,9 +2,10 @@
#define MANTID_MDALGORITHMS_BINARYOPERATIONMDTEST_H_
#include "MantidAPI/IMDEventWorkspace.h"
+#include "MantidDataObjects/MDHistoWorkspace.h"
#include "MantidDataObjects/WorkspaceSingleValue.h"
+#include "MantidKernel/WarningSuppresssions.h"
#include "MantidMDAlgorithms/BinaryOperationMD.h"
-#include "MantidDataObjects/MDHistoWorkspace.h"
#include "MantidTestHelpers/MDEventsTestHelper.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
@@ -18,6 +19,8 @@ using namespace Mantid::DataObjects;
using namespace Mantid::MDAlgorithms;
using namespace testing;
+GCC_DIAG_OFF_SUGGEST_OVERRIDE
+
class MockBinaryOperationMD : public BinaryOperationMD {
public:
MOCK_CONST_METHOD0(commutative, bool());
@@ -32,7 +35,7 @@ public:
Mantid::DataObjects::WorkspaceSingleValue_const_sptr scalar));
void exec() override { BinaryOperationMD::exec(); }
};
-
+GCC_DIAG_ON_SUGGEST_OVERRIDE
class BinaryOperationMDTest : public CxxTest::TestSuite {
public:
// This pair of boilerplate methods prevent the suite being created statically
diff --git a/Framework/MDAlgorithms/test/BooleanBinaryOperationMDTest.h b/Framework/MDAlgorithms/test/BooleanBinaryOperationMDTest.h
index c1215867bcd..dc7024cd302 100644
--- a/Framework/MDAlgorithms/test/BooleanBinaryOperationMDTest.h
+++ b/Framework/MDAlgorithms/test/BooleanBinaryOperationMDTest.h
@@ -1,15 +1,15 @@
#ifndef MANTID_MDALGORITHMS_BOOLEANBINARYOPERATIONMDTEST_H_
#define MANTID_MDALGORITHMS_BOOLEANBINARYOPERATIONMDTEST_H_
+#include "MantidKernel/WarningSuppressions.h"
#include "MantidMDAlgorithms/BooleanBinaryOperationMD.h"
-
#include <cxxtest/TestSuite.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
using namespace Mantid::MDAlgorithms;
using namespace testing;
-
+GCC_DIAG_OFF_SUGGEST_OVERRIDE
class MockBooleanBinaryOperationMD : public BooleanBinaryOperationMD {
public:
MOCK_METHOD0(initExtraProperties, void());
@@ -17,7 +17,7 @@ public:
void(Mantid::DataObjects::MDHistoWorkspace_sptr,
Mantid::DataObjects::MDHistoWorkspace_const_sptr));
};
-
+GCC_DIAG_ON_SUGGEST_OVERRIDE
class BooleanBinaryOperationMDTest : public CxxTest::TestSuite {
public:
void test_basics() {
diff --git a/Framework/MDAlgorithms/test/UnaryOperationMDTest.h b/Framework/MDAlgorithms/test/UnaryOperationMDTest.h
index a47d49dc02e..dd3d073b678 100644
--- a/Framework/MDAlgorithms/test/UnaryOperationMDTest.h
+++ b/Framework/MDAlgorithms/test/UnaryOperationMDTest.h
@@ -4,8 +4,9 @@
#include "MantidAPI/IMDEventWorkspace.h"
#include "MantidDataObjects/MDHistoWorkspace.h"
#include "MantidDataObjects/WorkspaceSingleValue.h"
-#include "MantidMDAlgorithms/UnaryOperationMD.h"
+#include "MantidKernel/WarningSuppressions.h"
#include "MantidMDAlgorithms/BinaryOperationMD.h"
+#include "MantidMDAlgorithms/UnaryOperationMD.h"
#include "MantidTestHelpers/MDEventsTestHelper.h"
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
@@ -22,9 +23,11 @@ using namespace testing;
class MockUnaryOperationMD : public UnaryOperationMD {
public:
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_METHOD1(execEvent, void(Mantid::API::IMDEventWorkspace_sptr));
MOCK_METHOD0(checkInputs, void());
MOCK_METHOD1(execHisto, void(Mantid::DataObjects::MDHistoWorkspace_sptr));
+ GCC_DIAG_ON_SUGGEST_OVERRIDE
void exec() override { UnaryOperationMD::exec(); }
};
diff --git a/Framework/TestHelpers/inc/MantidTestHelpers/FakeGmockObjects.h b/Framework/TestHelpers/inc/MantidTestHelpers/FakeGmockObjects.h
index 61549ee0634..da8daa19680 100644
--- a/Framework/TestHelpers/inc/MantidTestHelpers/FakeGmockObjects.h
+++ b/Framework/TestHelpers/inc/MantidTestHelpers/FakeGmockObjects.h
@@ -12,10 +12,11 @@
#define FAKEGMOCKOBJECTS_H_
#include "MantidGeometry/Instrument/INearestNeighboursFactory.h"
+#include "MantidKernel/WarningSuppressions.h"i
#include "gmock/gmock.h"
using namespace Mantid;
-
+GCC_DIAG_OFF_SUGGEST_OVERRIDE
// Helper and typedef for mocking NearestNeighbourFactory usage
class MockNearestNeighboursFactory
: public Mantid::Geometry::INearestNeighboursFactory {
@@ -41,5 +42,5 @@ public:
MOCK_METHOD0(die, void());
~MockNearestNeighbours() override { die(); }
};
-
+GCC_DIAG_ON_SUGGEST_OVERRIDE
#endif /* FAKEOBJECTS_H_ */
diff --git a/MantidQt/CustomInterfaces/test/ALCPeakFittingPresenterTest.h b/MantidQt/CustomInterfaces/test/ALCPeakFittingPresenterTest.h
index 2b3f61c40a2..035e00b165d 100644
--- a/MantidQt/CustomInterfaces/test/ALCPeakFittingPresenterTest.h
+++ b/MantidQt/CustomInterfaces/test/ALCPeakFittingPresenterTest.h
@@ -6,8 +6,9 @@
#include "MantidTestHelpers/WorkspaceCreationHelper.h"
-#include "MantidAPI/FunctionFactory.h"
#include "MantidAPI/FrameworkManager.h"
+#include "MantidAPI/FunctionFactory.h"
+#include "MantidKernel/WarningsSuppressions.h"
#include "MantidQtCustomInterfaces/Muon/IALCPeakFittingView.h"
#include "MantidQtCustomInterfaces/Muon/IALCPeakFittingModel.h"
@@ -28,6 +29,8 @@ operator<<(std::basic_ostream<CharType, CharTrait> &out,
}
}
+GCC_DIAG_OFF_SUGGEST_OVERRIDE
+
class MockALCPeakFittingView : public IALCPeakFittingView {
public:
void requestFit() { emit fitRequested(); }
@@ -353,5 +356,5 @@ public:
m_model->setError("Test error");
}
};
-
+GCC_DIAG_ON_SUGGEST_OVERRIDE
#endif /* MANTIDQT_CUSTOMINTERFACES_ALCPEAKFITTINGTEST_H_ */
diff --git a/MantidQt/CustomInterfaces/test/ReflMeasureTransferStrategyTest.h b/MantidQt/CustomInterfaces/test/ReflMeasureTransferStrategyTest.h
index 38494110d39..7eb3ccab5ac 100644
--- a/MantidQt/CustomInterfaces/test/ReflMeasureTransferStrategyTest.h
+++ b/MantidQt/CustomInterfaces/test/ReflMeasureTransferStrategyTest.h
@@ -1,6 +1,7 @@
#ifndef MANTID_CUSTOMINTERFACES_REFLMEASURETRANSFERSTRATEGYTEST_H_
#define MANTID_CUSTOMINTERFACES_REFLMEASURETRANSFERSTRATEGYTEST_H_
+#include "MantidKernel/WarningSuppressions.h"
#include "MantidKernel/make_unique.h"
#include "MantidQtCustomInterfaces/Reflectometry/ReflMeasureTransferStrategy.h"
#include "MantidQtCustomInterfaces/Reflectometry/ReflMeasurementItemSource.h"
@@ -17,10 +18,11 @@ using namespace MantidQt::CustomInterfaces;
class MockReflMeasurementItemSource
: public MantidQt::CustomInterfaces::ReflMeasurementItemSource {
public:
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD2(obtain, MantidQt::CustomInterfaces::MeasurementItem(
const std::string &, const std::string &));
MOCK_CONST_METHOD0(clone, MockReflMeasurementItemSource *());
- ~MockReflMeasurementItemSource() override {}
+ GCC_DIAG_ON_SUGGEST_OVERRIDE
};
class ReflMeasureTransferStrategyTest : public CxxTest::TestSuite {
diff --git a/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/DataProcessorUI/ProgressableViewMockObject.h b/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/DataProcessorUI/ProgressableViewMockObject.h
index 12ab1765a43..d30a9b98da3 100644
--- a/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/DataProcessorUI/ProgressableViewMockObject.h
+++ b/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/DataProcessorUI/ProgressableViewMockObject.h
@@ -1,6 +1,7 @@
#ifndef MANTID_MANTIDWIDGETS_PROGRESSABLEVIEWMOCKOBJECT_H
#define MANTID_MANTIDWIDGETS_PROGRESSABLEVIEWMOCKOBJECT_H
+#include "MantidKernel/WarningSuppressions.h"
#include "MantidQtMantidWidgets/ProgressableView.h"
#include <gmock/gmock.h>
@@ -8,10 +9,11 @@ using namespace MantidQt::MantidWidgets;
class MockProgressableView : public ProgressableView {
public:
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_METHOD1(setProgress, void(int));
MOCK_METHOD2(setProgressRange, void(int, int));
MOCK_METHOD0(clearProgress, void());
- ~MockProgressableView() override {}
+ GCC_DIAG_ON_SUGGEST_OVERRIDE
};
#endif /* MANTID_MANTIDWIDGETS_PROGRESSABLEVIEWMOCKOBJECT_H */
diff --git a/Vates/VatesAPI/test/ConcretePeaksPresenterVsiTest.h b/Vates/VatesAPI/test/ConcretePeaksPresenterVsiTest.h
index 794f7e6f087..548610c922e 100644
--- a/Vates/VatesAPI/test/ConcretePeaksPresenterVsiTest.h
+++ b/Vates/VatesAPI/test/ConcretePeaksPresenterVsiTest.h
@@ -1,18 +1,19 @@
#ifndef CONCRETE_PEAKS_PRESENTER_VSI_TEST_H_
#define CONCRETE_PEAKS_PRESENTER_VSI_TEST_H_
-#include "MantidVatesAPI/ConcretePeaksPresenterVsi.h"
#include "MantidAPI/IPeaksWorkspace.h"
-#include "MantidVatesAPI/ViewFrustum.h"
+#include "MantidDataObjects/NoShape.h"
+#include "MantidDataObjects/PeakShapeEllipsoid.h"
+#include "MantidDataObjects/PeakShapeSpherical.h"
#include "MantidDataObjects/PeaksWorkspace.h"
#include "MantidGeometry/Crystal/PeakShape.h"
-#include "MantidDataObjects/PeakShapeSpherical.h"
-#include "MantidDataObjects/PeakShapeEllipsoid.h"
-#include "MantidDataObjects/NoShape.h"
#include "MantidKernel/V3D.h"
+#include "MantidKernel/WarningSuppressions.h"
+#include "MantidVatesAPI/ConcretePeaksPresenterVsi.h"
+#include "MantidVatesAPI/ViewFrustum.h"
#include "MockObjects.h"
-#include <boost/shared_ptr.hpp>
#include <boost/make_shared.hpp>
+#include <boost/shared_ptr.hpp>
#include <cxxtest/TestSuite.h>
#include <gmock/gmock.h>
@@ -22,7 +23,7 @@
using namespace ::testing;
using namespace Mantid::VATES;
-
+GCC_DIAG_OFF_SUGGEST_OVERRIDE
class MockPeakConcrete : public Mantid::DataObjects::Peak {
public:
MOCK_CONST_METHOD0(getHKL, Mantid::Kernel::V3D(void));
@@ -37,7 +38,7 @@ public:
MOCK_METHOD1(getPeak, Mantid::DataObjects::Peak &(int peakNum));
MOCK_CONST_METHOD1(getPeak, const Mantid::DataObjects::Peak &(int peakNum));
};
-
+GCC_DIAG_ON_SUGGEST_OVERRIDE
class ConcretePeaksPresenterVsiTest : public CxxTest::TestSuite {
public:
void testSetupPresenterCorrectly() {
diff --git a/Vates/VatesAPI/test/MDEWInMemoryLoadingPresenterTest.h b/Vates/VatesAPI/test/MDEWInMemoryLoadingPresenterTest.h
index d26ce4798e4..fb9bf8fe4bc 100644
--- a/Vates/VatesAPI/test/MDEWInMemoryLoadingPresenterTest.h
+++ b/Vates/VatesAPI/test/MDEWInMemoryLoadingPresenterTest.h
@@ -9,11 +9,12 @@
#include "MantidAPI/IMDEventWorkspace.h"
#include "MantidAPI/ITableWorkspace.h"
#include "MantidAPI/WorkspaceFactory.h"
+#include "MantidKernel/WarningSuppressions.h"
+#include "MantidKernel/make_unique.h"
#include "MantidVatesAPI/FilteringUpdateProgressAction.h"
#include "MantidVatesAPI/MDEWInMemoryLoadingPresenter.h"
-#include "MantidKernel/make_unique.h"
-#include <vtkUnstructuredGrid.h>
#include <vtkSmartPointer.h>
+#include <vtkUnstructuredGrid.h>
using namespace Mantid::VATES;
using namespace Mantid::API;
@@ -25,10 +26,12 @@ private:
// Helper type. Mocks a Workspace Provider.
class MockWorkspaceProvider : public Mantid::VATES::WorkspaceProvider {
public:
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD1(canProvideWorkspace, bool(std::string));
MOCK_CONST_METHOD1(fetchWorkspace,
Mantid::API::Workspace_sptr(std::string));
MOCK_CONST_METHOD1(disposeWorkspace, void(std::string));
+ GCC_DIAG_ON_SUGGEST_OVERRIDE
};
// Helper method. Generates and returns a valid IMDEventWorkspace
diff --git a/Vates/VatesAPI/test/MDHWInMemoryLoadingPresenterTest.h b/Vates/VatesAPI/test/MDHWInMemoryLoadingPresenterTest.h
index 97c950ac323..1eebc734997 100644
--- a/Vates/VatesAPI/test/MDHWInMemoryLoadingPresenterTest.h
+++ b/Vates/VatesAPI/test/MDHWInMemoryLoadingPresenterTest.h
@@ -8,12 +8,13 @@
#include "MantidAPI/IMDHistoWorkspace.h"
#include "MantidAPI/ITableWorkspace.h"
#include "MantidAPI/WorkspaceFactory.h"
+#include "MantidKernel/WarningSuppressions.h"
+#include "MantidKernel/make_unique.h"
#include "MantidTestHelpers/MDEventsTestHelper.h"
#include "MantidVatesAPI/FilteringUpdateProgressAction.h"
#include "MantidVatesAPI/MDHWInMemoryLoadingPresenter.h"
-#include "MantidKernel/make_unique.h"
-#include <vtkUnstructuredGrid.h>
#include <vtkSmartPointer.h>
+#include <vtkUnstructuredGrid.h>
using namespace Mantid::VATES;
using namespace Mantid::API;
@@ -26,10 +27,12 @@ private:
// Helper type. Mocks a Workspace Provider.
class MockWorkspaceProvider : public Mantid::VATES::WorkspaceProvider {
public:
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD1(canProvideWorkspace, bool(std::string));
MOCK_CONST_METHOD1(fetchWorkspace,
Mantid::API::Workspace_sptr(std::string));
MOCK_CONST_METHOD1(disposeWorkspace, void(std::string));
+ GCC_DIAG_ON_SUGGEST_OVERRIDE
};
// Helper method. Generates and returns a valid IMDHistoWorkspace
diff --git a/Vates/VatesAPI/test/VatesKnowledgeSerializerTest.h b/Vates/VatesAPI/test/VatesKnowledgeSerializerTest.h
index 5039a9013a4..c9e42504658 100644
--- a/Vates/VatesAPI/test/VatesKnowledgeSerializerTest.h
+++ b/Vates/VatesAPI/test/VatesKnowledgeSerializerTest.h
@@ -1,17 +1,18 @@
#ifndef REBINNING_XML_GENERATOR_TEST_H
#define REBINNING_XML_GENERATOR_TEST_H
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-#include <cxxtest/TestSuite.h>
-#include <MantidGeometry/MDGeometry/IMDDimension.h>
-#include "MantidVatesAPI/VatesKnowledgeSerializer.h"
+#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/IMDWorkspace.h"
#include "MantidGeometry/MDGeometry/MDImplicitFunction.h"
#include "MantidKernel/System.h"
-#include "MantidAPI/AnalysisDataService.h"
-#include <boost/shared_ptr.hpp>
+#include "MantidKernel/WarningSuppressions.h"
+#include "MantidVatesAPI/VatesKnowledgeSerializer.h"
#include "MockObjects.h"
+#include <MantidGeometry/MDGeometry/IMDDimension.h>
+#include <boost/shared_ptr.hpp>
+#include <cxxtest/TestSuite.h>
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
using namespace Mantid::VATES;
@@ -20,12 +21,13 @@ private:
// Helper class
class MockImplicitFunction : public Mantid::Geometry::MDImplicitFunction {
public:
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_METHOD1(isPointContained, bool(const Mantid::coord_t *pPoint));
MOCK_METHOD1(isPointContained, bool(const std::vector<Mantid::coord_t> &));
MOCK_METHOD1(isPointContained, bool(const Mantid::Kernel::VMD &));
MOCK_CONST_METHOD0(getName, std::string());
MOCK_CONST_METHOD0(toXMLString, std::string());
- ~MockImplicitFunction() override {}
+ GCC_DIAG_ON_SUGGEST_OVERRIDE
};
// Test methods
diff --git a/Vates/VatesAPI/test/vtkDataSetFactoryTest.h b/Vates/VatesAPI/test/vtkDataSetFactoryTest.h
index 4c927600c67..2cb9cf290fa 100644
--- a/Vates/VatesAPI/test/vtkDataSetFactoryTest.h
+++ b/Vates/VatesAPI/test/vtkDataSetFactoryTest.h
@@ -2,19 +2,20 @@
#ifndef VTKDATASETFACTORYTEST_H_
#define VTKDATASETFACTORYTEST_H_
+#include "MantidAPI/IMDHistoWorkspace.h"
#include "MantidAPI/IMDWorkspace.h"
-#include "MantidVatesAPI/vtkDataSetFactory.h"
-#include "MantidVatesAPI/ProgressAction.h"
-#include <cxxtest/TestSuite.h>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-#include "vtkDataSet.h"
-#include "vtkFloatArray.h"
#include "MantidAPI/Workspace.h"
-#include "MantidAPI/IMDHistoWorkspace.h"
+#include "MantidKernel/WarningSuppressions.h"
#include "MantidKernel/make_unique.h"
#include "MantidTestHelpers/MDEventsTestHelper.h"
+#include "MantidVatesAPI/ProgressAction.h"
+#include "MantidVatesAPI/vtkDataSetFactory.h"
#include "MantidVatesAPI/vtkStructuredGrid_Silent.h"
+#include "vtkDataSet.h"
+#include "vtkFloatArray.h"
+#include <cxxtest/TestSuite.h>
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
using namespace Mantid::API;
using namespace Mantid::DataObjects;
@@ -26,11 +27,13 @@ private:
/// Mocked helper type
class MockvtkDataSetFactory : public Mantid::VATES::vtkDataSetFactory {
public:
+ GCC_DIAG_OFF_SUGGEST_OVERRIDE
MOCK_CONST_METHOD1(
create, vtkSmartPointer<vtkDataSet>(Mantid::VATES::ProgressAction &));
MOCK_METHOD1(initialize, void(boost::shared_ptr<Mantid::API::Workspace>));
MOCK_CONST_METHOD0(validate, void());
MOCK_CONST_METHOD0(getFactoryTypeName, std::string());
+ GCC_DIAG_ON_SUGGEST_OVERRIDE
void setSuccessorConcrete(std::unique_ptr<vtkDataSetFactory> pSuccessor) {
vtkDataSetFactory::setSuccessor(pSuccessor);
}
diff --git a/Vates/VatesAPI/test/vtkDataSetToPeaksFilteredDataSetTest.h b/Vates/VatesAPI/test/vtkDataSetToPeaksFilteredDataSetTest.h
index 845984098c9..c159e19f181 100644
--- a/Vates/VatesAPI/test/vtkDataSetToPeaksFilteredDataSetTest.h
+++ b/Vates/VatesAPI/test/vtkDataSetToPeaksFilteredDataSetTest.h
@@ -1,22 +1,23 @@
#ifndef MANTID_VATESAPI_VTKDATASETTOPEAKSFILTEREDDATASETTEST_H_
#define MANTID_VATESAPI_VTKDATASETTOPEAKSFILTEREDDATASETTEST_H_
+#include "MantidAPI/IPeaksWorkspace.h"
+#include "MantidDataObjects/NoShape.h"
+#include "MantidDataObjects/PeakShapeEllipsoid.h"
+#include "MantidDataObjects/PeakShapeSpherical.h"
+#include "MantidDataObjects/PeaksWorkspace.h"
+#include "MantidGeometry/Crystal/PeakShape.h"
+#include "MantidKernel/V3D.h"
+#include "MantidKernel/WarningSuppressions.h"
#include "MantidTestHelpers/MDEventsTestHelper.h"
#include "MantidVatesAPI/FieldDataToMetadata.h"
#include "MantidVatesAPI/MetadataJsonManager.h"
#include "MantidVatesAPI/MetadataToFieldData.h"
-#include "MantidVatesAPI/VatesConfigurations.h"
#include "MantidVatesAPI/NoThresholdRange.h"
+#include "MantidVatesAPI/UserDefinedThresholdRange.h"
+#include "MantidVatesAPI/VatesConfigurations.h"
#include "MantidVatesAPI/vtkDataSetToPeaksFilteredDataSet.h"
#include "MantidVatesAPI/vtkSplatterPlotFactory.h"
-#include "MantidVatesAPI/UserDefinedThresholdRange.h"
-#include "MantidAPI/IPeaksWorkspace.h"
-#include "MantidDataObjects/PeaksWorkspace.h"
-#include "MantidGeometry/Crystal/PeakShape.h"
-#include "MantidDataObjects/PeakShapeSpherical.h"
-#include "MantidDataObjects/PeakShapeEllipsoid.h"
-#include "MantidDataObjects/NoShape.h"
-#include "MantidKernel/V3D.h"
#include "MockObjects.h"
#include <gmock/gmock.h>
@@ -37,7 +38,7 @@
using namespace Mantid::DataObjects;
using namespace Mantid::VATES;
using namespace ::testing;
-
+GCC_DIAG_OFF_SUGGEST_OVERRIDE
class MockPeakFilter : public Mantid::DataObjects::Peak {
public:
MOCK_CONST_METHOD0(getHKL, Mantid::Kernel::V3D(void));
@@ -51,7 +52,7 @@ public:
MOCK_METHOD1(getPeak, Mantid::DataObjects::Peak &(int peakNum));
MOCK_CONST_METHOD1(getPeak, const Mantid::DataObjects::Peak &(int peakNum));
};
-
+GCC_DIAG_ON_SUGGEST_OVERRIDE
struct PeaksFilterDataContainer {
double radius;
double radiusFactor;
--
GitLab