[grid] Remove unused imports from GraphQL classes. Fix assert for NewSessionQueuer tests.

pujagani · pujagani · commit ee8dad362fd9 · 2021-01-08T18:23:08.000+05:30
diff --git a/java/server/src/org/openqa/selenium/grid/graphql/Grid.java b/java/server/src/org/openqa/selenium/grid/graphql/Grid.java
@@ -24,7 +24,6 @@
 import org.openqa.selenium.grid.data.NodeStatus;
 import org.openqa.selenium.grid.data.Slot;
 import org.openqa.selenium.grid.distributor.Distributor;
-import org.openqa.selenium.grid.sessionqueue.NewSessionQueue;
 import org.openqa.selenium.grid.sessionqueue.NewSessionQueuer;
 import org.openqa.selenium.internal.Require;
 
diff --git a/java/server/src/org/openqa/selenium/grid/graphql/GridData.java b/java/server/src/org/openqa/selenium/grid/graphql/GridData.java
@@ -20,7 +20,6 @@
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import org.openqa.selenium.grid.distributor.Distributor;
-import org.openqa.selenium.grid.sessionqueue.NewSessionQueue;
 import org.openqa.selenium.grid.sessionqueue.NewSessionQueuer;
 import org.openqa.selenium.internal.Require;
 
diff --git a/java/server/src/org/openqa/selenium/grid/sessionqueue/GetNewSessionQueueSize.java b/java/server/src/org/openqa/selenium/grid/sessionqueue/GetNewSessionQueueSize.java
@@ -18,12 +18,10 @@
 package org.openqa.selenium.grid.sessionqueue;
 
 import com.google.common.collect.ImmutableMap;
-import org.openqa.selenium.grid.data.RequestId;
 import org.openqa.selenium.internal.Require;
 import org.openqa.selenium.remote.http.HttpHandler;
 import org.openqa.selenium.remote.http.HttpRequest;
 import org.openqa.selenium.remote.http.HttpResponse;
-import org.openqa.selenium.remote.tracing.AttributeKey;
 import org.openqa.selenium.remote.tracing.Span;
 import org.openqa.selenium.remote.tracing.Tracer;
 
diff --git a/java/server/test/org/openqa/selenium/grid/sessionqueue/NewSessionQueuerTest.java b/java/server/test/org/openqa/selenium/grid/sessionqueue/NewSessionQueuerTest.java
@@ -234,7 +234,7 @@ public void shouldBeAbleToGetQueueSize() {
     sessionQueue.offerLast(request, requestId);
 
     int size = local.getQueueSize();
-    assertEquals(size, 1);
+    assertEquals(1, size);
   }
 
   @Test
@@ -243,7 +243,7 @@ public void shouldBeAbleToGetQueueSizeRemotely() {
     sessionQueue.offerLast(request, requestId);
 
     int size = sessionQueue.getQueueSize();
-    assertEquals(size, 1);
+    assertEquals(1, size);
   }
 
   @Test
diff --git a/java/server/test/org/openqa/selenium/grid/sessionqueue/local/LocalNewSessionQueueTest.java b/java/server/test/org/openqa/selenium/grid/sessionqueue/local/LocalNewSessionQueueTest.java
@@ -221,7 +221,7 @@ public void shouldBeAbleToGetQueueSize() {
     assertTrue(added);
 
     int size = sessionQueue.getQueueSize();
-    assertEquals(size, 1);
+    assertEquals(1, size);
   }
 
   private HttpRequest createRequest(NewSessionPayload payload, HttpMethod httpMethod, String uri) {

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ public void shouldBeAbleToGetQueueSize() {`
`234`	`234`	`sessionQueue.offerLast(request, requestId);`
`235`	`235`
`236`	`236`	`int size = local.getQueueSize();`
`237`		`- assertEquals(size, 1);`
	`237`	`+ assertEquals(1, size);`
`238`	`238`	`}`
`239`	`239`
`240`	`240`	`@Test`
`@@ -243,7 +243,7 @@ public void shouldBeAbleToGetQueueSizeRemotely() {`
`243`	`243`	`sessionQueue.offerLast(request, requestId);`
`244`	`244`
`245`	`245`	`int size = sessionQueue.getQueueSize();`
`246`		`- assertEquals(size, 1);`
	`246`	`+ assertEquals(1, size);`
`247`	`247`	`}`
`248`	`248`
`249`	`249`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ public void shouldBeAbleToGetQueueSize() {`
`221`	`221`	`assertTrue(added);`
`222`	`222`
`223`	`223`	`int size = sessionQueue.getQueueSize();`
`224`		`- assertEquals(size, 1);`
	`224`	`+ assertEquals(1, size);`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`private HttpRequest createRequest(NewSessionPayload payload, HttpMethod httpMethod, String uri) {`