EFRS-1350: Cleaned up the tests

Author: VolodymyrBushko

java/admin/src/test/java/com/exadel/frs/AppServiceTest.java renamed to java/admin/src/test/java/com/exadel/frs/service/AppServiceTest.java

@@ -14,7 +14,7 @@
  * permissions and limitations under the License.
  */
 
-package com.exadel.frs;
+package com.exadel.frs.service;
 
 import com.exadel.frs.commonservice.entity.*;
 import com.exadel.frs.commonservice.enums.AppRole;

java/admin/src/test/java/com/exadel/frs/ModelServiceTest.java renamed to java/admin/src/test/java/com/exadel/frs/service/ModelServiceTest.java

@@ -14,7 +14,7 @@
  * permissions and limitations under the License.
  */
 
-package com.exadel.frs;
+package com.exadel.frs.service;
 
 import com.exadel.frs.commonservice.entity.App;
 import com.exadel.frs.commonservice.entity.Model;

java/admin/src/test/java/com/exadel/frs/ModelServiceTestIT.java renamed to java/admin/src/test/java/com/exadel/frs/service/ModelServiceTestIT.java

@@ -14,8 +14,10 @@
  * permissions and limitations under the License.
  */
 
-package com.exadel.frs;
+package com.exadel.frs.service;
 
+import com.exadel.frs.DbHelper;
+import com.exadel.frs.EmbeddedPostgreSQLTest;
 import com.exadel.frs.commonservice.projection.EmbeddingProjection;
 import com.exadel.frs.commonservice.entity.Model;
 import com.exadel.frs.commonservice.entity.Subject;

java/admin/src/test/java/com/exadel/frs/ResetPasswordTokenServiceTestIT.java renamed to java/admin/src/test/java/com/exadel/frs/service/ResetPasswordTokenServiceTestIT.java

@@ -1,10 +1,12 @@
-package com.exadel.frs;
+package com.exadel.frs.service;
 
 import static java.time.LocalDateTime.now;
 import static java.time.ZoneOffset.UTC;
 import static java.time.temporal.ChronoUnit.MILLIS;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import com.exadel.frs.DbHelper;
+import com.exadel.frs.EmbeddedPostgreSQLTest;
 import com.exadel.frs.commonservice.repository.UserRepository;
 import com.exadel.frs.exception.InvalidResetPasswordTokenException;
 import com.exadel.frs.exception.UserDoesNotExistException;

java/admin/src/test/java/com/exadel/frs/UserServiceTest.java renamed to java/admin/src/test/java/com/exadel/frs/service/UserServiceTest.java

@@ -14,7 +14,7 @@
  * permissions and limitations under the License.
  */
 
-package com.exadel.frs;
+package com.exadel.frs.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;

java/admin/src/test/java/com/exadel/frs/UserServiceTestIT.java renamed to java/admin/src/test/java/com/exadel/frs/service/UserServiceTestIT.java

@@ -14,8 +14,10 @@
  * permissions and limitations under the License.
  */
 
-package com.exadel.frs;
+package com.exadel.frs.service;
 
+import com.exadel.frs.DbHelper;
+import com.exadel.frs.EmbeddedPostgreSQLTest;
 import com.exadel.frs.commonservice.entity.User;
 import com.exadel.frs.commonservice.repository.UserRepository;
 import com.exadel.frs.dto.UserCreateDto;