From 2178cdf2d993021ed63dd5e47e837d2d99079896 Mon Sep 17 00:00:00 2001 From: April Howard Date: Thu, 20 Feb 2020 07:56:40 -0500 Subject: [PATCH 1/9] add junit testin suite --- .idea/Product-Inventory-Lab.iml | 2 ++ .idea/compiler.xml | 1 + .idea/misc.xml | 3 +++ pom.xml | 16 ++++++++++++++++ 4 files changed, 22 insertions(+) create mode 100644 .idea/Product-Inventory-Lab.iml diff --git a/.idea/Product-Inventory-Lab.iml b/.idea/Product-Inventory-Lab.iml new file mode 100644 index 0000000..78b2cc5 --- /dev/null +++ b/.idea/Product-Inventory-Lab.iml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 7a4bf35..3860742 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -7,6 +7,7 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml index 4b661a5..3ccb27b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,9 @@ + + \ No newline at end of file From a33894c2855514ab59acd6b0838b4f65762d12ba Mon Sep 17 00:00:00 2001 From: April Howard Date: Sat, 22 Feb 2020 18:49:41 -0500 Subject: [PATCH 2/9] add banana/cookies models and services --- src/main/java/models/Bananas.java | 4 ++++ src/main/java/models/Cookies.java | 4 ++++ src/main/java/services/BananaService.java | 4 ++++ src/main/java/services/CookiesService.java | 4 ++++ src/test/java/models/BananaTest.java | 4 ++++ src/test/java/models/CookiesTest.java | 4 ++++ src/test/java/services/BananaServiceTest.java | 4 ++++ src/test/java/services/CookiesServiceTest.java | 4 ++++ 8 files changed, 32 insertions(+) create mode 100644 src/main/java/models/Bananas.java create mode 100644 src/main/java/models/Cookies.java create mode 100644 src/main/java/services/BananaService.java create mode 100644 src/main/java/services/CookiesService.java create mode 100644 src/test/java/models/BananaTest.java create mode 100644 src/test/java/models/CookiesTest.java create mode 100644 src/test/java/services/BananaServiceTest.java create mode 100644 src/test/java/services/CookiesServiceTest.java diff --git a/src/main/java/models/Bananas.java b/src/main/java/models/Bananas.java new file mode 100644 index 0000000..3a92ded --- /dev/null +++ b/src/main/java/models/Bananas.java @@ -0,0 +1,4 @@ +package models; + +public class Bananas { +} diff --git a/src/main/java/models/Cookies.java b/src/main/java/models/Cookies.java new file mode 100644 index 0000000..8823311 --- /dev/null +++ b/src/main/java/models/Cookies.java @@ -0,0 +1,4 @@ +package models; + +public class Cookies { +} diff --git a/src/main/java/services/BananaService.java b/src/main/java/services/BananaService.java new file mode 100644 index 0000000..94e08e0 --- /dev/null +++ b/src/main/java/services/BananaService.java @@ -0,0 +1,4 @@ +package services; + +public class BananaService { +} diff --git a/src/main/java/services/CookiesService.java b/src/main/java/services/CookiesService.java new file mode 100644 index 0000000..daf4037 --- /dev/null +++ b/src/main/java/services/CookiesService.java @@ -0,0 +1,4 @@ +package services; + +public class CookiesService { +} diff --git a/src/test/java/models/BananaTest.java b/src/test/java/models/BananaTest.java new file mode 100644 index 0000000..a7268be --- /dev/null +++ b/src/test/java/models/BananaTest.java @@ -0,0 +1,4 @@ +package models; + +public class BananaTest { +} diff --git a/src/test/java/models/CookiesTest.java b/src/test/java/models/CookiesTest.java new file mode 100644 index 0000000..8b45b8d --- /dev/null +++ b/src/test/java/models/CookiesTest.java @@ -0,0 +1,4 @@ +package models; + +public class CookiesTest { +} diff --git a/src/test/java/services/BananaServiceTest.java b/src/test/java/services/BananaServiceTest.java new file mode 100644 index 0000000..9deb459 --- /dev/null +++ b/src/test/java/services/BananaServiceTest.java @@ -0,0 +1,4 @@ +package services; + +public class BananaServiceTest { +} diff --git a/src/test/java/services/CookiesServiceTest.java b/src/test/java/services/CookiesServiceTest.java new file mode 100644 index 0000000..d4193f5 --- /dev/null +++ b/src/test/java/services/CookiesServiceTest.java @@ -0,0 +1,4 @@ +package services; + +public class CookiesServiceTest { +} From 5848273837880ed650d37e853026d172e94c69db Mon Sep 17 00:00:00 2001 From: April Howard Date: Sat, 22 Feb 2020 19:35:35 -0500 Subject: [PATCH 3/9] add shoes/tv models and services --- instructions/section-01.md | 5 +++-- instructions/section-02.md | 2 +- src/main/java/models/Bananas.java | 4 ---- src/main/java/models/Cookies.java | 4 ---- src/main/java/models/Shoes.java | 12 +++++++++++ src/main/java/models/TVs.java | 13 ++++++++++++ src/main/java/services/BananaService.java | 4 ---- src/main/java/services/CookiesService.java | 4 ---- src/main/java/services/ShoesService.java | 5 +++++ src/main/java/services/TVsService.java | 4 ++++ src/test/java/models/BananaTest.java | 4 ---- src/test/java/models/CookiesTest.java | 4 ---- src/test/java/models/ShoesTest.java | 20 +++++++++++++++++++ src/test/java/models/TVsTest.java | 4 ++++ src/test/java/services/BananaServiceTest.java | 4 ---- .../java/services/CookiesServiceTest.java | 4 ---- src/test/java/services/ShoesTestService.java | 4 ++++ src/test/java/services/TVsTestService.java | 4 ++++ 18 files changed, 70 insertions(+), 35 deletions(-) delete mode 100644 src/main/java/models/Bananas.java delete mode 100644 src/main/java/models/Cookies.java create mode 100644 src/main/java/models/Shoes.java create mode 100644 src/main/java/models/TVs.java delete mode 100644 src/main/java/services/BananaService.java delete mode 100644 src/main/java/services/CookiesService.java create mode 100644 src/main/java/services/ShoesService.java create mode 100644 src/main/java/services/TVsService.java delete mode 100644 src/test/java/models/BananaTest.java delete mode 100644 src/test/java/models/CookiesTest.java create mode 100644 src/test/java/models/ShoesTest.java create mode 100644 src/test/java/models/TVsTest.java delete mode 100644 src/test/java/services/BananaServiceTest.java delete mode 100644 src/test/java/services/CookiesServiceTest.java create mode 100644 src/test/java/services/ShoesTestService.java create mode 100644 src/test/java/services/TVsTestService.java diff --git a/instructions/section-01.md b/instructions/section-01.md index ab6c191..052fdc8 100644 --- a/instructions/section-01.md +++ b/instructions/section-01.md @@ -197,8 +197,9 @@ src/main │   └── services │   ├── SneakerService.java │   └── WhiskeyService.java -└── resources -``` +└── resource +s + Because our store is so successful, we are really moving through inventory. So I would be nice to have a class that would help maintain all the items. A class that provided the service of creating and managing the items. For my example I will create a "SneakerService" class and a "WhiskeyService" class inside the services package. Because we are Doing Test Driven Development (TDD) we need to also have test classes for the models and the services. diff --git a/instructions/section-02.md b/instructions/section-02.md index 30303d4..b891267 100644 --- a/instructions/section-02.md +++ b/instructions/section-02.md @@ -26,7 +26,7 @@ A sneaker item from inventory - size: float - qty: int - price: float - +f These will be enough properties for now. If I ever need to add or remove I can come back and make a change. diff --git a/src/main/java/models/Bananas.java b/src/main/java/models/Bananas.java deleted file mode 100644 index 3a92ded..0000000 --- a/src/main/java/models/Bananas.java +++ /dev/null @@ -1,4 +0,0 @@ -package models; - -public class Bananas { -} diff --git a/src/main/java/models/Cookies.java b/src/main/java/models/Cookies.java deleted file mode 100644 index 8823311..0000000 --- a/src/main/java/models/Cookies.java +++ /dev/null @@ -1,4 +0,0 @@ -package models; - -public class Cookies { -} diff --git a/src/main/java/models/Shoes.java b/src/main/java/models/Shoes.java new file mode 100644 index 0000000..4c982c4 --- /dev/null +++ b/src/main/java/models/Shoes.java @@ -0,0 +1,12 @@ +package models; + +public class Shoes { + + private int id; + private String name; + private String brand; + private int size; + private int qty; + private float price; + } + diff --git a/src/main/java/models/TVs.java b/src/main/java/models/TVs.java new file mode 100644 index 0000000..6512b29 --- /dev/null +++ b/src/main/java/models/TVs.java @@ -0,0 +1,13 @@ +package models; + +public class TVs { + public class Sneaker { + + private int id; + private String name; + private String brand; + private int size; + private int qty; + private float price; + } +} diff --git a/src/main/java/services/BananaService.java b/src/main/java/services/BananaService.java deleted file mode 100644 index 94e08e0..0000000 --- a/src/main/java/services/BananaService.java +++ /dev/null @@ -1,4 +0,0 @@ -package services; - -public class BananaService { -} diff --git a/src/main/java/services/CookiesService.java b/src/main/java/services/CookiesService.java deleted file mode 100644 index daf4037..0000000 --- a/src/main/java/services/CookiesService.java +++ /dev/null @@ -1,4 +0,0 @@ -package services; - -public class CookiesService { -} diff --git a/src/main/java/services/ShoesService.java b/src/main/java/services/ShoesService.java new file mode 100644 index 0000000..e8e6c34 --- /dev/null +++ b/src/main/java/services/ShoesService.java @@ -0,0 +1,5 @@ +package services; + +public class ShoesService { + +} diff --git a/src/main/java/services/TVsService.java b/src/main/java/services/TVsService.java new file mode 100644 index 0000000..d787626 --- /dev/null +++ b/src/main/java/services/TVsService.java @@ -0,0 +1,4 @@ +package services; + +public class TVsService { +} diff --git a/src/test/java/models/BananaTest.java b/src/test/java/models/BananaTest.java deleted file mode 100644 index a7268be..0000000 --- a/src/test/java/models/BananaTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package models; - -public class BananaTest { -} diff --git a/src/test/java/models/CookiesTest.java b/src/test/java/models/CookiesTest.java deleted file mode 100644 index 8b45b8d..0000000 --- a/src/test/java/models/CookiesTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package models; - -public class CookiesTest { -} diff --git a/src/test/java/models/ShoesTest.java b/src/test/java/models/ShoesTest.java new file mode 100644 index 0000000..7922c6c --- /dev/null +++ b/src/test/java/models/ShoesTest.java @@ -0,0 +1,20 @@ +package models; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class ShoesTest { + @Test + public void setNameTest() { + // given (1) + String expected = "OZWEEGO"; + + // when (2) + Shoes shoes = new Shoes(); + Shoes.setName(expected); + + // then (3) + Assertions.assertEquals(expected, Shoes.getName()); + } +} +} diff --git a/src/test/java/models/TVsTest.java b/src/test/java/models/TVsTest.java new file mode 100644 index 0000000..b486c52 --- /dev/null +++ b/src/test/java/models/TVsTest.java @@ -0,0 +1,4 @@ +package models; + +public class TVsTest { +} diff --git a/src/test/java/services/BananaServiceTest.java b/src/test/java/services/BananaServiceTest.java deleted file mode 100644 index 9deb459..0000000 --- a/src/test/java/services/BananaServiceTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package services; - -public class BananaServiceTest { -} diff --git a/src/test/java/services/CookiesServiceTest.java b/src/test/java/services/CookiesServiceTest.java deleted file mode 100644 index d4193f5..0000000 --- a/src/test/java/services/CookiesServiceTest.java +++ /dev/null @@ -1,4 +0,0 @@ -package services; - -public class CookiesServiceTest { -} diff --git a/src/test/java/services/ShoesTestService.java b/src/test/java/services/ShoesTestService.java new file mode 100644 index 0000000..2d52660 --- /dev/null +++ b/src/test/java/services/ShoesTestService.java @@ -0,0 +1,4 @@ +package services; + +public class ShoesTestService { +} diff --git a/src/test/java/services/TVsTestService.java b/src/test/java/services/TVsTestService.java new file mode 100644 index 0000000..1234712 --- /dev/null +++ b/src/test/java/services/TVsTestService.java @@ -0,0 +1,4 @@ +package services; + +public class TVsTestService { +} From 8cd0c4c1cf3f3e52a07f18aa67f322aac8c9c185 Mon Sep 17 00:00:00 2001 From: April Howard Date: Sat, 22 Feb 2020 19:36:49 -0500 Subject: [PATCH 4/9] add shoes and TVs models and services --- instructions/section-01.md | 1 + src/test/java/models/ShoesTest.java | 13 +------------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/instructions/section-01.md b/instructions/section-01.md index 052fdc8..d8bce0b 100644 --- a/instructions/section-01.md +++ b/instructions/section-01.md @@ -198,6 +198,7 @@ src/main │   ├── SneakerService.java │   └── WhiskeyService.java └── resource + s Because our store is so successful, we are really moving through inventory. So I would be nice to have a class that would help maintain all the items. A class that provided the service of creating and managing the items. For my example I will create a "SneakerService" class and a "WhiskeyService" class inside the services package. diff --git a/src/test/java/models/ShoesTest.java b/src/test/java/models/ShoesTest.java index 7922c6c..c1fadf6 100644 --- a/src/test/java/models/ShoesTest.java +++ b/src/test/java/models/ShoesTest.java @@ -4,17 +4,6 @@ import org.junit.jupiter.api.Test; public class ShoesTest { - @Test - public void setNameTest() { - // given (1) - String expected = "OZWEEGO"; - // when (2) - Shoes shoes = new Shoes(); - Shoes.setName(expected); - - // then (3) - Assertions.assertEquals(expected, Shoes.getName()); - } -} } + From 6e3d35a3eb9afed27befd60d5e76673b6ff6faf4 Mon Sep 17 00:00:00 2001 From: April Howard Date: Sun, 23 Feb 2020 00:38:49 -0500 Subject: [PATCH 5/9] tests --- src/main/java/models/Shoes.java | 33 ++++++++++++++--- src/main/java/models/TVs.java | 33 +++++++++++++---- src/main/java/services/ShoesService 2.java | 5 +++ src/main/java/services/ShoesService.java | 2 + src/main/java/services/TVsService 2.java | 4 ++ src/main/java/services/TVsService.java | 1 + src/test/java/models/ShoesTest.java | 14 +++++++ src/test/java/models/TVsTest 2.java | 4 ++ src/test/java/models/TVsTest.java | 15 ++++++++ .../java/services/ShoesTestService 2.java | 4 ++ src/test/java/services/ShoesTestService.java | 37 ++++++++++++++++++- src/test/java/services/TVsTestService 2.java | 4 ++ 12 files changed, 141 insertions(+), 15 deletions(-) create mode 100644 src/main/java/services/ShoesService 2.java create mode 100644 src/main/java/services/TVsService 2.java create mode 100644 src/test/java/models/TVsTest 2.java create mode 100644 src/test/java/services/ShoesTestService 2.java create mode 100644 src/test/java/services/TVsTestService 2.java diff --git a/src/main/java/models/Shoes.java b/src/main/java/models/Shoes.java index 4c982c4..189facd 100644 --- a/src/main/java/models/Shoes.java +++ b/src/main/java/models/Shoes.java @@ -2,11 +2,34 @@ public class Shoes { - private int id; - private String name; - private String brand; + private String name; private int size; - private int qty; private float price; - } + + public void setName(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public void setSize(int size) { + this.size = size; + } + + public int getSize() { + return size; + } + + public void setPrice(float price) { + this.price = price; + } + + public float getPrice() { + return price; + } +} + + diff --git a/src/main/java/models/TVs.java b/src/main/java/models/TVs.java index 6512b29..48375c8 100644 --- a/src/main/java/models/TVs.java +++ b/src/main/java/models/TVs.java @@ -1,13 +1,30 @@ package models; public class TVs { - public class Sneaker { - - private int id; - private String name; - private String brand; - private int size; - private int qty; - private float price; + + private String name; + private int size; + private float price; + + public void setName(String name) { + this.name = name; + } + + public String getName() { + return name; } + + public void setSize(int size) {this.size = size;} + + public int getSize() {return size;} + + public void setPrice(float price) {this.price = price;} + + public float getPrice() {return price;} + + + } + + + diff --git a/src/main/java/services/ShoesService 2.java b/src/main/java/services/ShoesService 2.java new file mode 100644 index 0000000..0e614f6 --- /dev/null +++ b/src/main/java/services/ShoesService 2.java @@ -0,0 +1,5 @@ +package services; + +//public class ShoesService { + +//} diff --git a/src/main/java/services/ShoesService.java b/src/main/java/services/ShoesService.java index e8e6c34..f1a9383 100644 --- a/src/main/java/services/ShoesService.java +++ b/src/main/java/services/ShoesService.java @@ -2,4 +2,6 @@ public class ShoesService { + + } diff --git a/src/main/java/services/TVsService 2.java b/src/main/java/services/TVsService 2.java new file mode 100644 index 0000000..dbb65af --- /dev/null +++ b/src/main/java/services/TVsService 2.java @@ -0,0 +1,4 @@ +package services; + +//public class TVsService { +//} diff --git a/src/main/java/services/TVsService.java b/src/main/java/services/TVsService.java index d787626..974f08a 100644 --- a/src/main/java/services/TVsService.java +++ b/src/main/java/services/TVsService.java @@ -1,4 +1,5 @@ package services; public class TVsService { + } diff --git a/src/test/java/models/ShoesTest.java b/src/test/java/models/ShoesTest.java index c1fadf6..525e9cc 100644 --- a/src/test/java/models/ShoesTest.java +++ b/src/test/java/models/ShoesTest.java @@ -5,5 +5,19 @@ public class ShoesTest { + @Test + public void setNameTest() { + // given (1) + String expected = "NIKE"; + + // when (2) + Shoes testName = new Shoes(); + testName.setName(expected); + + // then (3) + Assertions.assertEquals(expected, testName.getName()); + } } + + diff --git a/src/test/java/models/TVsTest 2.java b/src/test/java/models/TVsTest 2.java new file mode 100644 index 0000000..082c443 --- /dev/null +++ b/src/test/java/models/TVsTest 2.java @@ -0,0 +1,4 @@ +package models; + +//public class TVsTest { +//} diff --git a/src/test/java/models/TVsTest.java b/src/test/java/models/TVsTest.java index b486c52..c3e9810 100644 --- a/src/test/java/models/TVsTest.java +++ b/src/test/java/models/TVsTest.java @@ -1,4 +1,19 @@ package models; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + public class TVsTest { + @Test + public void setNameTest() { + // given + String expected = "Samsung"; + + //when + TVs testName = new TVs(); + testName.setName(expected); + + //then + Assertions.assertEquals(expected, testName.getName()); + } } diff --git a/src/test/java/services/ShoesTestService 2.java b/src/test/java/services/ShoesTestService 2.java new file mode 100644 index 0000000..a3cfbe7 --- /dev/null +++ b/src/test/java/services/ShoesTestService 2.java @@ -0,0 +1,4 @@ +package services; + +//public class ShoesTestService { +//} diff --git a/src/test/java/services/ShoesTestService.java b/src/test/java/services/ShoesTestService.java index 2d52660..2549da5 100644 --- a/src/test/java/services/ShoesTestService.java +++ b/src/test/java/services/ShoesTestService.java @@ -1,4 +1,37 @@ package services; -public class ShoesTestService { -} +import models.ShoesTest; +import org.junit.jupiter.api.Test; + +/*public class ShoesTests{ + + + @Test + // (1) + public void constructorTest(){ + + // (2) + int expectedId = 6; + String expectedName = "Stan Smith"; + String expectedBrand = "Adidas"; + String expectedSport = "Tennnis"; + int expectedQty = 10; + float expectedPrice = 80.00f; + + // (3) + ShoesTest shoes = new Shoes(expectedId, expectedName, expectedBrand, + expectedSport, expectedQty,expectedPrice); + + // (4) + assertEquals(expectedId, testSneaker.getId()); + Assertions.assertEquals(expectedName, testSneaker.getName()); + Assertions.assertEquals(expectedBrand, testSneaker.getBrand()); + Assertions.assertEquals(expectedSport, testSneaker.getSport()); + Assertions.assertEquals(expectedQty, testSneaker.getQty()); + Assertions.assertEquals(expectedPrice, testSneaker.getPrice()); + } + } + + */ + + diff --git a/src/test/java/services/TVsTestService 2.java b/src/test/java/services/TVsTestService 2.java new file mode 100644 index 0000000..fce1707 --- /dev/null +++ b/src/test/java/services/TVsTestService 2.java @@ -0,0 +1,4 @@ +package services; + +//public class TVsTestService { +//} From 1eadf5b83f802442c6b12484358bec07d6094951 Mon Sep 17 00:00:00 2001 From: April Howard Date: Sun, 23 Feb 2020 01:14:17 -0500 Subject: [PATCH 6/9] all tests for shoes --- src/main/java/models/Shoes.java | 16 ++++++++-------- src/test/java/models/ShoesTest.java | 28 ++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/src/main/java/models/Shoes.java b/src/main/java/models/Shoes.java index 189facd..734ff6e 100644 --- a/src/main/java/models/Shoes.java +++ b/src/main/java/models/Shoes.java @@ -3,8 +3,8 @@ public class Shoes { private String name; - private int size; - private float price; + private int quantity; + private Double price; public void setName(String name) { this.name = name; @@ -14,19 +14,19 @@ public String getName() { return name; } - public void setSize(int size) { - this.size = size; + public void setQuantity(int quantity) { + this.quantity = quantity; } - public int getSize() { - return size; + public int getQuantity() { + return quantity; } - public void setPrice(float price) { + public void setPrice(Double price) { this.price = price; } - public float getPrice() { + public Double getPrice() { return price; } } diff --git a/src/test/java/models/ShoesTest.java b/src/test/java/models/ShoesTest.java index 525e9cc..7414158 100644 --- a/src/test/java/models/ShoesTest.java +++ b/src/test/java/models/ShoesTest.java @@ -17,6 +17,34 @@ public void setNameTest() { // then (3) Assertions.assertEquals(expected, testName.getName()); } + @Test + public void setQuantityTest() { + //given + int expected = 1000; + + // when + Shoes testQuantity = new Shoes(); + testQuantity.setQuantity(expected); + + // then + Assertions.assertEquals(expected, testQuantity.getQuantity()); + + + } + @Test + public void setPrice() { + //given + Double expected = 20.99; + + //when + Shoes testPrice = new Shoes(); + testPrice.setPrice(expected); + + //then + Assertions.assertEquals(expected, testPrice.getPrice()); + + + } } From 40afcf95ba81685222fdf38a4525db8180b3351c Mon Sep 17 00:00:00 2001 From: April Howard Date: Sun, 23 Feb 2020 01:54:49 -0500 Subject: [PATCH 7/9] TV Tests --- src/main/java/models/TVs.java | 12 ++++----- src/test/java/models/ShoesTest.java | 4 +-- src/test/java/models/TVsTest.java | 27 ++++++++++++++++++++ src/test/java/services/ShoesTestService.java | 26 ------------------- 4 files changed, 35 insertions(+), 34 deletions(-) diff --git a/src/main/java/models/TVs.java b/src/main/java/models/TVs.java index 48375c8..bf3e5f9 100644 --- a/src/main/java/models/TVs.java +++ b/src/main/java/models/TVs.java @@ -3,8 +3,8 @@ public class TVs { private String name; - private int size; - private float price; + private int quantity; + private Double price; public void setName(String name) { this.name = name; @@ -14,13 +14,13 @@ public String getName() { return name; } - public void setSize(int size) {this.size = size;} + public void setQuantity(int quantity) {this.quantity = quantity;} - public int getSize() {return size;} + public int getQuantity() {return quantity;} - public void setPrice(float price) {this.price = price;} + public void setPrice(Double price) {this.price = price;} - public float getPrice() {return price;} + public Double getPrice() {return price;} diff --git a/src/test/java/models/ShoesTest.java b/src/test/java/models/ShoesTest.java index 7414158..98c84bb 100644 --- a/src/test/java/models/ShoesTest.java +++ b/src/test/java/models/ShoesTest.java @@ -17,6 +17,7 @@ public void setNameTest() { // then (3) Assertions.assertEquals(expected, testName.getName()); } + @Test public void setQuantityTest() { //given @@ -29,8 +30,8 @@ public void setQuantityTest() { // then Assertions.assertEquals(expected, testQuantity.getQuantity()); - } + @Test public void setPrice() { //given @@ -43,7 +44,6 @@ public void setPrice() { //then Assertions.assertEquals(expected, testPrice.getPrice()); - } } diff --git a/src/test/java/models/TVsTest.java b/src/test/java/models/TVsTest.java index c3e9810..128d752 100644 --- a/src/test/java/models/TVsTest.java +++ b/src/test/java/models/TVsTest.java @@ -16,4 +16,31 @@ public void setNameTest() { //then Assertions.assertEquals(expected, testName.getName()); } + + @Test + public void setQuantityTest() { + //given + int expected = 500; + + //when + TVs testQuantity = new TVs(); + testQuantity.setQuantity(expected); + + //then + Assertions.assertEquals(expected, testQuantity.getQuantity()); + } + + @Test + public void setPriceTest() { + //given + int expected = (int) 29.99; + + //when + TVs testPrice = new TVs(); + testPrice.setPrice((double) expected); + + //then + Assertions.assertEquals(expected, testPrice.getPrice()); + + } } diff --git a/src/test/java/services/ShoesTestService.java b/src/test/java/services/ShoesTestService.java index 2549da5..3da59cd 100644 --- a/src/test/java/services/ShoesTestService.java +++ b/src/test/java/services/ShoesTestService.java @@ -6,32 +6,6 @@ /*public class ShoesTests{ - @Test - // (1) - public void constructorTest(){ - // (2) - int expectedId = 6; - String expectedName = "Stan Smith"; - String expectedBrand = "Adidas"; - String expectedSport = "Tennnis"; - int expectedQty = 10; - float expectedPrice = 80.00f; - - // (3) - ShoesTest shoes = new Shoes(expectedId, expectedName, expectedBrand, - expectedSport, expectedQty,expectedPrice); - - // (4) - assertEquals(expectedId, testSneaker.getId()); - Assertions.assertEquals(expectedName, testSneaker.getName()); - Assertions.assertEquals(expectedBrand, testSneaker.getBrand()); - Assertions.assertEquals(expectedSport, testSneaker.getSport()); - Assertions.assertEquals(expectedQty, testSneaker.getQty()); - Assertions.assertEquals(expectedPrice, testSneaker.getPrice()); - } - } - - */ From 7fb776c645e97b73419d526fc0fcbc780e8bd6de Mon Sep 17 00:00:00 2001 From: April Howard Date: Sun, 23 Feb 2020 14:44:01 -0500 Subject: [PATCH 8/9] contructor tests for shoes and TVs --- src/main/java/models/Shoes.java | 21 ++++++++++++--- src/main/java/services/ShoesService 2.java | 5 ---- src/main/java/services/ShoesService.java | 11 +++++++- src/main/java/services/TVsService 2.java | 4 --- src/test/java/models/ShoesTest.java | 26 ++++++++++++++++++- src/test/java/models/TVsTest 2.java | 4 --- src/test/java/models/TVsTest.java | 7 ++++- src/test/java/services/ShoesServicesTest.java | 11 ++++++++ .../java/services/ShoesTestService 2.java | 4 --- src/test/java/services/ShoesTestService.java | 11 -------- src/test/java/services/TVsServiceTest.java | 4 +++ src/test/java/services/TVsTestService 2.java | 4 --- src/test/java/services/TVsTestService.java | 4 --- 13 files changed, 73 insertions(+), 43 deletions(-) delete mode 100644 src/main/java/services/ShoesService 2.java delete mode 100644 src/main/java/services/TVsService 2.java delete mode 100644 src/test/java/models/TVsTest 2.java create mode 100644 src/test/java/services/ShoesServicesTest.java delete mode 100644 src/test/java/services/ShoesTestService 2.java delete mode 100644 src/test/java/services/ShoesTestService.java create mode 100644 src/test/java/services/TVsServiceTest.java delete mode 100644 src/test/java/services/TVsTestService 2.java delete mode 100644 src/test/java/services/TVsTestService.java diff --git a/src/main/java/models/Shoes.java b/src/main/java/models/Shoes.java index 734ff6e..dcae647 100644 --- a/src/main/java/models/Shoes.java +++ b/src/main/java/models/Shoes.java @@ -4,8 +4,13 @@ public class Shoes { private String name; private int quantity; - private Double price; - + private double price; + //a.need this for testing individual setTests. + public Shoes () { + this.name = "NIKE"; + this.quantity = 1000; + this.price = 20.00; + } public void setName(String name) { this.name = name; } @@ -22,13 +27,21 @@ public int getQuantity() { return quantity; } - public void setPrice(Double price) { + public void setPrice(double price) { this.price = price; } - public Double getPrice() { + public double getPrice() { return price; } + //d. + public Shoes(String name, int quantity, double price) { + this.name = name; + this.quantity = quantity; + this.price = price; + } + + } diff --git a/src/main/java/services/ShoesService 2.java b/src/main/java/services/ShoesService 2.java deleted file mode 100644 index 0e614f6..0000000 --- a/src/main/java/services/ShoesService 2.java +++ /dev/null @@ -1,5 +0,0 @@ -package services; - -//public class ShoesService { - -//} diff --git a/src/main/java/services/ShoesService.java b/src/main/java/services/ShoesService.java index f1a9383..dd2a8de 100644 --- a/src/main/java/services/ShoesService.java +++ b/src/main/java/services/ShoesService.java @@ -1,7 +1,16 @@ package services; - +/* public class ShoesService { + public class Shoes { + + private String name; + private int quantity; + private double price; + public Shoes(String expectedName, double expectedPrice, int expectedQuantity) { + } } + + */ diff --git a/src/main/java/services/TVsService 2.java b/src/main/java/services/TVsService 2.java deleted file mode 100644 index dbb65af..0000000 --- a/src/main/java/services/TVsService 2.java +++ /dev/null @@ -1,4 +0,0 @@ -package services; - -//public class TVsService { -//} diff --git a/src/test/java/models/ShoesTest.java b/src/test/java/models/ShoesTest.java index 98c84bb..785cce3 100644 --- a/src/test/java/models/ShoesTest.java +++ b/src/test/java/models/ShoesTest.java @@ -8,6 +8,7 @@ public class ShoesTest { @Test public void setNameTest() { // given (1) + Shoes shoe = new Shoes(); String expected = "NIKE"; // when (2) @@ -35,7 +36,7 @@ public void setQuantityTest() { @Test public void setPrice() { //given - Double expected = 20.99; + double expected = 20.99; //when Shoes testPrice = new Shoes(); @@ -45,6 +46,29 @@ public void setPrice() { Assertions.assertEquals(expected, testPrice.getPrice()); } + //d. + @Test + public void testDefaultConstructor() { + //Given + String expectedName = "NIKE"; + int expectedQuantity = 1000; + double expectedPrice = 20.99; + + //When + Shoes shoes = new Shoes(expectedName, expectedQuantity, expectedPrice); + + //Then + String actualName = shoes.getName(); + int actualQuantity = shoes.getQuantity(); + double actualPrice = shoes.getPrice(); + + Assertions.assertEquals(expectedName, actualName); + Assertions.assertEquals(expectedQuantity, actualQuantity); + Assertions.assertEquals(expectedPrice, actualPrice); + } + + + } diff --git a/src/test/java/models/TVsTest 2.java b/src/test/java/models/TVsTest 2.java deleted file mode 100644 index 082c443..0000000 --- a/src/test/java/models/TVsTest 2.java +++ /dev/null @@ -1,4 +0,0 @@ -package models; - -//public class TVsTest { -//} diff --git a/src/test/java/models/TVsTest.java b/src/test/java/models/TVsTest.java index 128d752..ada5b90 100644 --- a/src/test/java/models/TVsTest.java +++ b/src/test/java/models/TVsTest.java @@ -43,4 +43,9 @@ public void setPriceTest() { Assertions.assertEquals(expected, testPrice.getPrice()); } -} + + + + + } + diff --git a/src/test/java/services/ShoesServicesTest.java b/src/test/java/services/ShoesServicesTest.java new file mode 100644 index 0000000..9aee873 --- /dev/null +++ b/src/test/java/services/ShoesServicesTest.java @@ -0,0 +1,11 @@ +package services; + +import models.Shoes; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class ShoesServicesTest { + + + +} diff --git a/src/test/java/services/ShoesTestService 2.java b/src/test/java/services/ShoesTestService 2.java deleted file mode 100644 index a3cfbe7..0000000 --- a/src/test/java/services/ShoesTestService 2.java +++ /dev/null @@ -1,4 +0,0 @@ -package services; - -//public class ShoesTestService { -//} diff --git a/src/test/java/services/ShoesTestService.java b/src/test/java/services/ShoesTestService.java deleted file mode 100644 index 3da59cd..0000000 --- a/src/test/java/services/ShoesTestService.java +++ /dev/null @@ -1,11 +0,0 @@ -package services; - -import models.ShoesTest; -import org.junit.jupiter.api.Test; - -/*public class ShoesTests{ - - - - - diff --git a/src/test/java/services/TVsServiceTest.java b/src/test/java/services/TVsServiceTest.java new file mode 100644 index 0000000..221ea08 --- /dev/null +++ b/src/test/java/services/TVsServiceTest.java @@ -0,0 +1,4 @@ +package services; + +public class TVsServiceTest { +} diff --git a/src/test/java/services/TVsTestService 2.java b/src/test/java/services/TVsTestService 2.java deleted file mode 100644 index fce1707..0000000 --- a/src/test/java/services/TVsTestService 2.java +++ /dev/null @@ -1,4 +0,0 @@ -package services; - -//public class TVsTestService { -//} diff --git a/src/test/java/services/TVsTestService.java b/src/test/java/services/TVsTestService.java deleted file mode 100644 index 1234712..0000000 --- a/src/test/java/services/TVsTestService.java +++ /dev/null @@ -1,4 +0,0 @@ -package services; - -public class TVsTestService { -} From bf8784c0f128ed1b9eb555e4ed6f9f0ca5227e23 Mon Sep 17 00:00:00 2001 From: April Howard Date: Sun, 23 Feb 2020 14:48:57 -0500 Subject: [PATCH 9/9] add constructor tests for shoes and tvs --- src/main/java/models/Shoes.java | 2 +- src/main/java/models/TVs.java | 12 ++++++++++++ src/test/java/models/ShoesTest.java | 5 +++-- src/test/java/models/TVsTest.java | 23 ++++++++++++++++++++++- 4 files changed, 38 insertions(+), 4 deletions(-) diff --git a/src/main/java/models/Shoes.java b/src/main/java/models/Shoes.java index dcae647..ca76e29 100644 --- a/src/main/java/models/Shoes.java +++ b/src/main/java/models/Shoes.java @@ -34,7 +34,7 @@ public void setPrice(double price) { public double getPrice() { return price; } - //d. + //d.need this for constructor public Shoes(String name, int quantity, double price) { this.name = name; this.quantity = quantity; diff --git a/src/main/java/models/TVs.java b/src/main/java/models/TVs.java index bf3e5f9..1e0593f 100644 --- a/src/main/java/models/TVs.java +++ b/src/main/java/models/TVs.java @@ -6,6 +6,12 @@ public class TVs { private int quantity; private Double price; + //a.need this for testing individual and combined + public TVs () { + this.name = "Samsung"; + this.quantity = 500; + this.price = 29.99; + } public void setName(String name) { this.name = name; } @@ -22,6 +28,12 @@ public String getName() { public Double getPrice() {return price;} + //d. need this for constructor + public TVs(String name, int quantity, double price) { + this.name = name; + this.quantity = quantity; + this.price = price; + } } diff --git a/src/test/java/models/ShoesTest.java b/src/test/java/models/ShoesTest.java index 785cce3..0b07abf 100644 --- a/src/test/java/models/ShoesTest.java +++ b/src/test/java/models/ShoesTest.java @@ -12,7 +12,8 @@ public void setNameTest() { String expected = "NIKE"; // when (2) - Shoes testName = new Shoes(); + Shoes testName = new Shoes(); //need this Shoes class a.public Shoes() { + //this.name = "NIKE"; this.quantity = 1000; this.price = 20.00;} testName.setName(expected); // then (3) @@ -46,7 +47,7 @@ public void setPrice() { Assertions.assertEquals(expected, testPrice.getPrice()); } - //d. + //d. need this for constructor @Test public void testDefaultConstructor() { //Given diff --git a/src/test/java/models/TVsTest.java b/src/test/java/models/TVsTest.java index ada5b90..83500ed 100644 --- a/src/test/java/models/TVsTest.java +++ b/src/test/java/models/TVsTest.java @@ -7,6 +7,7 @@ public class TVsTest { @Test public void setNameTest() { // given + TVs tvs = new TVs(); // String expected = "Samsung"; //when @@ -33,7 +34,7 @@ public void setQuantityTest() { @Test public void setPriceTest() { //given - int expected = (int) 29.99; + double expected = 29.99; //when TVs testPrice = new TVs(); @@ -43,6 +44,26 @@ public void setPriceTest() { Assertions.assertEquals(expected, testPrice.getPrice()); } + //d. need this for constructor + @Test + public void testDefaultConstructorTV() { + //Given + String expectedName = "Samsung"; + int expectedQuantity = 500; + double expectedPrice = 29.99; + + //When + TVs tvs = new TVs(expectedName, expectedQuantity, expectedPrice); + + //Then + String actualName = tvs.getName(); + int actualQuantity = tvs.getQuantity(); + double actualPrice = tvs.getPrice(); + + Assertions.assertEquals(expectedName, actualName); + Assertions.assertEquals(expectedQuantity, actualQuantity); + Assertions.assertEquals(expectedPrice, actualPrice); + }