tests/fire: Cover firing at unused / sunk ships

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

diff --git a/tests/fire/01-sector-1 b/tests/fire/01-sector-1
index a85cc464cf896869bf5c6db70fdb518ab735c188..0354f7696f0f06bf2aff8f7d2e1e0db47e829f08 100644 (file)
--- a/tests/fire/01-sector-1
+++ b/tests/fire/01-sector-1
@@ -22,6 +22,8 @@ fire se 0,0 0,0
 fire se 0,0 1,0
 | at ship that doesn't exist
 fire se 0,0 666
 fire se 0,0 1,0
 | at ship that doesn't exist
 fire se 0,0 666

+fire se 0,0 19
+__cmd added 1 1 0

 | at valid target, but with insufficient mil
 move m 0,0 1 nh
 fire se 0,0 6,0
 | at valid target, but with insufficient mil
 move m 0,0 1 nh
 fire se 0,0 6,0

diff --git a/tests/fire/03-ship-1 b/tests/fire/03-ship-1
index 095af0c87eca2ee88f3abc64d46d7b29cc788630..cc08180a176436b72212e2aef4f3904a1d75695f 100644 (file)
--- a/tests/fire/03-ship-1
+++ b/tests/fire/03-ship-1
@@ -21,6 +21,8 @@ fire sh 2 2
 fire sh 2 1,0
 | at ship that doesn't exist
 fire sh 2 666
 fire sh 2 1,0
 | at ship that doesn't exist
 fire sh 2 666

+fire sh 2 19
+__cmd added 1 1 0

 | at valid target, but no mil
 unload m 2 13
 fire sh 2 6,0
 | at valid target, but no mil
 unload m 2 13
 fire sh 2 6,0

diff --git a/tests/fire/05-land-1 b/tests/fire/05-land-1
index 17c995335d6455b2575f42ea1713c8b1acef284f..f301c8cedd0750fbf067aafbaf5537e10d521654 100644 (file)
--- a/tests/fire/05-land-1
+++ b/tests/fire/05-land-1
@@ -21,6 +21,8 @@ fire la 2 3,1
 fire la 2 1,0
 | at ship that doesn't exist
 fire la 2 666
 fire la 2 1,0
 | at ship that doesn't exist
 fire la 2 666

+fire la 2 19
+__cmd added 1 1 0

 | at valid target, but no mil
 lunload m 2 10
 fire la 2 6,0
 | at valid target, but no mil
 lunload m 2 10
 fire la 2 6,0

diff --git a/tests/fire/journal.log b/tests/fire/journal.log
index 225171b9354c2d8a89da0c519f521232aa96cc74..fa05d45550aa109fe1b82fa68ea80e4295f92914 100644 (file)
--- a/tests/fire/journal.log
+++ b/tests/fire/journal.log
@@ -75,6 +75,14 @@
     Play#1 output Play#1 1 Sector 0,0 ready to fire
     Play#1 output Play#1 1 No such ship exists!
     Play#1 output Play#1 6 0 634
     Play#1 output Play#1 1 Sector 0,0 ready to fire
     Play#1 output Play#1 1 No such ship exists!
     Play#1 output Play#1 6 0 634

+    Play#1 input fire se 0,0 19
+    Play#1 command fire
+    Play#1 output Play#1 1 Sector 0,0 ready to fire
+    Play#1 output Play#1 1 No such ship exists!
+    Play#1 output Play#1 6 0 633
+    Play#1 input __cmd added 1 1 0
+    Play#1 command __cmd
+    Play#1 output Play#1 6 0 634

     Play#1 input move m 0,0 1 nh
     Play#1 command move
     Play#1 output Play#1 1 No mobility used
     Play#1 input move m 0,0 1 nh
     Play#1 command move
     Play#1 output Play#1 1 No mobility used


@@ -527,6 +535,14 @@
     Play#1 output Play#1 1 bb   battleship (#2) ready to fire
     Play#1 output Play#1 1 No such ship exists!
     Play#1 output Play#1 6 0 589
     Play#1 output Play#1 1 bb   battleship (#2) ready to fire
     Play#1 output Play#1 1 No such ship exists!
     Play#1 output Play#1 6 0 589

+    Play#1 input fire sh 2 19
+    Play#1 command fire
+    Play#1 output Play#1 1 bb   battleship (#2) ready to fire
+    Play#1 output Play#1 1 No such ship exists!
+    Play#1 output Play#1 6 0 588
+    Play#1 input __cmd added 1 1 0
+    Play#1 command __cmd
+    Play#1 output Play#1 6 0 589

     Play#1 input unload m 2 13
     Play#1 command unload
     Play#1 output Play#1 1 13 military unloaded from bb   battleship (#2) at 3,1
     Play#1 input unload m 2 13
     Play#1 command unload
     Play#1 output Play#1 1 13 military unloaded from bb   battleship (#2) at 3,1


@@ -1042,6 +1058,14 @@
     Play#1 output Play#1 1 hat  hvy artillery #2 ready to fire
     Play#1 output Play#1 1 No such ship exists!
     Play#1 output Play#1 6 0 532
     Play#1 output Play#1 1 hat  hvy artillery #2 ready to fire
     Play#1 output Play#1 1 No such ship exists!
     Play#1 output Play#1 6 0 532

+    Play#1 input fire la 2 19
+    Play#1 command fire
+    Play#1 output Play#1 1 hat  hvy artillery #2 ready to fire
+    Play#1 output Play#1 1 No such ship exists!
+    Play#1 output Play#1 6 0 531
+    Play#1 input __cmd added 1 1 0
+    Play#1 command __cmd
+    Play#1 output Play#1 6 0 532

     Play#1 input lunload m 2 10
     Play#1 command lunload
     Play#1 output Play#1 1 10 military unloaded from hat  hvy artillery #2 at 3,1
     Play#1 input lunload m 2 10
     Play#1 command lunload
     Play#1 output Play#1 1 10 military unloaded from hat  hvy artillery #2 at 3,1