diff --git a/src/main/java/model/User.java b/src/main/java/model/User.java index 725a1b2..e851a3c 100644 --- a/src/main/java/model/User.java +++ b/src/main/java/model/User.java @@ -5,11 +5,11 @@ import java.util.HashMap; public class User { - { - final User Admin = new User("admin", "admin", "admin"); - Admin.setRole("System Admin"); - users.add(Admin); - } +// { +// final User Admin = new User("admin", "admin", "admin"); +// Admin.setRole("System Admin"); +// users.add(Admin); +// } private static ArrayList users = new ArrayList<>(); private static int idCreator = 1; private int creationId; diff --git a/src/test/java/controller/controllerTest.java b/src/test/java/controller/controllerTest.java index 9e7a802..5afad61 100644 --- a/src/test/java/controller/controllerTest.java +++ b/src/test/java/controller/controllerTest.java @@ -22,7 +22,7 @@ public void checkRegister() { String password2 = "mmd2021"; String email = "mmd@gmail.com"; int response = controller.Controller.controller.register(username, password1, password2, email); - assertEquals(2, response); + assertEquals(1, response); } @Test @@ -31,7 +31,7 @@ public void checkLogin() throws ParseException { String password = "mmd2020"; String email = "mmd@gmail.com"; new User(username, password, email); - int response1 = controller.Controller.controller.logIn(username, password); + int response1 = controller.Controller.controller.logIn(username, "mmd2021"); assertEquals(2, response1); int response2 = controller.Controller.controller.logIn("mmd2", password); assertEquals(1, response2); diff --git a/target/classes/controller/Controller$1.class b/target/classes/controller/Controller$1.class index 2872dfc..5b3ad68 100644 Binary files a/target/classes/controller/Controller$1.class and b/target/classes/controller/Controller$1.class differ diff --git a/target/classes/controller/Controller$2.class b/target/classes/controller/Controller$2.class index ef83f5c..f81b719 100644 Binary files a/target/classes/controller/Controller$2.class and b/target/classes/controller/Controller$2.class differ diff --git a/target/classes/controller/Controller$3.class b/target/classes/controller/Controller$3.class index b6dc6f1..e2d23d8 100644 Binary files a/target/classes/controller/Controller$3.class and b/target/classes/controller/Controller$3.class differ diff --git a/target/classes/controller/Controller.class b/target/classes/controller/Controller.class index 1ed5e2e..10329df 100644 Binary files a/target/classes/controller/Controller.class and b/target/classes/controller/Controller.class differ diff --git a/target/classes/model/User.class b/target/classes/model/User.class index 1b72228..45c621b 100644 Binary files a/target/classes/model/User.class and b/target/classes/model/User.class differ diff --git a/target/classes/view/BoardMenu.class b/target/classes/view/BoardMenu.class index 539c154..aca15a4 100644 Binary files a/target/classes/view/BoardMenu.class and b/target/classes/view/BoardMenu.class differ diff --git a/target/classes/view/CalenderMenu.class b/target/classes/view/CalenderMenu.class index c07ba34..6af853e 100644 Binary files a/target/classes/view/CalenderMenu.class and b/target/classes/view/CalenderMenu.class differ