paczek/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Reset the RallyPoint in case the building changes Ownership to Gaia, so as to prevent the execution of commands like gathering resources or attacking someone if the garrisoned building becomes destroyed.

Browse Source 
Add RallyPoint tests.

Reviewed By: mimo, Sandarac
Differential Revision: https://code.wildfiregames.com/D132
This was SVN commit r19217.
This commit is contained in:
elexis 2017-02-10 18:47:25 +00:00
parent 5f8f7bae20
commit cc8f991e2a
2 changed files with 81 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
binaries/data/mods/public/simulation/components/RallyPoint.js
View File

@ -106,8 +106,7 @@ RallyPoint.prototype.OnGlobalEntityRenamed = function(msg)
RallyPoint.prototype.OnOwnershipChanged = function(msg)
{
// No need to reset when constructing or destructing the entity
// Don't reset upon defeat to improve performance
if (msg.from == -1 || msg.to < 1)
if (msg.from == -1 || msg.to == -1)
return;
this.Reset();

80
binaries/data/mods/public/simulation/components/tests/test_RallyPoint.js Normal file
View File

@ -0,0 +1,80 @@
Engine.LoadHelperScript("Player.js");
Engine.LoadComponentScript("interfaces/Formation.js");
Engine.LoadComponentScript("interfaces/Health.js");
Engine.LoadComponentScript("interfaces/RallyPoint.js");
Engine.LoadComponentScript("RallyPoint.js");
function initialRallyPointTest(test_function)
{
ResetState();
let entityID = 123;
let cmpRallyPoint = ConstructComponent(entityID, "RallyPoint", {});
TS_ASSERT_UNEVAL_EQUALS(cmpRallyPoint.GetData(), []);
TS_ASSERT_UNEVAL_EQUALS(cmpRallyPoint.GetPositions(), []);
cmpRallyPoint.AddPosition(3, 1415);
TS_ASSERT_UNEVAL_EQUALS(cmpRallyPoint.GetPositions(), [{ "x": 3, "z": 1415 }]);
cmpRallyPoint.AddPosition(926, 535);
TS_ASSERT_UNEVAL_EQUALS(cmpRallyPoint.GetPositions(), [{ "x": 3, "z": 1415 }, { "x": 926, "z": 535 }]);
let targetID = 456;
let myData = { "command": "write a unit test", "target": targetID };
cmpRallyPoint.AddData(myData);
TS_ASSERT_UNEVAL_EQUALS(cmpRallyPoint.GetPositions(), [{ "x": 3, "z": 1415 }, { "x": 926, "z": 535 }]);
TS_ASSERT_UNEVAL_EQUALS(cmpRallyPoint.GetData(), [myData]);
let targetID2 = 789;
let myData2 = { "command": "this time really", "target": targetID2 };
cmpRallyPoint.AddData(myData2);
TS_ASSERT_UNEVAL_EQUALS(cmpRallyPoint.GetData(), [myData, myData2]);
if (test_function(cmpRallyPoint))
{
TS_ASSERT_UNEVAL_EQUALS(cmpRallyPoint.GetData(), []);
TS_ASSERT_UNEVAL_EQUALS(cmpRallyPoint.GetPositions(), []);
}
else
{
TS_ASSERT_UNEVAL_EQUALS(cmpRallyPoint.GetData(), [myData, myData2]);
TS_ASSERT_UNEVAL_EQUALS(cmpRallyPoint.GetPositions(), [{ "x": 3, "z": 1415 }, { "x": 926, "z": 535 }]);
}
}
initialRallyPointTest((cmpRallyPoint) => {});
initialRallyPointTest((cmpRallyPoint) => {
cmpRallyPoint.Unset()
return true;
});
initialRallyPointTest((cmpRallyPoint) => {
cmpRallyPoint.Reset()
return true;
});
// Construction
initialRallyPointTest((cmpRallyPoint) => {
cmpRallyPoint.OnOwnershipChanged({ "from": -1, "to": 1 });
return false;
});
// Capturing
initialRallyPointTest((cmpRallyPoint) => {
cmpRallyPoint.OnOwnershipChanged({ "from": 1, "to": 2 });
return true;
});
// Destruction
initialRallyPointTest((cmpRallyPoint) => {
cmpRallyPoint.OnOwnershipChanged({ "from": 2, "to": -1 });
return false;
});
// Gaia
initialRallyPointTest((cmpRallyPoint) => {
cmpRallyPoint.OnOwnershipChanged({ "from": 2, "to": 0 });
return true;
});