Update tests

AlphaWallet · Aug 8, 2023 · 5ed6db3 · 5ed6db3
1 parent b316aa7
commit 5ed6db3
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 15 deletions.
diff --git a/app/src/androidTest/java/com/alphawallet/app/ImportWalletWithSeedPhraseTest.java b/app/src/androidTest/java/com/alphawallet/app/ImportWalletWithSeedPhraseTest.java
@@ -11,7 +11,7 @@
 import static com.alphawallet.app.util.Helper.click;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.CoreMatchers.allOf;
 import static org.junit.Assert.fail;
 
 import android.os.Build;

diff --git a/app/src/androidTest/java/com/alphawallet/app/SelectNetworkTest.java b/app/src/androidTest/java/com/alphawallet/app/SelectNetworkTest.java
@@ -19,7 +19,7 @@
 import static com.alphawallet.app.util.Helper.clickListItem;
 import static com.alphawallet.app.util.Helper.clickStaticListItem;
 
-import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.CoreMatchers.allOf;
 
 import androidx.test.espresso.action.ViewActions;
 import androidx.test.espresso.contrib.RecyclerViewActions;

diff --git a/app/src/androidTest/java/com/alphawallet/app/assertions/Should.java b/app/src/androidTest/java/com/alphawallet/app/assertions/Should.java
@@ -8,8 +8,8 @@
 import static androidx.test.espresso.matcher.ViewMatchers.withSubstring;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static com.alphawallet.app.util.Helper.waitUntil;
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.not;
+import static org.hamcrest.CoreMatchers.allOf;
+import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
 
 import android.widget.TextView;

diff --git a/app/src/androidTest/java/com/alphawallet/app/steps/Steps.java b/app/src/androidTest/java/com/alphawallet/app/steps/Steps.java
@@ -27,8 +27,8 @@
 import static com.alphawallet.app.util.Helper.waitUntil;
 import static com.alphawallet.app.util.Helper.waitUntilThenBack;
 import static com.alphawallet.app.util.RootUtil.isDeviceRooted;
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.anyOf;
+import static org.hamcrest.CoreMatchers.allOf;
+import static org.hamcrest.CoreMatchers.anyOf;
 import static org.hamcrest.core.StringStartsWith.startsWith;
 
 import android.view.KeyEvent;
@@ -64,7 +64,8 @@
 public class Steps
 {
     //public static final String GANACHE_URL = "http://10.0.2.2:8545/";
-    public static final String GANACHE_URL = "http://192.168.50.128:8545/";
+    //public static final String GANACHE_URL = "http://192.168.50.128:8545/";
+    public static final String GANACHE_URL = "http://192.168.50.206:8545/";
 
     public static void createNewWallet()
     {

diff --git a/app/src/androidTest/java/com/alphawallet/app/util/Helper.java b/app/src/androidTest/java/com/alphawallet/app/util/Helper.java
@@ -28,16 +28,14 @@
 import androidx.test.espresso.util.TreeIterables;
 
 import org.hamcrest.Matcher;
-import org.hamcrest.Matchers;
+import org.hamcrest.CoreMatchers;
 
 import java.util.concurrent.TimeoutException;
 import com.alphawallet.app.R;
+import com.walletconnect.android.Core;
 
 import junit.framework.AssertionFailedError;
 
-import org.hamcrest.Matcher;
-import org.hamcrest.Matchers;
-
 import java.util.concurrent.TimeoutException;
 
 public class Helper
@@ -175,14 +173,14 @@ public void perform(final UiController uiController, final View view)
 
     public static void click(Matcher<View> matcher, int timeoutInSeconds)
     {
-        onView(isRoot()).perform(Helper.waitUntil(Matchers.allOf(matcher, isDisplayed()), timeoutInSeconds));
+        onView(isRoot()).perform(Helper.waitUntil(CoreMatchers.allOf(matcher, isDisplayed()), timeoutInSeconds));
         onView(matcher).perform(ViewActions.click(doNothing())); // if click executed as long press, do nothing and retry clicking
     }
 
     public static void click(Matcher<View> matcher)
     {
 //        Helper.wait(1); //slight pause
-        onView(isRoot()).perform(Helper.waitUntil(Matchers.allOf(matcher, isDisplayed())));
+        onView(isRoot()).perform(Helper.waitUntil(CoreMatchers.allOf(matcher, isDisplayed())));
         onView(matcher).perform(ViewActions.click(doNothing())); // if click executed as long press, do nothing and retry clicking
     }
 

diff --git a/app/src/androidTest/java/com/alphawallet/app/util/ScrollToActionImproved.java b/app/src/androidTest/java/com/alphawallet/app/util/ScrollToActionImproved.java
@@ -5,8 +5,8 @@
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast;
 import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
 
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.anyOf;
+import static org.hamcrest.CoreMatchers.allOf;
+import static org.hamcrest.CoreMatchers.anyOf;
 
 import android.graphics.Rect;
 import android.view.View;