From dbe8cd7a9c92286fee26542742c9cd0ff17ba48c Mon Sep 17 00:00:00 2001 From: Nathan Date: Thu, 1 Jul 2021 23:10:06 -0400 Subject: [PATCH 01/18] added junit testing suite --- .idea/compiler.xml | 1 + .idea/jarRepositories.xml | 20 ++++++++++++++++++++ instructions/section-01.md | 1 + pom.xml | 15 ++++++++++++++- 4 files changed, 36 insertions(+), 1 deletion(-) 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/instructions/section-01.md b/instructions/section-01.md index ab6c191..8e22efe 100644 --- a/instructions/section-01.md +++ b/instructions/section-01.md @@ -10,6 +10,7 @@ In this section we start with an empty Java project and start to setup our envir * Import a testing framework to support Test Driven Development(TDD) * Creating classes stubs for our products + ## Part 1 - Repository 1. Log into github.com diff --git a/pom.xml b/pom.xml index 43c1af2..b36c574 100644 --- a/pom.xml +++ b/pom.xml @@ -21,5 +21,18 @@ - + + + org.junit.jupiter + junit-jupiter-engine + 5.4.2 + test + + + org.junit.jupiter + junit-jupiter-api + 5.4.2 + test + + \ No newline at end of file From 8ab324f42564ec31dcd13e057b32ef1e09eb2bcf Mon Sep 17 00:00:00 2001 From: Nathan Date: Thu, 1 Jul 2021 23:35:05 -0400 Subject: [PATCH 02/18] add sneaker/whiskey models and services --- src/main/java/models/Sneaker.java | 4 ++++ src/main/java/models/Whiskey.java | 4 ++++ src/main/java/services/SneakerService.java | 4 ++++ src/main/java/services/WhiskeyService.java | 4 ++++ src/test/java/models/SneakerTest.java | 4 ++++ src/test/java/models/WhiskeyTest.java | 4 ++++ src/test/java/services/SneakerServiceTest.java | 4 ++++ src/test/java/services/WhiskeyServiceTest.java | 4 ++++ 8 files changed, 32 insertions(+) create mode 100644 src/main/java/models/Sneaker.java create mode 100644 src/main/java/models/Whiskey.java create mode 100644 src/main/java/services/SneakerService.java create mode 100644 src/main/java/services/WhiskeyService.java create mode 100644 src/test/java/models/SneakerTest.java create mode 100644 src/test/java/models/WhiskeyTest.java create mode 100644 src/test/java/services/SneakerServiceTest.java create mode 100644 src/test/java/services/WhiskeyServiceTest.java diff --git a/src/main/java/models/Sneaker.java b/src/main/java/models/Sneaker.java new file mode 100644 index 0000000..fa150ec --- /dev/null +++ b/src/main/java/models/Sneaker.java @@ -0,0 +1,4 @@ +package models; + +public class Sneaker { +} diff --git a/src/main/java/models/Whiskey.java b/src/main/java/models/Whiskey.java new file mode 100644 index 0000000..bb9e5d5 --- /dev/null +++ b/src/main/java/models/Whiskey.java @@ -0,0 +1,4 @@ +package models; + +public class Whiskey { +} diff --git a/src/main/java/services/SneakerService.java b/src/main/java/services/SneakerService.java new file mode 100644 index 0000000..a022353 --- /dev/null +++ b/src/main/java/services/SneakerService.java @@ -0,0 +1,4 @@ +package services; + +public class SneakerService { +} diff --git a/src/main/java/services/WhiskeyService.java b/src/main/java/services/WhiskeyService.java new file mode 100644 index 0000000..1307c24 --- /dev/null +++ b/src/main/java/services/WhiskeyService.java @@ -0,0 +1,4 @@ +package services; + +public class WhiskeyService { +} diff --git a/src/test/java/models/SneakerTest.java b/src/test/java/models/SneakerTest.java new file mode 100644 index 0000000..c63eae0 --- /dev/null +++ b/src/test/java/models/SneakerTest.java @@ -0,0 +1,4 @@ +package models; + +public class SneakerTest { +} diff --git a/src/test/java/models/WhiskeyTest.java b/src/test/java/models/WhiskeyTest.java new file mode 100644 index 0000000..81c7672 --- /dev/null +++ b/src/test/java/models/WhiskeyTest.java @@ -0,0 +1,4 @@ +package models; + +public class WhiskeyTest { +} diff --git a/src/test/java/services/SneakerServiceTest.java b/src/test/java/services/SneakerServiceTest.java new file mode 100644 index 0000000..3ae2e9a --- /dev/null +++ b/src/test/java/services/SneakerServiceTest.java @@ -0,0 +1,4 @@ +package services; + +public class SneakerServiceTest { +} diff --git a/src/test/java/services/WhiskeyServiceTest.java b/src/test/java/services/WhiskeyServiceTest.java new file mode 100644 index 0000000..cb856f0 --- /dev/null +++ b/src/test/java/services/WhiskeyServiceTest.java @@ -0,0 +1,4 @@ +package services; + +public class WhiskeyServiceTest { +} From d6ac6907a6096b2eff4dab5737afa86530d7fb82 Mon Sep 17 00:00:00 2001 From: Nathan Date: Fri, 2 Jul 2021 08:15:24 -0400 Subject: [PATCH 03/18] add fields to sneaker --- src/main/java/models/Sneaker.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/models/Sneaker.java b/src/main/java/models/Sneaker.java index fa150ec..3673003 100644 --- a/src/main/java/models/Sneaker.java +++ b/src/main/java/models/Sneaker.java @@ -1,4 +1,12 @@ package models; public class Sneaker { + private int id; + private String name; + private String brand; + private String sport; + private int size; + private int qyt; + private float price; + } From 719c9f8f15e1b63feb076f3e2a9e55a73b3c9a6c Mon Sep 17 00:00:00 2001 From: Nathan Date: Fri, 2 Jul 2021 08:24:38 -0400 Subject: [PATCH 04/18] added whiskey properties --- src/main/java/models/Sneaker.java | 2 +- src/main/java/models/Whiskey.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/models/Sneaker.java b/src/main/java/models/Sneaker.java index 3673003..144033d 100644 --- a/src/main/java/models/Sneaker.java +++ b/src/main/java/models/Sneaker.java @@ -6,7 +6,7 @@ public class Sneaker { private String brand; private String sport; private int size; - private int qyt; + private int quantity; private float price; } diff --git a/src/main/java/models/Whiskey.java b/src/main/java/models/Whiskey.java index bb9e5d5..6dedacb 100644 --- a/src/main/java/models/Whiskey.java +++ b/src/main/java/models/Whiskey.java @@ -1,4 +1,10 @@ package models; public class Whiskey { + private int id; + private String name; + private String brand; + private float alcoholPercent; + private int quantity; + private float price; } From c91db42382cc219a7f5fcfb546a077bc6116aa41 Mon Sep 17 00:00:00 2001 From: Nathan Date: Fri, 2 Jul 2021 09:12:14 -0400 Subject: [PATCH 05/18] added tests for sneaker --- src/main/java/models/Sneaker.java | 51 +++++++++++++++++++++- src/test/java/models/SneakerTest.java | 63 +++++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 1 deletion(-) diff --git a/src/main/java/models/Sneaker.java b/src/main/java/models/Sneaker.java index 144033d..0886119 100644 --- a/src/main/java/models/Sneaker.java +++ b/src/main/java/models/Sneaker.java @@ -7,6 +7,55 @@ public class Sneaker { private String sport; private int size; private int quantity; - private float price; + private double price; + public Sneaker(){ + } + + public void setName(String name){ + this.name = name; + } + public String getName(){ + return this.name; + } + + public void setBrand(String brand) { + this.brand = brand; + } + + public String getBrand() { + return this.brand; + } + + public void setSport(String sport) { + this.sport = sport; + } + + public String getSport() { + return this.sport; + } + + public void setSize(int size) { + this.size = size; + } + + public int getSize() { + return this.size; + } + + public void setQuantity(int quantity) { + this.quantity = quantity; + } + + public int getQuantity() { + return this.quantity; + } + + public void setPrice(double price) { + this.price = price; + } + + public double getPrice() { + return this.price; + } } diff --git a/src/test/java/models/SneakerTest.java b/src/test/java/models/SneakerTest.java index c63eae0..61d69d9 100644 --- a/src/test/java/models/SneakerTest.java +++ b/src/test/java/models/SneakerTest.java @@ -1,4 +1,67 @@ package models; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + public class SneakerTest { + @Test + public void setNameTest(){ + //Given + String expected = "OZWEEGO"; + //When + Sneaker testSneaker = new Sneaker(); + testSneaker.setName(expected); + //Then + Assertions.assertEquals(expected,testSneaker.getName()); + } + @Test + public void setBrandTest(){ + //Given + String expected = "Nike"; + //When + Sneaker testSneaker = new Sneaker(); + testSneaker.setBrand(expected); + //Then + Assertions.assertEquals(expected, testSneaker.getBrand()); + } + @Test + public void setSportTest(){ + //Given + String expected = "Running"; + //When + Sneaker testSneaker = new Sneaker(); + testSneaker.setSport(expected); + //Then + Assertions.assertEquals(expected,testSneaker.getSport()); + } + @Test + public void setSizeTest(){ + //Given + int expected = 7; + //When + Sneaker testSneaker = new Sneaker(); + testSneaker.setSize(expected); + //Then + Assertions.assertEquals(expected,testSneaker.getSize()); + } + @Test + public void setQuantityTest(){ + //Given + int expected = 50; + //When + Sneaker testSneaker = new Sneaker(); + testSneaker.setQuantity(expected); + //Then + Assertions.assertEquals(expected,testSneaker.getQuantity()); + } + @Test + public void setPriceTest(){ + //Given + double expected = 99; + //When + Sneaker testSneaker = new Sneaker(); + testSneaker.setPrice(expected); + //Then + Assertions.assertEquals(expected,testSneaker.getPrice()); + } } From fca1473b9f1cc3a491abcfcf9fd0473bd4243b52 Mon Sep 17 00:00:00 2001 From: Nathan Date: Fri, 2 Jul 2021 14:16:49 -0400 Subject: [PATCH 06/18] changed wiskey to shirt and added tests for shirt --- src/main/java/models/Shirt.java | 52 +++++++++++++++++ src/main/java/models/Sneaker.java | 1 - src/main/java/models/Whiskey.java | 10 ---- src/main/java/services/ShirtService.java | 4 ++ src/main/java/services/WhiskeyService.java | 4 -- src/test/java/models/ShirtTest.java | 57 +++++++++++++++++++ src/test/java/models/WhiskeyTest.java | 4 -- src/test/java/services/ShirtServiceTest.java | 4 ++ .../java/services/WhiskeyServiceTest.java | 4 -- 9 files changed, 117 insertions(+), 23 deletions(-) create mode 100644 src/main/java/models/Shirt.java delete mode 100644 src/main/java/models/Whiskey.java create mode 100644 src/main/java/services/ShirtService.java delete mode 100644 src/main/java/services/WhiskeyService.java create mode 100644 src/test/java/models/ShirtTest.java delete mode 100644 src/test/java/models/WhiskeyTest.java create mode 100644 src/test/java/services/ShirtServiceTest.java delete mode 100644 src/test/java/services/WhiskeyServiceTest.java diff --git a/src/main/java/models/Shirt.java b/src/main/java/models/Shirt.java new file mode 100644 index 0000000..6ab9e18 --- /dev/null +++ b/src/main/java/models/Shirt.java @@ -0,0 +1,52 @@ +package models; + +public class Shirt { + private String shirtType; + private String brand; + private String material; + private int quantity; + private double price; + + public Shirt(){ + } + + public void setShirtType(String type) { + this.shirtType = type; + } + + public String getShirtType() { + return this.shirtType; + } + + public void setBrand(String brand) { + this.brand = brand; + } + + public String getBrand() { + return this.brand; + } + + public void setMaterial(String material) { + this.material = material; + } + + public String getMaterial() { + return this.material; + } + + public void setQuantity(int quantity) { + this.quantity = quantity; + } + + public int getQuantity() { + return this.quantity; + } + + public void setPrice(double price) { + this.price = price; + } + + public double getPrice() { + return this.price; + } +} diff --git a/src/main/java/models/Sneaker.java b/src/main/java/models/Sneaker.java index 0886119..60d9fa3 100644 --- a/src/main/java/models/Sneaker.java +++ b/src/main/java/models/Sneaker.java @@ -1,7 +1,6 @@ package models; public class Sneaker { - private int id; private String name; private String brand; private String sport; diff --git a/src/main/java/models/Whiskey.java b/src/main/java/models/Whiskey.java deleted file mode 100644 index 6dedacb..0000000 --- a/src/main/java/models/Whiskey.java +++ /dev/null @@ -1,10 +0,0 @@ -package models; - -public class Whiskey { - private int id; - private String name; - private String brand; - private float alcoholPercent; - private int quantity; - private float price; -} diff --git a/src/main/java/services/ShirtService.java b/src/main/java/services/ShirtService.java new file mode 100644 index 0000000..a30f7ed --- /dev/null +++ b/src/main/java/services/ShirtService.java @@ -0,0 +1,4 @@ +package services; + +public class ShirtService { +} diff --git a/src/main/java/services/WhiskeyService.java b/src/main/java/services/WhiskeyService.java deleted file mode 100644 index 1307c24..0000000 --- a/src/main/java/services/WhiskeyService.java +++ /dev/null @@ -1,4 +0,0 @@ -package services; - -public class WhiskeyService { -} diff --git a/src/test/java/models/ShirtTest.java b/src/test/java/models/ShirtTest.java new file mode 100644 index 0000000..aace842 --- /dev/null +++ b/src/test/java/models/ShirtTest.java @@ -0,0 +1,57 @@ +package models; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class ShirtTest { + Shirt shirt = new Shirt(); + + @Test + public void getTypeTest(){ + //Given + String expected = "Button down"; + shirt.setShirtType(expected); + //When + String actual = shirt.getShirtType(); + //Then + Assertions.assertEquals(expected, actual); + } + + public void getBrandTest(){ + //Given + String expected = "Gucci"; + shirt.setBrand(expected); + //When + String actual = shirt.getBrand(); + //Then + Assertions.assertEquals(expected, actual); + } + public void getMaterialTest(){ + //Given + String expected = "Cotton"; + shirt.setMaterial(expected); + //When + String actual = shirt.getMaterial(); + //Then + Assertions.assertEquals(expected, actual); + } + public void getQuantityTest(){ + //Given + int expected = 25; + shirt.setQuantity(expected); + //When + int actual = shirt.getQuantity(); + //Then + Assertions.assertEquals(expected, actual, 0); + } + public void getPriceTest(){ + //Given + double expected = 25.99; + shirt.setPrice(expected); + //When + double actual = shirt.getPrice(); + //Then + Assertions.assertEquals(expected, actual); + } + +} diff --git a/src/test/java/models/WhiskeyTest.java b/src/test/java/models/WhiskeyTest.java deleted file mode 100644 index 81c7672..0000000 --- a/src/test/java/models/WhiskeyTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package models; - -public class WhiskeyTest { -} diff --git a/src/test/java/services/ShirtServiceTest.java b/src/test/java/services/ShirtServiceTest.java new file mode 100644 index 0000000..f255f9b --- /dev/null +++ b/src/test/java/services/ShirtServiceTest.java @@ -0,0 +1,4 @@ +package services; + +public class ShirtServiceTest { +} diff --git a/src/test/java/services/WhiskeyServiceTest.java b/src/test/java/services/WhiskeyServiceTest.java deleted file mode 100644 index cb856f0..0000000 --- a/src/test/java/services/WhiskeyServiceTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package services; - -public class WhiskeyServiceTest { -} From 52e40ab9ff8bb0871142e268dfeabf7d3f7a3663 Mon Sep 17 00:00:00 2001 From: Nathan Date: Fri, 2 Jul 2021 20:25:35 -0400 Subject: [PATCH 07/18] Added constructor tests for sneaker and shirt --- src/main/java/models/Shirt.java | 8 ++++++++ src/main/java/models/Sneaker.java | 13 +++++++++++-- src/test/java/models/ShirtTest.java | 18 ++++++++++++++++++ src/test/java/models/SneakerTest.java | 24 +++++++++++++++++++++++- 4 files changed, 60 insertions(+), 3 deletions(-) diff --git a/src/main/java/models/Shirt.java b/src/main/java/models/Shirt.java index 6ab9e18..a8c069e 100644 --- a/src/main/java/models/Shirt.java +++ b/src/main/java/models/Shirt.java @@ -10,6 +10,14 @@ public class Shirt { public Shirt(){ } + public Shirt(String shirtType, String brand, String material, int quantity, double price) { + this.shirtType = shirtType; + this.brand = brand; + this.material = material; + this.quantity = quantity; + this.price = price; + } + public void setShirtType(String type) { this.shirtType = type; } diff --git a/src/main/java/models/Sneaker.java b/src/main/java/models/Sneaker.java index 60d9fa3..ab847ea 100644 --- a/src/main/java/models/Sneaker.java +++ b/src/main/java/models/Sneaker.java @@ -6,11 +6,20 @@ public class Sneaker { private String sport; private int size; private int quantity; - private double price; + private float price; public Sneaker(){ } + public Sneaker(String name, String brand, String sport, int size, int quantity, float price) { + this.name = name; + this.brand = brand; + this.sport = sport; + this.size = size; + this.quantity = quantity; + this.price = price; + } + public void setName(String name){ this.name = name; } @@ -50,7 +59,7 @@ public int getQuantity() { return this.quantity; } - public void setPrice(double price) { + public void setPrice(float price) { this.price = price; } diff --git a/src/test/java/models/ShirtTest.java b/src/test/java/models/ShirtTest.java index aace842..34ea00b 100644 --- a/src/test/java/models/ShirtTest.java +++ b/src/test/java/models/ShirtTest.java @@ -54,4 +54,22 @@ public void getPriceTest(){ Assertions.assertEquals(expected, actual); } + @Test + public void shirtConstructorTest(){ + //Given + String shirtTypeExpected = "Crew Neck" ; + String brandExpected = "Produce of the Factory"; + String materialExpected = "Cotton"; + int quantityExpected = 50; + double priceExpected = 5.99; + //When + Shirt testShirt = new Shirt(shirtTypeExpected, brandExpected, materialExpected, quantityExpected, priceExpected); + //Then + Assertions.assertEquals(shirtTypeExpected, testShirt.getShirtType()); + Assertions.assertEquals(brandExpected, testShirt.getBrand()); + Assertions.assertEquals(materialExpected, testShirt.getMaterial()); + Assertions.assertEquals(quantityExpected, testShirt.getQuantity()); + Assertions.assertEquals(priceExpected, testShirt.getPrice()); + } + } diff --git a/src/test/java/models/SneakerTest.java b/src/test/java/models/SneakerTest.java index 61d69d9..fa189a6 100644 --- a/src/test/java/models/SneakerTest.java +++ b/src/test/java/models/SneakerTest.java @@ -57,11 +57,33 @@ public void setQuantityTest(){ @Test public void setPriceTest(){ //Given - double expected = 99; + float expected = 99.99f; //When Sneaker testSneaker = new Sneaker(); testSneaker.setPrice(expected); //Then Assertions.assertEquals(expected,testSneaker.getPrice()); } + + @Test + public void constructorTest() { + //Given + String expectedName = "SpeedForce"; + String expectedBrand = "Sketchers"; + String expectedSport = "Training"; + int expectedSize = 8; + int expectedQuantity = 26; + float expectedPrice = 78.99f; + //When + Sneaker testSneaker = new Sneaker(expectedName, expectedBrand, expectedSport, expectedSize, expectedQuantity, expectedPrice); + //Then + Assertions.assertEquals(expectedName, testSneaker.getName()); + Assertions.assertEquals(expectedBrand, testSneaker.getBrand()); + Assertions.assertEquals(expectedSport, testSneaker.getSport()); + Assertions.assertEquals(expectedSize, testSneaker.getSize()); + Assertions.assertEquals(expectedQuantity, testSneaker.getQuantity()); + Assertions.assertEquals(expectedPrice, testSneaker.getPrice()); + + + } } From 8797095c8d423714abdc7bb36ce78df3b18f3814 Mon Sep 17 00:00:00 2001 From: Nathan Date: Sat, 3 Jul 2021 14:38:18 -0400 Subject: [PATCH 08/18] added find test and find function for sneakerService --- src/main/java/models/Shirt.java | 4 ++ src/main/java/models/Sneaker.java | 14 +++- src/main/java/services/SneakerService.java | 30 +++++++++ src/test/java/models/SneakerTest.java | 4 +- .../java/services/SneakerServiceTest.java | 65 +++++++++++++++++++ 5 files changed, 114 insertions(+), 3 deletions(-) diff --git a/src/main/java/models/Shirt.java b/src/main/java/models/Shirt.java index a8c069e..5be531c 100644 --- a/src/main/java/models/Shirt.java +++ b/src/main/java/models/Shirt.java @@ -1,5 +1,7 @@ package models; +import java.util.ArrayList; + public class Shirt { private String shirtType; private String brand; @@ -57,4 +59,6 @@ public void setPrice(double price) { public double getPrice() { return this.price; } + + } diff --git a/src/main/java/models/Sneaker.java b/src/main/java/models/Sneaker.java index ab847ea..c3e12de 100644 --- a/src/main/java/models/Sneaker.java +++ b/src/main/java/models/Sneaker.java @@ -1,6 +1,7 @@ package models; public class Sneaker { + private int id; private String name; private String brand; private String sport; @@ -11,7 +12,8 @@ public class Sneaker { public Sneaker(){ } - public Sneaker(String name, String brand, String sport, int size, int quantity, float price) { + public Sneaker(int id, String name, String brand, String sport, int size, int quantity, float price) { + this.id = id; this.name = name; this.brand = brand; this.sport = sport; @@ -63,7 +65,15 @@ public void setPrice(float price) { this.price = price; } - public double getPrice() { + public float getPrice() { return this.price; } + + public int getId() { + return this.id; + } + + public void setID(int id){ + this.id = id; + } } diff --git a/src/main/java/services/SneakerService.java b/src/main/java/services/SneakerService.java index a022353..913b8e2 100644 --- a/src/main/java/services/SneakerService.java +++ b/src/main/java/services/SneakerService.java @@ -1,4 +1,34 @@ package services; +import com.sun.deploy.net.MessageHeader; +import models.Sneaker; + +import java.util.ArrayList; + public class SneakerService { + public static int nextID = 1; + private ArrayList inventory = new ArrayList(); + + //Creates a new sneaker object and add it to the inventory. + public Sneaker create(String name, String brand, String sport, int size, int qty, float price) { + //2 + Sneaker createdSneaker = new Sneaker(nextID++, name, brand, sport, size, qty, price); + //3 + inventory.add(createdSneaker); + //4 + return createdSneaker; + + } + + //Finds a particular sneaker object in inventory using a provided id. + public Sneaker find(int id) { + for(Sneaker sneaker : inventory) { + if(sneaker.getId() == (id)){ + return sneaker; + } + } + return null; + } + + // } diff --git a/src/test/java/models/SneakerTest.java b/src/test/java/models/SneakerTest.java index fa189a6..9bbbdcf 100644 --- a/src/test/java/models/SneakerTest.java +++ b/src/test/java/models/SneakerTest.java @@ -68,6 +68,7 @@ public void setPriceTest(){ @Test public void constructorTest() { //Given + int expectedID = 01; String expectedName = "SpeedForce"; String expectedBrand = "Sketchers"; String expectedSport = "Training"; @@ -75,8 +76,9 @@ public void constructorTest() { int expectedQuantity = 26; float expectedPrice = 78.99f; //When - Sneaker testSneaker = new Sneaker(expectedName, expectedBrand, expectedSport, expectedSize, expectedQuantity, expectedPrice); + Sneaker testSneaker = new Sneaker(expectedID,expectedName, expectedBrand, expectedSport, expectedSize, expectedQuantity, expectedPrice); //Then + Assertions.assertEquals(expectedID, testSneaker.getId()); Assertions.assertEquals(expectedName, testSneaker.getName()); Assertions.assertEquals(expectedBrand, testSneaker.getBrand()); Assertions.assertEquals(expectedSport, testSneaker.getSport()); diff --git a/src/test/java/services/SneakerServiceTest.java b/src/test/java/services/SneakerServiceTest.java index 3ae2e9a..ef90507 100644 --- a/src/test/java/services/SneakerServiceTest.java +++ b/src/test/java/services/SneakerServiceTest.java @@ -1,4 +1,69 @@ package services; +import models.Sneaker; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + public class SneakerServiceTest { + @Test + public void createTest(){ + //1 + String expectedName = "NitroBalance"; + String expectedBrand = "Nike"; + String expectedSport = "Basket Ball"; + int expectedSize = 11; + int expectedQty = 10; + float expectedPrice = 75.00f; + + //2 + SneakerService newSneakerService = new SneakerService(); + Sneaker testSneaker = newSneakerService.create(expectedName, expectedBrand, expectedSport, expectedSize, expectedQty, expectedPrice); + //3 + int actualId = testSneaker.getId(); + String actualName = testSneaker.getName(); + String actualBrand = testSneaker.getBrand(); + String actualSport = testSneaker.getSport(); + int actualSize = testSneaker.getSize(); + int actualQty = testSneaker.getQuantity(); + float actualPrice = testSneaker.getPrice(); + //4 + Assertions.assertEquals(Integer.class.getName(), new Integer(actualId).getClass().getName()); + Assertions.assertEquals(expectedName, actualName); + Assertions.assertEquals(expectedBrand, actualBrand); + Assertions.assertEquals(expectedSport, actualSport); + Assertions.assertEquals(expectedSize, actualSize); + Assertions.assertEquals(expectedQty, actualQty); + Assertions.assertEquals(expectedPrice, actualPrice); + } + + /** + * should take an int and return an object with that id, if it exists. + */ + @Test + public void findTest(){ + //1 + int expectedID = 1; + String expectedName = "NitroBalance"; + String expectedBrand = "Nike"; + String expectedSport = "Basket Ball"; + int expectedSize = 11; + int expectedQty = 10; + float expectedPrice = 75.00f; + //2 + SneakerService newSneakerService = new SneakerService(); + Sneaker newSneaker = newSneakerService.create(expectedName, expectedBrand, expectedSport, expectedSize, expectedQty, expectedPrice); + //3 + Sneaker actualSneaker = newSneakerService.find(expectedID); + //4 + Assertions.assertEquals(expectedID,actualSneaker.getId()); + } + + /** + * //read all + * public Sneaker[] findAll() { + * // should return a basic array copy of the ArrayList + * } + */ + @Test + } From 2cd1075d0bd06354d7fd904c7e1f2b17df25fce6 Mon Sep 17 00:00:00 2001 From: Nathan Date: Sat, 3 Jul 2021 16:54:28 -0400 Subject: [PATCH 09/18] Added findAllTest for sneakerService --- src/main/java/services/SneakerService.java | 5 ++- .../java/services/SneakerServiceTest.java | 38 +++++++++++++++++-- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/src/main/java/services/SneakerService.java b/src/main/java/services/SneakerService.java index 913b8e2..f084c1b 100644 --- a/src/main/java/services/SneakerService.java +++ b/src/main/java/services/SneakerService.java @@ -1,6 +1,5 @@ package services; -import com.sun.deploy.net.MessageHeader; import models.Sneaker; import java.util.ArrayList; @@ -30,5 +29,9 @@ public Sneaker find(int id) { return null; } + public Object[] findAll() { + return inventory.toArray(); + } + // } diff --git a/src/test/java/services/SneakerServiceTest.java b/src/test/java/services/SneakerServiceTest.java index ef90507..d85ffa9 100644 --- a/src/test/java/services/SneakerServiceTest.java +++ b/src/test/java/services/SneakerServiceTest.java @@ -4,6 +4,8 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import java.util.Arrays; + public class SneakerServiceTest { @Test public void createTest(){ @@ -53,9 +55,9 @@ public void findTest(){ SneakerService newSneakerService = new SneakerService(); Sneaker newSneaker = newSneakerService.create(expectedName, expectedBrand, expectedSport, expectedSize, expectedQty, expectedPrice); //3 - Sneaker actualSneaker = newSneakerService.find(expectedID); + //4 - Assertions.assertEquals(expectedID,actualSneaker.getId()); + Assertions.assertEquals(newSneaker,newSneakerService.find(expectedID)); } /** @@ -65,5 +67,35 @@ public void findTest(){ * } */ @Test - + public void sneakerServiceFindAllTest() { + //1 + int expectedID = 1; + String expectedName = "NitroBalance"; + String expectedBrand = "Nike"; + String expectedSport = "Basket Ball"; + int expectedSize = 11; + int expectedQty = 10; + float expectedPrice = 75.00f; + //2 + SneakerService newSneakerService = new SneakerService(); + Sneaker newSneaker = newSneakerService.create(expectedName, expectedBrand, expectedSport, expectedSize, expectedQty, expectedPrice); + //3 + Object[] actualSneakerArray = new Sneaker[1]; + actualSneakerArray[0] = newSneaker; + //4 + Assertions.assertEquals(true, Arrays.equals(actualSneakerArray,newSneakerService.findAll())); + } + + /** + * //delete + * public boolean delete(int id) { + * // should remove the object with this id from the ArrayList if exits and return true. + * // Otherwise return false + * } + */ + @Test + public void SneakerServiceDeleteTest(){ + + } } + From 4106adc79a1dc3476fbfce97c9d21e09ce3c1dfa Mon Sep 17 00:00:00 2001 From: Nathan Date: Sat, 3 Jul 2021 17:10:59 -0400 Subject: [PATCH 10/18] Added deleteTest and delete method for sneakerService --- src/main/java/services/SneakerService.java | 10 ++++++ .../java/services/SneakerServiceTest.java | 32 +++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/src/main/java/services/SneakerService.java b/src/main/java/services/SneakerService.java index f084c1b..87357a5 100644 --- a/src/main/java/services/SneakerService.java +++ b/src/main/java/services/SneakerService.java @@ -33,5 +33,15 @@ public Object[] findAll() { return inventory.toArray(); } + public boolean delete(int id) { + for(Sneaker sneaker: inventory) { + if(sneaker.getId() == id){ + inventory.remove(sneaker); + return true; + } + } + return false; + } + // } diff --git a/src/test/java/services/SneakerServiceTest.java b/src/test/java/services/SneakerServiceTest.java index d85ffa9..545bfbd 100644 --- a/src/test/java/services/SneakerServiceTest.java +++ b/src/test/java/services/SneakerServiceTest.java @@ -95,6 +95,38 @@ public void sneakerServiceFindAllTest() { */ @Test public void SneakerServiceDeleteTest(){ + //1 + int expectedID1 = 1; + String expectedName = "NitroBalance"; + String expectedBrand = "Nike"; + String expectedSport = "Basket Ball"; + int expectedSize = 11; + int expectedQty = 10; + float expectedPrice = 75.00f; + + int expectedID2 = 2; + String expectedName2 = "BubbleGum"; + String expectedBrand2 = "Adidas"; + String expectedSport2 = "Tennis"; + int expectedSize2 = 9; + int expectedQty2 = 20; + float expectedPrice2 = 80.00f; + + //2 + SneakerService newSneakerService = new SneakerService(); + Sneaker newSneaker1 = newSneakerService.create(expectedName, expectedBrand, expectedSport, expectedSize, expectedQty, expectedPrice); + Sneaker newSneaker2 = newSneakerService.create(expectedName2, expectedBrand2, expectedSport2, expectedSize2, expectedQty2, expectedPrice2); + + //Test 1 + boolean deleteResult = newSneakerService.delete(expectedID2); + Assertions.assertEquals(true, deleteResult); + + //Test 2 + boolean deleteResult2 = newSneakerService.delete(expectedID2); + Assertions.assertEquals(false, deleteResult2); + + + } } From c5a74cdf4dfe0db0a72c1321de059e784a4303fb Mon Sep 17 00:00:00 2001 From: Nathan Date: Sat, 3 Jul 2021 17:14:43 -0400 Subject: [PATCH 11/18] saved all changes --- src/main/java/services/SneakerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/services/SneakerService.java b/src/main/java/services/SneakerService.java index 87357a5..b06a11d 100644 --- a/src/main/java/services/SneakerService.java +++ b/src/main/java/services/SneakerService.java @@ -6,7 +6,7 @@ public class SneakerService { public static int nextID = 1; - private ArrayList inventory = new ArrayList(); + private ArrayList inventory = new ArrayList<>(); //Creates a new sneaker object and add it to the inventory. public Sneaker create(String name, String brand, String sport, int size, int qty, float price) { From 63655dec4e7a9a6d673be5d035f4557c84c3de2d Mon Sep 17 00:00:00 2001 From: Nathan Date: Sat, 3 Jul 2021 17:22:57 -0400 Subject: [PATCH 12/18] added id field and test for shirt class and shirtTest class --- src/main/java/models/Shirt.java | 10 +++++++++- src/test/java/models/ShirtTest.java | 19 ++++++++++++++++--- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/src/main/java/models/Shirt.java b/src/main/java/models/Shirt.java index 5be531c..f672b72 100644 --- a/src/main/java/models/Shirt.java +++ b/src/main/java/models/Shirt.java @@ -3,6 +3,7 @@ import java.util.ArrayList; public class Shirt { + private int id; private String shirtType; private String brand; private String material; @@ -12,7 +13,8 @@ public class Shirt { public Shirt(){ } - public Shirt(String shirtType, String brand, String material, int quantity, double price) { + public Shirt(int id, String shirtType, String brand, String material, int quantity, double price) { + this.id = id; this.shirtType = shirtType; this.brand = brand; this.material = material; @@ -60,5 +62,11 @@ public double getPrice() { return this.price; } + public void setId(int id) { + this.id = id; + } + public int getId() { + return this.id; + } } diff --git a/src/test/java/models/ShirtTest.java b/src/test/java/models/ShirtTest.java index 34ea00b..6a642f2 100644 --- a/src/test/java/models/ShirtTest.java +++ b/src/test/java/models/ShirtTest.java @@ -16,7 +16,7 @@ public void getTypeTest(){ //Then Assertions.assertEquals(expected, actual); } - + @Test public void getBrandTest(){ //Given String expected = "Gucci"; @@ -26,6 +26,7 @@ public void getBrandTest(){ //Then Assertions.assertEquals(expected, actual); } + @Test public void getMaterialTest(){ //Given String expected = "Cotton"; @@ -35,6 +36,7 @@ public void getMaterialTest(){ //Then Assertions.assertEquals(expected, actual); } + @Test public void getQuantityTest(){ //Given int expected = 25; @@ -44,6 +46,7 @@ public void getQuantityTest(){ //Then Assertions.assertEquals(expected, actual, 0); } + @Test public void getPriceTest(){ //Given double expected = 25.99; @@ -53,17 +56,27 @@ public void getPriceTest(){ //Then Assertions.assertEquals(expected, actual); } - + @Test + public void getIdTest(){ + //Given + int expectedId = 1; + shirt.setId(expectedId); + //When + int actualId = shirt.getId(); + //Then + Assertions.assertEquals(expectedId, actualId); + } @Test public void shirtConstructorTest(){ //Given + int idExpected = 1; String shirtTypeExpected = "Crew Neck" ; String brandExpected = "Produce of the Factory"; String materialExpected = "Cotton"; int quantityExpected = 50; double priceExpected = 5.99; //When - Shirt testShirt = new Shirt(shirtTypeExpected, brandExpected, materialExpected, quantityExpected, priceExpected); + Shirt testShirt = new Shirt(idExpected, shirtTypeExpected, brandExpected, materialExpected, quantityExpected, priceExpected); //Then Assertions.assertEquals(shirtTypeExpected, testShirt.getShirtType()); Assertions.assertEquals(brandExpected, testShirt.getBrand()); From f3a44061942fd7067f8128f26e69c85ddeccac9c Mon Sep 17 00:00:00 2001 From: Nathan Date: Sat, 3 Jul 2021 19:43:07 -0400 Subject: [PATCH 13/18] Added shirtSerticeTests and shirtService methods --- src/main/java/models/Shirt.java | 9 +- src/main/java/services/ShirtService.java | 42 +++++++ src/main/java/services/SneakerService.java | 6 +- src/test/java/models/ShirtTest.java | 4 +- src/test/java/services/ShirtServiceTest.java | 114 ++++++++++++++++++ .../java/services/SneakerServiceTest.java | 20 ++- 6 files changed, 183 insertions(+), 12 deletions(-) diff --git a/src/main/java/models/Shirt.java b/src/main/java/models/Shirt.java index f672b72..fb96312 100644 --- a/src/main/java/models/Shirt.java +++ b/src/main/java/models/Shirt.java @@ -8,12 +8,12 @@ public class Shirt { private String brand; private String material; private int quantity; - private double price; + private float price; public Shirt(){ } - public Shirt(int id, String shirtType, String brand, String material, int quantity, double price) { + public Shirt(int id, String shirtType, String brand, String material, int quantity, float price) { this.id = id; this.shirtType = shirtType; this.brand = brand; @@ -54,11 +54,11 @@ public int getQuantity() { return this.quantity; } - public void setPrice(double price) { + public void setPrice(float price) { this.price = price; } - public double getPrice() { + public float getPrice() { return this.price; } @@ -69,4 +69,5 @@ public void setId(int id) { public int getId() { return this.id; } + } diff --git a/src/main/java/services/ShirtService.java b/src/main/java/services/ShirtService.java index a30f7ed..4cd9911 100644 --- a/src/main/java/services/ShirtService.java +++ b/src/main/java/services/ShirtService.java @@ -1,4 +1,46 @@ package services; +import models.Shirt; +import models.Sneaker; + +import java.util.ArrayList; + public class ShirtService { + //ID for each shirt + private static int nextID = 1; + //ArrayList 'inventory' to hold all shirts + private ArrayList inventory = new ArrayList<>(); + + //Method to create a new shirt and add to inventory + public Shirt create(String shirtType, String brand, String material, int quantity, float price) { + //instantiate a new shirt object + Shirt newShirt = new Shirt(nextID++, shirtType, brand, material, quantity, price); + //Add new shirt object to inventory + inventory.add(newShirt); + return newShirt; + } + + + public Object find(int id) { + for (Shirt shirt: inventory) { + if(shirt.getId() == id){ + return shirt; + } + } + return null; + } + + public Object[] findAll() { + return inventory.toArray(); + } + + public boolean delete(int id) { + for(Shirt shirt: inventory) { + if(shirt.getId() == id){ + inventory.remove(shirt); + return true; + } + } + return false; + } } diff --git a/src/main/java/services/SneakerService.java b/src/main/java/services/SneakerService.java index b06a11d..4e0419b 100644 --- a/src/main/java/services/SneakerService.java +++ b/src/main/java/services/SneakerService.java @@ -5,7 +5,9 @@ import java.util.ArrayList; public class SneakerService { + //Generate an int ID for the each sneaker public static int nextID = 1; + //Create an inventory arrayList for sneakers private ArrayList inventory = new ArrayList<>(); //Creates a new sneaker object and add it to the inventory. @@ -20,9 +22,9 @@ public Sneaker create(String name, String brand, String sport, int size, int qty } //Finds a particular sneaker object in inventory using a provided id. - public Sneaker find(int id) { + public Object find(int id) { for(Sneaker sneaker : inventory) { - if(sneaker.getId() == (id)){ + if(sneaker.getId() == id){ return sneaker; } } diff --git a/src/test/java/models/ShirtTest.java b/src/test/java/models/ShirtTest.java index 6a642f2..eb13b83 100644 --- a/src/test/java/models/ShirtTest.java +++ b/src/test/java/models/ShirtTest.java @@ -49,7 +49,7 @@ public void getQuantityTest(){ @Test public void getPriceTest(){ //Given - double expected = 25.99; + float expected = 25.99f; shirt.setPrice(expected); //When double actual = shirt.getPrice(); @@ -74,7 +74,7 @@ public void shirtConstructorTest(){ String brandExpected = "Produce of the Factory"; String materialExpected = "Cotton"; int quantityExpected = 50; - double priceExpected = 5.99; + float priceExpected = 5.99f; //When Shirt testShirt = new Shirt(idExpected, shirtTypeExpected, brandExpected, materialExpected, quantityExpected, priceExpected); //Then diff --git a/src/test/java/services/ShirtServiceTest.java b/src/test/java/services/ShirtServiceTest.java index f255f9b..398bdb6 100644 --- a/src/test/java/services/ShirtServiceTest.java +++ b/src/test/java/services/ShirtServiceTest.java @@ -1,4 +1,118 @@ package services; +import models.Shirt; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import java.util.Arrays; + public class ShirtServiceTest { + @Test + public void createShirtTest(){ + //1 + int expectedId = 1; + String expectedShirtType = "V-neck"; + String expectedBrand = "J crew"; + String expectedMaterial = "Polyester"; + int expectedQuantity = 10; + float expectedPrice = 25.00f; + //2 + ShirtService newShirtService = new ShirtService(); + Shirt testShirt = newShirtService.create(expectedShirtType, expectedBrand, expectedMaterial, expectedQuantity, expectedPrice); + //3 + int actualId = testShirt.getId(); + String actualShirtType = testShirt.getShirtType(); + String actualBrand = testShirt.getBrand(); + String actualMaterial = testShirt.getMaterial(); + int actualQuantity = testShirt.getQuantity(); + float actualPrice = testShirt.getPrice(); + //4 + Assertions.assertEquals(expectedId, actualId); + Assertions.assertEquals(expectedShirtType, actualShirtType); + Assertions.assertEquals(expectedBrand, actualBrand); + Assertions.assertEquals(expectedMaterial, actualMaterial); + Assertions.assertEquals(expectedQuantity, actualQuantity); + Assertions.assertEquals(expectedPrice, actualPrice); + } + + @Test + public void findShirtTest(){ + //Given + int expId = 1; + String expShirtType = "Blouse"; + String expBrand = "Zara"; + String expMaterial = "Wool"; + int expQuantity = 15; + float expPrice = 50.00f; + ShirtService newShirtService1 = new ShirtService(); + Shirt newBlouse = newShirtService1.create(expShirtType, expBrand, expMaterial, expQuantity, expPrice); + //When + + //Then + Assertions.assertEquals(newBlouse, newShirtService1.find(expId)); + + + } + + @Test + public void findAllShirtTest(){ + //1 + //Shirt 1 + int expId = 1; + String expShirtType = "Button-Down"; + String expBrand = "Puma"; + String expMaterial = "Cotton"; + int expQuantity = 25; + float expPrice = 10.00f; + //Shirt 2 + int expId2 = 2; + String expShirtType2 = "Rain coat"; + String expBrand2 = "AE"; + String expMaterial2 = "Plastic"; + int expQuantity2 = 5; + float expPrice2 = 60.00f; + //2 + ShirtService newShirtService2 = new ShirtService(); + Shirt newButtonDown = newShirtService2.create(expShirtType, expBrand, expMaterial, expQuantity, expPrice); + Shirt newRainCoat = newShirtService2.create(expShirtType2, expBrand2, expMaterial2, expQuantity2, expPrice2); + //3 + Object[] actualShirtArray = new Shirt[2]; + actualShirtArray[0] = newButtonDown; + actualShirtArray[1] = newRainCoat; + //4 + Assertions.assertArrayEquals(actualShirtArray, newShirtService2.findAll()); + + } + + @Test + public void deleteShirtTest(){ + //1 + //Shirt 1 + int expId = 1; + String expShirtType = "Button-Up"; + String expBrand = "Happy"; + String expMaterial = "Silk"; + int expQuantity = 10; + float expPrice = 100.00f; + //Shirt 2 + int expId2 = 2; + String expShirtType2 = "Winter coat"; + String expBrand2 = "Panda"; + String expMaterial2 = "Feather"; + int expQuantity2 = 9; + float expPrice2 = 160.00f; + //2 + ShirtService newShirtService2 = new ShirtService(); + Shirt newButtonUp = newShirtService2.create(expShirtType, expBrand, expMaterial, expQuantity, expPrice); + Shirt newWinterCoat = newShirtService2.create(expShirtType2, expBrand2, expMaterial2, expQuantity2, expPrice2); + //3 + //Test 1 + boolean deleteResult = newShirtService2.delete(expId2); + Assertions.assertTrue(deleteResult); + + //Test 2 + Assertions.assertFalse(newShirtService2.delete(expId2)); + + + } } diff --git a/src/test/java/services/SneakerServiceTest.java b/src/test/java/services/SneakerServiceTest.java index 545bfbd..3c4af11 100644 --- a/src/test/java/services/SneakerServiceTest.java +++ b/src/test/java/services/SneakerServiceTest.java @@ -44,6 +44,7 @@ public void createTest(){ @Test public void findTest(){ //1 + //Sneaker 1 int expectedID = 1; String expectedName = "NitroBalance"; String expectedBrand = "Nike"; @@ -51,13 +52,24 @@ public void findTest(){ int expectedSize = 11; int expectedQty = 10; float expectedPrice = 75.00f; + //Sneaker2 + int expectedID2 = 2; + String expectedName2 = "RocketFeet"; + String expectedBrand2 = "NewBalance"; + String expectedSport2 = "Running"; + int expectedSize2 = 6; + int expectedQty2 = 20; + float expectedPrice2 = 90.00f; + //2 - SneakerService newSneakerService = new SneakerService(); - Sneaker newSneaker = newSneakerService.create(expectedName, expectedBrand, expectedSport, expectedSize, expectedQty, expectedPrice); + SneakerService newSneakerService1 = new SneakerService(); + //Making sneaker1 + Sneaker newSneaker = newSneakerService1.create(expectedName, expectedBrand, expectedSport, expectedSize, expectedQty, expectedPrice); + //Making sneaker2 + Sneaker newSneaker2 = newSneakerService1.create(expectedName2, expectedBrand2, expectedSport2, expectedSize2, expectedQty2, expectedPrice2); //3 - //4 - Assertions.assertEquals(newSneaker,newSneakerService.find(expectedID)); + Assertions.assertEquals(newSneaker2,newSneakerService1.find(expectedID2)); } /** From 49db4f84bc2836e38f27c7ce7bf35c8f4f89f39e Mon Sep 17 00:00:00 2001 From: Nathan Date: Sat, 3 Jul 2021 20:29:01 -0400 Subject: [PATCH 14/18] created io package and console class --- src/main/java/io/Console.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/main/java/io/Console.java diff --git a/src/main/java/io/Console.java b/src/main/java/io/Console.java new file mode 100644 index 0000000..ec35011 --- /dev/null +++ b/src/main/java/io/Console.java @@ -0,0 +1,12 @@ +package io; + +public class Console { + public static void printWelcome(){ + System.out.println("" + + "**************************************************" + + "*** Welcome and Bienvenue ***" + + "*** to ***" + + "*** Nathan's Inventory Manager ***" + + "**************************************************"); + } +} From 98263a7804ead46d516eb26658e47063349c09ea Mon Sep 17 00:00:00 2001 From: Nathan Date: Sun, 4 Jul 2021 00:20:54 -0400 Subject: [PATCH 15/18] Added a bunch of functionality to console class --- src/main/java/io/App.java | 26 ++++++++ src/main/java/io/Console.java | 104 ++++++++++++++++++++++++++++-- src/main/java/models/Sneaker.java | 1 + src/test/java/io/AppTest.java | 4 ++ src/test/java/io/ConsoleTest.java | 4 ++ 5 files changed, 135 insertions(+), 4 deletions(-) create mode 100644 src/main/java/io/App.java create mode 100644 src/test/java/io/AppTest.java create mode 100644 src/test/java/io/ConsoleTest.java diff --git a/src/main/java/io/App.java b/src/main/java/io/App.java new file mode 100644 index 0000000..8d8ae52 --- /dev/null +++ b/src/main/java/io/App.java @@ -0,0 +1,26 @@ +package io; + +import services.ShirtService; +import services.SneakerService; + +public class App { + private SneakerService sneakerService = new SneakerService(); + private ShirtService shirtService = new ShirtService(); + + public static void main(String... args) { + App application = new App(); + application.init(); + + } + + private void init() { + Console.printWelcome(); + Console.printOptions(); + Console.options(); + + } + + + + +} diff --git a/src/main/java/io/Console.java b/src/main/java/io/Console.java index ec35011..04ac46e 100644 --- a/src/main/java/io/Console.java +++ b/src/main/java/io/Console.java @@ -1,12 +1,108 @@ package io; +import services.ShirtService; +import services.SneakerService; + +import java.util.Locale; +import java.util.Scanner; + public class Console { + public SneakerService sneakerService = new SneakerService(); + public ShirtService shirtService = new ShirtService(); + public static void printWelcome(){ System.out.println("" + - "**************************************************" + - "*** Welcome and Bienvenue ***" + - "*** to ***" + - "*** Nathan's Inventory Manager ***" + + "**************************************************" + "\n" + + "*** Welcome and Bienvenue ***" + "\n" + + "*** to ***" + "\n" + + "*** Nathan's Inventory Manager ***" + "\n" + "**************************************************"); } + //Prints out the options for app + public static void printOptions() { + System.out.println("" + + "*****************************************" + "\n" + + "*** 1. Create new product ***" + "\n" + + "*** 2. View current inventory ***" + "\n" + + "*** 3. Update product ***" + "\n" + + "*** 4. View product reports ***" + "\n" + + "*** 5. Exit ***" + "\n" + + "*****************************************"); + } + + public static void print(String output, Object...args){ + System.out.printf(output, args); + } + + public static void println(String output, Object...args){ + print(output + "\n" + args); + } + + public static String getStringInput(String prompt) { + Scanner scanner = new Scanner(System.in); + println(prompt); + String userInput = scanner.nextLine(); + return userInput; + } + + public static Integer getIntegerInput(String prompt) { + Scanner scanner = new Scanner(System.in); + println(prompt); + int userInput = Integer.parseInt(scanner.nextLine()); + return userInput; + } + + public static Float getFloatInput(String prompt) { + Scanner scanner = new Scanner(System.in); + println(String.valueOf(prompt)); + Float userInput = Float.parseFloat((scanner.nextLine())); + return userInput; + } + + public static void options() { + boolean exitNow = false; + while(exitNow){ + Integer option = Console.getIntegerInput("Type number to choose option"); + switch (option) { + case 1: + makeNewProduct(); + break; + case 2: + //Do something + break; + case 3: + //Do something + break; + case 4: + //Do something + break; + case 5: + exitNow = true; + break; + } + } + + + } + + public static void makeNewProduct(){ + String productType = Console.getStringInput("Choose shirt or sneaker").toLowerCase(Locale.ROOT); + switch(productType) { + case "shirt": + //Male new shirt + + break; + case "sneaker": + //Make new sneaker + String name = Console.getStringInput("Enter sneaker name:"); + String brand = Console.getStringInput("Enter sneaker brand:"); + String sport = Console.getStringInput("Enter sneaker sport:"); + int size = Console.getIntegerInput("Enter sneaker size:"); + int qty = Console.getIntegerInput("Enter sneaker quantity:"); + float price = Console.getFloatInput("Enter price:"); + //sneakerService.create(name, brand, sport, size, qty, price); + break; + } + } + } diff --git a/src/main/java/models/Sneaker.java b/src/main/java/models/Sneaker.java index c3e12de..a406a42 100644 --- a/src/main/java/models/Sneaker.java +++ b/src/main/java/models/Sneaker.java @@ -25,6 +25,7 @@ public Sneaker(int id, String name, String brand, String sport, int size, int qu public void setName(String name){ this.name = name; } + public String getName(){ return this.name; } diff --git a/src/test/java/io/AppTest.java b/src/test/java/io/AppTest.java new file mode 100644 index 0000000..e29a925 --- /dev/null +++ b/src/test/java/io/AppTest.java @@ -0,0 +1,4 @@ +package io; + +public class AppTest { +} diff --git a/src/test/java/io/ConsoleTest.java b/src/test/java/io/ConsoleTest.java new file mode 100644 index 0000000..a5ea791 --- /dev/null +++ b/src/test/java/io/ConsoleTest.java @@ -0,0 +1,4 @@ +package io; + +public class ConsoleTest { +} From 9769e9e3da0657b3708862e1fe7ade73c881f04e Mon Sep 17 00:00:00 2001 From: Nathan Date: Sun, 4 Jul 2021 13:47:33 -0400 Subject: [PATCH 16/18] App works yey --- src/main/java/io/App.java | 13 +--- src/main/java/io/Console.java | 54 ++++--------- src/main/java/io/Inventory.java | 91 ++++++++++++++++++++++ src/main/java/models/Shirt.java | 2 - src/main/java/services/ShirtService.java | 6 +- src/main/java/services/SneakerService.java | 4 +- 6 files changed, 110 insertions(+), 60 deletions(-) create mode 100644 src/main/java/io/Inventory.java diff --git a/src/main/java/io/App.java b/src/main/java/io/App.java index 8d8ae52..ae1c7fc 100644 --- a/src/main/java/io/App.java +++ b/src/main/java/io/App.java @@ -1,26 +1,15 @@ package io; -import services.ShirtService; -import services.SneakerService; - public class App { - private SneakerService sneakerService = new SneakerService(); - private ShirtService shirtService = new ShirtService(); - public static void main(String... args) { App application = new App(); + Inventory.putSomeItemsInInventory(); application.init(); - } - private void init() { Console.printWelcome(); Console.printOptions(); Console.options(); - } - - - } diff --git a/src/main/java/io/Console.java b/src/main/java/io/Console.java index 04ac46e..903c3c1 100644 --- a/src/main/java/io/Console.java +++ b/src/main/java/io/Console.java @@ -1,14 +1,8 @@ package io; -import services.ShirtService; -import services.SneakerService; - -import java.util.Locale; import java.util.Scanner; public class Console { - public SneakerService sneakerService = new SneakerService(); - public ShirtService shirtService = new ShirtService(); public static void printWelcome(){ System.out.println("" + @@ -41,68 +35,46 @@ public static void println(String output, Object...args){ public static String getStringInput(String prompt) { Scanner scanner = new Scanner(System.in); println(prompt); - String userInput = scanner.nextLine(); - return userInput; + return scanner.nextLine(); } public static Integer getIntegerInput(String prompt) { Scanner scanner = new Scanner(System.in); println(prompt); - int userInput = Integer.parseInt(scanner.nextLine()); - return userInput; + return Integer.parseInt(scanner.nextLine()); } public static Float getFloatInput(String prompt) { Scanner scanner = new Scanner(System.in); println(String.valueOf(prompt)); - Float userInput = Float.parseFloat((scanner.nextLine())); - return userInput; + return Float.parseFloat((scanner.nextLine())); } public static void options() { boolean exitNow = false; - while(exitNow){ - Integer option = Console.getIntegerInput("Type number to choose option"); + while(exitNow == false){ + Integer option = Console.getIntegerInput("Type number to choose option:"); switch (option) { case 1: - makeNewProduct(); + Inventory.makeNewProduct(); break; case 2: - //Do something + //View current inventory + Inventory.viewInventory(); break; case 3: - //Do something + //Update product - delete product + Inventory.removeProduct(); break; case 4: - //Do something + //View product reports + Inventory.viewProduct(); break; case 5: + //Exit exitNow = true; break; } } - - - } - - public static void makeNewProduct(){ - String productType = Console.getStringInput("Choose shirt or sneaker").toLowerCase(Locale.ROOT); - switch(productType) { - case "shirt": - //Male new shirt - - break; - case "sneaker": - //Make new sneaker - String name = Console.getStringInput("Enter sneaker name:"); - String brand = Console.getStringInput("Enter sneaker brand:"); - String sport = Console.getStringInput("Enter sneaker sport:"); - int size = Console.getIntegerInput("Enter sneaker size:"); - int qty = Console.getIntegerInput("Enter sneaker quantity:"); - float price = Console.getFloatInput("Enter price:"); - //sneakerService.create(name, brand, sport, size, qty, price); - break; - } } - } diff --git a/src/main/java/io/Inventory.java b/src/main/java/io/Inventory.java new file mode 100644 index 0000000..7517e68 --- /dev/null +++ b/src/main/java/io/Inventory.java @@ -0,0 +1,91 @@ +package io; + +import models.Shirt; +import models.Sneaker; +import services.ShirtService; +import services.SneakerService; + +import java.util.ArrayList; +import java.util.Locale; + +public class Inventory { + static SneakerService sneakerService = new SneakerService(); + static ShirtService shirtService = new ShirtService(); + + static void putSomeItemsInInventory() { + sneakerService.create("NitroBalance", "Nike", "Running", 8, 15, 60.00f); + sneakerService.create("RainbowFeet", "Adidas", "Soccer", 7, 20, 55.00f); + sneakerService.create("BubbleGum", "Puma", "Dance", 6, 10, 70.00f); + shirtService.create("Vneck", "Jcrew", "Cotton", 25, 20.00f); + shirtService.create("Button-Down", "FruitDeLoom", "Cotton", 50, 10.00f); + shirtService.create("Sweater", "Nautica", "Wool", 15, 45.00f); + } + + + static void viewInventory(){ + ArrayList wholeInventory = new ArrayList<>(); + for (Shirt shirt: shirtService.findAll()) { + wholeInventory.add(shirt.getShirtType()); + } + for (Sneaker sneaker: sneakerService.findAll()) { + wholeInventory.add(sneaker.getName()); + } + String readOut = wholeInventory.toString(); + Console.println("The current inventory has: " + readOut.substring(1, readOut.length()-1 )); + } + + static void viewProduct() { + String productType = Console.getStringInput("Shirts or Sneakers?"); + switch (productType.toLowerCase(Locale.ROOT)) { + case "shirts": + Integer viewThisShirt = Console.getIntegerInput("Enter item ID to view"); + shirtService.find(viewThisShirt); + break; + case "sneaker": + Integer viewThisSneaker = Console.getIntegerInput("Enter item ID to view"); + sneakerService.find(viewThisSneaker); + break; + } + } + + static void removeProduct() { + String productType = Console.getStringInput("Shirts or Sneakers?"); + switch (productType.toLowerCase(Locale.ROOT)){ + case "shirts": + Integer deleteThisShirt = Console.getIntegerInput("Enter item ID to delete"); + shirtService.delete(deleteThisShirt); + break; + case "sneakers": + Integer deleteThisSneaker = Console.getIntegerInput("Enter item ID to delete"); + sneakerService.delete(deleteThisSneaker); + break; + } + } + + public static void makeNewProduct(){ + String productType = Console.getStringInput("Choose shirt or sneaker").toLowerCase(Locale.ROOT); + switch(productType) { + case "shirt": + //Male new shirt + String shirtType = Console.getStringInput("Enter shirt type:"); + String shirtBrand = Console.getStringInput("Enter shirt brand:"); + String shirtMaterial = Console.getStringInput("Enter shirt material:"); + int shirtQuantity = Console.getIntegerInput("Enter quantity:");; + float shirtPrice = Console.getFloatInput("Enter price"); + shirtService.create(shirtType, shirtBrand, shirtMaterial, shirtQuantity, shirtPrice); + + break; + case "sneaker": + //Make new sneaker + String sneakerName = Console.getStringInput("Enter sneaker name:"); + String sneakerBrand = Console.getStringInput("Enter sneaker brand:"); + String sneakerSport = Console.getStringInput("Enter sneaker sport:"); + int sneakerSize = Console.getIntegerInput("Enter sneaker size:"); + int sneakerQty = Console.getIntegerInput("Enter quantity:"); + float sneakerPrice = Console.getFloatInput("Enter price:"); + sneakerService.create(sneakerName, sneakerBrand, sneakerSport, sneakerSize, sneakerQty, sneakerPrice); + break; + } + } + +} diff --git a/src/main/java/models/Shirt.java b/src/main/java/models/Shirt.java index fb96312..a5d7463 100644 --- a/src/main/java/models/Shirt.java +++ b/src/main/java/models/Shirt.java @@ -1,7 +1,5 @@ package models; -import java.util.ArrayList; - public class Shirt { private int id; private String shirtType; diff --git a/src/main/java/services/ShirtService.java b/src/main/java/services/ShirtService.java index 4cd9911..1fea93a 100644 --- a/src/main/java/services/ShirtService.java +++ b/src/main/java/services/ShirtService.java @@ -9,7 +9,7 @@ public class ShirtService { //ID for each shirt private static int nextID = 1; //ArrayList 'inventory' to hold all shirts - private ArrayList inventory = new ArrayList<>(); + private static ArrayList inventory = new ArrayList<>(); //Method to create a new shirt and add to inventory public Shirt create(String shirtType, String brand, String material, int quantity, float price) { @@ -30,8 +30,8 @@ public Object find(int id) { return null; } - public Object[] findAll() { - return inventory.toArray(); + public Shirt[] findAll() { + return inventory.toArray(new Shirt[0]); } public boolean delete(int id) { diff --git a/src/main/java/services/SneakerService.java b/src/main/java/services/SneakerService.java index 4e0419b..a3bb700 100644 --- a/src/main/java/services/SneakerService.java +++ b/src/main/java/services/SneakerService.java @@ -31,8 +31,8 @@ public Object find(int id) { return null; } - public Object[] findAll() { - return inventory.toArray(); + public Sneaker[] findAll() { + return inventory.toArray(new Sneaker[0]); } public boolean delete(int id) { From c5538eb54e37f331ec8f17fb22847e585fd63571 Mon Sep 17 00:00:00 2001 From: Nathan Date: Mon, 5 Jul 2021 20:58:30 -0400 Subject: [PATCH 17/18] Finished lab --- pom.xml | 5 ++ src/main/java/io/App.java | 15 +++- src/main/java/io/Console.java | 2 + src/main/java/io/Inventory.java | 18 +++-- src/main/java/models/Sneaker.java | 7 +- src/main/java/services/CSVUtils.java | 29 +++++++ src/main/java/services/SneakerService.java | 80 ++++++++++++++++++- src/test/java/models/SneakerTest.java | 4 +- .../java/services/SneakerServiceTest.java | 18 ++--- 9 files changed, 147 insertions(+), 31 deletions(-) create mode 100644 src/main/java/services/CSVUtils.java diff --git a/pom.xml b/pom.xml index b36c574..5c25a7e 100644 --- a/pom.xml +++ b/pom.xml @@ -22,6 +22,11 @@ + + com.fasterxml.jackson.core + jackson-databind + 2.10.1 + org.junit.jupiter junit-jupiter-engine diff --git a/src/main/java/io/App.java b/src/main/java/io/App.java index ae1c7fc..5d45483 100644 --- a/src/main/java/io/App.java +++ b/src/main/java/io/App.java @@ -1,15 +1,26 @@ package io; +import services.SneakerService; + +import java.io.IOException; public class App { - public static void main(String... args) { + public static void main(String... args) throws IOException { + App application = new App(); Inventory.putSomeItemsInInventory(); application.init(); + + // Creating a new CSV file + //SneakerService.makeCSVfile(); + } - private void init() { + private void init() throws IOException { Console.printWelcome(); Console.printOptions(); Console.options(); + //SneakerService.makeCSVfile(); + SneakerService.loadData(); + } } diff --git a/src/main/java/io/Console.java b/src/main/java/io/Console.java index 903c3c1..3a96da4 100644 --- a/src/main/java/io/Console.java +++ b/src/main/java/io/Console.java @@ -77,4 +77,6 @@ public static void options() { } } } + + } diff --git a/src/main/java/io/Inventory.java b/src/main/java/io/Inventory.java index 7517e68..d7f1b7f 100644 --- a/src/main/java/io/Inventory.java +++ b/src/main/java/io/Inventory.java @@ -2,10 +2,14 @@ import models.Shirt; import models.Sneaker; +import services.CSVUtils; import services.ShirtService; import services.SneakerService; +import java.io.FileWriter; import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import java.util.Locale; public class Inventory { @@ -13,9 +17,9 @@ public class Inventory { static ShirtService shirtService = new ShirtService(); static void putSomeItemsInInventory() { - sneakerService.create("NitroBalance", "Nike", "Running", 8, 15, 60.00f); - sneakerService.create("RainbowFeet", "Adidas", "Soccer", 7, 20, 55.00f); - sneakerService.create("BubbleGum", "Puma", "Dance", 6, 10, 70.00f); + sneakerService.create("NitroBalance", "Nike", "Running", 8, 60.00f); + sneakerService.create("RainbowFeet", "Adidas", "Soccer", 7, 55.00f); + sneakerService.create("BubbleGum", "Puma", "Dance", 6, 70.00f); shirtService.create("Vneck", "Jcrew", "Cotton", 25, 20.00f); shirtService.create("Button-Down", "FruitDeLoom", "Cotton", 50, 10.00f); shirtService.create("Sweater", "Nautica", "Wool", 15, 45.00f); @@ -39,11 +43,11 @@ static void viewProduct() { switch (productType.toLowerCase(Locale.ROOT)) { case "shirts": Integer viewThisShirt = Console.getIntegerInput("Enter item ID to view"); - shirtService.find(viewThisShirt); + Console.println("" + shirtService.find(viewThisShirt).toString()); break; case "sneaker": Integer viewThisSneaker = Console.getIntegerInput("Enter item ID to view"); - sneakerService.find(viewThisSneaker); + Console.println("" + sneakerService.find(viewThisSneaker).toString()); break; } } @@ -70,7 +74,7 @@ public static void makeNewProduct(){ String shirtType = Console.getStringInput("Enter shirt type:"); String shirtBrand = Console.getStringInput("Enter shirt brand:"); String shirtMaterial = Console.getStringInput("Enter shirt material:"); - int shirtQuantity = Console.getIntegerInput("Enter quantity:");; + int shirtQuantity = Console.getIntegerInput("Enter quantity:"); float shirtPrice = Console.getFloatInput("Enter price"); shirtService.create(shirtType, shirtBrand, shirtMaterial, shirtQuantity, shirtPrice); @@ -83,7 +87,7 @@ public static void makeNewProduct(){ int sneakerSize = Console.getIntegerInput("Enter sneaker size:"); int sneakerQty = Console.getIntegerInput("Enter quantity:"); float sneakerPrice = Console.getFloatInput("Enter price:"); - sneakerService.create(sneakerName, sneakerBrand, sneakerSport, sneakerSize, sneakerQty, sneakerPrice); + sneakerService.create(sneakerName, sneakerBrand, sneakerSport, sneakerQty, sneakerPrice); break; } } diff --git a/src/main/java/models/Sneaker.java b/src/main/java/models/Sneaker.java index a406a42..e26f567 100644 --- a/src/main/java/models/Sneaker.java +++ b/src/main/java/models/Sneaker.java @@ -12,16 +12,16 @@ public class Sneaker { public Sneaker(){ } - public Sneaker(int id, String name, String brand, String sport, int size, int quantity, float price) { + public Sneaker(int id, String name, String brand, String sport, int qyt, float price) { this.id = id; this.name = name; this.brand = brand; this.sport = sport; - this.size = size; - this.quantity = quantity; + this.quantity = qyt; this.price = price; } + public void setName(String name){ this.name = name; } @@ -77,4 +77,5 @@ public int getId() { public void setID(int id){ this.id = id; } + } diff --git a/src/main/java/services/CSVUtils.java b/src/main/java/services/CSVUtils.java new file mode 100644 index 0000000..9d40053 --- /dev/null +++ b/src/main/java/services/CSVUtils.java @@ -0,0 +1,29 @@ +package services; + +import java.io.IOException; +import java.io.Writer; +import java.util.List; + +public class CSVUtils { + private static final char DEFAULT_SEPARATOR = ','; // (1) + + // (2) + public static void writeLine(Writer w, List values) throws IOException { + boolean first = true; + + StringBuilder sb = new StringBuilder(); + + // (3) + for (String value : values) { + if (!first) { + sb.append(DEFAULT_SEPARATOR); + } + sb.append(value); + first = false; + } + sb.append("\n"); + + w.append(sb.toString()); // (4) + } + +} diff --git a/src/main/java/services/SneakerService.java b/src/main/java/services/SneakerService.java index a3bb700..6734ea7 100644 --- a/src/main/java/services/SneakerService.java +++ b/src/main/java/services/SneakerService.java @@ -1,19 +1,27 @@ package services; +import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectWriter; +import jdk.internal.org.objectweb.asm.TypeReference; import models.Sneaker; +import java.io.*; +import java.lang.reflect.Array; import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; public class SneakerService { //Generate an int ID for the each sneaker public static int nextID = 1; //Create an inventory arrayList for sneakers - private ArrayList inventory = new ArrayList<>(); + private static ArrayList inventory = new ArrayList<>(); //Creates a new sneaker object and add it to the inventory. - public Sneaker create(String name, String brand, String sport, int size, int qty, float price) { + public Sneaker create(String name, String brand, String sport, int qty, float price) { //2 - Sneaker createdSneaker = new Sneaker(nextID++, name, brand, sport, size, qty, price); + Sneaker createdSneaker = new Sneaker(nextID++, name, brand, sport, qty, price); //3 inventory.add(createdSneaker); //4 @@ -45,5 +53,69 @@ public boolean delete(int id) { return false; } - // + public static void makeCSVfile() throws IOException { + String csvFile = "/Users/nathan/Desktop/Sneaker.csv"; + FileWriter writer = new FileWriter(csvFile); //(1) + + CSVUtils.writeLine(writer, new ArrayList(Arrays.asList(String.valueOf(nextID)))); // (2) + + for (Sneaker s : inventory) { + List list = new ArrayList<>(); // (3) + list.add(String.valueOf(s.getId())); + list.add(s.getName()); + list.add(s.getBrand()); + list.add(s.getSport()); + list.add(String.valueOf(s.getQuantity())); + list.add(String.valueOf(s.getPrice())); + + CSVUtils.writeLine(writer, list); // (4) + } + + // (5) + writer.flush(); + writer.close(); + } + + public static void loadData(){ + // (1) + String csvFile = "/Users/nathan/Desktop/Sneaker.csv"; + String line = ""; + String csvSplitBy = ","; + + // (2) + try (BufferedReader br = new BufferedReader(new FileReader(csvFile))) { + nextID = Integer.parseInt(br.readLine()); // (3) + + while ((line = br.readLine()) != null) { + // split line with comma + String[] beer = line.split(csvSplitBy); + + // (4) + int id = Integer.parseInt(beer[0]); + String name = beer[1]; + String brand = beer[2]; + String sport = beer[3]; + int qty = Integer.parseInt(beer[4]); + float price = Float.parseFloat(beer[5]); + + // (5) + inventory.add(new Sneaker(id, name, brand, sport, qty, price)); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + +// public void readInJSON(){ +// ObjectMapper objectMapper = new ObjectMapper(); +// inventory = objectMapper.readValue(new File("sneaker.json"), new TypeReference>(){}); +// } + + public void writeInJSON() throws IOException { + ObjectMapper mapper = new ObjectMapper(); + ObjectWriter writer = mapper.writer(new DefaultPrettyPrinter()); + writer.writeValue(new File("sneaker.json"), inventory); + } + + } diff --git a/src/test/java/models/SneakerTest.java b/src/test/java/models/SneakerTest.java index 9bbbdcf..1271030 100644 --- a/src/test/java/models/SneakerTest.java +++ b/src/test/java/models/SneakerTest.java @@ -72,17 +72,15 @@ public void constructorTest() { String expectedName = "SpeedForce"; String expectedBrand = "Sketchers"; String expectedSport = "Training"; - int expectedSize = 8; int expectedQuantity = 26; float expectedPrice = 78.99f; //When - Sneaker testSneaker = new Sneaker(expectedID,expectedName, expectedBrand, expectedSport, expectedSize, expectedQuantity, expectedPrice); + Sneaker testSneaker = new Sneaker(expectedID,expectedName, expectedBrand, expectedSport, expectedQuantity, expectedPrice); //Then Assertions.assertEquals(expectedID, testSneaker.getId()); Assertions.assertEquals(expectedName, testSneaker.getName()); Assertions.assertEquals(expectedBrand, testSneaker.getBrand()); Assertions.assertEquals(expectedSport, testSneaker.getSport()); - Assertions.assertEquals(expectedSize, testSneaker.getSize()); Assertions.assertEquals(expectedQuantity, testSneaker.getQuantity()); Assertions.assertEquals(expectedPrice, testSneaker.getPrice()); diff --git a/src/test/java/services/SneakerServiceTest.java b/src/test/java/services/SneakerServiceTest.java index 3c4af11..12a320d 100644 --- a/src/test/java/services/SneakerServiceTest.java +++ b/src/test/java/services/SneakerServiceTest.java @@ -19,7 +19,7 @@ public void createTest(){ //2 SneakerService newSneakerService = new SneakerService(); - Sneaker testSneaker = newSneakerService.create(expectedName, expectedBrand, expectedSport, expectedSize, expectedQty, expectedPrice); + Sneaker testSneaker = newSneakerService.create(expectedName, expectedBrand, expectedSport, expectedQty, expectedPrice); //3 int actualId = testSneaker.getId(); String actualName = testSneaker.getName(); @@ -33,7 +33,6 @@ public void createTest(){ Assertions.assertEquals(expectedName, actualName); Assertions.assertEquals(expectedBrand, actualBrand); Assertions.assertEquals(expectedSport, actualSport); - Assertions.assertEquals(expectedSize, actualSize); Assertions.assertEquals(expectedQty, actualQty); Assertions.assertEquals(expectedPrice, actualPrice); } @@ -49,7 +48,6 @@ public void findTest(){ String expectedName = "NitroBalance"; String expectedBrand = "Nike"; String expectedSport = "Basket Ball"; - int expectedSize = 11; int expectedQty = 10; float expectedPrice = 75.00f; //Sneaker2 @@ -57,16 +55,15 @@ public void findTest(){ String expectedName2 = "RocketFeet"; String expectedBrand2 = "NewBalance"; String expectedSport2 = "Running"; - int expectedSize2 = 6; int expectedQty2 = 20; float expectedPrice2 = 90.00f; //2 SneakerService newSneakerService1 = new SneakerService(); //Making sneaker1 - Sneaker newSneaker = newSneakerService1.create(expectedName, expectedBrand, expectedSport, expectedSize, expectedQty, expectedPrice); + Sneaker newSneaker = newSneakerService1.create(expectedName, expectedBrand, expectedSport, expectedQty, expectedPrice); //Making sneaker2 - Sneaker newSneaker2 = newSneakerService1.create(expectedName2, expectedBrand2, expectedSport2, expectedSize2, expectedQty2, expectedPrice2); + Sneaker newSneaker2 = newSneakerService1.create(expectedName2, expectedBrand2, expectedSport2, expectedQty2, expectedPrice2); //3 //4 Assertions.assertEquals(newSneaker2,newSneakerService1.find(expectedID2)); @@ -85,12 +82,11 @@ public void sneakerServiceFindAllTest() { String expectedName = "NitroBalance"; String expectedBrand = "Nike"; String expectedSport = "Basket Ball"; - int expectedSize = 11; int expectedQty = 10; float expectedPrice = 75.00f; //2 SneakerService newSneakerService = new SneakerService(); - Sneaker newSneaker = newSneakerService.create(expectedName, expectedBrand, expectedSport, expectedSize, expectedQty, expectedPrice); + Sneaker newSneaker = newSneakerService.create(expectedName, expectedBrand, expectedSport, expectedQty, expectedPrice); //3 Object[] actualSneakerArray = new Sneaker[1]; actualSneakerArray[0] = newSneaker; @@ -112,7 +108,6 @@ public void SneakerServiceDeleteTest(){ String expectedName = "NitroBalance"; String expectedBrand = "Nike"; String expectedSport = "Basket Ball"; - int expectedSize = 11; int expectedQty = 10; float expectedPrice = 75.00f; @@ -120,14 +115,13 @@ public void SneakerServiceDeleteTest(){ String expectedName2 = "BubbleGum"; String expectedBrand2 = "Adidas"; String expectedSport2 = "Tennis"; - int expectedSize2 = 9; int expectedQty2 = 20; float expectedPrice2 = 80.00f; //2 SneakerService newSneakerService = new SneakerService(); - Sneaker newSneaker1 = newSneakerService.create(expectedName, expectedBrand, expectedSport, expectedSize, expectedQty, expectedPrice); - Sneaker newSneaker2 = newSneakerService.create(expectedName2, expectedBrand2, expectedSport2, expectedSize2, expectedQty2, expectedPrice2); + Sneaker newSneaker1 = newSneakerService.create(expectedName, expectedBrand, expectedSport, expectedQty, expectedPrice); + Sneaker newSneaker2 = newSneakerService.create(expectedName2, expectedBrand2, expectedSport2, expectedQty2, expectedPrice2); //Test 1 boolean deleteResult = newSneakerService.delete(expectedID2); From 24c1b19c4fd1c7bfd76b5b12095f9a29f011d159 Mon Sep 17 00:00:00 2001 From: Nathan Date: Mon, 5 Jul 2021 20:59:08 -0400 Subject: [PATCH 18/18] Finished section 5 --- src/main/java/services/SneakerService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/services/SneakerService.java b/src/main/java/services/SneakerService.java index 6734ea7..12824dc 100644 --- a/src/main/java/services/SneakerService.java +++ b/src/main/java/services/SneakerService.java @@ -106,10 +106,10 @@ public static void loadData(){ } } -// public void readInJSON(){ -// ObjectMapper objectMapper = new ObjectMapper(); -// inventory = objectMapper.readValue(new File("sneaker.json"), new TypeReference>(){}); -// } + public void readInJSON(){ + ObjectMapper objectMapper = new ObjectMapper(); + inventory = objectMapper.readValue(new File("sneaker.json"), new TypeReference>(){}); + } public void writeInJSON() throws IOException { ObjectMapper mapper = new ObjectMapper();