mirror/Android
1
0 Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-09-16 08:29:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix some merge issues

Browse Source
This commit is contained in:
Sylvia van Os committed 2020-10-25 18:14:35 +01:00
1 parent c9f3054682
commit 8880e35a7a
2 files changed
+3 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
+3 -4
View File
@@ -489,11 +489,10 @@ public class LoyaltyCardViewActivityTest
assertTrue(menu != null);
// The share, settings, add and star button should be present
assertEquals(menu.size(), 4);
assertEquals(menu.size(), 3);
assertEquals("Block Rotation", menu.findItem(R.id.action_lock_unlock).getTitle().toString());
assertEquals("Share", menu.findItem(R.id.action_share).getTitle().toString());
assertEquals("Edit", menu.findItem(R.id.action_edit).getTitle().toString());
assertEquals("Add to favorites", menu.findItem(R.id.action_star_unstar).getTitle().toString());
}
@@ -708,8 +707,8 @@ public class LoyaltyCardViewActivityTest
final Menu menu = shadowOf(activity).getOptionsMenu();
assertTrue(menu != null);
// The share, settings, add and star button should be present
assertEquals(menu.size(), 4);
// The share, settings and star button should be present
assertEquals(menu.size(), 3);
assertEquals("Add to favorites", menu.findItem(R.id.action_star_unstar).getTitle().toString());