[grid] Code formatting and removing two tests

The removed tests were trying to assert that a
Node can only register to the Distributor when
they provide the correct registration secret.
However, they were using the `GuavaEventBus`,
which does not have the logic that compares
secrets. So testing this here is pointless,
in addition, the test was flaky due to a
race condition. Moreover, testing that all
events have a valid secret is already being
done here https://github.com/SeleniumHQ/selenium/blob/trunk/java/server/test/org/openqa/selenium/events/ZeroMqEventBusTest.java#L36

Author: diemol

java/server/test/org/openqa/selenium/grid/distributor/AddingNodesTest.java

@@ -121,14 +121,19 @@ public void setUpDistributor() throws MalformedURLException {
 
     stereotype = new ImmutableCapabilities("browserName", "gouda");
 
-    wait = new FluentWait<>(new Object()).ignoring(Throwable.class).withTimeout(Duration.ofSeconds(2));
+    wait = new FluentWait<>(
+      new Object()).ignoring(Throwable.class).withTimeout(Duration.ofSeconds(2));
   }
 
   @Test
   public void shouldBeAbleToRegisterALocalNode() throws URISyntaxException {
     URI sessionUri = new URI("http://example:1234");
-    Node node = LocalNode.builder(tracer, bus, externalUrl.toURI(), externalUrl.toURI(), registrationSecret)
-        .add(CAPS, new TestSessionFactory((id, caps) -> new Session(id, sessionUri, stereotype, caps, Instant.now())))
+    Node node = LocalNode
+      .builder(tracer, bus, externalUrl.toURI(), externalUrl.toURI(), registrationSecret)
+        .add(
+          CAPS,
+          new TestSessionFactory(
+            (id, caps) -> new Session(id, sessionUri, stereotype, caps, Instant.now())))
         .build();
     handler.addHandler(node);
 
@@ -140,86 +145,15 @@ public void shouldBeAbleToRegisterALocalNode() throws URISyntaxException {
     assertEquals(1, getStereotypes(status).get(CAPS).intValue());
   }
 
-  @Test
-  public void shouldNotRegisterALocalNodeWithWrongRegistrationSecret() throws URISyntaxException {
-    URI sessionUri = new URI("http://example:1234");
-    HttpClient.Factory clientFactory = new RoutableHttpClientFactory(
-        externalUrl,
-        handler,
-        HttpClient.Factory.createDefault());
-
-    Secret registrationSecret = new Secret("my_secret");
-
-    Node node = LocalNode.builder(tracer, bus, externalUrl.toURI(), externalUrl.toURI(), registrationSecret)
-      .add(CAPS, new TestSessionFactory((id, caps) -> new Session(id, sessionUri, stereotype, caps, Instant.now())))
-      .build();
-    handler.addHandler(node);
-
-    LocalSessionMap sessions = new LocalSessionMap(tracer, bus);
-    LocalNewSessionQueue localNewSessionQueue = new LocalNewSessionQueue(
-      tracer,
-      bus,
-      Duration.ofSeconds(2),
-      Duration.ofSeconds(2));
-    LocalNewSessionQueuer queuer = new LocalNewSessionQueuer(tracer, bus, localNewSessionQueue);
-    Distributor secretDistributor = new LocalDistributor(
-      tracer,
-      bus,
-      clientFactory,
-      sessions,
-      queuer,
-      registrationSecret);
-
-    bus.fire(new NodeStatusEvent(node.getStatus()));
-
-    assertEquals(0, secretDistributor.getAvailableNodes().size());
-  }
-
-  @Test
-  public void shouldRegisterALocalNodeWithCorrectRegistrationSecret() throws URISyntaxException {
-    URI sessionUri = new URI("http://example:1234");
-    HttpClient.Factory clientFactory = new RoutableHttpClientFactory(
-        externalUrl,
-        handler,
-        HttpClient.Factory.createDefault());
-
-    Secret registrationSecret = new Secret("my_secret");
-
-    Node node = LocalNode.builder(tracer, bus, externalUrl.toURI(), externalUrl.toURI(), registrationSecret)
-        .add(CAPS, new TestSessionFactory((id, caps) -> new Session(id, sessionUri, stereotype, caps, Instant.now())))
-        .build();
-    handler.addHandler(node);
-
-    LocalSessionMap sessions = new LocalSessionMap(tracer, bus);
-    LocalNewSessionQueue localNewSessionQueue = new LocalNewSessionQueue(
-      tracer,
-      bus,
-      Duration.ofSeconds(2),
-      Duration.ofSeconds(2));
-    LocalNewSessionQueuer queuer = new LocalNewSessionQueuer(tracer, bus, localNewSessionQueue);
-    Distributor secretDistributor = new LocalDistributor(
-        tracer,
-        bus,
-        clientFactory,
-        sessions,
-        queuer,
-        registrationSecret);
-
-    bus.fire(new NodeStatusEvent(node.getStatus()));
-
-    wait.until(obj -> secretDistributor.getStatus().hasCapacity());
-
-    assertEquals(1, secretDistributor.getAvailableNodes().size());
-  }
-
   @Test
   public void shouldBeAbleToRegisterACustomNode() throws URISyntaxException {
     URI sessionUri = new URI("http://example:1234");
     Node node = new CustomNode(
         bus,
         new NodeId(UUID.randomUUID()),
         externalUrl.toURI(),
-        c -> new Session(new SessionId(UUID.randomUUID()), sessionUri, stereotype, c, Instant.now()));
+        c -> new Session(
+          new SessionId(UUID.randomUUID()), sessionUri, stereotype, c, Instant.now()));
     handler.addHandler(node);
 
     distributor.add(node);
@@ -233,8 +167,12 @@ public void shouldBeAbleToRegisterACustomNode() throws URISyntaxException {
   @Test
   public void shouldBeAbleToRegisterNodesByListeningForEvents() throws URISyntaxException {
     URI sessionUri = new URI("http://example:1234");
-    Node node = LocalNode.builder(tracer, bus, externalUrl.toURI(), externalUrl.toURI(), registrationSecret)
-        .add(CAPS, new TestSessionFactory((id, caps) -> new Session(id, sessionUri, stereotype, caps, Instant.now())))
+    Node node = LocalNode
+      .builder(tracer, bus, externalUrl.toURI(), externalUrl.toURI(), registrationSecret)
+        .add(
+          CAPS,
+          new TestSessionFactory(
+            (id, caps) -> new Session(id, sessionUri, stereotype, caps, Instant.now())))
         .build();
     handler.addHandler(node);
 
@@ -247,13 +185,22 @@ public void shouldBeAbleToRegisterNodesByListeningForEvents() throws URISyntaxEx
   }
 
   @Test
-  public void shouldKeepOnlyOneNodeWhenTwoRegistrationsHaveTheSameUriByListeningForEvents() throws URISyntaxException {
+  public void shouldKeepOnlyOneNodeWhenTwoRegistrationsHaveTheSameUriByListeningForEvents()
+    throws URISyntaxException {
     URI sessionUri = new URI("http://example:1234");
-    Node firstNode = LocalNode.builder(tracer, bus, externalUrl.toURI(), externalUrl.toURI(), registrationSecret)
-      .add(CAPS, new TestSessionFactory((id, caps) -> new Session(id, sessionUri, stereotype, caps, Instant.now())))
+    Node firstNode = LocalNode
+      .builder(tracer, bus, externalUrl.toURI(), externalUrl.toURI(), registrationSecret)
+      .add(
+        CAPS,
+        new TestSessionFactory(
+          (id, caps) -> new Session(id, sessionUri, stereotype, caps, Instant.now())))
       .build();
-    Node secondNode = LocalNode.builder(tracer, bus, externalUrl.toURI(), externalUrl.toURI(), registrationSecret)
-      .add(CAPS, new TestSessionFactory((id, caps) -> new Session(id, sessionUri, stereotype, caps, Instant.now())))
+    Node secondNode = LocalNode
+      .builder(tracer, bus, externalUrl.toURI(), externalUrl.toURI(), registrationSecret)
+      .add(
+        CAPS,
+        new TestSessionFactory(
+          (id, caps) -> new Session(id, sessionUri, stereotype, caps, Instant.now())))
       .build();
     handler.addHandler(firstNode);
     handler.addHandler(secondNode);
@@ -272,8 +219,12 @@ public void shouldKeepOnlyOneNodeWhenTwoRegistrationsHaveTheSameUriByListeningFo
   public void distributorShouldUpdateStateOfExistingNodeWhenNodePublishesStateChange()
       throws URISyntaxException {
     URI sessionUri = new URI("http://example:1234");
-    Node node = LocalNode.builder(tracer, bus, externalUrl.toURI(), externalUrl.toURI(), registrationSecret)
-        .add(CAPS, new TestSessionFactory((id, caps) -> new Session(id, sessionUri, stereotype, caps, Instant.now())))
+    Node node = LocalNode
+      .builder(tracer, bus, externalUrl.toURI(), externalUrl.toURI(), registrationSecret)
+        .add(
+          CAPS,
+          new TestSessionFactory(
+            (id, caps) -> new Session(id, sessionUri, stereotype, caps, Instant.now())))
         .build();
     handler.addHandler(node);
 
@@ -296,7 +247,8 @@ public void distributorShouldUpdateStateOfExistingNodeWhenNodePublishesStateChan
           new SlotId(status.getId(), UUID.randomUUID()),
           CAPS,
           Instant.now(),
-          Optional.of(new Session(new SessionId(UUID.randomUUID()), sessionUri, CAPS, CAPS, Instant.now())))),
+          Optional.of(new Session(
+            new SessionId(UUID.randomUUID()), sessionUri, CAPS, CAPS, Instant.now())))),
       UP);
 
     bus.fire(new NodeStatusEvent(crafted));
@@ -396,7 +348,12 @@ public NodeStatus getStatus() {
       Session sess = null;
       if (running != null) {
         try {
-          sess = new Session(running.getId(), new URI("http://localhost:14568"), CAPS, running.getCapabilities(), Instant.now());
+          sess = new Session(
+            running.getId(),
+            new URI("http://localhost:14568"),
+            CAPS,
+            running.getCapabilities(),
+            Instant.now());
         } catch (URISyntaxException e) {
           throw new RuntimeException(e);
         }