更新jUnit(已绿，但事务没自动会滚)

src/main/java/cn/quantgroup/xyqb/service/auth/impl/UserAuthorizedServiceImpl.java

@@ -14,6 +14,7 @@ import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import javax.transaction.Transactional;
 import java.sql.Timestamp;
 import java.text.ParseException;
 import java.util.Objects;
@@ -65,6 +66,7 @@ public class UserAuthorizedServiceImpl implements IUserAuthorizedService {
         return (StringUtils.isBlank(name) || StringUtils.isBlank(authPattern) || !iIdCardService.isIdCardValid(idNo));
     }
 
+    @Transactional
     @Override
     public UserAuthorized createUserAuthorized(UserAuthorizedParam userAuthorizedParam) {
         // 数据检查,以及检查userUuid是否存在

src/test/java/demo/BaseParametersTests.java

@@ -2,12 +2,13 @@ package demo;
 
 import org.junit.Before;
 import org.springframework.test.context.TestContextManager;
+import org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests;
 
 /**
  * @author renwc
  * @date 2018-01-05
  */
-public abstract class BaseParametersTests {
+public abstract class BaseParametersTests extends AbstractTransactionalJUnit4SpringContextTests {
     private TestContextManager testContextManager;
     @Before
     public void setUpContext() throws Exception {

src/test/java/demo/RepsitoryTests.java

@@ -10,6 +10,7 @@ import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -28,7 +29,7 @@ import java.time.Instant;
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = Bootstrap.class)
 @ContextConfiguration(initializers = ApolloPropertySourceInitializer.class)
-public class RepsitoryTests {
+public class RepsitoryTests extends AbstractTransactionalJUnit4SpringContextTests {
 
     @Resource
     private IUserRepository userRepository;

src/test/java/demo/ServiceTests.java

@@ -10,6 +10,7 @@ import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -27,7 +28,7 @@ import java.time.Instant;
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = Bootstrap.class)
 @ContextConfiguration(initializers = ApolloPropertySourceInitializer.class)
-public class ServiceTests {
+public class ServiceTests extends AbstractTransactionalJUnit4SpringContextTests {
 
     @Resource
     private IUserService userService;

src/test/java/repsitory/UserAuthorizedRepsitoryTests.java

@@ -49,10 +49,10 @@ public class UserAuthorizedRepsitoryTests extends BaseParametersTests {
     @Parameterized.Parameters
     public static Collection<Object[]> data() {
         Object[][] data = new Object[][]{
-                {1L,"350504198805144101","史书一", AuthPattern.ZMXY, true},
-                {10L,"350504198805144102","史书二", AuthPattern.ZMXY, true},
-                {20L,"350504198805144103","史书三", AuthPattern.FOUR_ELEMENTS_OF_BANK_CARD, true},
-                {1L, "IDNO-1", "王-1", AuthPattern.ZMXY, true}
+                {"711892ae-191b-445a-a4eb-3c0b7bab7840","350504198805144101","史书一", AuthPattern.ZMXY, true},
+                {"711892ae-191b-445a-a4eb-3c0b7bab7841","350504198805144102","史书二", AuthPattern.ZMXY, true},
+                {"711892ae-191b-445a-a4eb-3c0b7bab7842","350504198805144103","史书三", AuthPattern.FOUR_ELEMENTS_OF_BANK_CARD, true},
+                {"711892ae-191b-445a-a4eb-3c0b7bab7843", "IDNO-1", "王-1", AuthPattern.ZMXY, true}
         };
         return Arrays.asList(data);
     }
@@ -60,24 +60,24 @@ public class UserAuthorizedRepsitoryTests extends BaseParametersTests {
     @Test
     public void testExist() throws Exception {
         log.info("testExist: name:{}, idNo:{}, userId:{}, authPattern:{}", obj.getName(), obj.getIdNo(), obj.getUserUuid(), obj.getAuthPattern());
-        UserAuthorized obj = new UserAuthorized();
         boolean exist = userAuthorizedRepository.exists(Example.of(obj));
-        Assert.assertNotNull(obj);
+        Assert.assertFalse(exist);
     }
 
     @Test
     public void testSave() throws Exception {
         log.info("testSave: name:{}, idNo:{}, userId:{}, authPattern:{}", obj.getName(), obj.getIdNo(), obj.getUserUuid(), obj.getAuthPattern());
-        UserAuthorized obj = new UserAuthorized();
-        obj = userAuthorizedRepository.save(obj);
-        Assert.assertNotNull(obj);
+        Object o = userAuthorizedRepository.save(obj);
+        Assert.assertNotNull(o);
+        Assert.assertEquals(obj, o);
     }
 
     @Test
-    public void testQuery(){
+    public void testThenQuery(){
         log.info("testQuery: name:{}, idNo:{}, userId:{}, authPattern:{}", obj.getName(), obj.getIdNo(), obj.getUserUuid(), obj.getAuthPattern());
-        UserAuthorized obj = userAuthorizedRepository.findByIdNo(this.obj.getIdNo());
-        Assert.assertNotNull(obj);
+        UserAuthorized o = userAuthorizedRepository.findByIdNo(this.obj.getIdNo());
+        Assert.assertNotNull(o);
+        Assert.assertEquals(obj.getIdNo(), o.getIdNo());
     }
 
 }

src/test/java/service/UserAuthorizedServiceTests.java

 package service;
 
 import cn.quantgroup.xyqb.Bootstrap;
+import cn.quantgroup.xyqb.entity.UserAuthorized;
 import cn.quantgroup.xyqb.model.AuthPattern;
 import cn.quantgroup.xyqb.model.UserAuthorizedParam;
 import cn.quantgroup.xyqb.service.auth.IUserAuthorizedService;
@@ -8,8 +9,10 @@ import com.ctrip.framework.apollo.spring.config.ApolloPropertySourceInitializer;
 import demo.BaseParametersTests;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Assert;
+import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
 import org.junit.runners.Parameterized;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.Rollback;
@@ -27,8 +30,9 @@ import java.util.Optional;
  * @date 2018-01-05
  */
 @Slf4j
-@Rollback
+@Rollback(true)
 @Transactional
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @RunWith(value = Parameterized.class)
 @SpringBootTest(classes = Bootstrap.class)
 @ContextConfiguration(initializers = ApolloPropertySourceInitializer.class)
@@ -48,10 +52,10 @@ public class UserAuthorizedServiceTests extends BaseParametersTests {
     @Parameterized.Parameters
     public static Collection<Object[]> data() {
         Object[][] data = new Object[][]{
-                {1L,"350504198805144101","史书一", AuthPattern.ZMXY, true},
-                {10L,"350504198805144102","史书二", AuthPattern.ZMXY, true},
-                {20L,"350504198805144103","史书三", AuthPattern.FOUR_ELEMENTS_OF_BANK_CARD, true},
-                {1L, "IDNO-1", "王-1", AuthPattern.ZMXY, true}
+                {"55544ae9-a1dd-458b-a7ac-2b4e64e59f99","350504198805144101","史书一", AuthPattern.ZMXY, true},
+                {"2f7715f1-e59e-4169-8214-89aef11d2291","350504198805144102","史书二", AuthPattern.ZMXY, true},
+                {"7addad2f-100b-49fa-ac44-bb729dfca06e","350504198805144103","史书三", AuthPattern.FOUR_ELEMENTS_OF_BANK_CARD, true},
+                {"2dae9875-71ba-47bd-9332-0e4922f75f12", "IDNO-1", "王-1", AuthPattern.ZMXY, true}
         };
         return Arrays.asList(data);
     }
@@ -59,22 +63,23 @@ public class UserAuthorizedServiceTests extends BaseParametersTests {
     @Test
     public void testExist() throws Exception {
         log.info("testExist: name:{}, idNo:{}, userId:{}, authPattern:{}", obj.getName(), obj.getIdNo(), obj.getUserUuid(), obj.getAuthPattern());
-        Object obj = userAuthorizedService.hasUserAuthorized(this.obj.getIdNo());
-        Assert.assertNotNull(obj);
+        Boolean exist = userAuthorizedService.hasUserAuthorized(this.obj.getIdNo());
+        Assert.assertFalse(exist);
     }
 
     @Test
     public void testSave() throws Exception {
         log.info("testSave: name:{}, idNo:{}, userId:{}, authPattern:{}", obj.getName(), obj.getIdNo(), obj.getUserUuid(), obj.getAuthPattern());
-        Object obj = userAuthorizedService.createUserAuthorized(this.obj);
-        Assert.assertNotNull(obj);
+        UserAuthorized o = userAuthorizedService.createUserAuthorized(this.obj);
+        Assert.assertNotNull(o);
+        Assert.assertEquals(obj.getIdNo(), o.getIdNo());
     }
 
     @Test
-    public void testQuery(){
+    public void testThenQuery(){
         log.info("testQuery: name:{}, idNo:{}, userId:{}, authPattern:{}", obj.getName(), obj.getIdNo(), obj.getUserUuid(), obj.getAuthPattern());
-        Object obj = userAuthorizedService.getUserAuthorizedId(this.obj.getUserUuid());
-        Assert.assertNotNull(obj);
+        Object o = userAuthorizedService.getUserAuthorizedId(this.obj.getUserUuid());
+        Assert.assertNotNull(o);
     }
 
 }

src/test/java/web/UserAuthorizedControllerTests.java

@@ -38,11 +38,12 @@ public class UserAuthorizedControllerTests extends BaseParametersTests {
     private TestRestTemplate restTemplate;
     private UserAuthorizedParam obj = new UserAuthorizedParam();
     {
-        Long userId = 1L;
+        String userUuid = "711892ae-191b-445a-a4eb-3c0b7bab7840";
         String idNo = "350504198805144101";
         String name = "史书一";
         AuthPattern authPattern = AuthPattern.ZMXY;
         Boolean available = true;
+        obj.setUserUuid(userUuid);
         obj.setIdNo(idNo);
         obj.setName(name);
         obj.setAuthPattern(Optional.ofNullable(authPattern).orElse(AuthPattern.ZMXY).name());
@@ -64,7 +65,7 @@ public class UserAuthorizedControllerTests extends BaseParametersTests {
 
     @Test
     public void testQuery(){
-        ResponseEntity<String> phil = restTemplate.getForEntity("/user/auth/{model}?userId={userId}", String.class, "getUserAuthorizedId");
+        ResponseEntity<String> phil = restTemplate.getForEntity("/user/auth/{model}?userUuid={userUuid}", String.class, "getUserAuthorizedId", obj.getUserUuid());
         Assert.assertEquals(phil.getStatusCode(), HttpStatus.OK);
     }