More tests + edge case bug fixing

src/main/java/eggventory/logic/commands/edit/EditStockCommand.java

@@ -54,12 +54,9 @@ public String execute(StockList list, Ui ui, Storage storage) throws BadInputExc
                         + "stockcode: %s\n"
                         + "quantity: %d\n"
                         + "description: %s\n"
-                        + "minimum: %s\n"
-                        + "lost: %s\n"
-                        + "loaned: %s\n"
-                        + "available: %s",
+                        + "minimum: %s",
                 edited.getStockType(), edited.getStockCode(), edited.getQuantity(), edited.getDescription(),
-                edited.getMinimum(), edited.getLost(), edited.getLoaned(), edited.numAvailable());
+                edited.getMinimum());
         output += QuantityManager.checkMinimum(edited);
         storage.save(list);
         ui.print(output);

src/main/java/eggventory/logic/parsers/ParseAdd.java

@@ -35,6 +35,8 @@ private int processAddStockMinimum(String input) throws BadInputException {
             String minString = parseMinimum[1].split(" ", 2)[0]; //Take only the first word after " -m ".
 
             Parser.isCheckIsInteger(minString, "minimum quantity");
+            Parser.isNotNegative(Integer.parseInt(minString), "minimum quantity");
+
             return Integer.parseInt(minString);
         }
     }
@@ -77,6 +79,8 @@ private Command processAddStock(String input) throws BadInputException {
         }
 
         Parser.isCheckIsInteger(addInput[2], "quantity");
+        Parser.isNotNegative(Integer.parseInt(addInput[2]), "quantity");
+
 
         return new AddStockCommand(CommandType.ADD, addInput[0], addInput[1],
                 Integer.parseInt(addInput[2]), addInput[3], minimumQuantity);
@@ -164,6 +168,9 @@ private Command processAddLoan(String input) throws InsufficientInfoException, B
         }
 
         Parser.isCheckIsInteger(addInput[2], "loan quantity");
+        Parser.isNotNegative(Integer.parseInt(addInput[2]), "loan quantity");
+        Parser.isNotZero(Integer.parseInt(addInput[2]), "loan quantity");
+
 
         return new AddLoanCommand(CommandType.ADD, addInput[0], addInput[1], Integer.parseInt(addInput[2]));
     }

src/main/java/eggventory/logic/parsers/ParseEdit.java

@@ -31,13 +31,17 @@ private Command processEditStock(String input) throws BadInputException {
 
         case "quantity":
             Parser.isCheckIsInteger(editInput[2], "quantity");
+            Parser.isNotNegative(Integer.parseInt(editInput[2]), "quantity");
+
             return new EditStockCommand(CommandType.EDIT, stockCode, StockProperty.QUANTITY,
                     editInput[2]);
         case "description":
             return new EditStockCommand(CommandType.EDIT, stockCode, StockProperty.DESCRIPTION,
                     editInput[2]);
         case "minimum":
             Parser.isCheckIsInteger(editInput[2], "minimum quantity");
+            Parser.isNotNegative(Integer.parseInt(editInput[2]), "minimum quantity");
+
             return new EditStockCommand(CommandType.EDIT, stockCode, StockProperty.MINIMUM, editInput[2]);
         default:
             throw new BadInputException("The property you are trying to edit does not exist.");

src/main/java/eggventory/logic/parsers/Parser.java

@@ -7,9 +7,8 @@
 import eggventory.logic.commands.Command;
 import eggventory.logic.commands.CommandDictionary;
 import eggventory.logic.commands.HelpCommand;
-import eggventory.logic.commands.UndoCommand;
 import eggventory.logic.commands.RedoCommand;
-
+import eggventory.logic.commands.UndoCommand;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -78,6 +77,7 @@ public static boolean isCommandComplete(String command, int reqArguments) {
     /**
      * Checks if a string input is an integer.
      * @param testInteger the input to test.
+     * @throws BadInputException if the input is not an integer.
      */
     public static void isCheckIsInteger(String testInteger, String inputName) throws BadInputException {
         try {
@@ -87,6 +87,28 @@ public static void isCheckIsInteger(String testInteger, String inputName) throws
         }
     }
 
+    /**
+     * Checks if a int input is negative.
+     * @param testInteger the input to test.
+     * @throws BadInputException if the input is negative.
+     */
+    public static void isNotNegative(int testInteger, String inputName) throws BadInputException {
+        if (testInteger < 0) {
+            throw new BadInputException(String.format("Sorry, the input for %s cannot be negative!", inputName));
+        }
+    }
+
+    /**
+     * Checks if a int input is zero.
+     * @param testInteger the input to test.
+     * @throws BadInputException if the input is zero.
+     */
+    public static void isNotZero(int testInteger, String inputName) throws BadInputException {
+        if (testInteger == 0) {
+            throw new BadInputException(String.format("Sorry, the input for %s cannot be 0!", inputName));
+        }
+    }
+
     /**
      * Checks if the command keyword (first word is valid).
      * Determines what to do with the remaining string depending on the command.

src/main/java/eggventory/model/items/Stock.java

@@ -44,8 +44,7 @@ public Stock(String stockType, String stockCode, int quantity, String descriptio
         this.stockCode = stockCode;
         this.quantity = quantity;
         this.description = description;
-        this.loaned = 0; //TODO: Determine whether to remove this attribute or update it from the LoanList.
-        this.lost = 0;
+        this.lost = 0; //For future use.
         this.minimum = 0;
     }
 
@@ -151,23 +150,6 @@ public void quantitySanityCheck(int quantity) throws BadInputException {
         }
     }
 
-    /**
-     * Gets the number of this stock that is on loan.
-     * @return loaned the number of loaned items.
-     */
-    public int getLoaned() {
-        return loaned;
-    }
-
-
-    /**
-     * Sets the number of this stock on loan. To be used by the 'loan' command.
-     * @param loaned the number of items on loan.
-     */
-    public void setLoaned(int loaned) {
-        this.loaned = loaned;
-    }
-
     /**
      * Gets the number of this stock that is lost.
      * @return lost the number of lost items.

src/main/java/eggventory/model/items/StockType.java

@@ -2,7 +2,7 @@
 
 import eggventory.commons.enums.StockProperty;
 import eggventory.commons.exceptions.BadInputException;
-import java.util.List;
+
 import java.util.ArrayList;
 
 //@@author Deculsion
@@ -107,38 +107,6 @@ public Stock setStockQuantity(String stockCode, int quantity) throws BadInputExc
         return null;
     }
 
-    /**
-     * Accesses and updates loaned quantity of a stock.
-     * @param stockCode The current stockcode reffering to this stock
-     * @param quantity The new loaned quantity to change to
-     * @return Stock if stockCode is found, else null
-     */
-    public Stock setStockLoaned(String stockCode, int quantity) {
-        for (Stock stock : stocks) {
-            if (stock.getStockCode().equals(stockCode)) {
-                stock.setLoaned(quantity);
-                return stock;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Accesses and updates lost quantity of a stock.
-     * @param stockCode The current stockcode reffering to this stock
-     * @param quantity The new lost quantity to change to
-     * @return Stock if stockCode is found, else null
-     */
-    public Stock setStockLost(String stockCode, int quantity) {
-        for (Stock stock : stocks) {
-            if (stock.getStockCode().equals(stockCode)) {
-                stock.setLost(quantity);
-                return stock;
-            }
-        }
-        return null;
-    }
-
     /**
      * Accesses and updates stock description of a stock.
      * @param stockCode The current stockcode reffering to this stock
@@ -242,10 +210,6 @@ public Stock setStock(String stockCode, StockProperty property, String newValue)
             return this.setStockCode(stockCode, newValue);
         case QUANTITY:
             return this.setStockQuantity(stockCode, Integer.parseInt(newValue));
-        case LOANED:
-            return this.setStockLoaned(stockCode, Integer.parseInt(newValue));
-        case LOST:
-            return this.setStockLost(stockCode, Integer.parseInt(newValue));
         case DESCRIPTION:
             return this.setStockDescription(stockCode, newValue);
         case MINIMUM:

src/main/java/eggventory/model/items/UniqueStock.java

@@ -7,7 +7,7 @@
 
 //@@author cyanoei
 
-//TODO: Since 5 Nov the quantity-related features have been broken by the sanity check for negatives.
+//Since 5 Nov the quantity-related features have been broken by the sanity check for negatives.
 /**
  * A child of the Stock class.
  * A UniqueStock is a group of many items (eg. Arduino Uno) that share the same stockCode, description etc.,
@@ -85,7 +85,7 @@ public void deleteUnique(int index) {
 
     //Note: toString works as per normal, treating UniqueStock as a CollectiveStock.
 
-    //TODO: Provide a 'detailed' version of the print string to show individual items.
+    //Provide a 'detailed' version of the print string to show individual items.
     public void printUniqueStocks() {
        /*
            A header with all the usual info, maybe using toString.
@@ -99,8 +99,8 @@ public void printUniqueStocks() {
         */
     }
 
-    //TODO: Update both print and save method in Item class, and iterate through all of them here.
-    //  Should be similar to StockType printing methods.
+    //Update both print and save method in Item class, and iterate through all of them here.
+    //Should be similar to StockType printing methods.
     /**
      * Formats all stock details appropriately to be saved to file.
      * @return the string to save.

src/main/java/eggventory/model/loans/Loan.java

@@ -1,6 +1,7 @@
 package eggventory.model.loans;
 
 import eggventory.model.PersonList;
+
 import java.util.ArrayList;
 import java.util.Calendar;
 

src/test/java/eggventory/logic/commands/edit/EditStockCommandTest.java

@@ -42,10 +42,7 @@ void testExecuteEditStockCode_ValidStockCode_Success() throws BadInputException
                 + "stockcode: #TNEW\n"
                 + "quantity: 100\n"
                 + "description: Test\n"
-                + "minimum: 0\n"
-                + "lost: 0\n"
-                + "loaned: 0\n"
-                + "available: 100";
+                + "minimum: 0";
         String output = new EditStockCommand(CommandType.EDIT, "#T", StockProperty.STOCKCODE,
                 "#TNEW").execute(testStockList,testCli,testStorage);
         assertEquals(expected,output);
@@ -60,10 +57,7 @@ void testExecuteEditStockQuantity_Success() throws BadInputException {
                 + "stockcode: #T\n"
                 + "quantity: 5000\n"
                 + "description: Test\n"
-                + "minimum: 0\n"
-                + "lost: 0\n"
-                + "loaned: 0\n"
-                + "available: 5000";
+                + "minimum: 0";
         String output = new EditStockCommand(CommandType.EDIT, "#T", StockProperty.QUANTITY,
                 "5000").execute(testStockList,testCli,testStorage);
         assertEquals(expected,output);
@@ -78,10 +72,7 @@ void testExecuteEditStockDescription_Success() throws BadInputException {
                 + "stockcode: #T\n"
                 + "quantity: 100\n"
                 + "description: Test NEW\n"
-                + "minimum: 0\n"
-                + "lost: 0\n"
-                + "loaned: 0\n"
-                + "available: 100";
+                + "minimum: 0";
         String output = new EditStockCommand(CommandType.EDIT, "#T", StockProperty.DESCRIPTION,
                 "Test NEW").execute(testStockList,testCli,testStorage);
         assertEquals(expected,output);

src/test/java/eggventory/logic/parsers/ParseEditTest.java

@@ -44,5 +44,16 @@ public void testParseEdit_BadFirstInput_ThrowsBadInputException() {
         assertDoesNotThrow(() -> testParser.parse("stocktype arg1 arg2"));
         assertThrows(BadInputException.class, () -> testParser.parse("sommething arg1 arg2"));
     }
+
+    //@@author cyanoei
+    @Test
+    public void testParseEdit_NegativeQuantity_ThrowsBadInputException() {
+        assertDoesNotThrow(() -> testParser.parse("stock test quantity 1"));
+        assertThrows(BadInputException.class, () -> testParser.parse("stock test quantity -1"));
+
+        assertDoesNotThrow(() -> testParser.parse("stock test minimum 1"));
+        assertThrows(BadInputException.class, () -> testParser.parse("stock test minimum -1"));
+    }
+
     //@@author
 }

src/test/java/eggventory/logic/parsers/ParserTest.java

@@ -70,6 +70,31 @@ public void checkIsIntegerOutput_StringInput_MessageOutput() {
 
     }
 
+    @Test
+    public void testIfNotNegative_NonNegativeInput_DoesNotThrow() {
+        assertDoesNotThrow(() -> Parser.isNotNegative(0, "test"));
+        assertDoesNotThrow(() -> Parser.isNotNegative(100, "test"));
+    }
+
+    @Test
+    public void testIfNotNegative_NegativeInput_ThrowsBadInputException() {
+        assertDoesNotThrow(() -> Parser.isNotNegative(100, "test"));
+        assertThrows(BadInputException.class,() -> Parser.isNotNegative(-1, "test"));
+    }
+
+    @Test
+    public void testIfNotZero_NonZero_DoesNotThrow() {
+        assertDoesNotThrow(() -> Parser.isNotZero(-1, "test"));
+        assertDoesNotThrow(() -> Parser.isNotZero(1, "test"));
+    }
+
+    @Test
+    public void testIfNotZero_IsZero_ThrowsBadInputException() {
+        assertDoesNotThrow(() -> Parser.isNotZero(100, "test"));
+        assertThrows(BadInputException.class, () -> Parser.isNotZero(0, "test"));
+    }
+
+
     @Test
     public void checkReservedInput_InputNotReserved_ReturnsFalse() {
         String[] testInputs = {"Rishab", "Raghav", "Rebecca", "Dana", "Yanbo", "Resistor", "Arduino", "Eggventory"};

src/test/java/eggventory/model/LoanListTest.java

@@ -0,0 +1,42 @@
+package eggventory.model;
+
+import eggventory.model.loans.Loan;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class LoanListTest {
+
+    private String stockCode = "R5";
+    private String matric = "A1";
+
+    Loan loan = new Loan(matric, stockCode, 10);
+
+    @Test
+    void testDeleteLoan_LoanExists_ReturnTrue() {
+        LoanList.addLoan("A1", "R5", 10);
+        Assertions.assertTrue(LoanList.deleteLoan("A1", "R5"));
+    }
+
+    @Test
+    void testDeleteLoan_LoanDoesNotExist_ReturnFalse() {
+        LoanList.addLoan("A1", "R5", 10);
+        Assertions.assertFalse(LoanList.deleteLoan("A2", "R5"));
+
+        Assertions.assertFalse(LoanList.deleteLoan("A1", "R1"));
+
+        Assertions.assertFalse(LoanList.deleteLoan("a2", "r5"));
+    }
+
+    @Test
+    void getStockLoanedQuantity_StockDoesNotExist_ReturnZero() {
+        Assertions.assertEquals(0, LoanList.getStockLoanedQuantity("not stockcode"));
+        Assertions.assertEquals(0, LoanList.getStockLoanedQuantity(""));
+    }
+
+    @Test
+    void getStockLoanedQuantity_StockExists_ReturnQuantity() {
+        Assertions.assertEquals(0, LoanList.getStockLoanedQuantity("abc"));
+        LoanList.addLoan("A1", "abc", 100);
+        Assertions.assertEquals(100, LoanList.getStockLoanedQuantity("abc"));
+    }
+}