From ae874fa62e01bc6e78539cb0c14c4af9eafe49e4 Mon Sep 17 00:00:00 2001 From: vaidehi4321 <56602405+vaidehi4321@users.noreply.github.com> Date: Sat, 26 Oct 2019 16:05:17 -0400 Subject: [PATCH 1/8] add junit testing suite --- ProductInventoryLab.iml | 2 -- pom.xml | 15 ++++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) delete mode 100644 ProductInventoryLab.iml diff --git a/ProductInventoryLab.iml b/ProductInventoryLab.iml deleted file mode 100644 index 78b2cc5..0000000 --- a/ProductInventoryLab.iml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file 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 3512212e6e7ebd429a539463fa0b6aeab8395f6e Mon Sep 17 00:00:00 2001 From: vaidehi4321 <56602405+vaidehi4321@users.noreply.github.com> Date: Sat, 26 Oct 2019 17:15:43 -0400 Subject: [PATCH 2/8] 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 7f9539d7d7f9bb01ebc218aa0a8d80145d612fe4 Mon Sep 17 00:00:00 2001 From: vaidehi4321 <56602405+vaidehi4321@users.noreply.github.com> Date: Fri, 22 Nov 2019 13:24:51 -0500 Subject: [PATCH 3/8] second part done --- pom.xml | 10 ++- src/main/java/models/Sneaker.java | 74 +++++++++++++++++++ src/main/java/services/SneakerService.java | 12 +++ src/test/java/models/SneakerTest.java | 38 ++++++++++ .../java/services/SneakerServiceTest.java | 34 ++++++++- 5 files changed, 165 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index b36c574..99773ec 100644 --- a/pom.xml +++ b/pom.xml @@ -25,13 +25,19 @@ org.junit.jupiter junit-jupiter-engine - 5.4.2 + 4.1.2 test org.junit.jupiter junit-jupiter-api - 5.4.2 + 4.1.2 + test + + + junit + junit + 4.12 test diff --git a/src/main/java/models/Sneaker.java b/src/main/java/models/Sneaker.java index fa150ec..2d9387e 100644 --- a/src/main/java/models/Sneaker.java +++ b/src/main/java/models/Sneaker.java @@ -1,4 +1,78 @@ package models; public class Sneaker { + private int id; + private String name; + private String brand; + private String sport; + private float size; + private int qty; + private float price; + + + public Sneaker(int id, String name, String brand, String sport, float size, int qty, float price) { + this.id = id; + this.name = name; + this.brand = brand; + this.sport = sport; + this.size = size; + this.qty = qty; + this.price = price; + } + + public int getId() { + return id; + } + + public String getName() { + return name; + } + + public String getBrand() { + return brand; + } + + public String getSport() { + return sport; + } + + public float getSize() { + return size; + } + + public int getQty() { + return qty; + } + + public float getPrice() { + return price; + } + + public void setId(int id) { + this.id = id; + } + + public void setName(String name) { + this.name = name; + } + + public void setBrand(String brand) { + this.brand = brand; + } + + public void setSport(String sport) { + this.sport = sport; + } + + public void setSize(int size) { + this.size = size; + } + + public void setQty(int qty) { + this.qty = qty; + } + + public void setPrice(float price) { + this.price = price; + } } diff --git a/src/main/java/services/SneakerService.java b/src/main/java/services/SneakerService.java index a022353..4f0ea62 100644 --- a/src/main/java/services/SneakerService.java +++ b/src/main/java/services/SneakerService.java @@ -1,4 +1,16 @@ package services; +import models.Sneaker; + +import java.util.ArrayList; +import java.util.List; + public class SneakerService { + private static int nextId = 1; + private ArrayList inventory=new ArrayList<>(); +public Sneaker create(String name, String brand, String sport, float size, int quantity, float price){ + Sneaker sneaker = new Sneaker(nextId++, name, brand, sport, size, quantity, price); + inventory.add(sneaker); + return sneaker; +} } diff --git a/src/test/java/models/SneakerTest.java b/src/test/java/models/SneakerTest.java index c63eae0..0ac96c6 100644 --- a/src/test/java/models/SneakerTest.java +++ b/src/test/java/models/SneakerTest.java @@ -1,4 +1,42 @@ package models; + +import org.junit.Assert; +import org.junit.Test; +//import org.junit.jupiter.api.Test; +//import org.junit.jupiter.api.TestTemplate; + + + public class SneakerTest { + @Test + public void nameTest(){ + Sneaker sneaker=new Sneaker(6,"","","",10,2,99.90f); + int expectedId = 6; + String expectedName = "Stan Smith"; + String expectedBrand = "Adidas"; + String expectedSport = "Tennnis"; + int expectedQty = 10; + float expectedPrice = 80.00f; + } + @Test + public void constructorTest(){ + + int expectedId = 6; + String expectedName = "Stan Smith"; + String expectedBrand = "Adidas"; + String expectedSport = "Tennnis"; + float expectedSize=10f; + int expectedQty = 10; + float expectedPrice = 80.00f; + Sneaker sneaker=new Sneaker(expectedId,expectedName,expectedBrand,expectedSport,expectedSize,expectedQty,expectedPrice); + Assert.assertEquals(expectedId, sneaker.getId()); + Assert.assertEquals(expectedName, sneaker.getName()); + Assert.assertEquals(expectedBrand, sneaker.getBrand()); + Assert.assertEquals(expectedSport, sneaker.getSport()); + Assert.assertEquals(expectedQty, sneaker.getQty()); + Assert.assertEquals(expectedPrice, sneaker.getPrice(),0.0); + + } + } diff --git a/src/test/java/services/SneakerServiceTest.java b/src/test/java/services/SneakerServiceTest.java index 3ae2e9a..6d2ad51 100644 --- a/src/test/java/services/SneakerServiceTest.java +++ b/src/test/java/services/SneakerServiceTest.java @@ -1,4 +1,36 @@ package services; +import models.Sneaker; +import org.junit.Assert; +import org.junit.Test; + public class SneakerServiceTest { -} + @Test + public void createTest() { + + // (1) + String expectedName = "Stan Smith"; + String expectedBrand = "Adidas"; + String expectedSport = "Tennis"; + float expectedSize = 10.5f; + int expectedQty = 10; + float expectedPrice = 80.00f; + SneakerService sneakerService = new SneakerService(); + Sneaker sneaker=sneakerService.create(expectedName,expectedBrand,expectedSport,expectedSize,expectedQty,expectedPrice); + int actualId = sneaker.getId(); + String actualName = sneaker.getName(); + String actualBrand = sneaker.getBrand(); + String actualSport = sneaker.getSport(); + float actualSize = sneaker.getSize(); + int actualQty = sneaker.getQty(); + float actualPrice = sneaker.getPrice(); + Assert.assertEquals(Integer.class.getName(), new Integer(actualId).getClass().getName()); + Assert.assertEquals(expectedName, actualName); + Assert.assertEquals(expectedBrand, actualBrand); + Assert.assertEquals(expectedSport, actualSport); + Assert.assertEquals(expectedSize, actualSize,0.0); + Assert.assertEquals(expectedQty, actualQty); + Assert.assertEquals(expectedPrice, actualPrice,0.0); + + } +} \ No newline at end of file From 5846f9c714d3a230b462f2ef386fa9c59ae3b835 Mon Sep 17 00:00:00 2001 From: vaidehi4321 <56602405+vaidehi4321@users.noreply.github.com> Date: Wed, 27 Nov 2019 17:53:56 -0500 Subject: [PATCH 4/8] done part 2 --- src/main/java/models/Sneaker.java | 15 ++++- src/main/java/models/Whiskey.java | 1 + src/main/java/services/SneakerService.java | 42 ++++++++++--- src/test/java/models/SneakerTest.java | 59 ++++++++++++++++--- .../java/services/SneakerServiceTest.java | 51 ++++++++++++++++ 5 files changed, 153 insertions(+), 15 deletions(-) diff --git a/src/main/java/models/Sneaker.java b/src/main/java/models/Sneaker.java index 2d9387e..11783e1 100644 --- a/src/main/java/models/Sneaker.java +++ b/src/main/java/models/Sneaker.java @@ -64,7 +64,7 @@ public void setSport(String sport) { this.sport = sport; } - public void setSize(int size) { + public void setSize(float size) { this.size = size; } @@ -75,4 +75,17 @@ public void setQty(int qty) { public void setPrice(float price) { this.price = price; } + + @Override + public String toString() { + return "Sneaker{" + + "id=" + id + + ", name='" + name + '\'' + + ", brand='" + brand + '\'' + + ", sport='" + sport + '\'' + + ", size=" + size + + ", qty=" + qty + + ", price=" + price + + '}'; + } } diff --git a/src/main/java/models/Whiskey.java b/src/main/java/models/Whiskey.java index bb9e5d5..a21721c 100644 --- a/src/main/java/models/Whiskey.java +++ b/src/main/java/models/Whiskey.java @@ -1,4 +1,5 @@ package models; public class Whiskey { + } diff --git a/src/main/java/services/SneakerService.java b/src/main/java/services/SneakerService.java index 4f0ea62..d8b6e70 100644 --- a/src/main/java/services/SneakerService.java +++ b/src/main/java/services/SneakerService.java @@ -7,10 +7,38 @@ public class SneakerService { private static int nextId = 1; - private ArrayList inventory=new ArrayList<>(); -public Sneaker create(String name, String brand, String sport, float size, int quantity, float price){ - Sneaker sneaker = new Sneaker(nextId++, name, brand, sport, size, quantity, price); - inventory.add(sneaker); - return sneaker; -} -} + private ArrayList inventory = new ArrayList<>(); + + public Sneaker create(String name, String brand, String sport, float size, int quantity, float price) { + Sneaker sneaker = new Sneaker(nextId++, name, brand, sport, size, quantity, price); + inventory.add(sneaker); + return sneaker; + } + + public Sneaker findSneaker(int id) { + for (int i = 0; i < inventory.size(); i++) { + if (inventory.get(i).getId() == id) + return inventory.get(i); + } + return null; + + } + public Sneaker[] findAll() { + Sneaker[] sneakersArr=new Sneaker[inventory.size()]; + for(int i=0; i< inventory.size(); i++){ + sneakersArr[i] = inventory.get(i); + } + + return sneakersArr; + } + public boolean delete(int id) { + for(int i=0; iinventory=new ArrayList<>(); + @Before + public void setUp(){ + sneakerService.create("rosy","fitFlop","badminton",4.5f,1,90.99f); + sneakerService.create("navy","lotus","cricket",3.0f,4,45.00f); + } + @Test public void createTest() { @@ -33,4 +45,43 @@ public void createTest() { Assert.assertEquals(expectedPrice, actualPrice,0.0); } + + @Test + public void findSneakerTest(){ + // int expectedId = 1; + String expectedName = "Mary Jane"; + String expectedBrand = "Bata"; + String expectedSport = "soccer"; + float expectedSize = 6.5f; + int expectedQty = 5; + float expectedPrice = 60.00f; + Sneaker expected = sneakerService.create(expectedName,expectedBrand,expectedSport,expectedSize,expectedQty,expectedPrice); + Sneaker actual = sneakerService.findSneaker(1); + Assert.assertEquals(expected,actual); + + } + @Test + public void testFindAll(){ + Sneaker[]actual= sneakerService.findAll(); + // Sneaker[] expected = + for (int i = 0; i < inventory.size(); i++) { + System.out.printf(inventory.get(i).toString()); + + } + System.out.println(Arrays.toString(actual)); + System.out.println(actual.length); + } + +@Test + public void deleteTest(){ + Boolean b = sneakerService.delete(1); + Sneaker s2 = sneakerService.findSneaker(2); + //System.out.println(expected); + Sneaker s1 = sneakerService.findSneaker(1); + Assert.assertNull(s1); + Assert.assertNotNull(s2); + + +} + } \ No newline at end of file From 7190a32aa2f53762598f1632d324b3b492a6c73c Mon Sep 17 00:00:00 2001 From: vaidehi4321 <56602405+vaidehi4321@users.noreply.github.com> Date: Fri, 29 Nov 2019 12:12:35 -0500 Subject: [PATCH 5/8] working on whiskey --- src/main/java/models/Whiskey.java | 51 ++++++++++++ src/main/java/services/SneakerService.java | 7 ++ src/main/java/services/WhiskeyService.java | 17 ++++ src/test/java/models/WhiskeyTest.java | 41 ++++++++++ .../java/services/SneakerServiceTest.java | 77 +++++++++++-------- 5 files changed, 159 insertions(+), 34 deletions(-) diff --git a/src/main/java/models/Whiskey.java b/src/main/java/models/Whiskey.java index a21721c..1ac27b4 100644 --- a/src/main/java/models/Whiskey.java +++ b/src/main/java/models/Whiskey.java @@ -1,5 +1,56 @@ package models; public class Whiskey { + int id; + String name; + String brand; + float price; + public Whiskey(int id, String name, String brand,float price) { + this.id = id; + this.name = name; + this.brand = brand; + this.price=price; + + } + + public int getId() { + return id; + } + + public String getName() { + return name; + } + + public String getBrand() { + return brand; + } + + public float getPrice() { + return price; + } + + public void setId(int id) { + this.id = id; + } + + public void setName(String name) { + this.name = name; + } + + public void setBrand(String brand) { + this.brand = brand; + } + + public void setPrice(float price) { + this.price = price; + } + + @Override + public String toString() { + return "Sneaker{" + + "id=" + id + + ", name='" + name + '\'' + + ", brand='" + brand + "}"; + } } diff --git a/src/main/java/services/SneakerService.java b/src/main/java/services/SneakerService.java index d8b6e70..8c4c5c3 100644 --- a/src/main/java/services/SneakerService.java +++ b/src/main/java/services/SneakerService.java @@ -7,6 +7,11 @@ public class SneakerService { private static int nextId = 1; + + public static void setNextId(int nextId) { + SneakerService.nextId = nextId; + } + private ArrayList inventory = new ArrayList<>(); public Sneaker create(String name, String brand, String sport, float size, int quantity, float price) { @@ -41,4 +46,6 @@ public boolean delete(int id) { return false; } + + } \ No newline at end of file diff --git a/src/main/java/services/WhiskeyService.java b/src/main/java/services/WhiskeyService.java index 1307c24..83f8f85 100644 --- a/src/main/java/services/WhiskeyService.java +++ b/src/main/java/services/WhiskeyService.java @@ -1,4 +1,21 @@ package services; +import models.Whiskey; + +import java.util.ArrayList; + public class WhiskeyService { + private static int nextId = 1; + public static void setNextId(int nextId) { + WhiskeyService.nextId = nextId; + } + private ArrayList joyInventory = new ArrayList<>(); + public Whiskey create( String name, String brand,float price){ + Whiskey whiskey = new Whiskey(nextId++, name, brand,price); + joyInventory.add(whiskey); + return whiskey; + } + public Whiskey findAll(){ + Whiskey + } } diff --git a/src/test/java/models/WhiskeyTest.java b/src/test/java/models/WhiskeyTest.java index 81c7672..75210c5 100644 --- a/src/test/java/models/WhiskeyTest.java +++ b/src/test/java/models/WhiskeyTest.java @@ -1,4 +1,45 @@ package models; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + public class WhiskeyTest { + int expectedId; + String expectedName; + String expectedBrand; + float expectedPrice; + @Before + public void setUp() { + expectedId = 6; + expectedName = "passion"; + expectedBrand = "bagpiper"; + expectedPrice = 70.50f; + Whiskey whiskey = new Whiskey(expectedId, expectedName, expectedBrand,expectedPrice); + } + @Test + public void constructorTest(){ + expectedId = 6; + expectedName = "passion"; + expectedBrand = "bagpiper"; + Whiskey whiskey = new Whiskey(expectedId, expectedName, expectedBrand,expectedPrice); + Assert.assertEquals(expectedId, whiskey.getId()); + Assert.assertEquals(expectedName, whiskey.getName()); + Assert.assertEquals(expectedBrand, whiskey.getBrand()); + Assert.assertEquals(expectedPrice,whiskey.getPrice(),0.001); + } + @Test + public void testSetterMethods() { + Whiskey whiskey = new Whiskey(2,"torque","sunshine",70.50f); + whiskey.setId(expectedId); + whiskey.setName(expectedName); + whiskey.setBrand(expectedBrand); + whiskey.setPrice(expectedPrice); + Assert.assertEquals(expectedId, whiskey.getId()); + Assert.assertEquals(expectedName, whiskey.getName()); + Assert.assertEquals(expectedBrand, whiskey.getBrand()); + Assert.assertEquals(expectedPrice,whiskey.getPrice(),0.001); + + } + } diff --git a/src/test/java/services/SneakerServiceTest.java b/src/test/java/services/SneakerServiceTest.java index 2c559d4..d4aae24 100644 --- a/src/test/java/services/SneakerServiceTest.java +++ b/src/test/java/services/SneakerServiceTest.java @@ -1,6 +1,7 @@ package services; import models.Sneaker; +import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -9,12 +10,19 @@ import java.util.Arrays; public class SneakerServiceTest { - SneakerService sneakerService=new SneakerService(); - ArrayListinventory=new ArrayList<>(); + SneakerService sneakerService; + + // ArrayListinventory=new ArrayList<>(); @Before - public void setUp(){ - sneakerService.create("rosy","fitFlop","badminton",4.5f,1,90.99f); - sneakerService.create("navy","lotus","cricket",3.0f,4,45.00f); + public void setUp() throws Exception { + sneakerService = new SneakerService(); + sneakerService.create("rosy", "fitFlop", "badminton", 4.5f, 1, 90.99f); + sneakerService.create("navy", "lotus", "cricket", 3.0f, 4, 45.00f); + } + + @After + public void tearDown() throws Exception { + SneakerService.setNextId(1); } @Test @@ -27,8 +35,8 @@ public void createTest() { float expectedSize = 10.5f; int expectedQty = 10; float expectedPrice = 80.00f; - SneakerService sneakerService = new SneakerService(); - Sneaker sneaker=sneakerService.create(expectedName,expectedBrand,expectedSport,expectedSize,expectedQty,expectedPrice); +// SneakerService sneakerService = new SneakerService(); + Sneaker sneaker = sneakerService.create(expectedName, expectedBrand, expectedSport, expectedSize, expectedQty, expectedPrice); int actualId = sneaker.getId(); String actualName = sneaker.getName(); String actualBrand = sneaker.getBrand(); @@ -40,40 +48,41 @@ public void createTest() { Assert.assertEquals(expectedName, actualName); Assert.assertEquals(expectedBrand, actualBrand); Assert.assertEquals(expectedSport, actualSport); - Assert.assertEquals(expectedSize, actualSize,0.0); + Assert.assertEquals(expectedSize, actualSize, 0.0); Assert.assertEquals(expectedQty, actualQty); - Assert.assertEquals(expectedPrice, actualPrice,0.0); - + Assert.assertEquals(expectedPrice, actualPrice, 0.0); } - @Test - public void findSneakerTest(){ - // int expectedId = 1; + @Test + public void findSneakerTest() { + // int expectedId = 3; String expectedName = "Mary Jane"; - String expectedBrand = "Bata"; - String expectedSport = "soccer"; - float expectedSize = 6.5f; - int expectedQty = 5; - float expectedPrice = 60.00f; - Sneaker expected = sneakerService.create(expectedName,expectedBrand,expectedSport,expectedSize,expectedQty,expectedPrice); - Sneaker actual = sneakerService.findSneaker(1); - Assert.assertEquals(expected,actual); + String expectedBrand = "Bata"; + String expectedSport = "soccer"; + float expectedSize = 6.5f; + int expectedQty = 5; + float expectedPrice = 60.00f; + Sneaker expected = sneakerService.create(expectedName, expectedBrand, expectedSport, expectedSize, expectedQty, expectedPrice); + Sneaker actual = sneakerService.findSneaker(3); + Assert.assertEquals(expected, actual); - } - @Test - public void testFindAll(){ - Sneaker[]actual= sneakerService.findAll(); - // Sneaker[] expected = - for (int i = 0; i < inventory.size(); i++) { - System.out.printf(inventory.get(i).toString()); + } + + @Test + public void testFindAll() { + Sneaker[] actual = sneakerService.findAll(); + // Sneaker[] expected = + for (int i = 0; i < actual.length; i++) { + System.out.printf(actual[i].toString()); - } - System.out.println(Arrays.toString(actual)); - System.out.println(actual.length); + } + System.out.println(Arrays.toString(actual)); + System.out.println(actual.length); + Assert.assertEquals(2, actual.length); } -@Test - public void deleteTest(){ + @Test + public void deleteTest() { Boolean b = sneakerService.delete(1); Sneaker s2 = sneakerService.findSneaker(2); //System.out.println(expected); @@ -82,6 +91,6 @@ public void deleteTest(){ Assert.assertNotNull(s2); -} + } } \ No newline at end of file From a74e2653599634deca43dcb32f8f88772994f123 Mon Sep 17 00:00:00 2001 From: vaidehi4321 <56602405+vaidehi4321@users.noreply.github.com> Date: Fri, 29 Nov 2019 12:22:43 -0500 Subject: [PATCH 6/8] working on whiskey --- pom.xml | 4 ++-- src/main/java/services/WhiskeyService.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 99773ec..306cfad 100644 --- a/pom.xml +++ b/pom.xml @@ -25,13 +25,13 @@ org.junit.jupiter junit-jupiter-engine - 4.1.2 + 5.4.2 test org.junit.jupiter junit-jupiter-api - 4.1.2 + 5.4.2 test diff --git a/src/main/java/services/WhiskeyService.java b/src/main/java/services/WhiskeyService.java index 83f8f85..be6ea93 100644 --- a/src/main/java/services/WhiskeyService.java +++ b/src/main/java/services/WhiskeyService.java @@ -16,6 +16,6 @@ public Whiskey create( String name, String brand,float price){ return whiskey; } public Whiskey findAll(){ - Whiskey + return null; } } From 1fe9a1794fe2aa4bc2ea46ec560351a4a4819d60 Mon Sep 17 00:00:00 2001 From: vaidehi4321 <56602405+vaidehi4321@users.noreply.github.com> Date: Fri, 29 Nov 2019 12:44:12 -0500 Subject: [PATCH 7/8] whiskey complete --- src/main/java/services/WhiskeyService.java | 23 +++++- .../java/services/WhiskeyServiceTest.java | 80 +++++++++++++++++++ 2 files changed, 102 insertions(+), 1 deletion(-) diff --git a/src/main/java/services/WhiskeyService.java b/src/main/java/services/WhiskeyService.java index be6ea93..4f5bd57 100644 --- a/src/main/java/services/WhiskeyService.java +++ b/src/main/java/services/WhiskeyService.java @@ -15,7 +15,28 @@ public Whiskey create( String name, String brand,float price){ joyInventory.add(whiskey); return whiskey; } - public Whiskey findAll(){ + public Whiskey findWhiskey(int id){ + for (int i = 0; i < joyInventory.size(); i++) { + if (joyInventory.get(i).getId() == id) + return joyInventory.get(i); + } return null; } + public Whiskey[] findAll() { + Whiskey[] sneakersArr=new Whiskey[joyInventory.size()]; + for(int i=0; i< joyInventory.size(); i++){ + sneakersArr[i] = joyInventory.get(i); + } + + return sneakersArr; + } + public boolean delete(int id) { + for(int i=0; i Date: Fri, 29 Nov 2019 13:18:11 -0500 Subject: [PATCH 8/8] adding a comment --- src/test/java/services/WhiskeyServiceTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/services/WhiskeyServiceTest.java b/src/test/java/services/WhiskeyServiceTest.java index 55858b0..e1b722c 100644 --- a/src/test/java/services/WhiskeyServiceTest.java +++ b/src/test/java/services/WhiskeyServiceTest.java @@ -10,6 +10,7 @@ import java.util.Arrays; public class WhiskeyServiceTest { + //this is whiskey WhiskeyService whiskeyService;