From 1c815d8d7030b0973dac5e5714f6c43f155821f4 Mon Sep 17 00:00:00 2001 From: lukacsiulia Date: Thu, 29 Sep 2022 19:08:04 +0300 Subject: [PATCH 01/18] created branch --- .idea/.gitignore | 3 ++ .idea/encodings.xml | 9 +++++ .idea/misc.xml | 12 ++++++ .idea/vcs.xml | 6 +++ iulia/pom.xml | 29 ++++++++++++++ .../main/java/com/imalittletester/App.java | 13 +++++++ .../java/com/imalittletester/AppTest.java | 38 +++++++++++++++++++ pom.xml | 4 ++ 8 files changed, 114 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/encodings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/vcs.xml create mode 100644 iulia/pom.xml create mode 100644 iulia/src/main/java/com/imalittletester/App.java create mode 100644 iulia/src/test/java/com/imalittletester/AppTest.java 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..39dabb3 --- /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..56c7380 --- /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 diff --git a/iulia/pom.xml b/iulia/pom.xml new file mode 100644 index 0000000..c7102ad --- /dev/null +++ b/iulia/pom.xml @@ -0,0 +1,29 @@ + + + tutorial-java + com.imalittletester + 1.0-SNAPSHOT + + 4.0.0 + + iulia + jar + + iulia + http://maven.apache.org + + + UTF-8 + + + + + + org.junit.jupiter + junit-jupiter-api + 5.9.1 + test + + + diff --git a/iulia/src/main/java/com/imalittletester/App.java b/iulia/src/main/java/com/imalittletester/App.java new file mode 100644 index 0000000..f957ebc --- /dev/null +++ b/iulia/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/iulia/src/test/java/com/imalittletester/AppTest.java b/iulia/src/test/java/com/imalittletester/AppTest.java new file mode 100644 index 0000000..392529e --- /dev/null +++ b/iulia/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..9355cf8 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,11 @@ com.imalittletester tutorial-java + pom 1.0-SNAPSHOT + + iulia + tutorial-java From 94a0e688866d2d57892931053574a63589921a06 Mon Sep 17 00:00:00 2001 From: lukacsiulia Date: Mon, 3 Oct 2022 11:37:10 +0300 Subject: [PATCH 02/18] created branch --- pom.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9355cf8..b7cf72a 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,18 @@ test - + + + org.apache.commons + commons-lang3 + 3.12.0 + + + + commons-io + commons-io + 2.11.0 + From af1df1f54cac4210a4eadb7dfb7e99b2806c0363 Mon Sep 17 00:00:00 2001 From: lukacsiulia Date: Mon, 3 Oct 2022 11:43:48 +0300 Subject: [PATCH 03/18] created branch --- iulia/pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/iulia/pom.xml b/iulia/pom.xml index c7102ad..b752b66 100644 --- a/iulia/pom.xml +++ b/iulia/pom.xml @@ -25,5 +25,17 @@ 5.9.1 test + + + commons-io + commons-io + 2.11.0 + + + + org.apache.commons + commons-lang3 + 3.12.0 + From 15b5c666cf38eeea0ce9e61eb7820f2a2139b3a0 Mon Sep 17 00:00:00 2001 From: lukacsiulia Date: Mon, 3 Oct 2022 12:32:48 +0300 Subject: [PATCH 04/18] created branch, and imported common lang 3 and common io --- pom.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index b7cf72a..8e8baf9 100644 --- a/pom.xml +++ b/pom.xml @@ -30,19 +30,19 @@ 5.9.1 test + + + org.apache.commons + commons-lang3 + 3.12.0 + + + + commons-io + commons-io + 2.11.0 + - - - org.apache.commons - commons-lang3 - 3.12.0 - - - - commons-io - commons-io - 2.11.0 - From 5adc30712ed8dcb0c884861c6b2757a1af0482e1 Mon Sep 17 00:00:00 2001 From: lukacsiulia Date: Thu, 6 Oct 2022 16:42:50 +0300 Subject: [PATCH 05/18] created branch, and imported common lang 3 and common io --- iulia/pom.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/iulia/pom.xml b/iulia/pom.xml index b752b66..aab5620 100644 --- a/iulia/pom.xml +++ b/iulia/pom.xml @@ -18,13 +18,6 @@ - - - org.junit.jupiter - junit-jupiter-api - 5.9.1 - test - commons-io From 2d66fc9062d5c62edc6655779656185a697218fb Mon Sep 17 00:00:00 2001 From: lukacsiulia Date: Thu, 6 Oct 2022 16:43:28 +0300 Subject: [PATCH 06/18] created branch, and imported common lang 3 and common io --- pom.xml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pom.xml b/pom.xml index 8e8baf9..6507c1c 100644 --- a/pom.xml +++ b/pom.xml @@ -30,18 +30,6 @@ 5.9.1 test - - - org.apache.commons - commons-lang3 - 3.12.0 - - - - commons-io - commons-io - 2.11.0 - From 1f3bada3693b819b439103e780cac5e460ab4068 Mon Sep 17 00:00:00 2001 From: lukacsiulia Date: Thu, 6 Oct 2022 18:30:42 +0300 Subject: [PATCH 07/18] created branch, and imported common lang 3 and common io --- .idea/uiDesigner.xml | 124 ++++++++++++++++++ .../main/java/com/imalittletester/App.java | 13 -- .../com/imalittletester/jam/ApricotJam.java | 24 ++++ .../java/com/imalittletester/AppTest.java | 38 ------ .../imalittletester/jam/ApricotJamTest.java | 28 ++++ 5 files changed, 176 insertions(+), 51 deletions(-) create mode 100644 .idea/uiDesigner.xml delete mode 100644 iulia/src/main/java/com/imalittletester/App.java create mode 100644 iulia/src/main/java/com/imalittletester/jam/ApricotJam.java delete mode 100644 iulia/src/test/java/com/imalittletester/AppTest.java create mode 100644 iulia/src/test/java/com/imalittletester/jam/ApricotJamTest.java diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/iulia/src/main/java/com/imalittletester/App.java b/iulia/src/main/java/com/imalittletester/App.java deleted file mode 100644 index f957ebc..0000000 --- a/iulia/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/iulia/src/main/java/com/imalittletester/jam/ApricotJam.java b/iulia/src/main/java/com/imalittletester/jam/ApricotJam.java new file mode 100644 index 0000000..735392b --- /dev/null +++ b/iulia/src/main/java/com/imalittletester/jam/ApricotJam.java @@ -0,0 +1,24 @@ +package com.imalittletester.jam; + +public class ApricotJam { + + //fields - to describe state (ex proprietatile unui obiect) + // - trebuie sa aiba visibility attribute + type (primitiv sau obiect) + si trebuie sa ii dam nume + // - fieldul va fi definit in toate metodele care apartin clasei + // primitive data types - int/ long/ byte/ short etc (numeric integral) + + 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 +} diff --git a/iulia/src/test/java/com/imalittletester/AppTest.java b/iulia/src/test/java/com/imalittletester/AppTest.java deleted file mode 100644 index 392529e..0000000 --- a/iulia/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/iulia/src/test/java/com/imalittletester/jam/ApricotJamTest.java b/iulia/src/test/java/com/imalittletester/jam/ApricotJamTest.java new file mode 100644 index 0000000..d645c04 --- /dev/null +++ b/iulia/src/test/java/com/imalittletester/jam/ApricotJamTest.java @@ -0,0 +1,28 @@ +package com.imalittletester.jam; + +import org.junit.jupiter.api.Test; + +import java.io.File; +import java.util.Date; + +public class ApricotJamTest { + + public int aPositiveValue = 10; + public long aPositiveLong = -1001001; + public float aFloat = 500; + public double aDouble = 29292.29292929229; + public boolean aBoolean; + public String aSweetener = "sugar\ncane"; + public File newFile; + public Date newDate; + + @Test + void firstTest() { + // System.out.println(aPositiveValue); + // System.out.println(aPositiveLong); + // System.out.println(aFloat); + // System.out.println(aDouble); + // System.out.println(aBoolean); + System.out.println(" -->" + aSweetener); + } +} From 0c315239b76d9674cb2165dcea18ea50b72d1ffe Mon Sep 17 00:00:00 2001 From: lukacsiulia Date: Mon, 10 Oct 2022 15:02:17 +0300 Subject: [PATCH 08/18] defined garmin cookies --- iulia/pom.xml | 12 ++++++++++++ .../com/imalittletester/garmincookies/NID.java | 15 +++++++++++++++ .../imalittletester/garmincookies/uuid2.java | 17 +++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 iulia/src/main/java/com/imalittletester/garmincookies/NID.java create mode 100644 iulia/src/main/java/com/imalittletester/garmincookies/uuid2.java diff --git a/iulia/pom.xml b/iulia/pom.xml index aab5620..186ba60 100644 --- a/iulia/pom.xml +++ b/iulia/pom.xml @@ -12,6 +12,18 @@ iulia http://maven.apache.org + + + + org.apache.maven.plugins + maven-compiler-plugin + + 8 + 8 + + + + UTF-8 diff --git a/iulia/src/main/java/com/imalittletester/garmincookies/NID.java b/iulia/src/main/java/com/imalittletester/garmincookies/NID.java new file mode 100644 index 0000000..df6cb7b --- /dev/null +++ b/iulia/src/main/java/com/imalittletester/garmincookies/NID.java @@ -0,0 +1,15 @@ +package com.imalittletester.garmincookies; + +public class NID { + public String name = "NID"; + public String domain = ".google.com"; + public char path = '/'; + public int size = 178; + public String sameSite = "None"; + public boolean sameParty = false; + public String partitionKey; + + { + partitionKey = null; + } +} diff --git a/iulia/src/main/java/com/imalittletester/garmincookies/uuid2.java b/iulia/src/main/java/com/imalittletester/garmincookies/uuid2.java new file mode 100644 index 0000000..0554534 --- /dev/null +++ b/iulia/src/main/java/com/imalittletester/garmincookies/uuid2.java @@ -0,0 +1,17 @@ +package com.imalittletester.garmincookies; + +import javax.print.attribute.DateTimeSyntax; +import java.time.LocalDateTime; +import java.util.Date; + +public class uuid2 { + + public String name = "uuid2"; + public int size = 24; + public long value = 1071970293196698480L; + public boolean httpOnly = true; + public char secure = '✓'; + public String priority = "Medium"; + LocalDateTime date = LocalDateTime.parse("2023-01-08T06:38:10.919Z"); + +} From 71361ee209f5a227e2864248c7b4c904b83fb963 Mon Sep 17 00:00:00 2001 From: lukacsiulia Date: Tue, 11 Oct 2022 09:08:30 +0300 Subject: [PATCH 09/18] defined garmin cookies --- .../garmincookies/CookieStructure.java | 15 +++++++++++++++ .../com/imalittletester/garmincookies/NID.java | 15 --------------- .../imalittletester/garmincookies/uuid2.java | 17 ----------------- .../com/imalittletester/jam/ApricotJamTest.java | 3 +-- 4 files changed, 16 insertions(+), 34 deletions(-) create mode 100644 iulia/src/main/java/com/imalittletester/garmincookies/CookieStructure.java delete mode 100644 iulia/src/main/java/com/imalittletester/garmincookies/NID.java delete mode 100644 iulia/src/main/java/com/imalittletester/garmincookies/uuid2.java diff --git a/iulia/src/main/java/com/imalittletester/garmincookies/CookieStructure.java b/iulia/src/main/java/com/imalittletester/garmincookies/CookieStructure.java new file mode 100644 index 0000000..12a9cb5 --- /dev/null +++ b/iulia/src/main/java/com/imalittletester/garmincookies/CookieStructure.java @@ -0,0 +1,15 @@ +package com.imalittletester.garmincookies; + +import java.util.Date; + +public class CookieStructure { + + public String cookieName; + public int cookieSize; + public long cookieValue; + public boolean cookieHttpOnly; + public char secure = '✓'; + public String cookiePriority; + public Date cookieExpirationDate; + +} diff --git a/iulia/src/main/java/com/imalittletester/garmincookies/NID.java b/iulia/src/main/java/com/imalittletester/garmincookies/NID.java deleted file mode 100644 index df6cb7b..0000000 --- a/iulia/src/main/java/com/imalittletester/garmincookies/NID.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.imalittletester.garmincookies; - -public class NID { - public String name = "NID"; - public String domain = ".google.com"; - public char path = '/'; - public int size = 178; - public String sameSite = "None"; - public boolean sameParty = false; - public String partitionKey; - - { - partitionKey = null; - } -} diff --git a/iulia/src/main/java/com/imalittletester/garmincookies/uuid2.java b/iulia/src/main/java/com/imalittletester/garmincookies/uuid2.java deleted file mode 100644 index 0554534..0000000 --- a/iulia/src/main/java/com/imalittletester/garmincookies/uuid2.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.imalittletester.garmincookies; - -import javax.print.attribute.DateTimeSyntax; -import java.time.LocalDateTime; -import java.util.Date; - -public class uuid2 { - - public String name = "uuid2"; - public int size = 24; - public long value = 1071970293196698480L; - public boolean httpOnly = true; - public char secure = '✓'; - public String priority = "Medium"; - LocalDateTime date = LocalDateTime.parse("2023-01-08T06:38:10.919Z"); - -} diff --git a/iulia/src/test/java/com/imalittletester/jam/ApricotJamTest.java b/iulia/src/test/java/com/imalittletester/jam/ApricotJamTest.java index d645c04..444f7d9 100644 --- a/iulia/src/test/java/com/imalittletester/jam/ApricotJamTest.java +++ b/iulia/src/test/java/com/imalittletester/jam/ApricotJamTest.java @@ -13,8 +13,7 @@ public class ApricotJamTest { public double aDouble = 29292.29292929229; public boolean aBoolean; public String aSweetener = "sugar\ncane"; - public File newFile; - public Date newDate; + public Date new_Date; @Test void firstTest() { From b6b56ac66b06402d0833c80b0afbeb4a8f58a250 Mon Sep 17 00:00:00 2001 From: lukacsiulia Date: Thu, 13 Oct 2022 09:57:52 +0300 Subject: [PATCH 10/18] curs 3 --- .../garmincookies/CookieStructure.java | 12 ++--- .../com/imalittletester/jam/ApricotJam.java | 46 ++++++++++++++++++- .../imalittletester/jam/ApricotJamTest.java | 14 +++++- 3 files changed, 64 insertions(+), 8 deletions(-) diff --git a/iulia/src/main/java/com/imalittletester/garmincookies/CookieStructure.java b/iulia/src/main/java/com/imalittletester/garmincookies/CookieStructure.java index 12a9cb5..1856bfe 100644 --- a/iulia/src/main/java/com/imalittletester/garmincookies/CookieStructure.java +++ b/iulia/src/main/java/com/imalittletester/garmincookies/CookieStructure.java @@ -4,12 +4,12 @@ public class CookieStructure { - public String cookieName; - public int cookieSize; - public long cookieValue; - public boolean cookieHttpOnly; + public String name; + public int size; + public long value; + public boolean httpOnly; public char secure = '✓'; - public String cookiePriority; - public Date cookieExpirationDate; + public String priority; + public Date expirationDate; } diff --git a/iulia/src/main/java/com/imalittletester/jam/ApricotJam.java b/iulia/src/main/java/com/imalittletester/jam/ApricotJam.java index 735392b..7b5dc6a 100644 --- a/iulia/src/main/java/com/imalittletester/jam/ApricotJam.java +++ b/iulia/src/main/java/com/imalittletester/jam/ApricotJam.java @@ -20,5 +20,49 @@ public class ApricotJam { public boolean isDietetic; - //method + //method = grupare de linie de cod, deobicei se foloseste in mai multe locuri (se apeleaza metoda) + //constructors = asignam valori fieldurilor definite in obiect + + public ApricotJam() { + } + + public ApricotJam(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 "ApricotJam{" + + "sweetener='" + sweetener + '\'' + + ", sweetenerQty=" + sweetenerQty + + ", sweetenerUom='" + sweetenerUom + '\'' + + ", apricotQty=" + apricotQty + + ", apricotUom='" + apricotUom + '\'' + + ", jarQty=" + jarQty + + ", jarCapacity=" + jarCapacity + + ", isDietetic=" + isDietetic + + '}'; + } } + + + + + diff --git a/iulia/src/test/java/com/imalittletester/jam/ApricotJamTest.java b/iulia/src/test/java/com/imalittletester/jam/ApricotJamTest.java index 444f7d9..e344712 100644 --- a/iulia/src/test/java/com/imalittletester/jam/ApricotJamTest.java +++ b/iulia/src/test/java/com/imalittletester/jam/ApricotJamTest.java @@ -2,7 +2,6 @@ import org.junit.jupiter.api.Test; -import java.io.File; import java.util.Date; public class ApricotJamTest { @@ -15,6 +14,19 @@ public class ApricotJamTest { public String aSweetener = "sugar\ncane"; public Date new_Date; + public ApricotJam apricotJam = new ApricotJam(); + public ApricotJam apricotJam2 = new ApricotJam(); + + public ApricotJam apricotJam3 = new ApricotJam("sugar cane",1.5f, "kg",10, "kg", 30, 500,false ); + @Test + void secondTest() { + System.out.println(apricotJam); + System.out.println(apricotJam2); + System.out.println(apricotJam3); + apricotJam3.makeJam(); + + } + @Test void firstTest() { // System.out.println(aPositiveValue); From 4809aabbe776f8cdaaebe57b82699aeda1416b6a Mon Sep 17 00:00:00 2001 From: lukacsiulia Date: Mon, 17 Oct 2022 15:01:17 +0300 Subject: [PATCH 11/18] cookie constructors and methods --- .../garmincookies/CookieStructure.java | 44 ++++++++++++++++++- .../jam/CookieStructureTest.java | 24 ++++++++++ 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 iulia/src/test/java/com/imalittletester/jam/CookieStructureTest.java diff --git a/iulia/src/main/java/com/imalittletester/garmincookies/CookieStructure.java b/iulia/src/main/java/com/imalittletester/garmincookies/CookieStructure.java index 1856bfe..5800302 100644 --- a/iulia/src/main/java/com/imalittletester/garmincookies/CookieStructure.java +++ b/iulia/src/main/java/com/imalittletester/garmincookies/CookieStructure.java @@ -11,5 +11,47 @@ public class CookieStructure { public char secure = '✓'; public String priority; public Date expirationDate; + private boolean isProvidedParamSubDomainOfDomain; + + public CookieStructure () { //constructor default + } + + public CookieStructure(String name, int size, long value, boolean httpOnly, char secure, String priority, Date expirationDate, boolean isProvidedParamSubDomainOfDomain) { + this.name = name; + this.size = size; + this.value = value; + this.httpOnly = httpOnly; + this.secure = secure; + this.priority = priority; + this.expirationDate = expirationDate; + this.isProvidedParamSubDomainOfDomain = isProvidedParamSubDomainOfDomain; + }//constructor with all fields + + + public CookieStructure(String name, long value) { + this.name = name; + this.value = value; //constructor name and value + } + + @Override + public String toString() { + return "CookieStructure{" + + "name='" + name + '\'' + + ", size=" + size + + ", value=" + value + + ", httpOnly=" + httpOnly + + ", secure=" + secure + + ", priority='" + priority + '\'' + + ", expirationDate=" + expirationDate + + ", isProvidedParamSubDomainOfDomain=" + isProvidedParamSubDomainOfDomain + + '}'; + } + + + public boolean isProvidedParamSubDomainOfDomain() { + return isProvidedParamSubDomainOfDomain; + } + + + } -} diff --git a/iulia/src/test/java/com/imalittletester/jam/CookieStructureTest.java b/iulia/src/test/java/com/imalittletester/jam/CookieStructureTest.java new file mode 100644 index 0000000..be4ca07 --- /dev/null +++ b/iulia/src/test/java/com/imalittletester/jam/CookieStructureTest.java @@ -0,0 +1,24 @@ +package com.imalittletester.jam; + +import com.imalittletester.garmincookies.CookieStructure; +import org.junit.jupiter.api.Test; + +import java.util.Date; + +public class CookieStructureTest { + + public CookieStructure cookieStructure = new CookieStructure(); + + public CookieStructure cookieStructure2 = new CookieStructure(); + + public CookieStructure cookieStructure3 = new CookieStructure("notice preferences",20,34343434343443L,true,'✓',"medium", new Date(),false); + + @Test + void firstTest(){ + System.out.println(cookieStructure); + System.out.println(cookieStructure2); + System.out.println(cookieStructure3); + } + + +} From 033fc279bc7eac3f5512a1809e1ea9bd601dc64f Mon Sep 17 00:00:00 2001 From: lukacsiulia Date: Thu, 20 Oct 2022 10:02:38 +0300 Subject: [PATCH 12/18] cookie constructors and methods --- .../com/imalittletester/garmincookies/CookieStructure.java | 4 ++-- .../java/com/imalittletester/jam/CookieStructureTest.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/iulia/src/main/java/com/imalittletester/garmincookies/CookieStructure.java b/iulia/src/main/java/com/imalittletester/garmincookies/CookieStructure.java index 5800302..d419656 100644 --- a/iulia/src/main/java/com/imalittletester/garmincookies/CookieStructure.java +++ b/iulia/src/main/java/com/imalittletester/garmincookies/CookieStructure.java @@ -48,8 +48,8 @@ public String toString() { } - public boolean isProvidedParamSubDomainOfDomain() { - return isProvidedParamSubDomainOfDomain; + public boolean isProvidedParamSubDomainOfDomain(String stringToCheck) { + return name.contains(stringToCheck) ; } diff --git a/iulia/src/test/java/com/imalittletester/jam/CookieStructureTest.java b/iulia/src/test/java/com/imalittletester/jam/CookieStructureTest.java index be4ca07..9aceb8c 100644 --- a/iulia/src/test/java/com/imalittletester/jam/CookieStructureTest.java +++ b/iulia/src/test/java/com/imalittletester/jam/CookieStructureTest.java @@ -18,6 +18,7 @@ void firstTest(){ System.out.println(cookieStructure); System.out.println(cookieStructure2); System.out.println(cookieStructure3); + System.out.println(cookieStructure3.isProvidedParamSubDomainOfDomain("preferences")); } From a737ea323926c8e6f4910b021eda7879887a0eee Mon Sep 17 00:00:00 2001 From: lukacsiulia Date: Fri, 21 Oct 2022 10:59:27 +0300 Subject: [PATCH 13/18] created Jar class and modified ApricotJam class --- .../com/imalittletester/jam/ApricotJam.java | 34 ++++++++---------- .../java/com/imalittletester/jam/Bottle.java | 12 +++++++ .../java/com/imalittletester/jam/Jam.java | 35 +++++++++++++++++++ .../java/com/imalittletester/jam/Jar.java | 12 +++++++ .../com/imalittletester/jam/MelonJam.java | 33 +++++++++++++++++ .../imalittletester/jam/ApricotJamTest.java | 30 +++++++++++++--- 6 files changed, 132 insertions(+), 24 deletions(-) create mode 100644 iulia/src/main/java/com/imalittletester/jam/Bottle.java create mode 100644 iulia/src/main/java/com/imalittletester/jam/Jam.java create mode 100644 iulia/src/main/java/com/imalittletester/jam/Jar.java create mode 100644 iulia/src/main/java/com/imalittletester/jam/MelonJam.java diff --git a/iulia/src/main/java/com/imalittletester/jam/ApricotJam.java b/iulia/src/main/java/com/imalittletester/jam/ApricotJam.java index 7b5dc6a..44efe66 100644 --- a/iulia/src/main/java/com/imalittletester/jam/ApricotJam.java +++ b/iulia/src/main/java/com/imalittletester/jam/ApricotJam.java @@ -1,23 +1,17 @@ package com.imalittletester.jam; -public class ApricotJam { +public class ApricotJam extends Jam { //fields - to describe state (ex proprietatile unui obiect) // - trebuie sa aiba visibility attribute + type (primitiv sau obiect) + si trebuie sa ii dam nume // - fieldul va fi definit in toate metodele care apartin clasei // primitive data types - int/ long/ byte/ short etc (numeric integral) - public String sweetener; - public float sweetenerQty; - public String sweetenerUom; public float apricotQty; public String apricotUom; - public int jarQty; - public int jarCapacity; - - public boolean isDietetic; + public Jar jar; //method = grupare de linie de cod, deobicei se foloseste in mai multe locuri (se apeleaza metoda) @@ -25,28 +19,30 @@ public class ApricotJam { public ApricotJam() { } + public ApricotJam(String sweetener) { + super(sweetener); + } - public ApricotJam(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; + public ApricotJam(String sweetener, float sweetenerQty, String sweetenerUom, float apricotQty, String apricotUom, Jar jar, boolean isDietetic) { + super(sweetener, sweetenerQty, sweetenerUom, isDietetic); this.apricotQty = apricotQty; this.apricotUom = apricotUom; - this.jarQty = jarQty; - this.jarCapacity = jarCapacity; - this.isDietetic = isDietetic; + this.jar = jar; } - public void makeJam() { - System.out.println("Adding " + sweetenerQty + " " + sweetenerUom + " of " + sweetener); + @Override + public void makeJam() { + super.makeJam(); System.out.println("Also adding " + apricotQty + " " + apricotUom + " of apricots"); System.out.println("Boiling for "+ preparationTime()+" minutes"); - System.out.println("Is dietetic? "+ isDietetic); } + + //method private int preparationTime(){ return 30; } + //method @Override public String toString() { return "ApricotJam{" + @@ -55,8 +51,6 @@ public String toString() { ", sweetenerUom='" + sweetenerUom + '\'' + ", apricotQty=" + apricotQty + ", apricotUom='" + apricotUom + '\'' + - ", jarQty=" + jarQty + - ", jarCapacity=" + jarCapacity + ", isDietetic=" + isDietetic + '}'; } diff --git a/iulia/src/main/java/com/imalittletester/jam/Bottle.java b/iulia/src/main/java/com/imalittletester/jam/Bottle.java new file mode 100644 index 0000000..0879fa8 --- /dev/null +++ b/iulia/src/main/java/com/imalittletester/jam/Bottle.java @@ -0,0 +1,12 @@ +package com.imalittletester.jam; + +public class Bottle { + + public int bottleQty; + public int bottleCapacity; + + public Bottle(int bottleQty, int bottleCapacity) { + this.bottleQty = bottleQty; + this.bottleCapacity = bottleCapacity; + } +} diff --git a/iulia/src/main/java/com/imalittletester/jam/Jam.java b/iulia/src/main/java/com/imalittletester/jam/Jam.java new file mode 100644 index 0000000..9f17a3a --- /dev/null +++ b/iulia/src/main/java/com/imalittletester/jam/Jam.java @@ -0,0 +1,35 @@ +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); + + + + } + + // exercitiu +} + diff --git a/iulia/src/main/java/com/imalittletester/jam/Jar.java b/iulia/src/main/java/com/imalittletester/jam/Jar.java new file mode 100644 index 0000000..0c1d412 --- /dev/null +++ b/iulia/src/main/java/com/imalittletester/jam/Jar.java @@ -0,0 +1,12 @@ +package com.imalittletester.jam; + +public class Jar { + public int jarCapacity; + public int jarQty; + + public Jar(int jarCapacity, int jarQty) { + this.jarCapacity = jarCapacity; + this.jarQty = jarQty; + } +} + diff --git a/iulia/src/main/java/com/imalittletester/jam/MelonJam.java b/iulia/src/main/java/com/imalittletester/jam/MelonJam.java new file mode 100644 index 0000000..5011462 --- /dev/null +++ b/iulia/src/main/java/com/imalittletester/jam/MelonJam.java @@ -0,0 +1,33 @@ +package com.imalittletester.jam; + +public class MelonJam extends Jam { + + //fields + + public float melonQty; + public String melonUom; + public Bottle bottle; + //constructors + + public MelonJam(String sweetener, float sweetenerQty, String sweetenerUom, float melonQty, String melonUom, Bottle bottle, boolean isDietetic) { + super(sweetener, sweetenerQty,sweetenerUom, isDietetic); + this.melonQty = melonQty; + this.melonUom = melonUom; + this.bottle = bottle; + } + + public MelonJam() { + } + public MelonJam(String sweetener){ + super(sweetener); + } + + //method + @Override + public void makeJam(){ + super.makeJam(); + System.out.println("Adding " + melonQty + " " + melonUom + " of melon"); + System.out.println("Bottling in: " + bottle.bottleQty + " of capacity: " + bottle.bottleCapacity); + } + +} diff --git a/iulia/src/test/java/com/imalittletester/jam/ApricotJamTest.java b/iulia/src/test/java/com/imalittletester/jam/ApricotJamTest.java index e344712..6235bb0 100644 --- a/iulia/src/test/java/com/imalittletester/jam/ApricotJamTest.java +++ b/iulia/src/test/java/com/imalittletester/jam/ApricotJamTest.java @@ -1,9 +1,12 @@ 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.util.Date; - +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class ApricotJamTest { public int aPositiveValue = 10; @@ -17,16 +20,33 @@ public class ApricotJamTest { public ApricotJam apricotJam = new ApricotJam(); public ApricotJam apricotJam2 = new ApricotJam(); - public ApricotJam apricotJam3 = new ApricotJam("sugar cane",1.5f, "kg",10, "kg", 30, 500,false ); + public ApricotJam apricotJam3 = new ApricotJam("sugar cane",1.5f, "kg",10, "kg",new Jar(500,30),true ); + + public MelonJam melonJam = new MelonJam("plain sugar",10,"kg",10, "kg", new Bottle(20,1000),false); + + + @Order(1) + @Test + void thirdTest() { + apricotJam3.makeJam(); + System.out.println("------------------"); + melonJam.makeJam(); + } + + @Order(2) @Test void secondTest() { + System.out.println("------------------"); System.out.println(apricotJam); System.out.println(apricotJam2); System.out.println(apricotJam3); apricotJam3.makeJam(); + apricotJam3.sweetener.contains("sugar"); + melonJam.makeJam(); } + @Order(3) @Test void firstTest() { // System.out.println(aPositiveValue); @@ -34,6 +54,8 @@ void firstTest() { // System.out.println(aFloat); // System.out.println(aDouble); // System.out.println(aBoolean); - System.out.println(" -->" + aSweetener); + //System.out.println(" -->" + aSweetener); } -} + + } + From 5efa538f2e1184065af7154f6973d465b9146341 Mon Sep 17 00:00:00 2001 From: lukacsiulia Date: Fri, 21 Oct 2022 12:23:21 +0300 Subject: [PATCH 14/18] created Jar class and modified ApricotJam class --- .../java/com/imalittletester/jam/Jam.java | 63 ++++++++++++++++++- 1 file changed, 61 insertions(+), 2 deletions(-) diff --git a/iulia/src/main/java/com/imalittletester/jam/Jam.java b/iulia/src/main/java/com/imalittletester/jam/Jam.java index 9f17a3a..9b64f14 100644 --- a/iulia/src/main/java/com/imalittletester/jam/Jam.java +++ b/iulia/src/main/java/com/imalittletester/jam/Jam.java @@ -22,14 +22,73 @@ 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); - } // exercitiu + + // in Jam class add the following fields: + // public float fruitQty; + // public String fruitUom; + // public String fruitType; + + // delete ApricotJam and MelonJam classes. + // update the constructor Jam in the Jam class with the following: + // public Jam(String sweetener, float sweetenerQty, String sweetenerUom,String fruitType, String fruitUom, float fruitQty, boolean isDietetic) { + // this.fruitType = fruitType; + // this.fruitQty = fruitQty; + // this.fruitUom = fruitUom; + + //update the method in Jam class: + //public void makeJam(){ + // System.out.println("Adding " + sweetenerQty + " " + sweetenerUom + " " + "of " + sweetener); + // System.out.println("Also adding " +fruitQty + " " + fruitUom + " " + fruitType); + // System.out.println("Boiling for "+ preparationTime()+" minutes"); + // System.out.println("Is jam dietetic? " + isDietetic); + + + // update the test class: + // public Jam apricotJam = new Jam(new Jam("sugar cane", 1, "kg","apricot", 3, "kg), ,new Jar(500,30),true ); + // public Jam melonJam = new Jam(new Jam("stevia", 2, "kg","melon", 3, "kg), ,new Bottle(500,30),false ); + + // create new test example: + // void apricotJamTest() { + // apricotJam.makeJam(); + + // void melonJamTest () { + // melonJam.makeJam(); + + + // alta rezolvare ar fi sa facem 2 metode: + //public void makeApricotJam(){ + // System.out.println("Adding " + sweetenerQty + " " + sweetenerUom + " " + "of " + sweetener); + // System.out.println("Also adding " +fruitQty + " " + fruitUom + " " + fruitType); + // System.out.println("Boiling for "+ preparationTime()+" minutes"); + // System.out.println("Is jam dietetic? " + isDietetic); + + //public void makeMelonJam(){ + // System.out.println("Adding " + sweetenerQty + " " + sweetenerUom + " " + "of " + sweetener); + // System.out.println("Adding " + fruitQty + " " + fruitUom + " " + fruitType); + // System.out.println("Bottling in: " + bottle.bottleQty + " of capacity: " + bottle.bottleCapacity); + // System.out.println("Is jam dietetic? " + isDietetic); + + //obiectele raman: + // public Jam apricotJam = new Jam(new Jam("sugar cane", 1, "kg","apricot", 3, "kg), ,new Jar(500,30),true ); + // public Jam melonJam = new Jam(new Jam("stevia", 2, "kg","melon", 3, "kg), ,new Bottle(500,30),false ); + + // create new test example: + // void apricotJamTest() { + // apricotJam.makeApricotJam(); + + // void melonJamTest () { + // melonJam.makeMelonJam(); + + + + } From f159ca6b5abcf96f74aa771525b6df6befc93386 Mon Sep 17 00:00:00 2001 From: lukacsiulia Date: Wed, 2 Nov 2022 10:51:23 +0200 Subject: [PATCH 15/18] homework 4 --- .../com/imalittletester/jam/ApricotJam.java | 33 ++++++- .../java/com/imalittletester/jam/Jam.java | 19 +++- .../com/imalittletester/jam/MelonJam.java | 6 +- .../imalittletester/jam/ApricotJamTest.java | 22 ++++- .../imalittletester/jam/OperatorsTest.java | 99 +++++++++++++++++++ 5 files changed, 171 insertions(+), 8 deletions(-) create mode 100644 iulia/src/test/java/com/imalittletester/jam/OperatorsTest.java diff --git a/iulia/src/main/java/com/imalittletester/jam/ApricotJam.java b/iulia/src/main/java/com/imalittletester/jam/ApricotJam.java index 44efe66..f453857 100644 --- a/iulia/src/main/java/com/imalittletester/jam/ApricotJam.java +++ b/iulia/src/main/java/com/imalittletester/jam/ApricotJam.java @@ -1,5 +1,7 @@ package com.imalittletester.jam; +import java.util.Objects; + public class ApricotJam extends Jam { //fields - to describe state (ex proprietatile unui obiect) @@ -23,14 +25,16 @@ public ApricotJam(String sweetener) { super(sweetener); } - public ApricotJam(String sweetener, float sweetenerQty, String sweetenerUom, float apricotQty, String apricotUom, Jar jar, boolean isDietetic) { - super(sweetener, sweetenerQty, sweetenerUom, isDietetic); + public ApricotJam(String sweetener, float sweetenerQty, String sweetenerUom, float apricotQty, String apricotUom, Jar jar) { + super(sweetener, sweetenerQty, sweetenerUom); 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"); @@ -54,6 +58,29 @@ public String toString() { ", isDietetic=" + isDietetic + '}'; } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + ApricotJam that = (ApricotJam) 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/iulia/src/main/java/com/imalittletester/jam/Jam.java b/iulia/src/main/java/com/imalittletester/jam/Jam.java index 9b64f14..e5f6d0e 100644 --- a/iulia/src/main/java/com/imalittletester/jam/Jam.java +++ b/iulia/src/main/java/com/imalittletester/jam/Jam.java @@ -1,5 +1,7 @@ package com.imalittletester.jam; +import java.util.Objects; + public class Jam { public String sweetener; @@ -8,11 +10,12 @@ public class Jam { public boolean isDietetic; - public Jam(String sweetener, float sweetenerQty, String sweetenerUom, boolean isDietetic) { + public Jam(String sweetener, float sweetenerQty, String sweetenerUom) { this.sweetener = sweetener; this.sweetenerQty = sweetenerQty; this.sweetenerUom = sweetenerUom; this.isDietetic = isDietetic; + this.isDietetic = sweetener.equals("sucralose")|| sweetener.equals("stevia"); } public Jam() { @@ -28,6 +31,20 @@ public void makeJam() { } + @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); + } + + // exercitiu diff --git a/iulia/src/main/java/com/imalittletester/jam/MelonJam.java b/iulia/src/main/java/com/imalittletester/jam/MelonJam.java index 5011462..2f05d84 100644 --- a/iulia/src/main/java/com/imalittletester/jam/MelonJam.java +++ b/iulia/src/main/java/com/imalittletester/jam/MelonJam.java @@ -10,7 +10,7 @@ public class MelonJam extends Jam { //constructors public MelonJam(String sweetener, float sweetenerQty, String sweetenerUom, float melonQty, String melonUom, Bottle bottle, boolean isDietetic) { - super(sweetener, sweetenerQty,sweetenerUom, isDietetic); + super(sweetener, sweetenerQty,sweetenerUom); this.melonQty = melonQty; this.melonUom = melonUom; this.bottle = bottle; @@ -30,4 +30,6 @@ public void makeJam(){ System.out.println("Bottling in: " + bottle.bottleQty + " of capacity: " + bottle.bottleCapacity); } -} + } + + diff --git a/iulia/src/test/java/com/imalittletester/jam/ApricotJamTest.java b/iulia/src/test/java/com/imalittletester/jam/ApricotJamTest.java index 6235bb0..95dd27c 100644 --- a/iulia/src/test/java/com/imalittletester/jam/ApricotJamTest.java +++ b/iulia/src/test/java/com/imalittletester/jam/ApricotJamTest.java @@ -20,8 +20,8 @@ public class ApricotJamTest { public ApricotJam apricotJam = new ApricotJam(); public ApricotJam apricotJam2 = new ApricotJam(); - public ApricotJam apricotJam3 = new ApricotJam("sugar cane",1.5f, "kg",10, "kg",new Jar(500,30),true ); - + public ApricotJam apricotJam3 = new ApricotJam("stevia", 1.5f,"kg", 10, "kg", new Jar(30, 500)); + public ApricotJam apricotJam4 = new ApricotJam("sugar cane", 1.5f,"kg", 10, "kg", new Jar(30, 500)); public MelonJam melonJam = new MelonJam("plain sugar",10,"kg",10, "kg", new Bottle(20,1000),false); @@ -31,6 +31,17 @@ void thirdTest() { apricotJam3.makeJam(); System.out.println("------------------"); melonJam.makeJam(); + + System.out.println("avem " + apricotJam3.howManyFullJars(2300) + " borcane pline."); + System.out.println("mai raman " + apricotJam3.remainderJam(2300) + "g."); + System.out.println(apricotJam3.equals(apricotJam4)); + } + + @Test + void forthTest() { + apricotJam3.makeJam(); + System.out.println("Is jam made with stevia dietetic? " + apricotJam3.isDietetic); + System.out.println("Is jam made with sugar cane dietetic? " + apricotJam4.isDietetic); } @Order(2) @@ -55,7 +66,14 @@ void firstTest() { // System.out.println(aDouble); // System.out.println(aBoolean); //System.out.println(" -->" + aSweetener); + + System.out.println(apricotJam3.howManyFullJars(2300)); + System.out.println(apricotJam3.remainderJam(2300)); + System.out.println(apricotJam3.equals(apricotJam2)); } + + + } diff --git a/iulia/src/test/java/com/imalittletester/jam/OperatorsTest.java b/iulia/src/test/java/com/imalittletester/jam/OperatorsTest.java new file mode 100644 index 0000000..7aaa35f --- /dev/null +++ b/iulia/src/test/java/com/imalittletester/jam/OperatorsTest.java @@ -0,0 +1,99 @@ +package com.imalittletester.jam; + +import org.junit.jupiter.api.Test; + +import javax.lang.model.SourceVersion; + +public class OperatorsTest { + + public int numele; + + + @Test + void firstTest() { + int int1 = 0; + int int2 = 55; + + double double1 = 0.0, double2 = 125.5; + + boolean bool1 = 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"); + System.out.println(1 + "2"); + + + System.out.println(!bool1); + System.out.println(!bool2); + boolean e = !"eeee".contains("e"); + + System.out.println(string1.equals(string2)); + + } + @Test + void secondTest() { + int int1 = 1; + int cuiAsignamValoarea = 0; + //int 1 e 1 + cuiAsignamValoarea = int1++; //asignez valoarea veche, apoi updatez valoarea lui int1 + System.out.println("cuiAsignamValoarea = " + cuiAsignamValoarea); + //int1 e 2 deja + cuiAsignamValoarea = ++int1; //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? " + (int1 < cuiAsignamValoarea)); + } + + @Test + void thirdTest () { + int int1 = 1; + //int1 = int1 + 10; + int1 += 10; + System.out.println("int1 = " + int1); //avem valoarea 11 + // int1 = int1 - 10; + int1 -= 10; + System.out.println("int1 = " + int1); //avem valoarea 1 + // int1 = int1 + -100000; + int1 += -100000; + System.out.println("int1 = " + int1); //valoarea -99999 + + System.out.println(1 == 2); + System.out.println(1 != 2); + + } + +} From 0023b4767ac7af9119ebae5800d4e91257ef6406 Mon Sep 17 00:00:00 2001 From: lukacsiulia Date: Tue, 8 Nov 2022 23:05:48 +0200 Subject: [PATCH 16/18] homework 5 --- iulia/pom.xml | 6 +- .../homeworks/MonthHomework.java | 32 ++++++++ .../java/com/imalittletester/jam/Jam.java | 63 ++++++++++++--- .../imalittletester/jam/ApricotJamTest.java | 80 +++++++++++++++++-- .../jam/MonthHomeworkTest.java | 56 +++++++++++++ 5 files changed, 217 insertions(+), 20 deletions(-) create mode 100644 iulia/src/main/java/com/imalittletester/homeworks/MonthHomework.java create mode 100644 iulia/src/test/java/com/imalittletester/jam/MonthHomeworkTest.java diff --git a/iulia/pom.xml b/iulia/pom.xml index 186ba60..500cb6d 100644 --- a/iulia/pom.xml +++ b/iulia/pom.xml @@ -18,15 +18,15 @@ org.apache.maven.plugins maven-compiler-plugin - 8 - 8 + 14 + 14 - UTF-8 + UTF-81.71.7 diff --git a/iulia/src/main/java/com/imalittletester/homeworks/MonthHomework.java b/iulia/src/main/java/com/imalittletester/homeworks/MonthHomework.java new file mode 100644 index 0000000..b09d1a7 --- /dev/null +++ b/iulia/src/main/java/com/imalittletester/homeworks/MonthHomework.java @@ -0,0 +1,32 @@ +package com.imalittletester.homeworks; + +public class MonthHomework { + + public boolean checkIfLastDayOfMonth(String monthName, int dayNumber) { + boolean result; + + if (monthName.equals("April")|| monthName.equals("June")|| monthName.equals("September")|| monthName.equals("November")) { + result = dayNumber ==30; + return result; + } + if (monthName.equals("February")) { + result = dayNumber==28; + } + else { + result = dayNumber == 31; + } + return result; + } + public int countNumbersDivided(int maxLimit) { + int count = 0; + for (int i = 1; i <= maxLimit; i++) { + if (i % 7 == 0) + { + count++; + } + } + return count; + } + } + + diff --git a/iulia/src/main/java/com/imalittletester/jam/Jam.java b/iulia/src/main/java/com/imalittletester/jam/Jam.java index e5f6d0e..2268dc4 100644 --- a/iulia/src/main/java/com/imalittletester/jam/Jam.java +++ b/iulia/src/main/java/com/imalittletester/jam/Jam.java @@ -28,21 +28,66 @@ public Jam(String sweetener) { public void makeJam() { System.out.println("Adding " + sweetenerQty + " " + sweetenerUom + " " + "of " + sweetener); System.out.println("Is jam dietetic? " + isDietetic); + System.out.println(isDietetic ? "Is jam dietetic? Yes" : "Is jam dietetic? No"); + + } +//ifs + public double qtyGramsUsingIf(String uom, double qty) { + double mustMultiplyBy = 1; + if (uom.equalsIgnoreCase( "kg")|| uom.equalsIgnoreCase("kilograms")) { + mustMultiplyBy = 1000; + } + if (uom.equalsIgnoreCase("micrograms")) { + mustMultiplyBy = 0.0001; + } + return qty * mustMultiplyBy; } - @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); + + public double qtyInGramsUsingIfSimple (String uom, double qty) { + if (uom.equalsIgnoreCase("kg") || uom.equalsIgnoreCase("kilograms")) { + return qty * 1000; + } + 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/100;} + } + return valueToReturn; } - @Override - public int hashCode() { - return Objects.hash(sweetener, sweetenerQty, sweetenerUom, isDietetic); + //simple switch + public double qtyInGramsUsingSwitchSimple (String uom, double qty) { + switch (uom.toLowerCase()) { + case "kg", "kilograms" -> {return qty * 1000;} + case "grams" -> {return qty;} + case "micrograms" -> {return qty/100;} + default -> {return 0;} + } } + // + // + //@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/iulia/src/test/java/com/imalittletester/jam/ApricotJamTest.java b/iulia/src/test/java/com/imalittletester/jam/ApricotJamTest.java index 95dd27c..7dce6a9 100644 --- a/iulia/src/test/java/com/imalittletester/jam/ApricotJamTest.java +++ b/iulia/src/test/java/com/imalittletester/jam/ApricotJamTest.java @@ -5,6 +5,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; +import javax.swing.plaf.synth.SynthOptionPaneUI; import java.util.Date; @TestMethodOrder(MethodOrderer.OrderAnnotation.class) public class ApricotJamTest { @@ -20,9 +21,9 @@ public class ApricotJamTest { public ApricotJam apricotJam = new ApricotJam(); public ApricotJam apricotJam2 = new ApricotJam(); - public ApricotJam apricotJam3 = new ApricotJam("stevia", 1.5f,"kg", 10, "kg", new Jar(30, 500)); - public ApricotJam apricotJam4 = new ApricotJam("sugar cane", 1.5f,"kg", 10, "kg", new Jar(30, 500)); - public MelonJam melonJam = new MelonJam("plain sugar",10,"kg",10, "kg", new Bottle(20,1000),false); + public ApricotJam apricotJam3 = new ApricotJam("stevia", 1.5f, "kg", 10, "kg", new Jar(30, 500)); + public ApricotJam apricotJam4 = new ApricotJam("sugar cane", 1.5f, "kg", 10, "kg", new Jar(30, 500)); + public MelonJam melonJam = new MelonJam("plain sugar", 10, "kg", 10, "kg", new Bottle(20, 1000), false); @Order(1) @@ -44,6 +45,7 @@ void forthTest() { System.out.println("Is jam made with sugar cane dietetic? " + apricotJam4.isDietetic); } + @Order(2) @Test void secondTest() { @@ -60,11 +62,11 @@ void secondTest() { @Order(3) @Test void firstTest() { - // System.out.println(aPositiveValue); - // System.out.println(aPositiveLong); - // System.out.println(aFloat); - // System.out.println(aDouble); - // System.out.println(aBoolean); + // System.out.println(aPositiveValue); + // System.out.println(aPositiveLong); + // System.out.println(aFloat); + // System.out.println(aDouble); + // System.out.println(aBoolean); //System.out.println(" -->" + aSweetener); System.out.println(apricotJam3.howManyFullJars(2300)); @@ -72,8 +74,70 @@ void firstTest() { System.out.println(apricotJam3.equals(apricotJam2)); } + @Test + void fifthTest() { + System.out.println(apricotJam3.qtyGramsUsingIf("kg", 2.5f)); + System.out.println(apricotJam3.qtyGramsUsingIf("micrograms", 1000)); + System.out.println(apricotJam3.qtyGramsUsingIf("grams", 125)); + + System.out.println("----------------------------------------------"); + System.out.println(apricotJam3.qtyInGramsUsingSwitchSimple("micrograme", 2500)); + System.out.println("------------------------------------------------"); + System.out.println(apricotJam3.qtyInGramsUsingSwitchSimple("grams", 78)); + + + 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!!!"); + + String theMessage = position > 0 ? "Element found on position: " + position : "THERE IS NO ELEMENT!!!"; + String theMessage2 = ""; + if (position > 0) + theMessage2 = "Eelement found on position: " + position; + else theMessage2 = "THERE IS NO ELEMENT!"; + System.out.println(theMessage2); + } + + @Test + void sixthTest() { + for (int i = 0; i < 10; i++) { + System.out.println(i); + } + + System.out.println("---------------------"); + + + //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("---------------------------"); + for (int i = 20; 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 = 1; + while (i < 21) { + if (i % 3 == 0) { + System.out.println(i); + } + i++; + } + } +} diff --git a/iulia/src/test/java/com/imalittletester/jam/MonthHomeworkTest.java b/iulia/src/test/java/com/imalittletester/jam/MonthHomeworkTest.java new file mode 100644 index 0000000..22cea05 --- /dev/null +++ b/iulia/src/test/java/com/imalittletester/jam/MonthHomeworkTest.java @@ -0,0 +1,56 @@ +package com.imalittletester.jam; + +import com.imalittletester.homeworks.MonthHomework; +import org.junit.jupiter.api.Test; + +import java.sql.SQLOutput; + +public class MonthHomeworkTest { + + @Test + void LastDayOfTheMonth() { + MonthHomework monthHomework = new MonthHomework(); + System.out.println(monthHomework.checkIfLastDayOfMonth("April", 28)); + System.out.println(monthHomework.checkIfLastDayOfMonth("September", 30)); + System.out.println(monthHomework.checkIfLastDayOfMonth("July", 31)); + System.out.println(monthHomework.checkIfLastDayOfMonth("August", 26)); + System.out.println(monthHomework.checkIfLastDayOfMonth("February", 28)); + System.out.println(monthHomework.checkIfLastDayOfMonth("February", 24)); + + } + + @Test + void numbersDivideBy7() { + for (int n = 1; n < 222; n++) { + if (n % 7 == 0) + System.out.println(n); + } + } + + @Test + void numbersDivide() { + for (int i = 1; i <= 222; i++) { + if (i / 7 == 1) + System.out.println(i); + } + } + + //@Test + //void numbersDivideSeven(){ + //for (int totalNumber = 222; totalNumber < 0; totalNumber++) { + //if (totalNumber % 7==0) + @Test + void testTen (){ + MonthHomework monthHomework = new MonthHomework(); + System.out.println(monthHomework.countNumbersDivided(35)); + } + + + } + + + + + + + From 5c4f1a17534293a0b65d10b2856f369afe331a25 Mon Sep 17 00:00:00 2001 From: lukacsiulia Date: Wed, 16 Nov 2022 18:39:04 +0200 Subject: [PATCH 17/18] homework 6 and assesment --- .../com/imalittletester/homeworks/Watch.java | 64 ++++++++++ .../com/imalittletester/jam/ApricotJam.java | 84 ------------ .../java/com/imalittletester/jam/Fruit.java | 17 +++ .../java/com/imalittletester/jam/Jam.java | 119 +++++------------ .../com/imalittletester/jam/MelonJam.java | 35 ----- .../jam/{ApricotJamTest.java => JamTest.java} | 70 +--------- .../imalittletester/jam/OperatorsTest.java | 120 +++++++++++++++++- .../com/imalittletester/jam/WatchTest.java | 27 ++++ 8 files changed, 267 insertions(+), 269 deletions(-) create mode 100644 iulia/src/main/java/com/imalittletester/homeworks/Watch.java create mode 100644 iulia/src/main/java/com/imalittletester/jam/Fruit.java rename iulia/src/test/java/com/imalittletester/jam/{ApricotJamTest.java => JamTest.java} (54%) create mode 100644 iulia/src/test/java/com/imalittletester/jam/WatchTest.java diff --git a/iulia/src/main/java/com/imalittletester/homeworks/Watch.java b/iulia/src/main/java/com/imalittletester/homeworks/Watch.java new file mode 100644 index 0000000..e1e3f9e --- /dev/null +++ b/iulia/src/main/java/com/imalittletester/homeworks/Watch.java @@ -0,0 +1,64 @@ +package com.imalittletester.homeworks; + +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.Date; + +public class Watch { + public String timeStamp; + public double stepsToday; + public double stepsThisWeek; + public float distanceToday; + public String distanceUom; + public int calories; + public Date currentTime; + public int idleAlerts; + public float distanceThisWeek; + public int hour; + private int anInt; + + public Watch(String timestamp, double stepsToday, double stepsThisWeek, String distanceUom, int calories, Date currentTime, int idleAlerts, int hour) { + this.timeStamp = timestamp; + this.stepsToday = stepsToday; + this.stepsThisWeek = stepsThisWeek; + this.distanceUom = distanceUom; + this.calories = calories; + this.currentTime = currentTime; + this.idleAlerts = idleAlerts; + this.hour = hour; + } + + public double unitConvertorForOneDay() { + double distanceToday = stepsToday; + if (distanceUom.equalsIgnoreCase("km")) { + return stepsToday / 1408; + } + if (distanceUom.equalsIgnoreCase("miles")) { + return stepsToday / 2000; + } + return distanceToday; + } + + public double unitConvertorForOneWeek() { + double distanceThisWeek = stepsThisWeek; + if (distanceUom.equalsIgnoreCase("km")) { + return stepsThisWeek / 1408; + } + if (distanceUom.equalsIgnoreCase("miles")) { + return stepsThisWeek / 2000; + } + return stepsThisWeek; + } + + public int idleAlerts() { + anInt = hour; + if (anInt >= 06) { + return idleAlerts; + } else { + return 0; + } + } + public void getWatchData() { + System.out.println("Number of steps until: " + timeStamp + " is: " + stepsToday + " You burned " + calories + " calories." + " Total distance today: " + unitConvertorForOneDay() +" " + distanceUom + " " + " Total distance for the week: " + unitConvertorForOneWeek() + distanceUom + " Current date and time is: " + currentTime + "." + " Number of idle alerts: " + idleAlerts()); + } +} diff --git a/iulia/src/main/java/com/imalittletester/jam/ApricotJam.java b/iulia/src/main/java/com/imalittletester/jam/ApricotJam.java index f453857..3f2ff2d 100644 --- a/iulia/src/main/java/com/imalittletester/jam/ApricotJam.java +++ b/iulia/src/main/java/com/imalittletester/jam/ApricotJam.java @@ -1,87 +1,3 @@ -package com.imalittletester.jam; - -import java.util.Objects; - -public class ApricotJam extends Jam { - - //fields - to describe state (ex proprietatile unui obiect) - // - trebuie sa aiba visibility attribute + type (primitiv sau obiect) + si trebuie sa ii dam nume - // - fieldul va fi definit in toate metodele care apartin clasei - // primitive data types - int/ long/ byte/ short etc (numeric integral) - - - public float apricotQty; - public String apricotUom; - - public Jar jar; - - - //method = grupare de linie de cod, deobicei se foloseste in mai multe locuri (se apeleaza metoda) - //constructors = asignam valori fieldurilor definite in obiect - - public ApricotJam() { - } - public ApricotJam(String sweetener) { - super(sweetener); - } - - public ApricotJam(String sweetener, float sweetenerQty, String sweetenerUom, float apricotQty, String apricotUom, Jar jar) { - super(sweetener, sweetenerQty, sweetenerUom); - this.apricotQty = apricotQty; - this.apricotUom = apricotUom; - this.jar = jar; - } - - - - @Override - public void makeJam() { - super.makeJam(); - System.out.println("Also adding " + apricotQty + " " + apricotUom + " of apricots"); - System.out.println("Boiling for "+ preparationTime()+" minutes"); - } - - - //method - private int preparationTime(){ - return 30; - } - //method - @Override - public String toString() { - return "ApricotJam{" + - "sweetener='" + sweetener + '\'' + - ", sweetenerQty=" + sweetenerQty + - ", sweetenerUom='" + sweetenerUom + '\'' + - ", apricotQty=" + apricotQty + - ", apricotUom='" + apricotUom + '\'' + - ", isDietetic=" + isDietetic + - '}'; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - ApricotJam that = (ApricotJam) 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/iulia/src/main/java/com/imalittletester/jam/Fruit.java b/iulia/src/main/java/com/imalittletester/jam/Fruit.java new file mode 100644 index 0000000..9f6bc02 --- /dev/null +++ b/iulia/src/main/java/com/imalittletester/jam/Fruit.java @@ -0,0 +1,17 @@ +package com.imalittletester.jam; + +import java.util.ArrayList; +import java.util.List; + +public class Fruit { + private String name; + private double qty; + private String uom; + + public Fruit(String name, double qty, String uom) { + this.name = name; + this.qty = qty; + this.uom = uom; + } + } + diff --git a/iulia/src/main/java/com/imalittletester/jam/Jam.java b/iulia/src/main/java/com/imalittletester/jam/Jam.java index 2268dc4..c8822d8 100644 --- a/iulia/src/main/java/com/imalittletester/jam/Jam.java +++ b/iulia/src/main/java/com/imalittletester/jam/Jam.java @@ -1,5 +1,8 @@ package com.imalittletester.jam; +import javax.xml.namespace.QName; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; public class Jam { @@ -7,33 +10,55 @@ public class Jam { public String sweetener; public float sweetenerQty; public String sweetenerUom; - public boolean isDietetic; + public Jar jar; - public Jam(String sweetener, float sweetenerQty, String sweetenerUom) { + List fruits = new ArrayList<>(); + + public Jam(String sweetener, float sweetenerQty, String sweetenerUom, boolean isDietetic, Jar jar) { this.sweetener = sweetener; this.sweetenerQty = sweetenerQty; this.sweetenerUom = sweetenerUom; this.isDietetic = isDietetic; - this.isDietetic = sweetener.equals("sucralose")|| sweetener.equals("stevia"); + this.jar = jar; } - public Jam() { + public Jam(String sweetener, float sweetenerQty, String sweetenerUom, boolean isDietetic, Jar jar, List fruits) { + this.sweetener = sweetener; + this.sweetenerQty = sweetenerQty; + this.sweetenerUom = sweetenerUom; + this.isDietetic = isDietetic; + this.jar = jar; + this.fruits = fruits; } + public Jam() { + } public Jam(String sweetener) { this.sweetener = sweetener; } + public Jam(String sweetener, float sweetenerQty, String sweetenerUom) { + this.sweetener = sweetener; + this.sweetenerQty = sweetenerQty; + this.sweetenerUom = sweetenerUom; + this.isDietetic = isDietetic; + this.isDietetic = sweetener.equals("sucralose")|| sweetener.equals("stevia"); + } public void makeJam() { System.out.println("Adding " + sweetenerQty + " " + sweetenerUom + " " + "of " + sweetener); System.out.println("Is jam dietetic? " + isDietetic); System.out.println(isDietetic ? "Is jam dietetic? Yes" : "Is jam dietetic? No"); + } - - + public int howManyFullJars (int jamQtyInGrams) { + return jamQtyInGrams / jar.jarCapacity; } -//ifs + public int remainderJam (int jamQtyInGrams) { + return jamQtyInGrams % jar.jarCapacity; + } + + //ifs public double qtyGramsUsingIf(String uom, double qty) { double mustMultiplyBy = 1; if (uom.equalsIgnoreCase( "kg")|| uom.equalsIgnoreCase("kilograms")) { @@ -64,7 +89,6 @@ public double qtyInGramsUsingSwitch (String uom, double qty) { } return valueToReturn; } - //simple switch public double qtyInGramsUsingSwitchSimple (String uom, double qty) { switch (uom.toLowerCase()) { @@ -74,83 +98,6 @@ public double qtyInGramsUsingSwitchSimple (String uom, double qty) { default -> {return 0;} } } - // - // - //@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); - //} - - - - // exercitiu - - // in Jam class add the following fields: - // public float fruitQty; - // public String fruitUom; - // public String fruitType; - - // delete ApricotJam and MelonJam classes. - // update the constructor Jam in the Jam class with the following: - // public Jam(String sweetener, float sweetenerQty, String sweetenerUom,String fruitType, String fruitUom, float fruitQty, boolean isDietetic) { - // this.fruitType = fruitType; - // this.fruitQty = fruitQty; - // this.fruitUom = fruitUom; - - //update the method in Jam class: - //public void makeJam(){ - // System.out.println("Adding " + sweetenerQty + " " + sweetenerUom + " " + "of " + sweetener); - // System.out.println("Also adding " +fruitQty + " " + fruitUom + " " + fruitType); - // System.out.println("Boiling for "+ preparationTime()+" minutes"); - // System.out.println("Is jam dietetic? " + isDietetic); - - - // update the test class: - // public Jam apricotJam = new Jam(new Jam("sugar cane", 1, "kg","apricot", 3, "kg), ,new Jar(500,30),true ); - // public Jam melonJam = new Jam(new Jam("stevia", 2, "kg","melon", 3, "kg), ,new Bottle(500,30),false ); - - // create new test example: - // void apricotJamTest() { - // apricotJam.makeJam(); - - // void melonJamTest () { - // melonJam.makeJam(); - - - // alta rezolvare ar fi sa facem 2 metode: - //public void makeApricotJam(){ - // System.out.println("Adding " + sweetenerQty + " " + sweetenerUom + " " + "of " + sweetener); - // System.out.println("Also adding " +fruitQty + " " + fruitUom + " " + fruitType); - // System.out.println("Boiling for "+ preparationTime()+" minutes"); - // System.out.println("Is jam dietetic? " + isDietetic); - - //public void makeMelonJam(){ - // System.out.println("Adding " + sweetenerQty + " " + sweetenerUom + " " + "of " + sweetener); - // System.out.println("Adding " + fruitQty + " " + fruitUom + " " + fruitType); - // System.out.println("Bottling in: " + bottle.bottleQty + " of capacity: " + bottle.bottleCapacity); - // System.out.println("Is jam dietetic? " + isDietetic); - - //obiectele raman: - // public Jam apricotJam = new Jam(new Jam("sugar cane", 1, "kg","apricot", 3, "kg), ,new Jar(500,30),true ); - // public Jam melonJam = new Jam(new Jam("stevia", 2, "kg","melon", 3, "kg), ,new Bottle(500,30),false ); - - // create new test example: - // void apricotJamTest() { - // apricotJam.makeApricotJam(); - - // void melonJamTest () { - // melonJam.makeMelonJam(); - - - - } + diff --git a/iulia/src/main/java/com/imalittletester/jam/MelonJam.java b/iulia/src/main/java/com/imalittletester/jam/MelonJam.java index 2f05d84..e69de29 100644 --- a/iulia/src/main/java/com/imalittletester/jam/MelonJam.java +++ b/iulia/src/main/java/com/imalittletester/jam/MelonJam.java @@ -1,35 +0,0 @@ -package com.imalittletester.jam; - -public class MelonJam extends Jam { - - //fields - - public float melonQty; - public String melonUom; - public Bottle bottle; - //constructors - - public MelonJam(String sweetener, float sweetenerQty, String sweetenerUom, float melonQty, String melonUom, Bottle bottle, boolean isDietetic) { - super(sweetener, sweetenerQty,sweetenerUom); - this.melonQty = melonQty; - this.melonUom = melonUom; - this.bottle = bottle; - } - - public MelonJam() { - } - public MelonJam(String sweetener){ - super(sweetener); - } - - //method - @Override - public void makeJam(){ - super.makeJam(); - System.out.println("Adding " + melonQty + " " + melonUom + " of melon"); - System.out.println("Bottling in: " + bottle.bottleQty + " of capacity: " + bottle.bottleCapacity); - } - - } - - diff --git a/iulia/src/test/java/com/imalittletester/jam/ApricotJamTest.java b/iulia/src/test/java/com/imalittletester/jam/JamTest.java similarity index 54% rename from iulia/src/test/java/com/imalittletester/jam/ApricotJamTest.java rename to iulia/src/test/java/com/imalittletester/jam/JamTest.java index 7dce6a9..cfa0f17 100644 --- a/iulia/src/test/java/com/imalittletester/jam/ApricotJamTest.java +++ b/iulia/src/test/java/com/imalittletester/jam/JamTest.java @@ -5,10 +5,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import javax.swing.plaf.synth.SynthOptionPaneUI; import java.util.Date; @TestMethodOrder(MethodOrderer.OrderAnnotation.class) -public class ApricotJamTest { +public class JamTest { public int aPositiveValue = 10; public long aPositiveLong = -1001001; @@ -18,12 +17,10 @@ public class ApricotJamTest { public String aSweetener = "sugar\ncane"; public Date new_Date; - public ApricotJam apricotJam = new ApricotJam(); - public ApricotJam apricotJam2 = new ApricotJam(); - - public ApricotJam apricotJam3 = new ApricotJam("stevia", 1.5f, "kg", 10, "kg", new Jar(30, 500)); - public ApricotJam apricotJam4 = new ApricotJam("sugar cane", 1.5f, "kg", 10, "kg", new Jar(30, 500)); - public MelonJam melonJam = new MelonJam("plain sugar", 10, "kg", 10, "kg", new Bottle(20, 1000), false); + public Jam apricotJam = new Jam(); + public Jam apricotJam2 = new Jam("stevia",1.5f,"kg",true,new Jar(50,400)); + public Jam apricotJam3 = new Jam("sugar cane",1,"kg",false,new Jar(800,40)); + public Jam melonJam = new Jam("plain sugar",2,"kg",false,new Jar(500,20)); @Order(1) @@ -35,14 +32,14 @@ void thirdTest() { System.out.println("avem " + apricotJam3.howManyFullJars(2300) + " borcane pline."); System.out.println("mai raman " + apricotJam3.remainderJam(2300) + "g."); - System.out.println(apricotJam3.equals(apricotJam4)); + System.out.println(apricotJam3.equals(apricotJam2)); } @Test void forthTest() { apricotJam3.makeJam(); System.out.println("Is jam made with stevia dietetic? " + apricotJam3.isDietetic); - System.out.println("Is jam made with sugar cane dietetic? " + apricotJam4.isDietetic); + System.out.println("Is jam made with sugar cane dietetic? " + apricotJam2.isDietetic); } @@ -85,59 +82,6 @@ void fifthTest() { System.out.println("------------------------------------------------"); System.out.println(apricotJam3.qtyInGramsUsingSwitchSimple("grams", 78)); - - 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!!!"); - - String theMessage = position > 0 ? "Element found on position: " + position : "THERE IS NO ELEMENT!!!"; - String theMessage2 = ""; - if (position > 0) - theMessage2 = "Eelement found on position: " + position; - else theMessage2 = "THERE IS NO ELEMENT!"; - System.out.println(theMessage2); - } - - @Test - void sixthTest() { - for (int i = 0; i < 10; i++) { - System.out.println(i); - } - - System.out.println("---------------------"); - - - //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("---------------------------"); - for (int i = 20; 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 = 1; - while (i < 21) { - if (i % 3 == 0) { - System.out.println(i); - } - i++; - } - } } diff --git a/iulia/src/test/java/com/imalittletester/jam/OperatorsTest.java b/iulia/src/test/java/com/imalittletester/jam/OperatorsTest.java index 7aaa35f..46c75f6 100644 --- a/iulia/src/test/java/com/imalittletester/jam/OperatorsTest.java +++ b/iulia/src/test/java/com/imalittletester/jam/OperatorsTest.java @@ -3,6 +3,7 @@ import org.junit.jupiter.api.Test; import javax.lang.model.SourceVersion; +import java.util.*; public class OperatorsTest { @@ -55,6 +56,7 @@ void firstTest() { System.out.println(string1.equals(string2)); } + @Test void secondTest() { int int1 = 1; @@ -79,7 +81,7 @@ void secondTest() { } @Test - void thirdTest () { + void thirdTest() { int int1 = 1; //int1 = int1 + 10; int1 += 10; @@ -93,7 +95,123 @@ void thirdTest () { System.out.println(1 == 2); System.out.println(1 != 2); + } + + //Lists + @Test + void collectionTest() { + List lista1 = new ArrayList<>(); + System.out.println(lista1.isEmpty()); + lista1.add("Cluj"); + lista1.add("Oradea"); + 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, 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); + + for (Integer numarInLista : listaDeNumere) { + if (numarInLista % 7 == 0) { + number2++; + } + } + System.out.println("number 2..." + number2); + } + //Map + @Test + void mapTest() { + Map simpleMap = new HashMap<>(); + simpleMap.put("first", 1); + System.out.println("simpleMap= " + simpleMap); + + Map anotherMap = Map.of("firstKey", 1, "secondKey", 2, "thirdKey", 3); + System.out.println("anotherMap = " + anotherMap); + System.out.println("Is value present? " + anotherMap.containsValue(3)); + System.out.println("Is key present" + anotherMap.containsKey("secondKey")); + System.out.println("The value of second key 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); } + void sixthTest() { + for (int i = 0; i < 10; i++) { + System.out.println(i); + } + + System.out.println("---------------------"); + + + //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("---------------------------"); + for (int i = 20; 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 = 1; + while (i < 21) { + if (i % 3 == 0) { + System.out.println(i); + } + i++; + } + + 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!!!"); + + String theMessage = position > 0 ? "Element found on position: " + position : "THERE IS NO ELEMENT!!!"; + String theMessage2 = ""; + if (position > 0) + theMessage2 = "Eelement found on position: " + position; + else theMessage2 = "THERE IS NO ELEMENT!"; + System.out.println(theMessage2); + } } + diff --git a/iulia/src/test/java/com/imalittletester/jam/WatchTest.java b/iulia/src/test/java/com/imalittletester/jam/WatchTest.java new file mode 100644 index 0000000..2d4cc06 --- /dev/null +++ b/iulia/src/test/java/com/imalittletester/jam/WatchTest.java @@ -0,0 +1,27 @@ +package com.imalittletester.jam; + +import com.imalittletester.homeworks.Watch; +import org.junit.jupiter.api.Test; + +import java.sql.Timestamp; +import java.util.Date; + +public class WatchTest { + + public Watch watchData1 = new Watch("2022-11-17 12:23",3555,50000,"km",345,new Date(2022,18,17),5,12); + public Watch watchData2 = new Watch("2022-11-17 13:45",3555,50000,"miles",345,new Date(2022,18,17),5,13); + public Watch watchData3 = new Watch("2022-11-17 20:30",5096,54848,"km",567,new Date(2022,18,17),5,05); + + + @Test + void firstTest() { + watchData1.getWatchData(); + System.out.println("---------------------"); + watchData2.getWatchData(); + System.out.println("---------------------"); + watchData3.getWatchData(); + } + +} + + From a65e11c9b3f492ec2c71445d6384ff5b5a418c69 Mon Sep 17 00:00:00 2001 From: lukacsiulia Date: Wed, 16 Nov 2022 18:45:47 +0200 Subject: [PATCH 18/18] homework 6 and assesment --- .../src/main/java/com/imalittletester/homeworks/Watch.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/iulia/src/main/java/com/imalittletester/homeworks/Watch.java b/iulia/src/main/java/com/imalittletester/homeworks/Watch.java index e1e3f9e..e7628c9 100644 --- a/iulia/src/main/java/com/imalittletester/homeworks/Watch.java +++ b/iulia/src/main/java/com/imalittletester/homeworks/Watch.java @@ -59,6 +59,11 @@ public int idleAlerts() { } } public void getWatchData() { - System.out.println("Number of steps until: " + timeStamp + " is: " + stepsToday + " You burned " + calories + " calories." + " Total distance today: " + unitConvertorForOneDay() +" " + distanceUom + " " + " Total distance for the week: " + unitConvertorForOneWeek() + distanceUom + " Current date and time is: " + currentTime + "." + " Number of idle alerts: " + idleAlerts()); + System.out.println("Number of steps until: " + timeStamp + " is: " + stepsToday); + System.out.println("Calories burned: " + calories); + System.out.println("Distance today: " + unitConvertorForOneDay() + " " + distanceUom); + System.out.println("Distance this week: " + unitConvertorForOneWeek()+" " + distanceUom); + System.out.println("Current date: " + currentTime); + System.out.println("Number of idle alerts: " + idleAlerts()); } }