The addition to #477 (#480)

* The addition to #477

- the enum `io.appium.java_client.android.ConfiguratorParameters` was removed
- new elements were added to the `io.appium.java_client.android.Settings`
- refactoring of the `io.appium.java_client.HasSettings`.

* Work on remarks. Addition to #477

Author: TikhomirovSergey

src/main/java/io/appium/java_client/android/ConfiguratorParameters.java

@@ -73,50 +73,45 @@ default void ignoreUnimportantViews(Boolean compress) {
     /**
      * invoke {@code setWaitForIdleTimeout} in {@code com.android.uiautomator.core.Configurator}
      *
-     * @param timeout in milliseconds, 0 would reset to its default value
+     * @param timeout in milliseconds. A negative value would reset to its default value
      */
     default void configuratorSetWaitForIdleTimeout(int timeout) {
-        setSetting(Setting.CONFIGURATOR,
-            ConfiguratorParameters.WAIT_FOR_IDLE_TIMEOUT.format(timeout));
+        setSetting(Setting.WAIT_FOR_IDLE_TIMEOUT, timeout);
     }
 
     /**
      * invoke {@code setWaitForSelectorTimeout} in {@code com.android.uiautomator.core.Configurator}
      *
-     * @param timeout in milliseconds, 0 would reset to its default value
+     * @param timeout in milliseconds. A negative value would reset to its default value
      */
     default void configuratorSetWaitForSelectorTimeout(int timeout) {
-        setSetting(Setting.CONFIGURATOR,
-            ConfiguratorParameters.WAIT_FOR_SELECTOR_TIMEOUT.format(timeout));
+        setSetting(Setting.WAIT_FOR_SELECTOR_TIMEOUT, timeout);
     }
 
     /**
      * invoke {@code setScrollAcknowledgmentTimeout} in {@code com.android.uiautomator.core.Configurator}
      *
-     * @param timeout in milliseconds, 0 would reset to its default value
+     * @param timeout in milliseconds. A negative value would reset to its default value
      */
     default void configuratorSetScrollAcknowledgmentTimeout(int timeout) {
-        setSetting(Setting.CONFIGURATOR,
-            ConfiguratorParameters.WAIT_SCROLL_ACKNOWLEDGMENT_TIMEOUT.format(timeout));
+        setSetting(Setting.WAIT_SCROLL_ACKNOWLEDGMENT_TIMEOUT, timeout);
     }
 
     /**
      * invoke {@code configuratorSetKeyInjectionDelay} in {@code com.android.uiautomator.core.Configurator}
      *
-     * @param delay in milliseconds, 0 would reset to its default value
+     * @param delay in milliseconds. A negative value would reset to its default value
      */
     default void configuratorSetKeyInjectionDelay(int delay) {
-        setSetting(Setting.CONFIGURATOR,
-            ConfiguratorParameters.KEY_INJECTION_DELAY.format(delay));
+        setSetting(Setting.KEY_INJECTION_DELAY, delay);
     }
 
     /**
      * invoke {@code setActionAcknowledgmentTimeout} in {@code com.android.uiautomator.core.Configurator}
      *
-     * @param timeout in milliseconds, 0 would reset to its default value
+     * @param timeout in milliseconds. A negative value would reset to its default value
      */
     default void configuratorSetActionAcknowledgmentTimeout(int timeout) {
-        setSetting(Setting.CONFIGURATOR,
-            ConfiguratorParameters.WAIT_ACTION_ACKNOWLEDGMENT_TIMEOUT.format(timeout));
+        setSetting(Setting.WAIT_ACTION_ACKNOWLEDGMENT_TIMEOUT, timeout);
     }
 }

src/main/java/io/appium/java_client/android/HasSettings.java

@@ -22,7 +22,11 @@
 public enum Setting {
 
     IGNORE_UNIMPORTANT_VIEWS("ignoreUnimportantViews"),
-    CONFIGURATOR("configurator");
+    WAIT_FOR_IDLE_TIMEOUT("setWaitForIdleTimeout"),
+    WAIT_FOR_SELECTOR_TIMEOUT("setWaitForSelectorTimeout"),
+    WAIT_SCROLL_ACKNOWLEDGMENT_TIMEOUT("setScrollAcknowledgmentTimeout"),
+    WAIT_ACTION_ACKNOWLEDGMENT_TIMEOUT("setActionAcknowledgmentTimeout"),
+    KEY_INJECTION_DELAY("setKeyInjectionDelay");
 
     private String name;
 

src/main/java/io/appium/java_client/android/Setting.java

@@ -21,27 +21,24 @@ public class SettingTest extends BaseAndroidTest {
     }
 
     @Test public void configuratorTest() {
-        driver.configuratorSetActionAcknowledgmentTimeout(5);
-        assertJSONElementContains("setActionAcknowledgmentTimeout", 5);
+        driver.configuratorSetActionAcknowledgmentTimeout(500);
+        assertJSONElementContains(Setting.WAIT_ACTION_ACKNOWLEDGMENT_TIMEOUT, 500);
 
-        driver.configuratorSetKeyInjectionDelay(4);
-        assertJSONElementContains("setKeyInjectionDelay", 4);
+        driver.configuratorSetKeyInjectionDelay(400);
+        assertJSONElementContains(Setting.KEY_INJECTION_DELAY, 400);
 
-        driver.configuratorSetScrollAcknowledgmentTimeout(3);
-        assertJSONElementContains("setScrollAcknowledgmentTimeout", 3);
+        driver.configuratorSetScrollAcknowledgmentTimeout(300);
+        assertJSONElementContains(Setting.WAIT_SCROLL_ACKNOWLEDGMENT_TIMEOUT, 300);
 
-        driver.configuratorSetWaitForIdleTimeout(6);
-        assertJSONElementContains("setWaitForIdleTimeout", 6);
+        driver.configuratorSetWaitForIdleTimeout(600);
+        assertJSONElementContains(Setting.WAIT_FOR_IDLE_TIMEOUT, 600);
 
-        driver.configuratorSetWaitForSelectorTimeout(1);
-        assertJSONElementContains("setWaitForSelectorTimeout", 1);
+        driver.configuratorSetWaitForSelectorTimeout(1000);
+        assertJSONElementContains(Setting.WAIT_FOR_SELECTOR_TIMEOUT, 1000);
     }
 
-    private void assertJSONElementContains(String method, int value) {
-        driver.getSettings().get(Setting.CONFIGURATOR.toString());
-        assertEquals(driver.getSettings().get(Setting.CONFIGURATOR.toString())
-                .getAsJsonObject().get("method").getAsString(), method);
-        assertEquals(driver.getSettings().get(Setting.CONFIGURATOR.toString())
-                .getAsJsonObject().get("value").getAsInt(), value);
+    private void assertJSONElementContains(Setting setting, int value) {
+        assertEquals(driver.getSettings().get(setting.toString())
+                .getAsInt(), value);
     }
 }