Add missing *Selected commands to the core runner

Author: shs96c

java/client/src/com/thoughtworks/selenium/webdriven/BUCK

@@ -29,10 +29,10 @@ java_library(name = 'webdriven',
   ],
   exported_deps = [
     ':emulation-api',
+    '//java/client/src/com/thoughtworks/selenium/webdriven/commands:commands',
   ],
   deps = [
     '//java/client/src/com/thoughtworks/selenium:selenium',
-    '//java/client/src/com/thoughtworks/selenium/webdriven/commands:commands',
     '//java/client/src/org/openqa/selenium:selenium',
     '//third_party/java/guava:guava',
   ],
@@ -41,6 +41,7 @@ java_library(name = 'webdriven',
     '//java/client/test/com/thoughtworks/selenium/...',
     '//java/server/src/com/thoughtworks/selenium/webdriven:rc-emulation-servlet',
     '//java/server/src/org/openqa/grid/selenium:classes',
+    '//java/server/src/org/openqa/selenium/server/htmlrunner:htmlrunner',
   ],
 )
 

java/client/src/com/thoughtworks/selenium/webdriven/commands/SeleniumSelect.java

@@ -36,12 +36,15 @@ public class SeleniumSelect {
   private final WebDriver driver;
   private final WebElement select;
 
-  public SeleniumSelect(JavascriptLibrary library, ElementFinder finder, WebDriver driver,
-      String locator) {
+  public SeleniumSelect(
+    JavascriptLibrary library,
+    ElementFinder finder,
+    WebDriver driver,
+    String locator) {
     this.driver = driver;
 
     findOption =
-        "return (" + library.getSeleniumScript("findOption.js") + ").apply(null, arguments)";
+      "return (" + library.getSeleniumScript("findOption.js") + ").apply(null, arguments)";
 
     select = finder.findElement(driver, locator);
     if (!"select".equals(select.getTagName().toLowerCase())) {
@@ -94,7 +97,7 @@ public List<WebElement> getSelectedOptions() {
     return toReturn;
   }
 
-  private WebElement findOption(String optionLocator) {
+  public WebElement findOption(String optionLocator) {
     return (WebElement) ((JavascriptExecutor) driver)
         .executeScript(findOption, select, optionLocator);
   }

java/server/src/org/openqa/selenium/server/htmlrunner/BUCK

@@ -11,6 +11,7 @@ java_library(
   srcs = glob(['*.java']),
   deps = [
     '//java/client/src/com/thoughtworks/selenium:leg-rc',
+    '//java/client/src/com/thoughtworks/selenium/webdriven:webdriven',
     '//java/client/src/org/openqa/selenium:selenium',
     '//java/client/src/org/openqa/selenium/chrome:chrome',
     '//java/client/src/org/openqa/selenium/edge:edge',

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

@@ -24,6 +24,12 @@
 
 import com.thoughtworks.selenium.Selenium;
 import com.thoughtworks.selenium.SeleniumException;
+import com.thoughtworks.selenium.webdriven.ElementFinder;
+import com.thoughtworks.selenium.webdriven.JavascriptLibrary;
+import com.thoughtworks.selenium.webdriven.commands.SeleniumSelect;
+
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.internal.WrapsDriver;
 
 import java.util.logging.Logger;
 
@@ -50,6 +56,44 @@ private static ImmutableMap<String, CoreStepFactory> build() {
     steps.put("verifyErrorOnNext", verifyNextCommandFails);
     steps.put("verifyFailureOnNext", verifyNextCommandFails);
 
+    class SelectedOption implements CoreStep {
+
+      private final String locator;
+      private final String value;
+      private final NextStepDecorator onFailure;
+
+      public SelectedOption(String locator, String value, NextStepDecorator onFailure) {
+        this.locator = locator;
+        this.value = value;
+        this.onFailure = onFailure;
+      }
+
+      @Override
+      public NextStepDecorator execute(Selenium selenium, TestState state) {
+        JavascriptLibrary library = new JavascriptLibrary();
+        ElementFinder finder = new ElementFinder(library);
+        SeleniumSelect select = new SeleniumSelect(
+          library,
+          finder,
+          ((WrapsDriver) selenium).getWrappedDriver(),
+          locator);
+
+        WebElement element = select.findOption(value);
+        if (element == null) {
+          return onFailure;
+        }
+        return NextStepDecorator.IDENTITY;
+      }
+    }
+
+    steps.put(
+      "assertSelected",
+      ((locator, value) -> new SelectedOption(locator, value, NextStepDecorator.ASSERTION_FAILED)));
+    steps.put(
+      "verifySelected",
+      ((locator, value) ->
+         new SelectedOption(locator, value, NextStepDecorator.VERIFICATION_FAILED)));
+
     steps.put("echo", ((locator, value) -> (selenium, state) -> {
       LOG.info(locator);
       return NextStepDecorator.IDENTITY;

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

@@ -79,6 +79,9 @@ public String expand(String toExpand) {
       lastEnd = matcher.end();
     }
 
+    // Now append the last part of the input
+    toReturn.append(toExpand.substring(lastEnd));
+
     return toReturn.toString();
   }
 }