From 234815846429acf2bc4ece4aa33ac25faa340214 Mon Sep 17 00:00:00 2001 From: Philippe Hanrigou Date: Thu, 16 Jul 2009 18:48:25 -0700 Subject: [PATCH] Code cleanup and introducing RegistrationInfo class --- .../selenium/grid/hub/HttpCommandParser.java | 2 +- .../selenium/grid/hub/HubRegistry.java | 4 +-- .../selenium/grid/hub/HubServlet.java | 4 +-- .../management/LifecycleManagerServlet.java | 2 +- .../management/console/ConsoleServlet.java | 3 +- .../commands/NewBrowserSessionCommand.java | 6 ++-- .../commands/SeleneseCommand.java | 4 +-- .../commands/TestCompleteCommand.java | 2 +- .../remotecontrol/LocalHostResolverTest.java | 4 +-- .../hub/remotecontrol/RequestProxyTest.java | 8 ++--- .../SeleniumRCProxyIntegrationTest.java | 10 +++--- .../selenium/grid/hub/HubRegistryTest.java | 2 +- .../selenium/grid/hub/HubServletTest.java | 4 +-- .../console/ConsoleServletTest.java | 2 +- .../GlobalRemoteControlPoolTest.java | 2 +- .../RemoteControlSessionTest.java | 2 +- .../NewBrowserSessionCommandTest.java | 6 ++-- .../commands/SeleneseCommandTest.java | 6 ++-- .../commands/TestCompleteCommandTest.java | 4 +-- .../selenium/grid/HttpParametersTest.java | 4 +-- .../selenium/grid/IOHelperTest.java | 8 ++++- .../configuration/ResourceLocatorTest.java | 2 +- .../grid/webserver/MainServletTest.java | 5 ++- .../regressiontests/HugeRequestTests.java | 2 +- .../grid/regressiontests/InactivityTests.java | 1 - .../grid/regressiontests/UnicodeTests.java | 4 ++- .../grid/remotecontrol/HubRequest.java | 2 +- .../grid/remotecontrol/RegistrationInfo.java | 35 +++++++++++++++++++ .../instrumentation/EchoRemoteControl.java | 1 - .../remotecontrol/RegistrationInfoTest.java | 29 +++++++++++++++ .../UnregistrationRequestTest.java | 1 - 31 files changed, 117 insertions(+), 54 deletions(-) create mode 100644 remote-control/src/main/java/com/thoughtworks/selenium/grid/remotecontrol/RegistrationInfo.java create mode 100644 remote-control/src/test/unit/java/com/thoughtworks/selenium/grid/remotecontrol/RegistrationInfoTest.java diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/HttpCommandParser.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/HttpCommandParser.java index 779a0fd4..8cb538e1 100755 --- a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/HttpCommandParser.java +++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/HttpCommandParser.java @@ -1,9 +1,9 @@ package com.thoughtworks.selenium.grid.hub; +import com.thoughtworks.selenium.grid.HttpParameters; import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.NewBrowserSessionCommand; import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.SeleneseCommand; import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.TestCompleteCommand; -import com.thoughtworks.selenium.grid.HttpParameters; /** * Parse HTTP commands targeting a Remote Control diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/HubRegistry.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/HubRegistry.java index 41bcb79d..9f44bf90 100755 --- a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/HubRegistry.java +++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/HubRegistry.java @@ -2,12 +2,12 @@ import com.thoughtworks.selenium.grid.configuration.EnvironmentConfiguration; import com.thoughtworks.selenium.grid.configuration.GridConfiguration; -import com.thoughtworks.selenium.grid.configuration.ResourceLocator; import com.thoughtworks.selenium.grid.configuration.HubConfiguration; +import com.thoughtworks.selenium.grid.configuration.ResourceLocator; +import com.thoughtworks.selenium.grid.hub.management.LifecycleManager; import com.thoughtworks.selenium.grid.hub.remotecontrol.DynamicRemoteControlPool; import com.thoughtworks.selenium.grid.hub.remotecontrol.GlobalRemoteControlPool; import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlPoller; -import com.thoughtworks.selenium.grid.hub.management.LifecycleManager; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/HubServlet.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/HubServlet.java index d54a8165..9ce9469e 100755 --- a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/HubServlet.java +++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/HubServlet.java @@ -1,8 +1,8 @@ package com.thoughtworks.selenium.grid.hub; -import com.thoughtworks.selenium.grid.hub.remotecontrol.DynamicRemoteControlPool; -import com.thoughtworks.selenium.grid.Response; import com.thoughtworks.selenium.grid.HttpParameters; +import com.thoughtworks.selenium.grid.Response; +import com.thoughtworks.selenium.grid.hub.remotecontrol.DynamicRemoteControlPool; import com.thoughtworks.selenium.grid.hub.remotecontrol.commands.SeleneseCommand; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/management/LifecycleManagerServlet.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/management/LifecycleManagerServlet.java index fcece42c..c186a00c 100644 --- a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/management/LifecycleManagerServlet.java +++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/management/LifecycleManagerServlet.java @@ -3,9 +3,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletException; import java.io.IOException; /** diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/management/console/ConsoleServlet.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/management/console/ConsoleServlet.java index cf3a9902..bfb1d7b1 100755 --- a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/management/console/ConsoleServlet.java +++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/management/console/ConsoleServlet.java @@ -1,5 +1,6 @@ package com.thoughtworks.selenium.grid.hub.management.console; +import com.thoughtworks.selenium.grid.hub.HubRegistry; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -9,8 +10,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import com.thoughtworks.selenium.grid.hub.HubRegistry; - /** * Gateway to Selenium Farm. * diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/NewBrowserSessionCommand.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/NewBrowserSessionCommand.java index 7466aa12..bca25cea 100755 --- a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/NewBrowserSessionCommand.java +++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/NewBrowserSessionCommand.java @@ -1,12 +1,12 @@ package com.thoughtworks.selenium.grid.hub.remotecontrol.commands; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import com.thoughtworks.selenium.grid.hub.Environment; import com.thoughtworks.selenium.grid.HttpParameters; import com.thoughtworks.selenium.grid.Response; +import com.thoughtworks.selenium.grid.hub.Environment; import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlPool; import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlProxy; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import java.io.IOException; import java.util.regex.Matcher; diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/SeleneseCommand.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/SeleneseCommand.java index f30a63e0..0c4df4c4 100755 --- a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/SeleneseCommand.java +++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/SeleneseCommand.java @@ -1,9 +1,9 @@ package com.thoughtworks.selenium.grid.hub.remotecontrol.commands; +import com.thoughtworks.selenium.grid.HttpParameters; +import com.thoughtworks.selenium.grid.Response; import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlPool; import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlProxy; -import com.thoughtworks.selenium.grid.Response; -import com.thoughtworks.selenium.grid.HttpParameters; import java.io.IOException; diff --git a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/TestCompleteCommand.java b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/TestCompleteCommand.java index 2dc2946d..0e9abcf6 100755 --- a/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/TestCompleteCommand.java +++ b/hub/src/main/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/TestCompleteCommand.java @@ -1,8 +1,8 @@ package com.thoughtworks.selenium.grid.hub.remotecontrol.commands; +import com.thoughtworks.selenium.grid.HttpParameters; import com.thoughtworks.selenium.grid.Response; import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlPool; -import com.thoughtworks.selenium.grid.HttpParameters; import java.io.IOException; diff --git a/hub/src/test/integration/com/thoughtworks/selenium/grid/hub/remotecontrol/LocalHostResolverTest.java b/hub/src/test/integration/com/thoughtworks/selenium/grid/hub/remotecontrol/LocalHostResolverTest.java index 861e1ae1..6102cf76 100755 --- a/hub/src/test/integration/com/thoughtworks/selenium/grid/hub/remotecontrol/LocalHostResolverTest.java +++ b/hub/src/test/integration/com/thoughtworks/selenium/grid/hub/remotecontrol/LocalHostResolverTest.java @@ -1,5 +1,7 @@ package com.thoughtworks.selenium.grid.hub.remotecontrol; +import org.junit.Test; + import java.net.InetAddress; import java.net.NetworkInterface; import java.net.SocketException; @@ -9,8 +11,6 @@ import java.util.LinkedList; import java.util.List; -import org.junit.Test; - /** * Experimenting on educated guess for which address a remote control should * listen to by default when it is not explicitely provided. diff --git a/hub/src/test/integration/com/thoughtworks/selenium/grid/hub/remotecontrol/RequestProxyTest.java b/hub/src/test/integration/com/thoughtworks/selenium/grid/hub/remotecontrol/RequestProxyTest.java index 9bacc82b..1e6da2ef 100755 --- a/hub/src/test/integration/com/thoughtworks/selenium/grid/hub/remotecontrol/RequestProxyTest.java +++ b/hub/src/test/integration/com/thoughtworks/selenium/grid/hub/remotecontrol/RequestProxyTest.java @@ -1,14 +1,12 @@ package com.thoughtworks.selenium.grid.hub.remotecontrol; +import com.thoughtworks.selenium.grid.HttpClient; +import com.thoughtworks.selenium.grid.Response; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertTrue; - -import java.io.IOException; - import org.junit.Test; -import com.thoughtworks.selenium.grid.HttpClient; -import com.thoughtworks.selenium.grid.Response; +import java.io.IOException; public class RequestProxyTest { diff --git a/hub/src/test/integration/com/thoughtworks/selenium/grid/hub/remotecontrol/SeleniumRCProxyIntegrationTest.java b/hub/src/test/integration/com/thoughtworks/selenium/grid/hub/remotecontrol/SeleniumRCProxyIntegrationTest.java index 547f5bb8..5479dda5 100755 --- a/hub/src/test/integration/com/thoughtworks/selenium/grid/hub/remotecontrol/SeleniumRCProxyIntegrationTest.java +++ b/hub/src/test/integration/com/thoughtworks/selenium/grid/hub/remotecontrol/SeleniumRCProxyIntegrationTest.java @@ -1,15 +1,13 @@ package com.thoughtworks.selenium.grid.hub.remotecontrol; +import com.thoughtworks.selenium.grid.HttpClient; +import com.thoughtworks.selenium.grid.HttpParameters; +import com.thoughtworks.selenium.grid.Response; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertTrue; - -import java.io.IOException; - import org.junit.Test; -import com.thoughtworks.selenium.grid.HttpClient; -import com.thoughtworks.selenium.grid.HttpParameters; -import com.thoughtworks.selenium.grid.Response; +import java.io.IOException; public class SeleniumRCProxyIntegrationTest { diff --git a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/HubRegistryTest.java b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/HubRegistryTest.java index 04db32d2..8809a846 100755 --- a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/HubRegistryTest.java +++ b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/HubRegistryTest.java @@ -1,8 +1,8 @@ package com.thoughtworks.selenium.grid.hub; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertEquals; import org.junit.Test; diff --git a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/HubServletTest.java b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/HubServletTest.java index 9f314b77..fe0905a1 100755 --- a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/HubServletTest.java +++ b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/HubServletTest.java @@ -1,9 +1,9 @@ package com.thoughtworks.selenium.grid.hub; +import com.thoughtworks.selenium.grid.HttpParameters; +import com.thoughtworks.selenium.grid.Response; import com.thoughtworks.selenium.grid.hub.remotecontrol.DynamicRemoteControlPool; import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlProxy; -import com.thoughtworks.selenium.grid.Response; -import com.thoughtworks.selenium.grid.HttpParameters; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertTrue; import org.jbehave.classmock.UsingClassMock; diff --git a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/management/console/ConsoleServletTest.java b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/management/console/ConsoleServletTest.java index 1aec425d..4717b218 100755 --- a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/management/console/ConsoleServletTest.java +++ b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/management/console/ConsoleServletTest.java @@ -4,8 +4,8 @@ import org.jbehave.core.mock.Mock; import org.junit.Test; -import javax.servlet.http.HttpServletResponse; import javax.servlet.ServletException; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; diff --git a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/GlobalRemoteControlPoolTest.java b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/GlobalRemoteControlPoolTest.java index 0279907e..6eac1701 100755 --- a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/GlobalRemoteControlPoolTest.java +++ b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/GlobalRemoteControlPoolTest.java @@ -10,8 +10,8 @@ import static junit.framework.Assert.assertTrue; import org.jbehave.classmock.UsingClassMock; import org.jbehave.core.mock.Mock; -import org.junit.Test; import static org.junit.Assert.assertNotNull; +import org.junit.Test; import java.util.Date; import java.util.List; diff --git a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/RemoteControlSessionTest.java b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/RemoteControlSessionTest.java index 662aabd4..1332de03 100644 --- a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/RemoteControlSessionTest.java +++ b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/RemoteControlSessionTest.java @@ -2,8 +2,8 @@ import org.jbehave.classmock.UsingClassMock; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import org.junit.Test; import java.util.Date; diff --git a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/NewBrowserSessionCommandTest.java b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/NewBrowserSessionCommandTest.java index bd86a4fa..353b3856 100755 --- a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/NewBrowserSessionCommandTest.java +++ b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/NewBrowserSessionCommandTest.java @@ -1,14 +1,14 @@ package com.thoughtworks.selenium.grid.hub.remotecontrol.commands; -import com.thoughtworks.selenium.grid.hub.Environment; import com.thoughtworks.selenium.grid.HttpParameters; import com.thoughtworks.selenium.grid.Response; +import com.thoughtworks.selenium.grid.hub.Environment; import com.thoughtworks.selenium.grid.hub.remotecontrol.DynamicRemoteControlPool; -import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlProxy; import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlPool; +import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlProxy; import static junit.framework.Assert.assertEquals; -import org.jbehave.core.mock.Mock; import org.jbehave.classmock.UsingClassMock; +import org.jbehave.core.mock.Mock; import org.junit.Test; import java.io.IOException; diff --git a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/SeleneseCommandTest.java b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/SeleneseCommandTest.java index 7c827807..592d75a9 100755 --- a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/SeleneseCommandTest.java +++ b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/SeleneseCommandTest.java @@ -1,12 +1,12 @@ package com.thoughtworks.selenium.grid.hub.remotecontrol.commands; +import com.thoughtworks.selenium.grid.HttpParameters; +import com.thoughtworks.selenium.grid.Response; import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlPool; import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlProxy; -import com.thoughtworks.selenium.grid.Response; -import com.thoughtworks.selenium.grid.HttpParameters; import static junit.framework.Assert.assertEquals; -import org.jbehave.core.mock.Mock; import org.jbehave.classmock.UsingClassMock; +import org.jbehave.core.mock.Mock; import org.junit.Test; import java.io.IOException; diff --git a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/TestCompleteCommandTest.java b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/TestCompleteCommandTest.java index bd6bd24b..2080756b 100755 --- a/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/TestCompleteCommandTest.java +++ b/hub/src/test/unit/java/com/thoughtworks/selenium/grid/hub/remotecontrol/commands/TestCompleteCommandTest.java @@ -1,9 +1,9 @@ package com.thoughtworks.selenium.grid.hub.remotecontrol.commands; +import com.thoughtworks.selenium.grid.HttpParameters; +import com.thoughtworks.selenium.grid.Response; import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlPool; import com.thoughtworks.selenium.grid.hub.remotecontrol.RemoteControlProxy; -import com.thoughtworks.selenium.grid.Response; -import com.thoughtworks.selenium.grid.HttpParameters; import static junit.framework.Assert.assertEquals; import org.jbehave.classmock.UsingClassMock; import org.jbehave.core.mock.Mock; diff --git a/infrastructure/core/src/test/unit/java/com/thoughtworks/selenium/grid/HttpParametersTest.java b/infrastructure/core/src/test/unit/java/com/thoughtworks/selenium/grid/HttpParametersTest.java index d598a0ec..26c352bb 100755 --- a/infrastructure/core/src/test/unit/java/com/thoughtworks/selenium/grid/HttpParametersTest.java +++ b/infrastructure/core/src/test/unit/java/com/thoughtworks/selenium/grid/HttpParametersTest.java @@ -6,9 +6,9 @@ import org.jbehave.classmock.UsingClassMock; import org.junit.Test; -import java.util.Set; -import java.util.Map; import java.util.HashMap; +import java.util.Map; +import java.util.Set; public class HttpParametersTest extends UsingClassMock { diff --git a/infrastructure/core/src/test/unit/java/com/thoughtworks/selenium/grid/IOHelperTest.java b/infrastructure/core/src/test/unit/java/com/thoughtworks/selenium/grid/IOHelperTest.java index db66e99b..47d97b79 100755 --- a/infrastructure/core/src/test/unit/java/com/thoughtworks/selenium/grid/IOHelperTest.java +++ b/infrastructure/core/src/test/unit/java/com/thoughtworks/selenium/grid/IOHelperTest.java @@ -5,7 +5,13 @@ import org.jbehave.core.mock.Mock; import org.junit.Test; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.Reader; +import java.io.StringWriter; +import java.io.Writer; import java.net.Socket; public class IOHelperTest extends UsingClassMock { diff --git a/infrastructure/core/src/test/unit/java/com/thoughtworks/selenium/grid/configuration/ResourceLocatorTest.java b/infrastructure/core/src/test/unit/java/com/thoughtworks/selenium/grid/configuration/ResourceLocatorTest.java index e92900d6..a07067a0 100755 --- a/infrastructure/core/src/test/unit/java/com/thoughtworks/selenium/grid/configuration/ResourceLocatorTest.java +++ b/infrastructure/core/src/test/unit/java/com/thoughtworks/selenium/grid/configuration/ResourceLocatorTest.java @@ -1,7 +1,7 @@ package com.thoughtworks.selenium.grid.configuration; -import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.assertNotNull; +import static junit.framework.Assert.assertTrue; import org.junit.Test; diff --git a/infrastructure/webserver/src/test/unit/java/com/thoughtworks/selenium/grid/webserver/MainServletTest.java b/infrastructure/webserver/src/test/unit/java/com/thoughtworks/selenium/grid/webserver/MainServletTest.java index ab505f31..4907219b 100644 --- a/infrastructure/webserver/src/test/unit/java/com/thoughtworks/selenium/grid/webserver/MainServletTest.java +++ b/infrastructure/webserver/src/test/unit/java/com/thoughtworks/selenium/grid/webserver/MainServletTest.java @@ -1,5 +1,6 @@ package com.thoughtworks.selenium.grid.webserver; +import com.thoughtworks.selenium.grid.HttpParameters; import org.jbehave.classmock.UsingClassMock; import org.jbehave.core.mock.Mock; import static org.junit.Assert.assertEquals; @@ -14,10 +15,8 @@ import java.io.IOException; import java.io.PrintWriter; import java.lang.reflect.Field; -import java.util.Map; import java.util.HashMap; - -import com.thoughtworks.selenium.grid.HttpParameters; +import java.util.Map; public class MainServletTest extends UsingClassMock { diff --git a/regression-tests/src/com/thoughtworks/selenium/grid/regressiontests/HugeRequestTests.java b/regression-tests/src/com/thoughtworks/selenium/grid/regressiontests/HugeRequestTests.java index ca992cff..493f53f9 100644 --- a/regression-tests/src/com/thoughtworks/selenium/grid/regressiontests/HugeRequestTests.java +++ b/regression-tests/src/com/thoughtworks/selenium/grid/regressiontests/HugeRequestTests.java @@ -1,7 +1,7 @@ package com.thoughtworks.selenium.grid.regressiontests; -import org.testng.annotations.Parameters; import com.thoughtworks.selenium.grid.tools.ThreadSafeSeleniumSessionStorage; +import org.testng.annotations.Parameters; /** * Check that Selenium Grid handles Unicode Characters properly diff --git a/regression-tests/src/com/thoughtworks/selenium/grid/regressiontests/InactivityTests.java b/regression-tests/src/com/thoughtworks/selenium/grid/regressiontests/InactivityTests.java index b505ca85..9abe2c18 100644 --- a/regression-tests/src/com/thoughtworks/selenium/grid/regressiontests/InactivityTests.java +++ b/regression-tests/src/com/thoughtworks/selenium/grid/regressiontests/InactivityTests.java @@ -1,7 +1,6 @@ package com.thoughtworks.selenium.grid.regressiontests; import com.thoughtworks.selenium.grid.tools.ThreadSafeSeleniumSessionStorage; -import org.testng.AssertJUnit; import org.testng.annotations.Parameters; import org.testng.annotations.Test; diff --git a/regression-tests/src/com/thoughtworks/selenium/grid/regressiontests/UnicodeTests.java b/regression-tests/src/com/thoughtworks/selenium/grid/regressiontests/UnicodeTests.java index 5eeedbc1..f4946a3a 100644 --- a/regression-tests/src/com/thoughtworks/selenium/grid/regressiontests/UnicodeTests.java +++ b/regression-tests/src/com/thoughtworks/selenium/grid/regressiontests/UnicodeTests.java @@ -1,6 +1,8 @@ package com.thoughtworks.selenium.grid.regressiontests; -import static com.thoughtworks.selenium.grid.tools.ThreadSafeSeleniumSessionStorage.*; +import static com.thoughtworks.selenium.grid.tools.ThreadSafeSeleniumSessionStorage.closeSeleniumSession; +import static com.thoughtworks.selenium.grid.tools.ThreadSafeSeleniumSessionStorage.session; +import static com.thoughtworks.selenium.grid.tools.ThreadSafeSeleniumSessionStorage.startSeleniumSession; import org.testng.AssertJUnit; import org.testng.annotations.Parameters; import org.testng.annotations.Test; diff --git a/remote-control/src/main/java/com/thoughtworks/selenium/grid/remotecontrol/HubRequest.java b/remote-control/src/main/java/com/thoughtworks/selenium/grid/remotecontrol/HubRequest.java index 4e299f05..27388ce3 100644 --- a/remote-control/src/main/java/com/thoughtworks/selenium/grid/remotecontrol/HubRequest.java +++ b/remote-control/src/main/java/com/thoughtworks/selenium/grid/remotecontrol/HubRequest.java @@ -1,7 +1,7 @@ package com.thoughtworks.selenium.grid.remotecontrol; -import org.apache.commons.httpclient.methods.PostMethod; import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.methods.PostMethod; import java.io.IOException; diff --git a/remote-control/src/main/java/com/thoughtworks/selenium/grid/remotecontrol/RegistrationInfo.java b/remote-control/src/main/java/com/thoughtworks/selenium/grid/remotecontrol/RegistrationInfo.java new file mode 100644 index 00000000..785b99a7 --- /dev/null +++ b/remote-control/src/main/java/com/thoughtworks/selenium/grid/remotecontrol/RegistrationInfo.java @@ -0,0 +1,35 @@ +package com.thoughtworks.selenium.grid.remotecontrol; + +/** + * Information required when registering the Remote Control to the Hub + */ +public class RegistrationInfo { + private final String seleniumHubURL; + private final String environment; + private final String host; + private final String port; + + public RegistrationInfo(String seleniumHubURL, String environment, String host, String port) { + this.seleniumHubURL = seleniumHubURL; + this.environment = environment; + this.host = host; + this.port = port; + } + + public String hubURL() { + return seleniumHubURL; + } + + public String environment() { + return environment; + } + + public String host() { + return host; + } + + public String port() { + return port; + } + +} diff --git a/remote-control/src/main/java/com/thoughtworks/selenium/grid/remotecontrol/instrumentation/EchoRemoteControl.java b/remote-control/src/main/java/com/thoughtworks/selenium/grid/remotecontrol/instrumentation/EchoRemoteControl.java index 3fb955d0..46c88851 100644 --- a/remote-control/src/main/java/com/thoughtworks/selenium/grid/remotecontrol/instrumentation/EchoRemoteControl.java +++ b/remote-control/src/main/java/com/thoughtworks/selenium/grid/remotecontrol/instrumentation/EchoRemoteControl.java @@ -1,7 +1,6 @@ package com.thoughtworks.selenium.grid.remotecontrol.instrumentation; import com.thoughtworks.selenium.grid.remotecontrol.SelfRegisteringRemoteControl; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/remote-control/src/test/unit/java/com/thoughtworks/selenium/grid/remotecontrol/RegistrationInfoTest.java b/remote-control/src/test/unit/java/com/thoughtworks/selenium/grid/remotecontrol/RegistrationInfoTest.java new file mode 100644 index 00000000..653c791c --- /dev/null +++ b/remote-control/src/test/unit/java/com/thoughtworks/selenium/grid/remotecontrol/RegistrationInfoTest.java @@ -0,0 +1,29 @@ +package com.thoughtworks.selenium.grid.remotecontrol; + +import static junit.framework.Assert.assertEquals; +import org.jbehave.classmock.UsingClassMock; +import org.junit.Test; + +public class RegistrationInfoTest extends UsingClassMock { + + @Test + public void hubURLIsTheOneProvidedInTheConstructor() { + assertEquals("The URL", new RegistrationInfo("The URL", "", "", "").hubURL()); + } + + @Test + public void environmentIsTheOneProvidedInTheConstructor() { + assertEquals("The Environment", new RegistrationInfo("", "The Environment", "", "").environment()); + } + + @Test + public void hostIsTheOneProvidedInTheConstructor() { + assertEquals("The Host", new RegistrationInfo("", "", "The Host", "").host()); + } + + @Test + public void portIsTheOneProvidedInTheConstructor() { + assertEquals("The Port", new RegistrationInfo("", "", "", "The Port").port()); + } + +} \ No newline at end of file diff --git a/remote-control/src/test/unit/java/com/thoughtworks/selenium/grid/remotecontrol/UnregistrationRequestTest.java b/remote-control/src/test/unit/java/com/thoughtworks/selenium/grid/remotecontrol/UnregistrationRequestTest.java index 2caa4d70..807ab732 100644 --- a/remote-control/src/test/unit/java/com/thoughtworks/selenium/grid/remotecontrol/UnregistrationRequestTest.java +++ b/remote-control/src/test/unit/java/com/thoughtworks/selenium/grid/remotecontrol/UnregistrationRequestTest.java @@ -1,6 +1,5 @@ package com.thoughtworks.selenium.grid.remotecontrol; -import junit.framework.Assert; import static junit.framework.Assert.assertEquals; import org.jbehave.classmock.UsingClassMock; import org.junit.Test;