From 4536453fdf323f619c7259f0d63a2c53a6ed2f4c Mon Sep 17 00:00:00 2001 From: Katharine Date: Mon, 1 Nov 2021 19:46:07 +0800 Subject: [PATCH] debugging test case breakage --- .../card_locker/LoyaltyCardEditActivity.java | 17 ++++++++++++----- .../LoyaltyCardViewActivityTest.java | 10 ++++++++++ 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java index 3f2c82d6d..48157722f 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java @@ -64,11 +64,10 @@ import java.util.Locale; import java.util.NoSuchElementException; import java.util.concurrent.Callable; -import androidx.activity.result.ActivityResult; -import androidx.activity.result.ActivityResultCallback; import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.contract.ActivityResultContracts; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.widget.Toolbar; @@ -148,7 +147,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity { ActivityResultLauncher mPhotoTakerLauncher; ActivityResultLauncher mPhotoPickerLauncher; - ActivityResultLauncher mCardIdAndBardCodeEditorLauncher; + ActivityResultLauncher mCardIdAndBarCodeEditorLauncher; ActivityResultLauncher mCropperLauncher; int mRequestedImage; @@ -545,7 +544,8 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity { }); - mCardIdAndBardCodeEditorLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> { + mCardIdAndBarCodeEditorLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> { + Log.d("requestCode", "result arriving at mCardIdAndBarCodeEditorLauncher"); if (result.getResultCode() == RESULT_OK) { Intent intent = result.getData(); if (intent == null){ @@ -924,7 +924,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity { final Bundle b = new Bundle(); b.putString(LoyaltyCardEditActivity.BUNDLE_CARDID, cardIdFieldView.getText().toString()); i.putExtras(b); - mCardIdAndBardCodeEditorLauncher.launch(i); + mCardIdAndBarCodeEditorLauncher.launch(i); } } @@ -1271,4 +1271,11 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity { throw new UnsupportedOperationException(); } } + + @Override + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + super.onActivityResult(requestCode, resultCode, data); + System.out.println("requestCode: " + requestCode); + Log.d("requestCode", "requestCode: " + requestCode); + } } diff --git a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java index a7371bdd2..01a37a8ea 100644 --- a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java +++ b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java @@ -263,11 +263,15 @@ public class LoyaltyCardViewActivityTest assertNotNull(intent); assertEquals(intent.getComponent().getClassName(), ScanActivity.class.getCanonicalName()); + // this confuses the test suit, a activity result with request type 2 gets sent to the activity being tested + /* 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); @@ -516,6 +520,7 @@ public class LoyaltyCardViewActivityTest // Complete barcode capture successfully captureBarcodeWithResult(activity, true); + activityController.resume(); checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.prettyName(), null, null); @@ -540,6 +545,7 @@ public class LoyaltyCardViewActivityTest // Complete barcode capture in failure captureBarcodeWithResult(activity, false); + activityController.resume(); shadowOf(getMainLooper()).idle(); @@ -561,6 +567,7 @@ public class LoyaltyCardViewActivityTest // Complete barcode capture successfully captureBarcodeWithResult(activity, true); + activityController.resume(); checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.prettyName(), null, null); @@ -660,6 +667,7 @@ public class LoyaltyCardViewActivityTest // Complete barcode capture successfully captureBarcodeWithResult(activity, true); + activityController.resume(); checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.prettyName(), null, null); @@ -684,6 +692,7 @@ public class LoyaltyCardViewActivityTest // Complete barcode capture successfully captureBarcodeWithResult(activity, true); + activityController.resume(); checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), BARCODE_TYPE.prettyName(), null, null); @@ -1136,6 +1145,7 @@ public class LoyaltyCardViewActivityTest // Complete empty barcode selection successfully selectBarcodeWithResult(activity, BARCODE_DATA, "", true); + activityController.resume(); // Check if the barcode type is NO_BARCODE as expected checkAllFields(activity, ViewMode.UPDATE_CARD, "store", "note", context.getString(R.string.never), "0", context.getString(R.string.points), BARCODE_DATA, context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), null, null);