From 5dbb4477d27ec242d15aab6517f1daf36a171ac5 Mon Sep 17 00:00:00 2001 From: Maira Botelho Date: Tue, 29 Oct 2019 13:09:41 -0400 Subject: [PATCH 1/8] test dev --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 43c1af2..e49b787 100644 --- a/pom.xml +++ b/pom.xml @@ -22,4 +22,5 @@ + \ No newline at end of file From b6ba4a06bf8dc32332e413fba2a5e916662f4e57 Mon Sep 17 00:00:00 2001 From: Maira Botelho Date: Tue, 29 Oct 2019 13:12:54 -0400 Subject: [PATCH 2/8] add junit testing suite --- pom.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pom.xml b/pom.xml index e49b787..0997d4c 100644 --- a/pom.xml +++ b/pom.xml @@ -21,6 +21,20 @@ + + + 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 37246675141472562bf819d7408f6711fe58977d Mon Sep 17 00:00:00 2001 From: Maira Botelho Date: Tue, 29 Oct 2019 13:15:00 -0400 Subject: [PATCH 3/8] q --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0997d4c..c3fbd83 100644 --- a/pom.xml +++ b/pom.xml @@ -36,5 +36,4 @@ - \ No newline at end of file From 725a411a338b8cab3ac3fe1a870ad6f7a406c14e Mon Sep 17 00:00:00 2001 From: Maira Botelho Date: Tue, 29 Oct 2019 13:21:50 -0400 Subject: [PATCH 4/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/SneakerServices.java | 4 ++++ src/main/java/services/WhiskeyServices.java | 4 ++++ src/test/java/models/SneakerTest.java | 7 +++++++ src/test/java/models/whiskeyTest.java | 7 +++++++ src/test/java/services/SneakerServicesTest.java | 7 +++++++ src/test/java/services/WhiskeyServicesTest.java | 7 +++++++ 8 files changed, 44 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/SneakerServices.java create mode 100644 src/main/java/services/WhiskeyServices.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/SneakerServicesTest.java create mode 100644 src/test/java/services/WhiskeyServicesTest.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..a97ff67 --- /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/SneakerServices.java b/src/main/java/services/SneakerServices.java new file mode 100644 index 0000000..23f6f02 --- /dev/null +++ b/src/main/java/services/SneakerServices.java @@ -0,0 +1,4 @@ +package services; + +public class SneakerServices { +} diff --git a/src/main/java/services/WhiskeyServices.java b/src/main/java/services/WhiskeyServices.java new file mode 100644 index 0000000..a97fac6 --- /dev/null +++ b/src/main/java/services/WhiskeyServices.java @@ -0,0 +1,4 @@ +package services; + +public class WhiskeyServices { +} diff --git a/src/test/java/models/SneakerTest.java b/src/test/java/models/SneakerTest.java new file mode 100644 index 0000000..30ccb7a --- /dev/null +++ b/src/test/java/models/SneakerTest.java @@ -0,0 +1,7 @@ +package models; + +import static org.junit.jupiter.api.Assertions.*; + +class SneakerTest { + +} \ No newline at end of file diff --git a/src/test/java/models/whiskeyTest.java b/src/test/java/models/whiskeyTest.java new file mode 100644 index 0000000..a83c596 --- /dev/null +++ b/src/test/java/models/whiskeyTest.java @@ -0,0 +1,7 @@ +package models; + +import static org.junit.jupiter.api.Assertions.*; + +class whiskeyTest { + +} \ No newline at end of file diff --git a/src/test/java/services/SneakerServicesTest.java b/src/test/java/services/SneakerServicesTest.java new file mode 100644 index 0000000..eaa8039 --- /dev/null +++ b/src/test/java/services/SneakerServicesTest.java @@ -0,0 +1,7 @@ +package services; + +import static org.junit.jupiter.api.Assertions.*; + +class SneakerServicesTest { + +} \ No newline at end of file diff --git a/src/test/java/services/WhiskeyServicesTest.java b/src/test/java/services/WhiskeyServicesTest.java new file mode 100644 index 0000000..14197bb --- /dev/null +++ b/src/test/java/services/WhiskeyServicesTest.java @@ -0,0 +1,7 @@ +package services; + +import static org.junit.jupiter.api.Assertions.*; + +class WhiskeyServicesTest { + +} \ No newline at end of file From 40f5356af3a48696813f803edba9d6efac3a0461 Mon Sep 17 00:00:00 2001 From: Maira Botelho Date: Sat, 9 Nov 2019 23:10:02 -0500 Subject: [PATCH 5/8] features --- .idea/misc.xml | 2 +- src/main/java/models/Sneaker.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 4b661a5..35c439d 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/src/main/java/models/Sneaker.java b/src/main/java/models/Sneaker.java index fa150ec..6fdc469 100644 --- a/src/main/java/models/Sneaker.java +++ b/src/main/java/models/Sneaker.java @@ -1,4 +1,14 @@ package models; public class Sneaker { + + private int id; + private String name; + private String brand; + private String sport; + private int size; + private int qty; + private float price; + + } From 5411f373f4c06d2ac594fc58c3ea0818a85729ef Mon Sep 17 00:00:00 2001 From: Maira Botelho Date: Sat, 9 Nov 2019 23:21:28 -0500 Subject: [PATCH 6/8] getters and setters and tests added --- src/main/java/models/Sneaker.java | 70 +++++++++++++++++++++++++++ src/test/java/models/SneakerTest.java | 42 +++++++++++++++- 2 files changed, 111 insertions(+), 1 deletion(-) diff --git a/src/main/java/models/Sneaker.java b/src/main/java/models/Sneaker.java index 6fdc469..25bbff5 100644 --- a/src/main/java/models/Sneaker.java +++ b/src/main/java/models/Sneaker.java @@ -10,5 +10,75 @@ public class Sneaker { private int qty; private float price; + public Sneaker(){ + + } + + public Sneaker(int id, String name, String brand, String sport, int qty, float price){ + + this.id = id; + this.name = name; + this.brand = brand; + this.sport = sport; + this.qty = qty; + this.price = price; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getBrand() { + return brand; + } + + public void setBrand(String brand) { + this.brand = brand; + } + + public String getSport() { + return sport; + } + + public void setSport(String sport) { + this.sport = sport; + } + + public int getSize() { + return size; + } + + public void setSize(int size) { + this.size = size; + } + + public int getQty() { + return qty; + } + + public void setQty(int qty) { + this.qty = qty; + } + + public float getPrice() { + return price; + } + + public void setPrice(float price) { + this.price = price; + } + } diff --git a/src/test/java/models/SneakerTest.java b/src/test/java/models/SneakerTest.java index 30ccb7a..29aba70 100644 --- a/src/test/java/models/SneakerTest.java +++ b/src/test/java/models/SneakerTest.java @@ -1,7 +1,47 @@ package models; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.*; class SneakerTest { -} \ No newline at end of file + @Test + public void setNameTest() { + // given (1) + String expected = "OZWEEGO"; + + // when (2) + Sneaker testSneaker = new Sneaker(); + testSneaker.setName(expected); + + // then (3) + Assertions.assertEquals(expected, testSneaker.getName()); + } + + @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) + Sneaker testSneaker = new Sneaker(expectedId, expectedName, expectedBrand, + expectedSport, expectedQty,expectedPrice); + + // (4) + Assertions.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 206ee422d79da00bf2d80c1a1e80bb55cb0069fc Mon Sep 17 00:00:00 2001 From: Maira Botelho Date: Sat, 9 Nov 2019 23:25:58 -0500 Subject: [PATCH 7/8] services --- src/test/java/services/SneakerServicesTest.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/test/java/services/SneakerServicesTest.java b/src/test/java/services/SneakerServicesTest.java index eaa8039..03ec5df 100644 --- a/src/test/java/services/SneakerServicesTest.java +++ b/src/test/java/services/SneakerServicesTest.java @@ -1,7 +1,12 @@ package services; -import static org.junit.jupiter.api.Assertions.*; +import models.Sneaker; + +import java.util.ArrayList; +import java.util.List; class SneakerServicesTest { + List sneakerList = new ArrayList(); + } \ No newline at end of file From a3f23aba2b1556bbb488b66007fdaa389ad5dc62 Mon Sep 17 00:00:00 2001 From: Maira Botelho Date: Sat, 9 Nov 2019 23:37:27 -0500 Subject: [PATCH 8/8] new services --- pom.xml | 6 ++++++ src/main/java/services/SneakerServices.java | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/pom.xml b/pom.xml index c3fbd83..6c753d2 100644 --- a/pom.xml +++ b/pom.xml @@ -34,6 +34,12 @@ 5.4.2 test + + junit + junit + 4.12 + test + \ No newline at end of file diff --git a/src/main/java/services/SneakerServices.java b/src/main/java/services/SneakerServices.java index 23f6f02..95d24ba 100644 --- a/src/main/java/services/SneakerServices.java +++ b/src/main/java/services/SneakerServices.java @@ -1,4 +1,13 @@ package services; +import models.Sneaker; + +import java.util.ArrayList; +import java.util.List; + public class SneakerServices { + + private static int nextId = 1; // (1) + + private List inventory = new ArrayList<>(); // (2) }