Author: alessio.soldano(a)jboss.com Date: 2013-04-08 11:20:49 -0400 (Mon, 08 Apr 2013) New Revision: 17477 Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java Log: Fixing MemoryBufferRecorderTestCase to ask for proper client host records (related to Undertow integration in AS8) Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2013-04-08 14:16:04 UTC (rev 17476) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2013-04-08 15:20:49 UTC (rev 17477) @@ -21,7 +21,9 @@ */ package org.jboss.test.ws.management.recording; +import java.net.InetAddress; import java.net.URL; +import java.net.UnknownHostException; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -132,8 +134,8 @@ port.echo1("Test getRecordsByClientHost"); //We have client and server on the same host here... - String host = "localhost".equals(getServerHost()) ? "127.0.0.1" : getServerHost(); - if ("[::1]".equals(host)) host = "0:0:0:0:0:0:0:1"; // IPv6 hack + String host = getClientHostName(getServerHost()); + Map<String, List<Record>> localhostRecords = (Map<String, List<Record>>)server.invoke(oname, "getRecordsByClientHost", new Object[] { host }, new String[] { "java.lang.String" }); Map<String, List<Record>> amazonRecords = (Map<String, List<Record>>)server.invoke(oname, "getRecordsByClientHost", new Object[] { "72.21.203.1" }, @@ -143,6 +145,14 @@ assertTrue("There are records for 72.21.203.1", amazonRecords.size() == 0); } + private static String getClientHostName(String host) throws UnknownHostException { + //AS8 (using Undertow) actually does reverse lookup in ServletRequest::getRemoteHost(), AS720 doesn't... + final String ip = InetAddress.getByName(host).getHostAddress(); + String clientHost = (ip.equals(host) || isTargetJBoss7()) ? ip : InetAddress.getByName(ip).getHostName(); + if ("[::1]".equals(clientHost)) clientHost = "0:0:0:0:0:0:0:1"; // IPv6 hack + return clientHost; + } + @SuppressWarnings("unchecked") public void testGetMatchingRecords() throws Exception {