METRON-1299 In MetronError tests, don't test for HostName if getHostName wouldn't work closes apache/incubator-metron#924
Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/85d12475 Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/85d12475 Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/85d12475 Branch: refs/heads/master Commit: 85d12475cf363f0b9d6bdd973ec9860550f73980 Parents: e69ce21 Author: ottobackwards <ottobackwa...@gmail.com> Authored: Thu Mar 15 14:13:44 2018 -0400 Committer: cstella <ceste...@gmail.com> Committed: Thu Mar 15 14:13:44 2018 -0400 ---------------------------------------------------------------------- .../metron/common/error/MetronErrorTest.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/85d12475/metron-platform/metron-common/src/test/java/org/apache/metron/common/error/MetronErrorTest.java ---------------------------------------------------------------------- diff --git a/metron-platform/metron-common/src/test/java/org/apache/metron/common/error/MetronErrorTest.java b/metron-platform/metron-common/src/test/java/org/apache/metron/common/error/MetronErrorTest.java index 5e505a8..e7390de 100644 --- a/metron-platform/metron-common/src/test/java/org/apache/metron/common/error/MetronErrorTest.java +++ b/metron-platform/metron-common/src/test/java/org/apache/metron/common/error/MetronErrorTest.java @@ -18,15 +18,16 @@ package org.apache.metron.common.error; import com.google.common.collect.Sets; -import com.google.common.primitives.Bytes; +import org.apache.commons.lang3.StringUtils; import org.apache.metron.common.Constants; import org.json.simple.JSONObject; import org.junit.Before; import org.junit.Test; +import java.net.InetAddress; +import java.net.UnknownHostException; import java.util.Arrays; -import static org.apache.metron.common.Constants.ErrorFields.RAW_MESSAGE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -53,7 +54,18 @@ public class MetronErrorTest { assertEquals(Constants.ErrorType.PARSER_ERROR.getType(), errorJSON.get(Constants.ErrorFields.ERROR_TYPE.getName())); assertEquals("error", errorJSON.get(Constants.SENSOR_TYPE)); assertEquals("sensorType", errorJSON.get(Constants.ErrorFields.FAILED_SENSOR_TYPE.getName())); - assertTrue(((String) errorJSON.get(Constants.ErrorFields.HOSTNAME.getName())).length() > 0); + + String hostName = null; + try { + hostName = InetAddress.getLocalHost().getHostName(); + } catch (UnknownHostException uhe) { + // unable to get the hostname on this machine, don't test it + } + + if (!StringUtils.isEmpty(hostName)) { + assertTrue(((String) errorJSON.get(Constants.ErrorFields.HOSTNAME.getName())).length() > 0); + assertEquals(hostName, (String) errorJSON.get(Constants.ErrorFields.HOSTNAME.getName())); + } assertTrue(((long) errorJSON.get(Constants.ErrorFields.TIMESTAMP.getName())) > 0); }