[Orxonox-commit 4984] r9653 - in code/branches/core6: src/libraries/core/config test/core/class
landauf at orxonox.net
landauf at orxonox.net
Fri Aug 16 21:39:29 CEST 2013
Author: landauf
Date: 2013-08-16 21:39:29 +0200 (Fri, 16 Aug 2013)
New Revision: 9653
Added:
code/branches/core6/src/libraries/core/config/Configurable.cc
Modified:
code/branches/core6/src/libraries/core/config/CMakeLists.txt
code/branches/core6/src/libraries/core/config/Configurable.h
code/branches/core6/test/core/class/IdentifierClassHierarchyTest.cc
code/branches/core6/test/core/class/IdentifierExternalClassHierarchyTest.cc
code/branches/core6/test/core/class/IdentifierSimpleClassHierarchyTest.cc
Log:
register Configurable in the framework
Modified: code/branches/core6/src/libraries/core/config/CMakeLists.txt
===================================================================
--- code/branches/core6/src/libraries/core/config/CMakeLists.txt 2013-08-16 19:38:00 UTC (rev 9652)
+++ code/branches/core6/src/libraries/core/config/CMakeLists.txt 2013-08-16 19:39:29 UTC (rev 9653)
@@ -5,6 +5,7 @@
ConfigFileEntryVectorValue.cc
ConfigFileManager.cc
ConfigFileSection.cc
+ Configurable.cc
ConfigValueContainer.cc
SettingsConfigFile.cc
)
Added: code/branches/core6/src/libraries/core/config/Configurable.cc
===================================================================
--- code/branches/core6/src/libraries/core/config/Configurable.cc (rev 0)
+++ code/branches/core6/src/libraries/core/config/Configurable.cc 2013-08-16 19:39:29 UTC (rev 9653)
@@ -0,0 +1,40 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Fabian 'x3n' Landau
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "Configurable.h"
+#include "core/CoreIncludes.h"
+
+namespace orxonox
+{
+ RegisterClassNoArgs(Configurable);
+
+ Configurable::Configurable()
+ {
+ RegisterObject(Configurable);
+ }
+}
Property changes on: code/branches/core6/src/libraries/core/config/Configurable.cc
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/branches/core6/src/libraries/core/config/Configurable.h
===================================================================
--- code/branches/core6/src/libraries/core/config/Configurable.h 2013-08-16 19:38:00 UTC (rev 9652)
+++ code/branches/core6/src/libraries/core/config/Configurable.h 2013-08-16 19:39:29 UTC (rev 9653)
@@ -47,6 +47,8 @@
class _CoreExport Configurable : virtual public Listable
{
public:
+ Configurable();
+
/// Function to collect the SetConfigValue-macro calls.
void setConfigValues() {};
};
Modified: code/branches/core6/test/core/class/IdentifierClassHierarchyTest.cc
===================================================================
--- code/branches/core6/test/core/class/IdentifierClassHierarchyTest.cc 2013-08-16 19:38:00 UTC (rev 9652)
+++ code/branches/core6/test/core/class/IdentifierClassHierarchyTest.cc 2013-08-16 19:39:29 UTC (rev 9653)
@@ -131,6 +131,7 @@
{
registerClass("Context", new ClassFactoryWithContext<Context>());
registerClass("Listable", new ClassFactoryWithContext<Listable>());
+ registerClass("Configurable", new ClassFactoryNoArgs<Configurable>());
registerClass("OrxonoxInterface", new ClassFactoryNoArgs<OrxonoxInterface>());
registerClass("OrxonoxClass", new ClassFactoryNoArgs<OrxonoxClass>());
registerClass("BaseInterface1", static_cast<ClassFactory<BaseInterface1>*>(NULL), false).inheritsFrom(Class(OrxonoxInterface));
@@ -231,9 +232,10 @@
EXPECT_EQ(1u, identifier->getDirectParents().size());
EXPECT_TRUE(contains(identifier->getDirectParents(), Class(OrxonoxInterface)));
- EXPECT_EQ(3u, identifier->getParents().size());
+ EXPECT_EQ(4u, identifier->getParents().size());
EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable)));
EXPECT_TRUE(contains(identifier->getParents(), Class(Listable)));
+ EXPECT_TRUE(contains(identifier->getParents(), Class(Configurable)));
EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxInterface)));
}
@@ -254,9 +256,10 @@
EXPECT_EQ(1u, identifier->getDirectParents().size());
EXPECT_TRUE(contains(identifier->getDirectParents(), Class(OrxonoxInterface)));
- EXPECT_EQ(3u, identifier->getParents().size());
+ EXPECT_EQ(4u, identifier->getParents().size());
EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable)));
EXPECT_TRUE(contains(identifier->getParents(), Class(Listable)));
+ EXPECT_TRUE(contains(identifier->getParents(), Class(Configurable)));
EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxInterface)));
}
@@ -277,9 +280,10 @@
EXPECT_EQ(1u, identifier->getDirectParents().size());
EXPECT_TRUE(contains(identifier->getDirectParents(), Class(BaseInterface1)));
- EXPECT_EQ(4u, identifier->getParents().size());
+ EXPECT_EQ(5u, identifier->getParents().size());
EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable)));
EXPECT_TRUE(contains(identifier->getParents(), Class(Listable)));
+ EXPECT_TRUE(contains(identifier->getParents(), Class(Configurable)));
EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxInterface)));
EXPECT_TRUE(contains(identifier->getParents(), Class(BaseInterface1)));
}
@@ -299,9 +303,10 @@
EXPECT_EQ(1u, identifier->getDirectParents().size());
EXPECT_TRUE(contains(identifier->getDirectParents(), Class(BaseInterface2)));
- EXPECT_EQ(4u, identifier->getParents().size());
+ EXPECT_EQ(5u, identifier->getParents().size());
EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable)));
EXPECT_TRUE(contains(identifier->getParents(), Class(Listable)));
+ EXPECT_TRUE(contains(identifier->getParents(), Class(Configurable)));
EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxInterface)));
EXPECT_TRUE(contains(identifier->getParents(), Class(BaseInterface2)));
}
@@ -327,9 +332,10 @@
EXPECT_EQ(1u, identifier->getDirectParents().size());
EXPECT_TRUE(contains(identifier->getDirectParents(), Class(OrxonoxClass)));
- EXPECT_EQ(3u, identifier->getParents().size());
+ EXPECT_EQ(4u, identifier->getParents().size());
EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable)));
EXPECT_TRUE(contains(identifier->getParents(), Class(Listable)));
+ EXPECT_TRUE(contains(identifier->getParents(), Class(Configurable)));
EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxClass)));
}
@@ -344,9 +350,10 @@
EXPECT_EQ(1u, identifier->getDirectParents().size());
EXPECT_TRUE(contains(identifier->getDirectParents(), Class(BaseClass)));
- EXPECT_EQ(4u, identifier->getParents().size());
+ EXPECT_EQ(5u, identifier->getParents().size());
EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable)));
EXPECT_TRUE(contains(identifier->getParents(), Class(Listable)));
+ EXPECT_TRUE(contains(identifier->getParents(), Class(Configurable)));
EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxClass)));
EXPECT_TRUE(contains(identifier->getParents(), Class(BaseClass)));
}
@@ -363,9 +370,10 @@
EXPECT_TRUE(contains(identifier->getDirectParents(), Class(BaseClass)));
EXPECT_TRUE(contains(identifier->getDirectParents(), Class(Interface1)));
- EXPECT_EQ(7u, identifier->getParents().size());
+ EXPECT_EQ(8u, identifier->getParents().size());
EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable)));
EXPECT_TRUE(contains(identifier->getParents(), Class(Listable)));
+ EXPECT_TRUE(contains(identifier->getParents(), Class(Configurable)));
EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxClass)));
EXPECT_TRUE(contains(identifier->getParents(), Class(BaseClass)));
EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxInterface)));
@@ -386,9 +394,10 @@
EXPECT_TRUE(contains(identifier->getDirectParents(), Class(Interface1)));
EXPECT_TRUE(contains(identifier->getDirectParents(), Class(Interface2)));
- EXPECT_EQ(9u, identifier->getParents().size());
+ EXPECT_EQ(10u, identifier->getParents().size());
EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable)));
EXPECT_TRUE(contains(identifier->getParents(), Class(Listable)));
+ EXPECT_TRUE(contains(identifier->getParents(), Class(Configurable)));
EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxClass)));
EXPECT_TRUE(contains(identifier->getParents(), Class(BaseClass)));
EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxInterface)));
@@ -411,9 +420,10 @@
EXPECT_TRUE(contains(identifier->getDirectParents(), Class(Interface1)));
EXPECT_TRUE(contains(identifier->getDirectParents(), Class(Interface2)));
- EXPECT_EQ(9u, identifier->getParents().size());
+ EXPECT_EQ(10u, identifier->getParents().size());
EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable)));
EXPECT_TRUE(contains(identifier->getParents(), Class(Listable)));
+ EXPECT_TRUE(contains(identifier->getParents(), Class(Configurable)));
EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxClass)));
EXPECT_TRUE(contains(identifier->getParents(), Class(BaseClass)));
EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxInterface)));
@@ -436,9 +446,10 @@
EXPECT_TRUE(contains(identifier->getDirectParents(), Class(BaseInterface1)));
EXPECT_TRUE(contains(identifier->getDirectParents(), Class(BaseInterface2)));
- EXPECT_EQ(7u, identifier->getParents().size());
+ EXPECT_EQ(8u, identifier->getParents().size());
EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable)));
EXPECT_TRUE(contains(identifier->getParents(), Class(Listable)));
+ EXPECT_TRUE(contains(identifier->getParents(), Class(Configurable)));
EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxClass)));
EXPECT_TRUE(contains(identifier->getParents(), Class(BaseClass)));
EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxInterface)));
Modified: code/branches/core6/test/core/class/IdentifierExternalClassHierarchyTest.cc
===================================================================
--- code/branches/core6/test/core/class/IdentifierExternalClassHierarchyTest.cc 2013-08-16 19:38:00 UTC (rev 9652)
+++ code/branches/core6/test/core/class/IdentifierExternalClassHierarchyTest.cc 2013-08-16 19:39:29 UTC (rev 9653)
@@ -43,6 +43,8 @@
public:
virtual void SetUp()
{
+ registerClass("Context", new ClassFactoryWithContext<Context>());
+ registerClass("Listable", new ClassFactoryWithContext<Listable>());
registerClass("Interface", static_cast<ClassFactory<Interface>*>(NULL), false).inheritsFrom(Class(Identifiable));
registerClass("BaseClass", new ClassFactoryNoArgs<BaseClass>());
registerClass("RealClass", new ClassFactoryNoArgs<RealClass>());
Modified: code/branches/core6/test/core/class/IdentifierSimpleClassHierarchyTest.cc
===================================================================
--- code/branches/core6/test/core/class/IdentifierSimpleClassHierarchyTest.cc 2013-08-16 19:38:00 UTC (rev 9652)
+++ code/branches/core6/test/core/class/IdentifierSimpleClassHierarchyTest.cc 2013-08-16 19:39:29 UTC (rev 9653)
@@ -47,6 +47,7 @@
{
registerClass("Context", new ClassFactoryWithContext<Context>());
registerClass("Listable", new ClassFactoryWithContext<Listable>());
+ registerClass("Configurable", new ClassFactoryNoArgs<Configurable>());
registerClass("OrxonoxInterface", new ClassFactoryNoArgs<OrxonoxInterface>());
registerClass("OrxonoxClass", new ClassFactoryNoArgs<OrxonoxClass>());
registerClass("Interface", static_cast<ClassFactory<Interface>*>(NULL), false).inheritsFrom(Class(OrxonoxInterface));
@@ -100,9 +101,10 @@
EXPECT_EQ(1u, identifier->getDirectParents().size());
EXPECT_TRUE(contains(identifier->getDirectParents(), Class(OrxonoxInterface)));
- EXPECT_EQ(3u, identifier->getParents().size());
+ EXPECT_EQ(4u, identifier->getParents().size());
EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable)));
EXPECT_TRUE(contains(identifier->getParents(), Class(Listable)));
+ EXPECT_TRUE(contains(identifier->getParents(), Class(Configurable)));
EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxInterface)));
}
@@ -119,9 +121,10 @@
EXPECT_EQ(1u, identifier->getDirectParents().size());
EXPECT_TRUE(contains(identifier->getDirectParents(), Class(OrxonoxClass)));
- EXPECT_EQ(3u, identifier->getParents().size());
+ EXPECT_EQ(4u, identifier->getParents().size());
EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable)));
EXPECT_TRUE(contains(identifier->getParents(), Class(Listable)));
+ EXPECT_TRUE(contains(identifier->getParents(), Class(Configurable)));
EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxClass)));
}
@@ -137,9 +140,10 @@
EXPECT_TRUE(contains(identifier->getDirectParents(), Class(Interface)));
EXPECT_TRUE(contains(identifier->getDirectParents(), Class(BaseClass)));
- EXPECT_EQ(6u, identifier->getParents().size());
+ EXPECT_EQ(7u, identifier->getParents().size());
EXPECT_TRUE(contains(identifier->getParents(), Class(Identifiable)));
EXPECT_TRUE(contains(identifier->getParents(), Class(Listable)));
+ EXPECT_TRUE(contains(identifier->getParents(), Class(Configurable)));
EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxInterface)));
EXPECT_TRUE(contains(identifier->getParents(), Class(OrxonoxClass)));
EXPECT_TRUE(contains(identifier->getParents(), Class(Interface)));
More information about the Orxonox-commit
mailing list