Rework our new SeCore test runner.

This allows us to implement methods that wrap the output
of the next step to be executed (eg. "assertFailureOnNext")

Author: shs96c

java/server/src/org/openqa/selenium/server/htmlrunner/CoreRunnerError.java

@@ -0,0 +1,25 @@
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.openqa.selenium.server.htmlrunner;
+
+
+public class CoreRunnerError extends Error {
+  public CoreRunnerError(String message, Object... args) {
+    super(String.format(message, args));
+  }
+}

java/server/src/org/openqa/selenium/server/htmlrunner/CoreStep.java

@@ -0,0 +1,24 @@
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.openqa.selenium.server.htmlrunner;
+
+import com.thoughtworks.selenium.Selenium;
+
+public interface CoreStep {
+  Object execute(Selenium selenium);
+}

java/server/src/org/openqa/selenium/server/htmlrunner/CoreStepFactory.java

@@ -0,0 +1,25 @@
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.openqa.selenium.server.htmlrunner;
+
+import java.util.Iterator;
+import java.util.List;
+
+interface CoreStepFactory {
+  CoreStep create(Iterator<List<String>> remainingSteps, String locator, String value);
+}

java/server/src/org/openqa/selenium/server/htmlrunner/CoreTestCase.java

@@ -20,17 +20,24 @@
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 
 import com.thoughtworks.selenium.Selenium;
 import com.thoughtworks.selenium.SeleniumException;
 
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.WebDriver;
 
+import java.util.Iterator;
 import java.util.List;
 
 public class CoreTestCase {
 
+  private static final ImmutableMap<String, CoreStepFactory> STEP_FACTORY =
+    ImmutableMap.<String, CoreStepFactory>builder()
+    .putAll(new ReflectivelyDiscoveredSteps().get())
+    .putAll(new NonReflectiveSteps().get())
+    .build();
   private String url;
 
   public CoreTestCase(String url) {
@@ -43,21 +50,18 @@ public void run(Results results, WebDriver driver, Selenium selenium) {
       driver.get(url);
     }
 
-    List<CoreTestStep> steps = findCommands(driver);
-    for (CoreTestStep step : steps) {
+    List<CoreStep> steps = findCommands(driver);
+    for (CoreStep step : steps) {
       try {
-        step.run(results, driver, selenium);
-        Thread.sleep(2000);
+        step.execute(selenium);
       } catch (SeleniumException e) {
         results.addTestFailure();
         return;
-      } catch (InterruptedException e) {
-        e.printStackTrace();
       }
     }
   }
 
-  private List<CoreTestStep> findCommands(WebDriver driver) {
+  private List<CoreStep> findCommands(WebDriver driver) {
     // Let's just run and hide in the horror that is JS for the sake of speed.
     List<List<String>> rawSteps = (List<List<String>>) ((JavascriptExecutor) driver).executeScript(
       "var toReturn = [];\n" +
@@ -73,9 +77,14 @@ private List<CoreTestStep> findCommands(WebDriver driver) {
       "}\n" +
       "return toReturn;");
 
-    ImmutableList.Builder<CoreTestStep> steps = ImmutableList.builder();
-    for (List<String> rawStep: rawSteps) {
-      steps.add(new CoreTestStep(rawStep.get(0), rawStep.get(1), rawStep.get(2)));
+    ImmutableList.Builder<CoreStep> steps = ImmutableList.builder();
+    Iterator<List<String>> stepIterator = rawSteps.iterator();
+    while (stepIterator.hasNext()) {
+      List<String> step =  stepIterator.next();
+      if (!STEP_FACTORY.containsKey(step.get(0))) {
+        throw new SeleniumException("Unknown command: " + step.get(0));
+      }
+      steps.add(STEP_FACTORY.get(step.get(0)).create(stepIterator, step.get(1), step.get(2)));
     }
     return steps.build();
   }