Mykola mokhnach's actions params: The addition to the #756

src/main/java/io/appium/java_client/touch/WaitOptions.java

@@ -18,7 +18,6 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
-import static java.util.Optional.ofNullable;
 
 import java.time.Duration;
 import java.util.Map;
@@ -53,15 +52,13 @@ public WaitOptions withDuration(Duration duration) {
 
     @Override
     protected void verify() {
-        ofNullable(duration).orElseThrow(() ->
-                new IllegalArgumentException("Duration value should not be a null value"));
+        //there is nothing to check
     }
 
     @Override
     public Map<String, Object> build() {
         final Map<String, Object> result = super.build();
-        ofNullable(duration).ifPresent(durationParam ->
-                result.put("ms", durationParam.toMillis()));
+        result.put("ms", duration.toMillis());
         return result;
     }
 }

src/test/java/io/appium/java_client/touch/FailsWithMatcher.java

@@ -7,26 +7,26 @@
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
 
-public final class FailsWithMatcher<E extends Throwable> extends TypeSafeMatcher<IThrowingRunnable<E>> {
+public final class FailsWithMatcher<E extends Throwable> extends TypeSafeMatcher<Runnable> {
 
     private final Matcher<? super E> matcher;
 
     private FailsWithMatcher(final Matcher<? super E> matcher) {
         this.matcher = matcher;
     }
 
-    public static <E extends Throwable> Matcher<IThrowingRunnable<E>> failsWith(
+    public static <E extends Throwable> Matcher<Runnable> failsWith(
             final Class<E> throwableType) {
         return new FailsWithMatcher<>(instanceOf(throwableType));
     }
 
-    public static <E extends Throwable> Matcher<IThrowingRunnable<E>> failsWith(
+    public static <E extends Throwable> Matcher<Runnable> failsWith(
             final Class<E> throwableType, final Matcher<? super E> throwableMatcher) {
         return new FailsWithMatcher<>(allOf(instanceOf(throwableType), throwableMatcher));
     }
 
     @Override
-    protected boolean matchesSafely(final IThrowingRunnable<E> runnable) {
+    protected boolean matchesSafely(final Runnable runnable) {
         try {
             runnable.run();
             return false;

src/test/java/io/appium/java_client/touch/TouchOptionsTests.java

@@ -8,6 +8,7 @@
 import static io.appium.java_client.touch.WaitOptions.waitOptions;
 import static java.time.Duration.ofMillis;
 import static java.time.Duration.ofSeconds;
+import static junit.framework.TestCase.fail;
 import static org.hamcrest.CoreMatchers.everyItem;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.isIn;
@@ -24,34 +25,28 @@
 public class TouchOptionsTests {
     private static final WebElement DUMMY_ELEMENT = new DummyElement();
 
-    @Test
+    @Test(expected = IllegalArgumentException.class)
     public void invalidAbsolutePositionOptionsShouldFailOnBuild() throws Exception {
-        final List<ActionOptions> invalidOptions = new ArrayList<>();
-        invalidOptions.add(new AbsoluteOffsetOption());
-        for (ActionOptions opts : invalidOptions) {
-            assertThat(opts::build, failsWith(IllegalArgumentException.class));
-        }
+        new AbsoluteOffsetOption().build();
+        fail("The exception throwing was expected");
     }
 
-    @Test
+    @Test(expected = IllegalArgumentException.class)
     public void invalidRelativePositionOptionsShouldFailOnBuild() throws Exception {
-        final List<ActionOptions> invalidOptions = new ArrayList<>();
-        invalidOptions.add(new RelativeOffsetOption());
-        for (ActionOptions opts : invalidOptions) {
-            assertThat(opts::build, failsWith(IllegalArgumentException.class));
-        }
+        new RelativeOffsetOption().build();
+        fail("The exception throwing was expected");
     }
 
     @Test
     public void invalidOptionsArgumentsShouldFailOnAltering() throws Exception {
-        final List<IThrowingRunnable<RuntimeException>> invalidOptions = new ArrayList<>();
+        final List<Runnable> invalidOptions = new ArrayList<>();
         invalidOptions.add(() -> waitOptions(ofMillis(-1)));
         invalidOptions.add(() -> new RelativeOffsetOption().withRelativeOffset(null, 0, 0));
         invalidOptions.add(() -> new WaitOptions().withDuration(null));
         invalidOptions.add(() -> tapOptions().withTapsCount(-1));
         invalidOptions.add(() -> longPressOptions().withDuration(null));
         invalidOptions.add(() -> longPressOptions().withDuration(ofMillis(-1)));
-        for (IThrowingRunnable<RuntimeException> item : invalidOptions) {
+        for (Runnable item : invalidOptions) {
             assertThat(item, failsWith(RuntimeException.class));
         }
     }