mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-02-24 19:26:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://github.com/brarcher/loyalty-card-locker into feature/pkpass

Browse Source
This commit is contained in:
Sylvia van Os
2019-12-16 16:51:25 +01:00
parent 80b45973ac 8a3b623ea6
commit 43148cb12c
11 changed files with 216 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
View File

@@ -248,10 +248,6 @@ public class LoyaltyCardViewActivityTest
noteField.setText("note");
shadowActivity.clickMenuItem(R.id.action_save);
assertEquals(0, db.getLoyaltyCardCount());
cardIdField.setText("cardId");
shadowActivity.clickMenuItem(R.id.action_save);
assertEquals(0, db.getLoyaltyCardCount());
}
@Test
@@ -288,7 +284,7 @@ public class LoyaltyCardViewActivityTest
checkAllFields(activity, ViewMode.ADD_CARD, "", "", BARCODE_DATA, BARCODE_TYPE);
// Save and check the gift card
// Save and check the loyalty card
saveLoyaltyCardWithArguments(activity, "store", "note", BARCODE_DATA, BARCODE_TYPE, true);
}
@@ -327,7 +323,7 @@ public class LoyaltyCardViewActivityTest
checkAllFields(activity, ViewMode.ADD_CARD, "", "", BARCODE_DATA, BARCODE_TYPE);
// Cancel the gift card creation
// Cancel the loyalty card creation
assertEquals(false, activity.isFinishing());
shadowOf(activity).clickMenuItem(android.R.id.home);
assertEquals(true, activity.isFinishing());
@@ -530,10 +526,27 @@ public class LoyaltyCardViewActivityTest
activityController.visible();
activityController.resume();
// Save and check the gift card
// Save and check the loyalty card
saveLoyaltyCardWithArguments(activity, "store", "note", BARCODE_DATA, BARCODE_TYPE, false);
}
@Test
public void startLoyaltyCardWithExplicitNoBarcodeSave() throws IOException, JSONException
{
ActivityController activityController = createActivityWithLoyaltyCard(true);
Activity activity = (Activity)activityController.get();
DBHelper db = new DBHelper(activity);
db.insertLoyaltyCard("store", "note", BARCODE_DATA, "", Color.BLACK, Color.WHITE, new ExtrasHelper());
activityController.start();
activityController.visible();
activityController.resume();
// Save and check the loyalty card
saveLoyaltyCardWithArguments(activity, "store", "note", BARCODE_DATA, "", false);
}
@Test
public void startCheckFontSizes() throws JSONException
{