work: Unit Tests and Integration Tests

Author: thomaswoehlke

src/test/java/org/woehlke/java/simpleworklist/domain/db/user/UserAccountPasswordEncodedIntegrationTest.java

@@ -2,6 +2,7 @@
 
 
 import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.woehlke.java.simpleworklist.config.AbstractIntegrationTest;
@@ -20,15 +21,15 @@ public class UserAccountPasswordEncodedIntegrationTest extends AbstractIntegrati
     @Autowired
     private PasswordEncoder encoder;
 
-    //@Test
+    @Test
     public void testEncoderIsWired(){
         assertTrue(encoder != null);
     }
 
     /**
      * This Test is obsolete now due to changed encoder from MD5 to BCrypt (20.02.2016).
      */
-    //@Test
+    @Test
     public void testGetUserPasswordEncoded(){
         UserAccountForm u = new UserAccountForm();
         u.setUserEmail("test01//@Test.de");
@@ -39,7 +40,7 @@ public void testGetUserPasswordEncoded(){
         assertTrue(encodedPassword.compareTo(encoder.encode(u.getUserPassword()))==0);
     }
 
-    //@Test
+    @Test
     public void testPasswordsAreTheSame(){
         UserAccountForm u = new UserAccountForm();
         u.setUserEmail("test01//@Test.de");

src/test/java/org/woehlke/java/simpleworklist/domain/db/user/UserAccountPasswordRecoveryServiceIT.java

@@ -1,10 +1,10 @@
 package org.woehlke.java.simpleworklist.domain.db.user;
 
 import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.woehlke.java.simpleworklist.config.AbstractIntegrationTest;
-import org.woehlke.java.simpleworklist.domain.db.user.UserAccountPasswordRecovery;
 import org.woehlke.java.simpleworklist.domain.db.user.passwordrecovery.UserAccountPasswordRecoveryService;
 import org.woehlke.java.simpleworklist.domain.db.user.passwordrecovery.UserAccountPasswordRecoveryStatus;
 
@@ -23,21 +23,21 @@ public class UserAccountPasswordRecoveryServiceIT extends AbstractIntegrationTes
     @Autowired
     private UserAccountPasswordRecoveryService userAccountPasswordRecoveryService;
 
-    //@Test
+    @Test
     public void testResetPassword() throws Exception {
         this.mockMvc.perform(
                 get("/user/resetPassword")).andDo(print())
                 .andExpect(view().name(containsString("user/resetPassword/resetPasswordForm")));
     }
 
-    //@Test
+    @Test
     public void testEnterNewPasswordFormular() throws Exception {
         this.mockMvc.perform(
                 get("/user/resetPassword/confirm/ASDF")).andDo(print())
                 .andExpect(view().name(containsString("user/resetPassword/resetPasswordNotConfirmed")));
     }
 
-    //@Test
+    @Test
     public void testEnterNewPasswordFormularWithToken() throws Exception {
         userAccountPasswordRecoveryService.passwordRecoverySendEmailTo(emails[0]);
         try {
@@ -58,7 +58,7 @@ public void testEnterNewPasswordFormularWithToken() throws Exception {
         userAccountPasswordRecoveryService.passwordRecoveryDone(o);
     }
 
-    //@Test
+    @Test
     public void finish(){
         super.deleteAll();
     }

src/test/java/org/woehlke/java/simpleworklist/domain/db/user/UserAccountServiceIT.java

@@ -1,6 +1,7 @@
 package org.woehlke.java.simpleworklist.domain.db.user;
 
 import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 
@@ -11,7 +12,6 @@
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.woehlke.java.simpleworklist.config.AbstractIntegrationTest;
-import org.woehlke.java.simpleworklist.domain.db.user.UserAccount;
 import org.woehlke.java.simpleworklist.domain.db.user.account.UserAccountForm;
 import org.woehlke.java.simpleworklist.domain.db.user.passwordrecovery.UserAccountPasswordRecoveryService;
 import org.woehlke.java.simpleworklist.domain.db.user.signup.UserAccountRegistrationService;
@@ -30,7 +30,7 @@ public class UserAccountServiceIT extends AbstractIntegrationTest {
     @Autowired
     private UserAccountPasswordRecoveryService userAccountPasswordRecoveryService;
 
-    //@Test
+    @Test
     public void testStartSecondOptIn() throws Exception {
         int zeroNumberOfAllRegistrations = 0;
         deleteAll();
@@ -57,7 +57,7 @@ public void testStartSecondOptIn() throws Exception {
         assertEquals(zeroNumberOfAllRegistrations, testHelperService.getNumberOfAllRegistrations());
     }
 
-    //@Test
+    @Test
     public void testPasswordResetSendEmail() throws Exception {
         deleteAll();
         for(UserAccount userAccount:testUser){
@@ -86,7 +86,7 @@ public void testPasswordResetSendEmail() throws Exception {
         assertEquals(zeroNumberOfAllRegistrations, testHelperService.getNumberOfAllRegistrations());
     }
 
-    //@Test
+    @Test
     public void testSaveAndFlush(){
         deleteAll();
         for(UserAccount userAccount:testUser){
@@ -106,7 +106,7 @@ public void testSaveAndFlush(){
         }
     }
 
-    //@Test
+    @Test
     public void testLoadUserByUsername(){
         for(String email:emails){
             UserDetails userDetails = applicationUserDetailsService.loadUserByUsername(email);
@@ -120,7 +120,7 @@ public void testLoadUserByUsername(){
         }
     }
 
-    //@Test
+    @Test
     public void testAuthorize(){
         LoginForm loginForm = new LoginForm();
         loginForm.setUserEmail(emails[0]);
@@ -132,13 +132,13 @@ public void testAuthorize(){
         assertFalse(userAuthorizationService.authorize(loginForm));
     }
 
-    //@Test
+    @Test
     public void testIsEmailAvailable() {
         assertFalse(userAccountService.isEmailAvailable(emails[0]));
         assertTrue(userAccountService.isEmailAvailable(username_email));
     }
 
-    //@Test
+    @Test
     public void testCreateUser() {
         UserAccountForm userAccount = new UserAccountForm();
         userAccount.setUserEmail(username_email);
@@ -149,7 +149,7 @@ public void testCreateUser() {
         assertFalse(userAccountService.isEmailAvailable(username_email));
     }
 
-    //@Test
+    @Test
     public void testChangeUsersPassword(){
         UserAccountForm userAccount = new UserAccountForm();
         userAccount.setUserEmail(emails[0]);
@@ -159,13 +159,13 @@ public void testChangeUsersPassword(){
         userAccountService.changeUsersPassword(userAccount);
     }
 
-    //@Test
+    @Test
     public void testRetrieveUsernameLoggedOut(){
         String userName = loginSuccessService.retrieveUsername();
         assertTrue(userName.compareTo(" ")==0);
     }
 
-    //@Test
+    @Test
     public void testRetrieveUsernameLoggedIn(){
         makeActiveUser(emails[0]);
         String userName = loginSuccessService.retrieveUsername();
@@ -174,13 +174,13 @@ public void testRetrieveUsernameLoggedIn(){
         SecurityContextHolder.clearContext();
     }
 
-    //@Test
-    ////@Test(expected = UsernameNotFoundException.class)
+    @Test
+    //@Test(expected = UsernameNotFoundException.class)
     public void testRetrieveCurrentUserLoggedOut(){
         loginSuccessService.retrieveCurrentUser();
     }
 
-    //@Test
+    @Test
     public void testRetrieveCurrentUserLoggedIn(){
         makeActiveUser(emails[0]);
         UserAccount userAccount = loginSuccessService.retrieveCurrentUser();

src/test/java/org/woehlke/java/simpleworklist/domain/db/user/UserDetailsBeanUT.java

@@ -2,6 +2,7 @@
 
 
 
+import org.junit.jupiter.api.Test;
 import org.springframework.security.core.GrantedAuthority;
 import org.woehlke.java.simpleworklist.domain.security.access.UserDetailsDto;
 
@@ -12,7 +13,7 @@
 
 public class UserDetailsBeanUT {
 
-    //@Test
+    @Test
     public void testGetAuthorities(){
         UserAccount account = new UserAccount();
         UserDetailsDto b = new UserDetailsDto(account);
@@ -23,7 +24,7 @@ public void testGetAuthorities(){
         }
     }
 
-    //@Test
+    @Test
     public void testDefaultBooleans(){
         UserAccount account = new UserAccount();
         UserDetailsDto b = new UserDetailsDto(account);
@@ -33,7 +34,7 @@ public void testDefaultBooleans(){
         assertTrue(b.isEnabled());
     }
 
-    //@Test
+    @Test
     public void testHashCodeAndEquals(){
         UserAccount account1 = new UserAccount();
         UserAccount account2 = new UserAccount();

src/test/java/org/woehlke/java/simpleworklist/domain/db/user/UserRegistrationServiceIT.java

@@ -1,6 +1,7 @@
 package org.woehlke.java.simpleworklist.domain.db.user;
 
 import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.woehlke.java.simpleworklist.config.AbstractIntegrationTest;
@@ -29,7 +30,7 @@ public class UserRegistrationServiceIT extends AbstractIntegrationTest {
     @Autowired
     private UserAccountPasswordRecoveryService userAccountPasswordRecoveryService;
 
-    //@Test
+    @Test
     public void testIsRetryAndMaximumNumberOfRetries(){
         deleteAll();
         boolean result = userAccountRegistrationService.registrationIsRetryAndMaximumNumberOfRetries(username_email);
@@ -49,7 +50,7 @@ public void testIsRetryAndMaximumNumberOfRetries(){
     }
 
 
-    //@Test
+    @Test
     public void testCheckIfResponseIsInTimeNewUser(){
         userAccountRegistrationService.registrationCheckIfResponseIsInTime(emails[0]);
         UserAccountRegistration o = testHelperService.findRegistrationByEmail(emails[0]);
@@ -62,7 +63,7 @@ public void testCheckIfResponseIsInTimeNewUser(){
         assertNull(o);
     }
 
-    //@Test
+    @Test
     public void testCheckIfResponseIsInTime(){
         userAccountPasswordRecoveryService.passwordRecoverySendEmailTo(emails[0]);
         try {