From 12721156f59770e30a879afd8378cd0091353538 Mon Sep 17 00:00:00 2001 From: Arne Keller Date: Tue, 3 Mar 2020 07:28:27 +0100 Subject: [PATCH] Fix test for model 2B --- testcoverage_input.txt | 17 ++++++++--------- testcoverage_output.txt | 10 ++++------ 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/testcoverage_input.txt b/testcoverage_input.txt index 55d799f..f8aec68 100644 --- a/testcoverage_input.txt +++ b/testcoverage_input.txt @@ -31,6 +31,7 @@ put train 2 at (0,0) in direction -1,0 add track (1,0) -> (10,0) delete track 2 step 1 +delete track 2 create engine diesel T2 Gamma 10 true false create train-set T2 Epsilon 1 true false create engine steam T2 Epsilon 1 true false @@ -60,29 +61,27 @@ delete train 4 add train 2 T2-Rho add track (1,0) -> (10,0) put train 1 at (7,0) in direction -1,0 -put train 5 at (0,0) in direction -1,0 step 8 delete track 1 delete track 2 add track (0,0) -> (10,0) add track (10,0) -> (20,0) add track (20,0) -> (30,0) -put train 1 at (10,0) in direction 1,0 +put train 1 at (9,0) in direction 1,0 put train 2 at (15,0) in direction 1,0 -put train 5 at (20,0) in direction -1,0 -step 1 +put train 5 at (21,0) in direction -1,0 +step 2 add track (-10,0) -> (0,0) add track (30,0) -> (40,0) create train-set T1 Albert 1 true true create train-set T1 Berta 2 true true add train 3 T1-Albert add train 4 T1-Berta -put train 4 at (10,0) in direction 1,0 -put train 1 at (0,0) in direction 1,0 -put train 3 at (20,0) in direction -1,0 -put train 2 at (30,0) in direction -1,0 +put train 4 at (9,0) in direction 1,0 +put train 3 at (21,0) in direction -1,0 +put train 2 at (31,0) in direction -1,0 put train 5 at (15,0) in direction 1,0 -step 41 +step 42 add switch (40,0) -> (10,10),(40,40) add switch (40,0) -> (40,40),(10,10) add switch (40,0),(10,0),(0,10) diff --git a/testcoverage_output.txt b/testcoverage_output.txt index d3f3089..d5d5eac 100644 --- a/testcoverage_output.txt +++ b/testcoverage_output.txt @@ -36,8 +36,9 @@ T2-Gamma diesel engine T2-Gamma added to train 2 OK 2 -OK +Error, could not delete rail segment Crash of train 2 +OK Error, engine identifier already used T2-Epsilon Error, engine identifier already used @@ -66,7 +67,7 @@ OK 2 1 f 1 true true 3 1 s 1 true true 4 none p 1 true true -none T2 Epsilon 1 false false +none T2 Epsilon 1 true false 3 T2 Lambda 1 true true 2 d T2 Gamma 1 true true 1 e T2 Omega 2 true true @@ -83,9 +84,7 @@ OK steam engine T2-Rho added to train 2 2 OK -OK Crash of train 1 -Crash of train 5 OK OK 1 @@ -105,9 +104,8 @@ OK OK OK OK -OK -Crash of train 1,3,4,5 Crash of train 2 +Crash of train 3,4,5 Error, start has to be connected in straight lines to end positions! Error, start has to be connected in straight lines to end positions! Error, invalid add switch argument syntax