diff options
author | Benjamin Jones <bjones@galois.com> | 2013-07-05 16:01:03 -0700 |
---|---|---|
committer | Benjamin Jones <bjones@galois.com> | 2013-07-05 16:01:03 -0700 |
commit | 867f5c62c9e21790d305e7f43727c90e1d5628c2 (patch) | |
tree | 57ad8e17f2dcfc4f05ac5593fa94f6d0752793c8 /src/batchtools/headless/src/main/java/com/galois | |
parent | 202cce4d8c124a80c6637459b9fffb33b50d167a (diff) |
get the unit tests working again
Diffstat (limited to 'src/batchtools/headless/src/main/java/com/galois')
-rw-r--r-- | src/batchtools/headless/src/main/java/com/galois/fiveui/HeadlessRunDescription.java | 15 | ||||
-rw-r--r-- | src/batchtools/headless/src/main/java/com/galois/fiveui/Reporter.java | 7 |
2 files changed, 12 insertions, 10 deletions
diff --git a/src/batchtools/headless/src/main/java/com/galois/fiveui/HeadlessRunDescription.java b/src/batchtools/headless/src/main/java/com/galois/fiveui/HeadlessRunDescription.java index 8b41fe4..a6b6402 100644 --- a/src/batchtools/headless/src/main/java/com/galois/fiveui/HeadlessRunDescription.java +++ b/src/batchtools/headless/src/main/java/com/galois/fiveui/HeadlessRunDescription.java @@ -111,13 +111,11 @@ public class HeadlessRunDescription { * @return string property or null if the prop doesn't resolve */ public static String objGetString(JsonObject obj, String prop) { - try { - return obj.get(prop).getAsString(); - } catch (NullPointerException e) { - logger.error("HeadlessRunDescription.parse: failed to lookup JSON property: " + prop); - logger.error(e.toString()); - return null; + JsonElement value = obj.get(prop); + if (null == value) { + logger.warn("HeadlessRunDescription.parse: failed to lookup JSON property: " + prop); } + return null == value ? null : value.getAsString(); } public HeadlessRunDescription deserialize(JsonElement json, Type typeOfT, @@ -136,15 +134,16 @@ public class HeadlessRunDescription { String ffProfile = objGetString(obj, "firefoxProfile"); if (null != ffProfile) { - ffProfile = runDescDir + File.separator + ffProfile; + ffProfile = runDescDir + File.separator + ffProfile; } _firefoxProfile = ffProfile; _crawlType = objGetString(obj, "crawlType"); arr = obj.get("runs").getAsJsonArray(); - } else if (json.isJsonArray()) { + } else if (json.isJsonArray()) { // description has only a list of URL/rule pairs ruleSetDir = _ctxDir; _crawlType = "none"; + _firefoxProfile = null; // indicates that webdriver setup code should make a blank temp profile arr = json.getAsJsonArray(); } else { reportError(json); diff --git a/src/batchtools/headless/src/main/java/com/galois/fiveui/Reporter.java b/src/batchtools/headless/src/main/java/com/galois/fiveui/Reporter.java index f0461d4..344e46d 100644 --- a/src/batchtools/headless/src/main/java/com/galois/fiveui/Reporter.java +++ b/src/batchtools/headless/src/main/java/com/galois/fiveui/Reporter.java @@ -254,8 +254,11 @@ public class Reporter { html.li().b().text("Severity:").end(); html.text(r.getType().toString()).end(); - html.li().b().text("Browser:").end(); - html.text(r.getDriver().toString()).end(); + html.li().b().text("Browser:").end(); + // unit tests use a null webdriver object + if (null != r.getDriver()) { + html.text(r.getDriver().toString()).end(); + } html.li().b().text("Url:").end(); html.a().href(r.getURL()).text(r.getURL()).end().end(); |