From eabd988540637349898323dee0888681d06b3028 Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Tue, 15 Dec 2020 22:29:01 +0100
Subject: [PATCH] Fix tests

---
 .../LoyaltyCardViewActivityTest.java          | 28 +++++++++----------
 .../protect/card_locker/MainActivityTest.java |  9 +++---
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
index bed004e0b..c957dc275 100644
--- a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
+++ b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
@@ -153,27 +153,19 @@ public class LoyaltyCardViewActivityTest
         final Button startButton = activity.findViewById(R.id.enterButton);
         startButton.performClick();
 
-        Dialog dialog = ShadowDialog.getLatestDialog();
-        ShadowDialog shadowDialog = shadowOf(dialog);
-        shadowDialog.clickOn(R.id.add_from_camera);
-
         ShadowActivity.IntentForResult intentForResult = shadowOf(activity).peekNextStartedActivityForResult();
         assertNotNull(intentForResult);
 
         Intent intent = intentForResult.intent;
         assertNotNull(intent);
 
-        String action = intent.getAction();
-        assertNotNull(action);
-        assertEquals(Intents.Scan.ACTION, action);
-
         Bundle bundle = intent.getExtras();
         assertNotNull(bundle);
 
         Intent resultIntent = new Intent(intent);
         Bundle resultBundle = new Bundle();
-        resultBundle.putString(Intents.Scan.RESULT, BARCODE_DATA);
-        resultBundle.putString(Intents.Scan.RESULT_FORMAT, BARCODE_TYPE);
+        resultBundle.putString(BarcodeSelectorActivity.BARCODE_CONTENTS, BARCODE_DATA);
+        resultBundle.putString(BarcodeSelectorActivity.BARCODE_FORMAT, BARCODE_TYPE);
         resultIntent.putExtras(resultBundle);
 
         // Respond to image capture, success
@@ -193,14 +185,20 @@ public class LoyaltyCardViewActivityTest
         final Button startButton = activity.findViewById(R.id.enterButton);
         startButton.performClick();
 
-        Dialog dialog = ShadowDialog.getLatestDialog();
-        ShadowDialog shadowDialog = shadowOf(dialog);
-        shadowDialog.clickOn(R.id.add_manually);
-
         ShadowActivity.IntentForResult intentForResult = shadowOf(activity).peekNextStartedActivityForResult();
+        Intent intent = intentForResult.intent;
+        assertNotNull(intent);
+        assertEquals(intent.getComponent().getClassName(), ScanActivity.class.getCanonicalName());
+
+        Activity newActivity = Robolectric.buildActivity(ScanActivity.class, intent).create().get();
+
+        final Button manualButton = newActivity.findViewById(R.id.add_manually);
+        manualButton.performClick();
+
+        intentForResult = shadowOf(activity).peekNextStartedActivityForResult();
         assertNotNull(intentForResult);
 
-        Intent intent = intentForResult.intent;
+        intent = intentForResult.intent;
         assertNotNull(intent);
 
         Bundle bundle = intent.getExtras();
diff --git a/app/src/test/java/protect/card_locker/MainActivityTest.java b/app/src/test/java/protect/card_locker/MainActivityTest.java
index f9a606d95..930801231 100644
--- a/app/src/test/java/protect/card_locker/MainActivityTest.java
+++ b/app/src/test/java/protect/card_locker/MainActivityTest.java
@@ -21,6 +21,7 @@ import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 import org.robolectric.android.controller.ActivityController;
+import org.robolectric.shadows.ShadowActivity;
 import org.robolectric.shadows.ShadowAlertDialog;
 import org.robolectric.shadows.ShadowDialog;
 
@@ -73,16 +74,14 @@ public class MainActivityTest
     }
 
     @Test
-    public void clickAddLaunchesAddDialog()
+    public void clickAddStartsScan()
     {
         final MainActivity activity = Robolectric.setupActivity(MainActivity.class);
 
         activity.findViewById(R.id.fabAdd).performClick();
 
-        Dialog dialog = ShadowDialog.getLatestDialog();
-        ShadowDialog shadowDialog = shadowOf(dialog);
-
-        assertEquals("Add Card", shadowDialog.getTitle());
+        ShadowActivity shadowActivity = shadowOf(activity);
+        assertEquals(shadowActivity.peekNextStartedActivityForResult().intent.getComponent(), new ComponentName(activity, ScanActivity.class));
     }
 
     @Test