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

Fix tests

Browse Source
This commit is contained in:
Sylvia van Os
2020-01-01 19:43:23 +01:00
parent ccf3d1f3d6
commit cc99af13e4
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/test/java/protect/card_locker/BarcodeSelectorActivityTest.java
View File

@@ -63,7 +63,10 @@ public class BarcodeSelectorActivityTest {
// Clicking button should create "empty" barcode
activity.findViewById(R.id.noBarcode).performClick();
Intent resultIntent = shadowOf(activity).getResultIntent();
assertEquals("", resultIntent.getStringExtra(BarcodeSelectorActivity.BARCODE_FORMAT));
// The BarcodeSelectorActivity should return the special NO_BARCODE string to differentiate
// from nothing being set yet
assertEquals(LoyaltyCardEditActivity.NO_BARCODE, resultIntent.getStringExtra(BarcodeSelectorActivity.BARCODE_FORMAT));
assertEquals("abcdefg", resultIntent.getStringExtra(BarcodeSelectorActivity.BARCODE_CONTENTS));
}

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

@@ -126,7 +126,16 @@ public class LoyaltyCardViewActivityTest
assertEquals(store, card.store);
assertEquals(note, card.note);
assertEquals(cardId, card.cardId);
assertEquals(barcodeType, card.barcodeType);
// The special "No barcode" string shouldn't actually be written to the loyalty card
if(barcodeType.equals(LoyaltyCardEditActivity.NO_BARCODE))
{
assertEquals("", card.barcodeType);
}
else
{
assertEquals(barcodeType, card.barcodeType);
}
assertNotNull(card.headerColor);
assertNotNull(card.headerTextColor);
}
@@ -539,7 +548,7 @@ public class LoyaltyCardViewActivityTest
activityController.resume();
// Save and check the loyalty card
saveLoyaltyCardWithArguments(activity, "store", "note", BARCODE_DATA, "", false);
saveLoyaltyCardWithArguments(activity, "store", "note", BARCODE_DATA, LoyaltyCardEditActivity.NO_BARCODE, false);
}
@Test