code cleanup

2 files changed, 4 insertions, 11 deletions

diff --git a/src/test/java/com/blog/web/repository/ArticleRepositoryTests.java b/src/test/java/com/blog/web/repository/ArticleRepositoryTests.java
index 31764e3..96c5f5b 100644
--- a/src/test/java/com/blog/web/repository/ArticleRepositoryTests.java
+++ b/src/test/java/com/blog/web/repository/ArticleRepositoryTests.java
@@ -7,21 +7,13 @@ import com.blog.web.models.Article;
 import com.blog.web.models.UserEntity;
 import com.blog.web.services.ArticleService;
 import com.blog.web.services.UserService;
-import org.junit.Assert;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.jdbc.EmbeddedDatabaseConnection;
 import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.security.test.context.support.WithMockUser;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
-import org.springframework.test.context.junit4.SpringRunner;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -48,7 +40,7 @@ public class ArticleRepositoryTests {
                 "blah"
         );
         userService.saveUser(userDto);
-        UserEntity user = userService.findByUsername("test");
+        UserEntity user = userService.findByUsername("test").orElseThrow();
         final ArticleDto articleDto1 = new ArticleDto(
                 1,
                 "Title",
diff --git a/src/test/java/com/blog/web/services/ArticleServiceTests.java b/src/test/java/com/blog/web/services/ArticleServiceTests.java
index 00e7bbd..d55516a 100644
--- a/src/test/java/com/blog/web/services/ArticleServiceTests.java
+++ b/src/test/java/com/blog/web/services/ArticleServiceTests.java
@@ -21,6 +21,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.security.test.context.support.WithMockUser;
 
 import java.time.LocalDateTime;
+import java.util.Optional;
 
 import static org.mockito.AdditionalAnswers.returnsFirstArg;
 import static org.mockito.ArgumentMatchers.any;
@@ -63,13 +64,13 @@ public class ArticleServiceTests {
                 LocalDateTime.now()
         );
 
-        when(userRepository.findByUsername(anyString())).thenReturn(user);
+        when(userRepository.findByUsername(anyString())).thenReturn(Optional.of(user));
         when(articleRepository.save(any(Article.class))).then(returnsFirstArg());
         //when(SecurityUtil.getSessionUser()).thenReturn(user.getUsername());
         try(MockedStatic<SecurityUtil> utilities = Mockito.mockStatic(SecurityUtil.class)) {
             utilities.when(SecurityUtil::getSessionUser).thenReturn(user.getUsername());
             Assertions.assertEquals(user.getUsername(), SecurityUtil.getSessionUser());
-            Article article = articleService.saveArticle(articleDto);
+            Article article = articleService.saveArticle(articleDto).orElse(null);
 
             Assertions.assertNotNull(article);
         }