Migrate to Hamcrest 2.1 (#1099)

Author: valfirst

build.gradle

@@ -77,7 +77,7 @@ dependencies {
     compile 'org.slf4j:slf4j-api:1.7.25'
 
     testCompile 'junit:junit:4.12'
-    testCompile 'org.hamcrest:hamcrest-library:1.3'
+    testCompile 'org.hamcrest:hamcrest:2.1'
     testCompile (group: 'io.github.bonigarcia', name: 'webdrivermanager', version: '3.2.0') {
         exclude group: 'org.seleniumhq.selenium'
     }

src/test/java/io/appium/java_client/android/AndroidScreenRecordTest.java

@@ -1,7 +1,8 @@
 package io.appium.java_client.android;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.emptyString;
+import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 
 import org.junit.Before;
@@ -33,7 +34,7 @@ public void verifyBasicScreenRecordingWorks() throws InterruptedException {
         }
         Thread.sleep(5000);
         String result = driver.stopRecordingScreen();
-        assertThat(result, not(isEmptyString()));
+        assertThat(result, is(not(emptyString())));
     }
 
 }

src/test/java/io/appium/java_client/events/ExtendedEventListenerTest.java

@@ -1,6 +1,6 @@
 package io.appium.java_client.events;
 
-import static org.hamcrest.core.IsCollectionContaining.hasItems;
+import static org.hamcrest.core.IsIterableContaining.hasItems;
 import static org.junit.Assert.assertThat;
 
 import io.appium.java_client.MobileBy;

src/test/java/io/appium/java_client/events/WebDriverEventListenerCompatibilityTest.java

@@ -2,7 +2,7 @@
 
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsCollectionContaining.hasItems;
+import static org.hamcrest.core.IsIterableContaining.hasItems;
 import static org.junit.Assert.assertThat;
 import static org.openqa.selenium.By.id;
 import static org.openqa.selenium.By.xpath;

src/test/java/io/appium/java_client/ios/IOSScreenRecordTest.java

@@ -1,7 +1,8 @@
 package io.appium.java_client.ios;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyString;
+import static org.hamcrest.Matchers.emptyString;
+import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 
 import org.junit.Test;
@@ -18,7 +19,7 @@ public void verifyBasicScreenRecordingWorks() throws InterruptedException {
         );
         Thread.sleep(5000);
         String result = driver.stopRecordingScreen();
-        assertThat(result, not(isEmptyString()));
+        assertThat(result, is(not(emptyString())));
     }
 
 }

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

@@ -11,7 +11,8 @@
 import static junit.framework.TestCase.fail;
 import static org.hamcrest.CoreMatchers.everyItem;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isIn;
+import static org.hamcrest.Matchers.in;
+import static org.hamcrest.Matchers.is;
 
 import io.appium.java_client.touch.offset.ElementOption;
 import io.appium.java_client.touch.offset.PointOption;
@@ -65,8 +66,8 @@ public void longPressOptionsShouldBuildProperly() {
         expectedOpts.put("x", 0);
         expectedOpts.put("y", 0);
         expectedOpts.put("duration", 1L);
-        assertThat(actualOpts.entrySet(), everyItem(isIn(expectedOpts.entrySet())));
-        assertThat(expectedOpts.entrySet(), everyItem(isIn(actualOpts.entrySet())));
+        assertThat(actualOpts.entrySet(), everyItem(is(in(expectedOpts.entrySet()))));
+        assertThat(expectedOpts.entrySet(), everyItem(is(in(actualOpts.entrySet()))));
     }
 
     @Test
@@ -79,8 +80,8 @@ public void tapOptionsShouldBuildProperly() {
         expectedOpts.put("x", 0);
         expectedOpts.put("y", 0);
         expectedOpts.put("count", 2);
-        assertThat(actualOpts.entrySet(), everyItem(isIn(expectedOpts.entrySet())));
-        assertThat(expectedOpts.entrySet(), everyItem(isIn(actualOpts.entrySet())));
+        assertThat(actualOpts.entrySet(), everyItem(is(in(expectedOpts.entrySet()))));
+        assertThat(expectedOpts.entrySet(), everyItem(is(in(actualOpts.entrySet()))));
     }
 
     @Test
@@ -90,7 +91,7 @@ public void waitOptionsShouldBuildProperly() {
                 .build();
         final Map<String, Object> expectedOpts = new HashMap<>();
         expectedOpts.put("ms", 1000L);
-        assertThat(actualOpts.entrySet(), everyItem(isIn(expectedOpts.entrySet())));
-        assertThat(expectedOpts.entrySet(), everyItem(isIn(actualOpts.entrySet())));
+        assertThat(actualOpts.entrySet(), everyItem(is(in(expectedOpts.entrySet()))));
+        assertThat(expectedOpts.entrySet(), everyItem(is(in(actualOpts.entrySet()))));
     }
 }