From 199b4b61de7ae91a1aa2e25c585027f34263e425 Mon Sep 17 00:00:00 2001 From: adam Date: Sat, 8 Nov 2008 07:05:19 +0100 Subject: [PATCH] omit tests if no ships of that type present --- src/edu/berkeley/fleet/Main.java | 8 +++++--- src/edu/berkeley/fleet/two/ShipDescription.java | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/edu/berkeley/fleet/Main.java b/src/edu/berkeley/fleet/Main.java index e1eaed0..b259d3e 100644 --- a/src/edu/berkeley/fleet/Main.java +++ b/src/edu/berkeley/fleet/Main.java @@ -155,10 +155,12 @@ public class Main { } else if (f.getPath().endsWith(".ship")) { ShipDescription sd = new ShipDescription(f.getName(), new BufferedReader(new InputStreamReader(new FileInputStream(f)))); String testsection = sd.getSection("test"); - if (testsection != null) - runTest(fleet, new StringReader(testsection), sd.getName()); - else + if (testsection == null) System.out.println("no test for " + sd.getName() + "!"); + else if (fleet.getShip(sd.getName(),0)==null) + System.out.println("specified Fleet does not have any ships of type " + sd.getName()); + else + runTest(fleet, new StringReader(testsection), sd.getName()); } } diff --git a/src/edu/berkeley/fleet/two/ShipDescription.java b/src/edu/berkeley/fleet/two/ShipDescription.java index 159442c..dcf0a97 100644 --- a/src/edu/berkeley/fleet/two/ShipDescription.java +++ b/src/edu/berkeley/fleet/two/ShipDescription.java @@ -17,6 +17,7 @@ public class ShipDescription implements Iterable { public Iterator iterator() { return docks.values().iterator(); } public ShipDescription(String name, BufferedReader r) throws IOException { + if (name.endsWith(".ship")) name = name.substring(0, name.length()-".ship".length()); this.name = name; String sectionName = null; StringBuffer sb = new StringBuffer(); -- 1.7.10.4