Browse Source

refactoring: removed some not needed comments in CreateUserTest and fixed indentations

remotes/origin/hotfix/client/improve-chat-window-appearence
Richard Schmidt 11 months ago
parent
commit
972997fa35
  1. 14
      src/main/java/SignUpGUI.java
  2. 12
      src/test/java/CreateUserTest.java

14
src/main/java/SignUpGUI.java

@ -36,7 +36,7 @@ public class SignUpGUI extends JFrame implements ActionListener {
public SignUpGUI() { public SignUpGUI() {
setTitle("Sign Up"); setTitle("Sign Up");
setSize(400, 300); // Adjusted size for accommodating more fields
setSize(400, 300);
setDefaultCloseOperation(EXIT_ON_CLOSE); setDefaultCloseOperation(EXIT_ON_CLOSE);
setLayout(null); setLayout(null);
@ -64,7 +64,7 @@ public class SignUpGUI extends JFrame implements ActionListener {
confirmPasswordField.setBounds(140, 80, 160, 25); confirmPasswordField.setBounds(140, 80, 160, 25);
add(confirmPasswordField); add(confirmPasswordField);
JLabel firstNameLabel = new JLabel("First Name:"); // New field for first name
JLabel firstNameLabel = new JLabel("First Name:");
firstNameLabel.setBounds(20, 110, 80, 25); firstNameLabel.setBounds(20, 110, 80, 25);
add(firstNameLabel); add(firstNameLabel);
@ -72,7 +72,7 @@ public class SignUpGUI extends JFrame implements ActionListener {
firstNameField.setBounds(140, 110, 160, 25); firstNameField.setBounds(140, 110, 160, 25);
add(firstNameField); add(firstNameField);
JLabel surnameLabel = new JLabel("Surname:"); // New field for surname
JLabel surnameLabel = new JLabel("Surname:");
surnameLabel.setBounds(20, 140, 80, 25); surnameLabel.setBounds(20, 140, 80, 25);
add(surnameLabel); add(surnameLabel);
@ -89,7 +89,7 @@ public class SignUpGUI extends JFrame implements ActionListener {
add(birthdayField); add(birthdayField);
signUpButton = new JButton("Sign Up"); signUpButton = new JButton("Sign Up");
signUpButton.setBounds(140, 210, 100, 25); // Adjusted position
signUpButton.setBounds(140, 210, 100, 25);
signUpButton.addActionListener(this); signUpButton.addActionListener(this);
add(signUpButton); add(signUpButton);
} }
@ -113,6 +113,7 @@ public class SignUpGUI extends JFrame implements ActionListener {
JOptionPane.showMessageDialog(this, "Username already exists!", "Sign Up Error", JOptionPane.ERROR_MESSAGE); JOptionPane.showMessageDialog(this, "Username already exists!", "Sign Up Error", JOptionPane.ERROR_MESSAGE);
return; return;
} }
try { try {
UUID randomUUID = UUID.randomUUID(); UUID randomUUID = UUID.randomUUID();
CreateUser user = CreateUser.createUser(randomUUID.toString(), username, password, birthday, firstName, surname); CreateUser user = CreateUser.createUser(randomUUID.toString(), username, password, birthday, firstName, surname);
@ -124,17 +125,18 @@ public class SignUpGUI extends JFrame implements ActionListener {
} }
} }
} }
// Function to check if the input username doesn't already exist in the JSON file // Function to check if the input username doesn't already exist in the JSON file
private boolean isUsernameAvailable(String filename, String username) { private boolean isUsernameAvailable(String filename, String username) {
List<CreateUser> userList = CreateUser.readUserListFromJsonFile(filename); List<CreateUser> userList = CreateUser.readUserListFromJsonFile(filename);
if (userList != null) { if (userList != null) {
for (CreateUser user : userList) { for (CreateUser user : userList) {
if (user.getUserName().equals(username)) { if (user.getUserName().equals(username)) {
return false; // Username already exists
return false;
} }
} }
} }
return true; // Username is available
return true;
} }
public static void main(String[] args) { public static void main(String[] args) {

12
src/test/java/CreateUserTest.java

@ -23,7 +23,6 @@ class CreateUserTest {
assertEquals(firstName, user.getFirstName()); assertEquals(firstName, user.getFirstName());
assertEquals(surname, user.surname()); assertEquals(surname, user.surname());
// Password should be hashed
assertNotEquals(password, user.getPassword()); assertNotEquals(password, user.getPassword());
} }
@ -38,16 +37,12 @@ class CreateUserTest {
String firstName = "Jane"; String firstName = "Jane";
String surname = "Doe"; String surname = "Doe";
// Create a user
CreateUser user = new CreateUser(id, userName, password, birthday, firstName, surname); CreateUser user = new CreateUser(id, userName, password, birthday, firstName, surname);
// Save user to JSON file
user.saveToJsonFile(filename); user.saveToJsonFile(filename);
// Read users from JSON file
List<CreateUser> userList = CreateUser.readUserListFromJsonFile(filename); List<CreateUser> userList = CreateUser.readUserListFromJsonFile(filename);
// Ensure that the user has been saved and can be read correctly
assertEquals(1, userList.size()); assertEquals(1, userList.size());
CreateUser savedUser = userList.get(0); CreateUser savedUser = userList.get(0);
assertEquals(id, savedUser.getId()); assertEquals(id, savedUser.getId());
@ -56,7 +51,6 @@ class CreateUserTest {
assertEquals(firstName, savedUser.getFirstName()); assertEquals(firstName, savedUser.getFirstName());
assertEquals(surname, savedUser.surname()); assertEquals(surname, savedUser.surname());
// Clean up - delete the test file after the test
File file = new File(filename); File file = new File(filename);
file.delete(); file.delete();
} }
@ -71,22 +65,16 @@ class CreateUserTest {
String firstName = "Jack"; String firstName = "Jack";
String surname = "Doe"; String surname = "Doe";
// Create a user
CreateUser user = new CreateUser(id, userName, password, birthday, firstName, surname); CreateUser user = new CreateUser(id, userName, password, birthday, firstName, surname);
// Save user to JSON file
user.saveToJsonFile(filename); user.saveToJsonFile(filename);
// Update stayLoggedIn flag
CreateUser.updateStayLoggedIn(filename, userName, true); CreateUser.updateStayLoggedIn(filename, userName, true);
// Read updated user from JSON file
List<CreateUser> userList = CreateUser.readUserListFromJsonFile(filename); List<CreateUser> userList = CreateUser.readUserListFromJsonFile(filename);
// Ensure that the stayLoggedIn flag is updated
assertTrue(userList.get(0).isStayLoggedIn()); assertTrue(userList.get(0).isStayLoggedIn());
// Clean up - delete the test file after the test
File file = new File(filename); File file = new File(filename);
file.delete(); file.delete();
} }

Loading…
Cancel
Save