From 230c33b2501aee366dde5192fe883f5fccceb552 Mon Sep 17 00:00:00 2001 From: porfiremanuel Date: Thu, 29 Sep 2022 18:28:43 +0300 Subject: [PATCH 01/31] Initial branch commit. --- manuela2/pom.xml | 28 ++++++++++++++ .../main/java/com/imalittletester/App.java | 13 +++++++ .../java/com/imalittletester/AppTest.java | 38 +++++++++++++++++++ pom.xml | 4 ++ 4 files changed, 83 insertions(+) create mode 100644 manuela2/pom.xml create mode 100644 manuela2/src/main/java/com/imalittletester/App.java create mode 100644 manuela2/src/test/java/com/imalittletester/AppTest.java diff --git a/manuela2/pom.xml b/manuela2/pom.xml new file mode 100644 index 0000000..922c2a2 --- /dev/null +++ b/manuela2/pom.xml @@ -0,0 +1,28 @@ + + + tutorial-java + com.imalittletester + 1.0-SNAPSHOT + + 4.0.0 + + manuela2 + jar + + manuela2 + http://maven.apache.org + + + UTF-8 + + + + + junit + junit + 3.8.1 + test + + + diff --git a/manuela2/src/main/java/com/imalittletester/App.java b/manuela2/src/main/java/com/imalittletester/App.java new file mode 100644 index 0000000..f957ebc --- /dev/null +++ b/manuela2/src/main/java/com/imalittletester/App.java @@ -0,0 +1,13 @@ +package com.imalittletester; + +/** + * Hello world! + * + */ +public class App +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff --git a/manuela2/src/test/java/com/imalittletester/AppTest.java b/manuela2/src/test/java/com/imalittletester/AppTest.java new file mode 100644 index 0000000..392529e --- /dev/null +++ b/manuela2/src/test/java/com/imalittletester/AppTest.java @@ -0,0 +1,38 @@ +package com.imalittletester; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + */ +public class AppTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertTrue( true ); + } +} diff --git a/pom.xml b/pom.xml index 63fe07f..0bb994b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,11 @@ com.imalittletester tutorial-java + pom 1.0-SNAPSHOT + + manuela2 + tutorial-java From d647ab0f3aebde951045cfb2442705fa9b7b21a9 Mon Sep 17 00:00:00 2001 From: porfiremanuel Date: Sun, 2 Oct 2022 21:37:16 +0300 Subject: [PATCH 02/31] rename module --- {manuela2 => manuela}/pom.xml | 4 +- .../main/java/com/imalittletester/App.java | 13 ------- .../java/com/imalittletester/AppTest.java | 38 ------------------- pom.xml | 2 +- 4 files changed, 3 insertions(+), 54 deletions(-) rename {manuela2 => manuela}/pom.xml (92%) delete mode 100644 manuela2/src/main/java/com/imalittletester/App.java delete mode 100644 manuela2/src/test/java/com/imalittletester/AppTest.java diff --git a/manuela2/pom.xml b/manuela/pom.xml similarity index 92% rename from manuela2/pom.xml rename to manuela/pom.xml index 922c2a2..e17af14 100644 --- a/manuela2/pom.xml +++ b/manuela/pom.xml @@ -7,10 +7,10 @@ 4.0.0 - manuela2 + manuela jar - manuela2 + manuela http://maven.apache.org diff --git a/manuela2/src/main/java/com/imalittletester/App.java b/manuela2/src/main/java/com/imalittletester/App.java deleted file mode 100644 index f957ebc..0000000 --- a/manuela2/src/main/java/com/imalittletester/App.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.imalittletester; - -/** - * Hello world! - * - */ -public class App -{ - public static void main( String[] args ) - { - System.out.println( "Hello World!" ); - } -} diff --git a/manuela2/src/test/java/com/imalittletester/AppTest.java b/manuela2/src/test/java/com/imalittletester/AppTest.java deleted file mode 100644 index 392529e..0000000 --- a/manuela2/src/test/java/com/imalittletester/AppTest.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.imalittletester; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * Unit test for simple App. - */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - - /** - * Rigourous Test :-) - */ - public void testApp() - { - assertTrue( true ); - } -} diff --git a/pom.xml b/pom.xml index 0bb994b..023353c 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ pom 1.0-SNAPSHOT - manuela2 + manuela tutorial-java From 8e8c67fb2b65794e9de42c38994452f955bf7297 Mon Sep 17 00:00:00 2001 From: porfiremanuel Date: Sun, 2 Oct 2022 22:28:11 +0300 Subject: [PATCH 03/31] add dependencies homework T1 --- manuela/pom.xml | 12 ++++++ .../main/java/com/imalittletester/App.java | 13 +++++++ .../java/com/imalittletester/AppTest.java | 38 +++++++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 manuela/src/main/java/com/imalittletester/App.java create mode 100644 manuela/src/test/java/com/imalittletester/AppTest.java diff --git a/manuela/pom.xml b/manuela/pom.xml index e17af14..643792e 100644 --- a/manuela/pom.xml +++ b/manuela/pom.xml @@ -24,5 +24,17 @@ 3.8.1 test + + + org.apache.commons + commons-lang3 + 3.12.0 + + + + commons-io + commons-io + 2.11.0 + diff --git a/manuela/src/main/java/com/imalittletester/App.java b/manuela/src/main/java/com/imalittletester/App.java new file mode 100644 index 0000000..f957ebc --- /dev/null +++ b/manuela/src/main/java/com/imalittletester/App.java @@ -0,0 +1,13 @@ +package com.imalittletester; + +/** + * Hello world! + * + */ +public class App +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff --git a/manuela/src/test/java/com/imalittletester/AppTest.java b/manuela/src/test/java/com/imalittletester/AppTest.java new file mode 100644 index 0000000..392529e --- /dev/null +++ b/manuela/src/test/java/com/imalittletester/AppTest.java @@ -0,0 +1,38 @@ +package com.imalittletester; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + */ +public class AppTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertTrue( true ); + } +} From 54309c0a8d10b54b887b99bbf5e64ca97bca3deb Mon Sep 17 00:00:00 2001 From: porfiremanuel Date: Thu, 6 Oct 2022 16:39:43 +0300 Subject: [PATCH 04/31] remove junit dependency - add dependencies homework T1 --- manuela/pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/manuela/pom.xml b/manuela/pom.xml index 643792e..64d7558 100644 --- a/manuela/pom.xml +++ b/manuela/pom.xml @@ -18,12 +18,6 @@ - - junit - junit - 3.8.1 - test - org.apache.commons From cdd01afe5b273e277b8be25e11b62239cf1deb01 Mon Sep 17 00:00:00 2001 From: porfiremanuel Date: Thu, 6 Oct 2022 18:35:09 +0300 Subject: [PATCH 05/31] commit AppricotJamTest class --- .../main/java/com/imalittletester/App.java | 13 ------- .../com/imalittletester/jam/AppricotJam.java | 6 +++ .../java/com/imalittletester/AppTest.java | 38 ------------------- .../imalittletester/jam/AppricotJamTest.java | 26 +++++++++++++ 4 files changed, 32 insertions(+), 51 deletions(-) delete mode 100644 manuela/src/main/java/com/imalittletester/App.java create mode 100644 manuela/src/main/java/com/imalittletester/jam/AppricotJam.java delete mode 100644 manuela/src/test/java/com/imalittletester/AppTest.java create mode 100644 manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java diff --git a/manuela/src/main/java/com/imalittletester/App.java b/manuela/src/main/java/com/imalittletester/App.java deleted file mode 100644 index f957ebc..0000000 --- a/manuela/src/main/java/com/imalittletester/App.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.imalittletester; - -/** - * Hello world! - * - */ -public class App -{ - public static void main( String[] args ) - { - System.out.println( "Hello World!" ); - } -} diff --git a/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java b/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java new file mode 100644 index 0000000..949d9ab --- /dev/null +++ b/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java @@ -0,0 +1,6 @@ +package com.imalittletester.jam; + +public class AppricotJam { + //declaration of a field + public int nameOfInt = 3; +} diff --git a/manuela/src/test/java/com/imalittletester/AppTest.java b/manuela/src/test/java/com/imalittletester/AppTest.java deleted file mode 100644 index 392529e..0000000 --- a/manuela/src/test/java/com/imalittletester/AppTest.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.imalittletester; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * Unit test for simple App. - */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - - /** - * Rigourous Test :-) - */ - public void testApp() - { - assertTrue( true ); - } -} diff --git a/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java new file mode 100644 index 0000000..b310a55 --- /dev/null +++ b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java @@ -0,0 +1,26 @@ +package com.imalittletester.jam; + +import org.junit.jupiter.api.Test; + +public class AppricotJamTest { +//fields + public String sweetener; + public float sweetenerQty; + public String sweetenerUom; + + public float apricotQty; + public String apricotUom; + + public int jarQty; + public int jarCapacity; + + public boolean isDietetic; +//method + + @Test + void firstTest() { + //sout+tab for print + + } + +} From dcc2617a752075e2cf5edb9106bf1c2e345323a0 Mon Sep 17 00:00:00 2001 From: porfiremanuel Date: Sun, 9 Oct 2022 13:32:39 +0300 Subject: [PATCH 06/31] create CookieTest class T2 --- .../com/imalittletester/jam/AppricotJam.java | 2 ++ .../com/imalittletester/cookie/CookieTest.java | 17 +++++++++++++++++ .../imalittletester/jam/AppricotJamTest.java | 2 +- 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 manuela/src/test/java/com/imalittletester/cookie/CookieTest.java diff --git a/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java b/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java index 949d9ab..1befe7b 100644 --- a/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java +++ b/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java @@ -1,5 +1,7 @@ package com.imalittletester.jam; +import org.apache.commons.lang3.builder.ToStringExclude; + public class AppricotJam { //declaration of a field public int nameOfInt = 3; diff --git a/manuela/src/test/java/com/imalittletester/cookie/CookieTest.java b/manuela/src/test/java/com/imalittletester/cookie/CookieTest.java new file mode 100644 index 0000000..532270c --- /dev/null +++ b/manuela/src/test/java/com/imalittletester/cookie/CookieTest.java @@ -0,0 +1,17 @@ +package com.imalittletester.cookie; + +public class CookieTest { + public String name; + public String value; + public String domain; + public String path; + public String expires; + public int size; + public boolean httpOnly; + public boolean secure; + public String sameSite; + public boolean sameParty; + public String partitionKey; + public String priority; + //priority can be an enum type +} diff --git a/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java index b310a55..9311dbc 100644 --- a/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java +++ b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java @@ -20,7 +20,7 @@ public class AppricotJamTest { @Test void firstTest() { //sout+tab for print - + System.out.println(); } } From fcb6188fd78c0dc7635fd8baeb65ac4d2f4f78b4 Mon Sep 17 00:00:00 2001 From: porfiremanuel Date: Tue, 11 Oct 2022 08:33:17 +0300 Subject: [PATCH 07/31] update CookieTest class T1 --- .../com/imalittletester/cookie/Cookie.java} | 2 +- .../com/imalittletester/jam/AppricotJam.java | 14 +++++++-- .../imalittletester/jam/AppricotJamTest.java | 29 ++++++++++--------- 3 files changed, 28 insertions(+), 17 deletions(-) rename manuela/src/{test/java/com/imalittletester/cookie/CookieTest.java => main/java/com/imalittletester/cookie/Cookie.java} (93%) diff --git a/manuela/src/test/java/com/imalittletester/cookie/CookieTest.java b/manuela/src/main/java/com/imalittletester/cookie/Cookie.java similarity index 93% rename from manuela/src/test/java/com/imalittletester/cookie/CookieTest.java rename to manuela/src/main/java/com/imalittletester/cookie/Cookie.java index 532270c..1b0b51e 100644 --- a/manuela/src/test/java/com/imalittletester/cookie/CookieTest.java +++ b/manuela/src/main/java/com/imalittletester/cookie/Cookie.java @@ -1,6 +1,6 @@ package com.imalittletester.cookie; -public class CookieTest { +public class Cookie { public String name; public String value; public String domain; diff --git a/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java b/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java index 1befe7b..143b0b4 100644 --- a/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java +++ b/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java @@ -3,6 +3,16 @@ import org.apache.commons.lang3.builder.ToStringExclude; public class AppricotJam { - //declaration of a field - public int nameOfInt = 3; + //fields + public String sweetener; + public float sweetenerQty; + public String sweetenerUom; + + public float apricotQty; + public String apricotUom; + + public int jarQty; + public int jarCapacity; + + public boolean isDietetic; } diff --git a/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java index 9311dbc..c91a471 100644 --- a/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java +++ b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java @@ -1,26 +1,27 @@ package com.imalittletester.jam; import org.junit.jupiter.api.Test; +//import java.io.File; +import java.util.Date; public class AppricotJamTest { -//fields - public String sweetener; - public float sweetenerQty; - public String sweetenerUom; - - public float apricotQty; - public String apricotUom; - - public int jarQty; - public int jarCapacity; - - public boolean isDietetic; -//method + public int aPositiveInt = -10; + public long aPositiveLong = -100000000; + public float aFloat = 500; + public double aDouble = -221211.556765746464564564564564645645632342435465564; + public boolean aBoolean; + public String aSweetener = "sugar cane"; + public Date new_Date; @Test void firstTest() { //sout+tab for print - System.out.println(); + System.out.println(aPositiveInt); +// System.out.println(aPositiveLong); +// System.out.println(aFloat); +// System.out.println(aDouble); +// System.out.println(aBoolean); + System.out.println(" --> " + aSweetener); } } From 71bff6b05d246af0eec44684844a13437d69207b Mon Sep 17 00:00:00 2001 From: porfiremanuel Date: Thu, 13 Oct 2022 10:41:58 +0300 Subject: [PATCH 08/31] commit course2 --- .../com/imalittletester/jam/AppricotJam.java | 42 +++++++++++++++++++ .../imalittletester/jam/AppricotJamTest.java | 20 +++++++++ 2 files changed, 62 insertions(+) diff --git a/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java b/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java index 143b0b4..4885e58 100644 --- a/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java +++ b/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java @@ -15,4 +15,46 @@ public class AppricotJam { public int jarCapacity; public boolean isDietetic; + + //method + //constructor + public AppricotJam(){} + public AppricotJam(String sweetener){ + this.sweetener = sweetener; + } + + public AppricotJam(String sweetener, float sweetenerQty, String sweetenerUom, float apricotQty, String apricotUom, int jarQty, int jarCapacity, boolean isDietetic) { + this.sweetener = sweetener; + this.sweetenerQty = sweetenerQty; + this.sweetenerUom = sweetenerUom; + this.apricotQty = apricotQty; + this.apricotUom = apricotUom; + this.jarQty = jarQty; + this.jarCapacity = jarCapacity; + this.isDietetic = isDietetic; + } + + public void makeJam(){ + System.out.println("Adding " + sweetenerQty + " " + sweetenerUom + " of " + sweetener); + System.out.println("Also adding: " + apricotQty + " " + apricotUom + " of apricots"); + System.out.println("Boiling for " + preparationTime() + " minutes"); + System.out.println("Is dietetic? " + isDietetic); + } + private int preparationTime(){ + return 30; + } + + @Override + public String toString() { + return "AppricotJam{" + + "sweetener='" + sweetener + '\'' + + ", sweetenerQty=" + sweetenerQty + + ", sweetenerUom='" + sweetenerUom + '\'' + + ", apricotQty=" + apricotQty + + ", apricotUom='" + apricotUom + '\'' + + ", jarQty=" + jarQty + + ", jarCapacity=" + jarCapacity + + ", isDietetic=" + isDietetic + + '}'; + } } diff --git a/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java index c91a471..d048ab5 100644 --- a/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java +++ b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java @@ -13,6 +13,25 @@ public class AppricotJamTest { public String aSweetener = "sugar cane"; public Date new_Date; + //stocam un nou appricotJam + public AppricotJam appricotJam = new AppricotJam(); + public AppricotJam appricotJam2 = new AppricotJam("white sugar"); + public AppricotJam appricotJam3 = new AppricotJam("sugar cane", 1.5f, "kg", 10, "kg", 30, 500, false); + + @Test + void secondTest(){ + System.out.println(appricotJam); + + System.out.println(appricotJam2); + + System.out.println(appricotJam3); + + appricotJam3.makeJam(); + System.out.println(appricotJam3.sweetener); + + appricotJam3.sweetener.contains("sugar"); + } + @Test void firstTest() { //sout+tab for print @@ -22,6 +41,7 @@ void firstTest() { // System.out.println(aDouble); // System.out.println(aBoolean); System.out.println(" --> " + aSweetener); + // asertEquals (api.login("username1","passwoard1") + getResponse "Success"); } } From a62a76e0d608320fe8cd5326ed455abaa2e76278 Mon Sep 17 00:00:00 2001 From: porfiremanuel Date: Tue, 18 Oct 2022 17:15:52 +0300 Subject: [PATCH 09/31] create constructor and method for Cookie T2 --- .../com/imalittletester/cookie/Cookie.java | 48 ++++++++++++++++++- .../com/imalittletester/jam/AppricotJam.java | 11 +++-- .../imalittletester/cookie/CookieTest.java | 16 +++++++ .../imalittletester/jam/AppricotJamTest.java | 9 ++-- 4 files changed, 75 insertions(+), 9 deletions(-) create mode 100644 manuela/src/test/java/com/imalittletester/cookie/CookieTest.java diff --git a/manuela/src/main/java/com/imalittletester/cookie/Cookie.java b/manuela/src/main/java/com/imalittletester/cookie/Cookie.java index 1b0b51e..56ed35d 100644 --- a/manuela/src/main/java/com/imalittletester/cookie/Cookie.java +++ b/manuela/src/main/java/com/imalittletester/cookie/Cookie.java @@ -1,5 +1,9 @@ package com.imalittletester.cookie; +import org.w3c.dom.ls.LSOutput; + +import java.sql.SQLOutput; + public class Cookie { public String name; public String value; @@ -13,5 +17,47 @@ public class Cookie { public boolean sameParty; public String partitionKey; public String priority; + //priority can be an enum type -} + //default constructor + public Cookie() { + } + + //constructor only name and value + public Cookie(String domain) { + + this.domain = domain; + } + + public Cookie(String name, String value, String domain, String path, String expires, int size, boolean httpOnly, boolean secure, String sameSite, boolean sameParty, String partitionKey, String priority) { + this.name = name; + this.value = value; + this.domain = domain; + this.path = path; + this.expires = expires; + this.size = size; + this.httpOnly = httpOnly; + this.secure = secure; + this.sameSite = sameSite; + this.sameParty = sameParty; + this.partitionKey = partitionKey; + this.priority = priority; + } + + public void diplayCookie() { + System.out.println("The name of the cookie is " + name + "with the domain " + domain); + System.out.println("The value of the cookie is: " + value); + System.out.println("The domain of the cookie is: " + domain); + System.out.println("To access the cookie " + name + " use the path: " + path); + System.out.println("The cookie " + name + " with domain " + domain + " expires on " + expires); + } + + //Not sure about the requirements, but on CookieTest.java returns false or true based on entered value + public boolean isProvidedParamSubDomainOfDomain(String isSubDomainOfDomain) { + if (domain.contains(isSubDomainOfDomain)) { + return true; + } else { + return false; + } + } +} \ No newline at end of file diff --git a/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java b/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java index 4885e58..497dd60 100644 --- a/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java +++ b/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java @@ -18,8 +18,10 @@ public class AppricotJam { //method //constructor - public AppricotJam(){} - public AppricotJam(String sweetener){ + public AppricotJam() { + } + + public AppricotJam(String sweetener) { this.sweetener = sweetener; } @@ -34,13 +36,14 @@ public AppricotJam(String sweetener, float sweetenerQty, String sweetenerUom, fl this.isDietetic = isDietetic; } - public void makeJam(){ + public void makeJam() { System.out.println("Adding " + sweetenerQty + " " + sweetenerUom + " of " + sweetener); System.out.println("Also adding: " + apricotQty + " " + apricotUom + " of apricots"); System.out.println("Boiling for " + preparationTime() + " minutes"); System.out.println("Is dietetic? " + isDietetic); } - private int preparationTime(){ + + private int preparationTime() { return 30; } diff --git a/manuela/src/test/java/com/imalittletester/cookie/CookieTest.java b/manuela/src/test/java/com/imalittletester/cookie/CookieTest.java new file mode 100644 index 0000000..544573c --- /dev/null +++ b/manuela/src/test/java/com/imalittletester/cookie/CookieTest.java @@ -0,0 +1,16 @@ +package com.imalittletester.cookie; + +import com.imalittletester.jam.AppricotJam; +import org.junit.jupiter.api.Test; + +public class CookieTest { + public Cookie cookie2 = new Cookie("en.garmin.com"); + + @Test + void TestCookie() { + + cookie2.isProvidedParamSubDomainOfDomain("en"); + System.out.println(cookie2.isProvidedParamSubDomainOfDomain("en")); + System.out.println(cookie2.isProvidedParamSubDomainOfDomain("ro")); + } +} diff --git a/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java index d048ab5..0c36fac 100644 --- a/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java +++ b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java @@ -15,11 +15,11 @@ public class AppricotJamTest { //stocam un nou appricotJam public AppricotJam appricotJam = new AppricotJam(); - public AppricotJam appricotJam2 = new AppricotJam("white sugar"); - public AppricotJam appricotJam3 = new AppricotJam("sugar cane", 1.5f, "kg", 10, "kg", 30, 500, false); + public AppricotJam appricotJam2 = new AppricotJam("white sugar"); + public AppricotJam appricotJam3 = new AppricotJam("sugar cane", 1.5f, "kg", 10, "kg", 30, 500, false); @Test - void secondTest(){ + void secondTest() { System.out.println(appricotJam); System.out.println(appricotJam2); @@ -30,6 +30,7 @@ void secondTest(){ System.out.println(appricotJam3.sweetener); appricotJam3.sweetener.contains("sugar"); + } @Test @@ -41,7 +42,7 @@ void firstTest() { // System.out.println(aDouble); // System.out.println(aBoolean); System.out.println(" --> " + aSweetener); - // asertEquals (api.login("username1","passwoard1") + getResponse "Success"); + // asertEquals (api.login("username1","passwoard1") + getResponse "Success"); } } From faf2c771f19e7cc43a62c317878cf7014c1e78ad Mon Sep 17 00:00:00 2001 From: porfiremanuel Date: Thu, 20 Oct 2022 14:59:55 +0300 Subject: [PATCH 10/31] update create constructor and method for Cookie T2 --- .../main/java/com/imalittletester/cookie/Cookie.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/manuela/src/main/java/com/imalittletester/cookie/Cookie.java b/manuela/src/main/java/com/imalittletester/cookie/Cookie.java index 56ed35d..c07f34b 100644 --- a/manuela/src/main/java/com/imalittletester/cookie/Cookie.java +++ b/manuela/src/main/java/com/imalittletester/cookie/Cookie.java @@ -54,10 +54,11 @@ public void diplayCookie() { //Not sure about the requirements, but on CookieTest.java returns false or true based on entered value public boolean isProvidedParamSubDomainOfDomain(String isSubDomainOfDomain) { - if (domain.contains(isSubDomainOfDomain)) { - return true; - } else { - return false; - } + //if (domain.contains(isSubDomainOfDomain)) { + // return true; + //} else { + // return false; + //} + return domain.contains(isSubDomainOfDomain); } } \ No newline at end of file From 36dc3aa5eae66ee58ca89c32f0d734ee10b77b6c Mon Sep 17 00:00:00 2001 From: porfiremanuel Date: Thu, 20 Oct 2022 15:04:58 +0300 Subject: [PATCH 11/31] update create constructor and method for Cookie T2 --- manuela/src/main/java/com/imalittletester/cookie/Cookie.java | 1 - 1 file changed, 1 deletion(-) diff --git a/manuela/src/main/java/com/imalittletester/cookie/Cookie.java b/manuela/src/main/java/com/imalittletester/cookie/Cookie.java index c07f34b..860e878 100644 --- a/manuela/src/main/java/com/imalittletester/cookie/Cookie.java +++ b/manuela/src/main/java/com/imalittletester/cookie/Cookie.java @@ -58,7 +58,6 @@ public boolean isProvidedParamSubDomainOfDomain(String isSubDomainOfDomain) { // return true; //} else { // return false; - //} return domain.contains(isSubDomainOfDomain); } } \ No newline at end of file From cb76e468513ff857e76f0f8f852990bdf901e6ea Mon Sep 17 00:00:00 2001 From: porfiremanuel Date: Thu, 20 Oct 2022 18:35:28 +0300 Subject: [PATCH 12/31] commit course 3 inheritance --- .../com/imalittletester/cookie/Cookie.java | 3 +- .../com/imalittletester/jam/AppricotJam.java | 23 ++++-------- .../java/com/imalittletester/jam/Bottle.java | 11 ++++++ .../java/com/imalittletester/jam/Jam.java | 37 +++++++++++++++++++ .../com/imalittletester/jam/MelonJam.java | 33 +++++++++++++++++ .../imalittletester/jam/AppricotJamTest.java | 24 +++++++++++- 6 files changed, 113 insertions(+), 18 deletions(-) create mode 100644 manuela/src/main/java/com/imalittletester/jam/Bottle.java create mode 100644 manuela/src/main/java/com/imalittletester/jam/Jam.java create mode 100644 manuela/src/main/java/com/imalittletester/jam/MelonJam.java diff --git a/manuela/src/main/java/com/imalittletester/cookie/Cookie.java b/manuela/src/main/java/com/imalittletester/cookie/Cookie.java index 860e878..4ec34f3 100644 --- a/manuela/src/main/java/com/imalittletester/cookie/Cookie.java +++ b/manuela/src/main/java/com/imalittletester/cookie/Cookie.java @@ -56,8 +56,7 @@ public void diplayCookie() { public boolean isProvidedParamSubDomainOfDomain(String isSubDomainOfDomain) { //if (domain.contains(isSubDomainOfDomain)) { // return true; - //} else { - // return false; + //} else {// return false; return domain.contains(isSubDomainOfDomain); } } \ No newline at end of file diff --git a/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java b/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java index 497dd60..95c2230 100644 --- a/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java +++ b/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java @@ -2,45 +2,38 @@ import org.apache.commons.lang3.builder.ToStringExclude; -public class AppricotJam { +//inhierence +public class AppricotJam extends Jam { //fields - public String sweetener; - public float sweetenerQty; - public String sweetenerUom; - public float apricotQty; public String apricotUom; public int jarQty; public int jarCapacity; - public boolean isDietetic; - //method //constructor public AppricotJam() { } public AppricotJam(String sweetener) { - this.sweetener = sweetener; + super(sweetener); } public AppricotJam(String sweetener, float sweetenerQty, String sweetenerUom, float apricotQty, String apricotUom, int jarQty, int jarCapacity, boolean isDietetic) { - this.sweetener = sweetener; - this.sweetenerQty = sweetenerQty; - this.sweetenerUom = sweetenerUom; + super(sweetener, sweetenerQty, sweetenerUom, isDietetic); //the supper class Jam this.apricotQty = apricotQty; this.apricotUom = apricotUom; this.jarQty = jarQty; this.jarCapacity = jarCapacity; - this.isDietetic = isDietetic; - } + } +@Override public void makeJam() { - System.out.println("Adding " + sweetenerQty + " " + sweetenerUom + " of " + sweetener); + super.makeJam(); System.out.println("Also adding: " + apricotQty + " " + apricotUom + " of apricots"); System.out.println("Boiling for " + preparationTime() + " minutes"); - System.out.println("Is dietetic? " + isDietetic); + } private int preparationTime() { diff --git a/manuela/src/main/java/com/imalittletester/jam/Bottle.java b/manuela/src/main/java/com/imalittletester/jam/Bottle.java new file mode 100644 index 0000000..41b0a93 --- /dev/null +++ b/manuela/src/main/java/com/imalittletester/jam/Bottle.java @@ -0,0 +1,11 @@ +package com.imalittletester.jam; + +public class Bottle { + public int bottleQty; //how many we have 7, 11 + public int bottleCapacity; //250, 200 + + public Bottle(int bottleQty, int bottleCapacity) { + this.bottleQty = bottleQty; + this.bottleCapacity = bottleCapacity; + } +} diff --git a/manuela/src/main/java/com/imalittletester/jam/Jam.java b/manuela/src/main/java/com/imalittletester/jam/Jam.java new file mode 100644 index 0000000..e0fe20c --- /dev/null +++ b/manuela/src/main/java/com/imalittletester/jam/Jam.java @@ -0,0 +1,37 @@ +package com.imalittletester.jam; + +public class Jam { + public String sweetener; + public float sweetenerQty; + public String sweetenerUom; + + public boolean isDietetic; + + public Jam(String sweetener, float sweetenerQty, String sweetenerUom, boolean isDietetic) { + this.sweetener = sweetener; + this.sweetenerQty = sweetenerQty; + this.sweetenerUom = sweetenerUom; + this.isDietetic = isDietetic; + } + + public Jam() { + } + + public Jam(String sweetener) { + this.sweetener = sweetener; + } + + public void makeJam(){ + System.out.println("Adding " + sweetenerQty + " " + sweetenerUom + " of " +sweetener); + System.out.println("Is jam dietetic? " + isDietetic); + + } + + public String getSweetener() { + return sweetener; + } + + public void setSweetener(String sweetener) { + this.sweetener = sweetener; + } +} diff --git a/manuela/src/main/java/com/imalittletester/jam/MelonJam.java b/manuela/src/main/java/com/imalittletester/jam/MelonJam.java new file mode 100644 index 0000000..a213a21 --- /dev/null +++ b/manuela/src/main/java/com/imalittletester/jam/MelonJam.java @@ -0,0 +1,33 @@ +package com.imalittletester.jam; + +public class MelonJam extends Jam { + //attribute - properties of the object + public float melonQty; + public String melonUom; + + public Bottle bottle; + + public MelonJam(String sweetener, float sweetenerQty, String sweetenerUom, float melonQty, String melonUom, Bottle bottle, boolean isDietetic) { + super(sweetener, sweetenerQty, sweetenerUom, isDietetic); //the supper class Jam + this.melonQty = melonQty; + this.melonUom = melonUom; + this.bottle = bottle; + + } + + public MelonJam() { + } + + public MelonJam(String sweetener){ + super(sweetener); + } + + @Override + //method that does not return anything + public void makeJam(){ + super.makeJam(); + System.out.println("Adding " + melonQty + " " + melonUom + " of melon"); + System.out.println("Bottling in: " + bottle.bottleQty + " bottles of capacity: " + bottle.bottleCapacity); + +} +} diff --git a/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java index 0c36fac..051e2c5 100644 --- a/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java +++ b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java @@ -1,9 +1,13 @@ package com.imalittletester.jam; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; //import java.io.File; import java.util.Date; +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) //set order on run tests public class AppricotJamTest { public int aPositiveInt = -10; public long aPositiveLong = -100000000; @@ -16,8 +20,23 @@ public class AppricotJamTest { //stocam un nou appricotJam public AppricotJam appricotJam = new AppricotJam(); public AppricotJam appricotJam2 = new AppricotJam("white sugar"); - public AppricotJam appricotJam3 = new AppricotJam("sugar cane", 1.5f, "kg", 10, "kg", 30, 500, false); + public AppricotJam appricotJam3 = new AppricotJam("sugar cane", 1.5f, "kg", 10, "kg", 30, 500, true); + //initialized a new object of melonJam + public MelonJam melonJam = new MelonJam("plain sugar", 10, "kg", 10, "kg", new Bottle(20,100), false); + + @Order(1) //sa fie rulate in ordine + @Test + + void thirdTest(){ + appricotJam3.makeJam(); + System.out.println(appricotJam3.getSweetener()); + appricotJam3.setSweetener("stevia"); + System.out.println(appricotJam3.getSweetener()); + System.out.println("-------------------------"); + melonJam.makeJam(); + } + @Order(2) @Test void secondTest() { System.out.println(appricotJam); @@ -31,8 +50,11 @@ void secondTest() { appricotJam3.sweetener.contains("sugar"); + melonJam.makeJam(); + } + @Order(3) @Test void firstTest() { //sout+tab for print From 8981ebc8914fdb57c02f4c734e643ef0266f92ff Mon Sep 17 00:00:00 2001 From: porfiremanuel Date: Tue, 25 Oct 2022 16:58:34 +0300 Subject: [PATCH 13/31] T3 creating Jar class --- .../java/com/imalittletester/jam/AppricotJam.java | 13 ++++++------- .../src/main/java/com/imalittletester/jam/Jar.java | 11 +++++++++++ .../com/imalittletester/jam/AppricotJamTest.java | 7 ++++++- 3 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 manuela/src/main/java/com/imalittletester/jam/Jar.java diff --git a/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java b/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java index 95c2230..47b2d44 100644 --- a/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java +++ b/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java @@ -8,8 +8,7 @@ public class AppricotJam extends Jam { public float apricotQty; public String apricotUom; - public int jarQty; - public int jarCapacity; + public Jar jar; //method //constructor @@ -20,12 +19,11 @@ public AppricotJam(String sweetener) { super(sweetener); } - public AppricotJam(String sweetener, float sweetenerQty, String sweetenerUom, float apricotQty, String apricotUom, int jarQty, int jarCapacity, boolean isDietetic) { + public AppricotJam(String sweetener, float sweetenerQty, String sweetenerUom, float apricotQty, String apricotUom, Jar jar, boolean isDietetic) { super(sweetener, sweetenerQty, sweetenerUom, isDietetic); //the supper class Jam this.apricotQty = apricotQty; this.apricotUom = apricotUom; - this.jarQty = jarQty; - this.jarCapacity = jarCapacity; + this.jar = jar; } @Override @@ -33,6 +31,7 @@ public void makeJam() { super.makeJam(); System.out.println("Also adding: " + apricotQty + " " + apricotUom + " of apricots"); System.out.println("Boiling for " + preparationTime() + " minutes"); + System.out.println("Having " + jar.jarQty + " jars"+ " " + "of capacity: " + jar.jarCapacity ); } @@ -48,8 +47,8 @@ public String toString() { ", sweetenerUom='" + sweetenerUom + '\'' + ", apricotQty=" + apricotQty + ", apricotUom='" + apricotUom + '\'' + - ", jarQty=" + jarQty + - ", jarCapacity=" + jarCapacity + + ", jarQty=" + jar + + ", jarCapacity=" + jar + ", isDietetic=" + isDietetic + '}'; } diff --git a/manuela/src/main/java/com/imalittletester/jam/Jar.java b/manuela/src/main/java/com/imalittletester/jam/Jar.java new file mode 100644 index 0000000..52d5513 --- /dev/null +++ b/manuela/src/main/java/com/imalittletester/jam/Jar.java @@ -0,0 +1,11 @@ +package com.imalittletester.jam; + +public class Jar { + public int jarQty; + public int jarCapacity; + + public Jar(int jarQty, int jarCapacity) { + this.jarQty = jarQty; + this.jarCapacity = jarCapacity; + } +} diff --git a/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java index 051e2c5..2bf3e31 100644 --- a/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java +++ b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java @@ -20,7 +20,7 @@ public class AppricotJamTest { //stocam un nou appricotJam public AppricotJam appricotJam = new AppricotJam(); public AppricotJam appricotJam2 = new AppricotJam("white sugar"); - public AppricotJam appricotJam3 = new AppricotJam("sugar cane", 1.5f, "kg", 10, "kg", 30, 500, true); + public AppricotJam appricotJam3 = new AppricotJam("sugar cane", 1.5f, "kg", 10, "kg", new Jar(30, 500), true); //initialized a new object of melonJam public MelonJam melonJam = new MelonJam("plain sugar", 10, "kg", 10, "kg", new Bottle(20,100), false); @@ -67,4 +67,9 @@ void firstTest() { // asertEquals (api.login("username1","passwoard1") + getResponse "Success"); } + @Test + void fourthTest(){ + appricotJam3.makeJam(); + } + } From c53d12fbcc70d18e05a99a87ba0cc8bb496ac66a Mon Sep 17 00:00:00 2001 From: porfiremanuel Date: Tue, 25 Oct 2022 17:00:24 +0300 Subject: [PATCH 14/31] T3 creating Jar class --- .../src/test/java/com/imalittletester/jam/AppricotJamTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java index 2bf3e31..1779270 100644 --- a/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java +++ b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java @@ -67,6 +67,7 @@ void firstTest() { // asertEquals (api.login("username1","passwoard1") + getResponse "Success"); } + @Order (3) @Test void fourthTest(){ appricotJam3.makeJam(); From e507ee1f93b527764fd9fd675fad19e1b6efb2a6 Mon Sep 17 00:00:00 2001 From: porfiremanuel Date: Wed, 26 Oct 2022 08:48:46 +0300 Subject: [PATCH 15/31] T3 extract fruit into Jam class --- .../java/com/imalittletester/jam/AppricotJam.java | 6 ++++-- .../src/main/java/com/imalittletester/jam/Jam.java | 13 +++++++++++++ .../com/imalittletester/jam/AppricotJamTest.java | 1 - 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java b/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java index 47b2d44..faa5aa9 100644 --- a/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java +++ b/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java @@ -21,9 +21,11 @@ public AppricotJam(String sweetener) { public AppricotJam(String sweetener, float sweetenerQty, String sweetenerUom, float apricotQty, String apricotUom, Jar jar, boolean isDietetic) { super(sweetener, sweetenerQty, sweetenerUom, isDietetic); //the supper class Jam - this.apricotQty = apricotQty; - this.apricotUom = apricotUom; + this.apricotQty = apricotQty; + this.apricotUom = apricotUom; this.jar = jar; + //this.fruitQty = apricotQty; + //this.fruitUom = apricotUom; } @Override diff --git a/manuela/src/main/java/com/imalittletester/jam/Jam.java b/manuela/src/main/java/com/imalittletester/jam/Jam.java index e0fe20c..b326177 100644 --- a/manuela/src/main/java/com/imalittletester/jam/Jam.java +++ b/manuela/src/main/java/com/imalittletester/jam/Jam.java @@ -1,6 +1,17 @@ package com.imalittletester.jam; public class Jam { + + //Homework T3 + //public float fruitQty; + //public String fruitUom; + //In clasa AppricotJam - in constructorul cu toate valorile as scrie: + //this.fruitQty = apricotQty; + //this.fruitUom = apricotUom; + //As inlocui astea unde mai este necesar in AppricotJam si MelonJam in loc de: + // public float melonQty; + // public String melonUom; + public String sweetener; public float sweetenerQty; public String sweetenerUom; @@ -34,4 +45,6 @@ public String getSweetener() { public void setSweetener(String sweetener) { this.sweetener = sweetener; } + + } diff --git a/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java index 1779270..d5dc6e7 100644 --- a/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java +++ b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java @@ -21,7 +21,6 @@ public class AppricotJamTest { public AppricotJam appricotJam = new AppricotJam(); public AppricotJam appricotJam2 = new AppricotJam("white sugar"); public AppricotJam appricotJam3 = new AppricotJam("sugar cane", 1.5f, "kg", 10, "kg", new Jar(30, 500), true); - //initialized a new object of melonJam public MelonJam melonJam = new MelonJam("plain sugar", 10, "kg", 10, "kg", new Bottle(20,100), false); From e567041eabc8f6612662055929c2e114bd7d6901 Mon Sep 17 00:00:00 2001 From: porfiremanuel Date: Wed, 26 Oct 2022 08:57:58 +0300 Subject: [PATCH 16/31] T3 extract fruit into Jam class --- .../main/java/com/imalittletester/jam/AppricotJam.java | 6 ++++-- manuela/src/main/java/com/imalittletester/jam/Jam.java | 10 ++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java b/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java index faa5aa9..c59ba35 100644 --- a/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java +++ b/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java @@ -21,17 +21,17 @@ public AppricotJam(String sweetener) { public AppricotJam(String sweetener, float sweetenerQty, String sweetenerUom, float apricotQty, String apricotUom, Jar jar, boolean isDietetic) { super(sweetener, sweetenerQty, sweetenerUom, isDietetic); //the supper class Jam + //super(sweetener, sweetenerQty, sweetenerUom, fruitQty, fruitUom, isDietetic); this.apricotQty = apricotQty; this.apricotUom = apricotUom; this.jar = jar; - //this.fruitQty = apricotQty; - //this.fruitUom = apricotUom; } @Override public void makeJam() { super.makeJam(); System.out.println("Also adding: " + apricotQty + " " + apricotUom + " of apricots"); + //System.out.println("Also adding: " + fruitQty + " " + fruitUom + " of apricots"); System.out.println("Boiling for " + preparationTime() + " minutes"); System.out.println("Having " + jar.jarQty + " jars"+ " " + "of capacity: " + jar.jarCapacity ); @@ -49,6 +49,8 @@ public String toString() { ", sweetenerUom='" + sweetenerUom + '\'' + ", apricotQty=" + apricotQty + ", apricotUom='" + apricotUom + '\'' + +// ", apricotQty=" + fruitQty + +// ", apricotUom='" + fruitUom + '\'' + ", jarQty=" + jar + ", jarCapacity=" + jar + ", isDietetic=" + isDietetic + diff --git a/manuela/src/main/java/com/imalittletester/jam/Jam.java b/manuela/src/main/java/com/imalittletester/jam/Jam.java index b326177..3e291e7 100644 --- a/manuela/src/main/java/com/imalittletester/jam/Jam.java +++ b/manuela/src/main/java/com/imalittletester/jam/Jam.java @@ -5,9 +5,15 @@ public class Jam { //Homework T3 //public float fruitQty; //public String fruitUom; + //In clasa AppricotJam - in constructorul cu toate valorile as scrie: - //this.fruitQty = apricotQty; - //this.fruitUom = apricotUom; + + //public AppricotJam(String sweetener, float sweetenerQty, String sweetenerUom, float fruitQty, String fruitUom, Jar jar, boolean isDietetic) + // { + // super(sweetener, sweetenerQty, sweetenerUom, fruitQty, fruitUom, isDietetic); + // this.jar = jar; + // } + //As inlocui astea unde mai este necesar in AppricotJam si MelonJam in loc de: // public float melonQty; // public String melonUom; From 1cc9ae5175dab83a56c390bcb5a9ff17879539b0 Mon Sep 17 00:00:00 2001 From: porfiremanuel Date: Thu, 27 Oct 2022 08:47:26 +0300 Subject: [PATCH 17/31] changes made for extract fruit into Jam class --- .../com/imalittletester/jam/AppricotJam.java | 18 +++++++++--------- .../main/java/com/imalittletester/jam/Jam.java | 18 ++++++++++++++---- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java b/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java index c59ba35..1a95dac 100644 --- a/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java +++ b/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java @@ -5,8 +5,8 @@ //inhierence public class AppricotJam extends Jam { //fields - public float apricotQty; - public String apricotUom; + public float apricotQty; + public String apricotUom; public Jar jar; @@ -19,11 +19,11 @@ public AppricotJam(String sweetener) { super(sweetener); } - public AppricotJam(String sweetener, float sweetenerQty, String sweetenerUom, float apricotQty, String apricotUom, Jar jar, boolean isDietetic) { - super(sweetener, sweetenerQty, sweetenerUom, isDietetic); //the supper class Jam - //super(sweetener, sweetenerQty, sweetenerUom, fruitQty, fruitUom, isDietetic); - this.apricotQty = apricotQty; - this.apricotUom = apricotUom; + public AppricotJam(String sweetener, float sweetenerQty, String sweetenerUom, float apricotQtyQty, String apricotUomUom, Jar jar, boolean isDietetic) { + super(sweetener, sweetenerQty, sweetenerUom, isDietetic); //the supper class Jam + //super(fruitQty, fruitUom,sweetener, sweetenerQty, sweetenerUom, isDietetic); + this.apricotQty = apricotQty; + this.apricotUom = apricotUom; this.jar = jar; } @@ -49,8 +49,8 @@ public String toString() { ", sweetenerUom='" + sweetenerUom + '\'' + ", apricotQty=" + apricotQty + ", apricotUom='" + apricotUom + '\'' + -// ", apricotQty=" + fruitQty + -// ", apricotUom='" + fruitUom + '\'' + + //", apricotQty=" + fruitQty + + // ", apricotUom='" + fruitUom + '\'' + ", jarQty=" + jar + ", jarCapacity=" + jar + ", isDietetic=" + isDietetic + diff --git a/manuela/src/main/java/com/imalittletester/jam/Jam.java b/manuela/src/main/java/com/imalittletester/jam/Jam.java index 3e291e7..e6d99cf 100644 --- a/manuela/src/main/java/com/imalittletester/jam/Jam.java +++ b/manuela/src/main/java/com/imalittletester/jam/Jam.java @@ -4,13 +4,23 @@ public class Jam { //Homework T3 //public float fruitQty; - //public String fruitUom; - +// public String fruitUom; +// public String fruitType; + +// public Jam(float fruitQty, String fruitUom, String fruitType, String sweetener, float sweetenerQty, String sweetenerUom, boolean isDietetic) { +// this.fruitQty = fruitQty; +// this.fruitUom = fruitUom; +// this.fruitType = fruitType; +// this.sweetener = sweetener; +// this.sweetenerQty = sweetenerQty; +// this.sweetenerUom = sweetenerUom; +// this.isDietetic = isDietetic; +// } //In clasa AppricotJam - in constructorul cu toate valorile as scrie: - //public AppricotJam(String sweetener, float sweetenerQty, String sweetenerUom, float fruitQty, String fruitUom, Jar jar, boolean isDietetic) + //public AppricotJam(String sweetener, float sweetenerQty, String sweetenerUom, float fruitQty, String fruitUom, String fruitType, Jar jar, boolean isDietetic) // { - // super(sweetener, sweetenerQty, sweetenerUom, fruitQty, fruitUom, isDietetic); + // super(sweetener, sweetenerQty, sweetenerUom, fruitQty, fruitUom, fruitType, isDietetic); // this.jar = jar; // } From 106bbb3ad7e1d30064745478fee15a2846fbcdc7 Mon Sep 17 00:00:00 2001 From: porfiremanuel Date: Thu, 27 Oct 2022 18:19:41 +0300 Subject: [PATCH 18/31] commit chapter 4 operatorsTest --- .../com/imalittletester/jam/AppricotJam.java | 44 +++++++--- .../java/com/imalittletester/jam/Jam.java | 13 +++ .../com/imalittletester/jam/MelonJam.java | 21 ++++- .../com/imalittletester/OperatorsTest.java | 83 +++++++++++++++++++ .../imalittletester/jam/AppricotJamTest.java | 27 +++--- 5 files changed, 163 insertions(+), 25 deletions(-) create mode 100644 manuela/src/test/java/com/imalittletester/OperatorsTest.java diff --git a/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java b/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java index 1a95dac..8c628fc 100644 --- a/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java +++ b/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java @@ -2,11 +2,13 @@ import org.apache.commons.lang3.builder.ToStringExclude; +import java.util.Objects; + //inhierence public class AppricotJam extends Jam { //fields - public float apricotQty; - public String apricotUom; + public float apricotQty; + public String apricotUom; public Jar jar; @@ -19,21 +21,22 @@ public AppricotJam(String sweetener) { super(sweetener); } - public AppricotJam(String sweetener, float sweetenerQty, String sweetenerUom, float apricotQtyQty, String apricotUomUom, Jar jar, boolean isDietetic) { - super(sweetener, sweetenerQty, sweetenerUom, isDietetic); //the supper class Jam + public AppricotJam(String sweetener, float sweetenerQty, String sweetenerUom, float apricotQty, String apricotUom, Jar jar, boolean isDietetic) { + super(sweetener, sweetenerQty, sweetenerUom, isDietetic); //the supper class Jam //super(fruitQty, fruitUom,sweetener, sweetenerQty, sweetenerUom, isDietetic); - this.apricotQty = apricotQty; - this.apricotUom = apricotUom; + this.apricotQty = apricotQty; + this.apricotUom = apricotUom; this.jar = jar; } -@Override + + @Override public void makeJam() { super.makeJam(); System.out.println("Also adding: " + apricotQty + " " + apricotUom + " of apricots"); //System.out.println("Also adding: " + fruitQty + " " + fruitUom + " of apricots"); System.out.println("Boiling for " + preparationTime() + " minutes"); - System.out.println("Having " + jar.jarQty + " jars"+ " " + "of capacity: " + jar.jarCapacity ); + System.out.println("Having " + jar.jarQty + " jars" + " " + "of capacity: " + jar.jarCapacity); } @@ -49,11 +52,32 @@ public String toString() { ", sweetenerUom='" + sweetenerUom + '\'' + ", apricotQty=" + apricotQty + ", apricotUom='" + apricotUom + '\'' + - //", apricotQty=" + fruitQty + - // ", apricotUom='" + fruitUom + '\'' + + //", apricotQty=" + fruitQty + + // ", apricotUom='" + fruitUom + '\'' + ", jarQty=" + jar + ", jarCapacity=" + jar + ", isDietetic=" + isDietetic + '}'; } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + AppricotJam that = (AppricotJam) o; + return Float.compare(that.apricotQty, apricotQty) == 0 && Objects.equals(apricotUom, that.apricotUom) && Objects.equals(jar, that.jar); + } + + @Override + public int hashCode() { + return Objects.hash(apricotQty, apricotUom, jar); + } + + public int howManyFullJars(int jamQtyInGrams) { + return jamQtyInGrams / jar.jarCapacity; + } + + public int remainderJam(int jamQtyInGrams) { + return jamQtyInGrams % jar.jarCapacity; + } } diff --git a/manuela/src/main/java/com/imalittletester/jam/Jam.java b/manuela/src/main/java/com/imalittletester/jam/Jam.java index e6d99cf..961c1f2 100644 --- a/manuela/src/main/java/com/imalittletester/jam/Jam.java +++ b/manuela/src/main/java/com/imalittletester/jam/Jam.java @@ -1,5 +1,7 @@ package com.imalittletester.jam; +import java.util.Objects; + public class Jam { //Homework T3 @@ -62,5 +64,16 @@ public void setSweetener(String sweetener) { this.sweetener = sweetener; } + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + Jam jam = (Jam) o; + return Float.compare(jam.sweetenerQty, sweetenerQty) == 0 && isDietetic == jam.isDietetic && Objects.equals(sweetener, jam.sweetener) && Objects.equals(sweetenerUom, jam.sweetenerUom); + } + @Override + public int hashCode() { + return Objects.hash(sweetener, sweetenerQty, sweetenerUom, isDietetic); + } } diff --git a/manuela/src/main/java/com/imalittletester/jam/MelonJam.java b/manuela/src/main/java/com/imalittletester/jam/MelonJam.java index a213a21..f4d8970 100644 --- a/manuela/src/main/java/com/imalittletester/jam/MelonJam.java +++ b/manuela/src/main/java/com/imalittletester/jam/MelonJam.java @@ -1,5 +1,7 @@ package com.imalittletester.jam; +import java.util.Objects; + public class MelonJam extends Jam { //attribute - properties of the object public float melonQty; @@ -18,16 +20,29 @@ public MelonJam(String sweetener, float sweetenerQty, String sweetenerUom, float public MelonJam() { } - public MelonJam(String sweetener){ + public MelonJam(String sweetener) { super(sweetener); } + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + MelonJam melonJam = (MelonJam) o; + return Float.compare(melonJam.melonQty, melonQty) == 0 && Objects.equals(melonUom, melonJam.melonUom) && Objects.equals(bottle, melonJam.bottle); + } + + @Override + public int hashCode() { + return Objects.hash(melonQty, melonUom, bottle); + } + @Override //method that does not return anything - public void makeJam(){ + public void makeJam() { super.makeJam(); System.out.println("Adding " + melonQty + " " + melonUom + " of melon"); System.out.println("Bottling in: " + bottle.bottleQty + " bottles of capacity: " + bottle.bottleCapacity); -} + } } diff --git a/manuela/src/test/java/com/imalittletester/OperatorsTest.java b/manuela/src/test/java/com/imalittletester/OperatorsTest.java new file mode 100644 index 0000000..2fb5cf9 --- /dev/null +++ b/manuela/src/test/java/com/imalittletester/OperatorsTest.java @@ -0,0 +1,83 @@ +package com.imalittletester; + +import org.junit.jupiter.api.Test; + +public class OperatorsTest { + + @Test + void firstTest() { + //variabila + int int1 = 0; + int int2 = 55; + + double double1 = 0.0, double2 = 125.5; //operator unar -125.5 + + boolean boo1 = true, bool2 = false; + String string1 = "", string2 = "This is the second string"; + + System.out.println("int1 = " + int1); + int1 = 100; + System.out.println("int1 = " + int1); + int2 = int1; + System.out.println("int2 = " + int2); + int1 = int1 + 5; + System.out.println("int1 = " + int1); + int1 = int2 + 10; + System.out.println("int1 = " + int1); + + double1 = 10.5 - 2.3; + System.out.println("double1 = " + double1); + double1 = double2 - 1; + System.out.println("double1 = " + double1); + double1 = double1 - double2; + System.out.println("double1 = " + double1); + System.out.println(1 + 2); + System.out.println("1 " + "2");//concatenare de string + System.out.println(1 + "2"); + System.out.println(!boo1); // asta device false + System.out.println(!bool2); //asta devine true + + boolean e = !"eee".contains("e"); //are nega si ar aduce false in loc de true + + System.out.println("String equals: " + string1.equals(string2)); + + } + + @Test + void secondTest(){ + int int1 = 1; + //la fel ca si int1 = int1+1; + int cuiAsignamValoarea = 0; + //int 1 e 1 + cuiAsignamValoarea = int1++; //nu tine cont de ++ cand asignezi o variabila altei variable, asignez valoarea veche, apoi updatez valoarea lui int1 + System.out.println("cuiAsignamValoarea = " + cuiAsignamValoarea); + //int1 e 2 deja + cuiAsignamValoarea = ++int1; //tine cont de ++ cand asignezi o variable altei variable, intai updatez valoarea lui int1, apoi o asignez + //int1 e 3 + System.out.println("cuiAsignamValoarea = " + cuiAsignamValoarea); + ++int1; + //int1 e 4 + System.out.println("int1 = " + int1); + int1++; + //int1 e 5 + System.out.println("int1 = " + int1); + + boolean int1MaiMareSauNu = int1 > cuiAsignamValoarea; + System.out.println("Int1 mai mare ca celalalt? " + int1MaiMareSauNu); + System.out.println("Int1 mai mic ca celalalt? " + (int1MaiMareSauNu)); + + } + + @Test + void thirdTest(){ + int int1 = 1; + int1 += 10; //la fel ca int1 = int1 + 10; + System.out.println("int1 = " + int1); //avem valoarea 11 + int1 -= 10; //la fel ca int1 = int1 - 10; + System.out.println("int1 = " + int1);//avem valoare 1 + int1 += -100000; // int1 = int1 + -100000; + System.out.println("int1 = " + int1); + System.out.println(1 == 2); + System.out.println(1 != 2); + } +} diff --git a/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java index d5dc6e7..e3d2a54 100644 --- a/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java +++ b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java @@ -22,20 +22,23 @@ public class AppricotJamTest { public AppricotJam appricotJam2 = new AppricotJam("white sugar"); public AppricotJam appricotJam3 = new AppricotJam("sugar cane", 1.5f, "kg", 10, "kg", new Jar(30, 500), true); //initialized a new object of melonJam - public MelonJam melonJam = new MelonJam("plain sugar", 10, "kg", 10, "kg", new Bottle(20,100), false); + public MelonJam melonJam = new MelonJam("plain sugar", 10, "kg", 10, "kg", new Bottle(20, 100), false); @Order(1) //sa fie rulate in ordine @Test + void thirdTest() { +// appricotJam3.makeJam(); +// System.out.println(appricotJam3.getSweetener()); +// appricotJam3.setSweetener(aSweetener); +// System.out.println(appricotJam3.getSweetener()); +// System.out.println("-------------------------"); +// melonJam.makeJam(); + System.out.println(appricotJam3.howManyFullJars(2300)); + System.out.println(appricotJam3.remainderJam(2300)); + System.out.println(appricotJam3.equals(appricotJam2)); + } - void thirdTest(){ - appricotJam3.makeJam(); - System.out.println(appricotJam3.getSweetener()); - appricotJam3.setSweetener("stevia"); - System.out.println(appricotJam3.getSweetener()); - System.out.println("-------------------------"); - melonJam.makeJam(); - } - @Order(2) + @Order(2) @Test void secondTest() { System.out.println(appricotJam); @@ -66,9 +69,9 @@ void firstTest() { // asertEquals (api.login("username1","passwoard1") + getResponse "Success"); } - @Order (3) + @Order(3) @Test - void fourthTest(){ + void fourthTest() { appricotJam3.makeJam(); } From 68afd0cd1764486dd00069fe86af83f19692e838 Mon Sep 17 00:00:00 2001 From: porfiremanuel Date: Wed, 2 Nov 2022 07:50:50 +0200 Subject: [PATCH 19/31] commit T4 remove isDietetic from Jam constructor --- .../java/com/imalittletester/jam/AppricotJam.java | 10 +++++----- .../src/main/java/com/imalittletester/jam/Jam.java | 8 +++++--- .../main/java/com/imalittletester/jam/MelonJam.java | 4 ++-- .../java/com/imalittletester/jam/AppricotJamTest.java | 11 +++++++++-- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java b/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java index 8c628fc..854c34a 100644 --- a/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java +++ b/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java @@ -21,8 +21,8 @@ public AppricotJam(String sweetener) { super(sweetener); } - public AppricotJam(String sweetener, float sweetenerQty, String sweetenerUom, float apricotQty, String apricotUom, Jar jar, boolean isDietetic) { - super(sweetener, sweetenerQty, sweetenerUom, isDietetic); //the supper class Jam + public AppricotJam(String sweetener, float sweetenerQty, String sweetenerUom, float apricotQty, String apricotUom, Jar jar) { + super(sweetener, sweetenerQty, sweetenerUom); //the supper class Jam //super(fruitQty, fruitUom,sweetener, sweetenerQty, sweetenerUom, isDietetic); this.apricotQty = apricotQty; this.apricotUom = apricotUom; @@ -33,10 +33,10 @@ public AppricotJam(String sweetener, float sweetenerQty, String sweetenerUom, fl @Override public void makeJam() { super.makeJam(); - System.out.println("Also adding: " + apricotQty + " " + apricotUom + " of apricots"); + //System.out.println("Also adding: " + apricotQty + " " + apricotUom + " of apricots"); //System.out.println("Also adding: " + fruitQty + " " + fruitUom + " of apricots"); - System.out.println("Boiling for " + preparationTime() + " minutes"); - System.out.println("Having " + jar.jarQty + " jars" + " " + "of capacity: " + jar.jarCapacity); + // System.out.println("Boiling for " + preparationTime() + " minutes"); + //System.out.println("Having " + jar.jarQty + " jars" + " " + "of capacity: " + jar.jarCapacity); } diff --git a/manuela/src/main/java/com/imalittletester/jam/Jam.java b/manuela/src/main/java/com/imalittletester/jam/Jam.java index 961c1f2..6407fcc 100644 --- a/manuela/src/main/java/com/imalittletester/jam/Jam.java +++ b/manuela/src/main/java/com/imalittletester/jam/Jam.java @@ -36,11 +36,13 @@ public class Jam { public boolean isDietetic; - public Jam(String sweetener, float sweetenerQty, String sweetenerUom, boolean isDietetic) { + public Jam(String sweetener, float sweetenerQty, String sweetenerUom) { + String stevia = "stevia"; + String sucralose = "sucralose"; this.sweetener = sweetener; this.sweetenerQty = sweetenerQty; this.sweetenerUom = sweetenerUom; - this.isDietetic = isDietetic; + this.isDietetic = (this.sweetener == stevia) || (this.sweetener == sucralose); } public Jam() { @@ -51,7 +53,7 @@ public Jam(String sweetener) { } public void makeJam(){ - System.out.println("Adding " + sweetenerQty + " " + sweetenerUom + " of " +sweetener); + //System.out.println("Adding " + sweetenerQty + " " + sweetenerUom + " of " +sweetener); System.out.println("Is jam dietetic? " + isDietetic); } diff --git a/manuela/src/main/java/com/imalittletester/jam/MelonJam.java b/manuela/src/main/java/com/imalittletester/jam/MelonJam.java index f4d8970..847d6ea 100644 --- a/manuela/src/main/java/com/imalittletester/jam/MelonJam.java +++ b/manuela/src/main/java/com/imalittletester/jam/MelonJam.java @@ -9,8 +9,8 @@ public class MelonJam extends Jam { public Bottle bottle; - public MelonJam(String sweetener, float sweetenerQty, String sweetenerUom, float melonQty, String melonUom, Bottle bottle, boolean isDietetic) { - super(sweetener, sweetenerQty, sweetenerUom, isDietetic); //the supper class Jam + public MelonJam(String sweetener, float sweetenerQty, String sweetenerUom, float melonQty, String melonUom, Bottle bottle) { + super(sweetener, sweetenerQty, sweetenerUom); //the supper class Jam this.melonQty = melonQty; this.melonUom = melonUom; this.bottle = bottle; diff --git a/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java index e3d2a54..ea98b02 100644 --- a/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java +++ b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java @@ -20,9 +20,11 @@ public class AppricotJamTest { //stocam un nou appricotJam public AppricotJam appricotJam = new AppricotJam(); public AppricotJam appricotJam2 = new AppricotJam("white sugar"); - public AppricotJam appricotJam3 = new AppricotJam("sugar cane", 1.5f, "kg", 10, "kg", new Jar(30, 500), true); + public AppricotJam appricotJam3 = new AppricotJam("sugar cane", 1.5f, "kg", 10, "kg", new Jar(30, 500)); + public AppricotJam appricotJamStevia = new AppricotJam("stevia", 1.5f, "kg", 10, "kg", new Jar(30, 500)); + public AppricotJam appricotJamSucralose = new AppricotJam("sucralose", 1.5f, "kg", 10, "kg", new Jar(30, 500)); //initialized a new object of melonJam - public MelonJam melonJam = new MelonJam("plain sugar", 10, "kg", 10, "kg", new Bottle(20, 100), false); + public MelonJam melonJam = new MelonJam("plain sugar", 10, "kg", 10, "kg", new Bottle(20, 100)); @Order(1) //sa fie rulate in ordine @Test @@ -72,7 +74,12 @@ void firstTest() { @Order(3) @Test void fourthTest() { + appricotJam3.makeJam(); + System.out.println("----------------------------------"); + appricotJamStevia.makeJam(); + System.out.println("----------------------------------"); + appricotJamSucralose.makeJam(); } } From ef4fe77f00010b623b753b53916b8ca1f60950c2 Mon Sep 17 00:00:00 2001 From: porfiremanuel Date: Wed, 2 Nov 2022 07:55:13 +0200 Subject: [PATCH 20/31] commit T4 remove isDietetic from Jam constructor --- .idea/.gitignore | 3 +++ .idea/encodings.xml | 9 +++++++++ .idea/misc.xml | 12 ++++++++++++ .idea/vcs.xml | 6 ++++++ 4 files changed, 30 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/encodings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..cd487c2 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..67e1e61 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From 3e1ae4164a75fa60f55e4568edba930f4687e978 Mon Sep 17 00:00:00 2001 From: porfiremanuel Date: Thu, 3 Nov 2022 07:51:38 +0200 Subject: [PATCH 21/31] commit T4 remove variables from Jam constructor --- manuela/src/main/java/com/imalittletester/jam/Jam.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/manuela/src/main/java/com/imalittletester/jam/Jam.java b/manuela/src/main/java/com/imalittletester/jam/Jam.java index 6407fcc..5e9b997 100644 --- a/manuela/src/main/java/com/imalittletester/jam/Jam.java +++ b/manuela/src/main/java/com/imalittletester/jam/Jam.java @@ -37,12 +37,10 @@ public class Jam { public boolean isDietetic; public Jam(String sweetener, float sweetenerQty, String sweetenerUom) { - String stevia = "stevia"; - String sucralose = "sucralose"; this.sweetener = sweetener; this.sweetenerQty = sweetenerQty; this.sweetenerUom = sweetenerUom; - this.isDietetic = (this.sweetener == stevia) || (this.sweetener == sucralose); + this.isDietetic = (this.sweetener == "stevia") || (this.sweetener == "sucralose"); } public Jam() { From 4d3b3b58e3c1db85e2afde886f06064e8b763fad Mon Sep 17 00:00:00 2001 From: porfiremanuel Date: Thu, 3 Nov 2022 10:00:26 +0200 Subject: [PATCH 22/31] commit chapter 5 while, if, for statements --- manuela/pom.xml | 12 +++ .../java/com/imalittletester/jam/Jam.java | 42 ++++++++- .../utils/UnitOfMeasureConverter.java | 15 +++ .../imalittletester/jam/AppricotJamTest.java | 91 ++++++++++++++++++- 4 files changed, 158 insertions(+), 2 deletions(-) create mode 100644 manuela/src/main/java/com/imalittletester/utils/UnitOfMeasureConverter.java diff --git a/manuela/pom.xml b/manuela/pom.xml index 64d7558..00fa07d 100644 --- a/manuela/pom.xml +++ b/manuela/pom.xml @@ -12,6 +12,18 @@ manuela http://maven.apache.org + + + + org.apache.maven.plugins + maven-compiler-plugin + + 14 + 14 + + + + UTF-8 diff --git a/manuela/src/main/java/com/imalittletester/jam/Jam.java b/manuela/src/main/java/com/imalittletester/jam/Jam.java index 5e9b997..5eb37a8 100644 --- a/manuela/src/main/java/com/imalittletester/jam/Jam.java +++ b/manuela/src/main/java/com/imalittletester/jam/Jam.java @@ -50,12 +50,52 @@ public Jam(String sweetener) { this.sweetener = sweetener; } - public void makeJam(){ + public void makeJam() { //System.out.println("Adding " + sweetenerQty + " " + sweetenerUom + " of " +sweetener); System.out.println("Is jam dietetic? " + isDietetic); } + public double qtyInGramsUsingIf(String uom, double qty) { + double mustMultipleBy = 1; + //equalsIgnoreCase - nu tine cont de uppercase sau lowercase + if (uom.equalsIgnoreCase("kg") || uom.equalsIgnoreCase("kilograms")) { + mustMultipleBy = 1000; + } + if (uom.equalsIgnoreCase("micrograms")) { + mustMultipleBy = 0.0001; + } + return qty * mustMultipleBy; + } + + public double qtyInGramsUsingIfSimple(String uom, double qty) { + if (uom.equalsIgnoreCase("kg") || uom.equalsIgnoreCase("kilograms")) { + return qty * 1000; //odata rulat return se iese din metoda si al doilea if nu se mai executa + } + if (uom.equalsIgnoreCase("micrograms")) { + return qty / 1000; + } + return qty; + } + public double qtyInGramsUsingSwitch(String uom, double qty){ + double valueToReturn = 0; + switch(uom.toLowerCase()){ + case "kg", "kilograms" -> {valueToReturn = qty * 1000;} + case "grams" -> {valueToReturn = qty;} + case "micrograms" -> {valueToReturn = qty / 1000;} + } + return valueToReturn; + } + + public double qtyInGramsUsingSwitchSimple(String uom, double qty){ + switch(uom.toLowerCase()) { + case "kg", "kilograms" -> {return qty * 1000;} + case "grams" -> {return qty;} + case "micrograms" -> {return qty / 1000;} + default -> {return 0;} + } + + } public String getSweetener() { return sweetener; } diff --git a/manuela/src/main/java/com/imalittletester/utils/UnitOfMeasureConverter.java b/manuela/src/main/java/com/imalittletester/utils/UnitOfMeasureConverter.java new file mode 100644 index 0000000..9353f24 --- /dev/null +++ b/manuela/src/main/java/com/imalittletester/utils/UnitOfMeasureConverter.java @@ -0,0 +1,15 @@ +package com.imalittletester.utils; + +public class UnitOfMeasureConverter { + public double qtyInGramsUsingIf2(String uom, double qty){ + double mustMultipleBy =1; + //equalsIgnoreCase - nu tine cont de uppercase sau lowercase + if(uom.equalsIgnoreCase("kg") || uom.equalsIgnoreCase("kilograms")){ + mustMultipleBy = 1000; + } + if (uom.equalsIgnoreCase("micrograms")){ + mustMultipleBy = 0.0001; + } + return qty * mustMultipleBy; + } +} diff --git a/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java index ea98b02..51782dc 100644 --- a/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java +++ b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java @@ -1,10 +1,12 @@ package com.imalittletester.jam; +import com.imalittletester.utils.UnitOfMeasureConverter; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; //import java.io.File; +import java.sql.SQLOutput; import java.util.Date; @TestMethodOrder(MethodOrderer.OrderAnnotation.class) //set order on run tests @@ -71,7 +73,7 @@ void firstTest() { // asertEquals (api.login("username1","passwoard1") + getResponse "Success"); } - @Order(3) + @Order(4) @Test void fourthTest() { @@ -82,4 +84,91 @@ void fourthTest() { appricotJamSucralose.makeJam(); } + @Test + void fiveTest(){ + //apelezi clasa UnitOfMeasureConverter + UnitOfMeasureConverter unitOfMeasureConverter = new UnitOfMeasureConverter(); + System.out.println(unitOfMeasureConverter.qtyInGramsUsingIf2(appricotJam3.sweetenerUom, appricotJam3.sweetenerQty)); + + System.out.println(appricotJam3.qtyInGramsUsingIf("kg", 2.5f)); + System.out.println(appricotJam3.qtyInGramsUsingIf("micrograms", 1000)); + double appricotJam3SweetenerQtyInGrams = appricotJam3.qtyInGramsUsingIf(appricotJam3.sweetenerUom, appricotJam3.sweetenerQty); + System.out.println(appricotJam3SweetenerQtyInGrams); + System.out.println((appricotJam3.qtyInGramsUsingIf("grams", 125))); + + int position = 789; + if (position > 0){ + System.out.println("Element found on position: " + position); + } + else { + System.out.println("There is no element!!!"); + } + + //using simplified if + System.out.println(position > 0 ? "Element found on position: " + position : "THERE IS NO ELEMENT!"); // e la fel ca if de sus + String theMessage = position > 0 ? "Element found on position: " + position : "THERE IS NO ELEMENT!"; + System.out.println(theMessage); + //last simplified if is equivalent to: + String theMessage2 = ""; + if (position > 0){ + theMessage2 = "Element found on position: " + position; + } + else theMessage2 = "THERE IS NO ELEMENT!"; + System.out.println(theMessage2); + + System.out.println("--------------------------"); + System.out.println(appricotJam3.qtyInGramsUsingIfSimple("micrograms", 2500)); + System.out.println(appricotJam3.qtyInGramsUsingIfSimple(appricotJam3.sweetenerUom, appricotJam3.sweetenerQty)); + System.out.println(appricotJam3.qtyInGramsUsingIfSimple("grams",78)); + System.out.println(appricotJam3.qtyInGramsUsingSwitchSimple("gfgdfgfg", 12)); + System.out.println(appricotJam3.qtyInGramsUsingSwitch("grams", 23)); + System.out.println("--------------------------"); + } + @Test + void sixTest(){ +// for(int i = 0; i < 1; i++){ +// System.out.println(i); +// } + + //numere divizibile cu 3 intre 0 si 21 (exclusiv) + for (int i =1; i<21; i++){ + if (i % 3 == 0){ + System.out.println(i); + } + } + System.out.println("-----------------"); + //pt for in for e nevoie ca contorul (variabila) sa fie diferita de cea din primul for + for (int i =21; i>0; i--){ + if(i % 3 == 0){ + System.out.println(i); + } + } + System.out.println("--------------------------"); + for (int i =3; i < 20; i+=3){ + System.out.println(i); + } + + System.out.println("-----------------------"); + + int i=7; + while (i < 21){ + if(i % 3 ==0){ + System.out.println(i); + break; //te scoate din while + } + i++; + } + + System.out.println(("---------------------------")); + int j = 1; + do { + if (j % 3 == 0) { + System.out.println(j); + } + j++; + } + while (j<21); + + } + } From 08e15afbddd277d9cb4ac1cf52178859d6842a70 Mon Sep 17 00:00:00 2001 From: porfiremanuel Date: Mon, 7 Nov 2022 22:03:53 +0200 Subject: [PATCH 23/31] commit T5 lastDayOfMonth, divideBySeven and makeJam update --- .../java/com/imalittletester/jam/Jam.java | 8 ++- .../utils/UnitOfMeasureConverter.java | 53 +++++++++++++++++-- .../imalittletester/jam/AppricotJamTest.java | 4 +- .../utils/UnitOfMeasureConverterTest.java | 24 +++++++++ 4 files changed, 82 insertions(+), 7 deletions(-) create mode 100644 manuela/src/test/java/com/imalittletester/utils/UnitOfMeasureConverterTest.java diff --git a/manuela/src/main/java/com/imalittletester/jam/Jam.java b/manuela/src/main/java/com/imalittletester/jam/Jam.java index 5eb37a8..f5bae85 100644 --- a/manuela/src/main/java/com/imalittletester/jam/Jam.java +++ b/manuela/src/main/java/com/imalittletester/jam/Jam.java @@ -52,7 +52,13 @@ public Jam(String sweetener) { public void makeJam() { //System.out.println("Adding " + sweetenerQty + " " + sweetenerUom + " of " +sweetener); - System.out.println("Is jam dietetic? " + isDietetic); + if(isDietetic){ + System.out.println("Is jam dietetic? Yes"); + } + else{ + System.out.println("Is jam dietetic? No"); + } + //System.out.println("Is jam dietetic? " + isDietetic); } diff --git a/manuela/src/main/java/com/imalittletester/utils/UnitOfMeasureConverter.java b/manuela/src/main/java/com/imalittletester/utils/UnitOfMeasureConverter.java index 9353f24..f27863e 100644 --- a/manuela/src/main/java/com/imalittletester/utils/UnitOfMeasureConverter.java +++ b/manuela/src/main/java/com/imalittletester/utils/UnitOfMeasureConverter.java @@ -1,15 +1,60 @@ package com.imalittletester.utils; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.spi.CalendarDataProvider; + public class UnitOfMeasureConverter { - public double qtyInGramsUsingIf2(String uom, double qty){ - double mustMultipleBy =1; + public int lastDayOfMonthDay; + + public UnitOfMeasureConverter(int lastDayOfMonthDay) { + this.lastDayOfMonthDay = lastDayOfMonthDay; + + } + + public double qtyInGramsUsingIf2(String uom, double qty) { + double mustMultipleBy = 1; //equalsIgnoreCase - nu tine cont de uppercase sau lowercase - if(uom.equalsIgnoreCase("kg") || uom.equalsIgnoreCase("kilograms")){ + if (uom.equalsIgnoreCase("kg") || uom.equalsIgnoreCase("kilograms")) { mustMultipleBy = 1000; } - if (uom.equalsIgnoreCase("micrograms")){ + if (uom.equalsIgnoreCase("micrograms")) { mustMultipleBy = 0.0001; } return qty * mustMultipleBy; } + + public boolean lastDayOfProvidedMonth(String month, int day, int year) { + switch (month) { + case "Ianuarie", "Martie", "Mai", "Iulie", "August", "Octombrie", "Decembrie" -> { + if (day == 31) { + return true; + } + } + case "Aprilie", "Iunie", "Septembrie", "Noiembrie" -> { + if (day == 30) { + return true; + } + } + case "Februarie" -> { + if ((year % 4 == 0 && day == 29) || (year % 4 != 0 && day == 28)) { + return true; + } + } + default ->{return false;} + } + return false; + } + public int divideBySeven(int providedNumber){ + int j=0; + for(int i =1; i<= providedNumber; i++){ + if(i%7==0){ + j++; + } + } + return j; + } + } diff --git a/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java index 51782dc..f38d4ec 100644 --- a/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java +++ b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java @@ -87,8 +87,8 @@ void fourthTest() { @Test void fiveTest(){ //apelezi clasa UnitOfMeasureConverter - UnitOfMeasureConverter unitOfMeasureConverter = new UnitOfMeasureConverter(); - System.out.println(unitOfMeasureConverter.qtyInGramsUsingIf2(appricotJam3.sweetenerUom, appricotJam3.sweetenerQty)); + // UnitOfMeasureConverter unitOfMeasureConverter = new UnitOfMeasureConverter(); + // System.out.println(unitOfMeasureConverter.qtyInGramsUsingIf2(appricotJam3.sweetenerUom, appricotJam3.sweetenerQty)); System.out.println(appricotJam3.qtyInGramsUsingIf("kg", 2.5f)); System.out.println(appricotJam3.qtyInGramsUsingIf("micrograms", 1000)); diff --git a/manuela/src/test/java/com/imalittletester/utils/UnitOfMeasureConverterTest.java b/manuela/src/test/java/com/imalittletester/utils/UnitOfMeasureConverterTest.java new file mode 100644 index 0000000..c488863 --- /dev/null +++ b/manuela/src/test/java/com/imalittletester/utils/UnitOfMeasureConverterTest.java @@ -0,0 +1,24 @@ +package com.imalittletester.utils; + +import com.imalittletester.jam.AppricotJam; +import org.junit.jupiter.api.Test; + +public class UnitOfMeasureConverterTest { + + public UnitOfMeasureConverter lastDayOfMonth = new UnitOfMeasureConverter(1); + @Test + public void firstTest(){ + + System.out.println(lastDayOfMonth.lastDayOfProvidedMonth("Noiembrie", 31, 2022)); + System.out.println("-------------------------"); + System.out.println(lastDayOfMonth.lastDayOfProvidedMonth("Noiembrie", 30, 2022)); + System.out.println("-------------------------"); + System.out.println(lastDayOfMonth.lastDayOfProvidedMonth("Februarie", 28, 2022)); + System.out.println("-------------------------"); + System.out.println(lastDayOfMonth.lastDayOfProvidedMonth("Februarie", 29, 2022)); + System.out.println("-------------------------"); + System.out.println(lastDayOfMonth.divideBySeven(21)); + System.out.println(lastDayOfMonth.divideBySeven(14)); + } + +} From deb5ee56e51435c783ca12d2b443e1b00fdf89f7 Mon Sep 17 00:00:00 2001 From: porfiremanuel Date: Tue, 8 Nov 2022 17:42:39 +0200 Subject: [PATCH 24/31] commit makeJam update using simplified if --- .../main/java/com/imalittletester/jam/Jam.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/manuela/src/main/java/com/imalittletester/jam/Jam.java b/manuela/src/main/java/com/imalittletester/jam/Jam.java index f5bae85..6df60cc 100644 --- a/manuela/src/main/java/com/imalittletester/jam/Jam.java +++ b/manuela/src/main/java/com/imalittletester/jam/Jam.java @@ -52,14 +52,17 @@ public Jam(String sweetener) { public void makeJam() { //System.out.println("Adding " + sweetenerQty + " " + sweetenerUom + " of " +sweetener); - if(isDietetic){ - System.out.println("Is jam dietetic? Yes"); - } - else{ - System.out.println("Is jam dietetic? No"); - } +// if(isDietetic){ +// System.out.println("Is jam dietetic? Yes"); +// } +// else{ +// System.out.println("Is jam dietetic? No"); +// } //System.out.println("Is jam dietetic? " + isDietetic); + //using Simplified if + System.out.println(isDietetic ? "Is jam dietetic? Yes" : "Is jam dietetic? No"); + } public double qtyInGramsUsingIf(String uom, double qty) { From 219048f780dd8434769e8eb6cb2a6d74af032ee7 Mon Sep 17 00:00:00 2001 From: porfiremanuel Date: Tue, 8 Nov 2022 17:44:37 +0200 Subject: [PATCH 25/31] commit makeJam update using simplified if --- manuela/src/main/java/com/imalittletester/jam/Jam.java | 1 + 1 file changed, 1 insertion(+) diff --git a/manuela/src/main/java/com/imalittletester/jam/Jam.java b/manuela/src/main/java/com/imalittletester/jam/Jam.java index 6df60cc..c86f1bb 100644 --- a/manuela/src/main/java/com/imalittletester/jam/Jam.java +++ b/manuela/src/main/java/com/imalittletester/jam/Jam.java @@ -60,6 +60,7 @@ public void makeJam() { // } //System.out.println("Is jam dietetic? " + isDietetic); + //using Simplified if System.out.println(isDietetic ? "Is jam dietetic? Yes" : "Is jam dietetic? No"); From 16de1b9fff4456ea82fc87aab6d980ff29f437d7 Mon Sep 17 00:00:00 2001 From: porfiremanuel Date: Thu, 10 Nov 2022 18:12:12 +0200 Subject: [PATCH 26/31] commit chapter 6 --- .../com/imalittletester/jam/AppricotJam.java | 3 + .../com/imalittletester/OperatorsTest.java | 85 +++++++++++++++++++ 2 files changed, 88 insertions(+) diff --git a/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java b/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java index 854c34a..e62fff1 100644 --- a/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java +++ b/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java @@ -2,10 +2,13 @@ import org.apache.commons.lang3.builder.ToStringExclude; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; //inhierence public class AppricotJam extends Jam { + //fields public float apricotQty; public String apricotUom; diff --git a/manuela/src/test/java/com/imalittletester/OperatorsTest.java b/manuela/src/test/java/com/imalittletester/OperatorsTest.java index 2fb5cf9..fa53685 100644 --- a/manuela/src/test/java/com/imalittletester/OperatorsTest.java +++ b/manuela/src/test/java/com/imalittletester/OperatorsTest.java @@ -2,6 +2,8 @@ import org.junit.jupiter.api.Test; +import java.util.*; + public class OperatorsTest { @Test @@ -80,4 +82,87 @@ void thirdTest(){ System.out.println(1 == 2); System.out.println(1 != 2); } + @Test + void listTest(){ + //stocam mai multe, se poate adauga si in if, for, while + List lista1 = new ArrayList<>(); + System.out.println(lista1.isEmpty()); + lista1.add("Cluj"); + lista1.add("Oradea"); + lista1.get(1); + //rezultate [] reprezinta lista + System.out.println("lista1 = " + lista1); + + List lista2 = Arrays.asList("peach", "apple", "melon"); + System.out.println("lista2 = " + lista2); + System.out.println("Lista 2 contains apple: " + lista2.contains("apple")); + + List lista3 = List.of(1,2,3,4,5,6,7,8,9,10, 11); + System.out.println("lista3 = " + lista3); + System.out.println(lista3.get(5)); + System.out.println(lista3.size()); + + List listaDeNumere = List.of(5,13, 25, 8,14, 7, 9); + System.out.println(listaDeNumere.size()); + int numberOfNumbers = 0; + int number2 = 0; + List positionInList = new ArrayList<>(); + + for(int i = 0; i < listaDeNumere.size(); i++){ + if (listaDeNumere.get(i) % 7 == 0) { + numberOfNumbers++; + positionInList.add(i); + } + + } + System.out.println("Number of numbers...." + numberOfNumbers); + System.out.println("Elements on the positions: " +positionInList); + + //nu te intereseaza cate nr sunt in lista, inhence for + for (Integer numarInLista : listaDeNumere){ + if(numarInLista % 7 == 0){ + number2++; + } + } + System.out.println("Number 2...: " + number2); + + List listOf52 = new ArrayList<>(); + for (int i = 0; i<52; i++){ + listOf52.add(i+1); + } + System.out.println("listof52 " +listOf52); + + } + @Test + void mapTest(){ + Map simpleMap = new HashMap<>(); + simpleMap.put("firstKey", 1); + System.out.println(simpleMap.containsKey("firstKey")); + System.out.println("simpleMap = " + simpleMap); + + Map anotherMap = Map.of("firstKey", 1, "secondKey",2, "thirdKey", 3); + System.out.println("anotherMap = " + anotherMap); + System.out.println("Is key present: " + anotherMap.containsKey("secondKey")); + System.out.println("Is value present: " + anotherMap.containsValue(5)); + System.out.println("The value of 'secondKey' is: " +anotherMap.get("secondKey")); + System.out.println("The map size is: " + anotherMap.size()); + System.out.println("Is the map empty: " + anotherMap.isEmpty()); + + for(Map.Entry entry : anotherMap.entrySet()){ + System.out.println("Key: " + entry.getKey() + " - value: " + entry.getValue()); + } + for(String key : anotherMap.keySet()){ + System.out.println(key); + } + for (int value : anotherMap.values()){ + System.out.println(value); + } + } + + @Test + void setTest (){ + Set firstSet = new HashSet<>(); + firstSet.add("fruit"); + System.out.println(firstSet); + } } From 1d27a1d06cf22ee82c2a9e31c3ccaf47095a8d81 Mon Sep 17 00:00:00 2001 From: porfiremanuel Date: Wed, 16 Nov 2022 17:51:58 +0200 Subject: [PATCH 27/31] commit T6 Map and List --- .../com/imalittletester/jam/AppricotJam.java | 53 ++++++----- .../java/com/imalittletester/jam/Fruits.java | 18 ++++ .../java/com/imalittletester/jam/Jam.java | 19 +++- .../com/imalittletester/jam/MelonJam.java | 40 ++++---- .../com/imalittletester/OperatorsTest.java | 10 +- .../imalittletester/jam/AppricotJamTest.java | 92 ++++++++++--------- 6 files changed, 141 insertions(+), 91 deletions(-) create mode 100644 manuela/src/main/java/com/imalittletester/jam/Fruits.java diff --git a/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java b/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java index e62fff1..7e63c61 100644 --- a/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java +++ b/manuela/src/main/java/com/imalittletester/jam/AppricotJam.java @@ -10,8 +10,8 @@ public class AppricotJam extends Jam { //fields - public float apricotQty; - public String apricotUom; +// public float apricotQty; +// public String apricotUom; public Jar jar; @@ -24,19 +24,26 @@ public AppricotJam(String sweetener) { super(sweetener); } - public AppricotJam(String sweetener, float sweetenerQty, String sweetenerUom, float apricotQty, String apricotUom, Jar jar) { - super(sweetener, sweetenerQty, sweetenerUom); //the supper class Jam - //super(fruitQty, fruitUom,sweetener, sweetenerQty, sweetenerUom, isDietetic); - this.apricotQty = apricotQty; - this.apricotUom = apricotUom; - this.jar = jar; +// public AppricotJam(String sweetener, float sweetenerQty, String sweetenerUom,List fruits, Jar jar) { +// super(sweetener, sweetenerQty, sweetenerUom, fruits); //the supper class Jam +// //super(fruitQty, fruitUom,sweetener, sweetenerQty, sweetenerUom, isDietetic); +//// this.apricotQty = apricotQty; +//// this.apricotUom = apricotUom; +// this.jar = jar; +// +// } + + public AppricotJam(String sweetener, float sweetenerQty, String sweetenerUom, List fruits, Jar jar) { + super(sweetener, sweetenerQty, sweetenerUom, fruits); + this.jar = jar; } @Override public void makeJam() { super.makeJam(); - //System.out.println("Also adding: " + apricotQty + " " + apricotUom + " of apricots"); + fruits.add(new Fruits("appricot", 1.5, "kg")); + System.out.println("Also adding: " + fruits.get(0).fruitsQty + " " + fruits.get(0).fruitUom + " of " + fruits.get(0).fruitName); //System.out.println("Also adding: " + fruitQty + " " + fruitUom + " of apricots"); // System.out.println("Boiling for " + preparationTime() + " minutes"); //System.out.println("Having " + jar.jarQty + " jars" + " " + "of capacity: " + jar.jarCapacity); @@ -53,8 +60,8 @@ public String toString() { "sweetener='" + sweetener + '\'' + ", sweetenerQty=" + sweetenerQty + ", sweetenerUom='" + sweetenerUom + '\'' + - ", apricotQty=" + apricotQty + - ", apricotUom='" + apricotUom + '\'' + + // ", apricotQty=" + fruits.get(0).fruitsQty+ + /// ", apricotUom='" + fruits.get(0).fruitUom + '\'' + //", apricotQty=" + fruitQty + // ", apricotUom='" + fruitUom + '\'' + ", jarQty=" + jar + @@ -63,18 +70,18 @@ public String toString() { '}'; } - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - AppricotJam that = (AppricotJam) o; - return Float.compare(that.apricotQty, apricotQty) == 0 && Objects.equals(apricotUom, that.apricotUom) && Objects.equals(jar, that.jar); - } - - @Override - public int hashCode() { - return Objects.hash(apricotQty, apricotUom, jar); - } +// @Override +// public boolean equals(Object o) { +// if (this == o) return true; +// if (o == null || getClass() != o.getClass()) return false; +// AppricotJam that = (AppricotJam) o; +// return Float.compare(that.fruits.get(0).fruitsQty, fruits.get(0).fruitsQty) == 0 && Objects.equals(fruits.get(0).fruitUom, that.fruits.get(0).fruitUom) && Objects.equals(jar, that.jar); +// } +// +// @Override +// public int hashCode() { +// return Objects.hash(apricotQty, apricotUom, jar); +// } public int howManyFullJars(int jamQtyInGrams) { return jamQtyInGrams / jar.jarCapacity; diff --git a/manuela/src/main/java/com/imalittletester/jam/Fruits.java b/manuela/src/main/java/com/imalittletester/jam/Fruits.java new file mode 100644 index 0000000..7da2f1b --- /dev/null +++ b/manuela/src/main/java/com/imalittletester/jam/Fruits.java @@ -0,0 +1,18 @@ +package com.imalittletester.jam; + +import java.util.ArrayList; +import java.util.List; + +public class Fruits { + public String fruitName; + public double fruitsQty; + public String fruitUom; + + public Fruits(String fruitName, double fruitsQty, String fruitUom) { + this.fruitName = fruitName; + this.fruitsQty = fruitsQty; + this.fruitUom = fruitUom; + } + + +} diff --git a/manuela/src/main/java/com/imalittletester/jam/Jam.java b/manuela/src/main/java/com/imalittletester/jam/Jam.java index c86f1bb..3c60e5f 100644 --- a/manuela/src/main/java/com/imalittletester/jam/Jam.java +++ b/manuela/src/main/java/com/imalittletester/jam/Jam.java @@ -1,5 +1,7 @@ package com.imalittletester.jam; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; public class Jam { @@ -35,12 +37,24 @@ public class Jam { public String sweetenerUom; public boolean isDietetic; + // public List fruits; - public Jam(String sweetener, float sweetenerQty, String sweetenerUom) { + List fruits = new ArrayList<>(); +// public Jam(String sweetener, float sweetenerQty, String sweetenerUom, List fruits) { +// this.sweetener = sweetener; +// this.sweetenerQty = sweetenerQty; +// this.sweetenerUom = sweetenerUom; +// this.isDietetic = (this.sweetener == "stevia") || (this.sweetener == "sucralose"); +// this.fruits = fruits; +// } + + + public Jam(String sweetener, float sweetenerQty, String sweetenerUom, List fruits) { this.sweetener = sweetener; this.sweetenerQty = sweetenerQty; this.sweetenerUom = sweetenerUom; this.isDietetic = (this.sweetener == "stevia") || (this.sweetener == "sucralose"); + this.fruits = fruits; } public Jam() { @@ -50,7 +64,9 @@ public Jam(String sweetener) { this.sweetener = sweetener; } + public void makeJam() { + //System.out.println("Adding " + sweetenerQty + " " + sweetenerUom + " of " +sweetener); // if(isDietetic){ // System.out.println("Is jam dietetic? Yes"); @@ -113,7 +129,6 @@ public String getSweetener() { public void setSweetener(String sweetener) { this.sweetener = sweetener; } - @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/manuela/src/main/java/com/imalittletester/jam/MelonJam.java b/manuela/src/main/java/com/imalittletester/jam/MelonJam.java index 847d6ea..a5b6f81 100644 --- a/manuela/src/main/java/com/imalittletester/jam/MelonJam.java +++ b/manuela/src/main/java/com/imalittletester/jam/MelonJam.java @@ -1,18 +1,19 @@ package com.imalittletester.jam; +import java.util.List; import java.util.Objects; public class MelonJam extends Jam { //attribute - properties of the object - public float melonQty; - public String melonUom; +// public float melonQty; +// public String melonUom; public Bottle bottle; - public MelonJam(String sweetener, float sweetenerQty, String sweetenerUom, float melonQty, String melonUom, Bottle bottle) { - super(sweetener, sweetenerQty, sweetenerUom); //the supper class Jam - this.melonQty = melonQty; - this.melonUom = melonUom; + public MelonJam(String sweetener, float sweetenerQty, String sweetenerUom, List fruits, Bottle bottle) { + super(sweetener, sweetenerQty, sweetenerUom, fruits); //the supper class Jam +// this.melonQty = melonQty; +// this.melonUom = melonUom; this.bottle = bottle; } @@ -24,24 +25,25 @@ public MelonJam(String sweetener) { super(sweetener); } - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - MelonJam melonJam = (MelonJam) o; - return Float.compare(melonJam.melonQty, melonQty) == 0 && Objects.equals(melonUom, melonJam.melonUom) && Objects.equals(bottle, melonJam.bottle); - } - - @Override - public int hashCode() { - return Objects.hash(melonQty, melonUom, bottle); - } +// @Override +// public boolean equals(Object o) { +// if (this == o) return true; +// if (o == null || getClass() != o.getClass()) return false; +// MelonJam melonJam = (MelonJam) o; +// return Float.compare(melonJam.melonQty, melonQty) == 0 && Objects.equals(melonUom, melonJam.melonUom) && Objects.equals(bottle, melonJam.bottle); +// } +// +// @Override +// public int hashCode() { +// return Objects.hash(melonQty, melonUom, bottle); +// } @Override //method that does not return anything public void makeJam() { super.makeJam(); - System.out.println("Adding " + melonQty + " " + melonUom + " of melon"); + fruits.add(new Fruits("melon", 2, "kg")); + System.out.println("Adding " + fruits.get(0).fruitsQty + " " + fruits.get(0).fruitUom + " of " + fruits.get(0).fruitName); System.out.println("Bottling in: " + bottle.bottleQty + " bottles of capacity: " + bottle.bottleCapacity); } diff --git a/manuela/src/test/java/com/imalittletester/OperatorsTest.java b/manuela/src/test/java/com/imalittletester/OperatorsTest.java index fa53685..0891e02 100644 --- a/manuela/src/test/java/com/imalittletester/OperatorsTest.java +++ b/manuela/src/test/java/com/imalittletester/OperatorsTest.java @@ -137,13 +137,13 @@ void listTest(){ void mapTest(){ Map simpleMap = new HashMap<>(); simpleMap.put("firstKey", 1); - System.out.println(simpleMap.containsKey("firstKey")); - System.out.println("simpleMap = " + simpleMap); + // System.out.println(simpleMap.containsKey("firstKey")); + // System.out.println("simpleMap = " + simpleMap); Map anotherMap = Map.of("firstKey", 1, "secondKey",2, "thirdKey", 3); - System.out.println("anotherMap = " + anotherMap); - System.out.println("Is key present: " + anotherMap.containsKey("secondKey")); - System.out.println("Is value present: " + anotherMap.containsValue(5)); + // System.out.println("anotherMap = " + anotherMap); + //System.out.println("Is key present: " + anotherMap.containsKey("secondKey")); + // System.out.println("Is value present: " + anotherMap.containsValue(5)); System.out.println("The value of 'secondKey' is: " +anotherMap.get("secondKey")); System.out.println("The map size is: " + anotherMap.size()); System.out.println("Is the map empty: " + anotherMap.isEmpty()); diff --git a/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java index f38d4ec..e4bd779 100644 --- a/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java +++ b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java @@ -7,7 +7,7 @@ import org.junit.jupiter.api.TestMethodOrder; //import java.io.File; import java.sql.SQLOutput; -import java.util.Date; +import java.util.*; @TestMethodOrder(MethodOrderer.OrderAnnotation.class) //set order on run tests public class AppricotJamTest { @@ -22,11 +22,16 @@ public class AppricotJamTest { //stocam un nou appricotJam public AppricotJam appricotJam = new AppricotJam(); public AppricotJam appricotJam2 = new AppricotJam("white sugar"); - public AppricotJam appricotJam3 = new AppricotJam("sugar cane", 1.5f, "kg", 10, "kg", new Jar(30, 500)); - public AppricotJam appricotJamStevia = new AppricotJam("stevia", 1.5f, "kg", 10, "kg", new Jar(30, 500)); - public AppricotJam appricotJamSucralose = new AppricotJam("sucralose", 1.5f, "kg", 10, "kg", new Jar(30, 500)); + public AppricotJam appricotJam3 = new AppricotJam("sugar cane", 1.5f, "kg", new ArrayList<>(), new Jar(30, 500)); + public AppricotJam appricotJamStevia = new AppricotJam("stevia", 1.5f, "kg", new ArrayList<>(), new Jar(30, 500)); + public AppricotJam appricotJamSucralose = new AppricotJam("sucralose", 1.5f, "kg", new ArrayList<>(), new Jar(30, 500)); //initialized a new object of melonJam - public MelonJam melonJam = new MelonJam("plain sugar", 10, "kg", 10, "kg", new Bottle(20, 100)); + public MelonJam melonJam = new MelonJam("plain sugar", 10, "kg", new ArrayList<>(), new Bottle(20, 100)); + + //homework with MAP + //List fruits = new ArrayList<>(); + //public AppricotJam appricotJamTest = new AppricotJam ("sugar cane", 1.5f, "kg",fruits.add("appricot", 10, "kg"), new Jar(30, 500)); + //("sugar cane", 1.5f, "kg", List fruits, new Jar(30, 500)); @Order(1) //sa fie rulate in ordine @Test @@ -42,23 +47,17 @@ void thirdTest() { System.out.println(appricotJam3.equals(appricotJam2)); } - @Order(2) - @Test - void secondTest() { - System.out.println(appricotJam); - - System.out.println(appricotJam2); - - System.out.println(appricotJam3); - - appricotJam3.makeJam(); - System.out.println(appricotJam3.sweetener); - - appricotJam3.sweetener.contains("sugar"); - - melonJam.makeJam(); - - } + //@Order(2) +// @Test +// void secondTest() { +// appricotJam3.makeJam(); +// System.out.println(appricotJam3.sweetener); +// +// appricotJam3.sweetener.contains("sugar"); +// +// melonJam.makeJam(); +// +// } @Order(3) @Test @@ -85,10 +84,10 @@ void fourthTest() { } @Test - void fiveTest(){ + void fiveTest() { //apelezi clasa UnitOfMeasureConverter - // UnitOfMeasureConverter unitOfMeasureConverter = new UnitOfMeasureConverter(); - // System.out.println(unitOfMeasureConverter.qtyInGramsUsingIf2(appricotJam3.sweetenerUom, appricotJam3.sweetenerQty)); + // UnitOfMeasureConverter unitOfMeasureConverter = new UnitOfMeasureConverter(); + // System.out.println(unitOfMeasureConverter.qtyInGramsUsingIf2(appricotJam3.sweetenerUom, appricotJam3.sweetenerQty)); System.out.println(appricotJam3.qtyInGramsUsingIf("kg", 2.5f)); System.out.println(appricotJam3.qtyInGramsUsingIf("micrograms", 1000)); @@ -97,10 +96,9 @@ void fiveTest(){ System.out.println((appricotJam3.qtyInGramsUsingIf("grams", 125))); int position = 789; - if (position > 0){ + if (position > 0) { System.out.println("Element found on position: " + position); - } - else { + } else { System.out.println("There is no element!!!"); } @@ -110,49 +108,49 @@ void fiveTest(){ System.out.println(theMessage); //last simplified if is equivalent to: String theMessage2 = ""; - if (position > 0){ + if (position > 0) { theMessage2 = "Element found on position: " + position; - } - else theMessage2 = "THERE IS NO ELEMENT!"; + } else theMessage2 = "THERE IS NO ELEMENT!"; System.out.println(theMessage2); System.out.println("--------------------------"); System.out.println(appricotJam3.qtyInGramsUsingIfSimple("micrograms", 2500)); System.out.println(appricotJam3.qtyInGramsUsingIfSimple(appricotJam3.sweetenerUom, appricotJam3.sweetenerQty)); - System.out.println(appricotJam3.qtyInGramsUsingIfSimple("grams",78)); + System.out.println(appricotJam3.qtyInGramsUsingIfSimple("grams", 78)); System.out.println(appricotJam3.qtyInGramsUsingSwitchSimple("gfgdfgfg", 12)); System.out.println(appricotJam3.qtyInGramsUsingSwitch("grams", 23)); System.out.println("--------------------------"); } + @Test - void sixTest(){ + void sixTest() { // for(int i = 0; i < 1; i++){ // System.out.println(i); // } //numere divizibile cu 3 intre 0 si 21 (exclusiv) - for (int i =1; i<21; i++){ - if (i % 3 == 0){ + for (int i = 1; i < 21; i++) { + if (i % 3 == 0) { System.out.println(i); } } System.out.println("-----------------"); //pt for in for e nevoie ca contorul (variabila) sa fie diferita de cea din primul for - for (int i =21; i>0; i--){ - if(i % 3 == 0){ + for (int i = 21; i > 0; i--) { + if (i % 3 == 0) { System.out.println(i); } } System.out.println("--------------------------"); - for (int i =3; i < 20; i+=3){ + for (int i = 3; i < 20; i += 3) { System.out.println(i); } System.out.println("-----------------------"); - int i=7; - while (i < 21){ - if(i % 3 ==0){ + int i = 7; + while (i < 21) { + if (i % 3 == 0) { System.out.println(i); break; //te scoate din while } @@ -167,8 +165,18 @@ void sixTest(){ } j++; } - while (j<21); + while (j < 21); } + @Test + void mapOfFruit() { + //Nu am stiut cum sa adaug in initializarea unui obiect o lista ca sa pot testa "Create a new ApricotJam and calculate in the test class the cost of the fruit used for the jam" + Map fruitPricePerKg = Map.of("appricot", 5.0, "peach", 3.5, "melon", 7.0); + List fruits = new ArrayList<>(); + fruits.add(new Fruits("appricot", 25, "kg")); + System.out.println(fruits.get(0).fruitsQty * fruitPricePerKg.get("appricot")); + } + + } From 32d9ffdd735f510d2c8e64603dc9ffb2b0303a9e Mon Sep 17 00:00:00 2001 From: porfiremanuel Date: Thu, 17 Nov 2022 11:26:55 +0200 Subject: [PATCH 28/31] commit T6 List Of --- .../java/com/imalittletester/jam/AppricotJamTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java index e4bd779..4cfa117 100644 --- a/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java +++ b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java @@ -29,8 +29,8 @@ public class AppricotJamTest { public MelonJam melonJam = new MelonJam("plain sugar", 10, "kg", new ArrayList<>(), new Bottle(20, 100)); //homework with MAP - //List fruits = new ArrayList<>(); - //public AppricotJam appricotJamTest = new AppricotJam ("sugar cane", 1.5f, "kg",fruits.add("appricot", 10, "kg"), new Jar(30, 500)); + List fruits = List.of(); +public AppricotJam appricotJamTest = new AppricotJam ("sugar cane", 1.5f, "kg", List.of(new Fruits("appricot", 10, "kg")), new Jar(30, 500)); //("sugar cane", 1.5f, "kg", List fruits, new Jar(30, 500)); @Order(1) //sa fie rulate in ordine @@ -173,9 +173,9 @@ void sixTest() { void mapOfFruit() { //Nu am stiut cum sa adaug in initializarea unui obiect o lista ca sa pot testa "Create a new ApricotJam and calculate in the test class the cost of the fruit used for the jam" Map fruitPricePerKg = Map.of("appricot", 5.0, "peach", 3.5, "melon", 7.0); - List fruits = new ArrayList<>(); - fruits.add(new Fruits("appricot", 25, "kg")); - System.out.println(fruits.get(0).fruitsQty * fruitPricePerKg.get("appricot")); + // List fruits = new ArrayList<>(); + //fruits.add(new Fruits("appricot", 25, "kg")); + System.out.println(appricotJamTest.fruits.get(0).fruitsQty * fruitPricePerKg.get("appricot")); } From 3995b1bba5269e7693d91c02835f3fe82754610d Mon Sep 17 00:00:00 2001 From: porfiremanuel Date: Sun, 20 Nov 2022 18:09:23 +0200 Subject: [PATCH 29/31] commit T6 List Of --- .../imalittletester/Assesment/EventData.java | 28 ++++ .../com/imalittletester/Assesment/Senzor.java | 73 +++++++++ .../imalittletester/Assesment/UomAndDate.java | 30 ++++ .../imalittletester/Assesment/UserData.java | 146 ++++++++++++++++++ .../java/com/imalittletester/jam/Jam.java | 12 +- .../utils/UnitOfMeasureConverter.java | 1 + .../Assesment/AssesmentTests.java | 17 ++ .../imalittletester/jam/AppricotJamTest.java | 15 +- .../utils/UnitOfMeasureConverterTest.java | 8 +- 9 files changed, 317 insertions(+), 13 deletions(-) create mode 100644 manuela/src/main/java/com/imalittletester/Assesment/EventData.java create mode 100644 manuela/src/main/java/com/imalittletester/Assesment/Senzor.java create mode 100644 manuela/src/main/java/com/imalittletester/Assesment/UomAndDate.java create mode 100644 manuela/src/main/java/com/imalittletester/Assesment/UserData.java create mode 100644 manuela/src/test/java/com/imalittletester/Assesment/AssesmentTests.java diff --git a/manuela/src/main/java/com/imalittletester/Assesment/EventData.java b/manuela/src/main/java/com/imalittletester/Assesment/EventData.java new file mode 100644 index 0000000..ff6df07 --- /dev/null +++ b/manuela/src/main/java/com/imalittletester/Assesment/EventData.java @@ -0,0 +1,28 @@ +package com.imalittletester.Assesment; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Locale; + +public class EventData { + public int steps; + public Calendar date; + + public EventData(int steps, Calendar date) { + this.steps = steps; + this.date = date; + } + + public EventData(int steps, String date) { + this.steps = steps; + Calendar cal = Calendar.getInstance(); + SimpleDateFormat sdf = new SimpleDateFormat("MM-dd-yyyy hh:mm", Locale.ENGLISH); + try { + cal.setTime(sdf.parse(date)); + this.date = cal; + } catch (ParseException e) { + throw new RuntimeException(e); + } + } +} diff --git a/manuela/src/main/java/com/imalittletester/Assesment/Senzor.java b/manuela/src/main/java/com/imalittletester/Assesment/Senzor.java new file mode 100644 index 0000000..fac385d --- /dev/null +++ b/manuela/src/main/java/com/imalittletester/Assesment/Senzor.java @@ -0,0 +1,73 @@ +package com.imalittletester.Assesment; + +import java.util.*; + +public class Senzor { + public List eventDataList; + public List uomAndDateList; + + public Senzor(List eventDataList, List uomAndDateList) { + this.eventDataList = eventDataList; + this.uomAndDateList = uomAndDateList; + } + + public int getStepCountByDate(Calendar date) { + int stepCount = 0; + for (int i = 0; i < eventDataList.size(); i++) { + if (date.get(Calendar.YEAR) == eventDataList.get(i).date.get(Calendar.YEAR) && + date.get(Calendar.MONTH) == eventDataList.get(i).date.get(Calendar.MONTH) && + date.get(Calendar.DATE) == eventDataList.get(i).date.get(Calendar.DATE) && + eventDataList.get(i).date.before(date)) { + stepCount = stepCount + eventDataList.get(i).steps; + } + } + return stepCount; + } + + public void createEventDataAndUomAndDataListRandom() { + this.eventDataList = new ArrayList<>(); + this.uomAndDateList = new ArrayList<>(); + Calendar date = Calendar.getInstance(); + Random rn = new Random(); + for (int day = 0; day <= 14; day++) { + for (int hour = 0; hour <= 23; hour++) { + for (int minute = 0; minute <= 59; minute++) { + int steps = rn.nextInt(20 - 1 + 1) + 1; + Calendar date1 = Calendar.getInstance(); + date1.set(Calendar.DATE, date.get(Calendar.DATE) - day); + date1.set(Calendar.HOUR, hour); + date1.set(Calendar.MINUTE, minute); + date1.set(Calendar.SECOND, 0); + date1.set(Calendar.MILLISECOND, 0); + date1.set(Calendar.MONTH, date.get(Calendar.MONTH)); + date1.set(Calendar.YEAR, date.get(Calendar.YEAR)); + eventDataList.add(new EventData(steps, date1)); + } + } + Calendar date2 = Calendar.getInstance(); + date2.set(Calendar.DATE, date.get(Calendar.DATE) - day); + date2.set(Calendar.SECOND, 0); + date2.set(Calendar.MILLISECOND, 0); + date2.set(Calendar.MONTH, date.get(Calendar.MONTH)); + date2.set(Calendar.YEAR, date.get(Calendar.YEAR)); + if (day % 2 == 0) { + uomAndDateList.add(new UomAndDate("km", date2, 1000)); + } else { + uomAndDateList.add(new UomAndDate("mi", date2, 1600)); + } + } + } + + public void createEventDataAndUomAndDataListSpecific(){ + this.eventDataList = new ArrayList<>(); + this.uomAndDateList = new ArrayList<>(); + uomAndDateList.add(new UomAndDate("km", "11-20-2022 15:12", 1000)); + uomAndDateList.add(new UomAndDate("mi", "11-19-2022 15:12", 1600)); + eventDataList.add(new EventData(11, "11-20-2022 15:12")); + eventDataList.add(new EventData(11, "11-20-2022 10:13")); + eventDataList.add(new EventData(55, "11-19-2022 15:12")); + eventDataList.add(new EventData(12, "11-19-2022 17:13")); + eventDataList.add(new EventData(11, "11-19-2022 19:14")); + + } +} diff --git a/manuela/src/main/java/com/imalittletester/Assesment/UomAndDate.java b/manuela/src/main/java/com/imalittletester/Assesment/UomAndDate.java new file mode 100644 index 0000000..8afc888 --- /dev/null +++ b/manuela/src/main/java/com/imalittletester/Assesment/UomAndDate.java @@ -0,0 +1,30 @@ +package com.imalittletester.Assesment; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Locale; + +public class UomAndDate { + public String uom; + public Calendar date; + public int stepsPerUom; + + public UomAndDate(String uom, Calendar date, int stepsPerUom) { + this.uom = uom; + this.date = date; + this.stepsPerUom = stepsPerUom; + } + public UomAndDate(String uom, String date, int stepsPerUom) { + this.uom = uom; + Calendar cal = Calendar.getInstance(); + SimpleDateFormat sdf = new SimpleDateFormat("MM-dd-yyyy hh:mm", Locale.ENGLISH); + try { + cal.setTime(sdf.parse(date)); + this.date = cal; + } catch (ParseException e) { + throw new RuntimeException(e); + } + this.stepsPerUom = stepsPerUom; + } +} diff --git a/manuela/src/main/java/com/imalittletester/Assesment/UserData.java b/manuela/src/main/java/com/imalittletester/Assesment/UserData.java new file mode 100644 index 0000000..b4f24c1 --- /dev/null +++ b/manuela/src/main/java/com/imalittletester/Assesment/UserData.java @@ -0,0 +1,146 @@ +package com.imalittletester.Assesment; + +import java.text.DecimalFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; + +public class UserData { + public String userName; + public Senzor senzor; + public Calendar sleepTime; + public Calendar wakeTime; + + public UserData(String userName, Senzor senzor, String sleepTime, String wakeTime) { + this.userName = userName; + this.senzor = senzor; + Calendar cal = Calendar.getInstance(); + SimpleDateFormat sdf = new SimpleDateFormat("hh:mm", Locale.ENGLISH); + try { + cal.setTime(sdf.parse(sleepTime)); + this.sleepTime = cal; + } catch (ParseException e) { + throw new RuntimeException(e); + } + cal = Calendar.getInstance(); + try { + cal.setTime(sdf.parse(wakeTime)); + this.wakeTime = cal; + } catch (ParseException e) { + throw new RuntimeException(e); + } + } + + public void afisajTotal() { + this.senzor.createEventDataAndUomAndDataListRandom(); + System.out.println("Random By User: " + this.getCurrentDayStepCount()); + System.out.println(getCurrentDayDistance(Calendar.getInstance())); + System.out.println(nrOfCaloriesCurrentDay()); + System.out.println(nrOfAlerts()); + distance7Days(); + + System.out.println("----------------"); + this.senzor.createEventDataAndUomAndDataListSpecific(); + System.out.println("Specific By User: " + this.getCurrentDayStepCount()); + System.out.println(getCurrentDayDistance(Calendar.getInstance())); + System.out.println(nrOfCaloriesCurrentDay()); + System.out.println(nrOfAlerts()); + distance7Days(); + DateAndHour(); + } + + public String getCurrentDayStepCount() { + int totalSteps = this.senzor.getStepCountByDate(Calendar.getInstance()); + return "The user: " + userName + " did " + totalSteps + " steps until now."; + } + + public String getCurrentDayDistance(Calendar date) { + int stepsPerUom = 0; + String uom = ""; + for (int i = 0; i < this.senzor.uomAndDateList.size(); i++) { + if (date.get(Calendar.YEAR) == this.senzor.uomAndDateList.get(i).date.get(Calendar.YEAR) && + date.get(Calendar.MONTH) == this.senzor.uomAndDateList.get(i).date.get(Calendar.MONTH) && + date.get(Calendar.DATE) == this.senzor.uomAndDateList.get(i).date.get(Calendar.DATE)) { + stepsPerUom = this.senzor.uomAndDateList.get(i).stepsPerUom; + uom = this.senzor.uomAndDateList.get(i).uom; + break; + } + } + int todaySteps = this.senzor.getStepCountByDate(Calendar.getInstance()); + double distance = 1.0 * todaySteps / stepsPerUom; + return "Today distance is: " + distance + " " + uom; + } + + public String nrOfCaloriesCurrentDay() { + int calories = 0; + int todaySteps = this.senzor.getStepCountByDate(Calendar.getInstance()); + calories = (5 * todaySteps) / 1000; + return "Today calories number is: " + calories; + } + + public String nrOfAlerts() { + + Calendar cal = Calendar.getInstance(); + Map stepsPerHour = new HashMap<>(); + for (int j = this.wakeTime.get(Calendar.HOUR_OF_DAY); j < this.sleepTime.get(Calendar.HOUR_OF_DAY); j++) { + stepsPerHour.put(j, 0); + for (int i = 0; i < this.senzor.eventDataList.size(); i++) { + if (cal.get(Calendar.YEAR) == this.senzor.eventDataList.get(i).date.get(Calendar.YEAR) && + cal.get(Calendar.MONTH) == this.senzor.eventDataList.get(i).date.get(Calendar.MONTH) && + cal.get(Calendar.DATE) == this.senzor.eventDataList.get(i).date.get(Calendar.DATE)) { + if (j == this.senzor.eventDataList.get(i).date.get(Calendar.HOUR_OF_DAY)) { + int st = stepsPerHour.get(j); + st = st + this.senzor.eventDataList.get(i).steps; + stepsPerHour.put(j, st); + } + } + } + } + int alertNumber = 0; + for (int i = this.wakeTime.get(Calendar.HOUR_OF_DAY); i < this.sleepTime.get(Calendar.HOUR_OF_DAY); i++) { + if (stepsPerHour.get(i) == 0) { + alertNumber++; + } + } + + return "The number of idle alerts for current day is: " + alertNumber; + } + + public void distance7Days() { + Calendar calendar = Calendar.getInstance(); + for (int j = 0; j < 7; j++) { + Calendar cal2 = Calendar.getInstance(); + cal2.set(Calendar.DATE, calendar.get(Calendar.DATE) - j); + int stepsPerUom = 0; + String uom = ""; + for (int i = 0; i < this.senzor.uomAndDateList.size(); i++) { + if (cal2.get(Calendar.YEAR) == this.senzor.uomAndDateList.get(i).date.get(Calendar.YEAR) && + cal2.get(Calendar.MONTH) == this.senzor.uomAndDateList.get(i).date.get(Calendar.MONTH) && + cal2.get(Calendar.DATE) == this.senzor.uomAndDateList.get(i).date.get(Calendar.DATE)) { + stepsPerUom = this.senzor.uomAndDateList.get(i).stepsPerUom; + uom = this.senzor.uomAndDateList.get(i).uom; + break; + } + } + int todaySteps = this.senzor.getStepCountByDate(Calendar.getInstance()); + double distance = 0; + if (stepsPerUom != 0) { + distance = 1.0 * todaySteps / stepsPerUom; + } + String date = ""; + SimpleDateFormat format1 = new SimpleDateFormat("MMMM dd yyyy"); + String formatted = format1.format(cal2.getTime()); + System.out.println("On " + formatted + ", the distance is: " + distance + " " + uom); + } + } + + public void DateAndHour() { + Calendar cal = Calendar.getInstance(); + SimpleDateFormat format1 = new SimpleDateFormat("MMMM dd yyyy, HH:mm"); + String formatted = format1.format(cal.getTime()); + System.out.println("Current Date And Time : " + formatted); + } + + +} + diff --git a/manuela/src/main/java/com/imalittletester/jam/Jam.java b/manuela/src/main/java/com/imalittletester/jam/Jam.java index 3c60e5f..29bd3da 100644 --- a/manuela/src/main/java/com/imalittletester/jam/Jam.java +++ b/manuela/src/main/java/com/imalittletester/jam/Jam.java @@ -37,9 +37,9 @@ public class Jam { public String sweetenerUom; public boolean isDietetic; - // public List fruits; + public List fruits; - List fruits = new ArrayList<>(); + // List fruits = new ArrayList<>(); // public Jam(String sweetener, float sweetenerQty, String sweetenerUom, List fruits) { // this.sweetener = sweetener; // this.sweetenerQty = sweetenerQty; @@ -93,7 +93,7 @@ public double qtyInGramsUsingIf(String uom, double qty) { } return qty * mustMultipleBy; } - +// metoda ce arunca o eroare public double qtyInGramsUsingIfSimple(String uom, double qty) { if (uom.equalsIgnoreCase("kg") || uom.equalsIgnoreCase("kilograms")) { return qty * 1000; //odata rulat return se iese din metoda si al doilea if nu se mai executa @@ -101,8 +101,12 @@ public double qtyInGramsUsingIfSimple(String uom, double qty) { if (uom.equalsIgnoreCase("micrograms")) { return qty / 1000; } - return qty; + if (uom.equalsIgnoreCase("grams")){ + return qty; + } + throw new RuntimeException(("The unit of measure provided was not valid!")); } + //kg, kilograms, micrograms, grams, jajs public double qtyInGramsUsingSwitch(String uom, double qty){ double valueToReturn = 0; switch(uom.toLowerCase()){ diff --git a/manuela/src/main/java/com/imalittletester/utils/UnitOfMeasureConverter.java b/manuela/src/main/java/com/imalittletester/utils/UnitOfMeasureConverter.java index f27863e..a07e90c 100644 --- a/manuela/src/main/java/com/imalittletester/utils/UnitOfMeasureConverter.java +++ b/manuela/src/main/java/com/imalittletester/utils/UnitOfMeasureConverter.java @@ -46,6 +46,7 @@ public boolean lastDayOfProvidedMonth(String month, int day, int year) { default ->{return false;} } return false; + } public int divideBySeven(int providedNumber){ int j=0; diff --git a/manuela/src/test/java/com/imalittletester/Assesment/AssesmentTests.java b/manuela/src/test/java/com/imalittletester/Assesment/AssesmentTests.java new file mode 100644 index 0000000..4008fca --- /dev/null +++ b/manuela/src/test/java/com/imalittletester/Assesment/AssesmentTests.java @@ -0,0 +1,17 @@ +package com.imalittletester.Assesment; + +import org.junit.jupiter.api.Test; + +import java.sql.SQLOutput; +import java.util.Calendar; +import java.util.List; +import java.util.Random; + +public class AssesmentTests { + public UserData userData1 = new UserData("Manuela", new Senzor(null, null), "22:00", "06:00"); + @Test + void stepsForCurrentDay (){ + userData1.afisajTotal(); + + } +} diff --git a/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java index 4cfa117..249bc77 100644 --- a/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java +++ b/manuela/src/test/java/com/imalittletester/jam/AppricotJamTest.java @@ -74,8 +74,15 @@ void firstTest() { @Order(4) @Test - void fourthTest() { - + void fourthTest(){ + //tratarea unei exceptii +// try { +// System.out.println(9 / 0); +// } +// catch (Exception e) { +// // e.printStackTrace(); +// throw new RuntimeException(( "Nu am putut imparti 9 la 0")); +// } appricotJam3.makeJam(); System.out.println("----------------------------------"); appricotJamStevia.makeJam(); @@ -176,7 +183,7 @@ void mapOfFruit() { // List fruits = new ArrayList<>(); //fruits.add(new Fruits("appricot", 25, "kg")); System.out.println(appricotJamTest.fruits.get(0).fruitsQty * fruitPricePerKg.get("appricot")); + System.out.println(appricotJam3.qtyInGramsUsingIfSimple("grams", 1000)); + //System.out.println(appricotJam3.qtyInGramsUsingIfSimple("gramz", 1000)); } - - } diff --git a/manuela/src/test/java/com/imalittletester/utils/UnitOfMeasureConverterTest.java b/manuela/src/test/java/com/imalittletester/utils/UnitOfMeasureConverterTest.java index c488863..2c7e969 100644 --- a/manuela/src/test/java/com/imalittletester/utils/UnitOfMeasureConverterTest.java +++ b/manuela/src/test/java/com/imalittletester/utils/UnitOfMeasureConverterTest.java @@ -9,13 +9,11 @@ public class UnitOfMeasureConverterTest { @Test public void firstTest(){ - System.out.println(lastDayOfMonth.lastDayOfProvidedMonth("Noiembrie", 31, 2022)); + System.out.println(lastDayOfMonth.lastDayOfProvidedMonth("Noiembrie", 31, 2022)); System.out.println("-------------------------"); System.out.println(lastDayOfMonth.lastDayOfProvidedMonth("Noiembrie", 30, 2022)); - System.out.println("-------------------------"); - System.out.println(lastDayOfMonth.lastDayOfProvidedMonth("Februarie", 28, 2022)); - System.out.println("-------------------------"); - System.out.println(lastDayOfMonth.lastDayOfProvidedMonth("Februarie", 29, 2022)); + System.out.println(lastDayOfMonth.lastDayOfProvidedMonth("Februarie", 28, 2022)); + System.out.println("-------------------------"); System.out.println("-------------------------"); System.out.println(lastDayOfMonth.divideBySeven(21)); System.out.println(lastDayOfMonth.divideBySeven(14)); From 7def3a46824c93199c0459cdf3aee6dca8aed683 Mon Sep 17 00:00:00 2001 From: porfiremanuel Date: Tue, 22 Nov 2022 21:04:18 +0200 Subject: [PATCH 30/31] commit assesment project --- .../com/imalittletester/Assesment/Senzor.java | 21 +++++- .../imalittletester/Assesment/UomAndDate.java | 1 + .../imalittletester/Assesment/UserData.java | 72 ++++++++++--------- .../Assesment/AssesmentTests.java | 10 +-- 4 files changed, 63 insertions(+), 41 deletions(-) diff --git a/manuela/src/main/java/com/imalittletester/Assesment/Senzor.java b/manuela/src/main/java/com/imalittletester/Assesment/Senzor.java index fac385d..a0a7088 100644 --- a/manuela/src/main/java/com/imalittletester/Assesment/Senzor.java +++ b/manuela/src/main/java/com/imalittletester/Assesment/Senzor.java @@ -58,16 +58,33 @@ public void createEventDataAndUomAndDataListRandom() { } } - public void createEventDataAndUomAndDataListSpecific(){ + public void createEventDataAndUomAndDataListSpecific() { this.eventDataList = new ArrayList<>(); this.uomAndDateList = new ArrayList<>(); - uomAndDateList.add(new UomAndDate("km", "11-20-2022 15:12", 1000)); + + uomAndDateList.add(new UomAndDate("km", "11-21-2022 15:12", 1000)); + uomAndDateList.add(new UomAndDate("km", "11-22-2022 15:12", 1000)); + uomAndDateList.add(new UomAndDate("mi", "11-23-2022 15:12", 1600)); + uomAndDateList.add(new UomAndDate("mi", "11-20-2022 15:12", 1600)); uomAndDateList.add(new UomAndDate("mi", "11-19-2022 15:12", 1600)); + eventDataList.add(new EventData(11, "11-23-2022 09:12")); + eventDataList.add(new EventData(1000, "11-23-2022 12:12")); + eventDataList.add(new EventData(1000, "11-23-2022 14:12")); + eventDataList.add(new EventData(11, "11-23-2022 18:12")); + eventDataList.add(new EventData(22, "11-23-2022 21:12")); + eventDataList.add(new EventData(1000, "11-22-2022 07:12")); + eventDataList.add(new EventData(500, "11-22-2022 11:12")); + eventDataList.add(new EventData(4000, "11-22-2022 15:12")); + eventDataList.add(new EventData(22, "11-22-2022 21:59")); + eventDataList.add(new EventData(11, "11-21-2022 11:12")); + eventDataList.add(new EventData(55, "11-21-2022 21:59")); + eventDataList.add(new EventData(7000, "11-21-2022 13:12")); eventDataList.add(new EventData(11, "11-20-2022 15:12")); eventDataList.add(new EventData(11, "11-20-2022 10:13")); eventDataList.add(new EventData(55, "11-19-2022 15:12")); eventDataList.add(new EventData(12, "11-19-2022 17:13")); eventDataList.add(new EventData(11, "11-19-2022 19:14")); + eventDataList.add(new EventData(11, "11-19-2022 20:14")); } } diff --git a/manuela/src/main/java/com/imalittletester/Assesment/UomAndDate.java b/manuela/src/main/java/com/imalittletester/Assesment/UomAndDate.java index 8afc888..2defb61 100644 --- a/manuela/src/main/java/com/imalittletester/Assesment/UomAndDate.java +++ b/manuela/src/main/java/com/imalittletester/Assesment/UomAndDate.java @@ -15,6 +15,7 @@ public UomAndDate(String uom, Calendar date, int stepsPerUom) { this.date = date; this.stepsPerUom = stepsPerUom; } + public UomAndDate(String uom, String date, int stepsPerUom) { this.uom = uom; Calendar cal = Calendar.getInstance(); diff --git a/manuela/src/main/java/com/imalittletester/Assesment/UserData.java b/manuela/src/main/java/com/imalittletester/Assesment/UserData.java index b4f24c1..17a992e 100644 --- a/manuela/src/main/java/com/imalittletester/Assesment/UserData.java +++ b/manuela/src/main/java/com/imalittletester/Assesment/UserData.java @@ -1,6 +1,5 @@ package com.imalittletester.Assesment; -import java.text.DecimalFormat; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; @@ -31,23 +30,6 @@ public UserData(String userName, Senzor senzor, String sleepTime, String wakeTim } } - public void afisajTotal() { - this.senzor.createEventDataAndUomAndDataListRandom(); - System.out.println("Random By User: " + this.getCurrentDayStepCount()); - System.out.println(getCurrentDayDistance(Calendar.getInstance())); - System.out.println(nrOfCaloriesCurrentDay()); - System.out.println(nrOfAlerts()); - distance7Days(); - - System.out.println("----------------"); - this.senzor.createEventDataAndUomAndDataListSpecific(); - System.out.println("Specific By User: " + this.getCurrentDayStepCount()); - System.out.println(getCurrentDayDistance(Calendar.getInstance())); - System.out.println(nrOfCaloriesCurrentDay()); - System.out.println(nrOfAlerts()); - distance7Days(); - DateAndHour(); - } public String getCurrentDayStepCount() { int totalSteps = this.senzor.getStepCountByDate(Calendar.getInstance()); @@ -107,31 +89,40 @@ public String nrOfAlerts() { } public void distance7Days() { + double distanceKm = 0; + double distanceMi = 0; Calendar calendar = Calendar.getInstance(); for (int j = 0; j < 7; j++) { Calendar cal2 = Calendar.getInstance(); cal2.set(Calendar.DATE, calendar.get(Calendar.DATE) - j); - int stepsPerUom = 0; - String uom = ""; + //int stepsPerUom = 0; + // String uom = ""; for (int i = 0; i < this.senzor.uomAndDateList.size(); i++) { if (cal2.get(Calendar.YEAR) == this.senzor.uomAndDateList.get(i).date.get(Calendar.YEAR) && cal2.get(Calendar.MONTH) == this.senzor.uomAndDateList.get(i).date.get(Calendar.MONTH) && cal2.get(Calendar.DATE) == this.senzor.uomAndDateList.get(i).date.get(Calendar.DATE)) { - stepsPerUom = this.senzor.uomAndDateList.get(i).stepsPerUom; - uom = this.senzor.uomAndDateList.get(i).uom; - break; + // stepsPerUom = this.senzor.uomAndDateList.get(i).stepsPerUom; + // uom = this.senzor.uomAndDateList.get(i).uom; + + //int todaySteps = this.senzor.getStepCountByDate(cal2); + // this.senzor.uomAndDateList.get(i).totalDistance += todaySteps; + // break; + int todaySteps = this.senzor.getStepCountByDate(cal2); + if (this.senzor.uomAndDateList.get(i).uom == "km") { + if (this.senzor.uomAndDateList.get(i).stepsPerUom != 0) { + distanceKm = 1.0 * todaySteps / this.senzor.uomAndDateList.get(i).stepsPerUom; + } + } else { + + if (this.senzor.uomAndDateList.get(i).stepsPerUom != 0) { + distanceMi = 1.0 * todaySteps / this.senzor.uomAndDateList.get(i).stepsPerUom; + } + } } } - int todaySteps = this.senzor.getStepCountByDate(Calendar.getInstance()); - double distance = 0; - if (stepsPerUom != 0) { - distance = 1.0 * todaySteps / stepsPerUom; - } - String date = ""; - SimpleDateFormat format1 = new SimpleDateFormat("MMMM dd yyyy"); - String formatted = format1.format(cal2.getTime()); - System.out.println("On " + formatted + ", the distance is: " + distance + " " + uom); } + + System.out.println("In the last 7 days the user did: " + distanceKm + " km, and " + distanceMi + " mi"); } public void DateAndHour() { @@ -141,6 +132,23 @@ public void DateAndHour() { System.out.println("Current Date And Time : " + formatted); } + public void afisajTotal() { + this.senzor.createEventDataAndUomAndDataListRandom(); + System.out.println("Random By User: " + this.getCurrentDayStepCount()); + System.out.println(getCurrentDayDistance(Calendar.getInstance())); + System.out.println(nrOfCaloriesCurrentDay()); + System.out.println(nrOfAlerts()); + distance7Days(); + + System.out.println("----------------"); + this.senzor.createEventDataAndUomAndDataListSpecific(); + System.out.println("Specific By User: " + this.getCurrentDayStepCount()); + System.out.println(getCurrentDayDistance(Calendar.getInstance())); + System.out.println(nrOfCaloriesCurrentDay()); + System.out.println(nrOfAlerts()); + distance7Days(); + DateAndHour(); + } } diff --git a/manuela/src/test/java/com/imalittletester/Assesment/AssesmentTests.java b/manuela/src/test/java/com/imalittletester/Assesment/AssesmentTests.java index 4008fca..a9f89fb 100644 --- a/manuela/src/test/java/com/imalittletester/Assesment/AssesmentTests.java +++ b/manuela/src/test/java/com/imalittletester/Assesment/AssesmentTests.java @@ -2,16 +2,12 @@ import org.junit.jupiter.api.Test; -import java.sql.SQLOutput; -import java.util.Calendar; -import java.util.List; -import java.util.Random; - public class AssesmentTests { public UserData userData1 = new UserData("Manuela", new Senzor(null, null), "22:00", "06:00"); + @Test - void stepsForCurrentDay (){ - userData1.afisajTotal(); + void stepsForCurrentDay() { + userData1.afisajTotal(); } } From 54e7f5560ad745b02ae1a1286bcdfa3367a00b9b Mon Sep 17 00:00:00 2001 From: porfiremanuel Date: Wed, 23 Nov 2022 17:28:42 +0200 Subject: [PATCH 31/31] assesment project --- .../java/com/imalittletester/Assesment/Senzor.java | 13 +++++++++++++ .../com/imalittletester/Assesment/UserData.java | 7 +++++-- .../imalittletester/Assesment/AssesmentTests.java | 5 ++++- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/manuela/src/main/java/com/imalittletester/Assesment/Senzor.java b/manuela/src/main/java/com/imalittletester/Assesment/Senzor.java index a0a7088..4675d04 100644 --- a/manuela/src/main/java/com/imalittletester/Assesment/Senzor.java +++ b/manuela/src/main/java/com/imalittletester/Assesment/Senzor.java @@ -65,8 +65,21 @@ public void createEventDataAndUomAndDataListSpecific() { uomAndDateList.add(new UomAndDate("km", "11-21-2022 15:12", 1000)); uomAndDateList.add(new UomAndDate("km", "11-22-2022 15:12", 1000)); uomAndDateList.add(new UomAndDate("mi", "11-23-2022 15:12", 1600)); + uomAndDateList.add(new UomAndDate("mi", "11-24-2022 15:12", 1600)); + uomAndDateList.add(new UomAndDate("mi", "11-25-2022 15:12", 1600)); + uomAndDateList.add(new UomAndDate("mi", "11-26-2022 15:12", 1600)); + uomAndDateList.add(new UomAndDate("mi", "11-27-2022 15:12", 1600)); + uomAndDateList.add(new UomAndDate("km", "11-28-2022 15:12", 1000)); + uomAndDateList.add(new UomAndDate("km", "11-29-2022 15:12", 1000)); uomAndDateList.add(new UomAndDate("mi", "11-20-2022 15:12", 1600)); uomAndDateList.add(new UomAndDate("mi", "11-19-2022 15:12", 1600)); + eventDataList.add(new EventData(7000, "11-29-2022 09:12")); + eventDataList.add(new EventData(15000, "11-28-2022 09:12")); + eventDataList.add(new EventData(7000, "11-27-2022 09:12")); + eventDataList.add(new EventData(15000, "11-26-2022 09:12")); + eventDataList.add(new EventData(7000, "11-25-2022 09:12")); + eventDataList.add(new EventData(15000, "11-24-2022 09:12")); + eventDataList.add(new EventData(11, "11-24-2022 09:12")); eventDataList.add(new EventData(11, "11-23-2022 09:12")); eventDataList.add(new EventData(1000, "11-23-2022 12:12")); eventDataList.add(new EventData(1000, "11-23-2022 14:12")); diff --git a/manuela/src/main/java/com/imalittletester/Assesment/UserData.java b/manuela/src/main/java/com/imalittletester/Assesment/UserData.java index 17a992e..ef10904 100644 --- a/manuela/src/main/java/com/imalittletester/Assesment/UserData.java +++ b/manuela/src/main/java/com/imalittletester/Assesment/UserData.java @@ -133,8 +133,10 @@ public void DateAndHour() { } public void afisajTotal() { + System.out.println("----------------"); this.senzor.createEventDataAndUomAndDataListRandom(); - System.out.println("Random By User: " + this.getCurrentDayStepCount()); + System.out.println("Random By User: "); + System.out.println(this.getCurrentDayStepCount()); System.out.println(getCurrentDayDistance(Calendar.getInstance())); System.out.println(nrOfCaloriesCurrentDay()); System.out.println(nrOfAlerts()); @@ -142,7 +144,8 @@ public void afisajTotal() { System.out.println("----------------"); this.senzor.createEventDataAndUomAndDataListSpecific(); - System.out.println("Specific By User: " + this.getCurrentDayStepCount()); + System.out.println("Specific By User: "); + System.out.println(this.getCurrentDayStepCount()); System.out.println(getCurrentDayDistance(Calendar.getInstance())); System.out.println(nrOfCaloriesCurrentDay()); System.out.println(nrOfAlerts()); diff --git a/manuela/src/test/java/com/imalittletester/Assesment/AssesmentTests.java b/manuela/src/test/java/com/imalittletester/Assesment/AssesmentTests.java index a9f89fb..ecfc72e 100644 --- a/manuela/src/test/java/com/imalittletester/Assesment/AssesmentTests.java +++ b/manuela/src/test/java/com/imalittletester/Assesment/AssesmentTests.java @@ -4,10 +4,13 @@ public class AssesmentTests { public UserData userData1 = new UserData("Manuela", new Senzor(null, null), "22:00", "06:00"); - + public UserData userData2 = new UserData("Daniel", new Senzor(null, null), "23:00", "06:00"); + public UserData userData3 = new UserData("Alex", new Senzor(null, null), "20:00", "06:00"); @Test void stepsForCurrentDay() { userData1.afisajTotal(); + userData2.afisajTotal(); + userData3.afisajTotal(); } }