use className selector instead(to make test work in android 19)

tradingticket · Aug 30, 2018 · d17f84f · d17f84f
1 parent 8aca203
commit d17f84f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/exampleApp/src/androidTest/java/it/trade/android/exampleapp/MainActivityTest.java b/exampleApp/src/androidTest/java/it/trade/android/exampleapp/MainActivityTest.java
@@ -153,12 +153,12 @@ private void testOauthFlow(String dummyLogin) throws InterruptedException, UiObj
 
         UiDevice device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
         UiSelector selector = new UiSelector();
-        UiObject login = device.findObject(selector.resourceId("loginUser"));
+        UiObject login = device.findObject(selector.className(EditText.class).instance(0));
         login.clearTextField();
         login.click();
         login.setText(dummyLogin);
 
-        UiObject password = device.findObject(selector.resourceId("loginPwd"));
+        UiObject password = device.findObject(selector.className(EditText.class).instance(1));
         password.clearTextField();
         password.click();
         password.setText("dummy");
@@ -169,7 +169,7 @@ private void testOauthFlow(String dummyLogin) throws InterruptedException, UiObj
         Thread.sleep(3000l); //TODO there should be a better way for waiting
 
         if ("dummySecurity".equals(dummyLogin) || "dummyOption".equals(dummyLogin)) {
-            UiObject answer = device.findObject(selector.resourceId("securityAnswer"));
+            UiObject answer = device.findObject(selector.className(EditText.class).instance(0));
             answer.clearTextField();
             answer.click();
             answer.setText("dummySecurity".equals(dummyLogin) ? "tradingticket" : "option 1");
@@ -199,6 +199,7 @@ private void selectBroker(String brokerLongName) {
 
         appCompatCheckedTextView.perform(click());
     }
+
     private void testGetLinkedBrokers(int number) throws InterruptedException {
         tapOnText(MainActivity.MainActivityActions.GET_LINKED_BROKERS.getLabel());
 
@@ -260,7 +261,7 @@ private void testPreviewAndPlaceTradeFirstLinkedBrokerAccount() throws Interrupt
 
         Thread.sleep(1500l); //TODO there should be a better way for waiting
 
-        checkFieldContainsText(R.id.preview_order_textview,"TradeItPlaceStockOrEtfOrderResponseParcelable{broker='Dummy', confirmationMessage='Your order message");
+        checkFieldContainsText(R.id.preview_order_textview, "TradeItPlaceStockOrEtfOrderResponseParcelable{broker='Dummy', confirmationMessage='Your order message");
 
         navigateUp();
     }

diff --git a/exampleAppKotlin/src/androidTest/kotlin/it/trade/android/exampleapp/MainActivityTest.kt b/exampleAppKotlin/src/androidTest/kotlin/it/trade/android/exampleapp/MainActivityTest.kt
@@ -25,7 +25,8 @@ import org.junit.runner.RunWith
 @RunWith(AndroidJUnit4::class)
 class MainActivityTest {
 
-    @Rule @JvmField
+    @Rule
+    @JvmField
     var mActivityTestRule: ActivityTestRule<MainActivity> = object : ActivityTestRule<MainActivity>(MainActivity::class.java) {
         override fun beforeActivityLaunched() {
             clearSharedPrefs(InstrumentationRegistry.getTargetContext(), TradeItKeystoreService.TRADE_IT_SHARED_PREFS_KEY)
@@ -137,13 +138,15 @@ class MainActivityTest {
 
         Thread.sleep(3000L) //TODO there should be a better way for waiting
 
+        val name = "android.widget.EditText"
+
         val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
-        val login = device.findObject(UiSelector().resourceId("loginUser"))
+        val login = device.findObject(UiSelector().className(name).instance(0))
         login.clearTextField()
         login.click()
         login.text = dummyLogin
 
-        val password = device.findObject(UiSelector().resourceId("loginPwd"))
+        val password = device.findObject(UiSelector().className(name).instance(1))
         password.clearTextField()
         password.click()
         password.text = "dummy"
@@ -154,7 +157,7 @@ class MainActivityTest {
         Thread.sleep(3000L) //TODO there should be a better way for waiting
 
         if (dummyLogin in arrayOf("dummySecurity", "dummyOption")) {
-            device.findObject(UiSelector().resourceId("securityAnswer")).run {
+            device.findObject(UiSelector().className(name).instance(0)).run {
                 clearTextField()
                 click()
                 text = if (dummyLogin == "dummySecurity") "tradingticket" else "option 1"