[grid] Deleting tests for legacy (v1 and v2) grid implementations

SeleniumHQ · Apr 8, 2019 · f512540 · f512540
1 parent 2692396
commit f512540
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 160 deletions.
diff --git a/java/server/test/org/openqa/grid/e2e/GridE2ETests.java b/java/server/test/org/openqa/grid/e2e/GridE2ETests.java
@@ -20,7 +20,6 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.openqa.grid.e2e.misc.ConfigInheritanceTest;
-import org.openqa.grid.e2e.misc.Grid1HeartbeatTest;
 import org.openqa.grid.e2e.misc.GridDistributionTest;
 import org.openqa.grid.e2e.misc.GridListActiveSessionsTest;
 import org.openqa.grid.e2e.misc.GridSerializeExceptionTest;
@@ -47,7 +46,6 @@
     DefaultProxyInjectsConfigurationUuidTest.class,
     DefaultProxyIsUnregisteredIfDownForTooLongTest.class,
     ExtraServletUtilTest.class,
-    Grid1HeartbeatTest.class,
     GridDistributionTest.class,
     GridSerializeExceptionTest.class,
     GridViaCommandLineTest.class,

diff --git a/java/server/test/org/openqa/grid/e2e/misc/Grid1HeartbeatTest.java b/java/server/test/org/openqa/grid/e2e/misc/Grid1HeartbeatTest.java
diff --git a/java/server/test/org/openqa/grid/web/servlet/RegistrationServletTest.java b/java/server/test/org/openqa/grid/web/servlet/RegistrationServletTest.java
@@ -101,68 +101,6 @@ public void testInvalidV2Registration() {
         .isThrownBy(() -> sendCommand("POST", "/", requestWithoutConfig));
   }
 
-  /**
-   * Tests that the registration request servlet can process a V2 RegistrationRequest which
-   * contains servlets as a comma separated String.
-   */
-  @Test
-  public void testLegacyV2Registration() throws Exception {
-    Map<String, Object> config = new TreeMap<>();
-    config.put("servlets", "foo,bar,baz");
-    config.put("registerCycle", 30001);
-    config.put("proxy", null);
-    grid2Request.put("configuration", config);
-
-    grid2Request.put("capabilities", singletonList(new FirefoxOptions()));
-    String id = "http://dummynode:1234";
-    grid2Request.put("id", id);
-
-    final FakeHttpServletResponse response = sendCommand("POST", "/", grid2Request);
-    waitForServletToAddProxy();
-
-    assertEquals(HttpServletResponse.SC_OK, response.getStatus());
-    assertEquals(((RegistrationServlet) servlet).getRegistry().getAllProxies().size(), 1);
-
-    final RemoteProxy proxy = ((RegistrationServlet) servlet).getRegistry().getAllProxies()
-      .getProxyById(id);
-    assertNotNull(proxy);
-    assertEquals(3, proxy.getConfig().servlets.size());
-    assertEquals(1, proxy.getConfig().capabilities.size());
-    assertEquals(30001, proxy.getConfig().registerCycle.intValue());
-    assertEquals(id, proxy.getConfig().id);
-  }
-
-
-  /**
-   * Tests that the registration request servlet can process a V2 RegistrationRequest from
-   * a 3.x node.
-   */
-  @Test
-  public void testLegacyV3BetaRegistration() throws Exception {
-    GridNodeConfiguration config = new GridNodeConfiguration();
-    config.capabilities.clear();
-    config.proxy = null;
-    grid3Request.put("configuration", config);
-
-    grid3Request.put("capabilities", singletonList(new FirefoxOptions()));
-    String id = "http://dummynode:2345";
-    grid3Request.put("id", id);
-    final FakeHttpServletResponse response = sendCommand("POST", "/", grid3Request);
-    waitForServletToAddProxy();
-
-    assertEquals(HttpServletResponse.SC_OK, response.getStatus());
-    assertEquals(((RegistrationServlet) servlet).getRegistry().getAllProxies().size(), 1);
-
-    final RemoteProxy proxy = ((RegistrationServlet) servlet).getRegistry().getAllProxies()
-      .getProxyById(id);
-    assertNotNull(proxy);
-    assertEquals(0, proxy.getConfig().servlets.size());
-    assertEquals(1, proxy.getConfig().capabilities.size());
-    assertEquals(config.registerCycle.intValue(), proxy.getConfig().registerCycle.intValue());
-    assertEquals(id, proxy.getConfig().id);
-  }
-
-
   /**
    * Tests that the registration request servlet can process a V3 RegistrationRequest
    */