stackify
diff --git a/‎src/main/java/com/stackify/api/common/EnvironmentDetails.java‎
Lines changed: 35 additions & 9 deletions b/‎src/main/java/com/stackify/api/common/EnvironmentDetails.java‎
Lines changed: 35 additions & 9 deletions
diff --git a/‎src/test/java/com/stackify/api/common/EnvironmentDetailsTest.java‎
Lines changed: 18 additions & 12 deletions b/‎src/test/java/com/stackify/api/common/EnvironmentDetailsTest.java‎
Lines changed: 18 additions & 12 deletions
@@ -34,16 +34,9 @@ public class EnvironmentDetails {
 	 */
 	public static EnvironmentDetail getEnvironmentDetail(final String application, final String environment) {
 
-		// lookup the hostname
+		// lookup the host name
 
-		String hostName = null;
-		
-		try {
-			InetAddress addr = InetAddress.getLocalHost();
-			hostName = addr.getHostName();
-		} catch (Throwable t) {
-			// Do nothing
-		}
+		String hostName = getHostName();
 
 		// lookup the current path
 
@@ -60,6 +53,39 @@ public static EnvironmentDetail getEnvironmentDetail(final String application, f
 		return environmentBuilder.build();
 	}
 
+	/**
+	 * @return The host name 
+	 */
+	private static String getHostName() {
+		
+		// HOSTNAME environment variable
+		
+		try {
+			String hostName = System.getenv("HOSTNAME");
+			
+			if ((hostName != null) && (0 < hostName.length())) {
+				return hostName;
+			}
+		} catch (Throwable t) {
+			// Do nothing
+		}
+		
+		// InetAddress.getLocalHost().getHostName()
+		
+		try {
+			InetAddress addr = InetAddress.getLocalHost();
+			String hostName = addr.getHostName();
+			
+			if ((hostName != null) && (0 < hostName.length())) {
+				return hostName;
+			}
+		} catch (Throwable t) {
+			// Do nothing
+		}
+
+		return null;
+	}
+	
 	/**
 	 * Hidden to prevent construction
 	 */
 
@@ -33,7 +33,7 @@
  * @author Eric Martin
  */
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({EnvironmentDetails.class, InetAddress.class})
+@PrepareForTest({EnvironmentDetails.class, System.class, InetAddress.class})
 public class EnvironmentDetailsTest {
 
 	/**
@@ -45,12 +45,10 @@ public void testGetEnvironmentDetail() throws UnknownHostException {
 		String application = "application";
 		String environment = "environment";
 		String hostName = "hostName";
-		
-		InetAddress inetAddress = PowerMockito.mock(InetAddress.class);
-		PowerMockito.when(inetAddress.getHostName()).thenReturn(hostName);
-		
-		PowerMockito.mockStatic(InetAddress.class);
-		PowerMockito.when(InetAddress.getLocalHost()).thenReturn(inetAddress);
+				
+		PowerMockito.mockStatic(System.class);
+		PowerMockito.when(System.getenv("HOSTNAME")).thenReturn(hostName);
+		PowerMockito.when(System.getProperty("user.dir")).thenReturn("/some/dir/");
 
 		EnvironmentDetail env = EnvironmentDetails.getEnvironmentDetail(application, environment);
 
@@ -64,22 +62,30 @@ public void testGetEnvironmentDetail() throws UnknownHostException {
 	}
 
 	/**
-	 * testGetEnvironmentDetailHostnameException
+	 * testGetEnvironmentDetailWithoutHostnameEnvVar
 	 * @throws UnknownHostException 
 	 */
 	@Test
-	public void testGetEnvironmentDetailHostnameException() throws UnknownHostException {
+	public void testGetEnvironmentDetailWithoutHostnameEnvVar() throws UnknownHostException {
 		String application = "application";
 		String environment = "environment";
-				
+		String hostName = "hostName";
+		
+		PowerMockito.mockStatic(System.class);
+		PowerMockito.when(System.getenv("HOSTNAME")).thenReturn(null);
+		PowerMockito.when(System.getProperty("user.dir")).thenReturn("/some/dir/");
+
+		InetAddress inetAddress = PowerMockito.mock(InetAddress.class);
+		PowerMockito.when(inetAddress.getHostName()).thenReturn(hostName);
+		
 		PowerMockito.mockStatic(InetAddress.class);
-		PowerMockito.when(InetAddress.getLocalHost()).thenThrow(new RuntimeException());
+		PowerMockito.when(InetAddress.getLocalHost()).thenReturn(inetAddress);
 
 		EnvironmentDetail env = EnvironmentDetails.getEnvironmentDetail(application, environment);
 
 		Assert.assertNotNull(env);
 
-		Assert.assertNull(env.getDeviceName());
+		Assert.assertEquals(hostName, env.getDeviceName());
 		Assert.assertNotNull(env.getAppLocation());
 		Assert.assertNull(env.getAppName());
 		Assert.assertEquals(application, env.getConfiguredAppName());