Final correct LoyaltyCardTest implementation

CatimaLoyalty · Jun 11, 2024 · 889e98d · 889e98d
1 parent f1f38d1
commit 889e98d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 18 deletions.
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCard.java b/app/src/main/java/protect/card_locker/LoyaltyCard.java
@@ -68,8 +68,8 @@ protected LoyaltyCard(Parcel in) {
         balanceType = (Currency) in.readValue(Currency.class.getClassLoader());
         cardId = in.readString();
         barcodeId = in.readString();
-        String barcodeTypeName = in.readString();
-        barcodeType = barcodeTypeName != null && !barcodeTypeName.isEmpty() ? CatimaBarcode.fromName(barcodeTypeName) : null;
+        String tmpBarcodeType = in.readString();
+        barcodeType = !tmpBarcodeType.isEmpty() ? CatimaBarcode.fromName(tmpBarcodeType) : null;
         int tmpHeaderColor = in.readInt();
         headerColor = tmpHeaderColor != -1 ? tmpHeaderColor : null;
         starStatus = in.readInt();
@@ -97,18 +97,6 @@ public void writeToParcel(Parcel parcel, int i) {
         parcel.writeInt(archiveStatus);
     }
 
-    public static final Creator<LoyaltyCard> CREATOR = new Creator<LoyaltyCard>() {
-        @Override
-        public LoyaltyCard createFromParcel(Parcel in) {
-            return new LoyaltyCard(in);
-        }
-
-        @Override
-        public LoyaltyCard[] newArray(int size) {
-            return new LoyaltyCard[size];
-        }
-    };
-}
     public static LoyaltyCard toLoyaltyCard(Cursor cursor) {
         int id = cursor.getInt(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.ID));
         String store = cursor.getString(cursor.getColumnIndexOrThrow(DBHelper.LoyaltyCardDbIds.STORE));
@@ -215,4 +203,4 @@ public LoyaltyCard[] newArray(int size) {
             return new LoyaltyCard[size];
         }
     };
-}
+}
diff --git a/app/src/test/java/protect/card_locker/LoyaltyCardTest.java b/app/src/test/java/protect/card_locker/LoyaltyCardTest.java
@@ -1,11 +1,11 @@
 package protect.card_locker;
 
 import android.os.Parcel;
-import android.os.Parcelable;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 import java.math.BigDecimal;
 import java.util.Currency;
@@ -15,7 +15,8 @@
 
 import static org.junit.Assert.*;
 
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest=Config.NONE)
 public class LoyaltyCardTest {
 
     @Test