marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix unit test: Liquid container 

Adjusted some return values - it turned out that the test was actually wrong in these cases
install-platforms
Mark 2017-12-27 20:32:45 +01:00
parent ca16ffdd20
commit fc6c48078f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
planet/Tests.ocf/LiquidContainer.ocs/Script.c
View File

@ -435,7 +435,7 @@ global func Test5_Execute()
passed &= Test5_CheckPipes(pipeA, PIPE_STATE_Source, pipeB, PIPE_STATE_Neutral); passed &= Test5_CheckPipes(pipeA, PIPE_STATE_Source, pipeB, PIPE_STATE_Neutral);
pipeB->ConnectPipeTo(effect.engine); pipeB->ConnectPipeTo(effect.engine);
passed &= Test5_CheckConnections(effect, pipeA, effect.pump); passed &= Test5_CheckConnections(effect, pipeA, effect.pump);
passed &= Test5_CheckPipes(pipeA, PIPE_STATE_Source, pipeB, PIPE_STATE_Neutral); passed &= Test5_CheckPipes(pipeA, PIPE_STATE_Source, pipeB, PIPE_STATE_Drain);
pipeB->ConnectPipeTo(effect.pump); pipeB->ConnectPipeTo(effect.pump);
passed &= Test5_CheckConnections(effect, pipeA, effect.engine); passed &= Test5_CheckConnections(effect, pipeA, effect.engine);
passed &= Test5_CheckPipes(pipeA, PIPE_STATE_Source, pipeB, PIPE_STATE_Drain); passed &= Test5_CheckPipes(pipeA, PIPE_STATE_Source, pipeB, PIPE_STATE_Drain);
@ -499,7 +499,7 @@ global func Test5_Execute()
passed &= Test5_CheckConnections(effect, pipeA, effect.pump); passed &= Test5_CheckConnections(effect, pipeA, effect.pump);
passed &= Test5_CheckPipes(pipeA, PIPE_STATE_Source, nil, nil); passed &= Test5_CheckPipes(pipeA, PIPE_STATE_Source, nil, nil);
pipeA->ConnectPipeTo(effect.engine); pipeA->ConnectPipeTo(effect.engine);
passed &= Test5_CheckConnections(effect, pipeA, effect.pump); passed &= Test5_CheckConnections(effect, effect.engine, effect.pump);
passed &= Test5_CheckPipes(pipeA, PIPE_STATE_Source, nil, nil); passed &= Test5_CheckPipes(pipeA, PIPE_STATE_Source, nil, nil);
pipeA->CutLineConnection(effect.pump); pipeA->CutLineConnection(effect.pump);
@ -510,8 +510,8 @@ global func Test5_Execute()
global func Test5_CheckConnections(proplist effect, object expected_source, object expected_drain) global func Test5_CheckConnections(proplist effect, object expected_source, object expected_drain)
{ {
var passed = doTest("Pump returns source object. Got %v, expected %v.", effect.pump->GetSourceObject(), expected_source); var passed = doTest("Pump returns source object %v, expected %v.", effect.pump->GetSourceObject(), expected_source);
passed &= doTest("Pump returns drain object. Got %v, expected %v.", effect.pump->GetDrainObject(), expected_drain); passed &= doTest("Pump returns drain object %v, expected %v.", effect.pump->GetDrainObject(), expected_drain);
return passed; return passed;
} }
@ -527,7 +527,7 @@ global func Test5_CheckPipes(object pipeA, string stateA, object pipeB, string s
else if (stateA == PIPE_STATE_Neutral) functionA = pipeA.IsNeutralPipe; else if (stateA == PIPE_STATE_Neutral) functionA = pipeA.IsNeutralPipe;
var test = pipeA->Call(functionA); var test = pipeA->Call(functionA);
passed &= doTest(Format("Pipe A is a %s pipe? %s", stateA, "Got %v, expected %v.", test, true)); passed &= doTest(Format("Pipe A is a %s/%v pipe? %s", stateA, functionA, "Got %v, expected %v.", test, true));
} }
if (pipeB != nil) if (pipeB != nil)
@ -538,7 +538,7 @@ global func Test5_CheckPipes(object pipeA, string stateA, object pipeB, string s
test = pipeB->Call(functionB); test = pipeB->Call(functionB);
passed &= doTest(Format("Pipe B is a %s pipe? %s", stateB, "Got %v, expected %v."), test, true); passed &= doTest(Format("Pipe B is a %s/%v pipe? %s", stateB, functionB, "Got %v, expected %v."), test, true);
} }
return passed; return passed;
} }