Run grid tests using Buck.

shs96c · shs96c · commit 84f264ae98a3 · 2015-09-11T11:10:04.000-07:00
diff --git a/java/server/src/org/openqa/grid/BUCK b/java/server/src/org/openqa/grid/BUCK
@@ -29,5 +29,6 @@ java_library(name = 'grid',
   ],
   visibility = [
     '//java/server/src/org/openqa/grid/selenium:classes',
+    '//java/server/test/org/openqa/grid/...',
   ],
 )
diff --git a/java/server/src/org/openqa/grid/common/BUCK b/java/server/src/org/openqa/grid/common/BUCK
@@ -12,5 +12,6 @@ java_library(name = 'common',
   visibility = [
     '//java/server/src/org/openqa/grid:grid',
     '//java/server/src/org/openqa/grid/selenium:classes',
+    '//java/server/test/org/openqa/grid/...',
   ],
 )
diff --git a/java/server/src/org/openqa/grid/selenium/BUCK b/java/server/src/org/openqa/grid/selenium/BUCK
@@ -20,4 +20,7 @@ java_library(name = 'classes',
     '//third_party/java/gson:gson',
     '//third_party/java/servlet:servlet-api',
   ],
+  visibility = [
+    '//java/server/test/org/openqa/grid/e2e:tests',
+  ],
 )
diff --git a/java/server/src/org/openqa/grid/web/servlet/handler/RequestHandler.java b/java/server/src/org/openqa/grid/web/servlet/handler/RequestHandler.java
@@ -260,7 +260,8 @@ public void stop() {
   @Override
   public String toString() {
     StringBuilder b = new StringBuilder();
-    b.append("session :").append(session).append(" , ");
+    b.append("session:").append(session).append(", ");
+    b.append("caps: ").append(request.getDesiredCapabilities());
     b.append("\n");
     return b.toString();
   }
diff --git a/java/server/test/org/openqa/grid/BUCK b/java/server/test/org/openqa/grid/BUCK
@@ -0,0 +1,42 @@
+SUITES = glob([
+  'internal/**/*Tests.java',
+  'plugin/**/*Tests.java',
+])
+
+java_test(name = 'grid',
+  srcs = SUITES,
+  deps = [
+    ':test',
+    '//java/server/src/org/openqa/grid:grid',
+    '//java/server/src/org/openqa/grid/common:common',
+    '//java/client/src/org/openqa/selenium/net:net',
+    '//java/client/src/org/openqa/selenium/remote:capabilities',
+    '//java/client/src/org/openqa/selenium/remote:remote',
+    '//third_party/java/junit:junit',
+    '//third_party/java/httpcomponents:httpclient',
+    '//third_party/java/gson:gson',
+    '//third_party/java/servlet:servlet-api',
+  ],
+)
+
+java_library(name = 'test',
+  srcs = glob([
+    'internal/**/*.java',
+    'plugin/**/*.java',
+  ], excludes = SUITES),
+  resources = [
+    'internal/configuration/grid_configuration_test1.yml',
+    'internal/configuration/grid_configuration_test2.yml',
+  ],
+  deps = [
+    '//java/client/src/com/thoughtworks/selenium:selenium',
+    '//java/server/src/org/openqa/grid:grid',
+    '//java/server/src/org/openqa/grid/common:common',
+    '//java/client/src/org/openqa/selenium:webdriver-api',
+    '//java/client/src/org/openqa/selenium/remote:remote',
+    '//third_party/java/gson:gson',
+    '//third_party/java/junit:junit',
+    '//third_party/java/mockito:mockito',
+    '//third_party/java/servlet:servlet-api',
+  ],
+)
diff --git a/java/server/test/org/openqa/grid/common/BUCK b/java/server/test/org/openqa/grid/common/BUCK
@@ -0,0 +1,18 @@
+SUITES = glob(['*Tests.java'])
+
+java_test(name = 'common',
+  srcs = SUITES,
+  deps = [
+    ':tests',
+    '//third_party/java/junit:junit',
+  ],
+)
+
+java_library(name = 'tests',
+  srcs = glob(['*.java'], excludes = SUITES),
+  deps = [
+    '//java/client/src/org/openqa/selenium/remote:remote',
+    '//java/server/src/org/openqa/grid/common:common',
+    '//third_party/java/junit:junit',
+  ],
+)
diff --git a/java/server/test/org/openqa/grid/common/CommonTests.java b/java/server/test/org/openqa/grid/common/CommonTests.java
@@ -22,4 +22,4 @@
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses(RegistrationRequestTest.class)
-public class CommonTestSuite {}
+public class CommonTests {}
diff --git a/java/server/test/org/openqa/grid/e2e/BUCK b/java/server/test/org/openqa/grid/e2e/BUCK
@@ -0,0 +1,29 @@
+SUITES = glob(['**/*Tests.java'])
+
+java_test(name = 'e2e',
+  srcs = SUITES,
+  deps = [
+    ':tests',
+    '//third_party/java/junit:junit',
+  ],
+)
+
+java_library(name = 'tests',
+  srcs = glob(['**/*.java'], excludes = SUITES),
+  deps = [
+    '//java/client/src/com/thoughtworks/selenium:selenium',
+    '//java/server/src/org/openqa/grid:grid',
+    '//java/server/src/org/openqa/grid/common:common',
+    '//java/server/src/org/openqa/grid/selenium:classes',
+    '//java/client/src/org/openqa/selenium/chrome:chrome',
+    '//java/client/src/org/openqa/selenium/firefox:firefox',
+    '//java/client/src/org/openqa/selenium/net:net',
+    '//java/client/src/org/openqa/selenium/remote:remote',
+    '//java/client/src/org/openqa/selenium/support/ui:wait',
+    '//third_party/java/guava-libraries:guava-libraries',
+    '//third_party/java/httpcomponents:httpclient',
+    '//third_party/java/junit:junit',
+    '//third_party/java/mockito:mockito',
+    '//third_party/java/servlet:servlet-api',
+  ],
+)
diff --git a/java/server/test/org/openqa/grid/e2e/GridE2ETests.java b/java/server/test/org/openqa/grid/e2e/GridE2ETests.java
@@ -60,5 +60,4 @@
     ExtraServletUtilTest.class,
 })
 public class GridE2ETests {
-
 }
diff --git a/java/server/test/org/openqa/grid/internal/DefaultToFIFOPriorityTest.java b/java/server/test/org/openqa/grid/internal/DefaultToFIFOPriorityTest.java
@@ -67,7 +67,7 @@ public void setup() throws InterruptedException {
       Map<String, Object> cap = new HashMap<>();
       cap.put(APP, "FF");
       cap.put("_priority", i);
-      MockedRequestHandler req =GridHelper.createNewSessionHandler(registry, cap);
+      MockedRequestHandler req = GridHelper.createNewSessionHandler(registry, cap);
       requests.add(req);
     }
 
@@ -97,7 +97,8 @@ public void run() {
   }
 
 
-  @Test
+  // 20 second timeout in case we hang
+  @Test(timeout = 20000)
   public void validateRequestAreHandledFIFO() throws InterruptedException {
     int cpt = 0;
     while (cpt < 8) {
@@ -116,6 +117,7 @@ public void validateRequestAreHandledFIFO() throws InterruptedException {
   @After
   public void teardown() {
     registry.stop();
+    requests.clear();  // Because it's static
   }
 
 }
diff --git a/java/server/test/org/openqa/grid/internal/GridInternalTests.java b/java/server/test/org/openqa/grid/internal/GridInternalTests.java
@@ -49,6 +49,5 @@
     UserDefinedCapabilityMatcherTests.class,
     GridShutdownTest.class
 })
-public class GridInternalTestSuite {
-// 186 sec
+public class GridInternalTests {
 }
diff --git a/java/server/test/org/openqa/grid/internal/listener/RegistrationListenerTest.java b/java/server/test/org/openqa/grid/internal/listener/RegistrationListenerTest.java
@@ -57,7 +57,7 @@ public void beforeRegistration() {
     }
   }
 
-  private RegistrationRequest req = null;
+  private RegistrationRequest req;
   private Map<String, Object> app1 = new HashMap<>();
 
   @Before
diff --git a/java/server/test/org/openqa/grid/internal/mock/MockedRequestHandler.java b/java/server/test/org/openqa/grid/internal/mock/MockedRequestHandler.java
@@ -30,9 +30,10 @@
 
 public class MockedRequestHandler extends RequestHandler {
 
-
-  public MockedRequestHandler(SeleniumBasedRequest request, HttpServletResponse response,
-      Registry registry) {
+  public MockedRequestHandler(
+    SeleniumBasedRequest request,
+    HttpServletResponse response,
+    Registry registry) {
     super(request, response, registry);
   }
 
diff --git a/third_party/java/servlet/BUCK b/third_party/java/servlet/BUCK
@@ -2,10 +2,15 @@ prebuilt_jar(name = 'servlet-api',
   binary_jar = 'servlet-api-2.5-6.1.9.jar',
   visibility = [
     '//java/client/test/org/openqa/selenium/environment:environment',
-    '//java/server/src/org/openqa/grid:grid',
-    '//java/server/src/org/openqa/grid/selenium:classes',
-    '//java/server/src/org/openqa/selenium/remote/server:server',
-    '//third_party/java/jetty:jetty',
-    '//third_party/java/jetty:jetty-for-rc',
+
+    # Everything under grid
+    '//java/server/src/org/openqa/grid/...',
+     '//java/server/src/org/openqa/selenium/remote/server:server',
+
+    # Including the tests
+    '//java/server/test/org/openqa/grid/...',
+
+    # Everything declared in the jetty BUCK file.
+    '//third_party/java/jetty:',
   ],
 )

Original file line number	Diff line number	Diff line change
`@@ -29,5 +29,6 @@ java_library(name = 'grid',`
`29`	`29`	`],`
`30`	`30`	`visibility = [`
`31`	`31`	`'//java/server/src/org/openqa/grid/selenium:classes',`
	`32`	`+ '//java/server/test/org/openqa/grid/...',`
`32`	`33`	`],`
`33`	`34`	`)`
Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,6 @@ java_library(name = 'common',`
`12`	`12`	`visibility = [`
`13`	`13`	`'//java/server/src/org/openqa/grid:grid',`
`14`	`14`	`'//java/server/src/org/openqa/grid/selenium:classes',`
	`15`	`+ '//java/server/test/org/openqa/grid/...',`
`15`	`16`	`],`
`16`	`17`	`)`
Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,7 @@ java_library(name = 'classes',`
`20`	`20`	`'//third_party/java/gson:gson',`
`21`	`21`	`'//third_party/java/servlet:servlet-api',`
`22`	`22`	`],`
	`23`	`+ visibility = [`
	`24`	`+ '//java/server/test/org/openqa/grid/e2e:tests',`
	`25`	`+ ],`
`23`	`26`	`)`
Original file line number	Diff line number	Diff line change
`@@ -60,5 +60,4 @@`
`60`	`60`	`ExtraServletUtilTest.class,`
`61`	`61`	`})`
`62`	`62`	`public class GridE2ETests {`
`63`		`-`
`64`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public void setup() throws InterruptedException {`
`67`	`67`	`Map<String, Object> cap = new HashMap<>();`
`68`	`68`	`cap.put(APP, "FF");`
`69`	`69`	`cap.put("_priority", i);`
`70`		`- MockedRequestHandler req =GridHelper.createNewSessionHandler(registry, cap);`
	`70`	`+ MockedRequestHandler req = GridHelper.createNewSessionHandler(registry, cap);`
`71`	`71`	`requests.add(req);`
`72`	`72`	`}`
`73`	`73`
`@@ -97,7 +97,8 @@ public void run() {`
`97`	`97`	`}`
`98`	`98`
`99`	`99`
`100`		`- @Test`
	`100`	`+ // 20 second timeout in case we hang`
	`101`	`+ @Test(timeout = 20000)`
`101`	`102`	`public void validateRequestAreHandledFIFO() throws InterruptedException {`
`102`	`103`	`int cpt = 0;`
`103`	`104`	`while (cpt < 8) {`
`@@ -116,6 +117,7 @@ public void validateRequestAreHandledFIFO() throws InterruptedException {`
`116`	`117`	`@After`
`117`	`118`	`public void teardown() {`
`118`	`119`	`registry.stop();`
	`120`	`+ requests.clear(); // Because it's static`
`119`	`121`	`}`
`120`	`122`
`121`	`123`	`}`