Further minor cleanup

SeleniumHQ · Dec 28, 2018 · 0e49330 · 0e49330
1 parent 4f77e95
commit 0e49330
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 19 deletions.
diff --git a/java/client/src/org/openqa/selenium/interactions/KeyDownAction.java b/java/client/src/org/openqa/selenium/interactions/KeyDownAction.java
@@ -32,6 +32,7 @@
  */
 @Deprecated
 public class KeyDownAction extends SingleKeyAction implements Action {
+
   public KeyDownAction(Keyboard keyboard, Mouse mouse, Locatable locationProvider, Keys key) {
     super(keyboard, mouse, locationProvider, key);
   }
@@ -48,8 +49,7 @@ public void perform() {
 
   @Override
   public List<Interaction> asInteractions(PointerInput mouse, KeyInput keyboard) {
-
-    ArrayList<Interaction> interactions = new ArrayList<>(optionallyClickElement(mouse));
+    List<Interaction> interactions = new ArrayList<>(optionallyClickElement(mouse));
     interactions.add(keyboard.createKeyDown(key.getCodePoint()));
 
     return Collections.unmodifiableList(interactions);

diff --git a/java/client/src/org/openqa/selenium/support/PageFactory.java b/java/client/src/org/openqa/selenium/support/PageFactory.java
@@ -25,7 +25,6 @@
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
 
 
 /**
@@ -67,8 +66,8 @@ public static <T> T initElements(WebDriver driver, Class<T> pageClassToProxy) {
   }
 
   /**
-   * As {@link org.openqa.selenium.support.PageFactory#initElements(org.openqa.selenium.WebDriver,
-   * Class)} but will only replace the fields of an already instantiated Page Object.
+   * As {@link #initElements(WebDriver, Class)} but will only replace the fields of an already
+   * instantiated Page Object.
    *
    * @param driver The driver that will be used to look up the elements
    * @param page   The object with WebElement and List&lt;WebElement&gt; fields that
@@ -128,7 +127,7 @@ private static <T> T instantiatePage(WebDriver driver, Class<T> pageClassToProxy
       } catch (NoSuchMethodException e) {
         return pageClassToProxy.newInstance();
       }
-    } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+    } catch (ReflectiveOperationException e) {
       throw new RuntimeException(e);
     }
   }

diff --git a/java/client/test/com/thoughtworks/selenium/I18nTest.java b/java/client/test/com/thoughtworks/selenium/I18nTest.java
@@ -21,9 +21,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.StandardCharsets;
-
 public class I18nTest extends InternalSelenseTestBase {
 
   @Before
@@ -32,36 +29,36 @@ public void navigateToPage() {
   }
 
   @Test
-  public void testRomance() throws UnsupportedEncodingException {
+  public void testRomance() {
     String expected =
         "\u00FC\u00F6\u00E4\u00DC\u00D6\u00C4 \u00E7\u00E8\u00E9 \u00BF\u00F1 \u00E8\u00E0\u00F9\u00F2";
     String id = "romance";
     verifyText(expected, id);
   }
 
   @Test
-  public void testKorean() throws UnsupportedEncodingException {
+  public void testKorean() {
     String expected = "\uC5F4\uC5D0";
     String id = "korean";
     verifyText(expected, id);
   }
 
   @Test
-  public void testChinese() throws UnsupportedEncodingException {
+  public void testChinese() {
     String expected = "\u4E2D\u6587";
     String id = "chinese";
     verifyText(expected, id);
   }
 
   @Test
-  public void testJapanese() throws UnsupportedEncodingException {
+  public void testJapanese() {
     String expected = "\u307E\u3077";
     String id = "japanese";
     verifyText(expected, id);
   }
 
   @Test
-  public void testDangerous() throws UnsupportedEncodingException {
+  public void testDangerous() {
     String expected = "&%?\\+|,%*";
     String id = "dangerous";
     verifyText(expected, id);
@@ -76,13 +73,9 @@ public void testDangerousLabels() {
     Assert.assertEquals("mangled label", "c:\\I came, I \\saw\\, I conquered", labels[2]);
   }
 
-  private void verifyText(String expected, String id) throws UnsupportedEncodingException {
+  private void verifyText(String expected, String id) {
     assertTrue(selenium.isTextPresent(expected));
     String actual = selenium.getText(id);
-    byte[] result = actual.getBytes(StandardCharsets.UTF_8);
-    for (int i = 0; i < result.length; i++) {
-      Byte b = new Byte(result[i]);
-    }
     Assert.assertEquals(id + " characters didn't match", expected, actual);
   }