diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/SmokeTests.java b/src/test/java/org/woehlke/java/simpleworklist/SmokeTests.java
similarity index 97%
rename from src/test/java/org/woehlke/java/simpleworklist/test/SmokeTests.java
rename to src/test/java/org/woehlke/java/simpleworklist/SmokeTests.java
index 1927c7a3..2686c8a3 100644
--- a/src/test/java/org/woehlke/java/simpleworklist/test/SmokeTests.java
+++ b/src/test/java/org/woehlke/java/simpleworklist/SmokeTests.java
@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.test;
+package org.woehlke.java.simpleworklist;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.*;
@@ -14,9 +14,7 @@
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.ResultActions;
import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
-import org.woehlke.java.simpleworklist.SimpleworklistApplication;
-import org.woehlke.java.simpleworklist.test.application.config.FunctionalRequirements;
-import org.woehlke.java.simpleworklist.test.application.config.UserAccountTestDataService;
+import org.woehlke.java.simpleworklist.config.UserAccountTestDataService;
import java.net.URL;
@@ -26,7 +24,7 @@
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
-import static org.woehlke.java.simpleworklist.test.application.config.Requirements.*;
+import static org.woehlke.java.simpleworklist.config.Requirements.*;
@Slf4j
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/application/helper/TestHelperService.java b/src/test/java/org/woehlke/java/simpleworklist/application/helper/TestHelperService.java
similarity index 90%
rename from src/test/java/org/woehlke/java/simpleworklist/test/application/helper/TestHelperService.java
rename to src/test/java/org/woehlke/java/simpleworklist/application/helper/TestHelperService.java
index fb39ab48..08930bbb 100644
--- a/src/test/java/org/woehlke/java/simpleworklist/test/application/helper/TestHelperService.java
+++ b/src/test/java/org/woehlke/java/simpleworklist/application/helper/TestHelperService.java
@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.test.application.helper;
+package org.woehlke.java.simpleworklist.application.helper;
import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserPasswordRecovery;
import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistration;
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/application/helper/TestHelperServiceImpl.java b/src/test/java/org/woehlke/java/simpleworklist/application/helper/TestHelperServiceImpl.java
similarity index 98%
rename from src/test/java/org/woehlke/java/simpleworklist/test/application/helper/TestHelperServiceImpl.java
rename to src/test/java/org/woehlke/java/simpleworklist/application/helper/TestHelperServiceImpl.java
index d619f299..9804f19f 100644
--- a/src/test/java/org/woehlke/java/simpleworklist/test/application/helper/TestHelperServiceImpl.java
+++ b/src/test/java/org/woehlke/java/simpleworklist/application/helper/TestHelperServiceImpl.java
@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.test.application.helper;
+package org.woehlke.java.simpleworklist.application.helper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/application/config/AbstractTest.java b/src/test/java/org/woehlke/java/simpleworklist/config/AbstractTest.java
similarity index 96%
rename from src/test/java/org/woehlke/java/simpleworklist/test/application/config/AbstractTest.java
rename to src/test/java/org/woehlke/java/simpleworklist/config/AbstractTest.java
index 8dcd7955..ddf277fa 100644
--- a/src/test/java/org/woehlke/java/simpleworklist/test/application/config/AbstractTest.java
+++ b/src/test/java/org/woehlke/java/simpleworklist/config/AbstractTest.java
@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.test.application.config;
+package org.woehlke.java.simpleworklist.config;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -7,7 +7,7 @@
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.web.context.WebApplicationContext;
-import org.woehlke.java.simpleworklist.test.application.helper.TestHelperService;
+import org.woehlke.java.simpleworklist.application.helper.TestHelperService;
import org.woehlke.java.simpleworklist.config.SimpleworklistProperties;
import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
import org.woehlke.java.simpleworklist.domain.user.account.UserAccountService;
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/application/config/FunctionalRequirements.java b/src/test/java/org/woehlke/java/simpleworklist/config/FunctionalRequirements.java
similarity index 94%
rename from src/test/java/org/woehlke/java/simpleworklist/test/application/config/FunctionalRequirements.java
rename to src/test/java/org/woehlke/java/simpleworklist/config/FunctionalRequirements.java
index c47f1fd9..37908867 100644
--- a/src/test/java/org/woehlke/java/simpleworklist/test/application/config/FunctionalRequirements.java
+++ b/src/test/java/org/woehlke/java/simpleworklist/config/FunctionalRequirements.java
@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.test.application.config;
+package org.woehlke.java.simpleworklist.config;
public enum FunctionalRequirements {
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/application/config/Requirements.java b/src/test/java/org/woehlke/java/simpleworklist/config/Requirements.java
similarity index 95%
rename from src/test/java/org/woehlke/java/simpleworklist/test/application/config/Requirements.java
rename to src/test/java/org/woehlke/java/simpleworklist/config/Requirements.java
index 5cd5dab8..f4e7e604 100644
--- a/src/test/java/org/woehlke/java/simpleworklist/test/application/config/Requirements.java
+++ b/src/test/java/org/woehlke/java/simpleworklist/config/Requirements.java
@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.test.application.config;
+package org.woehlke.java.simpleworklist.config;
public interface Requirements {
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/application/config/UserAccountTestDataService.java b/src/test/java/org/woehlke/java/simpleworklist/config/UserAccountTestDataService.java
similarity index 73%
rename from src/test/java/org/woehlke/java/simpleworklist/test/application/config/UserAccountTestDataService.java
rename to src/test/java/org/woehlke/java/simpleworklist/config/UserAccountTestDataService.java
index 3b7d87d6..56ef7ce2 100644
--- a/src/test/java/org/woehlke/java/simpleworklist/test/application/config/UserAccountTestDataService.java
+++ b/src/test/java/org/woehlke/java/simpleworklist/config/UserAccountTestDataService.java
@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.test.application.config;
+package org.woehlke.java.simpleworklist.config;
import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/application/config/UserAccountTestDataServiceImpl.java b/src/test/java/org/woehlke/java/simpleworklist/config/UserAccountTestDataServiceImpl.java
similarity index 96%
rename from src/test/java/org/woehlke/java/simpleworklist/test/application/config/UserAccountTestDataServiceImpl.java
rename to src/test/java/org/woehlke/java/simpleworklist/config/UserAccountTestDataServiceImpl.java
index 1caf1c8e..ec0101f2 100644
--- a/src/test/java/org/woehlke/java/simpleworklist/test/application/config/UserAccountTestDataServiceImpl.java
+++ b/src/test/java/org/woehlke/java/simpleworklist/config/UserAccountTestDataServiceImpl.java
@@ -1,10 +1,9 @@
-package org.woehlke.java.simpleworklist.test.application.config;
+package org.woehlke.java.simpleworklist.config;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.woehlke.java.simpleworklist.config.SimpleworklistProperties;
import org.woehlke.java.simpleworklist.domain.context.Context;
import org.woehlke.java.simpleworklist.domain.context.ContextService;
import org.woehlke.java.simpleworklist.domain.context.NewContextForm;
diff --git a/src/test/java/org/woehlke/java/simpleworklist/domain/chat/User2UserMessageControllerTest.java b/src/test/java/org/woehlke/java/simpleworklist/domain/chat/User2UserMessageControllerTest.java
new file mode 100644
index 00000000..68042c6c
--- /dev/null
+++ b/src/test/java/org/woehlke/java/simpleworklist/domain/chat/User2UserMessageControllerTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.java.simpleworklist.domain.chat;
+
+public class User2UserMessageControllerTest {
+}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/domain/chat/User2UserMessageServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/domain/chat/User2UserMessageServiceTest.java
new file mode 100644
index 00000000..38322e36
--- /dev/null
+++ b/src/test/java/org/woehlke/java/simpleworklist/domain/chat/User2UserMessageServiceTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.java.simpleworklist.domain.chat;
+
+public class User2UserMessageServiceTest {
+}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/domain/context/ContextControllerTest.java b/src/test/java/org/woehlke/java/simpleworklist/domain/context/ContextControllerTest.java
new file mode 100644
index 00000000..d3ea0657
--- /dev/null
+++ b/src/test/java/org/woehlke/java/simpleworklist/domain/context/ContextControllerTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.java.simpleworklist.domain.context;
+
+public class ContextControllerTest {
+}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/domain/context/ContextServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/domain/context/ContextServiceTest.java
new file mode 100644
index 00000000..506c69d3
--- /dev/null
+++ b/src/test/java/org/woehlke/java/simpleworklist/domain/context/ContextServiceTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.java.simpleworklist.domain.context;
+
+public class ContextServiceTest {
+}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/domain/project/ProjectControllerTest.java b/src/test/java/org/woehlke/java/simpleworklist/domain/project/ProjectControllerTest.java
new file mode 100644
index 00000000..909a4693
--- /dev/null
+++ b/src/test/java/org/woehlke/java/simpleworklist/domain/project/ProjectControllerTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.java.simpleworklist.domain.project;
+
+public class ProjectControllerTest {
+}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/domain/project/ProjectServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/domain/project/ProjectServiceTest.java
new file mode 100644
index 00000000..6790f5bf
--- /dev/null
+++ b/src/test/java/org/woehlke/java/simpleworklist/domain/project/ProjectServiceTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.java.simpleworklist.domain.project;
+
+public class ProjectServiceTest {
+}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/domain/search/SearchControllerTest.java b/src/test/java/org/woehlke/java/simpleworklist/domain/search/SearchControllerTest.java
new file mode 100644
index 00000000..9905565e
--- /dev/null
+++ b/src/test/java/org/woehlke/java/simpleworklist/domain/search/SearchControllerTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.java.simpleworklist.domain.search;
+
+public class SearchControllerTest {
+}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/domain/search/SearchServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/domain/search/SearchServiceTest.java
new file mode 100644
index 00000000..a9cce1a8
--- /dev/null
+++ b/src/test/java/org/woehlke/java/simpleworklist/domain/search/SearchServiceTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.java.simpleworklist.domain.search;
+
+public class SearchServiceTest {
+}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/domain/task/TaskControllerTest.java b/src/test/java/org/woehlke/java/simpleworklist/domain/task/TaskControllerTest.java
new file mode 100644
index 00000000..ff2d5b30
--- /dev/null
+++ b/src/test/java/org/woehlke/java/simpleworklist/domain/task/TaskControllerTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.java.simpleworklist.domain.task;
+
+public class TaskControllerTest {
+}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/domain/task/TaskMoveControllerTest.java b/src/test/java/org/woehlke/java/simpleworklist/domain/task/TaskMoveControllerTest.java
new file mode 100644
index 00000000..099a1e1d
--- /dev/null
+++ b/src/test/java/org/woehlke/java/simpleworklist/domain/task/TaskMoveControllerTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.java.simpleworklist.domain.task;
+
+public class TaskMoveControllerTest {
+}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/domain/task/TaskMoveServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/domain/task/TaskMoveServiceTest.java
new file mode 100644
index 00000000..c394e092
--- /dev/null
+++ b/src/test/java/org/woehlke/java/simpleworklist/domain/task/TaskMoveServiceTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.java.simpleworklist.domain.task;
+
+public class TaskMoveServiceTest {
+}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/domain/task/TaskServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/domain/task/TaskServiceTest.java
new file mode 100644
index 00000000..68b683b2
--- /dev/null
+++ b/src/test/java/org/woehlke/java/simpleworklist/domain/task/TaskServiceTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.java.simpleworklist.domain.task;
+
+public class TaskServiceTest {
+}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/domain/task/TaskStateControllerTest.java b/src/test/java/org/woehlke/java/simpleworklist/domain/task/TaskStateControllerTest.java
new file mode 100644
index 00000000..e75632cb
--- /dev/null
+++ b/src/test/java/org/woehlke/java/simpleworklist/domain/task/TaskStateControllerTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.java.simpleworklist.domain.task;
+
+public class TaskStateControllerTest {
+}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/domain/task/TaskStateServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/domain/task/TaskStateServiceTest.java
new file mode 100644
index 00000000..9b98d760
--- /dev/null
+++ b/src/test/java/org/woehlke/java/simpleworklist/domain/task/TaskStateServiceTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.java.simpleworklist.domain.task;
+
+public class TaskStateServiceTest {
+}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/testdata/TestDataServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/domain/testdata/TestDataServiceTest.java
similarity index 89%
rename from src/test/java/org/woehlke/java/simpleworklist/test/testdata/TestDataServiceTest.java
rename to src/test/java/org/woehlke/java/simpleworklist/domain/testdata/TestDataServiceTest.java
index f141ab84..3722b74c 100644
--- a/src/test/java/org/woehlke/java/simpleworklist/test/testdata/TestDataServiceTest.java
+++ b/src/test/java/org/woehlke/java/simpleworklist/domain/testdata/TestDataServiceTest.java
@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.test.testdata;
+package org.woehlke.java.simpleworklist.domain.testdata;
import lombok.extern.slf4j.Slf4j;
@@ -10,8 +10,7 @@
import org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.web.context.WebApplicationContext;
-import org.woehlke.java.simpleworklist.test.application.config.UserAccountTestDataService;
-import org.woehlke.java.simpleworklist.domain.testdata.TestDataService;
+import org.woehlke.java.simpleworklist.config.UserAccountTestDataService;
import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
import java.net.URL;
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/user/UserDetailsBeanTest.java b/src/test/java/org/woehlke/java/simpleworklist/domain/user/UserDetailsBeanTest.java
similarity index 98%
rename from src/test/java/org/woehlke/java/simpleworklist/test/user/UserDetailsBeanTest.java
rename to src/test/java/org/woehlke/java/simpleworklist/domain/user/UserDetailsBeanTest.java
index 5437de31..bdf0e663 100644
--- a/src/test/java/org/woehlke/java/simpleworklist/test/user/UserDetailsBeanTest.java
+++ b/src/test/java/org/woehlke/java/simpleworklist/domain/user/UserDetailsBeanTest.java
@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.test.user;
+package org.woehlke.java.simpleworklist.domain.user;
diff --git a/src/test/java/org/woehlke/java/simpleworklist/domain/user/account/UserAccountAccessServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/domain/user/account/UserAccountAccessServiceTest.java
new file mode 100644
index 00000000..d40d6718
--- /dev/null
+++ b/src/test/java/org/woehlke/java/simpleworklist/domain/user/account/UserAccountAccessServiceTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.java.simpleworklist.domain.user.account;
+
+public class UserAccountAccessServiceTest {
+}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/account/UserAccountPasswordEncodedTest.java b/src/test/java/org/woehlke/java/simpleworklist/domain/user/account/UserAccountPasswordEncodedTest.java
similarity index 87%
rename from src/test/java/org/woehlke/java/simpleworklist/test/user/domain/account/UserAccountPasswordEncodedTest.java
rename to src/test/java/org/woehlke/java/simpleworklist/domain/user/account/UserAccountPasswordEncodedTest.java
index db9410dd..9d8cce7c 100644
--- a/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/account/UserAccountPasswordEncodedTest.java
+++ b/src/test/java/org/woehlke/java/simpleworklist/domain/user/account/UserAccountPasswordEncodedTest.java
@@ -1,11 +1,10 @@
-package org.woehlke.java.simpleworklist.test.user.domain.account;
+package org.woehlke.java.simpleworklist.domain.user.account;
import org.springframework.security.crypto.password.PasswordEncoder;
-import org.woehlke.java.simpleworklist.test.application.config.AbstractTest;
+import org.woehlke.java.simpleworklist.config.AbstractTest;
import org.springframework.beans.factory.annotation.Autowired;
-import org.woehlke.java.simpleworklist.domain.user.account.UserAccountForm;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/src/test/java/org/woehlke/java/simpleworklist/domain/user/account/UserAccountSecurityServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/domain/user/account/UserAccountSecurityServiceTest.java
new file mode 100644
index 00000000..7923f3f6
--- /dev/null
+++ b/src/test/java/org/woehlke/java/simpleworklist/domain/user/account/UserAccountSecurityServiceTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.java.simpleworklist.domain.user.account;
+
+public class UserAccountSecurityServiceTest {
+}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/account/UserAccountServiceImplTest.java b/src/test/java/org/woehlke/java/simpleworklist/domain/user/account/UserAccountServiceImplTest.java
similarity index 96%
rename from src/test/java/org/woehlke/java/simpleworklist/test/user/domain/account/UserAccountServiceImplTest.java
rename to src/test/java/org/woehlke/java/simpleworklist/domain/user/account/UserAccountServiceImplTest.java
index 9c2df79f..325925bb 100644
--- a/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/account/UserAccountServiceImplTest.java
+++ b/src/test/java/org/woehlke/java/simpleworklist/domain/user/account/UserAccountServiceImplTest.java
@@ -1,4 +1,4 @@
-package org.woehlke.java.simpleworklist.test.user.domain.account;
+package org.woehlke.java.simpleworklist.domain.user.account;
import org.springframework.beans.factory.annotation.Autowired;
@@ -8,9 +8,7 @@
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.woehlke.java.simpleworklist.test.application.config.AbstractTest;
-import org.woehlke.java.simpleworklist.domain.user.account.UserAccount;
-import org.woehlke.java.simpleworklist.domain.user.account.UserAccountForm;
+import org.woehlke.java.simpleworklist.config.AbstractTest;
import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserPasswordRecoveryService;
import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistrationService;
import org.woehlke.java.simpleworklist.domain.user.login.LoginForm;
diff --git a/src/test/java/org/woehlke/java/simpleworklist/domain/user/account/UserAccountServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/domain/user/account/UserAccountServiceTest.java
new file mode 100644
index 00000000..2f63ad60
--- /dev/null
+++ b/src/test/java/org/woehlke/java/simpleworklist/domain/user/account/UserAccountServiceTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.java.simpleworklist.domain.user.account;
+
+public class UserAccountServiceTest {
+}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/user/login/UserLoginControllerTest.java b/src/test/java/org/woehlke/java/simpleworklist/domain/user/login/UserLoginControllerTest.java
similarity index 83%
rename from src/test/java/org/woehlke/java/simpleworklist/test/user/login/UserLoginControllerTest.java
rename to src/test/java/org/woehlke/java/simpleworklist/domain/user/login/UserLoginControllerTest.java
index d09c1f3b..c3ca925f 100644
--- a/src/test/java/org/woehlke/java/simpleworklist/test/user/login/UserLoginControllerTest.java
+++ b/src/test/java/org/woehlke/java/simpleworklist/domain/user/login/UserLoginControllerTest.java
@@ -1,11 +1,11 @@
-package org.woehlke.java.simpleworklist.test.user.login;
+package org.woehlke.java.simpleworklist.domain.user.login;
import static org.hamcrest.Matchers.containsString;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
-import org.woehlke.java.simpleworklist.test.application.config.AbstractTest;
+import org.woehlke.java.simpleworklist.config.AbstractTest;
public class UserLoginControllerTest extends AbstractTest {
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/register/UserRegistrationControllerTest.java b/src/test/java/org/woehlke/java/simpleworklist/domain/user/register/UserRegistrationControllerTest.java
similarity index 94%
rename from src/test/java/org/woehlke/java/simpleworklist/test/user/domain/register/UserRegistrationControllerTest.java
rename to src/test/java/org/woehlke/java/simpleworklist/domain/user/register/UserRegistrationControllerTest.java
index 91024f5e..954a26f5 100644
--- a/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/register/UserRegistrationControllerTest.java
+++ b/src/test/java/org/woehlke/java/simpleworklist/domain/user/register/UserRegistrationControllerTest.java
@@ -1,6 +1,6 @@
-package org.woehlke.java.simpleworklist.test.user.domain.register;
+package org.woehlke.java.simpleworklist.domain.user.register;
-import org.woehlke.java.simpleworklist.test.application.config.AbstractTest;
+import org.woehlke.java.simpleworklist.config.AbstractTest;
import org.springframework.beans.factory.annotation.Autowired;
import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistration;
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/register/UserRegistrationServiceImplTest.java b/src/test/java/org/woehlke/java/simpleworklist/domain/user/register/UserRegistrationServiceImplTest.java
similarity index 95%
rename from src/test/java/org/woehlke/java/simpleworklist/test/user/domain/register/UserRegistrationServiceImplTest.java
rename to src/test/java/org/woehlke/java/simpleworklist/domain/user/register/UserRegistrationServiceImplTest.java
index c083146b..8b784f5f 100644
--- a/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/register/UserRegistrationServiceImplTest.java
+++ b/src/test/java/org/woehlke/java/simpleworklist/domain/user/register/UserRegistrationServiceImplTest.java
@@ -1,7 +1,7 @@
-package org.woehlke.java.simpleworklist.test.user.domain.register;
+package org.woehlke.java.simpleworklist.domain.user.register;
import org.springframework.beans.factory.annotation.Value;
-import org.woehlke.java.simpleworklist.test.application.config.AbstractTest;
+import org.woehlke.java.simpleworklist.config.AbstractTest;
import org.woehlke.java.simpleworklist.domain.user.signup.UserRegistration;
import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserPasswordRecovery;
import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserPasswordRecoveryService;
diff --git a/src/test/java/org/woehlke/java/simpleworklist/domain/user/register/UserRegistrationServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/domain/user/register/UserRegistrationServiceTest.java
new file mode 100644
index 00000000..f485ae24
--- /dev/null
+++ b/src/test/java/org/woehlke/java/simpleworklist/domain/user/register/UserRegistrationServiceTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.java.simpleworklist.domain.user.register;
+
+public class UserRegistrationServiceTest {
+}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/resetpassword/UserPasswordRecoveryControllerTest.java b/src/test/java/org/woehlke/java/simpleworklist/domain/user/resetpassword/UserPasswordRecoveryControllerTest.java
similarity index 94%
rename from src/test/java/org/woehlke/java/simpleworklist/test/user/domain/resetpassword/UserPasswordRecoveryControllerTest.java
rename to src/test/java/org/woehlke/java/simpleworklist/domain/user/resetpassword/UserPasswordRecoveryControllerTest.java
index 2f02d978..ab387a33 100644
--- a/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/resetpassword/UserPasswordRecoveryControllerTest.java
+++ b/src/test/java/org/woehlke/java/simpleworklist/domain/user/resetpassword/UserPasswordRecoveryControllerTest.java
@@ -1,6 +1,6 @@
-package org.woehlke.java.simpleworklist.test.user.domain.resetpassword;
+package org.woehlke.java.simpleworklist.domain.user.resetpassword;
-import org.woehlke.java.simpleworklist.test.application.config.AbstractTest;
+import org.woehlke.java.simpleworklist.config.AbstractTest;
import org.springframework.beans.factory.annotation.Autowired;
import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserPasswordRecovery;
diff --git a/src/test/java/org/woehlke/java/simpleworklist/domain/user/resetpassword/UserPasswordRecoveryServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/domain/user/resetpassword/UserPasswordRecoveryServiceTest.java
new file mode 100644
index 00000000..9558e65d
--- /dev/null
+++ b/src/test/java/org/woehlke/java/simpleworklist/domain/user/resetpassword/UserPasswordRecoveryServiceTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.java.simpleworklist.domain.user.resetpassword;
+
+public class UserPasswordRecoveryServiceTest {
+}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/domain/user/resetpassword/resetpassword/UserPasswordRecoveryControllerTest.java b/src/test/java/org/woehlke/java/simpleworklist/domain/user/resetpassword/resetpassword/UserPasswordRecoveryControllerTest.java
new file mode 100644
index 00000000..673d5d6f
--- /dev/null
+++ b/src/test/java/org/woehlke/java/simpleworklist/domain/user/resetpassword/resetpassword/UserPasswordRecoveryControllerTest.java
@@ -0,0 +1,61 @@
+package org.woehlke.java.simpleworklist.domain.user.resetpassword.resetpassword;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.woehlke.java.simpleworklist.config.AbstractTest;
+import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserPasswordRecovery;
+import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserPasswordRecoveryService;
+import org.woehlke.java.simpleworklist.domain.user.passwordrecovery.UserPasswordRecoveryStatus;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
+
+public class UserPasswordRecoveryControllerTest extends AbstractTest {
+
+ @Autowired
+ private UserPasswordRecoveryService userPasswordRecoveryService;
+
+ //@Test
+ public void testResetPassword() throws Exception {
+ this.mockMvc.perform(
+ get("/user/resetPassword")).andDo(print())
+ .andExpect(view().name(containsString("user/resetPassword/resetPasswordForm")));
+ }
+
+ //@Test
+ public void testEnterNewPasswordFormular() throws Exception {
+ this.mockMvc.perform(
+ get("/user/resetPassword/confirm/ASDF")).andDo(print())
+ .andExpect(view().name(containsString("user/resetPassword/resetPasswordNotConfirmed")));
+ }
+
+ //@Test
+ public void testEnterNewPasswordFormularWithToken() throws Exception {
+ userPasswordRecoveryService.passwordRecoverySendEmailTo(emails[0]);
+ try {
+ Thread.sleep(2000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ UserPasswordRecovery o = testHelperService.findPasswordRecoveryByEmail(emails[0]);
+ assertNotNull(o);
+ boolean result = o.getDoubleOptInStatus()== UserPasswordRecoveryStatus.PASSWORD_RECOVERY_SAVED_EMAIL
+ || o.getDoubleOptInStatus()== UserPasswordRecoveryStatus.PASSWORD_RECOVERY_SENT_EMAIL;
+ assertTrue(result);
+ String url = "/user/resetPassword/confirm/"+o.getToken();
+ this.mockMvc.perform(
+ get(url)).andDo(print())
+ .andExpect(view().name(containsString("user/resetPassword/resetPasswordConfirmed")))
+ .andExpect(model().attributeExists("userAccountFormBean"));
+ userPasswordRecoveryService.passwordRecoveryDone(o);
+ }
+
+ //@Test
+ public void finish(){
+ super.deleteAll();
+ }
+}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/domain/user/resetpassword/resetpassword/UserPasswordRecoveryServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/domain/user/resetpassword/resetpassword/UserPasswordRecoveryServiceTest.java
new file mode 100644
index 00000000..0cb7424d
--- /dev/null
+++ b/src/test/java/org/woehlke/java/simpleworklist/domain/user/resetpassword/resetpassword/UserPasswordRecoveryServiceTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.java.simpleworklist.domain.user.resetpassword.resetpassword;
+
+public class UserPasswordRecoveryServiceTest {
+}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/domain/user/selfservice/UserSelfserviceControllerTest.java b/src/test/java/org/woehlke/java/simpleworklist/domain/user/selfservice/UserSelfserviceControllerTest.java
new file mode 100644
index 00000000..76d60e00
--- /dev/null
+++ b/src/test/java/org/woehlke/java/simpleworklist/domain/user/selfservice/UserSelfserviceControllerTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.java.simpleworklist.domain.user.selfservice;
+
+public class UserSelfserviceControllerTest {
+}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/domain/user/token/TokenGeneratorServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/domain/user/token/TokenGeneratorServiceTest.java
new file mode 100644
index 00000000..2e171d98
--- /dev/null
+++ b/src/test/java/org/woehlke/java/simpleworklist/domain/user/token/TokenGeneratorServiceTest.java
@@ -0,0 +1,4 @@
+package org.woehlke.java.simpleworklist.domain.user.token;
+
+public class TokenGeneratorServiceTest {
+}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/context/ContextControllerTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/context/ContextControllerTest.java
deleted file mode 100644
index e4557d5d..00000000
--- a/src/test/java/org/woehlke/java/simpleworklist/test/context/ContextControllerTest.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.woehlke.java.simpleworklist.test.context;
-
-public class ContextControllerTest {
-}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/context/ContextServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/context/ContextServiceTest.java
deleted file mode 100644
index c12cd26c..00000000
--- a/src/test/java/org/woehlke/java/simpleworklist/test/context/ContextServiceTest.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.woehlke.java.simpleworklist.test.context;
-
-public class ContextServiceTest {
-}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/project/ProjectControllerTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/project/ProjectControllerTest.java
deleted file mode 100644
index ad426efb..00000000
--- a/src/test/java/org/woehlke/java/simpleworklist/test/project/ProjectControllerTest.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.woehlke.java.simpleworklist.test.project;
-
-public class ProjectControllerTest {
-}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/project/ProjectServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/project/ProjectServiceTest.java
deleted file mode 100644
index 91e8f5cb..00000000
--- a/src/test/java/org/woehlke/java/simpleworklist/test/project/ProjectServiceTest.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.woehlke.java.simpleworklist.test.project;
-
-public class ProjectServiceTest {
-}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/search/SearchControllerTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/search/SearchControllerTest.java
deleted file mode 100644
index 878e6afe..00000000
--- a/src/test/java/org/woehlke/java/simpleworklist/test/search/SearchControllerTest.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.woehlke.java.simpleworklist.test.search;
-
-public class SearchControllerTest {
-}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/search/SearchServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/search/SearchServiceTest.java
deleted file mode 100644
index fa18bab4..00000000
--- a/src/test/java/org/woehlke/java/simpleworklist/test/search/SearchServiceTest.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.woehlke.java.simpleworklist.test.search;
-
-public class SearchServiceTest {
-}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskControllerTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskControllerTest.java
deleted file mode 100644
index 68c6e193..00000000
--- a/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskControllerTest.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.woehlke.java.simpleworklist.test.task;
-
-public class TaskControllerTest {
-}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskMoveControllerTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskMoveControllerTest.java
deleted file mode 100644
index 1a86829a..00000000
--- a/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskMoveControllerTest.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.woehlke.java.simpleworklist.test.task;
-
-public class TaskMoveControllerTest {
-}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskMoveServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskMoveServiceTest.java
deleted file mode 100644
index 590d93cd..00000000
--- a/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskMoveServiceTest.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.woehlke.java.simpleworklist.test.task;
-
-public class TaskMoveServiceTest {
-}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskServiceTest.java
deleted file mode 100644
index 0ad78565..00000000
--- a/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskServiceTest.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.woehlke.java.simpleworklist.test.task;
-
-public class TaskServiceTest {
-}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskStateControllerTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskStateControllerTest.java
deleted file mode 100644
index 97da69dc..00000000
--- a/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskStateControllerTest.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.woehlke.java.simpleworklist.test.task;
-
-public class TaskStateControllerTest {
-}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskStateServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskStateServiceTest.java
deleted file mode 100644
index 4d627672..00000000
--- a/src/test/java/org/woehlke/java/simpleworklist/test/task/TaskStateServiceTest.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.woehlke.java.simpleworklist.test.task;
-
-public class TaskStateServiceTest {
-}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/account/UserAccountAccessServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/account/UserAccountAccessServiceTest.java
deleted file mode 100644
index bb4b8c75..00000000
--- a/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/account/UserAccountAccessServiceTest.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.woehlke.java.simpleworklist.test.user.domain.account;
-
-public class UserAccountAccessServiceTest {
-}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/account/UserAccountSecurityServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/account/UserAccountSecurityServiceTest.java
deleted file mode 100644
index ec50932b..00000000
--- a/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/account/UserAccountSecurityServiceTest.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.woehlke.java.simpleworklist.test.user.domain.account;
-
-public class UserAccountSecurityServiceTest {
-}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/account/UserAccountServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/account/UserAccountServiceTest.java
deleted file mode 100644
index 31ab935e..00000000
--- a/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/account/UserAccountServiceTest.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.woehlke.java.simpleworklist.test.user.domain.account;
-
-public class UserAccountServiceTest {
-}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/chat/User2UserMessageControllerTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/chat/User2UserMessageControllerTest.java
deleted file mode 100644
index f4ae279c..00000000
--- a/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/chat/User2UserMessageControllerTest.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.woehlke.java.simpleworklist.test.user.domain.chat;
-
-public class User2UserMessageControllerTest {
-}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/chat/User2UserMessageServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/chat/User2UserMessageServiceTest.java
deleted file mode 100644
index 966d6d37..00000000
--- a/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/chat/User2UserMessageServiceTest.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.woehlke.java.simpleworklist.test.user.domain.chat;
-
-public class User2UserMessageServiceTest {
-}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/register/UserRegistrationServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/register/UserRegistrationServiceTest.java
deleted file mode 100644
index 95c0871e..00000000
--- a/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/register/UserRegistrationServiceTest.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.woehlke.java.simpleworklist.test.user.domain.register;
-
-public class UserRegistrationServiceTest {
-}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/resetpassword/UserPasswordRecoveryServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/resetpassword/UserPasswordRecoveryServiceTest.java
deleted file mode 100644
index 8654d3d8..00000000
--- a/src/test/java/org/woehlke/java/simpleworklist/test/user/domain/resetpassword/UserPasswordRecoveryServiceTest.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.woehlke.java.simpleworklist.test.user.domain.resetpassword;
-
-public class UserPasswordRecoveryServiceTest {
-}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/user/selfservice/UserSelfserviceControllerTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/user/selfservice/UserSelfserviceControllerTest.java
deleted file mode 100644
index 7baf1589..00000000
--- a/src/test/java/org/woehlke/java/simpleworklist/test/user/selfservice/UserSelfserviceControllerTest.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.woehlke.java.simpleworklist.test.user.selfservice;
-
-public class UserSelfserviceControllerTest {
-}
diff --git a/src/test/java/org/woehlke/java/simpleworklist/test/user/token/TokenGeneratorServiceTest.java b/src/test/java/org/woehlke/java/simpleworklist/test/user/token/TokenGeneratorServiceTest.java
deleted file mode 100644
index 37d6f293..00000000
--- a/src/test/java/org/woehlke/java/simpleworklist/test/user/token/TokenGeneratorServiceTest.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.woehlke.java.simpleworklist.test.user.token;
-
-public class TokenGeneratorServiceTest {
-}