mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-03-28 20:31:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix unit tests

Browse Source
This commit is contained in:
Sylvia van Os
2020-11-22 18:26:05 +01:00
parent afcbca251c
commit 84d7f4fbba
2 changed files with 42 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
View File

@@ -75,6 +75,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
boolean hasChanged = false;
boolean initDone = false;
AlertDialog confirmExitDialog = null;
private void extractIntentFields(Intent intent)
{
@@ -397,28 +398,26 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
return;
}
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(R.string.leaveWithoutSaveTitle);
builder.setMessage(R.string.leaveWithoutSaveConfirmation);
builder.setPositiveButton(R.string.confirm, new DialogInterface.OnClickListener()
{
@Override
public void onClick(DialogInterface dialog, int which)
{
finish();
dialog.dismiss();
}
});
builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener()
{
@Override
public void onClick(DialogInterface dialog, int which)
{
dialog.dismiss();
}
});
AlertDialog dialog = builder.create();
dialog.show();
if (confirmExitDialog == null) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(R.string.leaveWithoutSaveTitle);
builder.setMessage(R.string.leaveWithoutSaveConfirmation);
builder.setPositiveButton(R.string.confirm, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
finish();
dialog.dismiss();
}
});
builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
}
});
confirmExitDialog = builder.create();
}
confirmExitDialog.show();
}
class EditCardIdAndBarcode implements View.OnClickListener

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

@@ -352,7 +352,7 @@ public class LoyaltyCardViewActivityTest
activityController.visible();
activityController.resume();
Activity activity = (Activity)activityController.get();
LoyaltyCardEditActivity activity = (LoyaltyCardEditActivity) activityController.get();
checkAllFields(activity, ViewMode.ADD_CARD, "", "", "", "");
@@ -363,7 +363,17 @@ public class LoyaltyCardViewActivityTest
// Cancel the loyalty card creation
assertEquals(false, activity.isFinishing());
// A change was made
shadowOf(activity).clickMenuItem(android.R.id.home);
assertEquals(true, activity.confirmExitDialog.isShowing());
assertEquals(true, activity.hasChanged);
assertEquals(false, activity.isFinishing());
// Exit after setting hasChanged to false
activity.hasChanged = false;
shadowOf(activity).clickMenuItem(android.R.id.home);
assertEquals(false, activity.hasChanged);
assertEquals(true, activity.isFinishing());
}
@@ -448,7 +458,7 @@ public class LoyaltyCardViewActivityTest
public void startWithLoyaltyCardWithReceiptUpdateReceiptCancel() throws IOException
{
ActivityController activityController = createActivityWithLoyaltyCard(true);
Activity activity = (Activity)activityController.get();
LoyaltyCardEditActivity activity = (LoyaltyCardEditActivity) activityController.get();
DBHelper db = new DBHelper(activity);
db.insertLoyaltyCard("store", "note", EAN_BARCODE_DATA, EAN_BARCODE_TYPE, Color.BLACK, 0);
@@ -466,7 +476,16 @@ public class LoyaltyCardViewActivityTest
// Cancel the loyalty card creation
assertEquals(false, activity.isFinishing());
// A change was made
shadowOf(activity).clickMenuItem(android.R.id.home);
assertEquals(true, activity.confirmExitDialog.isShowing());
assertEquals(true, activity.hasChanged);
assertEquals(false, activity.isFinishing());
// Exit after setting hasChanged to false
activity.hasChanged = false;
shadowOf(activity).clickMenuItem(android.R.id.home);
assertEquals(false, activity.hasChanged);
assertEquals(true, activity.isFinishing());
}