diff --git a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_2.xml similarity index 60% rename from .idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml rename to .idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_2.xml index f854ab0..6ac1c42 100644 --- a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml +++ b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_2.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_1.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_2.xml similarity index 57% rename from .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_1.xml rename to .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_2.xml index cbbc09f..4f367e7 100644 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_1.xml +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_8_2.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_2.xml new file mode 100644 index 0000000..8e50783 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_8_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_1.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_2.xml similarity index 67% rename from .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_1.xml rename to .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_2.xml index f17fef7..fc8291b 100644 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_1.xml +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_8_2.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_8_2.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_8_2.xml new file mode 100644 index 0000000..4b3ffb1 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_8_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_1.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_2.xml similarity index 67% rename from .idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_1.xml rename to .idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_2.xml index 1ded6d5..181d095 100644 --- a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_1.xml +++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_8_2.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_1.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_2.xml similarity index 67% rename from .idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_1.xml rename to .idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_2.xml index 983d973..5f3aebe 100644 --- a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_1.xml +++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_8_2.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..797acea --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GUI_basic.iml b/GUI_basic.iml index f3ced4f..948099b 100644 --- a/GUI_basic.iml +++ b/GUI_basic.iml @@ -6,6 +6,7 @@ + @@ -37,11 +38,13 @@ - - + + - - - + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 05a2c4a..2f72b2c 100644 --- a/pom.xml +++ b/pom.xml @@ -60,6 +60,7 @@ org.junit.jupiter junit-jupiter + 5.8.2 test diff --git a/src/main/java/InterfaceExample/App.java b/src/main/java/InterfaceExample/App.java new file mode 100644 index 0000000..f336357 --- /dev/null +++ b/src/main/java/InterfaceExample/App.java @@ -0,0 +1,15 @@ +package InterfaceExample; + +import java.io.IOException; + +public class App { + + public static void main(String[] args) throws IOException { + + UIForApp UI = new UIForApp(); + Database Database = new Database(); + + Logic Application = new Logic(UI,Database); + Application.Start(); + } +} diff --git a/src/main/java/InterfaceExample/DatabaseAccess.java b/src/main/java/InterfaceExample/DatabaseAccess.java new file mode 100644 index 0000000..a9a6a75 --- /dev/null +++ b/src/main/java/InterfaceExample/DatabaseAccess.java @@ -0,0 +1,13 @@ +package InterfaceExample; + +public interface DatabaseAccess { + + void SetData1(int a); + void SetData2(int a); + + int GetData1(); + int GetData2(); + + boolean SaveData(int a,int b); + boolean ResetData(); +} diff --git a/src/main/java/InterfaceExample/Logic.java b/src/main/java/InterfaceExample/Logic.java new file mode 100644 index 0000000..5f0b5ef --- /dev/null +++ b/src/main/java/InterfaceExample/Logic.java @@ -0,0 +1,146 @@ +package InterfaceExample; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; + +class Database implements DatabaseAccess +{ + + private int data1; + private int data2; + + @Override + public void SetData1(int a) { data1 = a; } + + @Override + public void SetData2(int a) { data2 = a; } + + @Override + public int GetData1() { return data1; } + + @Override + public int GetData2() { return data2; } + + @Override + public boolean SaveData(int a, int b) { + data1 = a; + data2 = b; + return true; + } + + @Override + public boolean ResetData() { + data1 = 0; + data2 = 0; + return true; + } +} + +class UIForApp implements UI +{ + private String menu; + private String message; + public String choice = ""; + + @Override + public void showMenu() { + + System.out.println(menu); + + } + + @Override + public void setMenuMessage(String s) { menu = s; } + + @Override + public void showMessage() { + System.out.println(message); + } + + @Override + public void setMessage(String s) { message = s; } + + @Override + public void close() { System.exit(0); } + + @Override + public String getChoice() throws IOException { + + setMenuMessage("Please select the action you want to take:" + + "\n" + + "A: Save data" + + "\n" + + "B: Reset data" + + "\n" + + "X: Exit"); + + showMenu(); + + switch (choice = getUserInput()) { + case "A": + setMessage("Please provide the numbers to store in the database!"); + showMessage(); + break; + case "B": + setMessage("You chose reset database!"); + showMessage(); + break; + case "X": + setMessage("Thank you, bye!"); + showMessage(); + break; + default: + setMessage("Not valid choice" + + "\n" + + "Please choose again!"); + showMessage(); + } + return choice; + } + + @Override + public String getUserInput() + throws IOException + { + // Enter data using BufferReader + BufferedReader reader = new BufferedReader( + new InputStreamReader(System.in)); + + // Reading data using readLine + String choice = reader.readLine(); + + return choice; + } +} + +public class Logic { + + Logic(UI a, DatabaseAccess b) + { + UI = a; + Database = b; + } + + private UI UI; + private DatabaseAccess Database; + + public void Start() throws IOException + { + while(true) + { + if ( UI.getChoice() == "A" ) + { + Database.SaveData(0,0); + } + else if (UI.getChoice() == "B") + { + Database.ResetData(); + } + else if ( UI.getChoice() == "X" ) + { + UI.close(); + } + } + } + +} diff --git a/src/main/java/InterfaceExample/UI.java b/src/main/java/InterfaceExample/UI.java new file mode 100644 index 0000000..88204c2 --- /dev/null +++ b/src/main/java/InterfaceExample/UI.java @@ -0,0 +1,16 @@ +package InterfaceExample; + +import java.io.IOException; + +public interface UI { + + void showMenu (); + void setMenuMessage(String s); + void showMessage(); + void setMessage(String s); + void close(); + + String getChoice() throws IOException; + String getUserInput() throws IOException; + +} diff --git a/src/main/java/com/example/gui_basic/BiggestNumber.java b/src/main/java/com/example/gui_basic/BiggestNumber.java index bdbced8..c860b8c 100644 --- a/src/main/java/com/example/gui_basic/BiggestNumber.java +++ b/src/main/java/com/example/gui_basic/BiggestNumber.java @@ -4,10 +4,10 @@ // Importing generic Classes/Files -class BiggestNumber { +public class BiggestNumber { // Function to find the biggest of three numbers - static int biggestOfThree(int x, int y, int z) + public static int biggestOfThree(int x, int y, int z) { return z > (x > y ? x : y) ? z : ((x > y) ? x : y); diff --git a/src/main/java/com/example/gui_basic/GUI_basic.java b/src/main/java/com/example/gui_basic/GUI_basic.java index ebcfa84..920de29 100644 --- a/src/main/java/com/example/gui_basic/GUI_basic.java +++ b/src/main/java/com/example/gui_basic/GUI_basic.java @@ -113,7 +113,7 @@ public void start(Stage primaryStage) throws Exception { okGomb.setOnAction(eventB); } // *************************************************************************************Teszt Adatok************************************************************** - private void tesztAdatok() { + public void tesztAdatok() { szuletesNap.setValue(LocalDate.of(2021, 12, 19)); utazasNap.setValue (LocalDate.of(2022, 10, 19)); diff --git a/src/main/java/com/example/gui_basic/util.java b/src/main/java/com/example/gui_basic/util.java index 55f3c03..4aa550b 100644 --- a/src/main/java/com/example/gui_basic/util.java +++ b/src/main/java/com/example/gui_basic/util.java @@ -15,18 +15,20 @@ public void hiba(String ablakCim, String hibaUzenet) { Optional answer = confirm.showAndWait(); } - +// Tesztelt public String kedvezmenyesArSzamolo(String alapErtek, int szazalek) { return String.valueOf(Integer.parseInt(alapErtek) - (Integer.parseInt(alapErtek) * szazalek / 100)); } - boolean Ketto_tizennyolcE(int ev) { + //Tesztelt + public boolean Ketto_tizennyolcE(int ev) { - return ev > 2 && ev < 18 ? true : false; + return ev > 2 && ev <= 18 ? true : false; } - - boolean keteves(int ev) { + //Tesztelt + public boolean keteves(int ev) { return ev <= 2 ? true : false;} + //Tesztelt public boolean uresEdatum(LocalDate datum) { System.out.println("datum = " + datum); return datum == null ? false : true; diff --git a/src/main/java/module-info.java b/src/module-info.java similarity index 93% rename from src/main/java/module-info.java rename to src/module-info.java index c6d3c81..1ffdf00 100644 --- a/src/main/java/module-info.java +++ b/src/module-info.java @@ -5,6 +5,7 @@ requires org.controlsfx.controls; requires validatorfx; requires org.kordamp.ikonli.javafx; + requires junit; opens com.example.gui_basic to javafx.fxml; exports com.example.gui_basic; diff --git a/src/test/java/testBiggestNumber.java b/src/test/java/testBiggestNumber.java new file mode 100644 index 0000000..40562b1 --- /dev/null +++ b/src/test/java/testBiggestNumber.java @@ -0,0 +1,38 @@ +import com.example.gui_basic.BiggestNumber; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class testBiggestNumber { + BiggestNumber biggestNumber = null ; + + @BeforeEach + public void init(){ + biggestNumber = new BiggestNumber(); + + } + @Test + public void tesztBiggestNumber(){ + assertEquals(10, biggestNumber.biggestOfThree(5,10,3)); + assertEquals(10, biggestNumber.biggestOfThree(10,5,3)); + assertEquals(10, biggestNumber.biggestOfThree(10,3,5)); + assertEquals(10, biggestNumber.biggestOfThree(5,3,10)); + assertEquals(10, biggestNumber.biggestOfThree(3,5,10)); + assertEquals(5, biggestNumber.biggestOfThree(5,5,5 )); + assertEquals(10, biggestNumber.biggestOfThree(10,10,10 )); + assertEquals(3, biggestNumber.biggestOfThree(3,3,3)); + + /*abc 5-10-3 + bac 10-5-3 + bca 10-3-5 + acb 5-3-10 + cab 3-5-10 + aaa 5-5-5 + bbb 10-10-10 + ccc 3-3-3 + */ + } + + +} diff --git a/src/test/java/testUtil.java b/src/test/java/testUtil.java new file mode 100644 index 0000000..66db48a --- /dev/null +++ b/src/test/java/testUtil.java @@ -0,0 +1,52 @@ +import com.example.gui_basic.util; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class testUtil{ + util util = null; + + @BeforeEach + public void init(){ + util=new util(); + } + + @Test + public void testuresEdatum(){ + assertEquals(true, util.Ketto_tizennyolcE(5)); + assertEquals(false, util.Ketto_tizennyolcE(2)); + assertEquals(true, util.Ketto_tizennyolcE(18)); + assertEquals(false, util.Ketto_tizennyolcE(19)); + assertEquals(false, util.Ketto_tizennyolcE(1)); + assertEquals(false, util.Ketto_tizennyolcE(-1)); + assertEquals(false, util.Ketto_tizennyolcE(2)); + + } + @Test + public void tesztKeteves(){ + assertEquals(true, util.keteves(0)); + assertEquals(true, util.keteves(2)); + assertEquals(false, util.keteves(3)); + //assertEquals(false, util.keteves(-1)); + } + @Test + public void tesztKedvezmenyesArSzamolo(){ + // 2 év alatti gyerekek ingyen utaznak + assertEquals("0", util.kedvezmenyesArSzamolo("1000",100)); + //2-18 év közötti utasok 40% kedvezményt kapnak minden úticélra + assertEquals("600", util.kedvezmenyesArSzamolo("1000",40)); + // Utasok, akik legalább 6 napot maradnak a célországban, újabb 10% kedvezményt kapnak + assertEquals("900", util.kedvezmenyesArSzamolo("1000",10)); + assertEquals("500", util.kedvezmenyesArSzamolo("1000",50)); + //Amerikába, de nem az USA-ba utazó vendégek 25% kedvezményt kapnak ha nem hétfőn vagy pénteken utaznak + assertEquals("750", util.kedvezmenyesArSzamolo("1000",25)); + //18 évesnél idősebb USA-ba utazó vendégek 20% kedvezményt kapnak, ha nem hétfőn vagy pénteken utaznak (indulási idő). + assertEquals("800", util.kedvezmenyesArSzamolo("1000",20)); + + + } + @Test + public void tesztUresEdatum(){ + assertEquals(false, util.uresEdatum(null)); + } +} diff --git a/target/classes/InterfaceExample/App.class b/target/classes/InterfaceExample/App.class new file mode 100644 index 0000000..c171f58 Binary files /dev/null and b/target/classes/InterfaceExample/App.class differ diff --git a/target/classes/InterfaceExample/Database.class b/target/classes/InterfaceExample/Database.class new file mode 100644 index 0000000..f1e9c27 Binary files /dev/null and b/target/classes/InterfaceExample/Database.class differ diff --git a/target/classes/InterfaceExample/DatabaseAccess.class b/target/classes/InterfaceExample/DatabaseAccess.class new file mode 100644 index 0000000..efd74a2 Binary files /dev/null and b/target/classes/InterfaceExample/DatabaseAccess.class differ diff --git a/target/classes/InterfaceExample/Logic.class b/target/classes/InterfaceExample/Logic.class new file mode 100644 index 0000000..43081ad Binary files /dev/null and b/target/classes/InterfaceExample/Logic.class differ diff --git a/target/classes/InterfaceExample/UI.class b/target/classes/InterfaceExample/UI.class new file mode 100644 index 0000000..6002e43 Binary files /dev/null and b/target/classes/InterfaceExample/UI.class differ diff --git a/target/classes/InterfaceExample/UIForApp.class b/target/classes/InterfaceExample/UIForApp.class new file mode 100644 index 0000000..145a863 Binary files /dev/null and b/target/classes/InterfaceExample/UIForApp.class differ diff --git a/target/classes/com/example/gui_basic/AddMatrices.class b/target/classes/com/example/gui_basic/AddMatrices.class new file mode 100644 index 0000000..d7c2f68 Binary files /dev/null and b/target/classes/com/example/gui_basic/AddMatrices.class differ diff --git a/target/classes/com/example/gui_basic/BiggestNumber.class b/target/classes/com/example/gui_basic/BiggestNumber.class new file mode 100644 index 0000000..807c767 Binary files /dev/null and b/target/classes/com/example/gui_basic/BiggestNumber.class differ diff --git a/target/classes/com/example/gui_basic/CopyFiles.class b/target/classes/com/example/gui_basic/CopyFiles.class new file mode 100644 index 0000000..50f44b7 Binary files /dev/null and b/target/classes/com/example/gui_basic/CopyFiles.class differ diff --git a/target/classes/com/example/gui_basic/DecimalToBinary.class b/target/classes/com/example/gui_basic/DecimalToBinary.class new file mode 100644 index 0000000..d03c983 Binary files /dev/null and b/target/classes/com/example/gui_basic/DecimalToBinary.class differ diff --git a/target/classes/com/example/gui_basic/Dog.class b/target/classes/com/example/gui_basic/Dog.class new file mode 100644 index 0000000..22f3004 Binary files /dev/null and b/target/classes/com/example/gui_basic/Dog.class differ diff --git a/target/classes/com/example/gui_basic/Encapsulate.class b/target/classes/com/example/gui_basic/Encapsulate.class new file mode 100644 index 0000000..c87eda8 Binary files /dev/null and b/target/classes/com/example/gui_basic/Encapsulate.class differ diff --git a/target/classes/com/example/gui_basic/Encapsulation.class b/target/classes/com/example/gui_basic/Encapsulation.class new file mode 100644 index 0000000..48007d9 Binary files /dev/null and b/target/classes/com/example/gui_basic/Encapsulation.class differ diff --git a/target/classes/com/example/gui_basic/GFG.class b/target/classes/com/example/gui_basic/GFG.class new file mode 100644 index 0000000..8e73a0e Binary files /dev/null and b/target/classes/com/example/gui_basic/GFG.class differ diff --git a/target/classes/com/example/gui_basic/GUI_basic.class b/target/classes/com/example/gui_basic/GUI_basic.class index 3e65e84..be4e899 100644 Binary files a/target/classes/com/example/gui_basic/GUI_basic.class and b/target/classes/com/example/gui_basic/GUI_basic.class differ diff --git a/target/classes/com/example/gui_basic/LeapYear.class b/target/classes/com/example/gui_basic/LeapYear.class new file mode 100644 index 0000000..06ee85e Binary files /dev/null and b/target/classes/com/example/gui_basic/LeapYear.class differ diff --git a/target/classes/com/example/gui_basic/RectanglePerimeter.class b/target/classes/com/example/gui_basic/RectanglePerimeter.class new file mode 100644 index 0000000..ad9c805 Binary files /dev/null and b/target/classes/com/example/gui_basic/RectanglePerimeter.class differ diff --git a/target/classes/com/example/gui_basic/Singleton.class b/target/classes/com/example/gui_basic/Singleton.class new file mode 100644 index 0000000..a233277 Binary files /dev/null and b/target/classes/com/example/gui_basic/Singleton.class differ diff --git a/target/classes/com/example/gui_basic/util.class b/target/classes/com/example/gui_basic/util.class index fa04a62..19bd07a 100644 Binary files a/target/classes/com/example/gui_basic/util.class and b/target/classes/com/example/gui_basic/util.class differ diff --git a/target/classes/module-info.class b/target/classes/module-info.class deleted file mode 100644 index 327d37e..0000000 Binary files a/target/classes/module-info.class and /dev/null differ diff --git a/target/test-classes/testBiggestNumber.class b/target/test-classes/testBiggestNumber.class new file mode 100644 index 0000000..08336ad Binary files /dev/null and b/target/test-classes/testBiggestNumber.class differ diff --git a/target/test-classes/testUtil.class b/target/test-classes/testUtil.class new file mode 100644 index 0000000..544d148 Binary files /dev/null and b/target/test-classes/testUtil.class differ