From ebb36f8dc3e0ca90ac1e3f454e8973255888b034 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 14 Feb 2015 11:14:11 +0100 Subject: [PATCH] tests/fire: Cover firing with foreign assets Signed-off-by: Markus Armbruster --- tests/fire/01-sector-1 | 3 +++ tests/fire/03-ship-1 | 3 +++ tests/fire/05-land-1 | 5 ++++- tests/fire/journal.log | 18 ++++++++++++++++++ 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/tests/fire/01-sector-1 b/tests/fire/01-sector-1 index 689af2de..a85cc464 100644 --- a/tests/fire/01-sector-1 +++ b/tests/fire/01-sector-1 @@ -8,6 +8,9 @@ comm * ?shell>0 || fort not firing | nonexistant sector fire se 1,0 6,0 +| foreign sector +fire se 2,2 6,0 +__cmd added 1 1 0 | 100% highway fire se -4,0 6,0 | 4% fort diff --git a/tests/fire/03-ship-1 b/tests/fire/03-ship-1 index 128fc121..095af0c8 100644 --- a/tests/fire/03-ship-1 +++ b/tests/fire/03-ship-1 @@ -8,6 +8,9 @@ carg * ?shell>0 || ship not firing | nonexistant ship fire sh 666 6,0 +| foreign ship +fire sh 11 6,0 +__cmd added 1 1 0 | 100% cs fire sh 9 6,0 | 59% bb diff --git a/tests/fire/05-land-1 b/tests/fire/05-land-1 index a99c8a5f..17c99533 100644 --- a/tests/fire/05-land-1 +++ b/tests/fire/05-land-1 @@ -8,7 +8,10 @@ lcarg * ?shell>0 || land not firing | nonexistant land fire la 666 6,0 -| 100% tra +| foreign land +fire la 13 6,0 +__cmd added 1 1 0 +| 100% sup fire la 9 6,0 | 39% hat fire la 1 6,0 diff --git a/tests/fire/journal.log b/tests/fire/journal.log index 3de19ac5..225171b9 100644 --- a/tests/fire/journal.log +++ b/tests/fire/journal.log @@ -47,6 +47,12 @@ Play#1 input fire se 1,0 6,0 Play#1 command fire Play#1 output Play#1 6 0 639 + Play#1 input fire se 2,2 6,0 + Play#1 command fire + Play#1 output Play#1 6 0 638 + Play#1 input __cmd added 1 1 0 + Play#1 command __cmd + Play#1 output Play#1 6 0 639 Play#1 input fire se -4,0 6,0 Play#1 command fire Play#1 output Play#1 6 0 638 @@ -492,6 +498,12 @@ Play#1 input fire sh 666 6,0 Play#1 command fire Play#1 output Play#1 6 0 594 + Play#1 input fire sh 11 6,0 + Play#1 command fire + Play#1 output Play#1 6 0 593 + Play#1 input __cmd added 1 1 0 + Play#1 command __cmd + Play#1 output Play#1 6 0 594 Play#1 input fire sh 9 6,0 Play#1 command fire Play#1 output Play#1 1 Ships 9 cannot fire guns! @@ -1001,6 +1013,12 @@ Play#1 input fire la 666 6,0 Play#1 command fire Play#1 output Play#1 6 0 537 + Play#1 input fire la 13 6,0 + Play#1 command fire + Play#1 output Play#1 6 0 536 + Play#1 input __cmd added 1 1 0 + Play#1 command __cmd + Play#1 output Play#1 6 0 537 Play#1 input fire la 9 6,0 Play#1 command fire Play#1 output Play#1 1 Unit 9 cannot fire!