From e39593228dbc43064269d31e7cabfc5b6003b81c Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Sun, 5 Jan 2020 00:12:12 +0100 Subject: [PATCH] Fix tests --- .../protect/card_locker/LoyaltyCardViewActivityTest.java | 8 ++++---- .../test/java/protect/card_locker/MainActivityTest.java | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java index e0b6b7441..440a6594a 100644 --- a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java +++ b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java @@ -117,7 +117,7 @@ public class LoyaltyCardViewActivityTest barcodeTypeField.setText(barcodeType); assertEquals(false, activity.isFinishing()); - shadowOf(activity).clickMenuItem(R.id.action_save); + activity.findViewById(R.id.fabSave).performClick(); assertEquals(true, activity.isFinishing()); assertEquals(1, db.getLoyaltyCardCount()); @@ -234,15 +234,15 @@ public class LoyaltyCardViewActivityTest final EditText noteField = activity.findViewById(R.id.noteEdit); final TextView cardIdField = activity.findViewById(R.id.cardIdView); - shadowOf(activity).clickMenuItem(R.id.action_save); + activity.findViewById(R.id.fabSave).performClick(); assertEquals(0, db.getLoyaltyCardCount()); storeField.setText("store"); - shadowOf(activity).clickMenuItem(R.id.action_save); + activity.findViewById(R.id.fabSave).performClick(); assertEquals(0, db.getLoyaltyCardCount()); noteField.setText("note"); - shadowOf(activity).clickMenuItem(R.id.action_save); + activity.findViewById(R.id.fabSave).performClick(); assertEquals(0, db.getLoyaltyCardCount()); } diff --git a/app/src/test/java/protect/card_locker/MainActivityTest.java b/app/src/test/java/protect/card_locker/MainActivityTest.java index e4cbc69c6..0d3441c8c 100644 --- a/app/src/test/java/protect/card_locker/MainActivityTest.java +++ b/app/src/test/java/protect/card_locker/MainActivityTest.java @@ -70,10 +70,9 @@ public class MainActivityTest assertTrue(menu != null); // The settings, search and add button should be present - assertEquals(menu.size(), 6); + assertEquals(menu.size(), 5); assertEquals("Search", menu.findItem(R.id.action_search).getTitle().toString()); - assertEquals("Add", menu.findItem(R.id.action_add).getTitle().toString()); assertEquals("Import/Export", menu.findItem(R.id.action_import_export).getTitle().toString()); assertEquals("Start Intro", menu.findItem(R.id.action_intro).getTitle().toString()); assertEquals("About", menu.findItem(R.id.action_about).getTitle().toString()); @@ -85,7 +84,7 @@ public class MainActivityTest { final MainActivity activity = Robolectric.setupActivity(MainActivity.class); - shadowOf(activity).clickMenuItem(R.id.action_add); + activity.findViewById(R.id.fabAdd).performClick(); Intent intent = shadowOf(activity).peekNextStartedActivityForResult().intent;