Moving tests too

Author: barancev

java/client/test/org/openqa/selenium/browserlaunchers/RcBrowserLauncherTests.java

@@ -26,9 +26,7 @@
 @Suite.SuiteClasses(value = {
     FirefoxLocatorUnitTest.class,
     LauncherUtilsUnitTest.class,
-    MacProxyManagerUnitTest.class,
     ProxyPacTest.class,
-    WindowsProxyManagerUnitTest.class,
     SingleBrowserLocatorUnitTest.class
 })
 public class RcBrowserLauncherTests {

java/server/test/org/openqa/selenium/server/RcServerUnitTests.java

@@ -24,7 +24,9 @@
 import org.openqa.selenium.server.browserlaunchers.BrowserConfigurationOptionsTest;
 import org.openqa.selenium.server.browserlaunchers.BrowserLauncherFactoryUnitTest;
 import org.openqa.selenium.server.browserlaunchers.FirefoxChromeLauncherUnitTest;
+import org.openqa.selenium.server.browserlaunchers.MacProxyManagerUnitTest;
 import org.openqa.selenium.server.browserlaunchers.MakeProxyPacUnitTest;
+import org.openqa.selenium.server.browserlaunchers.WindowsProxyManagerUnitTest;
 import org.openqa.selenium.server.htmlrunner.HTMLSuiteResultUnitTest;
 import org.openqa.selenium.server.mock.MockPIFrameUnitTest;
 
@@ -45,13 +47,15 @@
     FsResourceLocatorUnitTest.class,
     HTMLSuiteResultUnitTest.class,
     LoggingTests.class,
+    MacProxyManagerUnitTest.class,
     MakeProxyPacUnitTest.class,
     MockPIFrameUnitTest.class,
     ProxyHandlerUnitTest.class,
     RemoteControlConfigurationUnitTest.class,
     SeleniumDriverResourceHandlerUnitTest.class,
     SeleniumServerUnitTest.class,
     SingleEntryAsyncQueueUnitTest.class,
-    StaticContentHandlerUnitTest.class
+    StaticContentHandlerUnitTest.class,
+    WindowsProxyManagerUnitTest.class
 })
 public class RcServerUnitTests {}

java/client/test/org/openqa/selenium/browserlaunchers/MacProxyManagerUnitTest.java renamed to java/server/test/org/openqa/selenium/server/browserlaunchers/MacProxyManagerUnitTest.java

@@ -16,7 +16,7 @@
 */
 
 
-package org.openqa.selenium.browserlaunchers;
+package org.openqa.selenium.server.browserlaunchers;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -26,7 +26,6 @@
 
 import org.junit.Before;
 import org.junit.Test;
-import org.openqa.selenium.browserlaunchers.MacProxyManager.MacNetworkSetupException;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -429,7 +428,7 @@ protected String runNetworkSetupGetWebProxy() {
     try {
       mmpm._getCurrentNetworkSettings();
       fail("Didn't see expected exception");
-    } catch (MacNetworkSetupException e) {
+    } catch (MacProxyManager.MacNetworkSetupException e) {
       assertExceptionContains("Unhelpful exception message", "Port didn't look right", e);
     }
   }

java/client/test/org/openqa/selenium/browserlaunchers/WindowsProxyManagerUnitTest.java renamed to java/server/test/org/openqa/selenium/server/browserlaunchers/WindowsProxyManagerUnitTest.java

@@ -16,7 +16,7 @@
 */
 
 
-package org.openqa.selenium.browserlaunchers;
+package org.openqa.selenium.server.browserlaunchers;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -25,6 +25,7 @@
 import org.junit.Test;
 import org.openqa.selenium.io.FileHandler;
 import org.openqa.selenium.io.TemporaryFilesystem;
+import org.openqa.selenium.server.browserlaunchers.WindowsProxyManager;
 
 import java.io.File;
 import java.io.IOException;