diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java index b527bd11e..b982683e0 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java @@ -65,7 +65,6 @@ import java.util.concurrent.Callable; 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; @@ -893,11 +892,11 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity { onResuming = false; } - protected void setColorFromIcon(){ + protected void setColorFromIcon() { Object icon = thumbnail.getTag(); - if(icon != null && (icon instanceof Bitmap)){ - updateTempState(LoyaltyCardField.headerColor, new Palette.Builder((Bitmap)icon).generate().getDominantColor(tempLoyaltyCard.headerColor != null ? tempLoyaltyCard.headerColor : getResources().getColor(R.color.colorPrimary))); - }else{ + if (icon != null && (icon instanceof Bitmap)) { + updateTempState(LoyaltyCardField.headerColor, new Palette.Builder((Bitmap) icon).generate().getDominantColor(tempLoyaltyCard.headerColor != null ? tempLoyaltyCard.headerColor : getResources().getColor(R.color.colorPrimary))); + } else { Log.d("setColorFromIcon", "attempting header color change from icon but icon does not exist"); } } @@ -1035,8 +1034,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity { class ChooseCardImage implements View.OnClickListener { @Override - public void onClick(View v) throws NoSuchElementException - { + public void onClick(View v) throws NoSuchElementException { ImageView targetView; if (v.getId() == R.id.frontImageHolder) { @@ -1074,11 +1072,9 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity { } ColorPickerDialog dialog = dialogBuilder.create(); - dialog.setColorPickerDialogListener(new ColorPickerDialogListener() - { + dialog.setColorPickerDialogListener(new ColorPickerDialogListener() { @Override - public void onColorSelected(int dialogId, int color) - { + public void onColorSelected(int dialogId, int color) { updateTempState(LoyaltyCardField.headerColor, color); // Unset image if set @@ -1088,8 +1084,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity { } @Override - public void onDialogDismissed(int dialogId) - { + public void onDialogDismissed(int dialogId) { // Nothing to do, no change made } }); @@ -1352,9 +1347,9 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity { mCropperOptions.setToolbarTitle(getResources().getString(R.string.setIcon)); } - if(requestedIcon()) { - setCropperOptions(true,0f, 0f); - }else{ + if (requestedIcon()) { + setCropperOptions(true, 0f, 0f); + } else { // sniff the input image for width and height to work around a ucrop bug Bitmap image = null; try { @@ -1365,7 +1360,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity { } if (image == null) { Log.d("cropper", "failed loading bitmap for initial width and height for ucrop " + sourceUri.toString()); - setCropperOptions(true,0f, 0f); + setCropperOptions(true, 0f, 0f); } else { try { Bitmap imageRotated = Utils.rotateBitmap(image, new ExifInterface(getContentResolver().openInputStream(sourceUri))); diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java index b85af6b9b..357dfde6a 100644 --- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java +++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java @@ -369,7 +369,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements mainImage.setOnTouchListener(gestureTouchListener); } - private void changeUiToBottomSheetState(int newState){ + private void changeUiToBottomSheetState(int newState) { if (newState == BottomSheetBehavior.STATE_DRAGGING) { editButton.hide(); } else if (newState == BottomSheetBehavior.STATE_EXPANDED) { @@ -387,9 +387,9 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements bottomSheetState = newState; } - private void adjustLayoutHeights(){ + private void adjustLayoutHeights() { // use getLayoutParams instead of getHeight when heights are pre-determined in xml! getHeight could return 0 if a View is not inflated - if(iconImage.getLayoutParams().height != appBarLayout.getHeight()) { + if (iconImage.getLayoutParams().height != appBarLayout.getHeight()) { Log.d("adjustLayoutHeights", "setting imageIcon height from: " + iconImage.getLayoutParams().height + " to: " + appBarLayout.getHeight()); iconImage.setLayoutParams(new CoordinatorLayout.LayoutParams( CoordinatorLayout.LayoutParams.MATCH_PARENT, appBarLayout.getHeight()) @@ -406,7 +406,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements // bottomSheetContentWrapper.getChildAt(i).invalidate(); // } // since it's basically allergic to getting enlarged then shrunk again, and setting it at all when fullscreen makes no sense - if(!isFullscreen){ + if (!isFullscreen) { Log.d("adjustLayoutHeights", "setting bottomSheet height from: " + params.height + " to: " + bottomSheetHeight); bottomSheetContentWrapper.setLayoutParams( new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, bottomSheetHeight) @@ -561,14 +561,14 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements landscapeToolbar.setTitleTextColor(textColor); Bitmap icon = Utils.retrieveCardImage(this, loyaltyCard.id, ImageLocationType.icon); - if (icon != null){ + if (icon != null) { int backgroundAlphaColor = Utils.needsDarkForeground(backgroundHeaderColor) ? Color.WHITE : Color.BLACK; Log.d("onResume", "setting icon image"); iconImage.setImageBitmap(icon); int backgroundWithAlpha = Color.argb(HEADER_FILTER_ALPHA, Color.red(backgroundAlphaColor), Color.green(backgroundAlphaColor), Color.blue(backgroundAlphaColor)); // for images that has alpha appBarLayout.setBackgroundColor(backgroundWithAlpha); - }else{ + } else { Bitmap plain = Bitmap.createBitmap(new int[]{backgroundHeaderColor}, 1, 1, Bitmap.Config.ARGB_8888); iconImage.setImageBitmap(plain); appBarLayout.setBackgroundColor(Color.TRANSPARENT); diff --git a/app/src/main/java/protect/card_locker/ShortcutHelper.java b/app/src/main/java/protect/card_locker/ShortcutHelper.java index 984f5f56a..426983cf1 100644 --- a/app/src/main/java/protect/card_locker/ShortcutHelper.java +++ b/app/src/main/java/protect/card_locker/ShortcutHelper.java @@ -7,7 +7,8 @@ import android.graphics.Canvas; import android.graphics.Color; import android.os.Bundle; -import java.util.Arrays; +import org.jetbrains.annotations.NotNull; + import java.util.Collections; import java.util.Comparator; import java.util.LinkedList; @@ -18,8 +19,6 @@ import androidx.core.content.pm.ShortcutManagerCompat; import androidx.core.graphics.ColorUtils; import androidx.core.graphics.drawable.IconCompat; -import org.jetbrains.annotations.NotNull; - class ShortcutHelper { // Android documentation says that no more than 5 shortcuts // are supported. However, that may be too many, as not all @@ -120,7 +119,8 @@ class ShortcutHelper { ShortcutManagerCompat.setDynamicShortcuts(context, list); } - static @NotNull Bitmap createAdaptiveBitmap(@NotNull Bitmap in, int paddingColor){ + static @NotNull + Bitmap createAdaptiveBitmap(@NotNull Bitmap in, int paddingColor) { Bitmap ret = Bitmap.createBitmap(ADAPTIVE_BITMAP_SIZE, ADAPTIVE_BITMAP_SIZE, Bitmap.Config.ARGB_8888); Canvas output = new Canvas(ret); output.drawColor(ColorUtils.compositeColors(PADDING_COLOR_OVERLAY, paddingColor)); @@ -143,7 +143,7 @@ class ShortcutHelper { Bitmap iconBitmap = Utils.retrieveCardImage(context, loyaltyCard.id, ImageLocationType.icon); if (iconBitmap == null) { iconBitmap = Utils.generateIcon(context, loyaltyCard, true).getLetterTile(); - }else{ + } else { iconBitmap = createAdaptiveBitmap(iconBitmap, loyaltyCard.headerColor == null ? PADDING_COLOR : loyaltyCard.headerColor); } diff --git a/app/src/main/java/protect/card_locker/importexport/CatimaExporter.java b/app/src/main/java/protect/card_locker/importexport/CatimaExporter.java index ace6068b2..b55337ad1 100644 --- a/app/src/main/java/protect/card_locker/importexport/CatimaExporter.java +++ b/app/src/main/java/protect/card_locker/importexport/CatimaExporter.java @@ -70,7 +70,7 @@ public class CatimaExporter implements Exporter { // If it exists, add to the .zip file Bitmap image = Utils.retrieveCardImage(context, card.id, imageLocationType); if (image != null) { - ZipParameters imageZipParameters = createZipParameters(Utils.getCardImageFileName(card.id, imageLocationType) ,password); + ZipParameters imageZipParameters = createZipParameters(Utils.getCardImageFileName(card.id, imageLocationType), password); zipOutputStream.putNextEntry(imageZipParameters); InputStream imageInputStream = new ByteArrayInputStream(Utils.bitmapToByteArray(image)); while ((readLen = imageInputStream.read(readBuffer)) != -1) { diff --git a/app/src/test/java/protect/card_locker/DatabaseTest.java b/app/src/test/java/protect/card_locker/DatabaseTest.java index 67d32ed33..d75038d10 100644 --- a/app/src/test/java/protect/card_locker/DatabaseTest.java +++ b/app/src/test/java/protect/card_locker/DatabaseTest.java @@ -28,22 +28,19 @@ import static org.junit.Assert.assertTrue; @RunWith(RobolectricTestRunner.class) @Config(sdk = 23) -public class DatabaseTest -{ +public class DatabaseTest { private DBHelper db; private static final Integer DEFAULT_HEADER_COLOR = Color.BLACK; @Before - public void setUp() - { + public void setUp() { Activity activity = Robolectric.setupActivity(MainActivity.class); db = TestHelpers.getEmptyDb(activity); } @Test - public void addRemoveOneGiftCard() - { + public void addRemoveOneGiftCard() { assertEquals(0, db.getLoyaltyCardCount()); long id = db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), DEFAULT_HEADER_COLOR, 0, null); boolean result = (id != -1); @@ -70,8 +67,7 @@ public class DatabaseTest } @Test - public void updateGiftCard() - { + public void updateGiftCard() { long id = db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), DEFAULT_HEADER_COLOR, 0, null); boolean result = (id != -1); assertTrue(result); @@ -96,8 +92,7 @@ public class DatabaseTest } @Test - public void updateGiftCardOnlyStar() - { + public void updateGiftCardOnlyStar() { long id = db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), DEFAULT_HEADER_COLOR, 0, null); boolean result = (id != -1); assertTrue(result); @@ -122,8 +117,7 @@ public class DatabaseTest } @Test - public void updateMissingGiftCard() - { + public void updateMissingGiftCard() { assertEquals(0, db.getLoyaltyCardCount()); boolean result = db.updateLoyaltyCard(1, "store1", "note1", null, new BigDecimal("0"), null, "cardId1", @@ -133,8 +127,7 @@ public class DatabaseTest } @Test - public void emptyGiftCardValues() - { + public void emptyGiftCardValues() { long id = db.insertLoyaltyCard("", "", null, new BigDecimal("0"), null, "", null, null, null, 0, null); boolean result = (id != -1); assertTrue(result); @@ -155,14 +148,12 @@ public class DatabaseTest } @Test - public void giftCardsViaCursor() - { + public void giftCardsViaCursor() { final int CARDS_TO_ADD = 10; // Add the gift cards in reverse order, to ensure // that they are sorted - for(int index = CARDS_TO_ADD-1; index >= 0; index--) - { + for (int index = CARDS_TO_ADD - 1; index >= 0; index--) { long id = db.insertLoyaltyCard("store" + index, "note" + index, null, new BigDecimal("0"), null, "cardId" + index, null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), index, 0, null); boolean result = (id != -1); @@ -178,14 +169,13 @@ public class DatabaseTest cursor.moveToFirst(); - for(int index = 0; index < CARDS_TO_ADD; index++) - { - assertEquals("store"+index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STORE))); - assertEquals("note"+index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.NOTE))); + for (int index = 0; index < CARDS_TO_ADD; index++) { + assertEquals("store" + index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STORE))); + assertEquals("note" + index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.NOTE))); assertEquals(0, cursor.getLong(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.EXPIRY))); assertEquals("0", cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BALANCE))); assertEquals(null, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BALANCE_TYPE))); - assertEquals("cardId"+index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.CARD_ID))); + assertEquals("cardId" + index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.CARD_ID))); assertEquals(null, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_ID))); assertEquals(BarcodeFormat.UPC_A.toString(), cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE))); assertEquals(index, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_COLOR))); @@ -206,14 +196,11 @@ public class DatabaseTest long id; // Add the gift cards in reverse order and add one with STAR, to ensure // that they are sorted - for(int index = CARDS_TO_ADD-1; index >= 0; index--) - { - if (index == CARDS_TO_ADD-1) { + for (int index = CARDS_TO_ADD - 1; index >= 0; index--) { + if (index == CARDS_TO_ADD - 1) { id = db.insertLoyaltyCard("store" + index, "note" + index, null, new BigDecimal("0"), null, "cardId" + index, null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), index, 1, null); - } - - else { + } else { id = db.insertLoyaltyCard("store" + index, "note" + index, null, new BigDecimal("0"), null, "cardId" + index, null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), index, 0, null); } @@ -229,13 +216,13 @@ public class DatabaseTest assertEquals(CARDS_TO_ADD, cursor.getCount()); cursor.moveToFirst(); - int index = CARDS_TO_ADD-1 ; - assertEquals("store"+index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STORE))); - assertEquals("note"+index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.NOTE))); + int index = CARDS_TO_ADD - 1; + assertEquals("store" + index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STORE))); + assertEquals("note" + index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.NOTE))); assertEquals(0, cursor.getLong(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.EXPIRY))); assertEquals("0", cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BALANCE))); assertEquals(null, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BALANCE_TYPE))); - assertEquals("cardId"+index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.CARD_ID))); + assertEquals("cardId" + index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.CARD_ID))); assertEquals(null, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_ID))); assertEquals(BarcodeFormat.UPC_A.toString(), cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE))); assertEquals(index, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_COLOR))); @@ -243,14 +230,13 @@ public class DatabaseTest cursor.moveToNext(); - for(index = 0; index < CARDS_TO_ADD-1; index++) - { - assertEquals("store"+index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STORE))); - assertEquals("note"+index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.NOTE))); + for (index = 0; index < CARDS_TO_ADD - 1; index++) { + assertEquals("store" + index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STORE))); + assertEquals("note" + index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.NOTE))); assertEquals(null, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.EXPIRY))); assertEquals("0", cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BALANCE))); assertEquals(null, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BALANCE_TYPE))); - assertEquals("cardId"+index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.CARD_ID))); + assertEquals("cardId" + index, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.CARD_ID))); assertEquals(null, cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_ID))); assertEquals(BarcodeFormat.UPC_A.toString(), cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE))); assertEquals(index, cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.HEADER_COLOR))); @@ -264,8 +250,7 @@ public class DatabaseTest cursor.close(); } - private void setupDatabaseVersion1(SQLiteDatabase database) - { + private void setupDatabaseVersion1(SQLiteDatabase database) { // Delete the tables as they exist now database.execSQL("drop table " + DBHelper.LoyaltyCardDbIds.TABLE); database.execSQL("drop table " + DBHelper.LoyaltyCardDbGroups.TABLE); @@ -281,21 +266,19 @@ public class DatabaseTest } private int insertCardVersion1(SQLiteDatabase database, - final String store, final String cardId, - final String barcodeType) - { + final String store, final String cardId, + final String barcodeType) { ContentValues contentValues = new ContentValues(); contentValues.put(DBHelper.LoyaltyCardDbIds.STORE, store); contentValues.put(DBHelper.LoyaltyCardDbIds.CARD_ID, cardId); contentValues.put(DBHelper.LoyaltyCardDbIds.BARCODE_TYPE, barcodeType); final long newId = database.insert(DBHelper.LoyaltyCardDbIds.TABLE, null, contentValues); assertTrue(newId != -1); - return (int)newId; + return (int) newId; } @Test - public void addRemoveOneGroup() - { + public void addRemoveOneGroup() { assertEquals(0, db.getGroupCount()); long id = db.insertGroup("group one"); boolean result = (id != -1); @@ -313,8 +296,7 @@ public class DatabaseTest } @Test - public void updateGroup() - { + public void updateGroup() { // Create card assertEquals(0, db.getLoyaltyCardCount()); long id = db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), DEFAULT_HEADER_COLOR, 0, null); @@ -363,8 +345,7 @@ public class DatabaseTest } @Test - public void updateMissingGroup() - { + public void updateMissingGroup() { assertEquals(0, db.getGroupCount()); boolean result = db.updateGroup("group one", "new name"); @@ -373,8 +354,7 @@ public class DatabaseTest } @Test - public void emptyGroupValues() - { + public void emptyGroupValues() { long id = db.insertGroup(""); boolean result = (id != -1); assertFalse(result); @@ -382,8 +362,7 @@ public class DatabaseTest } @Test - public void duplicateGroupName() - { + public void duplicateGroupName() { assertEquals(0, db.getGroupCount()); long id = db.insertGroup("group one"); boolean result = (id != -1); @@ -402,8 +381,7 @@ public class DatabaseTest } @Test - public void updateGroupDuplicate() - { + public void updateGroupDuplicate() { long id = db.insertGroup("group one"); boolean result = (id != -1); assertTrue(result); @@ -430,8 +408,7 @@ public class DatabaseTest } @Test - public void cardAddAndRemoveGroups() - { + public void cardAddAndRemoveGroups() { // Create card assertEquals(0, db.getLoyaltyCardCount()); long id = db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), DEFAULT_HEADER_COLOR, 0, null); @@ -477,8 +454,7 @@ public class DatabaseTest } @Test - public void databaseUpgradeFromVersion1() - { + public void databaseUpgradeFromVersion1() { SQLiteDatabase database = db.getWritableDatabase(); // Setup the database as it appeared in revision 1 @@ -503,8 +479,8 @@ public class DatabaseTest assertEquals(BarcodeFormat.UPC_A, card.barcodeType.format()); assertEquals(null, card.headerColor); assertEquals(0, card.starStatus); - assertEquals(0,card.lastUsed); - assertEquals(100,card.zoomLevel); + assertEquals(0, card.lastUsed); + assertEquals(100, card.zoomLevel); // Determine that the entries are queryable and the fields are correct LoyaltyCard card2 = db.getLoyaltyCard(newCardId2); @@ -518,8 +494,8 @@ public class DatabaseTest assertEquals(null, card2.barcodeType); // Empty string should've become null assertEquals(null, card2.headerColor); assertEquals(0, card2.starStatus); - assertEquals(0,card2.lastUsed); - assertEquals(100,card2.zoomLevel); + assertEquals(0, card2.lastUsed); + assertEquals(100, card2.zoomLevel); database.close(); } diff --git a/app/src/test/java/protect/card_locker/ImportExportActivityTest.java b/app/src/test/java/protect/card_locker/ImportExportActivityTest.java index 7b08ccbb7..b8ac02a99 100644 --- a/app/src/test/java/protect/card_locker/ImportExportActivityTest.java +++ b/app/src/test/java/protect/card_locker/ImportExportActivityTest.java @@ -20,10 +20,8 @@ import static org.robolectric.Shadows.shadowOf; @RunWith(RobolectricTestRunner.class) @Config(sdk = 23) -public class ImportExportActivityTest -{ - private void registerIntentHandler(String handler) - { +public class ImportExportActivityTest { + private void registerIntentHandler(String handler) { // Add something that will 'handle' the given intent type PackageManager packageManager = RuntimeEnvironment.application.getPackageManager(); @@ -39,8 +37,7 @@ public class ImportExportActivityTest Intent intent = new Intent(handler); - if(handler.equals(Intent.ACTION_GET_CONTENT)) - { + if (handler.equals(Intent.ACTION_GET_CONTENT)) { intent.addCategory(Intent.CATEGORY_OPENABLE); intent.setType("*/*"); } @@ -48,8 +45,7 @@ public class ImportExportActivityTest shadowOf(packageManager).addResolveInfoForIntent(intent, info); } - private void checkVisibility(Activity activity, int state, int divider, int title, int message, int button) - { + private void checkVisibility(Activity activity, int state, int divider, int title, int message, int button) { View dividerView = activity.findViewById(divider); View titleView = activity.findViewById(title); View messageView = activity.findViewById(message); @@ -62,8 +58,7 @@ public class ImportExportActivityTest } @Test - public void testAllOptionsAvailable() - { + public void testAllOptionsAvailable() { registerIntentHandler(Intent.ACTION_PICK); registerIntentHandler(Intent.ACTION_GET_CONTENT); diff --git a/app/src/test/java/protect/card_locker/ImportExportTest.java b/app/src/test/java/protect/card_locker/ImportExportTest.java index cded58db9..7644dd9a1 100644 --- a/app/src/test/java/protect/card_locker/ImportExportTest.java +++ b/app/src/test/java/protect/card_locker/ImportExportTest.java @@ -45,7 +45,6 @@ import java.util.HashMap; import java.util.List; import androidx.core.content.res.ResourcesCompat; - import protect.card_locker.async.TaskHandler; import protect.card_locker.importexport.DataFormat; import protect.card_locker.importexport.ImportExportResult; diff --git a/app/src/test/java/protect/card_locker/ImportURITest.java b/app/src/test/java/protect/card_locker/ImportURITest.java index d0783d249..d282d3036 100644 --- a/app/src/test/java/protect/card_locker/ImportURITest.java +++ b/app/src/test/java/protect/card_locker/ImportURITest.java @@ -30,8 +30,7 @@ public class ImportURITest { private DBHelper db; @Before - public void setUp() - { + public void setUp() { Activity activity = Robolectric.setupActivity(MainActivity.class); importURIHelper = new ImportURIHelper(activity); db = TestHelpers.getEmptyDb(activity); @@ -96,19 +95,17 @@ public class ImportURITest { } @Test - public void failToParseInvalidUri() - { + public void failToParseInvalidUri() { try { importURIHelper.parse(Uri.parse("https://example.com/test")); assertTrue(false); // Shouldn't get here - } catch(InvalidObjectException ex) { + } catch (InvalidObjectException ex) { // Desired behaviour } } @Test - public void failToParseBadData() - { + public void failToParseBadData() { String[] urls = new String[3]; urls[0] = "https://brarcher.github.io/loyalty-card-locker/share?stare=store¬e=note&cardid=12345&barcodetype=ITF&headercolor=-416706"; urls[1] = "https://thelastproject.github.io/Catima/share#stare%3Dstore%26note%3Dnote%26balance%3D0%26cardid%3D12345%26barcodetype%3DITF%26headercolor%3D-416706"; diff --git a/app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java b/app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java index 3944769cb..1053aeeaf 100644 --- a/app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java +++ b/app/src/test/java/protect/card_locker/LoyaltyCardCursorAdapterTest.java @@ -33,15 +33,13 @@ import static org.junit.Assert.assertTrue; @RunWith(RobolectricTestRunner.class) @Config(sdk = 23) -public class LoyaltyCardCursorAdapterTest -{ +public class LoyaltyCardCursorAdapterTest { private Activity activity; private DBHelper db; private SharedPreferences settings; @Before - public void setUp() - { + public void setUp() { ShadowLog.stream = System.out; activity = Robolectric.setupActivity(MainActivity.class); @@ -49,15 +47,13 @@ public class LoyaltyCardCursorAdapterTest settings = PreferenceManager.getDefaultSharedPreferences(activity); } - private void setFontScale(int fontSizeScale) - { + private void setFontScale(int fontSizeScale) { settings.edit() - .putInt(activity.getResources().getString(R.string.settings_key_max_font_size_scale), fontSizeScale) - .apply(); + .putInt(activity.getResources().getString(R.string.settings_key_max_font_size_scale), fontSizeScale) + .apply(); } - private View createView(Cursor cursor) - { + private View createView(Cursor cursor) { LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(activity.getApplicationContext(), cursor, (MainActivity) activity); LoyaltyCardCursorAdapter.LoyaltyCardListItemViewHolder viewHolder = adapter.createViewHolder(activity.findViewById(R.id.list), 0); @@ -66,60 +62,48 @@ public class LoyaltyCardCursorAdapterTest return viewHolder.itemView; } - private void checkView(final View view, final String store, final String note, final String expiry, final String balance, boolean checkFontSizes) - { + private void checkView(final View view, final String store, final String note, final String expiry, final String balance, boolean checkFontSizes) { final TextView storeField = view.findViewById(R.id.store); final TextView noteField = view.findViewById(R.id.note); final TextView expiryField = view.findViewById(R.id.expiry); final TextView balanceField = view.findViewById(R.id.balance); - if(checkFontSizes) - { + if (checkFontSizes) { Settings preferences = new Settings(activity.getApplicationContext()); int mediumFontSize = preferences.getFontSizeMax(preferences.getMediumFont()); int smallFontSize = preferences.getFontSizeMax(preferences.getSmallFont()); - assertEquals(mediumFontSize, (int)storeField.getTextSize()); - assertEquals(smallFontSize, (int)noteField.getTextSize()); - assertEquals(smallFontSize, (int)expiryField.getTextSize()); + assertEquals(mediumFontSize, (int) storeField.getTextSize()); + assertEquals(smallFontSize, (int) noteField.getTextSize()); + assertEquals(smallFontSize, (int) expiryField.getTextSize()); } assertEquals(store, storeField.getText().toString()); - if(!note.isEmpty()) - { + if (!note.isEmpty()) { assertEquals(View.VISIBLE, noteField.getVisibility()); assertEquals(note, noteField.getText().toString()); - } - else - { + } else { assertEquals(View.GONE, noteField.getVisibility()); } - if(!expiry.isEmpty()) - { + if (!expiry.isEmpty()) { assertEquals(View.VISIBLE, expiryField.getVisibility()); assertEquals(expiry, expiryField.getText().toString()); - } - else - { + } else { assertEquals(View.GONE, expiryField.getVisibility()); } - if(!balance.isEmpty()) - { + if (!balance.isEmpty()) { assertEquals(View.VISIBLE, balanceField.getVisibility()); assertEquals(balance, balanceField.getText().toString()); - } - else - { + } else { assertEquals(View.GONE, balanceField.getVisibility()); } } @Test - public void TestCursorAdapterEmptyNote() - { + public void TestCursorAdapterEmptyNote() { db.insertLoyaltyCard("store", "", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null); LoyaltyCard card = db.getLoyaltyCard(1); @@ -128,14 +112,13 @@ public class LoyaltyCardCursorAdapterTest View view = createView(cursor); - checkView(view, card.store, card.note, "", "",false); + checkView(view, card.store, card.note, "", "", false); cursor.close(); } @Test - public void TestCursorAdapterWithNote() - { + public void TestCursorAdapterWithNote() { db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null); LoyaltyCard card = db.getLoyaltyCard(1); @@ -144,14 +127,13 @@ public class LoyaltyCardCursorAdapterTest View view = createView(cursor); - checkView(view, card.store, card.note, "", "",false); + checkView(view, card.store, card.note, "", "", false); cursor.close(); } @Test - public void TestCursorAdapterFontSizes() - { + public void TestCursorAdapterFontSizes() { final Context context = activity.getApplicationContext(); Date expiryDate = new Date(); String dateString = DateFormat.getDateInstance(DateFormat.LONG).format(expiryDate); @@ -169,14 +151,13 @@ public class LoyaltyCardCursorAdapterTest setFontScale(200); view = createView(cursor); - checkView(view, card.store, card.note, dateString, "",true); + checkView(view, card.store, card.note, dateString, "", true); cursor.close(); } @Test - public void TestCursorAdapterStarring() - { + public void TestCursorAdapterStarring() { assertNotEquals(-1, db.insertLoyaltyCard("storeA", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null)); assertNotEquals(-1, db.insertLoyaltyCard("storeB", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 1, null)); assertNotEquals(-1, db.insertLoyaltyCard("storeC", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 1, null)); @@ -218,8 +199,7 @@ public class LoyaltyCardCursorAdapterTest } @Test - public void TestCursorAdapter0Points() - { + public void TestCursorAdapter0Points() { db.insertLoyaltyCard("store", "", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null); LoyaltyCard card = db.getLoyaltyCard(1); @@ -228,14 +208,13 @@ public class LoyaltyCardCursorAdapterTest View view = createView(cursor); - checkView(view, card.store, card.note, "", "",false); + checkView(view, card.store, card.note, "", "", false); cursor.close(); } @Test - public void TestCursorAdapter0EUR() - { + public void TestCursorAdapter0EUR() { db.insertLoyaltyCard("store", "", null, new BigDecimal("0"), Currency.getInstance("EUR"), "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null); LoyaltyCard card = db.getLoyaltyCard(1); @@ -244,14 +223,13 @@ public class LoyaltyCardCursorAdapterTest View view = createView(cursor); - checkView(view, card.store, card.note, "", "",false); + checkView(view, card.store, card.note, "", "", false); cursor.close(); } @Test - public void TestCursorAdapter100Points() - { + public void TestCursorAdapter100Points() { db.insertLoyaltyCard("store", "note", null, new BigDecimal("100"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null); LoyaltyCard card = db.getLoyaltyCard(1); @@ -260,14 +238,13 @@ public class LoyaltyCardCursorAdapterTest View view = createView(cursor); - checkView(view, card.store, card.note, "", "100 points",false); + checkView(view, card.store, card.note, "", "100 points", false); cursor.close(); } @Test - public void TestCursorAdapter10USD() - { + public void TestCursorAdapter10USD() { db.insertLoyaltyCard("store", "note", null, new BigDecimal("10.00"), Currency.getInstance("USD"), "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null); LoyaltyCard card = db.getLoyaltyCard(1); @@ -276,7 +253,7 @@ public class LoyaltyCardCursorAdapterTest View view = createView(cursor); - checkView(view, card.store, card.note, "", "$10.00",false); + checkView(view, card.store, card.note, "", "$10.00", false); cursor.close(); } diff --git a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java index 76fcbc8f4..0a48f0c2a 100644 --- a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java +++ b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java @@ -67,32 +67,28 @@ import static org.robolectric.Shadows.shadowOf; @RunWith(RobolectricTestRunner.class) @Config(sdk = 23) -public class LoyaltyCardViewActivityTest -{ +public class LoyaltyCardViewActivityTest { private final String BARCODE_DATA = "428311627547"; private final CatimaBarcode BARCODE_TYPE = CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A); private final String EAN_BARCODE_DATA = "4763705295336"; private final CatimaBarcode EAN_BARCODE_TYPE = CatimaBarcode.fromBarcode(BarcodeFormat.EAN_13); - enum ViewMode - { + enum ViewMode { ADD_CARD, VIEW_CARD, UPDATE_CARD, ; } - enum FieldTypeView - { + enum FieldTypeView { TextView, TextInputLayout, ImageView } @Before - public void setUp() - { + public void setUp() { // Output logs emitted during tests so they may be accessed ShadowLog.stream = System.out; } @@ -100,8 +96,7 @@ public class LoyaltyCardViewActivityTest /** * Register a handler in the package manager for a image capture intent */ - private void registerMediaStoreIntentHandler() - { + private void registerMediaStoreIntentHandler() { // Add something that will 'handle' the media capture intent PackageManager packageManager = RuntimeEnvironment.application.getPackageManager(); @@ -133,12 +128,9 @@ public class LoyaltyCardViewActivityTest final String barcodeType, boolean creatingNewCard) throws ParseException { DBHelper db = new DBHelper(activity); - if(creatingNewCard) - { + if (creatingNewCard) { assertEquals(0, db.getLoyaltyCardCount()); - } - else - { + } else { assertEquals(1, db.getLoyaltyCardCount()); } @@ -172,43 +164,31 @@ public class LoyaltyCardViewActivityTest assertEquals(balance, card.balance); // The special "Never" string shouldn't actually be written to the loyalty card - if(expiry.equals(activity.getApplicationContext().getString(R.string.never))) - { + if (expiry.equals(activity.getApplicationContext().getString(R.string.never))) { assertEquals(null, card.expiry); - } - else - { + } else { assertEquals(DateFormat.getDateInstance().parse(expiry), card.expiry); } // The special "Points" string shouldn't actually be written to the loyalty card - if(balanceType.equals(activity.getApplicationContext().getString(R.string.points))) - { + if (balanceType.equals(activity.getApplicationContext().getString(R.string.points))) { assertEquals(null, card.balanceType); - } - else - { + } else { assertEquals(Currency.getInstance(balanceType), card.balanceType); } assertEquals(cardId, card.cardId); // The special "Same as barcode ID" string shouldn't actually be written to the loyalty card - if(barcodeId.equals(activity.getApplicationContext().getString(R.string.sameAsCardId))) - { + if (barcodeId.equals(activity.getApplicationContext().getString(R.string.sameAsCardId))) { assertEquals(null, card.barcodeId); - } - else - { + } else { assertEquals(barcodeId, card.barcodeId); } // The special "No barcode" string shouldn't actually be written to the loyalty card - if(barcodeType.equals(activity.getApplicationContext().getString(R.string.noBarcode))) - { + if (barcodeType.equals(activity.getApplicationContext().getString(R.string.noBarcode))) { assertEquals(null, card.barcodeType); - } - else - { + } else { assertEquals(CatimaBarcode.fromName(barcodeType).format(), card.barcodeType.format()); } assertNotNull(card.headerColor); @@ -220,8 +200,7 @@ public class LoyaltyCardViewActivityTest * Initiate and complete a barcode capture, either in success * or in failure */ - private void captureBarcodeWithResult(final Activity activity, final boolean success) throws IOException - { + private void captureBarcodeWithResult(final Activity activity, final boolean success) throws IOException { // Start image capture final Button startButton = activity.findViewById(R.id.enterButton); startButton.performClick(); @@ -252,8 +231,7 @@ public class LoyaltyCardViewActivityTest * Initiate and complete a barcode selection, either in success * or in failure */ - private void selectBarcodeWithResult(final Activity activity, final String barcodeData, final String barcodeType, final boolean success) throws IOException - { + private void selectBarcodeWithResult(final Activity activity, final String barcodeData, final String barcodeType, final boolean success) throws IOException { // Start barcode selector final Button startButton = activity.findViewById(R.id.enterButton); startButton.performClick(); @@ -286,8 +264,7 @@ public class LoyaltyCardViewActivityTest } private void checkFieldProperties(final Activity activity, final int id, final int visibility, - final Object contents, final FieldTypeView fieldType) - { + final Object contents, final FieldTypeView fieldType) { final View view = activity.findViewById(id); assertNotNull(view); assertEquals(visibility, view.getVisibility()); @@ -315,14 +292,10 @@ public class LoyaltyCardViewActivityTest final String balanceString, final String balanceTypeString, final String cardId, final String barcodeId, final String barcodeType, final Bitmap frontImage, - final Bitmap backImage) - { - if(mode == ViewMode.VIEW_CARD) - { + final Bitmap backImage) { + if (mode == ViewMode.VIEW_CARD) { checkFieldProperties(activity, R.id.cardIdView, View.VISIBLE, cardId, FieldTypeView.TextView); - } - else - { + } else { int editVisibility = View.VISIBLE; checkFieldProperties(activity, R.id.storeNameEdit, editVisibility, store, FieldTypeView.TextView); @@ -340,11 +313,10 @@ public class LoyaltyCardViewActivityTest } @Test - public void noDataLossOnResumeOrRotate() - { + public void noDataLossOnResumeOrRotate() { registerMediaStoreIntentHandler(); - for(boolean newCard : new boolean[] {false, true}) { + for (boolean newCard : new boolean[]{false, true}) { System.out.println(); System.out.println("====="); System.out.println("New card? " + newCard); @@ -437,29 +409,27 @@ public class LoyaltyCardViewActivityTest } @Test - public void startWithoutParametersCheckFieldsAvailable() - { + public void startWithoutParametersCheckFieldsAvailable() { ActivityController activityController = Robolectric.buildActivity(LoyaltyCardEditActivity.class).create(); activityController.start(); activityController.visible(); activityController.resume(); - Activity activity = (Activity)activityController.get(); + Activity activity = (Activity) activityController.get(); final Context context = activity.getApplicationContext(); - checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.never) , "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId),context.getString(R.string.noBarcode), null, null); + checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), null, null); } @Test - public void startWithoutParametersCannotCreateLoyaltyCard() - { + public void startWithoutParametersCannotCreateLoyaltyCard() { ActivityController activityController = Robolectric.buildActivity(LoyaltyCardEditActivity.class).create(); activityController.start(); activityController.visible(); activityController.resume(); - Activity activity = (Activity)activityController.get(); - + Activity activity = (Activity) activityController.get(); + DBHelper db = TestHelpers.getEmptyDb(activity); assertEquals(0, db.getLoyaltyCardCount()); @@ -481,14 +451,13 @@ public class LoyaltyCardViewActivityTest } @Test - public void startWithoutParametersBack() - { + public void startWithoutParametersBack() { ActivityController activityController = Robolectric.buildActivity(LoyaltyCardEditActivity.class).create(); activityController.start(); activityController.visible(); activityController.resume(); - Activity activity = (Activity)activityController.get(); + Activity activity = (Activity) activityController.get(); assertEquals(false, activity.isFinishing()); shadowOf(activity).clickMenuItem(android.R.id.home); @@ -504,10 +473,10 @@ public class LoyaltyCardViewActivityTest activityController.visible(); activityController.resume(); - Activity activity = (Activity)activityController.get(); + Activity activity = (Activity) activityController.get(); final Context context = activity.getApplicationContext(); - checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId),context.getString(R.string.noBarcode), null, null); + checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), null, null); // Complete barcode capture successfully captureBarcodeWithResult(activity, true); @@ -522,14 +491,13 @@ public class LoyaltyCardViewActivityTest } @Test - public void startWithoutParametersCaptureBarcodeFailure() throws IOException - { + public void startWithoutParametersCaptureBarcodeFailure() throws IOException { ActivityController activityController = Robolectric.buildActivity(LoyaltyCardEditActivity.class).create(); activityController.start(); activityController.visible(); activityController.resume(); - Activity activity = (Activity)activityController.get(); + Activity activity = (Activity) activityController.get(); final Context context = activity.getApplicationContext(); checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), null, null); @@ -540,12 +508,11 @@ public class LoyaltyCardViewActivityTest shadowOf(getMainLooper()).idle(); - checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId),context.getString(R.string.noBarcode), null, null); + checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), null, null); } @Test - public void startWithoutParametersCaptureBarcodeCancel() throws IOException - { + public void startWithoutParametersCaptureBarcodeCancel() throws IOException { ActivityController activityController = Robolectric.buildActivity(LoyaltyCardEditActivity.class).create(); activityController.start(); activityController.visible(); @@ -554,7 +521,7 @@ public class LoyaltyCardViewActivityTest LoyaltyCardEditActivity activity = (LoyaltyCardEditActivity) activityController.get(); final Context context = activity.getApplicationContext(); - checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId),context.getString(R.string.noBarcode), null, null); + checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), null, null); // Complete barcode capture successfully captureBarcodeWithResult(activity, true); @@ -578,21 +545,17 @@ public class LoyaltyCardViewActivityTest assertEquals(true, activity.isFinishing()); } - private ActivityController createActivityWithLoyaltyCard(boolean editMode) - { + private ActivityController createActivityWithLoyaltyCard(boolean editMode) { Intent intent = new Intent(); final Bundle bundle = new Bundle(); bundle.putInt("id", 1); Class clazz; - if(editMode) - { + if (editMode) { bundle.putBoolean("update", true); clazz = LoyaltyCardEditActivity.class; - } - else - { + } else { bundle.putBoolean("view", true); clazz = LoyaltyCardViewActivity.class; } @@ -603,10 +566,9 @@ public class LoyaltyCardViewActivityTest } @Test - public void startWithLoyaltyCardEditModeCheckDisplay() throws IOException - { + public void startWithLoyaltyCardEditModeCheckDisplay() throws IOException { ActivityController activityController = createActivityWithLoyaltyCard(true); - Activity activity = (Activity)activityController.get(); + Activity activity = (Activity) activityController.get(); final Context context = activity.getApplicationContext(); DBHelper db = TestHelpers.getEmptyDb(activity); @@ -622,10 +584,9 @@ public class LoyaltyCardViewActivityTest } @Test - public void startWithLoyaltyCardViewModeCheckDisplay() throws IOException - { + public void startWithLoyaltyCardViewModeCheckDisplay() throws IOException { ActivityController activityController = createActivityWithLoyaltyCard(false); - Activity activity = (Activity)activityController.get(); + Activity activity = (Activity) activityController.get(); final Context context = activity.getApplicationContext(); DBHelper db = TestHelpers.getEmptyDb(activity); @@ -641,10 +602,9 @@ public class LoyaltyCardViewActivityTest } @Test - public void startWithLoyaltyCardWithBarcodeUpdateBarcode() throws IOException - { + public void startWithLoyaltyCardWithBarcodeUpdateBarcode() throws IOException { ActivityController activityController = createActivityWithLoyaltyCard(true); - Activity activity = (Activity)activityController.get(); + Activity activity = (Activity) activityController.get(); final Context context = activity.getApplicationContext(); DBHelper db = TestHelpers.getEmptyDb(activity); @@ -666,8 +626,7 @@ public class LoyaltyCardViewActivityTest } @Test - public void startWithLoyaltyCardWithReceiptUpdateReceiptCancel() throws IOException - { + public void startWithLoyaltyCardWithReceiptUpdateReceiptCancel() throws IOException { ActivityController activityController = createActivityWithLoyaltyCard(true); LoyaltyCardEditActivity activity = (LoyaltyCardEditActivity) activityController.get(); final Context context = activity.getApplicationContext(); @@ -705,10 +664,9 @@ public class LoyaltyCardViewActivityTest } @Test - public void startWithLoyaltyCardNoExpirySetExpiry() throws IOException - { + public void startWithLoyaltyCardNoExpirySetExpiry() throws IOException { ActivityController activityController = createActivityWithLoyaltyCard(true); - Activity activity = (Activity)activityController.get(); + Activity activity = (Activity) activityController.get(); final Context context = activity.getApplicationContext(); DBHelper db = TestHelpers.getEmptyDb(activity); @@ -738,10 +696,9 @@ public class LoyaltyCardViewActivityTest } @Test - public void startWithLoyaltyCardExpirySetNoExpiry() throws IOException - { + public void startWithLoyaltyCardExpirySetNoExpiry() throws IOException { ActivityController activityController = createActivityWithLoyaltyCard(true); - Activity activity = (Activity)activityController.get(); + Activity activity = (Activity) activityController.get(); final Context context = activity.getApplicationContext(); DBHelper db = TestHelpers.getEmptyDb(activity); @@ -763,10 +720,9 @@ public class LoyaltyCardViewActivityTest } @Test - public void startWithLoyaltyCardNoBalanceSetBalance() throws IOException - { + public void startWithLoyaltyCardNoBalanceSetBalance() throws IOException { ActivityController activityController = createActivityWithLoyaltyCard(true); - Activity activity = (Activity)activityController.get(); + Activity activity = (Activity) activityController.get(); final Context context = activity.getApplicationContext(); DBHelper db = TestHelpers.getEmptyDb(activity); @@ -814,10 +770,9 @@ public class LoyaltyCardViewActivityTest } @Test - public void startWithLoyaltyCardBalanceSetNoBalance() throws IOException - { + public void startWithLoyaltyCardBalanceSetNoBalance() throws IOException { ActivityController activityController = createActivityWithLoyaltyCard(true); - Activity activity = (Activity)activityController.get(); + Activity activity = (Activity) activityController.get(); final Context context = activity.getApplicationContext(); DBHelper db = TestHelpers.getEmptyDb(activity); @@ -855,10 +810,9 @@ public class LoyaltyCardViewActivityTest } @Test - public void startWithLoyaltyCardSameAsCardIDUpdateBarcodeID() - { + public void startWithLoyaltyCardSameAsCardIDUpdateBarcodeID() { ActivityController activityController = createActivityWithLoyaltyCard(true); - Activity activity = (Activity)activityController.get(); + Activity activity = (Activity) activityController.get(); final Context context = activity.getApplicationContext(); DBHelper db = TestHelpers.getEmptyDb(activity); @@ -887,10 +841,9 @@ public class LoyaltyCardViewActivityTest } @Test - public void startWithLoyaltyCardSameAsCardIDUpdateCardID() - { + public void startWithLoyaltyCardSameAsCardIDUpdateCardID() { ActivityController activityController = createActivityWithLoyaltyCard(true); - Activity activity = (Activity)activityController.get(); + Activity activity = (Activity) activityController.get(); final Context context = activity.getApplicationContext(); DBHelper db = TestHelpers.getEmptyDb(activity); @@ -921,10 +874,9 @@ public class LoyaltyCardViewActivityTest } @Test - public void startWithLoyaltyCardDifferentFromCardIDUpdateCardIDUpdate() - { + public void startWithLoyaltyCardDifferentFromCardIDUpdateCardIDUpdate() { ActivityController activityController = createActivityWithLoyaltyCard(true); - Activity activity = (Activity)activityController.get(); + Activity activity = (Activity) activityController.get(); final Context context = activity.getApplicationContext(); DBHelper db = TestHelpers.getEmptyDb(activity); @@ -958,10 +910,9 @@ public class LoyaltyCardViewActivityTest } @Test - public void startWithLoyaltyCardDifferentFromCardIDUpdateCardIDDoNotUpdate() - { + public void startWithLoyaltyCardDifferentFromCardIDUpdateCardIDDoNotUpdate() { ActivityController activityController = createActivityWithLoyaltyCard(true); - Activity activity = (Activity)activityController.get(); + Activity activity = (Activity) activityController.get(); final Context context = activity.getApplicationContext(); DBHelper db = TestHelpers.getEmptyDb(activity); @@ -995,10 +946,9 @@ public class LoyaltyCardViewActivityTest } @Test - public void checkMenu() throws IOException - { + public void checkMenu() throws IOException { ActivityController activityController = createActivityWithLoyaltyCard(false); - Activity activity = (Activity)activityController.get(); + Activity activity = (Activity) activityController.get(); DBHelper db = TestHelpers.getEmptyDb(activity); db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0, null); @@ -1023,10 +973,9 @@ public class LoyaltyCardViewActivityTest } @Test - public void startWithMissingLoyaltyCard() throws IOException - { + public void startWithMissingLoyaltyCard() throws IOException { ActivityController activityController = createActivityWithLoyaltyCard(true); - Activity activity = (Activity)activityController.get(); + Activity activity = (Activity) activityController.get(); activityController.start(); activityController.visible(); @@ -1043,11 +992,10 @@ public class LoyaltyCardViewActivityTest } @Test - public void startWithoutParametersViewBack() - { + public void startWithoutParametersViewBack() { ActivityController activityController = createActivityWithLoyaltyCard(false); - Activity activity = (Activity)activityController.get(); + Activity activity = (Activity) activityController.get(); DBHelper db = TestHelpers.getEmptyDb(activity); db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0, null); @@ -1063,11 +1011,10 @@ public class LoyaltyCardViewActivityTest } @Test - public void startWithoutColors() - { + public void startWithoutColors() { ActivityController activityController = createActivityWithLoyaltyCard(false); - Activity activity = (Activity)activityController.get(); + Activity activity = (Activity) activityController.get(); DBHelper db = TestHelpers.getEmptyDb(activity); db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, 0, null); @@ -1086,7 +1033,7 @@ public class LoyaltyCardViewActivityTest public void startLoyaltyCardWithoutColorsSave() throws IOException, ParseException { ActivityController activityController = createActivityWithLoyaltyCard(true); - Activity activity = (Activity)activityController.get(); + Activity activity = (Activity) activityController.get(); DBHelper db = TestHelpers.getEmptyDb(activity); db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, null, 0, null); @@ -1104,7 +1051,7 @@ public class LoyaltyCardViewActivityTest public void startLoyaltyCardWithExplicitNoBarcodeSave() throws IOException, ParseException { ActivityController activityController = createActivityWithLoyaltyCard(true); - Activity activity = (Activity)activityController.get(); + Activity activity = (Activity) activityController.get(); DBHelper db = TestHelpers.getEmptyDb(activity); db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, null, Color.BLACK, 0, null); @@ -1121,7 +1068,7 @@ public class LoyaltyCardViewActivityTest @Test public void removeBarcodeFromLoyaltyCard() throws IOException, ParseException { ActivityController activityController = createActivityWithLoyaltyCard(true); - Activity activity = (Activity)activityController.get(); + Activity activity = (Activity) activityController.get(); final Context context = activity.getApplicationContext(); DBHelper db = TestHelpers.getEmptyDb(activity); @@ -1149,11 +1096,10 @@ public class LoyaltyCardViewActivityTest } @Test - public void startCheckFontSizes() - { + public void startCheckFontSizes() { ActivityController activityController = createActivityWithLoyaltyCard(false); - Activity activity = (Activity)activityController.get(); + Activity activity = (Activity) activityController.get(); DBHelper db = TestHelpers.getEmptyDb(activity); db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0, null); @@ -1161,8 +1107,8 @@ public class LoyaltyCardViewActivityTest SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(activity); settings.edit() - .putInt(activity.getResources().getString(R.string.settings_key_max_font_size_scale), 100) - .apply(); + .putInt(activity.getResources().getString(R.string.settings_key_max_font_size_scale), 100) + .apply(); activityController.start(); activityController.visible(); @@ -1184,13 +1130,11 @@ public class LoyaltyCardViewActivityTest } @Test - public void checkScreenOrientationLockSetting() - { - for(boolean locked : new boolean[] {false, true}) - { + public void checkScreenOrientationLockSetting() { + for (boolean locked : new boolean[]{false, true}) { ActivityController activityController = createActivityWithLoyaltyCard(false); - Activity activity = (Activity)activityController.get(); + Activity activity = (Activity) activityController.get(); DBHelper db = new DBHelper(activity); db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0, null); @@ -1207,12 +1151,9 @@ public class LoyaltyCardViewActivityTest MenuItem item = shadowOf(activity).getOptionsMenu().findItem(R.id.action_lock_unlock); - if(locked) - { + if (locked) { assertEquals(item.isVisible(), false); - } - else - { + } else { assertEquals(item.isVisible(), true); String title = item.getTitle().toString(); assertEquals(title, activity.getString(R.string.lockScreen)); @@ -1223,8 +1164,7 @@ public class LoyaltyCardViewActivityTest } @Test - public void checkPushStarIcon() - { + public void checkPushStarIcon() { ActivityController activityController = createActivityWithLoyaltyCard(false); Activity activity = (Activity) activityController.get(); @@ -1258,11 +1198,10 @@ public class LoyaltyCardViewActivityTest } @Test - public void checkBarcodeFullscreenWorkflow() - { + public void checkBarcodeFullscreenWorkflow() { ActivityController activityController = createActivityWithLoyaltyCard(false); - Activity activity = (Activity)activityController.get(); + Activity activity = (Activity) activityController.get(); DBHelper db = TestHelpers.getEmptyDb(activity); db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, BARCODE_TYPE, Color.BLACK, 0, null); @@ -1364,11 +1303,10 @@ public class LoyaltyCardViewActivityTest } @Test - public void checkNoBarcodeFullscreenWorkflow() - { + public void checkNoBarcodeFullscreenWorkflow() { ActivityController activityController = createActivityWithLoyaltyCard(false); - Activity activity = (Activity)activityController.get(); + Activity activity = (Activity) activityController.get(); DBHelper db = TestHelpers.getEmptyDb(activity); db.insertLoyaltyCard("store", "note", null, new BigDecimal("0"), null, BARCODE_DATA, null, null, Color.BLACK, 0, null); @@ -1408,8 +1346,7 @@ public class LoyaltyCardViewActivityTest } @Test - public void importCard() - { + public void importCard() { Date date = new Date(); Uri importUri = Uri.parse("https://catima.app/share#store%3DExample%2BStore%26note%3D%26expiry%3D" + date.getTime() + "%26balance%3D10.00%26balancetype%3DUSD%26cardid%3D123456%26barcodetype%3DAZTEC%26headercolor%3D-416706"); @@ -1423,7 +1360,7 @@ public class LoyaltyCardViewActivityTest activityController.visible(); activityController.resume(); - Activity activity = (Activity)activityController.get(); + Activity activity = (Activity) activityController.get(); final Context context = activity.getApplicationContext(); shadowOf(getMainLooper()).idle(); @@ -1433,8 +1370,7 @@ public class LoyaltyCardViewActivityTest } @Test - public void importCardOldFormat() - { + public void importCardOldFormat() { Uri importUri = Uri.parse("https://brarcher.github.io/loyalty-card-locker/share?store=Example%20Store¬e=&cardid=123456&barcodetype=AZTEC&headercolor=-416706&headertextcolor=-1"); Intent intent = new Intent(); @@ -1446,7 +1382,7 @@ public class LoyaltyCardViewActivityTest activityController.visible(); activityController.resume(); - Activity activity = (Activity)activityController.get(); + Activity activity = (Activity) activityController.get(); final Context context = activity.getApplicationContext(); checkAllFields(activity, ViewMode.ADD_CARD, "Example Store", "", context.getString(R.string.never), "0", context.getString(R.string.points), "123456", context.getString(R.string.sameAsCardId), "Aztec", null, null); diff --git a/app/src/test/java/protect/card_locker/MainActivityTest.java b/app/src/test/java/protect/card_locker/MainActivityTest.java index 7e3956c6a..e05b863d7 100644 --- a/app/src/test/java/protect/card_locker/MainActivityTest.java +++ b/app/src/test/java/protect/card_locker/MainActivityTest.java @@ -32,8 +32,7 @@ import static org.robolectric.Shadows.shadowOf; @RunWith(RobolectricTestRunner.class) @Config(sdk = 23) -public class MainActivityTest -{ +public class MainActivityTest { private SharedPreferences prefs; @Test @@ -69,8 +68,7 @@ public class MainActivityTest } @Test - public void clickAddStartsScan() - { + public void clickAddStartsScan() { final MainActivity activity = Robolectric.setupActivity(MainActivity.class); activity.findViewById(R.id.fabAdd).performClick(); @@ -80,11 +78,10 @@ public class MainActivityTest } @Test - public void addOneLoyaltyCard() - { + public void addOneLoyaltyCard() { ActivityController activityController = Robolectric.buildActivity(MainActivity.class).create(); - Activity mainActivity = (Activity)activityController.get(); + Activity mainActivity = (Activity) activityController.get(); activityController.start(); activityController.resume(); @@ -118,7 +115,7 @@ public class MainActivityTest { ActivityController activityController = Robolectric.buildActivity(MainActivity.class).create(); - Activity mainActivity = (Activity)activityController.get(); + Activity mainActivity = (Activity) activityController.get(); activityController.start(); activityController.resume(); activityController.visible(); @@ -162,11 +159,10 @@ public class MainActivityTest } @Test - public void testGroups() - { + public void testGroups() { ActivityController activityController = Robolectric.buildActivity(MainActivity.class).create(); - Activity mainActivity = (Activity)activityController.get(); + Activity mainActivity = (Activity) activityController.get(); activityController.start(); activityController.resume(); @@ -212,11 +208,10 @@ public class MainActivityTest } @Test - public void testFiltering() - { + public void testFiltering() { ActivityController activityController = Robolectric.buildActivity(MainActivity.class).create(); - MainActivity mainActivity = (MainActivity)activityController.get(); + MainActivity mainActivity = (MainActivity) activityController.get(); activityController.start(); activityController.resume(); diff --git a/app/src/test/java/protect/card_locker/TestHelpers.java b/app/src/test/java/protect/card_locker/TestHelpers.java index 9daa6b08f..d6b6747f7 100644 --- a/app/src/test/java/protect/card_locker/TestHelpers.java +++ b/app/src/test/java/protect/card_locker/TestHelpers.java @@ -19,7 +19,8 @@ public class TestHelpers { for (ImageLocationType imageLocationType : ImageLocationType.values()) { try { Utils.saveCardImage(activity.getApplicationContext(), null, cardID, imageLocationType); - } catch (FileNotFoundException ignored) {} + } catch (FileNotFoundException ignored) { + } } cursor.moveToNext(); diff --git a/app/src/test/java/protect/card_locker/UtilsTest.java b/app/src/test/java/protect/card_locker/UtilsTest.java index 53e4d76ca..9db9a4bcc 100644 --- a/app/src/test/java/protect/card_locker/UtilsTest.java +++ b/app/src/test/java/protect/card_locker/UtilsTest.java @@ -12,11 +12,9 @@ import static org.junit.Assert.assertEquals; @RunWith(RobolectricTestRunner.class) @Config(sdk = 23) -public class UtilsTest -{ +public class UtilsTest { @Test - public void parseBalances() - { + public void parseBalances() { assertEquals("1", Utils.parseCurrency("1", false).toPlainString()); assertEquals("1", Utils.parseCurrency("1", true).toPlainString()); @@ -67,8 +65,7 @@ public class UtilsTest } @Test - public void formatBalances() - { + public void formatBalances() { Currency euro = Currency.getInstance("EUR"); assertEquals("1", Utils.formatBalanceWithoutCurrencySymbol(new BigDecimal("1"), null));