Made some improvements to clean design and testing

Author: parmism

accounts

@@ -6,7 +6,6 @@
 import interface_adapters.login_interface_adapters.Login;
 import use_cases.user_attribute_modification_use_case.Changeable;
 import interface_adapters.app_screen_interface_adapters.UserAppScreenGateway;
-import entities.chat.*;
 
 import java.io.File;
 import java.io.Serializable;
@@ -42,12 +41,16 @@ public ArrayList<Chat> getUserChats(){
     @Override
 //    from Changeable
     public void changeFeature(String feature, String newFeature){
-        if (feature == "Username"){
-            this.username = newFeature;
-        } else if (feature == "Password"){
-            this.password = newFeature;
-        } else if (feature == "Email"){
-            this.email = newFeature;
+        switch (feature) {
+            case "Username":
+                this.username = newFeature;
+                break;
+            case "Password":
+                this.password = newFeature;
+                break;
+            case "Email":
+                this.email = newFeature;
+                break;
         }
     }
 

src/main/java/entities/user_entities/User.java

@@ -1,17 +1,19 @@
-package screens.profile_update_screen; /**
- * Provides the UI elements
- */
-import data_access.UserDatabase;
-import entities.user_entities.User;
-import interface_adapters.profile_modification_IA.ChangeController;
+package screens.profile_update_screen;
+import interface_adapters.profile_modification_IA.ChangeControllerClass;
 
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.Objects;
 
-public class UserModificationUI implements ChangeController {
-    private JLabel label;
+
+/**
+ * Provides the UI elements
+ */
+public class UserModificationUI {
+    ChangeControllerClass c = new ChangeControllerClass();
+    private final JLabel label;
     public UserModificationUI() {
         final JFrame frame = new JFrame();
         frame.setSize(500, 300);
@@ -47,9 +49,9 @@ public UserModificationUI() {
             public void actionPerformed(ActionEvent e) {
                 String username = (usernameField.getText());
                 String password = (passwordField.getText());
-                String item = cb.getSelectedItem().toString();
+                String item = Objects.requireNonNull(cb.getSelectedItem()).toString();
                 String newFeature = (newFeatureField.getText());
-                boolean success = reportChange(username, password, item, newFeature);
+                boolean success = c.reportChange(username, password, item, newFeature);
                 if (success){
                     label.setText("Your " + item + " was successfully changed.");
                 }
@@ -74,28 +76,5 @@ public void actionPerformed(ActionEvent e) {
 
         frame.setVisible(true);
     }
-    /**
-     * profile_modification_IA.ChangeController makes UI implement reportChange to invert the use-case --> UI dependency
-     */
-    @Override
-    public boolean reportChange(String username, String password, String feature, String newFeature) {
-        UserDatabase db = new UserDatabase();
-        if (db.UserExists(username)){
-            User user = db.getUser(username);
-            if (user.PasswordMatch(password) & user.getUsername().equals(username)){
-                user.changeFeature(feature, newFeature);
-                // this serializes the change
-                db.modifyUser(username, user);
-                return true;
-            }
-        }
-        return false;
-    }
-
-// for trying out the code:
-//    public static void main(String[] args) {
-//        new profile_update_screen.UserModificationUI();
-//
-//    }
 
 }

src/main/java/screens/profile_update_screen/UserModificationUI.java

@@ -1,18 +1,50 @@
 import data_access.UserDatabase;
 import org.junit.jupiter.api.Assertions;
-import screens.profile_update_screen.UserModificationUI;
-import org.junit.jupiter.api.Assertions;
+import interface_adapters.profile_modification_IA.ChangeControllerClass;
 import org.junit.jupiter.api.Test;
 
+/**
+ * Simple tests of User modification for all attribuites.
+ */
 public class TestUserChange {
     @Test
-    public void correctChange() {
+    public void emailChange() {
         UserDatabase db = new UserDatabase();
+        ChangeControllerClass c = new ChangeControllerClass();
         db.createUser("parmism", "123", "[email protected]", "Basic");
-        UserModificationUI ui = new UserModificationUI();
-        ui.reportChange("parmism", "123", "Email", "[email protected]");
+        c.reportChange("parmism", "123", "Email", "[email protected]");
         UserDatabase db2 = new UserDatabase();
         String actual = db2.getUser("parmism").getEmail();
         Assertions.assertEquals("[email protected]", actual);
     }
+
+    @Test
+    public void passwordChange() {
+        UserDatabase db = new UserDatabase();
+        ChangeControllerClass c = new ChangeControllerClass();
+        db.createUser("parmism", "123", "[email protected]", "Basic");
+        c.reportChange("parmism", "123", "Password", "456");
+        UserDatabase db2 = new UserDatabase();
+        Assertions.assertTrue(db2.getUser("parmism").PasswordMatch("456"));
+    }
+
+    @Test
+    public void oldUsernameRemoved() {
+        UserDatabase db = new UserDatabase();
+        ChangeControllerClass c = new ChangeControllerClass();
+        db.createUser("badUsername", "123", "[email protected]", "Basic");
+        c.reportChange("badUsername", "123", "Username", "goodUsername");
+        UserDatabase db2 = new UserDatabase();
+        Assertions.assertFalse(db2.UserExists("badUsername"));
+    }
+
+    @Test
+    public void newUsernameInDB() {
+        UserDatabase db = new UserDatabase();
+        ChangeControllerClass c = new ChangeControllerClass();
+        db.createUser("badUsername", "123", "[email protected]", "Basic");
+        c.reportChange("badUsername", "123", "Username", "goodUsername");
+        UserDatabase db2 = new UserDatabase();
+        Assertions.assertTrue(db2.UserExists("goodUsername"));
+    }
 }