[Orxonox-commit 6188] r10846 - in code/branches/cpp11_v2/test: core/class core/command core/object core/singleton util/output
landauf at orxonox.net
landauf at orxonox.net
Mon Nov 23 22:21:05 CET 2015
Author: landauf
Date: 2015-11-23 22:21:04 +0100 (Mon, 23 Nov 2015)
New Revision: 10846
Modified:
code/branches/cpp11_v2/test/core/class/IdentifiableTest.cc
code/branches/cpp11_v2/test/core/class/IdentifierClassHierarchyTest.cc
code/branches/cpp11_v2/test/core/class/IdentifierExternalClassHierarchyTest.cc
code/branches/cpp11_v2/test/core/class/IdentifierNestedClassHierarchyTest.cc
code/branches/cpp11_v2/test/core/class/IdentifierSimpleClassHierarchyTest.cc
code/branches/cpp11_v2/test/core/class/IdentifierTest.cc
code/branches/cpp11_v2/test/core/class/OrxonoxClassTest.cc
code/branches/cpp11_v2/test/core/class/OrxonoxInterfaceTest.cc
code/branches/cpp11_v2/test/core/class/SubclassIdentifierTest.cc
code/branches/cpp11_v2/test/core/class/SuperTest.cc
code/branches/cpp11_v2/test/core/command/CommandTest.cc
code/branches/cpp11_v2/test/core/command/ExecutorPtrTest.cc
code/branches/cpp11_v2/test/core/command/FunctorPtrTest.cc
code/branches/cpp11_v2/test/core/object/ClassFactoryTest.cc
code/branches/cpp11_v2/test/core/object/ContextTest.cc
code/branches/cpp11_v2/test/core/object/IteratorTest.cc
code/branches/cpp11_v2/test/core/object/ListableTest.cc
code/branches/cpp11_v2/test/core/object/ObjectListIteratorTest.cc
code/branches/cpp11_v2/test/core/object/ObjectListTest.cc
code/branches/cpp11_v2/test/core/singleton/ScopeTest.cc
code/branches/cpp11_v2/test/util/output/BaseWriterTest.cc
code/branches/cpp11_v2/test/util/output/ConsoleWriterTest.cc
code/branches/cpp11_v2/test/util/output/LogWriterTest.cc
code/branches/cpp11_v2/test/util/output/MemoryWriterTest.cc
Log:
added 'override' to inherited virtual functions in unittests
Modified: code/branches/cpp11_v2/test/core/class/IdentifiableTest.cc
===================================================================
--- code/branches/cpp11_v2/test/core/class/IdentifiableTest.cc 2015-11-23 21:20:29 UTC (rev 10845)
+++ code/branches/cpp11_v2/test/core/class/IdentifiableTest.cc 2015-11-23 21:21:04 UTC (rev 10846)
@@ -19,13 +19,13 @@
class IdentifiableTest : public ::testing::Test
{
public:
- virtual void SetUp()
+ virtual void SetUp() override
{
new IdentifierManager();
ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
}
- virtual void TearDown()
+ virtual void TearDown() override
{
ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
delete &IdentifierManager::getInstance();
Modified: code/branches/cpp11_v2/test/core/class/IdentifierClassHierarchyTest.cc
===================================================================
--- code/branches/cpp11_v2/test/core/class/IdentifierClassHierarchyTest.cc 2015-11-23 21:20:29 UTC (rev 10845)
+++ code/branches/cpp11_v2/test/core/class/IdentifierClassHierarchyTest.cc 2015-11-23 21:21:04 UTC (rev 10846)
@@ -85,7 +85,7 @@
RegisterObject(Class1);
}
- virtual void test1() {}
+ virtual void test1() override {}
};
class Class2a : public BaseClass, public Interface1, Interface2
@@ -96,8 +96,8 @@
RegisterObject(Class2a);
}
- virtual void test1() {}
- virtual void test2() {}
+ virtual void test1() override {}
+ virtual void test2() override {}
};
class Class2b : public BaseClass, public Interface2, Interface1
@@ -108,8 +108,8 @@
RegisterObject(Class2b);
}
- virtual void test1() {}
- virtual void test2() {}
+ virtual void test1() override {}
+ virtual void test2() override {}
};
class Class3 : public BaseClass, public BaseInterface1, BaseInterface2
@@ -120,8 +120,8 @@
RegisterObject(Class3);
}
- virtual void test1() {}
- virtual void test2() {}
+ virtual void test1() override {}
+ virtual void test2() override {}
};
RegisterAbstractClass(BaseInterface1).inheritsFrom<OrxonoxInterface>();
@@ -139,7 +139,7 @@
class IdentifierClassHierarchyTest : public ::testing::Test
{
public:
- virtual void SetUp()
+ virtual void SetUp() override
{
new IdentifierManager();
ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
@@ -148,7 +148,7 @@
IdentifierManager::getInstance().createClassHierarchy();
}
- virtual void TearDown()
+ virtual void TearDown() override
{
IdentifierManager::getInstance().destroyClassHierarchy();
Context::destroyRootContext();
Modified: code/branches/cpp11_v2/test/core/class/IdentifierExternalClassHierarchyTest.cc
===================================================================
--- code/branches/cpp11_v2/test/core/class/IdentifierExternalClassHierarchyTest.cc 2015-11-23 21:20:29 UTC (rev 10845)
+++ code/branches/cpp11_v2/test/core/class/IdentifierExternalClassHierarchyTest.cc 2015-11-23 21:21:04 UTC (rev 10846)
@@ -35,7 +35,7 @@
RegisterObject(RealClass);
}
- virtual void test() {}
+ virtual void test() override {}
};
RegisterAbstractClass(Interface).inheritsFrom<Identifiable>();
@@ -46,7 +46,7 @@
class IdentifierExternalClassHierarchyTest : public ::testing::Test
{
public:
- virtual void SetUp()
+ virtual void SetUp() override
{
new IdentifierManager();
ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
@@ -55,7 +55,7 @@
IdentifierManager::getInstance().createClassHierarchy();
}
- virtual void TearDown()
+ virtual void TearDown() override
{
IdentifierManager::getInstance().destroyClassHierarchy();
Context::destroyRootContext();
Modified: code/branches/cpp11_v2/test/core/class/IdentifierNestedClassHierarchyTest.cc
===================================================================
--- code/branches/cpp11_v2/test/core/class/IdentifierNestedClassHierarchyTest.cc 2015-11-23 21:20:29 UTC (rev 10845)
+++ code/branches/cpp11_v2/test/core/class/IdentifierNestedClassHierarchyTest.cc 2015-11-23 21:21:04 UTC (rev 10846)
@@ -106,7 +106,7 @@
class IdentifierNestedClassHierarchyTest : public ::testing::Test
{
public:
- virtual void SetUp()
+ virtual void SetUp() override
{
new IdentifierManager();
ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
@@ -115,7 +115,7 @@
IdentifierManager::getInstance().createClassHierarchy();
}
- virtual void TearDown()
+ virtual void TearDown() override
{
IdentifierManager::getInstance().destroyClassHierarchy();
Context::destroyRootContext();
Modified: code/branches/cpp11_v2/test/core/class/IdentifierSimpleClassHierarchyTest.cc
===================================================================
--- code/branches/cpp11_v2/test/core/class/IdentifierSimpleClassHierarchyTest.cc 2015-11-23 21:20:29 UTC (rev 10845)
+++ code/branches/cpp11_v2/test/core/class/IdentifierSimpleClassHierarchyTest.cc 2015-11-23 21:21:04 UTC (rev 10846)
@@ -37,7 +37,7 @@
RegisterObject(RealClass);
}
- virtual void test() {}
+ virtual void test() override {}
};
RegisterAbstractClass(Interface).inheritsFrom<OrxonoxInterface>();
@@ -48,7 +48,7 @@
class IdentifierSimpleClassHierarchyTest : public ::testing::Test
{
public:
- virtual void SetUp()
+ virtual void SetUp() override
{
new IdentifierManager();
ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
@@ -57,7 +57,7 @@
IdentifierManager::getInstance().createClassHierarchy();
}
- virtual void TearDown()
+ virtual void TearDown() override
{
IdentifierManager::getInstance().destroyClassHierarchy();
Context::destroyRootContext();
Modified: code/branches/cpp11_v2/test/core/class/IdentifierTest.cc
===================================================================
--- code/branches/cpp11_v2/test/core/class/IdentifierTest.cc 2015-11-23 21:20:29 UTC (rev 10845)
+++ code/branches/cpp11_v2/test/core/class/IdentifierTest.cc 2015-11-23 21:21:04 UTC (rev 10846)
@@ -26,13 +26,13 @@
class IdentifierTest : public ::testing::Test
{
public:
- virtual void SetUp()
+ virtual void SetUp() override
{
new IdentifierManager();
ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
}
- virtual void TearDown()
+ virtual void TearDown() override
{
ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
delete &IdentifierManager::getInstance();
Modified: code/branches/cpp11_v2/test/core/class/OrxonoxClassTest.cc
===================================================================
--- code/branches/cpp11_v2/test/core/class/OrxonoxClassTest.cc 2015-11-23 21:20:29 UTC (rev 10845)
+++ code/branches/cpp11_v2/test/core/class/OrxonoxClassTest.cc 2015-11-23 21:21:04 UTC (rev 10846)
@@ -15,13 +15,13 @@
class OrxonoxClassTest : public ::testing::Test
{
public:
- virtual void SetUp()
+ virtual void SetUp() override
{
new IdentifierManager();
Context::setRootContext(new Context(nullptr));
}
- virtual void TearDown()
+ virtual void TearDown() override
{
Context::destroyRootContext();
delete &IdentifierManager::getInstance();
Modified: code/branches/cpp11_v2/test/core/class/OrxonoxInterfaceTest.cc
===================================================================
--- code/branches/cpp11_v2/test/core/class/OrxonoxInterfaceTest.cc 2015-11-23 21:20:29 UTC (rev 10845)
+++ code/branches/cpp11_v2/test/core/class/OrxonoxInterfaceTest.cc 2015-11-23 21:21:04 UTC (rev 10846)
@@ -30,13 +30,13 @@
class OrxonoxInterfaceTest : public ::testing::Test
{
public:
- virtual void SetUp()
+ virtual void SetUp() override
{
new IdentifierManager();
Context::setRootContext(new Context(nullptr));
}
- virtual void TearDown()
+ virtual void TearDown() override
{
Context::destroyRootContext();
delete &IdentifierManager::getInstance();
Modified: code/branches/cpp11_v2/test/core/class/SubclassIdentifierTest.cc
===================================================================
--- code/branches/cpp11_v2/test/core/class/SubclassIdentifierTest.cc 2015-11-23 21:20:29 UTC (rev 10845)
+++ code/branches/cpp11_v2/test/core/class/SubclassIdentifierTest.cc 2015-11-23 21:21:04 UTC (rev 10846)
@@ -28,7 +28,7 @@
class SubclassIdentifierTest : public ::testing::Test
{
public:
- virtual void SetUp()
+ virtual void SetUp() override
{
new IdentifierManager();
ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
@@ -37,7 +37,7 @@
IdentifierManager::getInstance().createClassHierarchy();
}
- virtual void TearDown()
+ virtual void TearDown() override
{
IdentifierManager::getInstance().destroyClassHierarchy();
Context::destroyRootContext();
Modified: code/branches/cpp11_v2/test/core/class/SuperTest.cc
===================================================================
--- code/branches/cpp11_v2/test/core/class/SuperTest.cc 2015-11-23 21:20:29 UTC (rev 10845)
+++ code/branches/cpp11_v2/test/core/class/SuperTest.cc 2015-11-23 21:21:04 UTC (rev 10846)
@@ -18,12 +18,12 @@
RegisterObject(TestClass);
}
- virtual void changedName()
+ virtual void changedName() override
{
this->changedNameBase_ = true;
}
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode)
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override
{
this->xmlPortBase_ = true;
this->modeBase_ = mode;
@@ -42,14 +42,14 @@
RegisterObject(TestSubclass);
}
- virtual void changedName()
+ virtual void changedName() override
{
this->changedNameSubclass_ = true;
SUPER(TestSubclass, changedName);
}
- virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode)
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override
{
this->xmlPortSubclass_ = true;
this->modeSubclass_ = mode;
@@ -69,7 +69,7 @@
class SuperTest : public ::testing::Test
{
public:
- virtual void SetUp()
+ virtual void SetUp() override
{
new IdentifierManager();
ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
@@ -78,7 +78,7 @@
IdentifierManager::getInstance().createClassHierarchy();
}
- virtual void TearDown()
+ virtual void TearDown() override
{
IdentifierManager::getInstance().destroyClassHierarchy();
Context::destroyRootContext();
Modified: code/branches/cpp11_v2/test/core/command/CommandTest.cc
===================================================================
--- code/branches/cpp11_v2/test/core/command/CommandTest.cc 2015-11-23 21:20:29 UTC (rev 10845)
+++ code/branches/cpp11_v2/test/core/command/CommandTest.cc 2015-11-23 21:21:04 UTC (rev 10846)
@@ -137,7 +137,7 @@
class CommandTest : public ::testing::Test
{
public:
- virtual void SetUp()
+ virtual void SetUp() override
{
new IdentifierManager();
new ConsoleCommandManager();
@@ -147,7 +147,7 @@
IdentifierManager::getInstance().createClassHierarchy();
}
- virtual void TearDown()
+ virtual void TearDown() override
{
IdentifierManager::getInstance().destroyClassHierarchy();
Context::destroyRootContext();
Modified: code/branches/cpp11_v2/test/core/command/ExecutorPtrTest.cc
===================================================================
--- code/branches/cpp11_v2/test/core/command/ExecutorPtrTest.cc 2015-11-23 21:20:29 UTC (rev 10845)
+++ code/branches/cpp11_v2/test/core/command/ExecutorPtrTest.cc 2015-11-23 21:21:04 UTC (rev 10846)
@@ -20,11 +20,11 @@
class ExecutorPtrTest : public ::testing::Test
{
public:
- virtual void SetUp()
+ virtual void SetUp() override
{
}
- virtual void TearDown()
+ virtual void TearDown() override
{
}
};
Modified: code/branches/cpp11_v2/test/core/command/FunctorPtrTest.cc
===================================================================
--- code/branches/cpp11_v2/test/core/command/FunctorPtrTest.cc 2015-11-23 21:20:29 UTC (rev 10845)
+++ code/branches/cpp11_v2/test/core/command/FunctorPtrTest.cc 2015-11-23 21:21:04 UTC (rev 10846)
@@ -20,11 +20,11 @@
class FunctorPtrTest : public ::testing::Test
{
public:
- virtual void SetUp()
+ virtual void SetUp() override
{
}
- virtual void TearDown()
+ virtual void TearDown() override
{
}
};
Modified: code/branches/cpp11_v2/test/core/object/ClassFactoryTest.cc
===================================================================
--- code/branches/cpp11_v2/test/core/object/ClassFactoryTest.cc 2015-11-23 21:20:29 UTC (rev 10845)
+++ code/branches/cpp11_v2/test/core/object/ClassFactoryTest.cc 2015-11-23 21:21:04 UTC (rev 10846)
@@ -13,14 +13,14 @@
class ClassFactoryTest : public ::testing::Test
{
public:
- virtual void SetUp()
+ virtual void SetUp() override
{
new IdentifierManager();
ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
Context::setRootContext(new Context(nullptr));
}
- virtual void TearDown()
+ virtual void TearDown() override
{
Context::destroyRootContext();
ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
Modified: code/branches/cpp11_v2/test/core/object/ContextTest.cc
===================================================================
--- code/branches/cpp11_v2/test/core/object/ContextTest.cc 2015-11-23 21:20:29 UTC (rev 10845)
+++ code/branches/cpp11_v2/test/core/object/ContextTest.cc 2015-11-23 21:21:04 UTC (rev 10846)
@@ -20,14 +20,14 @@
class ContextTest : public ::testing::Test
{
public:
- virtual void SetUp()
+ virtual void SetUp() override
{
new IdentifierManager();
ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
Context::setRootContext(new Context(nullptr));
}
- virtual void TearDown()
+ virtual void TearDown() override
{
Context::destroyRootContext();
ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
Modified: code/branches/cpp11_v2/test/core/object/IteratorTest.cc
===================================================================
--- code/branches/cpp11_v2/test/core/object/IteratorTest.cc 2015-11-23 21:20:29 UTC (rev 10845)
+++ code/branches/cpp11_v2/test/core/object/IteratorTest.cc 2015-11-23 21:21:04 UTC (rev 10846)
@@ -14,7 +14,7 @@
class TestInterface : virtual public OrxonoxInterface
{
public:
- TestInterface() { RegisterObject(TestInterface); }
+ TestInterface() { RegisterObject(TestInterface); }
};
class TestClass : public OrxonoxClass, public TestInterface
@@ -31,14 +31,14 @@
class IteratorTest : public ::testing::Test
{
public:
- virtual void SetUp()
+ virtual void SetUp() override
{
new IdentifierManager();
ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
Context::setRootContext(new Context(nullptr));
}
- virtual void TearDown()
+ virtual void TearDown() override
{
Context::destroyRootContext();
ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
Modified: code/branches/cpp11_v2/test/core/object/ListableTest.cc
===================================================================
--- code/branches/cpp11_v2/test/core/object/ListableTest.cc 2015-11-23 21:20:29 UTC (rev 10845)
+++ code/branches/cpp11_v2/test/core/object/ListableTest.cc 2015-11-23 21:21:04 UTC (rev 10846)
@@ -36,14 +36,14 @@
class ListableTest : public ::testing::Test
{
public:
- virtual void SetUp()
+ virtual void SetUp() override
{
new IdentifierManager();
ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
Context::setRootContext(new Context(nullptr));
}
- virtual void TearDown()
+ virtual void TearDown() override
{
Context::destroyRootContext();
ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
Modified: code/branches/cpp11_v2/test/core/object/ObjectListIteratorTest.cc
===================================================================
--- code/branches/cpp11_v2/test/core/object/ObjectListIteratorTest.cc 2015-11-23 21:20:29 UTC (rev 10845)
+++ code/branches/cpp11_v2/test/core/object/ObjectListIteratorTest.cc 2015-11-23 21:21:04 UTC (rev 10846)
@@ -14,7 +14,7 @@
class TestInterface : virtual public OrxonoxInterface
{
public:
- TestInterface() { RegisterObject(TestInterface); }
+ TestInterface() { RegisterObject(TestInterface); }
};
class TestClass : public OrxonoxClass, public TestInterface
@@ -31,14 +31,14 @@
class ObjectListIteratorTest : public ::testing::Test
{
public:
- virtual void SetUp()
+ virtual void SetUp() override
{
new IdentifierManager();
ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
Context::setRootContext(new Context(nullptr));
}
- virtual void TearDown()
+ virtual void TearDown() override
{
Context::destroyRootContext();
ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
Modified: code/branches/cpp11_v2/test/core/object/ObjectListTest.cc
===================================================================
--- code/branches/cpp11_v2/test/core/object/ObjectListTest.cc 2015-11-23 21:20:29 UTC (rev 10845)
+++ code/branches/cpp11_v2/test/core/object/ObjectListTest.cc 2015-11-23 21:21:04 UTC (rev 10846)
@@ -23,14 +23,14 @@
class ObjectListTest : public ::testing::Test
{
public:
- virtual void SetUp()
+ virtual void SetUp() override
{
new IdentifierManager();
ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
Context::setRootContext(new Context(nullptr));
}
- virtual void TearDown()
+ virtual void TearDown() override
{
Context::destroyRootContext();
ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::IDENTIFIER);
Modified: code/branches/cpp11_v2/test/core/singleton/ScopeTest.cc
===================================================================
--- code/branches/cpp11_v2/test/core/singleton/ScopeTest.cc 2015-11-23 21:20:29 UTC (rev 10845)
+++ code/branches/cpp11_v2/test/core/singleton/ScopeTest.cc 2015-11-23 21:21:04 UTC (rev 10846)
@@ -25,7 +25,7 @@
class ScopeTest : public ::testing::Test
{
public:
- virtual void SetUp()
+ virtual void SetUp() override
{
new IdentifierManager();
new ScopeManager();
@@ -34,7 +34,7 @@
Context::setRootContext(new Context(nullptr));
}
- virtual void TearDown()
+ virtual void TearDown() override
{
Context::destroyRootContext();
ModuleInstance::getCurrentModuleInstance()->unloadAllStaticallyInitializedInstances(StaticInitialization::SCOPED_SINGLETON_WRAPPER);
Modified: code/branches/cpp11_v2/test/util/output/BaseWriterTest.cc
===================================================================
--- code/branches/cpp11_v2/test/util/output/BaseWriterTest.cc 2015-11-23 21:20:29 UTC (rev 10845)
+++ code/branches/cpp11_v2/test/util/output/BaseWriterTest.cc 2015-11-23 21:21:04 UTC (rev 10846)
@@ -29,7 +29,7 @@
MOCK_METHOD2(printLine, void(const std::string&, OutputLevel));
- virtual void output(OutputLevel level, const OutputContextContainer& context, const std::vector<std::string>& lines)
+ virtual void output(OutputLevel level, const OutputContextContainer& context, const std::vector<std::string>& lines) override
{ this->BaseWriter::output(level, context, lines); }
};
}
Modified: code/branches/cpp11_v2/test/util/output/ConsoleWriterTest.cc
===================================================================
--- code/branches/cpp11_v2/test/util/output/ConsoleWriterTest.cc 2015-11-23 21:20:29 UTC (rev 10845)
+++ code/branches/cpp11_v2/test/util/output/ConsoleWriterTest.cc 2015-11-23 21:21:04 UTC (rev 10846)
@@ -11,13 +11,13 @@
class ConsoleWriterTest : public ::testing::Test
{
public:
- virtual void SetUp()
+ virtual void SetUp() override
{
// reset output manager
OutputManager::Testing::getInstancePointer().reset(new OutputManager());
}
- virtual void TearDown()
+ virtual void TearDown() override
{
}
};
Modified: code/branches/cpp11_v2/test/util/output/LogWriterTest.cc
===================================================================
--- code/branches/cpp11_v2/test/util/output/LogWriterTest.cc 2015-11-23 21:20:29 UTC (rev 10845)
+++ code/branches/cpp11_v2/test/util/output/LogWriterTest.cc 2015-11-23 21:21:04 UTC (rev 10846)
@@ -11,7 +11,7 @@
class MockLogWriter : public LogWriter
{
public:
- virtual void printLine(const std::string& line, OutputLevel level)
+ virtual void printLine(const std::string& line, OutputLevel level) override
{ this->LogWriter::printLine(line, level); }
};
@@ -19,13 +19,13 @@
class LogWriterTest : public ::testing::Test
{
public:
- virtual void SetUp()
+ virtual void SetUp() override
{
// reset output manager
OutputManager::Testing::getInstancePointer().reset(new OutputManager());
}
- virtual void TearDown()
+ virtual void TearDown() override
{
}
};
Modified: code/branches/cpp11_v2/test/util/output/MemoryWriterTest.cc
===================================================================
--- code/branches/cpp11_v2/test/util/output/MemoryWriterTest.cc 2015-11-23 21:20:29 UTC (rev 10845)
+++ code/branches/cpp11_v2/test/util/output/MemoryWriterTest.cc 2015-11-23 21:21:04 UTC (rev 10846)
@@ -18,13 +18,13 @@
class MemoryWriterTest : public ::testing::Test
{
public:
- virtual void SetUp()
+ virtual void SetUp() override
{
// reset output manager
OutputManager::Testing::getInstancePointer().reset(new OutputManager());
}
- virtual void TearDown()
+ virtual void TearDown() override
{
}
};
More information about the Orxonox-commit
mailing list