Update test with more robust test data

CS2103-AY1819S2-T12-3 · Apr 10, 2019 · 6a0aa38 · 6a0aa38
1 parent dcd95da
commit 6a0aa38
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/test/data/JsonSerializableInventoryTest/typicalMedicinesInventory.json b/src/test/data/JsonSerializableInventoryTest/typicalMedicinesInventory.json
@@ -33,6 +33,11 @@
         "batchNumber" : "GKP1685",
         "expiry" : "15/08/2019",
         "quantity" : "300"
+      },
+       {
+        "batchNumber" : "GKP1682",
+        "expiry" : "31/07/2019",
+        "quantity" : "5"
       } ]
   }, {
     "name" : "Lipitor",

diff --git a/src/test/java/seedu/address/logic/commands/UpdateCommandTest.java b/src/test/java/seedu/address/logic/commands/UpdateCommandTest.java
@@ -30,6 +30,7 @@
 import seedu.address.model.UserPrefs;
 import seedu.address.model.medicine.Batch;
 import seedu.address.model.medicine.BatchNumber;
+import seedu.address.model.medicine.Expiry;
 import seedu.address.model.medicine.Medicine;
 import seedu.address.model.medicine.Quantity;
 import seedu.address.testutil.BatchBuilder;
@@ -201,16 +202,17 @@ public void execute_removeBatchUnfilteredListOneOtherBatch_success() {
         Batch batchToRemove = iter.next();
 
         assertTrue(iter.hasNext()); // There is one more batch after removing
-        Batch batchRemaining = iter.next();
 
         batches.remove(batchToRemove.getBatchNumber());
 
         int newQuantity = medicineToUpdate.getTotalQuantity().getNumericValue()
                 - batchToRemove.getQuantity().getNumericValue();
 
+        Expiry newExpiry = batches.values().stream().min(Comparator.comparing(Batch::getExpiry)).get().getExpiry();
+
         Medicine updatedMedicine = new MedicineBuilder(medicineToUpdate)
                 .withQuantity(Integer.toString(newQuantity))
-                .withExpiry(batchRemaining.getExpiry().toString())
+                .withExpiry(newExpiry.toString())
                 .withBatches(batches).build();
 
         Batch inputBatch = new BatchBuilder(batchToRemove).withQuantity("0").build();