From b8768c4e1fb7466c788f874fc1181d310e730039 Mon Sep 17 00:00:00 2001 From: JD Singer Date: Mon, 1 Aug 2022 19:29:05 -0400 Subject: [PATCH 1/9] added testing frame work to POM --- .idea/compiler.xml | 1 + .idea/jarRepositories.xml | 20 ++++++++++++++++++++ pom.xml | 20 ++++++++++++++++++++ 3 files changed, 41 insertions(+) create mode 100644 .idea/jarRepositories.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 7a4bf35..4f08829 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -6,6 +6,7 @@ + diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..712ab9d --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 43c1af2..fbdd66e 100644 --- a/pom.xml +++ b/pom.xml @@ -7,6 +7,26 @@ io.zipcodewilmington ProductInventoryLab 1.0-SNAPSHOT + + + org.junit.jupiter + junit-jupiter-engine + 5.4.2 + test + + + org.junit.jupiter + junit-jupiter-api + 5.4.2 + test + + + org.junit.jupiter + junit-jupiter + RELEASE + test + + From cecf2901bd9d900cf3c2ec66c232d1fa0c7ea39d Mon Sep 17 00:00:00 2001 From: JD Singer Date: Mon, 1 Aug 2022 19:50:09 -0400 Subject: [PATCH 2/9] added classes and tests package --- src/main/java/models/HockeySkates.java | 4 ++++ src/main/java/models/HockeyStick.java | 4 ++++ src/main/java/services/HockeySkateService.java | 4 ++++ src/main/java/services/HockeyStickService.java | 4 ++++ src/test/java/models/HockeySkatesTests.java | 4 ++++ src/test/java/models/HockeyStickTests.java | 4 ++++ src/test/java/services/HockeySkatesServiceTest.java | 4 ++++ src/test/java/services/HockeyStcikServiceTest.java | 4 ++++ 8 files changed, 32 insertions(+) create mode 100644 src/main/java/models/HockeySkates.java create mode 100644 src/main/java/models/HockeyStick.java create mode 100644 src/main/java/services/HockeySkateService.java create mode 100644 src/main/java/services/HockeyStickService.java create mode 100644 src/test/java/models/HockeySkatesTests.java create mode 100644 src/test/java/models/HockeyStickTests.java create mode 100644 src/test/java/services/HockeySkatesServiceTest.java create mode 100644 src/test/java/services/HockeyStcikServiceTest.java diff --git a/src/main/java/models/HockeySkates.java b/src/main/java/models/HockeySkates.java new file mode 100644 index 0000000..8cad82c --- /dev/null +++ b/src/main/java/models/HockeySkates.java @@ -0,0 +1,4 @@ +package models; + +public class HockeySkates { +} diff --git a/src/main/java/models/HockeyStick.java b/src/main/java/models/HockeyStick.java new file mode 100644 index 0000000..6ab776c --- /dev/null +++ b/src/main/java/models/HockeyStick.java @@ -0,0 +1,4 @@ +package models; + +public class HockeyStick { +} diff --git a/src/main/java/services/HockeySkateService.java b/src/main/java/services/HockeySkateService.java new file mode 100644 index 0000000..ff1ca14 --- /dev/null +++ b/src/main/java/services/HockeySkateService.java @@ -0,0 +1,4 @@ +package services; + +public class HockeySkateService { +} diff --git a/src/main/java/services/HockeyStickService.java b/src/main/java/services/HockeyStickService.java new file mode 100644 index 0000000..ecace8d --- /dev/null +++ b/src/main/java/services/HockeyStickService.java @@ -0,0 +1,4 @@ +package services; + +public class HockeyStickService { +} diff --git a/src/test/java/models/HockeySkatesTests.java b/src/test/java/models/HockeySkatesTests.java new file mode 100644 index 0000000..ce4e02b --- /dev/null +++ b/src/test/java/models/HockeySkatesTests.java @@ -0,0 +1,4 @@ +package models; + +public class HockeySkatesTests { +} diff --git a/src/test/java/models/HockeyStickTests.java b/src/test/java/models/HockeyStickTests.java new file mode 100644 index 0000000..0b264f7 --- /dev/null +++ b/src/test/java/models/HockeyStickTests.java @@ -0,0 +1,4 @@ +package models; + +public class HockeyStickTests { +} diff --git a/src/test/java/services/HockeySkatesServiceTest.java b/src/test/java/services/HockeySkatesServiceTest.java new file mode 100644 index 0000000..888f835 --- /dev/null +++ b/src/test/java/services/HockeySkatesServiceTest.java @@ -0,0 +1,4 @@ +package services; + +public class HockeySkatesServiceTest { +} diff --git a/src/test/java/services/HockeyStcikServiceTest.java b/src/test/java/services/HockeyStcikServiceTest.java new file mode 100644 index 0000000..8bb0340 --- /dev/null +++ b/src/test/java/services/HockeyStcikServiceTest.java @@ -0,0 +1,4 @@ +package services; + +public class HockeyStcikServiceTest { +} From ac300fa809783e9897ef35734c1c71f2d021ba6e Mon Sep 17 00:00:00 2001 From: JD Singer Date: Mon, 1 Aug 2022 20:17:33 -0400 Subject: [PATCH 3/9] started into tests --- src/main/java/models/HockeyStick.java | 69 ++++++++++++++++++++++ src/test/java/models/HockeyStickTests.java | 31 ++++++++++ 2 files changed, 100 insertions(+) diff --git a/src/main/java/models/HockeyStick.java b/src/main/java/models/HockeyStick.java index 6ab776c..bbbc674 100644 --- a/src/main/java/models/HockeyStick.java +++ b/src/main/java/models/HockeyStick.java @@ -1,4 +1,73 @@ package models; public class HockeyStick { + + private Integer id; + private String name; + private String brand; + private Integer size; + private Integer qty; + private Double price; + + public HockeyStick(){ + + } + + public HockeyStick(Integer id, String name, String brand, Integer size, Integer qty, Double price) { + this.id = id; + this.name = name; + this.brand = brand; + this.size = size; + this.qty = qty; + this.price = price; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getBrand() { + return brand; + } + + public void setBrand(String brand) { + this.brand = brand; + } + + public Integer getSize() { + return size; + } + + public void setSize(Integer size) { + this.size = size; + } + + public Integer getQty() { + return qty; + } + + public void setQty(Integer qty) { + this.qty = qty; + } + + public Double getPrice() { + return price; + } + + public void setPrice(Double price) { + this.price = price; + } + } diff --git a/src/test/java/models/HockeyStickTests.java b/src/test/java/models/HockeyStickTests.java index 0b264f7..628df46 100644 --- a/src/test/java/models/HockeyStickTests.java +++ b/src/test/java/models/HockeyStickTests.java @@ -1,4 +1,35 @@ package models; +import com.sun.xml.internal.ws.policy.AssertionSet; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + public class HockeyStickTests { + + private HockeyStick stick; + + @BeforeEach + public void setup(){ + stick = new HockeyStick(); + } + + @Test + public void HockeyStickNameTest(){ + //given + String expectedName = "bauer"; + + //when + stick.setName(expectedName); + String actualName = stick.getName(); + + + //then + + Assertions.assertEquals(expectedName, actualName); + + + } + } From 3bb1f3daf987d09e7944efeab372cbb4ec59b81e Mon Sep 17 00:00:00 2001 From: JD Singer Date: Mon, 1 Aug 2022 21:18:16 -0400 Subject: [PATCH 4/9] hockey stick tests are done and functioning --- src/test/java/models/HockeyStickTests.java | 55 ++++++++++++++++++++-- 1 file changed, 51 insertions(+), 4 deletions(-) diff --git a/src/test/java/models/HockeyStickTests.java b/src/test/java/models/HockeyStickTests.java index 628df46..06660a2 100644 --- a/src/test/java/models/HockeyStickTests.java +++ b/src/test/java/models/HockeyStickTests.java @@ -18,18 +18,65 @@ public void setup(){ @Test public void HockeyStickNameTest(){ //given - String expectedName = "bauer"; - + String expectedName = "rbz"; //when stick.setName(expectedName); String actualName = stick.getName(); + //then + Assertions.assertEquals(expectedName, actualName); + } + @Test + public void HockeyStickBrand(){ + String expectedBrand = "CCM"; - //then + stick.setBrand(expectedBrand); + String actualBrand = stick.getBrand(); - Assertions.assertEquals(expectedName, actualName); + Assertions.assertEquals(expectedBrand, actualBrand); + } + + @Test + public void HockeyStickSize(){ + Integer expectedSize = 64; + + stick.setSize(expectedSize); + Integer actualSize = stick.getSize(); + + Assertions.assertEquals(expectedSize,actualSize); + } + + @Test + public void HockeyStickQuantity(){ + Integer expectedQty = 3; + + stick.setQty(expectedQty); + Integer actualQty = stick.getQty(); + + Assertions.assertEquals(expectedQty,actualQty); + } + + @Test + public void HockeyStickPrice(){ + Double expectedPrice = 170.00; + + stick.setPrice(expectedPrice); + Double actualPrice = stick.getPrice(); + Assertions.assertEquals(expectedPrice,actualPrice); + } + + @Test + public void HockeyStickId(){ + Integer expectedId = 2424; + + stick.setId(expectedId); + Integer actualId = stick.getId(); + + Assertions.assertEquals(expectedId,actualId); } + + } From f3659f138a90f234fb9b6019bad620c57d8d841b Mon Sep 17 00:00:00 2001 From: JD Singer Date: Mon, 1 Aug 2022 23:24:28 -0400 Subject: [PATCH 5/9] on the services class/tests --- src/main/java/models/HockeySkates.java | 65 +++++++++++++ .../java/services/HockeyStickService.java | 21 ++++ src/test/java/models/HockeySkatesTests.java | 96 +++++++++++++++++++ src/test/java/models/HockeyStickTests.java | 28 +++++- .../java/services/HockeyStcikServiceTest.java | 4 - .../java/services/HockeyStickServiceTest.java | 25 +++++ 6 files changed, 233 insertions(+), 6 deletions(-) delete mode 100644 src/test/java/services/HockeyStcikServiceTest.java create mode 100644 src/test/java/services/HockeyStickServiceTest.java diff --git a/src/main/java/models/HockeySkates.java b/src/main/java/models/HockeySkates.java index 8cad82c..d25b441 100644 --- a/src/main/java/models/HockeySkates.java +++ b/src/main/java/models/HockeySkates.java @@ -1,4 +1,69 @@ package models; public class HockeySkates { + + private Integer id; + private String name; + private String brand; + private Integer size; + private Integer qty; + private Double price; + + + public HockeySkates(){ + } + + public HockeySkates(Integer id, String name, String brand, Integer size, Integer qty, Double price){ + + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getBrand() { + return brand; + } + + public void setBrand(String brand) { + this.brand = brand; + } + + public Integer getSize() { + return size; + } + + public void setSize(Integer size) { + this.size = size; + } + + public Integer getQty() { + return qty; + } + + public void setQty(Integer qty) { + this.qty = qty; + } + + public Double getPrice() { + return price; + } + + public void setPrice(Double price) { + this.price = price; + } + + } diff --git a/src/main/java/services/HockeyStickService.java b/src/main/java/services/HockeyStickService.java index ecace8d..af50729 100644 --- a/src/main/java/services/HockeyStickService.java +++ b/src/main/java/services/HockeyStickService.java @@ -1,4 +1,25 @@ package services; +import models.HockeyStick; + +import java.util.ArrayList; + public class HockeyStickService { + + private static int nextId = 1; + + private ArrayList inventory = new ArrayList(); + + public HockeyStick create(String name, String brand, Integer size, Integer qty, Integer price){ + + HockeyStick createdStick = new HockeyStick(nextId++, name, size, qty, price); + + inventory.add(createdStick); + + return createdStick; + } + + + + } diff --git a/src/test/java/models/HockeySkatesTests.java b/src/test/java/models/HockeySkatesTests.java index ce4e02b..9e725d1 100644 --- a/src/test/java/models/HockeySkatesTests.java +++ b/src/test/java/models/HockeySkatesTests.java @@ -1,4 +1,100 @@ package models; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + public class HockeySkatesTests { + + private HockeySkates skate; + + @BeforeEach + public void setup() {skate = new HockeySkates();} + + @Test + public void HockeySkateName(){ + //given + String expectedSkateName = "vapor"; + + //when + skate.setName(expectedSkateName); + String actualSkateName = skate.getName(); + //then + Assertions.assertEquals(expectedSkateName,actualSkateName); + } + + @Test + public void HockeySkateSize(){ + Integer expectedSkateSize = 13; + + skate.setSize(expectedSkateSize); + Integer actualSkateSize = skate.getSize(); + + Assertions.assertEquals(expectedSkateSize,actualSkateSize); + } + + @Test + public void HockeySkateBrand(){ + String expectedSkateBrand = "Bauer"; + + skate.setBrand(expectedSkateBrand); + String actualSkateBrand = skate.getBrand(); + + Assertions.assertEquals(expectedSkateBrand,actualSkateBrand); + } + + @Test + public void HockeySkateQuantity(){ + Integer expectedQty = 2; + + skate.setQty(expectedQty); + Integer actualSkateQty = skate.getQty(); + + Assertions.assertEquals(expectedQty,actualSkateQty); + } + + @Test + public void HockeySkatePrice(){ + Double expectedPrice = 350.00; + + skate.setPrice(expectedPrice); + Double actualPrice = skate.getPrice(); + + Assertions.assertEquals(expectedPrice,actualPrice); + } + @Test + public void HockeyStickId(){ + Integer expectedId = 8899; + + skate.setId(expectedId); + Integer actualId = skate.getId(); + + Assertions.assertEquals(expectedId,actualId); + } + + @Test + public void HockeySkateConstructor(){ + + Integer expectedId = 8899; + String expectedName = "vapor"; + String expectedBrand = "Bauer"; + Integer expectedSize = 13; + Integer expectedQty = 2; + Double expectedPrice = 350.00; + + HockeyStick testHockeyStick = new HockeyStick(expectedId,expectedName,expectedBrand,expectedSize,expectedQty,expectedPrice); + + Assertions.assertEquals(expectedId, testHockeyStick.getId()); + Assertions.assertEquals(expectedName, testHockeyStick.getName()); + Assertions.assertEquals(expectedBrand, testHockeyStick.getBrand()); + Assertions.assertEquals(expectedSize,testHockeyStick.getSize()); + Assertions.assertEquals(expectedQty,testHockeyStick.getQty()); + Assertions.assertEquals(expectedPrice,testHockeyStick.getPrice()); + + } + + + + + } diff --git a/src/test/java/models/HockeyStickTests.java b/src/test/java/models/HockeyStickTests.java index 06660a2..6d293a1 100644 --- a/src/test/java/models/HockeyStickTests.java +++ b/src/test/java/models/HockeyStickTests.java @@ -74,9 +74,33 @@ public void HockeyStickId(){ Integer actualId = stick.getId(); Assertions.assertEquals(expectedId,actualId); - } + @Test + public void HockeyStickConstructor(){ + + Integer expectedId = 9876; + String expectedName = "covert"; + String expectedBrand = "Warrior"; + Integer expectedSize = 59; + Integer expectedQty = 3; + Double expectedPrice = 120.00; + + HockeyStick testHockeyStick = new HockeyStick(expectedId,expectedName,expectedBrand,expectedSize,expectedQty,expectedPrice); + + Assertions.assertEquals(expectedId, testHockeyStick.getId()); + Assertions.assertEquals(expectedName, testHockeyStick.getName()); + Assertions.assertEquals(expectedBrand, testHockeyStick.getBrand()); + Assertions.assertEquals(expectedSize,testHockeyStick.getSize()); + Assertions.assertEquals(expectedQty,testHockeyStick.getQty()); + Assertions.assertEquals(expectedPrice,testHockeyStick.getPrice()); + + } -} + + + + + } + diff --git a/src/test/java/services/HockeyStcikServiceTest.java b/src/test/java/services/HockeyStcikServiceTest.java deleted file mode 100644 index 8bb0340..0000000 --- a/src/test/java/services/HockeyStcikServiceTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package services; - -public class HockeyStcikServiceTest { -} diff --git a/src/test/java/services/HockeyStickServiceTest.java b/src/test/java/services/HockeyStickServiceTest.java new file mode 100644 index 0000000..0b85c2e --- /dev/null +++ b/src/test/java/services/HockeyStickServiceTest.java @@ -0,0 +1,25 @@ +package services; + +import models.HockeyStick; +import org.junit.jupiter.api.Test; + +public class HockeyStickServiceTest { + + @Test + public void createTest(){ + String expectedName = "Tacks"; + String expectedBrand = "CCM"; + Integer expectedSize = 13; + Integer expectedQty = 5; + Double expectedPrice = 499.00; + + + HockeyStickService stickService = new HockeyStickService(); + HockeyStick testHockeyStick = HockeyStickService. + + + + + + } +} From 778b56f6d6bb43304a3e7b58be6b7c5d2dd43f52 Mon Sep 17 00:00:00 2001 From: JD Singer Date: Tue, 2 Aug 2022 19:00:20 -0400 Subject: [PATCH 6/9] finished service class ready to add tests --- src/main/java/models/HockeySkates.java | 1 + src/main/java/models/HockeyStick.java | 1 - .../java/services/HockeyStickService.java | 30 +++++++++++++++++-- .../java/services/HockeyStickServiceTest.java | 23 +++++++++++++- 4 files changed, 50 insertions(+), 5 deletions(-) diff --git a/src/main/java/models/HockeySkates.java b/src/main/java/models/HockeySkates.java index d25b441..167536e 100644 --- a/src/main/java/models/HockeySkates.java +++ b/src/main/java/models/HockeySkates.java @@ -17,6 +17,7 @@ public HockeySkates(Integer id, String name, String brand, Integer size, Integer } + public Integer getId() { return id; } diff --git a/src/main/java/models/HockeyStick.java b/src/main/java/models/HockeyStick.java index bbbc674..b141008 100644 --- a/src/main/java/models/HockeyStick.java +++ b/src/main/java/models/HockeyStick.java @@ -10,7 +10,6 @@ public class HockeyStick { private Double price; public HockeyStick(){ - } public HockeyStick(Integer id, String name, String brand, Integer size, Integer qty, Double price) { diff --git a/src/main/java/services/HockeyStickService.java b/src/main/java/services/HockeyStickService.java index af50729..769c4be 100644 --- a/src/main/java/services/HockeyStickService.java +++ b/src/main/java/services/HockeyStickService.java @@ -8,17 +8,41 @@ public class HockeyStickService { private static int nextId = 1; - private ArrayList inventory = new ArrayList(); + private static ArrayList inventory = new ArrayList(); - public HockeyStick create(String name, String brand, Integer size, Integer qty, Integer price){ + public static HockeyStick create(String name, String brand, Integer size, Integer qty, Double price){ - HockeyStick createdStick = new HockeyStick(nextId++, name, size, qty, price); + HockeyStick createdStick = new HockeyStick(nextId++, name, brand, size, qty, price); inventory.add(createdStick); return createdStick; } + public HockeyStick findHockeyStick(Integer id) { + for (int i = 0; i < inventory.size(); i++) { + if (inventory.get(i).equals(id)) { + return inventory.get(i); + } else { + return null; + } + } + return null; + } + + + public HockeyStick[] findAll(){ + return (HockeyStick[]) inventory.toArray(); + + } + + public boolean delete(Integer id){ + return inventory.remove(findHockeyStick(id)); + + } + + + diff --git a/src/test/java/services/HockeyStickServiceTest.java b/src/test/java/services/HockeyStickServiceTest.java index 0b85c2e..1b9ba73 100644 --- a/src/test/java/services/HockeyStickServiceTest.java +++ b/src/test/java/services/HockeyStickServiceTest.java @@ -1,6 +1,7 @@ package services; import models.HockeyStick; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; public class HockeyStickServiceTest { @@ -15,7 +16,27 @@ public void createTest(){ HockeyStickService stickService = new HockeyStickService(); - HockeyStick testHockeyStick = HockeyStickService. + HockeyStick testHockeyStick = HockeyStickService.create(expectedName,expectedBrand,expectedSize,expectedQty,expectedPrice); + + String actualName = testHockeyStick.getName(); + String actualBrand = testHockeyStick.getBrand(); + Integer actualSize = testHockeyStick.getSize(); + Integer actualQty = testHockeyStick.getQty(); + Double actualPrice = testHockeyStick.getPrice(); + + + Assertions.assertEquals(expectedName, actualName); + Assertions.assertEquals(expectedBrand, actualBrand); + Assertions.assertEquals(expectedSize, actualSize); + Assertions.assertEquals(expectedQty, actualQty); + Assertions.assertEquals(expectedPrice, actualPrice); + + + + + + + From b71b7869549487b6762d5add3b3d720fa18273ab Mon Sep 17 00:00:00 2001 From: JD Singer Date: Wed, 3 Aug 2022 15:34:56 -0400 Subject: [PATCH 7/9] made input,app,console class --- src/main/java/models/App.java | 20 ++++++++++++++++++++ src/main/java/models/Console.java | 12 ++++++++++++ src/main/java/models/UserInterface.java | 4 ++++ 3 files changed, 36 insertions(+) create mode 100644 src/main/java/models/App.java create mode 100644 src/main/java/models/Console.java create mode 100644 src/main/java/models/UserInterface.java diff --git a/src/main/java/models/App.java b/src/main/java/models/App.java new file mode 100644 index 0000000..c8ced97 --- /dev/null +++ b/src/main/java/models/App.java @@ -0,0 +1,20 @@ +package models; + +import services.HockeyStickService; + +public class App { + private HockeyStickService stickService = new HockeyStickService(); + + public static void main(String...args){ + App application = new App(); + application.init(); + } + + public void init(){ + + } + + + + +} diff --git a/src/main/java/models/Console.java b/src/main/java/models/Console.java new file mode 100644 index 0000000..39186b5 --- /dev/null +++ b/src/main/java/models/Console.java @@ -0,0 +1,12 @@ +package models; + +public class Console { + public static void printWelcome(){ + System.out.println("" + + "**************************************************" + + "*** Welcome and Bienvenue ***" + + "*** to ***" + + "*** ZipCo Inventory Manager ***" + + "**************************************************"); + } +} diff --git a/src/main/java/models/UserInterface.java b/src/main/java/models/UserInterface.java new file mode 100644 index 0000000..ac5f927 --- /dev/null +++ b/src/main/java/models/UserInterface.java @@ -0,0 +1,4 @@ +package models; + +public interface UserInterface { +} From 1efdb4fbc4542ff33c4132fc2b62f89880f1ed44 Mon Sep 17 00:00:00 2001 From: JD Singer Date: Thu, 4 Aug 2022 21:43:31 -0400 Subject: [PATCH 8/9] somewhere between userInput and losing my mind --- src/main/java/io/App.java | 58 +++++++++++++++++++ src/main/java/{models => io}/Console.java | 2 +- .../java/{models => io}/UserInterface.java | 2 +- src/main/java/models/App.java | 20 ------- 4 files changed, 60 insertions(+), 22 deletions(-) create mode 100644 src/main/java/io/App.java rename src/main/java/{models => io}/Console.java (96%) rename src/main/java/{models => io}/UserInterface.java (69%) delete mode 100644 src/main/java/models/App.java diff --git a/src/main/java/io/App.java b/src/main/java/io/App.java new file mode 100644 index 0000000..a3413dd --- /dev/null +++ b/src/main/java/io/App.java @@ -0,0 +1,58 @@ +package io; + +import services.HockeyStickService; + +import java.util.Scanner; + +public class App { + private HockeyStickService stickService = new HockeyStickService(); + + public static void main(String...args){ + App application = new App(); + application.init(); + } + + public void init(){ + Console.printWelcome(); + } + + public String userInput(){ + Integer opt1 = 0; + String opt2 = ""; + String opt3 = ""; + Integer opt4 = 0; + Integer opt5 = 0; + Double opt6 = 0.0; + + + while (addMore = true){ + System.out.println("What do you wish to add to inventory? Press 1 for Stick 2 for Skate"); + Scanner scanner = new Scanner(String.valueOf(input)); + System.out.println(); + System.out.println("Product Name?"); + opt2 = String.valueOf(scanner.hasNextInt()); + System.out.println("Product Brand?"); + opt3 = String.valueOf(scanner.hasNextInt()); + System.out.println("Product Size"); + opt4 = Integer.valueOf(String.valueOf(scanner.hasNextInt())); + System.out.println("Product Price"); + opt6 = Double.valueOf(String.valueOf(scanner.hasNextInt())); + System.out.println("How many would you like to add?"); + opt5 = Integer.valueOf(String.valueOf(scanner.hasNextInt())); + System.out.println("Products I.D.?"); + if(input = 1){ + HockeyStickService.create(o) + + + } + + + } + + } + + + + +} + diff --git a/src/main/java/models/Console.java b/src/main/java/io/Console.java similarity index 96% rename from src/main/java/models/Console.java rename to src/main/java/io/Console.java index 39186b5..952125d 100644 --- a/src/main/java/models/Console.java +++ b/src/main/java/io/Console.java @@ -1,4 +1,4 @@ -package models; +package io; public class Console { public static void printWelcome(){ diff --git a/src/main/java/models/UserInterface.java b/src/main/java/io/UserInterface.java similarity index 69% rename from src/main/java/models/UserInterface.java rename to src/main/java/io/UserInterface.java index ac5f927..6088389 100644 --- a/src/main/java/models/UserInterface.java +++ b/src/main/java/io/UserInterface.java @@ -1,4 +1,4 @@ -package models; +package io; public interface UserInterface { } diff --git a/src/main/java/models/App.java b/src/main/java/models/App.java deleted file mode 100644 index c8ced97..0000000 --- a/src/main/java/models/App.java +++ /dev/null @@ -1,20 +0,0 @@ -package models; - -import services.HockeyStickService; - -public class App { - private HockeyStickService stickService = new HockeyStickService(); - - public static void main(String...args){ - App application = new App(); - application.init(); - } - - public void init(){ - - } - - - - -} From 0df622b03215543634fb676767e037bc67d9e6f9 Mon Sep 17 00:00:00 2001 From: JD Singer Date: Wed, 31 Aug 2022 16:25:44 -0400 Subject: [PATCH 9/9] Pushing this up again --- src/main/java/io/App.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/io/App.java b/src/main/java/io/App.java index a3413dd..048399d 100644 --- a/src/main/java/io/App.java +++ b/src/main/java/io/App.java @@ -7,16 +7,16 @@ public class App { private HockeyStickService stickService = new HockeyStickService(); - public static void main(String...args){ + public static void main(String... args) { App application = new App(); application.init(); } - public void init(){ + public void init() { Console.printWelcome(); } - public String userInput(){ + public String userInput() { Integer opt1 = 0; String opt2 = ""; String opt3 = ""; @@ -25,7 +25,8 @@ public String userInput(){ Double opt6 = 0.0; - while (addMore = true){ + while (addMore = true) { + System.out.println("What do you wish to add to inventory? Press 1 for Stick 2 for Skate"); Scanner scanner = new Scanner(String.valueOf(input)); System.out.println(); @@ -40,7 +41,7 @@ public String userInput(){ System.out.println("How many would you like to add?"); opt5 = Integer.valueOf(String.valueOf(scanner.hasNextInt())); System.out.println("Products I.D.?"); - if(input = 1){ + if (input = 1) { HockeyStickService.create(o)