structure update

src/test/java/io/spring/infrastructure/article/MyBatisArticleRepositoryTest.java

@@ -5,7 +5,8 @@ import io.spring.core.article.ArticleRepository;
 import io.spring.core.article.Tag;
 import io.spring.core.user.User;
 import io.spring.core.user.UserRepository;
-import io.spring.infrastructure.user.MyBatisUserRepository;
+import io.spring.infrastructure.repository.MyBatisArticleRepository;
+import io.spring.infrastructure.repository.MyBatisUserRepository;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

src/test/java/io/spring/infrastructure/comment/MyBatisCommentRepositoryTest.java

@@ -2,6 +2,7 @@ package io.spring.infrastructure.comment;
 
 import io.spring.core.comment.Comment;
 import io.spring.core.comment.CommentRepository;
+import io.spring.infrastructure.repository.MyBatisCommentRepository;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mybatis.spring.boot.test.autoconfigure.MybatisTest;

src/test/java/io/spring/infrastructure/favorite/MyBatisArticleFavoriteRepositoryTest.java

@@ -2,6 +2,7 @@ package io.spring.infrastructure.favorite;
 
 import io.spring.core.favorite.ArticleFavorite;
 import io.spring.core.favorite.ArticleFavoriteRepository;
+import io.spring.infrastructure.repository.MyBatisArticleFavoriteRepository;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mybatis.spring.boot.test.autoconfigure.MybatisTest;
@@ -21,7 +22,7 @@ public class MyBatisArticleFavoriteRepositoryTest {
     private ArticleFavoriteRepository articleFavoriteRepository;
 
     @Autowired
-    private ArticleFavoriteMapper articleFavoriteMapper;
+    private io.spring.infrastructure.mybatis.mapper.ArticleFavoriteMapper articleFavoriteMapper;
 
     @Test
     public void should_save_and_fetch_articleFavorite_success() throws Exception {

src/test/java/io/spring/infrastructure/service/DefaultJwtServiceTest.java

@@ -1,7 +1,7 @@
 package io.spring.infrastructure.service;
 
-import io.spring.application.JwtService;
-import io.spring.application.user.UserData;
+import io.spring.core.service.JwtService;
+import io.spring.core.user.User;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -9,7 +9,7 @@ import java.util.Optional;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.core.IsNull.notNullValue;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertThat;
 
 public class DefaultJwtServiceTest {
 
@@ -22,14 +22,12 @@ public class DefaultJwtServiceTest {
 
     @Test
     public void should_generate_and_parse_token() throws Exception {
-        String username = "aisensiy";
-
-        UserData userData = new UserData("123", "aisensiy@163.com", username, "", "");
-        String token = jwtService.toToken(userData);
+        User user = new User("email@email.com", "username", "123", "", "");
+        String token = jwtService.toToken(user);
         assertThat(token, notNullValue());
         Optional<String> optional = jwtService.getSubFromToken(token);
         assertThat(optional.isPresent(), is(true));
-        assertThat(optional.get(), is(username));
+        assertThat(optional.get(), is(user.getId()));
     }
 
     @Test

src/test/java/io/spring/infrastructure/user/MyBatisUserRepositoryTest.java

@@ -3,6 +3,7 @@ package io.spring.infrastructure.user;
 import io.spring.core.user.FollowRelation;
 import io.spring.core.user.User;
 import io.spring.core.user.UserRepository;
+import io.spring.infrastructure.repository.MyBatisUserRepository;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;