From 371a966a62f57788b6202cf824d0516c95744a69 Mon Sep 17 00:00:00 2001 From: Fitru Date: Tue, 5 Jul 2022 21:50:25 -0400 Subject: [PATCH 01/14] add junit testing suite --- .idea/compiler.xml | 3 ++- .idea/jarRepositories.xml | 20 ++++++++++++++++++++ pom.xml | 15 +++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 .idea/jarRepositories.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 7a4bf35..65de713 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -6,9 +6,10 @@ + - + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..712ab9d --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 43c1af2..daa7978 100644 --- a/pom.xml +++ b/pom.xml @@ -22,4 +22,19 @@ + + + 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 cba3dd17944ad9578d9cd0c57c99b1a93a612cee Mon Sep 17 00:00:00 2001 From: Fitru Date: Tue, 5 Jul 2022 22:05:15 -0400 Subject: [PATCH 02/14] add runningshoes/DVDs models and services --- src/main/java/models/DVDs.java | 4 ++++ src/main/java/models/RunningShoes.java | 4 ++++ src/main/java/services/DVDs.java | 4 ++++ src/main/java/services/RunningShoes.java | 4 ++++ src/test/java/models/DVDsTest.java | 4 ++++ src/test/java/models/RunningShoesTest.java | 4 ++++ src/test/java/service/DVDsServiceTest.java | 4 ++++ src/test/java/service/RunningShoesServiceTest.java | 4 ++++ 8 files changed, 32 insertions(+) create mode 100644 src/main/java/models/DVDs.java create mode 100644 src/main/java/models/RunningShoes.java create mode 100644 src/main/java/services/DVDs.java create mode 100644 src/main/java/services/RunningShoes.java create mode 100644 src/test/java/models/DVDsTest.java create mode 100644 src/test/java/models/RunningShoesTest.java create mode 100644 src/test/java/service/DVDsServiceTest.java create mode 100644 src/test/java/service/RunningShoesServiceTest.java diff --git a/src/main/java/models/DVDs.java b/src/main/java/models/DVDs.java new file mode 100644 index 0000000..1a01897 --- /dev/null +++ b/src/main/java/models/DVDs.java @@ -0,0 +1,4 @@ +package models; + +public class DVDs { +} diff --git a/src/main/java/models/RunningShoes.java b/src/main/java/models/RunningShoes.java new file mode 100644 index 0000000..6e30af1 --- /dev/null +++ b/src/main/java/models/RunningShoes.java @@ -0,0 +1,4 @@ +package models; + +public class RunningShoes { +} diff --git a/src/main/java/services/DVDs.java b/src/main/java/services/DVDs.java new file mode 100644 index 0000000..5f0f466 --- /dev/null +++ b/src/main/java/services/DVDs.java @@ -0,0 +1,4 @@ +package services; + +public class DVDs { +} diff --git a/src/main/java/services/RunningShoes.java b/src/main/java/services/RunningShoes.java new file mode 100644 index 0000000..45893db --- /dev/null +++ b/src/main/java/services/RunningShoes.java @@ -0,0 +1,4 @@ +package services; + +public class RunningShoes { +} diff --git a/src/test/java/models/DVDsTest.java b/src/test/java/models/DVDsTest.java new file mode 100644 index 0000000..e0bdec9 --- /dev/null +++ b/src/test/java/models/DVDsTest.java @@ -0,0 +1,4 @@ +package models; + +public class DVDsTest { +} diff --git a/src/test/java/models/RunningShoesTest.java b/src/test/java/models/RunningShoesTest.java new file mode 100644 index 0000000..c42ea83 --- /dev/null +++ b/src/test/java/models/RunningShoesTest.java @@ -0,0 +1,4 @@ +package models; + +public class RunningShoesTest { +} diff --git a/src/test/java/service/DVDsServiceTest.java b/src/test/java/service/DVDsServiceTest.java new file mode 100644 index 0000000..2730788 --- /dev/null +++ b/src/test/java/service/DVDsServiceTest.java @@ -0,0 +1,4 @@ +package service; + +public class DVDsServiceTest { +} diff --git a/src/test/java/service/RunningShoesServiceTest.java b/src/test/java/service/RunningShoesServiceTest.java new file mode 100644 index 0000000..af66395 --- /dev/null +++ b/src/test/java/service/RunningShoesServiceTest.java @@ -0,0 +1,4 @@ +package service; + +public class RunningShoesServiceTest { +} From dee334ad548434036c7bcd55357de5ede38e9995 Mon Sep 17 00:00:00 2001 From: Fitru Date: Tue, 5 Jul 2022 22:14:53 -0400 Subject: [PATCH 03/14] stay safe --- src/main/java/models/DVDs.java | 1 + src/main/java/models/RunningShoes.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/models/DVDs.java b/src/main/java/models/DVDs.java index 1a01897..bebea3c 100644 --- a/src/main/java/models/DVDs.java +++ b/src/main/java/models/DVDs.java @@ -1,4 +1,5 @@ package models; public class DVDs { + } diff --git a/src/main/java/models/RunningShoes.java b/src/main/java/models/RunningShoes.java index 6e30af1..5352eda 100644 --- a/src/main/java/models/RunningShoes.java +++ b/src/main/java/models/RunningShoes.java @@ -1,4 +1,5 @@ package models; public class RunningShoes { + } From d967134b8a66a5662ac8c617b25e12b0f1a53c8d Mon Sep 17 00:00:00 2001 From: Fitru Date: Tue, 5 Jul 2022 22:21:01 -0400 Subject: [PATCH 04/14] Stop touching things --- src/main/java/models/DVDs.java | 1 - src/main/java/models/RunningShoes.java | 1 - 2 files changed, 2 deletions(-) diff --git a/src/main/java/models/DVDs.java b/src/main/java/models/DVDs.java index bebea3c..1a01897 100644 --- a/src/main/java/models/DVDs.java +++ b/src/main/java/models/DVDs.java @@ -1,5 +1,4 @@ package models; public class DVDs { - } diff --git a/src/main/java/models/RunningShoes.java b/src/main/java/models/RunningShoes.java index 5352eda..6e30af1 100644 --- a/src/main/java/models/RunningShoes.java +++ b/src/main/java/models/RunningShoes.java @@ -1,5 +1,4 @@ package models; public class RunningShoes { - } From 5ca9fa2a2bf0702f2c4770c802ac632915e08ab4 Mon Sep 17 00:00:00 2001 From: Fitru Date: Tue, 5 Jul 2022 22:25:34 -0400 Subject: [PATCH 05/14] update --- src/main/java/models/DVDs.java | 4 ++++ src/main/java/models/RunningShoes.java | 6 ++++++ src/test/java/models/RunningShoesTest.java | 3 +++ 3 files changed, 13 insertions(+) diff --git a/src/main/java/models/DVDs.java b/src/main/java/models/DVDs.java index 1a01897..438efe8 100644 --- a/src/main/java/models/DVDs.java +++ b/src/main/java/models/DVDs.java @@ -1,4 +1,8 @@ package models; public class DVDs { + private int id; + private String name; + private int qty; + private float price; } diff --git a/src/main/java/models/RunningShoes.java b/src/main/java/models/RunningShoes.java index 6e30af1..31bd94c 100644 --- a/src/main/java/models/RunningShoes.java +++ b/src/main/java/models/RunningShoes.java @@ -1,4 +1,10 @@ package models; public class RunningShoes { + private int id; + private String name; + private String brand; + private int size; + private int qty; + private float price; } diff --git a/src/test/java/models/RunningShoesTest.java b/src/test/java/models/RunningShoesTest.java index c42ea83..6b799f1 100644 --- a/src/test/java/models/RunningShoesTest.java +++ b/src/test/java/models/RunningShoesTest.java @@ -1,4 +1,7 @@ package models; +import org.junit.jupiter.api.Test; + public class RunningShoesTest { + } From cd842a61ed89bc15f2bf090e47b20f97aa54045f Mon Sep 17 00:00:00 2001 From: Fitru Date: Tue, 5 Jul 2022 22:37:52 -0400 Subject: [PATCH 06/14] Some update --- src/test/java/models/RunningShoesTest.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/test/java/models/RunningShoesTest.java b/src/test/java/models/RunningShoesTest.java index 6b799f1..2ba58da 100644 --- a/src/test/java/models/RunningShoesTest.java +++ b/src/test/java/models/RunningShoesTest.java @@ -1,7 +1,19 @@ package models; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; public class RunningShoesTest { - + @Test + public void setNameTest() { + // Given + String expected = "OZWEEGO"; + + // When + RunningShoes nameTest = new RunningShoes(); + nameTest.setName(expected); + + // Then + Assertions.assertEquals(expected, nameTest.getName()); + } } From f0c48f35ad241987dc31d7c5394a1989b635dc81 Mon Sep 17 00:00:00 2001 From: Fitru Date: Thu, 7 Jul 2022 07:54:20 -0400 Subject: [PATCH 07/14] Added changes to runningShoesTest --- src/main/java/models/RunningShoes.java | 13 +++++++++++++ src/test/java/models/RunningShoesTest.java | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/src/main/java/models/RunningShoes.java b/src/main/java/models/RunningShoes.java index 31bd94c..c23f7d3 100644 --- a/src/main/java/models/RunningShoes.java +++ b/src/main/java/models/RunningShoes.java @@ -7,4 +7,17 @@ public class RunningShoes { private int size; private int qty; private float price; + + + + public void setName(String name){ + this.name=name; + } + + + public String getName() { + return this.name; + } } + + diff --git a/src/test/java/models/RunningShoesTest.java b/src/test/java/models/RunningShoesTest.java index 6b799f1..be58df6 100644 --- a/src/test/java/models/RunningShoesTest.java +++ b/src/test/java/models/RunningShoesTest.java @@ -1,7 +1,20 @@ package models; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; public class RunningShoesTest { + @Test + public void setNameTest() { + // Given + String expected = "OZWEEGO"; + + // When + RunningShoes nameTest = new RunningShoes(); + nameTest.setName(expected); + + // Then + Assertions.assertEquals(expected, nameTest.getName()); + } } From d50b15d6b8d8f7fee58585e8ae393341c40d2685 Mon Sep 17 00:00:00 2001 From: Fitru Date: Thu, 7 Jul 2022 13:14:40 -0400 Subject: [PATCH 08/14] added methods --- src/main/java/models/RunningShoes.java | 35 ++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/src/main/java/models/RunningShoes.java b/src/main/java/models/RunningShoes.java index c23f7d3..c5727f2 100644 --- a/src/main/java/models/RunningShoes.java +++ b/src/main/java/models/RunningShoes.java @@ -18,6 +18,41 @@ public void setName(String name){ public String getName() { return this.name; } + + public void setBrand(String brand){ + this.brand = brand; + } + + public String getBrand(){ + return this.brand; + } + + public void setSize(Integer size) { + this.size = size; + } + + public Integer getSize() { + return this.size; + } + + public void setQty(Integer qty){ + this.qty = qty; + } + + public Integer getQty(){ + return this.qty; + } + + + public void setPrice(Float price){ + this.price = price; + } + + public Float getPrice() { + return this.price; + } + + } From 9919081fc227206ea525b01e30dc9d62a1c5371f Mon Sep 17 00:00:00 2001 From: Fitru Date: Thu, 7 Jul 2022 13:15:27 -0400 Subject: [PATCH 09/14] added methods --- src/main/java/models/RunningShoes.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/models/RunningShoes.java b/src/main/java/models/RunningShoes.java index c5727f2..824ac35 100644 --- a/src/main/java/models/RunningShoes.java +++ b/src/main/java/models/RunningShoes.java @@ -53,6 +53,8 @@ public Float getPrice() { } + + } From a899afb1fd9453d0d78c6913289b60ae948c29c3 Mon Sep 17 00:00:00 2001 From: Fitru Date: Thu, 7 Jul 2022 15:19:20 -0400 Subject: [PATCH 10/14] Methods are better --- src/main/java/models/RunningShoes.java | 6 +- src/test/java/models/RunningShoesTest.java | 68 ++++++++++++++++++++++ 2 files changed, 71 insertions(+), 3 deletions(-) diff --git a/src/main/java/models/RunningShoes.java b/src/main/java/models/RunningShoes.java index 824ac35..8260d99 100644 --- a/src/main/java/models/RunningShoes.java +++ b/src/main/java/models/RunningShoes.java @@ -4,7 +4,7 @@ public class RunningShoes { private int id; private String name; private String brand; - private int size; + private double size; private int qty; private float price; @@ -27,11 +27,11 @@ public String getBrand(){ return this.brand; } - public void setSize(Integer size) { + public void setSize(Double size) { this.size = size; } - public Integer getSize() { + public Double getSize() { return this.size; } diff --git a/src/test/java/models/RunningShoesTest.java b/src/test/java/models/RunningShoesTest.java index be58df6..ede9edc 100644 --- a/src/test/java/models/RunningShoesTest.java +++ b/src/test/java/models/RunningShoesTest.java @@ -16,5 +16,73 @@ public void setNameTest() { // Then Assertions.assertEquals(expected, nameTest.getName()); } + + @Test + public void setBrand() { + // Given + String brandExpected = "Nike"; + RunningShoes shoes = new RunningShoes(); + shoes.setBrand(brandExpected); + + + // When + String brandActual = shoes.getBrand(); + + // Then + Assertions.assertEquals(brandExpected, brandActual); + } + + @Test + public void setSize() { + // Given + Double sizeExpected = 9.5; + RunningShoes shoes = new RunningShoes(); + shoes.setSize(sizeExpected); + + // When + Double sizeActual = shoes.getSize(); + + + // Then + Assertions.assertEquals(sizeExpected, sizeActual, 0.01); + } + + + + + @Test + public void setQtyTest() { + // Given + Integer qtyExpected = 50; + RunningShoes shoes = new RunningShoes(); + shoes.setQty(qtyExpected); + + + // When + Integer qtyActual = shoes.getQty(); + + // Then + Assertions.assertEquals(qtyExpected, qtyActual); + } + + + @Test + public void setPriceTest() { + // Given + Float priceExpected = 15F; + RunningShoes shoes = new RunningShoes(); + shoes.setPrice(priceExpected); + + // When + Float priceActual = shoes.getPrice(); + + + // Then + Assertions.assertEquals(priceExpected, priceActual, 0.01); + + + + + } } From 6fccb9c10c0d139a5ea8c083423c5a780c8a94f5 Mon Sep 17 00:00:00 2001 From: Fitru Date: Thu, 7 Jul 2022 19:13:44 -0400 Subject: [PATCH 11/14] Nothing --- src/main/java/models/RunningShoes.java | 3 +++ src/test/java/models/RunningShoesTest.java | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/models/RunningShoes.java b/src/main/java/models/RunningShoes.java index 8260d99..72e44cd 100644 --- a/src/main/java/models/RunningShoes.java +++ b/src/main/java/models/RunningShoes.java @@ -10,6 +10,9 @@ public class RunningShoes { + + + public void setName(String name){ this.name=name; } diff --git a/src/test/java/models/RunningShoesTest.java b/src/test/java/models/RunningShoesTest.java index 5d0ae9c..25d2540 100644 --- a/src/test/java/models/RunningShoesTest.java +++ b/src/test/java/models/RunningShoesTest.java @@ -17,8 +17,7 @@ public void setNameTest() { Assertions.assertEquals(expected, nameTest.getName()); } -<<<<<<< HEAD -======= + @Test public void setBrand() { // Given @@ -87,5 +86,5 @@ public void setPriceTest() { } ->>>>>>> features-sneaker-properties + } From 25db6ae8ab5eab7a36d41edb07d338019ed9332b Mon Sep 17 00:00:00 2001 From: Fitru Date: Thu, 7 Jul 2022 19:26:49 -0400 Subject: [PATCH 12/14] Finished tests constructor --- src/main/java/models/RunningShoes.java | 15 ++++++++++++++ src/test/java/models/RunningShoesTest.java | 24 ++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/src/main/java/models/RunningShoes.java b/src/main/java/models/RunningShoes.java index 72e44cd..369f808 100644 --- a/src/main/java/models/RunningShoes.java +++ b/src/main/java/models/RunningShoes.java @@ -11,7 +11,18 @@ public class RunningShoes { + public RunningShoes(Integer id, String name, String brand, Double size, Integer qty, Float price) { + this.id = id; + this.name = name; + this.brand = brand; + this.size = size; + this.qty = qty; + this.price = price; + } + public RunningShoes() { + + } public void setName(String name){ this.name=name; @@ -55,6 +66,10 @@ public Float getPrice() { return this.price; } + public Integer getId() { + return this.id; + } + diff --git a/src/test/java/models/RunningShoesTest.java b/src/test/java/models/RunningShoesTest.java index 25d2540..7cc1d78 100644 --- a/src/test/java/models/RunningShoesTest.java +++ b/src/test/java/models/RunningShoesTest.java @@ -85,6 +85,30 @@ public void setPriceTest() { } + + @Test + public void constructorTest() { + // Given + + int expectedId = 6; + String expectedName = "Stan Smith"; + String expectedBrand = "Adidas"; + Double expectedSize = 9.5; + Integer expectedQty = 10; + Float expectedPrice = 80.00f; + + // When + RunningShoes testShoes = new RunningShoes(expectedId,expectedName, expectedBrand, expectedSize, expectedQty,expectedPrice); + + + // Then + Assertions.assertEquals(expectedId, testShoes.getId()); + Assertions.assertEquals(expectedName, testShoes.getName()); + Assertions.assertEquals(expectedBrand, testShoes.getBrand()); + Assertions.assertEquals(expectedSize, testShoes.getSize()); + Assertions.assertEquals(expectedQty, testShoes.getQty()); + Assertions.assertEquals(expectedPrice, testShoes.getPrice()); + } } From f514d1a540baf1041ce4bcb041222c81631dffc1 Mon Sep 17 00:00:00 2001 From: Fitru Date: Thu, 7 Jul 2022 19:34:42 -0400 Subject: [PATCH 13/14] Finished All tests in Models --- src/main/java/models/DVDs.java | 47 ++++++++++++++++++++ src/test/java/models/DVDsTest.java | 71 ++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+) diff --git a/src/main/java/models/DVDs.java b/src/main/java/models/DVDs.java index 438efe8..95985ea 100644 --- a/src/main/java/models/DVDs.java +++ b/src/main/java/models/DVDs.java @@ -5,4 +5,51 @@ public class DVDs { private String name; private int qty; private float price; + + public DVDs(Integer id, String name, Integer qty, Float price) { + this.id = id; + this.name = name; + this.qty = qty; + this.price = price; + } + + public DVDs() { + + } + + public Integer getId() { + return this.id; + } + + + public void setName(String name){ + this.name=name; + } + + + public String getName() { + return this.name; + } + + + + public void setQty(Integer qty){ + this.qty = qty; + } + + public Integer getQty(){ + return this.qty; + } + + + public void setPrice(Float price){ + this.price = price; + } + + public Float getPrice() { + return this.price; + } + + + } diff --git a/src/test/java/models/DVDsTest.java b/src/test/java/models/DVDsTest.java index e0bdec9..cffb133 100644 --- a/src/test/java/models/DVDsTest.java +++ b/src/test/java/models/DVDsTest.java @@ -1,4 +1,75 @@ package models; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + public class DVDsTest { + @Test + public void setNameTest() { + // Given + String expected = "OZWEEGO"; + + // When + DVDs nameTest = new DVDs(); + nameTest.setName(expected); + + // Then + Assertions.assertEquals(expected, nameTest.getName()); + } + + + @Test + public void setQtyTest() { + // Given + Integer qtyExpected = 50; + DVDs dvDs = new DVDs(); + dvDs.setQty(qtyExpected); + + + // When + Integer qtyActual = dvDs.getQty(); + + // Then + Assertions.assertEquals(qtyExpected, qtyActual); + } + + + @Test + public void setPriceTest() { + // Given + Float priceExpected = 30F; + DVDs dvDs = new DVDs(); + dvDs.setPrice(priceExpected); + + // When + Float priceActual = dvDs.getPrice(); + + + // Then + Assertions.assertEquals(priceExpected, priceActual, 0.01); + + + + + } + + @Test + public void constructorTest() { + // Given + + int expectedId = 6; + String expectedName = "Stan Smith"; + Integer expectedQty = 10; + Float expectedPrice = 80.00f; + + // When + DVDs testDVD = new DVDs(expectedId,expectedName, expectedQty, expectedPrice); + + + // Then + Assertions.assertEquals(expectedId, testDVD.getId()); + Assertions.assertEquals(expectedName, testDVD.getName()); + Assertions.assertEquals(expectedQty, testDVD.getQty()); + Assertions.assertEquals(expectedPrice, testDVD.getPrice()); + } } From cea6d00c3c384f359c22ab2043d00b65b347d2cd Mon Sep 17 00:00:00 2001 From: Fitru Date: Thu, 7 Jul 2022 22:01:12 -0400 Subject: [PATCH 14/14] Got some work --- src/main/java/services/RunningShoes.java | 31 ++++++++++++ .../java/service/RunningShoesServiceTest.java | 48 +++++++++++++++++++ 2 files changed, 79 insertions(+) diff --git a/src/main/java/services/RunningShoes.java b/src/main/java/services/RunningShoes.java index 45893db..85df57b 100644 --- a/src/main/java/services/RunningShoes.java +++ b/src/main/java/services/RunningShoes.java @@ -1,4 +1,35 @@ package services; +import java.util.ArrayList; +import java.util.List; + public class RunningShoes { + private static int nextId = 1; // (1) + + private List inventory = new ArrayList<>(); + + public models.RunningShoes create(Integer id, String name, String brand, double size, Integer quantity, float price) { + + models.RunningShoes createdShoes = new models.RunningShoes(nextId++, name, brand, size, quantity, price); + + inventory.add(createdShoes); + + + return createdShoes; + } + + // read + public RunningShoes findRunningShoes(int id) { + for(int i = 0; i