2006-01-19 Al Riddoch <alriddoch@zepler.org>
* aiclient/ClientAccount.cpp, aiclient/ClientAccount.h,
aiclient/ClientConnection.cpp, aiclient/ClientConnection.h,
aiclient/client.cpp, aiclient/client.h, client/BaseClient.cpp,
client/BaseClient.h, client/CharacterClient.cpp,
client/CharacterClient.h, client/ClientConnection.cpp,
client/ClientConnection.h, client/CreatorClient.cpp,
client/CreatorClient.h, client/ObserverClient.cpp,
client/ObserverClient.h, client/Py_CreatorClient.cpp,
client/Py_CreatorClient.h, client/client.cpp,
client/define_world.cpp, client/define_world.h, common/Add.h,
common/Affect.h, common/AtlasFileLoader.cpp,
common/AtlasFileLoader.h, common/Attack.h, common/BaseEntity.cpp,
common/BaseEntity.h, common/BaseWorld.cpp, common/BaseWorld.h,
common/Burn.h, common/Chop.h, common/Connect.h, common/CustomOp.cpp,
common/CustomOp.h, common/CustomOp_impl.h, common/Cut.h,
common/Database.cpp, common/Database.h, common/Delve.h, common/Dig.h,
common/Eat.h, common/FormattedXMLWriter.cpp,
common/FormattedXMLWriter.h, common/Generic.h, common/Load.h,
common/Monitor.h, common/Mow.h, common/Nourish.h,
common/OOGThing.cpp, common/OOGThing.h, common/Property.cpp,
common/Property.h, common/Property_impl.h, common/Save.h,
common/Setup.h, common/Tick.h, common/Unseen.h, common/Update.h,
common/Use.h, common/Wield.h, common/accountbase.cpp,
common/accountbase.h, common/const.cpp, common/const.h,
common/custom.cpp, common/debug.h, common/globals.cpp,
common/globals.h, common/id.cpp, common/id.h, common/inheritance.cpp,
common/inheritance.h, common/inheritance_impl.h, common/log.cpp,
common/log.h, common/newid.cpp, common/nls.h, common/op_switch.h,
common/operations.cpp, common/operations.h, common/random.h,
common/refno.h, common/serialno.cpp, common/serialno.h,
common/system.cpp, common/system.h, common/terrain_utils.cpp,
common/terrain_utils.h, common/type_utils.h, common/types.h,
common/utility.cpp, common/utility.h, modules/DateTime.cpp,
modules/DateTime.h, modules/Location.cpp, modules/Location.h,
modules/WorldTime.cpp, modules/WorldTime.h, physics/BBox.cpp,
physics/BBox.h, physics/Collision.cpp, physics/Collision.h,
physics/Quaternion.cpp, physics/Quaternion.h, physics/Vector3D.cpp,
physics/Vector3D.h, physics/VectorPol.h, rulesets/Area.cpp,
rulesets/Area.h, rulesets/AreaProperty.cpp, rulesets/AreaProperty.h,
rulesets/ArithmeticScript.cpp, rulesets/ArithmeticScript.h,
rulesets/BaseMind.cpp, rulesets/BaseMind.h,
rulesets/CalendarProperty.cpp, rulesets/CalendarProperty.h,
rulesets/Character.cpp, rulesets/Character.h, rulesets/Combat.cpp,
rulesets/Combat.h, rulesets/Container.cpp, rulesets/Container.h,
rulesets/Creator.cpp, rulesets/Creator.h, rulesets/Entity.cpp,
rulesets/Entity.h, rulesets/EntityProperties.cpp,
rulesets/Entity_getLocation.h, rulesets/Fell.cpp, rulesets/Fell.h,
rulesets/Food.cpp, rulesets/Food.h, rulesets/Line.cpp,
rulesets/Line.h, rulesets/LineProperty.cpp, rulesets/LineProperty.h,
rulesets/MemEntity.cpp, rulesets/MemEntity.h, rulesets/MemMap.cpp,
rulesets/MemMap.h, rulesets/MemMap_methods.h,
rulesets/MindFactory.cpp, rulesets/MindFactory.h, rulesets/Missile.h,
rulesets/Motion.cpp, rulesets/Motion.h, rulesets/Movement.cpp,
rulesets/Movement.h, rulesets/Pedestrian.cpp, rulesets/Pedestrian.h,
rulesets/Plant.cpp, rulesets/Plant.h, rulesets/Py_BBox.cpp,
rulesets/Py_BBox.h, rulesets/Py_EntityWrapper.h,
rulesets/Py_Location.cpp, rulesets/Py_Location.h,
rulesets/Py_Map.cpp, rulesets/Py_Map.h, rulesets/Py_Mind.cpp,
rulesets/Py_Mind.h, rulesets/Py_Object.cpp, rulesets/Py_Object.h,
rulesets/Py_Operation.cpp, rulesets/Py_Operation.h,
rulesets/Py_Oplist.cpp, rulesets/Py_Oplist.h, rulesets/Py_Optime.cpp,
rulesets/Py_Optime.h, rulesets/Py_Point3D.cpp, rulesets/Py_Point3D.h,
rulesets/Py_Property.cpp, rulesets/Py_Property.h,
rulesets/Py_Quaternion.cpp, rulesets/Py_Quaternion.h,
rulesets/Py_RootEntity.cpp, rulesets/Py_RootEntity.h,
rulesets/Py_Statistics.cpp, rulesets/Py_Statistics.h,
rulesets/Py_Task.cpp, rulesets/Py_Task.h, rulesets/Py_Thing.cpp,
rulesets/Py_Thing.h, rulesets/Py_Vector3D.cpp,
rulesets/Py_Vector3D.h, rulesets/Py_World.cpp, rulesets/Py_World.h,
rulesets/Py_WorldTime.cpp, rulesets/Py_WorldTime.h,
rulesets/PythonArithmeticScript.cpp,
rulesets/PythonArithmeticScript.h, rulesets/PythonMindScript.cpp,
rulesets/PythonMindScript.h, rulesets/PythonScript.cpp,
rulesets/PythonScript.h, rulesets/PythonThingScript.cpp,
rulesets/PythonThingScript.h, rulesets/PythonWrapper.cpp,
rulesets/PythonWrapper.h, rulesets/Python_API.cpp,
rulesets/Python_API.h, rulesets/Python_Script_Utils.h,
rulesets/Script.cpp, rulesets/Script.h, rulesets/Stackable.cpp,
rulesets/Stackable.h, rulesets/Statistics.cpp, rulesets/Statistics.h,
rulesets/StatisticsProperty.cpp, rulesets/StatisticsProperty.h,
rulesets/Structure.cpp, rulesets/Structure.h, rulesets/Task.cpp,
rulesets/Task.h, rulesets/TaskScript.cpp, rulesets/TaskScript.h,
rulesets/TerrainProperty.cpp, rulesets/TerrainProperty.h,
rulesets/Thing.cpp, rulesets/Thing.h, rulesets/ThingFactory.cpp,
rulesets/ThingFactory.h, rulesets/World.cpp, rulesets/World.h,
rulesets/attributes.h, server/Account.cpp, server/Account.h,
server/Admin.cpp, server/Admin.h, server/ArithmeticFactory.cpp,
server/ArithmeticFactory.h, server/CommClient.cpp,
server/CommClient.h, server/CommIdleSocket.cpp,
server/CommIdleSocket.h, server/CommListener.cpp,
server/CommListener.h, server/CommLocalClient.cpp,
server/CommLocalClient.h, server/CommMDNSPublisher.cpp,
server/CommMDNSPublisher.h, server/CommMaster.cpp,
server/CommMaster.h, server/CommMetaClient.cpp,
server/CommMetaClient.h, server/CommPSQLSocket.cpp,
server/CommPSQLSocket.h, server/CommPeer.cpp,
server/CommPeer.h, server/CommPeerListener.cpp,
server/CommPeerListener.h, server/CommRemoteClient.cpp,
server/CommRemoteClient.h, server/CommServer.cpp,
server/CommServer.h, server/CommSlaveClient.cpp,
server/CommSlaveClient.h, server/CommSlaveListener.cpp,
server/CommSlaveListener.h, server/CommSocket.cpp,
server/CommSocket.h, server/CommUnixListener.cpp,
server/CommUnixListener.h, server/Connection.cpp,
server/Connection.h, server/Connection_methods.h,
server/EntityFactory.cpp, server/EntityFactory.h,
server/ExternalMind.cpp, server/ExternalMind.h,
server/Idle.cpp, server/Idle.h, server/Lobby.cpp, server/Lobby.h,
server/Master.cpp, server/Master.h, server/Peer.cpp, server/Peer.h,
server/Persistance.cpp, server/Persistance.h,
server/PersistantThingFactory.cpp, server/PersistantThingFactory.h,
server/PersistantThingFactory_impl.h, server/Persistor.cpp,
server/Persistor.h, server/Persistor_impl.h,
server/Player.cpp, server/Player.h, server/Restoration.cpp,
server/Restoration.h, server/Restorer.cpp, server/Restorer.h,
server/Restorer_impl.h, server/ScriptFactory.cpp,
server/ScriptFactory.h, server/ServerRouting.cpp,
server/ServerRouting.h, server/ServerRouting_methods.h,
server/SlaveClientConnection.cpp, server/SlaveClientConnection.h,
server/TaskFactory.cpp, server/TaskFactory.h,
server/TrustedConnection.cpp, server/TrustedConnection.h,
server/WorldRouter.cpp, server/WorldRouter.h,
server/server.cpp, server/server.h, server/slave.cpp,
tests/Areatest.cpp, tests/BaseEntitytest.cpp,
tests/Charactertest.cpp, tests/Containertest.cpp,
tests/Creatortest.cpp, tests/EntityExerciser.h,
tests/EntityFactorytest.cpp, tests/Entitytest.cpp,
tests/Foodtest.cpp, tests/IGEntityExerciser.h,
tests/Linetest.cpp, tests/Locationtest.cpp, tests/OOGThingtest.cpp,
tests/Planttest.cpp, tests/Propertytest.cpp, tests/Stackabletest.cpp,
tests/Structuretest.cpp, tests/Tasktest.cpp, tests/TestWorld.h,
tests/Thingtest.cpp, tests/WorldTimetest.cpp, tests/Worldtest.cpp,
tests/allOperations.h, tests/collisiontest.cpp, tests/consttest.cpp,
tests/distancetest.cpp, tests/emergencetest.cpp,
tests/inheritancetest.cpp, tests/logtest.cpp, tests/randomtest.cpp,
tests/systemtest.cpp, tests/transformtest.cpp,
tests/type_utilstest.cpp, tests/utilitytest.cpp,
tools/AdminClient.cpp, tools/AdminClient.h, tools/cyaddrules.cpp,
tools/cycmd.cpp, tools/cyconfig.cpp, tools/cyconvertrules.cpp,
tools/cyctrl.cpp, tools/cydbload.cpp, tools/cydumprules.cpp,
tools/cyisoload.cpp, tools/cyloadrules.cpp, tools/cypasswd.cpp,
tools/cywatchdog.cpp: Replace the copyright and license statements
with new versions that include disclaimer of warranty, and
permit distribution under later versions of the GPL.
2006-01-19 02:17:06 +00:00
|
|
|
// Cyphesis Online RPG Server and AI Engine
|
2003-09-09 17:17:26 +00:00
|
|
|
// Copyright (C) 2003 Alistair Riddoch
|
2006-01-19 Al Riddoch <alriddoch@zepler.org>
* aiclient/ClientAccount.cpp, aiclient/ClientAccount.h,
aiclient/ClientConnection.cpp, aiclient/ClientConnection.h,
aiclient/client.cpp, aiclient/client.h, client/BaseClient.cpp,
client/BaseClient.h, client/CharacterClient.cpp,
client/CharacterClient.h, client/ClientConnection.cpp,
client/ClientConnection.h, client/CreatorClient.cpp,
client/CreatorClient.h, client/ObserverClient.cpp,
client/ObserverClient.h, client/Py_CreatorClient.cpp,
client/Py_CreatorClient.h, client/client.cpp,
client/define_world.cpp, client/define_world.h, common/Add.h,
common/Affect.h, common/AtlasFileLoader.cpp,
common/AtlasFileLoader.h, common/Attack.h, common/BaseEntity.cpp,
common/BaseEntity.h, common/BaseWorld.cpp, common/BaseWorld.h,
common/Burn.h, common/Chop.h, common/Connect.h, common/CustomOp.cpp,
common/CustomOp.h, common/CustomOp_impl.h, common/Cut.h,
common/Database.cpp, common/Database.h, common/Delve.h, common/Dig.h,
common/Eat.h, common/FormattedXMLWriter.cpp,
common/FormattedXMLWriter.h, common/Generic.h, common/Load.h,
common/Monitor.h, common/Mow.h, common/Nourish.h,
common/OOGThing.cpp, common/OOGThing.h, common/Property.cpp,
common/Property.h, common/Property_impl.h, common/Save.h,
common/Setup.h, common/Tick.h, common/Unseen.h, common/Update.h,
common/Use.h, common/Wield.h, common/accountbase.cpp,
common/accountbase.h, common/const.cpp, common/const.h,
common/custom.cpp, common/debug.h, common/globals.cpp,
common/globals.h, common/id.cpp, common/id.h, common/inheritance.cpp,
common/inheritance.h, common/inheritance_impl.h, common/log.cpp,
common/log.h, common/newid.cpp, common/nls.h, common/op_switch.h,
common/operations.cpp, common/operations.h, common/random.h,
common/refno.h, common/serialno.cpp, common/serialno.h,
common/system.cpp, common/system.h, common/terrain_utils.cpp,
common/terrain_utils.h, common/type_utils.h, common/types.h,
common/utility.cpp, common/utility.h, modules/DateTime.cpp,
modules/DateTime.h, modules/Location.cpp, modules/Location.h,
modules/WorldTime.cpp, modules/WorldTime.h, physics/BBox.cpp,
physics/BBox.h, physics/Collision.cpp, physics/Collision.h,
physics/Quaternion.cpp, physics/Quaternion.h, physics/Vector3D.cpp,
physics/Vector3D.h, physics/VectorPol.h, rulesets/Area.cpp,
rulesets/Area.h, rulesets/AreaProperty.cpp, rulesets/AreaProperty.h,
rulesets/ArithmeticScript.cpp, rulesets/ArithmeticScript.h,
rulesets/BaseMind.cpp, rulesets/BaseMind.h,
rulesets/CalendarProperty.cpp, rulesets/CalendarProperty.h,
rulesets/Character.cpp, rulesets/Character.h, rulesets/Combat.cpp,
rulesets/Combat.h, rulesets/Container.cpp, rulesets/Container.h,
rulesets/Creator.cpp, rulesets/Creator.h, rulesets/Entity.cpp,
rulesets/Entity.h, rulesets/EntityProperties.cpp,
rulesets/Entity_getLocation.h, rulesets/Fell.cpp, rulesets/Fell.h,
rulesets/Food.cpp, rulesets/Food.h, rulesets/Line.cpp,
rulesets/Line.h, rulesets/LineProperty.cpp, rulesets/LineProperty.h,
rulesets/MemEntity.cpp, rulesets/MemEntity.h, rulesets/MemMap.cpp,
rulesets/MemMap.h, rulesets/MemMap_methods.h,
rulesets/MindFactory.cpp, rulesets/MindFactory.h, rulesets/Missile.h,
rulesets/Motion.cpp, rulesets/Motion.h, rulesets/Movement.cpp,
rulesets/Movement.h, rulesets/Pedestrian.cpp, rulesets/Pedestrian.h,
rulesets/Plant.cpp, rulesets/Plant.h, rulesets/Py_BBox.cpp,
rulesets/Py_BBox.h, rulesets/Py_EntityWrapper.h,
rulesets/Py_Location.cpp, rulesets/Py_Location.h,
rulesets/Py_Map.cpp, rulesets/Py_Map.h, rulesets/Py_Mind.cpp,
rulesets/Py_Mind.h, rulesets/Py_Object.cpp, rulesets/Py_Object.h,
rulesets/Py_Operation.cpp, rulesets/Py_Operation.h,
rulesets/Py_Oplist.cpp, rulesets/Py_Oplist.h, rulesets/Py_Optime.cpp,
rulesets/Py_Optime.h, rulesets/Py_Point3D.cpp, rulesets/Py_Point3D.h,
rulesets/Py_Property.cpp, rulesets/Py_Property.h,
rulesets/Py_Quaternion.cpp, rulesets/Py_Quaternion.h,
rulesets/Py_RootEntity.cpp, rulesets/Py_RootEntity.h,
rulesets/Py_Statistics.cpp, rulesets/Py_Statistics.h,
rulesets/Py_Task.cpp, rulesets/Py_Task.h, rulesets/Py_Thing.cpp,
rulesets/Py_Thing.h, rulesets/Py_Vector3D.cpp,
rulesets/Py_Vector3D.h, rulesets/Py_World.cpp, rulesets/Py_World.h,
rulesets/Py_WorldTime.cpp, rulesets/Py_WorldTime.h,
rulesets/PythonArithmeticScript.cpp,
rulesets/PythonArithmeticScript.h, rulesets/PythonMindScript.cpp,
rulesets/PythonMindScript.h, rulesets/PythonScript.cpp,
rulesets/PythonScript.h, rulesets/PythonThingScript.cpp,
rulesets/PythonThingScript.h, rulesets/PythonWrapper.cpp,
rulesets/PythonWrapper.h, rulesets/Python_API.cpp,
rulesets/Python_API.h, rulesets/Python_Script_Utils.h,
rulesets/Script.cpp, rulesets/Script.h, rulesets/Stackable.cpp,
rulesets/Stackable.h, rulesets/Statistics.cpp, rulesets/Statistics.h,
rulesets/StatisticsProperty.cpp, rulesets/StatisticsProperty.h,
rulesets/Structure.cpp, rulesets/Structure.h, rulesets/Task.cpp,
rulesets/Task.h, rulesets/TaskScript.cpp, rulesets/TaskScript.h,
rulesets/TerrainProperty.cpp, rulesets/TerrainProperty.h,
rulesets/Thing.cpp, rulesets/Thing.h, rulesets/ThingFactory.cpp,
rulesets/ThingFactory.h, rulesets/World.cpp, rulesets/World.h,
rulesets/attributes.h, server/Account.cpp, server/Account.h,
server/Admin.cpp, server/Admin.h, server/ArithmeticFactory.cpp,
server/ArithmeticFactory.h, server/CommClient.cpp,
server/CommClient.h, server/CommIdleSocket.cpp,
server/CommIdleSocket.h, server/CommListener.cpp,
server/CommListener.h, server/CommLocalClient.cpp,
server/CommLocalClient.h, server/CommMDNSPublisher.cpp,
server/CommMDNSPublisher.h, server/CommMaster.cpp,
server/CommMaster.h, server/CommMetaClient.cpp,
server/CommMetaClient.h, server/CommPSQLSocket.cpp,
server/CommPSQLSocket.h, server/CommPeer.cpp,
server/CommPeer.h, server/CommPeerListener.cpp,
server/CommPeerListener.h, server/CommRemoteClient.cpp,
server/CommRemoteClient.h, server/CommServer.cpp,
server/CommServer.h, server/CommSlaveClient.cpp,
server/CommSlaveClient.h, server/CommSlaveListener.cpp,
server/CommSlaveListener.h, server/CommSocket.cpp,
server/CommSocket.h, server/CommUnixListener.cpp,
server/CommUnixListener.h, server/Connection.cpp,
server/Connection.h, server/Connection_methods.h,
server/EntityFactory.cpp, server/EntityFactory.h,
server/ExternalMind.cpp, server/ExternalMind.h,
server/Idle.cpp, server/Idle.h, server/Lobby.cpp, server/Lobby.h,
server/Master.cpp, server/Master.h, server/Peer.cpp, server/Peer.h,
server/Persistance.cpp, server/Persistance.h,
server/PersistantThingFactory.cpp, server/PersistantThingFactory.h,
server/PersistantThingFactory_impl.h, server/Persistor.cpp,
server/Persistor.h, server/Persistor_impl.h,
server/Player.cpp, server/Player.h, server/Restoration.cpp,
server/Restoration.h, server/Restorer.cpp, server/Restorer.h,
server/Restorer_impl.h, server/ScriptFactory.cpp,
server/ScriptFactory.h, server/ServerRouting.cpp,
server/ServerRouting.h, server/ServerRouting_methods.h,
server/SlaveClientConnection.cpp, server/SlaveClientConnection.h,
server/TaskFactory.cpp, server/TaskFactory.h,
server/TrustedConnection.cpp, server/TrustedConnection.h,
server/WorldRouter.cpp, server/WorldRouter.h,
server/server.cpp, server/server.h, server/slave.cpp,
tests/Areatest.cpp, tests/BaseEntitytest.cpp,
tests/Charactertest.cpp, tests/Containertest.cpp,
tests/Creatortest.cpp, tests/EntityExerciser.h,
tests/EntityFactorytest.cpp, tests/Entitytest.cpp,
tests/Foodtest.cpp, tests/IGEntityExerciser.h,
tests/Linetest.cpp, tests/Locationtest.cpp, tests/OOGThingtest.cpp,
tests/Planttest.cpp, tests/Propertytest.cpp, tests/Stackabletest.cpp,
tests/Structuretest.cpp, tests/Tasktest.cpp, tests/TestWorld.h,
tests/Thingtest.cpp, tests/WorldTimetest.cpp, tests/Worldtest.cpp,
tests/allOperations.h, tests/collisiontest.cpp, tests/consttest.cpp,
tests/distancetest.cpp, tests/emergencetest.cpp,
tests/inheritancetest.cpp, tests/logtest.cpp, tests/randomtest.cpp,
tests/systemtest.cpp, tests/transformtest.cpp,
tests/type_utilstest.cpp, tests/utilitytest.cpp,
tools/AdminClient.cpp, tools/AdminClient.h, tools/cyaddrules.cpp,
tools/cycmd.cpp, tools/cyconfig.cpp, tools/cyconvertrules.cpp,
tools/cyctrl.cpp, tools/cydbload.cpp, tools/cydumprules.cpp,
tools/cyisoload.cpp, tools/cyloadrules.cpp, tools/cypasswd.cpp,
tools/cywatchdog.cpp: Replace the copyright and license statements
with new versions that include disclaimer of warranty, and
permit distribution under later versions of the GPL.
2006-01-19 02:17:06 +00:00
|
|
|
//
|
|
|
|
|
// 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
|
2003-09-09 12:37:36 +00:00
|
|
|
|
2006-10-26 00:48:00 +00:00
|
|
|
|
2011-02-15 09:30:46 +00:00
|
|
|
#ifdef NDEBUG
|
|
|
|
|
#undef NDEBUG
|
|
|
|
|
#endif
|
|
|
|
|
#ifndef DEBUG
|
|
|
|
|
#define DEBUG
|
|
|
|
|
#endif
|
|
|
|
|
|
2013-02-27 22:02:55 +00:00
|
|
|
#include "TestBase.h"
|
|
|
|
|
|
2009-03-20 15:31:38 +00:00
|
|
|
#include "common/Inheritance.h"
|
2010-03-26 02:25:52 +00:00
|
|
|
|
|
|
|
|
#include "common/log.h"
|
2008-01-14 16:10:18 +00:00
|
|
|
#include "common/OperationRouter.h"
|
2010-03-26 02:25:52 +00:00
|
|
|
#include "common/TypeNode.h"
|
2003-09-09 12:37:36 +00:00
|
|
|
|
2005-09-27 Al Riddoch <alriddoch@zepler.org>
* common/inheritance.cpp, common/inheritance.h: Re-introduce
opEnumerate function as its useful for scripts, and tests.
* tests/inheritancetest.cpp: Add necessary includes to pick up
operation class numbers.
* tests/Areatest.cpp, tests/BaseEntitytest.cpp,
tests/Charactertest.cpp, tests/Creatortest.cpp,
tests/EntityExerciser.h, tests/Entitytest.cpp,
tests/Foodtest.cpp, tests/Linetest.cpp, tests/OOGThingtest.cpp,
tests/Planttest.cpp, tests/Stackabletest.cpp,
tests/Structuretest.cpp, tests/Thingtest.cpp, tests/Worldtest.cpp:
Remove all uses of the removed op subscription mechanism.
2005-09-27 17:45:20 +00:00
|
|
|
#include "common/Eat.h"
|
|
|
|
|
#include "common/Burn.h"
|
|
|
|
|
#include "common/Nourish.h"
|
|
|
|
|
#include "common/Setup.h"
|
|
|
|
|
#include "common/Tick.h"
|
|
|
|
|
|
|
|
|
|
#include <Atlas/Objects/Operation.h>
|
2003-09-09 12:37:36 +00:00
|
|
|
|
2003-09-09 17:29:38 +00:00
|
|
|
#include <cassert>
|
|
|
|
|
|
2004-12-03 Al Riddoch <alriddoch@zepler.org>
* client/BaseClient.cpp, client/BaseClient.h,
client/CharacterClient.cpp, client/CharacterClient.h,
client/ClientConnection.cpp, client/ClientConnection.h,
client/CreatorClient.cpp, client/CreatorClient.h,
client/Py_CreatorClient.cpp, common/BaseEntity.cpp,
common/BaseEntity.h, common/BaseWorld.h, common/custom.cpp,
common/inheritance.cpp, common/inheritance.h,
common/inheritance_impl.h, common/op_switch.h, common/type_utils.h,
common/types.h, common/utility.cpp, common/utility.h,
modules/Location.cpp, rulesets/BaseMind.cpp, rulesets/BaseMind.h,
rulesets/Character.cpp, rulesets/Character.h, rulesets/Creator.cpp,
rulesets/Creator.h, rulesets/Entity.cpp, rulesets/Entity.h,
rulesets/EntityProperties.cpp, rulesets/Entity_getLocation.h,
rulesets/Food.cpp, rulesets/Food.h, rulesets/MemMap.cpp,
rulesets/MemMap.h, rulesets/Missile.h, rulesets/Pedestrian.cpp,
rulesets/Plant.cpp, rulesets/Plant.h, rulesets/Py_Mind.cpp,
rulesets/Py_Object.cpp, rulesets/Py_Operation.cpp,
rulesets/Py_Operation.h, rulesets/Py_Thing.cpp,
rulesets/PythonMindScript.h, rulesets/PythonScript.h,
rulesets/PythonThingScript.h, rulesets/Python_API.cpp,
rulesets/Script.cpp, rulesets/Script.h, rulesets/Stackable.cpp,
rulesets/Stackable.h, rulesets/Thing.cpp, rulesets/Thing.h,
rulesets/World.cpp, rulesets/World.h,
server/Account.cpp, server/Account.h server/Admin.cpp, server/Admin.h,
server/CommClient.cpp, server/Connection.cpp, server/Connection.h,
server/EntityFactory.cpp, server/EntityFactory.h, server/Lobby.cpp,
server/Lobby.h, server/Persistance.cpp, server/Persistance.h,
server/Persistor.cpp, server/Player.cpp, server/Player.h,
server/ServerRouting.cpp, server/ServerRouting.h,
server/TrustedConnection.cpp, server/TrustedConnection.h,
server/WorldRouter.cpp, server/WorldRouter.h, tests/Areatest.cpp,
tests/Charactertest.cpp, tests/Creatortest.cpp,
tests/EntityExerciser.h, tests/Entitytest.cpp, tests/Foodtest.cpp,
tests/IGEntityExerciser.h, tests/Linetest.cpp, tests/Planttest.cpp,
tests/Stackabletest.cpp, tests/Structuretest.cpp, tests/Thingtest.cpp,
tests/Worldtest.cpp, tests/allOperations.h, tests/inheritancetest.cpp,
tests/utilitytest.cpp, tools/cycmd.cpp:
Modify the entity interface so that all Operation methods
take references to RootOperation, as its cleaner, and requires
less nasty casts. Clean up operations in headers generally.
2004-12-03 14:49:13 +00:00
|
|
|
using Atlas::Message::Element;
|
|
|
|
|
using Atlas::Message::ListType;
|
2013-02-27 22:02:55 +00:00
|
|
|
using Atlas::Objects::Factories;
|
|
|
|
|
using Atlas::Objects::generic_factory;
|
2003-09-09 12:37:36 +00:00
|
|
|
using Atlas::Objects::Root;
|
2007-04-22 23:07:18 +00:00
|
|
|
using Atlas::Objects::smart_dynamic_cast;
|
2013-02-27 22:02:55 +00:00
|
|
|
using Atlas::Objects::Operation::Login;
|
2007-04-22 23:07:18 +00:00
|
|
|
using Atlas::Objects::Operation::RootOperation;
|
2003-09-09 12:37:36 +00:00
|
|
|
|
2013-02-27 22:02:55 +00:00
|
|
|
static void descendTree(const Root & type, Inheritance & i, int & count)
|
2003-09-09 12:37:36 +00:00
|
|
|
{
|
2005-08-27 23:54:08 +00:00
|
|
|
assert(type.isValid());
|
2003-09-09 12:37:36 +00:00
|
|
|
++count;
|
|
|
|
|
if (!type->hasAttr("children")) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Element childrenobj = type->getAttr("children");
|
|
|
|
|
assert(childrenobj.isList());
|
2004-08-17 Al Riddoch <alriddoch@zepler.org>
* tests/Areatest.cpp, tests/Entitytest.cpp, tests/Foodtest.cpp,
tests/Linetest.cpp, tests/Planttest.cpp, tests/Stackabletest.cpp,
tests/Structuretest.cpp, tests/Thingtest.cpp, tests/Worldtest.cpp,
tests/inheritancetest.cpp, tests/utilitytest.cpp, tools/cycmd.cpp,
tools/cyconvertrules.cpp, tools/cydbload.cpp, tools/cyisoload.cpp,
tools/cyloadrules.cpp, tools/cypasswd.cpp: Convert code to using
Atlas Message typedefs as found in Atlas-C++ 0.6 to aid
conversion later.
2004-08-17 13:23:28 +00:00
|
|
|
ListType & children = childrenobj.asList();
|
2003-09-09 12:37:36 +00:00
|
|
|
|
2004-11-06 Al Riddoch <alriddoch@zepler.org>
* aiclient/ClientConnection.cpp, client/BaseClient.cpp,
client/CharacterClient.cpp, client/ClientConnection.cpp,
common/Database.cpp, common/FormattedXMLWriter.cpp,
common/inheritance.cpp, common/refno.h, common/terrain_utils.cpp,
common/type_utils.h, common/utility.cpp, modules/WorldTime.cpp,
modules/WorldTime.h, physics/Collision.cpp, rulesets/Area.cpp,
rulesets/BaseMind.cpp, rulesets/Character.cpp, rulesets/Entity.cpp,
rulesets/Line.cpp, rulesets/MemMap.cpp, rulesets/MemMap_methods.h,
rulesets/Movement.cpp, rulesets/Plant.cpp, rulesets/Py_Map.cpp,
rulesets/Py_Object.cpp, rulesets/Py_Operation.cpp,
rulesets/Py_Oplist.cpp, rulesets/PythonMindScript.cpp,
rulesets/PythonThingScript.cpp, rulesets/Python_API.cpp,
rulesets/Stackable.cpp, rulesets/TerrainProperty.cpp,
rulesets/Thing.cpp, rulesets/World.cpp, server/Account.cpp,
server/CommClient.cpp, server/CommServer.cpp, server/Connection.cpp,
server/EntityFactory.cpp, server/Lobby.cpp, server/Persistance.cpp,
server/Player.cpp, server/Restoration.cpp, server/ServerRouting.cpp,
server/WorldRouter.cpp, tests/EntityExerciser.h,
tests/IGEntityExerciser.h, tests/inheritancetest.cpp,
tools/cycmd.cpp, tools/cyconvertrules.cpp, tools/cydbload.cpp,
tools/cyloadrules.cpp:
Tweak for loops to avoid creating a temporary iterator each
iteration.
* tests/type_utilstest.cpp: New test for function which does
list conversions.
2004-11-06 20:36:03 +00:00
|
|
|
|
|
|
|
|
ListType::const_iterator Iend = children.end();
|
|
|
|
|
for (ListType::const_iterator I = children.begin(); I != Iend; ++I) {
|
2003-09-09 12:37:36 +00:00
|
|
|
const Element & e = *I;
|
|
|
|
|
assert(e.isString());
|
2004-08-17 Al Riddoch <alriddoch@zepler.org>
* tests/Areatest.cpp, tests/Entitytest.cpp, tests/Foodtest.cpp,
tests/Linetest.cpp, tests/Planttest.cpp, tests/Stackabletest.cpp,
tests/Structuretest.cpp, tests/Thingtest.cpp, tests/Worldtest.cpp,
tests/inheritancetest.cpp, tests/utilitytest.cpp, tools/cycmd.cpp,
tools/cyconvertrules.cpp, tools/cydbload.cpp, tools/cyisoload.cpp,
tools/cyloadrules.cpp, tools/cypasswd.cpp: Convert code to using
Atlas Message typedefs as found in Atlas-C++ 0.6 to aid
conversion later.
2004-08-17 13:23:28 +00:00
|
|
|
const std::string & es = e.asString();
|
2003-09-09 12:37:36 +00:00
|
|
|
assert(!es.empty());
|
2005-08-27 23:54:08 +00:00
|
|
|
const Root & child = i.getClass(es);
|
2003-09-09 12:37:36 +00:00
|
|
|
descendTree(child, i, count);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
2013-02-27 22:02:55 +00:00
|
|
|
class Inheritancetest : public Cyphesis::TestBase
|
|
|
|
|
{
|
|
|
|
|
public:
|
|
|
|
|
static int SQUIGGLYMUFF_NO;
|
|
|
|
|
|
|
|
|
|
Inheritancetest();
|
|
|
|
|
|
|
|
|
|
virtual void setup();
|
|
|
|
|
virtual void teardown();
|
|
|
|
|
|
|
|
|
|
void test_builtins();
|
|
|
|
|
void test_hasClass();
|
|
|
|
|
void test_getType();
|
|
|
|
|
void test_getClass();
|
|
|
|
|
void test_tree();
|
|
|
|
|
void test_addChild_unknown_parent();
|
|
|
|
|
void test_addChild();
|
|
|
|
|
void test_addChild_duplicate();
|
|
|
|
|
void test_updateClass_nonexist();
|
|
|
|
|
void test_updateClass_operation();
|
2013-03-03 22:17:57 +00:00
|
|
|
void test_updateClass_change_parent();
|
2013-02-27 22:02:55 +00:00
|
|
|
void test_isTypeOf_string();
|
|
|
|
|
void test_isTypeOf_TypeNode();
|
|
|
|
|
void test_isTypeOf_TypeNode2();
|
|
|
|
|
void test_flush();
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
int Inheritancetest::SQUIGGLYMUFF_NO = OP_INVALID;
|
|
|
|
|
|
|
|
|
|
Inheritancetest::Inheritancetest()
|
|
|
|
|
{
|
|
|
|
|
if (SQUIGGLYMUFF_NO == OP_INVALID) {
|
|
|
|
|
SQUIGGLYMUFF_NO = Factories::instance()->addFactory("squigglymuff",
|
2011-12-01 17:57:15 +01:00
|
|
|
&generic_factory, &Atlas::Objects::defaultInstance<Atlas::Objects::RootData>);
|
2013-02-27 22:02:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ADD_TEST(Inheritancetest::test_builtins);
|
|
|
|
|
ADD_TEST(Inheritancetest::test_hasClass);
|
|
|
|
|
ADD_TEST(Inheritancetest::test_getType);
|
|
|
|
|
ADD_TEST(Inheritancetest::test_getClass);
|
|
|
|
|
ADD_TEST(Inheritancetest::test_tree);
|
|
|
|
|
ADD_TEST(Inheritancetest::test_addChild_unknown_parent);
|
|
|
|
|
ADD_TEST(Inheritancetest::test_addChild);
|
|
|
|
|
ADD_TEST(Inheritancetest::test_addChild_duplicate);
|
|
|
|
|
ADD_TEST(Inheritancetest::test_updateClass_nonexist);
|
|
|
|
|
ADD_TEST(Inheritancetest::test_updateClass_operation);
|
2013-03-03 22:17:57 +00:00
|
|
|
ADD_TEST(Inheritancetest::test_updateClass_change_parent);
|
2013-02-27 22:02:55 +00:00
|
|
|
ADD_TEST(Inheritancetest::test_isTypeOf_string);
|
|
|
|
|
ADD_TEST(Inheritancetest::test_isTypeOf_TypeNode);
|
|
|
|
|
ADD_TEST(Inheritancetest::test_isTypeOf_TypeNode2);
|
|
|
|
|
ADD_TEST(Inheritancetest::test_flush);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Inheritancetest::setup()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Inheritancetest::teardown()
|
|
|
|
|
{
|
|
|
|
|
Inheritance::clear();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Inheritancetest::test_builtins()
|
2003-09-09 12:37:36 +00:00
|
|
|
{
|
|
|
|
|
Inheritance & i = Inheritance::instance();
|
|
|
|
|
|
2007-04-22 23:07:18 +00:00
|
|
|
assert(&i == &Inheritance::instance());
|
2013-02-27 22:02:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Inheritancetest::test_hasClass()
|
|
|
|
|
{
|
|
|
|
|
Inheritance & i = Inheritance::instance();
|
|
|
|
|
|
|
|
|
|
ASSERT_TRUE(i.hasClass("root"));
|
|
|
|
|
ASSERT_TRUE(i.hasClass("root_entity"));
|
|
|
|
|
ASSERT_TRUE(i.hasClass("root_operation"));
|
|
|
|
|
ASSERT_TRUE(i.hasClass("login"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Inheritancetest::test_getType()
|
|
|
|
|
{
|
|
|
|
|
Inheritance & i = Inheritance::instance();
|
2007-04-22 23:07:18 +00:00
|
|
|
|
2009-04-30 07:32:15 +01:00
|
|
|
const TypeNode * rt_node = i.getType("root");
|
2010-08-17 19:22:16 +01:00
|
|
|
assert(rt_node != 0);
|
2009-04-30 07:32:15 +01:00
|
|
|
|
2013-02-27 22:02:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Inheritancetest::test_getClass()
|
|
|
|
|
{
|
|
|
|
|
Inheritance & i = Inheritance::instance();
|
|
|
|
|
|
|
|
|
|
const Root & rt = i.getClass("root");
|
|
|
|
|
|
|
|
|
|
ASSERT_EQUAL(rt->getId(), "root");
|
|
|
|
|
ASSERT_TRUE(rt->getParents().empty());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Inheritancetest::test_tree()
|
|
|
|
|
{
|
|
|
|
|
Inheritance & i = Inheritance::instance();
|
|
|
|
|
|
2005-08-27 23:54:08 +00:00
|
|
|
const Root & rt = i.getClass("root");
|
2003-09-09 12:37:36 +00:00
|
|
|
|
|
|
|
|
// Make sure the type tree is coherent, and contains a decent
|
|
|
|
|
// number of types.
|
|
|
|
|
int count = 0;
|
|
|
|
|
descendTree(rt, i, count);
|
|
|
|
|
assert(count > 20);
|
2013-02-27 22:02:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Inheritancetest::test_addChild_unknown_parent()
|
|
|
|
|
{
|
|
|
|
|
Inheritance & i = Inheritance::instance();
|
|
|
|
|
|
|
|
|
|
// Make sure inserting a type with unknown parents fails with null
|
|
|
|
|
Root r;
|
|
|
|
|
r->setId("squigglymuff");
|
|
|
|
|
r->setParents(std::list<std::string>(1, "ludricous_test_parent"));
|
|
|
|
|
ASSERT_NULL(i.addChild(r));
|
|
|
|
|
|
|
|
|
|
ASSERT_TRUE(!i.hasClass("squigglymuff"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Inheritancetest::test_addChild()
|
|
|
|
|
{
|
|
|
|
|
Inheritance & i = Inheritance::instance();
|
|
|
|
|
|
|
|
|
|
Root r;
|
|
|
|
|
r->setId("squigglymuff");
|
|
|
|
|
r->setParents(std::list<std::string>(1, "root_operation"));
|
|
|
|
|
ASSERT_NOT_NULL(i.addChild(r));
|
|
|
|
|
|
|
|
|
|
ASSERT_TRUE(i.hasClass("squigglymuff"));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Inheritancetest::test_addChild_duplicate()
|
|
|
|
|
{
|
|
|
|
|
Inheritance & i = Inheritance::instance();
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
Root r;
|
|
|
|
|
r->setId("squigglymuff");
|
|
|
|
|
r->setParents(std::list<std::string>(1, "root_operation"));
|
|
|
|
|
ASSERT_NOT_NULL(i.addChild(r));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ASSERT_TRUE(i.hasClass("squigglymuff"));
|
|
|
|
|
|
|
|
|
|
// Make sure adding a duplicate fails.
|
|
|
|
|
Root r;
|
|
|
|
|
r->setId("squigglymuff");
|
|
|
|
|
r->setParents(std::list<std::string>(1, "root_operation"));
|
|
|
|
|
ASSERT_NULL(i.addChild(r));
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Inheritancetest::test_updateClass_nonexist()
|
|
|
|
|
{
|
|
|
|
|
Inheritance & i = Inheritance::instance();
|
2003-09-09 12:37:36 +00:00
|
|
|
|
2010-03-26 02:29:02 +00:00
|
|
|
{
|
|
|
|
|
Root r;
|
|
|
|
|
|
|
|
|
|
r->setId("squigglymuff");
|
|
|
|
|
r->setParents(std::list<std::string>(1, "ludricous_test_parent"));
|
|
|
|
|
|
|
|
|
|
int ret = i.updateClass("squigglymuff", r);
|
2013-02-27 22:02:55 +00:00
|
|
|
ASSERT_EQUAL(ret, -1);
|
2010-03-26 02:29:02 +00:00
|
|
|
}
|
|
|
|
|
|
2013-02-27 22:02:55 +00:00
|
|
|
}
|
2005-06-27 15:36:13 +00:00
|
|
|
|
2013-02-27 22:02:55 +00:00
|
|
|
void Inheritancetest::test_updateClass_operation()
|
|
|
|
|
{
|
|
|
|
|
Inheritance & i = Inheritance::instance();
|
2007-04-22 23:07:18 +00:00
|
|
|
|
2013-02-27 22:02:55 +00:00
|
|
|
Root r;
|
2007-04-22 23:07:18 +00:00
|
|
|
r->setId("squigglymuff");
|
|
|
|
|
r->setParents(std::list<std::string>(1, "root_operation"));
|
2013-02-27 22:02:55 +00:00
|
|
|
ASSERT_NOT_NULL(i.addChild(r));
|
2007-04-22 23:07:18 +00:00
|
|
|
|
2013-02-27 22:02:55 +00:00
|
|
|
ASSERT_TRUE(i.hasClass("squigglymuff"));
|
2007-04-22 23:07:18 +00:00
|
|
|
|
2010-03-26 02:29:02 +00:00
|
|
|
{
|
|
|
|
|
Root r;
|
|
|
|
|
|
|
|
|
|
r->setId("squigglymuff");
|
|
|
|
|
r->setParents(std::list<std::string>(1, "root_operation"));
|
|
|
|
|
|
|
|
|
|
int ret = i.updateClass("squigglymuff", r);
|
2013-02-27 22:02:55 +00:00
|
|
|
ASSERT_EQUAL(ret, 0);
|
2010-03-26 02:29:02 +00:00
|
|
|
}
|
2013-02-27 22:02:55 +00:00
|
|
|
}
|
2010-03-26 02:29:02 +00:00
|
|
|
|
2013-03-03 22:17:57 +00:00
|
|
|
void Inheritancetest::test_updateClass_change_parent()
|
|
|
|
|
{
|
|
|
|
|
Inheritance & i = Inheritance::instance();
|
|
|
|
|
|
|
|
|
|
Root r;
|
|
|
|
|
r->setId("squigglymuff");
|
|
|
|
|
r->setParents(std::list<std::string>(1, "root_operation"));
|
|
|
|
|
ASSERT_NOT_NULL(i.addChild(r));
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
Root r;
|
|
|
|
|
|
|
|
|
|
r->setId("squigglymuff");
|
|
|
|
|
r->setParents(std::list<std::string>(1, "action"));
|
|
|
|
|
|
|
|
|
|
int ret = i.updateClass("squigglymuff", r);
|
|
|
|
|
ASSERT_EQUAL(ret, -1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2013-02-27 22:02:55 +00:00
|
|
|
void Inheritancetest::test_isTypeOf_string()
|
|
|
|
|
{
|
|
|
|
|
Inheritance & i = Inheritance::instance();
|
2009-04-30 07:32:15 +01:00
|
|
|
|
|
|
|
|
assert(!i.isTypeOf("ludricous_test_parent", "root_operation"));
|
2011-12-09 09:38:36 +00:00
|
|
|
assert(i.isTypeOf("disappearance", "disappearance"));
|
2005-06-27 15:36:13 +00:00
|
|
|
assert(i.isTypeOf("disappearance", "root_operation"));
|
|
|
|
|
assert(i.isTypeOf("root_operation", "root_operation"));
|
|
|
|
|
assert(!i.isTypeOf("root_operation", "talk"));
|
2013-02-27 22:02:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Inheritancetest::test_isTypeOf_TypeNode()
|
|
|
|
|
{
|
|
|
|
|
Inheritance & i = Inheritance::instance();
|
2007-04-22 23:07:18 +00:00
|
|
|
|
2011-12-09 00:02:34 +00:00
|
|
|
const TypeNode * disappearance = i.getType("disappearance");
|
|
|
|
|
assert(disappearance != 0);
|
|
|
|
|
|
2011-12-09 09:38:36 +00:00
|
|
|
const TypeNode * root_operation = i.getType("root_operation");
|
|
|
|
|
assert(root_operation != 0);
|
|
|
|
|
|
2011-12-09 00:02:34 +00:00
|
|
|
assert(!i.isTypeOf(disappearance, "ludicrous_test_parent"));
|
|
|
|
|
assert(!i.isTypeOf(disappearance, "root_entity"));
|
|
|
|
|
assert(i.isTypeOf(disappearance, "root_operation"));
|
2011-12-09 09:38:36 +00:00
|
|
|
assert(i.isTypeOf(disappearance, "disappearance"));
|
|
|
|
|
assert(i.isTypeOf(root_operation, "root_operation"));
|
2013-02-27 22:02:55 +00:00
|
|
|
}
|
2011-12-09 00:02:34 +00:00
|
|
|
|
2013-02-27 22:02:55 +00:00
|
|
|
void Inheritancetest::test_isTypeOf_TypeNode2()
|
|
|
|
|
{
|
|
|
|
|
Inheritance & i = Inheritance::instance();
|
|
|
|
|
|
|
|
|
|
const TypeNode * disappearance = i.getType("disappearance");
|
|
|
|
|
assert(disappearance != 0);
|
|
|
|
|
|
|
|
|
|
const TypeNode * root_operation = i.getType("root_operation");
|
|
|
|
|
assert(root_operation != 0);
|
|
|
|
|
|
2011-12-09 00:02:34 +00:00
|
|
|
const TypeNode * root_entity = i.getType("root_entity");
|
|
|
|
|
assert(root_entity != 0);
|
|
|
|
|
|
|
|
|
|
assert(!i.isTypeOf(disappearance, root_entity));
|
|
|
|
|
assert(i.isTypeOf(disappearance, root_operation));
|
2011-12-09 09:38:36 +00:00
|
|
|
assert(i.isTypeOf(disappearance, disappearance));
|
|
|
|
|
assert(i.isTypeOf(root_operation, root_operation));
|
2013-02-27 22:02:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Inheritancetest::test_flush()
|
|
|
|
|
{
|
|
|
|
|
Inheritance & i = Inheritance::instance();
|
2011-12-09 00:02:34 +00:00
|
|
|
|
2007-04-22 23:07:18 +00:00
|
|
|
i.flush();
|
2013-02-27 22:02:55 +00:00
|
|
|
|
2007-04-22 23:07:18 +00:00
|
|
|
// Make sure the type for root can no longer be retrieved
|
2009-04-30 07:32:15 +01:00
|
|
|
const TypeNode * no_root_node = i.getType("root");
|
|
|
|
|
assert(no_root_node == 0);
|
2007-04-22 23:07:18 +00:00
|
|
|
const Root & non_root = i.getClass("root");
|
|
|
|
|
assert(i.getAllObjects().empty());
|
|
|
|
|
assert(!non_root.isValid());
|
|
|
|
|
|
2013-02-27 22:02:55 +00:00
|
|
|
// Make sure installing a child of root now fails.
|
|
|
|
|
Root r;
|
2007-04-22 23:07:18 +00:00
|
|
|
r->setId("squigglymuff");
|
|
|
|
|
r->setParents(std::list<std::string>(1, "root"));
|
2007-11-26 Al Riddoch <alriddoch@zepler.org>
* common/inheritance.cpp, common/inheritance.h: Introduce a type
node class as a carrier for all information, including default
values for a type.
* rulesets/Entity.h, rulesets/Entity.cpp, rulesets/Character.cpp:
Use a TypeNode pointer rather than a string giving the type
of an entity.
* client/Py_CreatorClient.cpp, rulesets/MemMap.cpp, rulesets/MemMap.h,
rulesets/MindFactory.cpp, rulesets/MindFactory.h,
rulesets/Py_Mind.cpp, rulesets/Py_Thing.cpp, rulesets/Stackable.cpp,
rulesets/World.cpp, server/PersistantThingFactory.h,
server/Restorer_impl.h, server/WorldRouter.cpp:
Adapt all the code that deals with types. Set the type pointer
up correctly in BaseMind.
* server/EntityFactory.cpp: Initialise the TypeNode pointer on new
entities.
* tests/inheritancetest.cpp: Adapt the test to cope with TypeNode.
2007-11-26 02:57:04 +00:00
|
|
|
assert(i.addChild(r) == 0);
|
2007-04-22 23:07:18 +00:00
|
|
|
|
|
|
|
|
assert(!i.hasClass("root"));
|
|
|
|
|
assert(!i.hasClass("root_entity"));
|
|
|
|
|
assert(!i.hasClass("root_operation"));
|
|
|
|
|
assert(!i.hasClass("login"));
|
|
|
|
|
assert(!i.hasClass("squigglymuff"));
|
2013-02-27 22:02:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int main()
|
|
|
|
|
{
|
|
|
|
|
Inheritancetest t;
|
|
|
|
|
|
|
|
|
|
return t.run();
|
2003-09-09 12:37:36 +00:00
|
|
|
}
|
2010-03-26 02:25:52 +00:00
|
|
|
|
|
|
|
|
// stubs
|
2015-05-23 16:47:45 +02:00
|
|
|
#include "stubs/common/stubCustom.h"
|
2010-03-26 02:25:52 +00:00
|
|
|
|
2011-09-16 18:30:22 +01:00
|
|
|
TypeNode::TypeNode(const std::string & name) : m_name(name), m_parent(0)
|
2010-03-26 02:25:52 +00:00
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2011-09-17 18:52:29 +01:00
|
|
|
TypeNode::TypeNode(const std::string & name,
|
|
|
|
|
const Atlas::Objects::Root & d) : m_name(name),
|
|
|
|
|
m_description(d),
|
|
|
|
|
m_parent(0)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2010-03-26 02:25:52 +00:00
|
|
|
TypeNode::~TypeNode()
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2011-12-09 00:19:53 +00:00
|
|
|
bool TypeNode::isTypeOf(const std::string & base_type) const
|
|
|
|
|
{
|
|
|
|
|
const TypeNode * node = this;
|
2011-12-09 09:38:36 +00:00
|
|
|
do {
|
|
|
|
|
if (node->name() == base_type) {
|
2011-12-09 00:19:53 +00:00
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
node = node->parent();
|
2011-12-09 09:38:36 +00:00
|
|
|
} while (node != 0);
|
2011-12-09 00:19:53 +00:00
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool TypeNode::isTypeOf(const TypeNode * base_type) const
|
|
|
|
|
{
|
|
|
|
|
const TypeNode * node = this;
|
2011-12-09 09:38:36 +00:00
|
|
|
do {
|
|
|
|
|
if (node == base_type) {
|
2011-12-09 00:19:53 +00:00
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
node = node->parent();
|
2011-12-09 09:38:36 +00:00
|
|
|
} while (node != 0);
|
2011-12-09 00:19:53 +00:00
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2010-03-26 02:25:52 +00:00
|
|
|
void log(LogLevel lvl, const std::string & msg)
|
|
|
|
|
{
|
|
|
|
|
}
|