Renamed Packages and added more tests for login and signup use case.

uoftguy · uoftguy · commit 5c913e5b95a2 · 2022-11-21T15:25:26.000-05:00
diff --git a/src/main/java/Main.java b/src/main/java/Main.java
@@ -1,7 +1,6 @@
-import com.formdev.flatlaf.FlatIntelliJLaf;
 import com.formdev.flatlaf.FlatDarculaLaf;
 
-import loginAndSignupUseCase.loginAndSignupUseCaseScreens.WelcomeScreen;
+import login_and_signup_use_case.login_and_signup_use_case_screens.WelcomeScreen;
 import java.io.IOException;
 
 /**
diff --git a/src/main/java/MainPage/FlashcardSetDataPanel.java b/src/main/java/MainPage/FlashcardSetDataPanel.java
@@ -3,7 +3,7 @@
 import EditorMainPage.EditorMainPage;
 import dataAccess.DBGateway;
 import delete_flashcardset_use_case.*;
-import loginAndSignupUseCase.UserLoginResponseModel;
+import login_and_signup_use_case.UserLoginResponseModel;
 import quizUseCase.*;
 import quizUseCase.screens.QuizSettingsScreen;
 import studyMode.*;
diff --git a/src/main/java/MainPage/HomePage.java b/src/main/java/MainPage/HomePage.java
@@ -3,8 +3,8 @@
 import create_flashcardset_use_case.*;
 import dataAccess.*;
 import entities.FlashcardSetFactory;
-import loginAndSignupUseCase.UserLoginResponseModel;
-import loginAndSignupUseCase.loginAndSignupUseCaseScreens.WelcomeScreen;
+import login_and_signup_use_case.UserLoginResponseModel;
+import login_and_signup_use_case.login_and_signup_use_case_screens.WelcomeScreen;
 import search_use_case.*;
 
 import javax.swing.*;
diff --git a/src/main/java/MainPage/ListOfFlashcardSetsDataPanel.java b/src/main/java/MainPage/ListOfFlashcardSetsDataPanel.java
@@ -2,7 +2,7 @@
 
 
 import dataAccess.DBGateway;
-import loginAndSignupUseCase.UserLoginResponseModel;
+import login_and_signup_use_case.UserLoginResponseModel;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/main/java/create_flashcardset_use_case/CreationScreen.java b/src/main/java/create_flashcardset_use_case/CreationScreen.java
@@ -1,6 +1,6 @@
 package create_flashcardset_use_case;
 
-import loginAndSignupUseCase.UserLoginResponseModel;
+import login_and_signup_use_case.UserLoginResponseModel;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/main/java/delete_flashcardset_use_case/DeletionScreen.java b/src/main/java/delete_flashcardset_use_case/DeletionScreen.java
@@ -1,7 +1,7 @@
 package delete_flashcardset_use_case;
 
 
-import loginAndSignupUseCase.UserLoginResponseModel;
+import login_and_signup_use_case.UserLoginResponseModel;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/main/java/login_and_signup_use_case/UserLoginInputBoundary.java b/src/main/java/login_and_signup_use_case/UserLoginInputBoundary.java
@@ -1,4 +1,4 @@
-package loginAndSignupUseCase;
+package login_and_signup_use_case;
 /**
  * Login Input Boundary.
  * Application Business Rules
diff --git a/src/main/java/login_and_signup_use_case/UserLoginInteractor.java b/src/main/java/login_and_signup_use_case/UserLoginInteractor.java
@@ -1,4 +1,4 @@
-package loginAndSignupUseCase;
+package login_and_signup_use_case;
 
 import dataAccess.DBGateway;
 import entityRequestModels.CommonUserDsRequestModel;
diff --git a/src/main/java/login_and_signup_use_case/UserLoginOutputBoundary.java b/src/main/java/login_and_signup_use_case/UserLoginOutputBoundary.java
@@ -1,6 +1,4 @@
-package loginAndSignupUseCase;
-
-import search_use_case.SearchResponseModel;
+package login_and_signup_use_case;
 
 /**
  * Login Output Boundary.
diff --git a/src/main/java/login_and_signup_use_case/UserLoginRequestModel.java b/src/main/java/login_and_signup_use_case/UserLoginRequestModel.java
@@ -1,4 +1,4 @@
-package loginAndSignupUseCase;
+package login_and_signup_use_case;
 
 /**
  * Login Request Model to request from the user.
diff --git a/src/main/java/login_and_signup_use_case/UserLoginResponseModel.java b/src/main/java/login_and_signup_use_case/UserLoginResponseModel.java
@@ -1,6 +1,5 @@
-package loginAndSignupUseCase;
+package login_and_signup_use_case;
 
-import java.util.HashMap;
 import java.util.Map;
 
 /**
diff --git a/src/main/java/login_and_signup_use_case/UserRegisterInputBoundary.java b/src/main/java/login_and_signup_use_case/UserRegisterInputBoundary.java
@@ -1,4 +1,4 @@
-package loginAndSignupUseCase;
+package login_and_signup_use_case;
 
 /**
  * Signup Input Boundary.
diff --git a/src/main/java/login_and_signup_use_case/UserRegisterInteractor.java b/src/main/java/login_and_signup_use_case/UserRegisterInteractor.java
@@ -1,4 +1,4 @@
-package loginAndSignupUseCase;
+package login_and_signup_use_case;
 
 import dataAccess.DBGateway;
 import entities.User;
diff --git a/src/main/java/login_and_signup_use_case/UserRegisterOutputBoundary.java b/src/main/java/login_and_signup_use_case/UserRegisterOutputBoundary.java
@@ -1,4 +1,4 @@
-package loginAndSignupUseCase;
+package login_and_signup_use_case;
 
 /**
  * Register Output Boundary.
diff --git a/src/main/java/login_and_signup_use_case/UserRegisterRequestModel.java b/src/main/java/login_and_signup_use_case/UserRegisterRequestModel.java
@@ -1,4 +1,4 @@
-package loginAndSignupUseCase;
+package login_and_signup_use_case;
 
 /**
  * Register Request Model to request from the user.
diff --git a/src/main/java/login_and_signup_use_case/UserRegisterResponseModel.java b/src/main/java/login_and_signup_use_case/UserRegisterResponseModel.java
@@ -1,4 +1,4 @@
-package loginAndSignupUseCase;
+package login_and_signup_use_case;
 
 /**
  * User Register Response Model
diff --git a/src/main/java/login_and_signup_use_case/login_and_signup_use_case_screens/CommonUserDataAccess.java b/src/main/java/login_and_signup_use_case/login_and_signup_use_case_screens/CommonUserDataAccess.java
diff --git a/src/main/java/login_and_signup_use_case/login_and_signup_use_case_screens/LabelTextPanel.java b/src/main/java/login_and_signup_use_case/login_and_signup_use_case_screens/LabelTextPanel.java
@@ -1,4 +1,4 @@
-package loginAndSignupUseCase.loginAndSignupUseCaseScreens;
+package login_and_signup_use_case.login_and_signup_use_case_screens;
 
 import javax.swing.*;
 
diff --git a/src/main/java/login_and_signup_use_case/login_and_signup_use_case_screens/LoginScreen.java b/src/main/java/login_and_signup_use_case/login_and_signup_use_case_screens/LoginScreen.java
@@ -1,7 +1,7 @@
-package loginAndSignupUseCase.loginAndSignupUseCaseScreens;
+package login_and_signup_use_case.login_and_signup_use_case_screens;
 
 import MainPage.HomePage;
-import loginAndSignupUseCase.UserLoginResponseModel;
+import login_and_signup_use_case.UserLoginResponseModel;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/main/java/login_and_signup_use_case/login_and_signup_use_case_screens/RegisterScreen.java b/src/main/java/login_and_signup_use_case/login_and_signup_use_case_screens/RegisterScreen.java
@@ -1,7 +1,7 @@
-package loginAndSignupUseCase.loginAndSignupUseCaseScreens;
+package login_and_signup_use_case.login_and_signup_use_case_screens;
 
 import MainPage.HomePage;
-import loginAndSignupUseCase.*;
+import login_and_signup_use_case.*;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/main/java/login_and_signup_use_case/login_and_signup_use_case_screens/UserDataMapper.java b/src/main/java/login_and_signup_use_case/login_and_signup_use_case_screens/UserDataMapper.java
@@ -1,4 +1,4 @@
-package loginAndSignupUseCase.loginAndSignupUseCaseScreens;
+package login_and_signup_use_case.login_and_signup_use_case_screens;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
diff --git a/src/main/java/login_and_signup_use_case/login_and_signup_use_case_screens/UserLoginController.java b/src/main/java/login_and_signup_use_case/login_and_signup_use_case_screens/UserLoginController.java
@@ -1,8 +1,8 @@
-package loginAndSignupUseCase.loginAndSignupUseCaseScreens;
+package login_and_signup_use_case.login_and_signup_use_case_screens;
 
-import loginAndSignupUseCase.UserLoginInputBoundary;
-import loginAndSignupUseCase.UserLoginRequestModel;
-import loginAndSignupUseCase.UserLoginResponseModel;
+import login_and_signup_use_case.UserLoginInputBoundary;
+import login_and_signup_use_case.UserLoginRequestModel;
+import login_and_signup_use_case.UserLoginResponseModel;
 
 /**
  * Create controller for the login user case
diff --git a/src/main/java/login_and_signup_use_case/login_and_signup_use_case_screens/UserLoginFailed.java b/src/main/java/login_and_signup_use_case/login_and_signup_use_case_screens/UserLoginFailed.java
@@ -1,4 +1,4 @@
-package loginAndSignupUseCase.loginAndSignupUseCaseScreens;
+package login_and_signup_use_case.login_and_signup_use_case_screens;
 /**
  * Display error message if login failed
  *<p>
diff --git a/src/main/java/login_and_signup_use_case/login_and_signup_use_case_screens/UserLoginPresenter.java b/src/main/java/login_and_signup_use_case/login_and_signup_use_case_screens/UserLoginPresenter.java
@@ -1,7 +1,7 @@
-package loginAndSignupUseCase.loginAndSignupUseCaseScreens;
+package login_and_signup_use_case.login_and_signup_use_case_screens;
 
-import loginAndSignupUseCase.UserLoginOutputBoundary;
-import loginAndSignupUseCase.UserLoginResponseModel;
+import login_and_signup_use_case.UserLoginOutputBoundary;
+import login_and_signup_use_case.UserLoginResponseModel;
 /**
  * The presenter for Login Use Case
  *<p>
diff --git a/src/main/java/login_and_signup_use_case/login_and_signup_use_case_screens/UserRegisterController.java b/src/main/java/login_and_signup_use_case/login_and_signup_use_case_screens/UserRegisterController.java
@@ -1,8 +1,8 @@
-package loginAndSignupUseCase.loginAndSignupUseCaseScreens;
+package login_and_signup_use_case.login_and_signup_use_case_screens;
 
-import loginAndSignupUseCase.UserRegisterInputBoundary;
-import loginAndSignupUseCase.UserRegisterRequestModel;
-import loginAndSignupUseCase.UserRegisterResponseModel;
+import login_and_signup_use_case.UserRegisterInputBoundary;
+import login_and_signup_use_case.UserRegisterRequestModel;
+import login_and_signup_use_case.UserRegisterResponseModel;
 
 /**
  * Create controller for the signup use case
diff --git a/src/main/java/login_and_signup_use_case/login_and_signup_use_case_screens/UserRegisterPresenter.java b/src/main/java/login_and_signup_use_case/login_and_signup_use_case_screens/UserRegisterPresenter.java
@@ -1,7 +1,7 @@
-package loginAndSignupUseCase.loginAndSignupUseCaseScreens;
+package login_and_signup_use_case.login_and_signup_use_case_screens;
 
-import loginAndSignupUseCase.UserRegisterOutputBoundary;
-import loginAndSignupUseCase.UserRegisterResponseModel;
+import login_and_signup_use_case.UserRegisterOutputBoundary;
+import login_and_signup_use_case.UserRegisterResponseModel;
 
 /**
  * The presenter for Signup Use Case
diff --git a/src/main/java/login_and_signup_use_case/login_and_signup_use_case_screens/UserRegistrationFailed.java b/src/main/java/login_and_signup_use_case/login_and_signup_use_case_screens/UserRegistrationFailed.java
@@ -1,4 +1,4 @@
-package loginAndSignupUseCase.loginAndSignupUseCaseScreens;
+package login_and_signup_use_case.login_and_signup_use_case_screens;
 
 /**
  * Display error message if signup failed
diff --git a/src/main/java/login_and_signup_use_case/login_and_signup_use_case_screens/WelcomeScreen.java b/src/main/java/login_and_signup_use_case/login_and_signup_use_case_screens/WelcomeScreen.java
@@ -1,9 +1,9 @@
-package loginAndSignupUseCase.loginAndSignupUseCaseScreens;
+package login_and_signup_use_case.login_and_signup_use_case_screens;
 
 import dataAccess.*;
 import entities.CommonUserFactory;
 import entities.UserFactory;
-import loginAndSignupUseCase.*;
+import login_and_signup_use_case.*;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/main/java/searchTestMain.java b/src/main/java/searchTestMain.java
@@ -1,5 +1,5 @@
 import dataAccess.*;
-import loginAndSignupUseCase.UserLoginResponseModel;
+import login_and_signup_use_case.UserLoginResponseModel;
 import search_use_case.*;
 
 import java.io.IOException;
diff --git a/src/main/java/search_use_case/SearchController.java b/src/main/java/search_use_case/SearchController.java
@@ -1,6 +1,6 @@
 package search_use_case;
 
-import loginAndSignupUseCase.UserLoginResponseModel;
+import login_and_signup_use_case.UserLoginResponseModel;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/src/main/java/search_use_case/SearchInteractor.java b/src/main/java/search_use_case/SearchInteractor.java
@@ -3,7 +3,7 @@
 import dataAccess.*;
 import entityRequestModels.CommonUserDsRequestModel;
 import entityRequestModels.FlashcardSetDsRequestModel;
-import loginAndSignupUseCase.UserLoginResponseModel;
+import login_and_signup_use_case.UserLoginResponseModel;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/src/main/java/search_use_case/SearchRequestModel.java b/src/main/java/search_use_case/SearchRequestModel.java
@@ -1,5 +1,5 @@
 package search_use_case;
-import loginAndSignupUseCase.UserLoginResponseModel;
+import login_and_signup_use_case.UserLoginResponseModel;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/search_use_case/SearchScreen.java b/src/main/java/search_use_case/SearchScreen.java
@@ -1,7 +1,7 @@
 package search_use_case;
 
 import dataAccess.DBGateway;
-import loginAndSignupUseCase.UserLoginResponseModel;
+import login_and_signup_use_case.UserLoginResponseModel;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
diff --git a/src/test/java/loginAndSignUpUseCase/testData/Users.csv b/src/test/java/loginAndSignUpUseCase/testData/Users.csv
diff --git a/src/test/java/loginAndSignUpUseCase/userLoginInteractorTest.java b/src/test/java/loginAndSignUpUseCase/userLoginInteractorTest.java
diff --git a/src/test/java/login_and_sign_up_use_case/InMemoryUser.java b/src/test/java/login_and_sign_up_use_case/InMemoryUser.java
@@ -1,4 +1,4 @@
-package loginAndSignUpUseCase;
+package login_and_sign_up_use_case;
 
 import dataAccess.IUserDataAccess;
 import entityRequestModels.CommonUserDsRequestModel;
diff --git a/src/test/java/login_and_sign_up_use_case/UserUnitTest.java b/src/test/java/login_and_sign_up_use_case/UserUnitTest.java
@@ -1,4 +1,4 @@
-package loginAndSignUpUseCase;
+package login_and_sign_up_use_case;
 
 import entities.CommonUser;
 import entities.User;
@@ -7,8 +7,6 @@
 
 import java.util.ArrayList;
 
-import static org.junit.Assert.*;
-
 public class UserUnitTest {
     @Test
     void given123Password_whenPasswordIsNotValid_thenIsFalse() {
diff --git a/src/test/java/login_and_sign_up_use_case/test_data/FlashcardSets.csv b/src/test/java/login_and_sign_up_use_case/test_data/FlashcardSets.csv
diff --git a/src/test/java/login_and_sign_up_use_case/test_data/Flashcards.csv b/src/test/java/login_and_sign_up_use_case/test_data/Flashcards.csv
diff --git a/src/test/java/login_and_sign_up_use_case/test_data/Users.csv b/src/test/java/login_and_sign_up_use_case/test_data/Users.csv
@@ -0,0 +1,6 @@
+username,password,isAdmin,flashcardSetIds
+George,Clooney123,false,
+John,Rockefeller123,false,
+rObErT,DowneyJr.,true,
+testUser,456r2t17yuihjn@,false,0,1
+Walt,Disney123,false,
diff --git a/src/test/java/login_and_sign_up_use_case/userLoginInteractorTest.java b/src/test/java/login_and_sign_up_use_case/userLoginInteractorTest.java
diff --git a/src/test/java/login_and_sign_up_use_case/userRegisterInteractorTest.java b/src/test/java/login_and_sign_up_use_case/userRegisterInteractorTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package loginAndSignupUseCase;`
	`1`	`+package login_and_signup_use_case;`
`2`	`2`	`/**`
`3`	`3`	`* Login Input Boundary.`
`4`	`4`	`* Application Business Rules`