clean up tests

R-Sandor · Sep 15, 2024 · 2f17eff · 2f17eff
1 parent d0d6ea7
commit 2f17eff
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 47 deletions.
diff --git a/server/src/main/java/dev/findfirst/core/model/Tag.java b/server/src/main/java/dev/findfirst/core/model/Tag.java
@@ -32,11 +32,9 @@ public class Tag extends Tenantable {
   private Long id;
 
   @Column(length = 255)
-  @NonNull
-  private String tag_title;
+  @NonNull private String tag_title;
 
-  public Tag() {
-  }
+  public Tag() {}
 
   public Tag(String tagVal) {
     this.tag_title = tagVal;

diff --git a/server/src/main/java/dev/findfirst/core/service/ScreenshotManager.java b/server/src/main/java/dev/findfirst/core/service/ScreenshotManager.java
@@ -1,11 +1,10 @@
 package dev.findfirst.core.service;
 
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
-import lombok.RequiredArgsConstructor;
-
 @Service
 @RequiredArgsConstructor
 public class ScreenshotManager {

diff --git a/server/src/main/java/dev/findfirst/core/service/TagService.java b/server/src/main/java/dev/findfirst/core/service/TagService.java
@@ -6,12 +6,9 @@
 
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
-
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import dev.findfirst.core.model.Tag;
-import dev.findfirst.core.repository.BookmarkRepository;
 import dev.findfirst.core.repository.TagRepository;
 
 @Service
@@ -20,8 +17,6 @@ public class TagService {
 
   private final TagRepository tagRepository;
 
-  private final BookmarkRepository bkmkRepo;
-
   public Tag addTag(String title) {
     return tagRepository.saveAndFlush(new Tag(title));
   }

diff --git a/server/src/main/java/dev/findfirst/security/jwt/service/RefreshTokenService.java b/server/src/main/java/dev/findfirst/security/jwt/service/RefreshTokenService.java
@@ -4,6 +4,7 @@
 import java.util.Optional;
 import java.util.UUID;
 
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -13,7 +14,6 @@
 import dev.findfirst.security.userAuth.models.RefreshToken;
 import dev.findfirst.users.model.user.User;
 import dev.findfirst.users.repository.UserRepo;
-import lombok.RequiredArgsConstructor;
 
 @Service
 @RequiredArgsConstructor

diff --git a/server/src/main/java/dev/findfirst/security/userAuth/service/UserDetailsServiceImpl.java b/server/src/main/java/dev/findfirst/security/userAuth/service/UserDetailsServiceImpl.java
@@ -1,5 +1,6 @@
 package dev.findfirst.security.userAuth.service;
 
+import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
@@ -8,7 +9,6 @@
 
 import dev.findfirst.users.model.user.User;
 import dev.findfirst.users.repository.UserRepo;
-import lombok.RequiredArgsConstructor;
 
 @Service
 @RequiredArgsConstructor

diff --git a/server/src/main/java/dev/findfirst/security/userAuth/tenant/aspects/TenantAspect.java b/server/src/main/java/dev/findfirst/security/userAuth/tenant/aspects/TenantAspect.java
@@ -1,17 +1,17 @@
 package dev.findfirst.security.userAuth.tenant.aspects;
 
+import lombok.RequiredArgsConstructor;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.hibernate.Session;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.stereotype.Component;
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
-import lombok.RequiredArgsConstructor;
+
 import dev.findfirst.core.annotations.DisableTenantFilter;
 import dev.findfirst.security.userAuth.tenant.contexts.TenantContext;
 import dev.findfirst.security.userAuth.utils.Constants;

diff --git a/server/src/test/java/dev/findfirst/core/DatabaseTest.java b/server/src/test/java/dev/findfirst/core/DatabaseTest.java
@@ -25,6 +25,11 @@
 @IntegrationTest
 public class DatabaseTest {
 
+  @Autowired
+  DatabaseTest(BookmarkRepository bkmkRepo) {
+    this.bkmkRepo = bkmkRepo;
+  }
+
   @MockBean
   private TenantContext tenantContext;
 
@@ -33,8 +38,7 @@ public class DatabaseTest {
   private static final PostgreSQLContainer<?> postgres =
       new PostgreSQLContainer<>("postgres:16.2-alpine3.19");
 
-  @Autowired
-  BookmarkRepository bkmkRepo;
+  final BookmarkRepository bkmkRepo;
 
   @Test
   void connectionEstablish() {

diff --git a/server/src/test/java/dev/findfirst/core/service/BookmarkServiceUnitTest.java b/server/src/test/java/dev/findfirst/core/service/BookmarkServiceUnitTest.java
diff --git a/server/src/test/java/dev/findfirst/core/service/ScreenshotManagerTest.java b/server/src/test/java/dev/findfirst/core/service/ScreenshotManagerTest.java
@@ -19,7 +19,7 @@ class ScreenshotManagerTest {
 
   @InjectMocks
   private ScreenshotManager screenshotManager;
-  
+
 
   @BeforeEach
   void setUp() {

diff --git a/server/src/test/java/dev/findfirst/core/service/TagServiceTest.java b/server/src/test/java/dev/findfirst/core/service/TagServiceTest.java