Commit graph

44 commits

Author SHA1 Message Date
Alistair Riddoch
703ee0dda9 Update test factories to have a type
It is completely reasonable to require that a fectory has a pointer
to a TypeNode, so these tests always set one up now. Upgrade to using the
framework while we're doing it.
2013-02-21 23:22:04 +00:00
Alistair Riddoch
5eceba40cf Remove unused handler mechanism 2013-02-14 10:01:20 +00:00
Alistair Riddoch
4a9c7078f7 Refactor to use LocatedEntity as base class
All IG code should use the interface of LocatedEntity when dealing
with any entity, rather than sometimes requiring Entity. Add virtual
functions to the interface where required, and modify all other interfaces
to stop them using Entity. This makes the code way cleaner, and much better
de-coupled.
2013-01-17 10:17:07 +00:00
Alistair Riddoch
4e66987bad Consolidate flags into one place 2013-01-14 09:59:54 +00:00
Alistair Riddoch
ec03a3b546 Remove Thing_parent typedef 2012-12-04 23:48:40 +00:00
Alistair Riddoch
d0e7bf2660 Remove Stackable_parent typedef 2012-12-04 23:45:53 +00:00
Alistair Riddoch
f257ff53a8 Remove Plant_parent typedef 2012-12-04 23:43:19 +00:00
Alistair Riddoch
6f03a09cc6 Remove Creator_parent typedef 2012-12-04 23:40:54 +00:00
Alistair Riddoch
73b81a6ff7 Remove Character_parent typedef 2012-12-04 23:39:22 +00:00
Alistair Riddoch
71cbcdcfc1 Modify externalOperation to include Link
The Link reference provided is the object allowing direct communication
back to the external source of the operation. This allows us to handle
things more cleanly in some cases.
2012-12-04 20:39:35 +00:00
Alistair Riddoch
1decf884a1 Add explicit destructor
Allowing the compiler to create a default destructor confuses gprof, and
causes it to report bad coverage data.
2012-08-06 18:32:01 +01:00
Alistair Riddoch
558301a836 Add an Info handler to Character 2012-07-02 20:05:18 -07:00
Alistair Riddoch
bc001bfe76 Add Get/Info to the IG op dispatch 2012-06-30 01:06:14 -07:00
Alistair Riddoch
b09c73179c Fix linking and stubbing in a few tests 2011-12-16 08:33:58 +00:00
Alistair Riddoch
0e8f9ccc95 Replace abstract script factories with common template 2011-12-14 14:26:01 +00:00
Alistair Riddoch
325d9265f3 Remove updateChildren to updateProperties
This name makes more sense, and now the interface is more consistent.
2011-12-13 00:40:43 +00:00
Alistair Riddoch
111581e56a Remove obsolete m_task in Character
This pointer is made obsolete now that TasksProperty holds it
2011-12-02 02:37:42 +00:00
Alistair Riddoch
a8fb1c8c89 Fix up some tests 2011-11-08 20:32:35 +00:00
Alistair Riddoch
ac37383d8a Convery all the property get functions 2011-09-29 17:36:26 +01:00
Alistair Riddoch
897d8d814b Update test stubs 2011-09-16 10:51:48 +01:00
Alistair Riddoch
d778be9aff Replicate the remainder of updateChildrenProperties in TypeNode
Fix up stubs
2011-09-15 23:54:33 +01:00
Alistair Riddoch
ef03d69b97 Add updateChildren() to EntityKit
This is code copied from Ruleset, but it doesn't really seem to belong there.
2011-09-15 23:05:41 +01:00
Alistair Riddoch
83cfa95abc Check return values 2011-04-22 00:21:17 +01:00
Alistair Riddoch
72ea3c70e1 Fix up tests 2011-02-28 00:28:25 +00:00
Alistair Riddoch
5cb0ac6ae5 Force asserts on in all tests. 2011-02-15 09:30:46 +00:00
Alistair Riddoch
85cce5e15e Add Actuate to those ops handled by Character 2010-11-23 14:00:38 +00:00
Alistair Riddoch
45c5e4f151 Initialise Location.loc in all tests 2010-09-16 05:14:35 +01:00
Alistair Riddoch
700ea036fd Isolate EntityFactory unit test. 2010-03-23 01:32:29 +00:00
Alistair Riddoch
163f12d567 Add full coverage test for EntityFactory 2009-11-19 01:12:39 +00:00
Alistair Riddoch
6d8baebf5c Update tests for renamed EntityBuilder filename. 2009-03-14 04:21:31 +00:00
Al Riddoch
4dde75493a 2008-09-08 Al Riddoch <alriddoch@googlemail.com>
* common/inheritance.cpp: Set the instance pointer to null on
	  deletion, so it can be cleanly instanced again.
2008-09-08 11:49:22 +00:00
Al Riddoch
d44d809641 2007-12-20 Al Riddoch <alriddoch@zepler.org>
* tests/EntityFactorytest.cpp: Fix up the tests to use the updated
	  class names.
2007-12-20 20:00:23 +00:00
Al Riddoch
f15ec518fd 2007-11-22 Al Riddoch <alriddoch@zepler.org>
* tests/EntityFactorytest.cpp: Update the entity factory tests to
	  comply with the new API, and fix pre-conditions which break
	  recently added assertions.
2007-11-22 02:06:52 +00:00
Al Riddoch
9a56dac06c 2006-10-26 Al Riddoch <alriddoch@zepler.org>
* Add RCS Id keywords to every file, for better version tracking.
2006-10-26 00:48:00 +00:00
Al Riddoch
320ffc8c4f 2006-07-03 Al Riddoch <alriddoch@zepler.org>
* tests/IGEntityExerciser.h, tests/TestPropertyManager.cpp,
	  tests/TestPropertyManager.h: Add a dummy property manager, and
	  install it before testing any IG entity classes.

	* tests/Areatest.cpp, tests/Charactertest.cpp,
	  tests/Creatortest.cpp, tests/EntityFactorytest.cpp,
	  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:
	  Switch to new hasAttr getAttr setAttr method names.
2006-07-03 11:30:02 +00:00
Al Riddoch
954a98d073 2006-04-25 Al Riddoch <alriddoch@zepler.org>
* tests/TestWorld.h: Add changes to the world interface to the world
	  test framework.

	* tests/EntityFactorytest.cpp: Update EntityFactory tests for changes
	  in the API.
2006-04-25 17:22:25 +00:00
Al Riddoch
fac57eee73 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
Al Riddoch
2a39ef93b0 2006-01-15 Al Riddoch <alriddoch@zepler.org>
* tests/EntityFactorytest.cpp: Initialise the python interpreter
	  before testing the entity factory, as it is now required.

	* tests/Makefile.am: Re-order the submodules of rulesets when
	  linking, to ensure they link correctly.
2006-01-15 21:12:19 +00:00
Al Riddoch
90d5e82f3a 2005-11-20 Al Riddoch <alriddoch@zepler.org>
* tests/EntityFactorytest.cpp: Get rid of warning about unused variables
	  in non-debug build.

	* configure.ac: Increment version for release soonish.
2005-11-20 02:32:15 +00:00
Al Riddoch
63e1fdf76d 2005-11-20 Al Riddoch <alriddoch@zepler.org>
* tests/EntityFactorytest.cpp: Add more tests to ensure adding or
	  removing attributes propagates correctly down the type tree.

	* server/EntityFactory.cpp: Reset class attributes when factory
	  is modified.
2005-11-20 02:03:08 +00:00
Al Riddoch
dec56b165c 2005-11-18 Al Riddoch <alriddoch@zepler.org>
* tests/EntityFactorytest.cpp: Fill out comments in tests a bit better.
2005-11-18 17:15:31 +00:00
Al Riddoch
fda6345bac 2005-11-18 Al Riddoch <alriddoch@zepler.org>
* tests/EntityFactorytest.cpp: Add new tests to verify the Entity
	  Factory does the right thing with class attributes and inheritance.
2005-11-18 15:09:08 +00:00
Al Riddoch
9d10ba6510 2005-11-18 Al Riddoch <alriddoch@zepler.org>
* server/PersistantThingFactory.h,
	  server/PersistantThingFactory_impl.h: Add separate tracking of
	  class attributes, and accumulated attributes including those
	  inherited from the parent class. Add members for storing
	  parent and child types to a factory.

	* server/EntityFactory.h: Ensure instance pointer is zeroed
	  when instance is deleted. Make internal methods protected so
	  its easier to test them in a unit test.

	* server/EntityFactory.cpp: Add pointers to child factories to parent
	  when installing new ones. Handle copying inherited attribute
	  defaults from the parent factory.

	* tests/EntityFactorytest.cpp: Add a new class which exposes the
	  protected parts of EntityFactory for testing.
2005-11-18 01:52:10 +00:00
Al Riddoch
19604c045d 2005-11-18 Al Riddoch <alriddoch@zepler.org>
* tests/EntityFactorytest.cpp: Add new test to work EntityFactory.
2005-11-18 01:11:42 +00:00