fix checkstyle

AY2021S1-CS2103T-T12-1 · Oct 15, 2020 · 8daa9e6 · 8daa9e6
1 parent 2d0ad71
commit 8daa9e6
Show file tree

Hide file tree

Showing 17 changed files with 55 additions and 54 deletions.
diff --git a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java
@@ -2,7 +2,15 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static seedu.address.logic.parser.CliSyntax.*;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_MAX_QUANTITY;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_METRIC;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_ORDER;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_QUANTITY;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_SUPPLIER;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_TAG;
 import static seedu.address.testutil.Assert.assertThrows;
 
 import java.util.ArrayList;

diff --git a/src/test/java/seedu/address/logic/commands/deliverycommand/DeliveryFindCommandTest.java b/src/test/java/seedu/address/logic/commands/deliverycommand/DeliveryFindCommandTest.java
@@ -1,7 +1,21 @@
 package seedu.address.logic.commands.deliverycommand;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static seedu.address.commons.core.Messages.MESSAGE_DELIVERIES_LISTED_OVERVIEW;
+import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
+import static seedu.address.testutil.TypicalDeliveries.getTypicalDeliveryBook;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+
 import seedu.address.logic.parser.Prefix;
 import seedu.address.model.UserPrefs;
 import seedu.address.model.delivery.Delivery;
@@ -10,18 +24,17 @@
 import seedu.address.model.deliverymodel.DeliveryModelManager;
 import seedu.address.testutil.DeliveryBuilder;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static seedu.address.commons.core.Messages.MESSAGE_DELIVERIES_LISTED_OVERVIEW;
-import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
-import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
-import static seedu.address.testutil.TypicalDeliveries.getTypicalDeliveryBook;
-
 class DeliveryFindCommandTest {
+    private static final Delivery KELVIN = new DeliveryBuilder().withName("Kelvin")
+            .withPhone("91234332")
+            .withAddress("Clementi Blk 235 #11-111")
+            .withOrder("Char Kway Teow")
+            .build();
+    private static final Delivery MARCUS = new DeliveryBuilder().withName("Marcus")
+            .withPhone("8198264")
+            .withAddress("Jurong Blk 231 #15-123")
+            .withOrder("Seafood Hor Fun x5")
+            .build();
     private DeliveryModel deliveryModel = new DeliveryModelManager(getTypicalDeliveryBook(), new UserPrefs());
     private DeliveryModel expectedDeliveryModel =
             new DeliveryModelManager(getTypicalDeliveryBook(), new UserPrefs());
@@ -30,16 +43,6 @@ class DeliveryFindCommandTest {
 
     @BeforeEach
     public void setUp() {
-        Delivery KELVIN = new DeliveryBuilder().withName("Kelvin")
-                .withPhone("91234332")
-                .withAddress("Clementi Blk 235 #11-111")
-                .withOrder("Char Kway Teow")
-                .build();
-        Delivery MARCUS = new DeliveryBuilder().withName("Marcus")
-                .withPhone("8198264")
-                .withAddress("Jurong Blk 231 #15-123")
-                .withOrder("Seafood Hor Fun x5")
-                .build();
         testModel = new DeliveryModelManager();
         expectedTestModel = new DeliveryModelManager();
         testModel.addDelivery(KELVIN);
@@ -114,4 +117,4 @@ private void executeTest(int numItemsMatched, String userInput, Prefix searchPre
         assertCommandSuccess(command, actualModel, expectedMessage, expectedModel);
         assertEquals(expectedFilteredDeliveries, actualModel.getFilteredDeliveryList());
     }
-}
+}
diff --git a/src/test/java/seedu/address/logic/commands/deliverycommand/DeliveryListCommandTest.java b/src/test/java/seedu/address/logic/commands/deliverycommand/DeliveryListCommandTest.java
@@ -6,13 +6,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import seedu.address.logic.commands.deliverycommand.DeliveryListCommand;
 import seedu.address.model.UserPrefs;
 import seedu.address.model.deliverymodel.DeliveryModel;
 import seedu.address.model.deliverymodel.DeliveryModelManager;
 
-
-
 /**
  * Contains integration tests (interaction with the Model) and unit tests for DeliveryListCommand.
  */

diff --git a/src/test/java/seedu/address/logic/commands/itemcommand/EditItemDescriptorTest.java b/src/test/java/seedu/address/logic/commands/itemcommand/EditItemDescriptorTest.java
@@ -11,7 +11,6 @@
 
 import org.junit.jupiter.api.Test;
 
-import seedu.address.logic.commands.itemcommand.ItemEditCommand;
 import seedu.address.logic.commands.itemcommand.ItemEditCommand.EditItemDescriptor;
 import seedu.address.testutil.EditItemDescriptorBuilder;
 

diff --git a/src/test/java/seedu/address/logic/commands/itemcommand/ItemAddCommandIntegrationTest.java b/src/test/java/seedu/address/logic/commands/itemcommand/ItemAddCommandIntegrationTest.java
@@ -6,7 +6,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import seedu.address.logic.commands.itemcommand.ItemAddCommand;
 import seedu.address.model.UserPrefs;
 import seedu.address.model.inventorymodel.InventoryModel;
 import seedu.address.model.inventorymodel.InventoryModelManager;

diff --git a/src/test/java/seedu/address/logic/commands/itemcommand/ItemAddCommandTest.java b/src/test/java/seedu/address/logic/commands/itemcommand/ItemAddCommandTest.java
@@ -18,7 +18,6 @@
 import javafx.collections.ObservableList;
 import seedu.address.commons.core.GuiSettings;
 import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.logic.commands.itemcommand.ItemAddCommand;
 import seedu.address.logic.commands.results.CommandResult;
 import seedu.address.model.ReadOnlyUserPrefs;
 import seedu.address.model.delivery.Delivery;

diff --git a/src/test/java/seedu/address/logic/commands/itemcommand/ItemClearCommandTest.java b/src/test/java/seedu/address/logic/commands/itemcommand/ItemClearCommandTest.java
@@ -5,7 +5,6 @@
 
 import org.junit.jupiter.api.Test;
 
-import seedu.address.logic.commands.itemcommand.ItemClearCommand;
 import seedu.address.model.UserPrefs;
 import seedu.address.model.inventorymodel.InventoryBook;
 import seedu.address.model.inventorymodel.InventoryModel;

diff --git a/src/test/java/seedu/address/logic/commands/itemcommand/ItemDeleteCommandTest.java b/src/test/java/seedu/address/logic/commands/itemcommand/ItemDeleteCommandTest.java
@@ -13,7 +13,6 @@
 
 import seedu.address.commons.core.Messages;
 import seedu.address.commons.core.index.Index;
-import seedu.address.logic.commands.itemcommand.ItemDeleteCommand;
 import seedu.address.model.UserPrefs;
 import seedu.address.model.inventorymodel.InventoryModel;
 import seedu.address.model.inventorymodel.InventoryModelManager;

diff --git a/src/test/java/seedu/address/logic/commands/itemcommand/ItemEditCommandTest.java b/src/test/java/seedu/address/logic/commands/itemcommand/ItemEditCommandTest.java
@@ -19,8 +19,6 @@
 
 import seedu.address.commons.core.Messages;
 import seedu.address.commons.core.index.Index;
-import seedu.address.logic.commands.itemcommand.ItemClearCommand;
-import seedu.address.logic.commands.itemcommand.ItemEditCommand;
 import seedu.address.model.UserPrefs;
 import seedu.address.model.inventorymodel.InventoryBook;
 import seedu.address.model.inventorymodel.InventoryModel;

diff --git a/src/test/java/seedu/address/logic/commands/itemcommand/ItemFindCommandTest.java b/src/test/java/seedu/address/logic/commands/itemcommand/ItemFindCommandTest.java
@@ -13,7 +13,6 @@
 
 import org.junit.jupiter.api.Test;
 
-import seedu.address.logic.commands.itemcommand.ItemFindCommand;
 import seedu.address.model.UserPrefs;
 import seedu.address.model.inventorymodel.InventoryModel;
 import seedu.address.model.inventorymodel.InventoryModelManager;

diff --git a/src/test/java/seedu/address/logic/commands/itemcommand/ItemListCommandTest.java b/src/test/java/seedu/address/logic/commands/itemcommand/ItemListCommandTest.java
@@ -8,7 +8,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import seedu.address.logic.commands.itemcommand.ItemListCommand;
 import seedu.address.model.UserPrefs;
 import seedu.address.model.inventorymodel.InventoryModel;
 import seedu.address.model.inventorymodel.InventoryModelManager;

diff --git a/src/test/java/seedu/address/logic/commands/itemcommand/ItemRemoveCommandTest.java b/src/test/java/seedu/address/logic/commands/itemcommand/ItemRemoveCommandTest.java
@@ -11,8 +11,6 @@
 import org.junit.jupiter.api.Test;
 
 import seedu.address.logic.commands.exceptions.CommandException;
-import seedu.address.logic.commands.itemcommand.ItemAddCommand;
-import seedu.address.logic.commands.itemcommand.ItemRemoveCommand;
 import seedu.address.logic.commands.results.CommandResult;
 import seedu.address.model.UserPrefs;
 import seedu.address.model.inventorymodel.InventoryModel;

diff --git a/src/test/java/seedu/address/logic/parser/deliveryparser/DeliveryFindCommandParserTest.java b/src/test/java/seedu/address/logic/parser/deliveryparser/DeliveryFindCommandParserTest.java
@@ -1,21 +1,29 @@
 package seedu.address.logic.parser.deliveryparser;
 
-import org.junit.jupiter.api.Test;
-import seedu.address.logic.commands.deliverycommand.DeliveryFindCommand;
-import seedu.address.logic.commands.itemcommand.ItemFindCommand;
-import seedu.address.logic.parser.itemparser.ItemFindCommandParser;
-import seedu.address.model.delivery.DeliveryContainsKeywordsPredicate;
-import seedu.address.model.item.ItemContainsKeywordsPredicate;
-
-import java.util.Arrays;
-
-import static org.junit.jupiter.api.Assertions.*;
 import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
-import static seedu.address.logic.commands.CommandTestUtil.*;
-import static seedu.address.logic.parser.CliSyntax.*;
+import static seedu.address.logic.commands.CommandTestUtil.ADDRESS_DESC_DAMITH;
+import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_DAMITH;
+import static seedu.address.logic.commands.CommandTestUtil.ORDER_DESC_DAMITH;
+import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_DAMITH;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_ADDRESS_DAMITH;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_AARON;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_NAME_DAMITH;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_ORDER_DAMITH;
+import static seedu.address.logic.commands.CommandTestUtil.VALID_PHONE_DAMITH;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_ADDRESS;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_NAME;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_ORDER;
+import static seedu.address.logic.parser.CliSyntax.PREFIX_PHONE;
 import static seedu.address.logic.parser.CommandParserTestUtil.assertParseFailure;
 import static seedu.address.logic.parser.CommandParserTestUtil.assertParseSuccess;
 
+import java.util.Arrays;
+
+import org.junit.jupiter.api.Test;
+
+import seedu.address.logic.commands.deliverycommand.DeliveryFindCommand;
+import seedu.address.model.delivery.DeliveryContainsKeywordsPredicate;
+
 class DeliveryFindCommandParserTest {
 
     private DeliveryFindCommandParser parser = new DeliveryFindCommandParser();
@@ -57,4 +65,4 @@ public void parse_validPhoneArgs_returnsFindCommand() {
                 Arrays.asList(VALID_PHONE_DAMITH), PREFIX_PHONE));
         assertParseSuccess(parser, PHONE_DESC_DAMITH, expectedFindCommand);
     }
-}
+}
diff --git a/src/test/java/seedu/address/logic/parser/itemparser/ItemAddCommandParserTest.java b/src/test/java/seedu/address/logic/parser/itemparser/ItemAddCommandParserTest.java
@@ -33,7 +33,6 @@
 import org.junit.jupiter.api.Test;
 
 import seedu.address.logic.commands.itemcommand.ItemAddCommand;
-import seedu.address.logic.parser.itemparser.ItemAddCommandParser;
 import seedu.address.model.item.Item;
 import seedu.address.model.item.Name;
 import seedu.address.model.item.Quantity;

diff --git a/src/test/java/seedu/address/logic/parser/itemparser/ItemDeleteCommandParserTest.java b/src/test/java/seedu/address/logic/parser/itemparser/ItemDeleteCommandParserTest.java
@@ -8,7 +8,6 @@
 import org.junit.jupiter.api.Test;
 
 import seedu.address.logic.commands.itemcommand.ItemDeleteCommand;
-import seedu.address.logic.parser.itemparser.ItemDeleteCommandParser;
 
 /**
  * As we are only doing white-box testing, our test cases do not cover path variations

diff --git a/src/test/java/seedu/address/logic/parser/itemparser/ItemEditCommandParserTest.java b/src/test/java/seedu/address/logic/parser/itemparser/ItemEditCommandParserTest.java
@@ -31,7 +31,6 @@
 import seedu.address.commons.core.index.Index;
 import seedu.address.logic.commands.itemcommand.ItemEditCommand;
 import seedu.address.logic.commands.itemcommand.ItemEditCommand.EditItemDescriptor;
-import seedu.address.logic.parser.itemparser.ItemEditCommandParser;
 import seedu.address.model.item.Name;
 import seedu.address.model.item.Quantity;
 import seedu.address.model.item.Supplier;

diff --git a/src/test/java/seedu/address/logic/parser/itemparser/ItemFindCommandParserTest.java b/src/test/java/seedu/address/logic/parser/itemparser/ItemFindCommandParserTest.java
@@ -12,7 +12,6 @@
 import org.junit.jupiter.api.Test;
 
 import seedu.address.logic.commands.itemcommand.ItemFindCommand;
-import seedu.address.logic.parser.itemparser.ItemFindCommandParser;
 import seedu.address.model.item.ItemContainsKeywordsPredicate;
 
 public class ItemFindCommandParserTest {