验证码jUnit测试类框架，待完善

src/main/java/cn/quantgroup/xyqb/aspect/captcha/CaptchaNewValidateAdvisor.java

@@ -79,7 +79,7 @@ public class CaptchaNewValidateAdvisor {
         String phoneNo = request.getParameter("phoneNo");
         String clientType = request.getParameter("clientType");
         log.info("使用极验二次验证,phoneNo:{}", phoneNo);
-        return geetestCaptchaService.validGeetestCaptcha(ClientType.valueByName(clientType), PasswordUtil.MD5(phoneNo), IPUtil.getRemoteIP(request), challenge, validate, seccode);
+        return geetestCaptchaService.validGeetestCaptcha(PasswordUtil.MD5(phoneNo), IPUtil.getRemoteIP(request), ClientType.valueByName(clientType), challenge, validate, seccode);
     }
 
     /**

src/main/java/cn/quantgroup/xyqb/service/captcha/IGeetestCaptchaService.java

@@ -12,25 +12,25 @@ public interface IGeetestCaptchaService {
     /**
      * 获取极验验证码
      *
-     * @param markStr    标示
-     * @param remoteIp
-     * @param clientType
+     * @param markId 用户标识
+     * @param remoteIp 请求终端真实IP
+     * @param clientType 请求终端类型
      * @return 获取失败返回null
      */
-    Map<String, String> fetchGeetestCaptcha(String markStr, String remoteIp, ClientType clientType);
+    Map<String, String> fetchGeetestCaptcha(String markId, String remoteIp, ClientType clientType);
 
 
     /**
      * 二次验证
      *
-     * @param clientType
-     * @param phoneNo
-     * @param remoteIp
+     * @param markId 用户标识
+     * @param remoteIp 请求终端真实IP
+     * @param clientType 请求终端类型
      * @param challenge
      * @param validate
      * @param seccode
      * @return
      */
-    boolean validGeetestCaptcha(ClientType clientType, String phoneNo, String remoteIp, String challenge, String validate, String seccode);
+    boolean validGeetestCaptcha(String markId, String remoteIp, ClientType clientType, String challenge, String validate, String seccode);
 
 }

src/main/java/cn/quantgroup/xyqb/service/captcha/impl/GeetestCaptchaServiceImpl.java

@@ -40,15 +40,15 @@ public class GeetestCaptchaServiceImpl implements IGeetestCaptchaService {
     private String apiUrl;
 
     @Override
-    public Map<String, String> fetchGeetestCaptcha(String markStr, String remoteIp, ClientType clientType) {
+    public Map<String, String> fetchGeetestCaptcha(String markId, String remoteIp, ClientType clientType) {
         GeetestLib gtSdk = new GeetestLib(captchaId, privateKey, newFailback, apiUrl);
-        HashMap<String, String> param = getParam(markStr, remoteIp, clientType);
+        HashMap<String, String> param = getParam(markId, remoteIp, clientType);
         return gtSdk.getResponseStr(param);
     }
 
     @Override
-    public boolean validGeetestCaptcha(ClientType clientType, String markStr, String remoteIp, String challenge, String validate, String seccode) {
-        HashMap<String, String> param = getParam(markStr, remoteIp, clientType);
+    public boolean validGeetestCaptcha(String markId, String remoteIp, ClientType clientType, String challenge, String validate, String seccode) {
+        HashMap<String, String> param = getParam(markId, remoteIp, clientType);
         return Constants.GT_CAPTCHA_VALIDATE_SUCCESS==getGeetestSdk().enhencedValidateRequest(challenge, validate, seccode, param);
     }
 
@@ -56,9 +56,9 @@ public class GeetestCaptchaServiceImpl implements IGeetestCaptchaService {
         return new GeetestLib(captchaId, privateKey, newFailback, apiUrl);
     }
 
-    private HashMap<String, String> getParam(String markStr, String remoteIp, ClientType clientType) {
+    private HashMap<String, String> getParam(String markId, String remoteIp, ClientType clientType) {
         HashMap<String, String> param = new HashMap<>();
-        param.put("user_id", markStr);
+        param.put("user_id", markId);
         if (Objects.isNull(clientType)) {
             param.put("client_type", ClientType.APP.name());
         }else{

src/test/java/CaptchaVerifyTests.java

+import service.GeetestCaptchaServiceTest;
+import service.QuantgroupCaptchaServiceTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({GeetestCaptchaServiceTest.class, QuantgroupCaptchaServiceTest.class})
+public class CaptchaVerifyTests {}
\ No newline at end of file

src/test/java/CommonTests.java

-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-public class CommonTests {
-
-  @Test
-  public void compileBooleanAndNull() {
-    Assert.assertFalse(null instanceof Boolean);
-    Assert.assertNotEquals(null, Boolean.TRUE);
-    Assert.assertNotEquals(null, Boolean.FALSE);
-  }
-
-  @Test
-  public void print() {
-    System.out.println(null instanceof Boolean);
-    System.out.println(Boolean.TRUE.equals(null));
-    System.out.println(Boolean.FALSE.equals(null));
-  }
-
-}

src/test/java/DemoTests.java

+import demo.*;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({DynamicTests.class, GeetestCaptchaServiceTest.class, MockMvcTests.class, MvcTests.class,
+        ParametersJunit4Tests.class, ParametersJunit5Tests.class, QuantgroupCaptchaServiceTest.class,
+        RepsitoryJpaTests.class, RepsitoryTests.class, ServiceTests.class, WebTests.class})
+public class DemoTests {}
\ No newline at end of file

src/test/java/UserAuthorizedTests.java

+import repsitory.UserAuthorizedRepsitoryTests;
+import service.UserAuthorizedServiceTests;
+import web.UserAuthorizedControllerTests;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({UserAuthorizedRepsitoryTests.class, UserAuthorizedServiceTests.class, UserAuthorizedControllerTests.class})
+public class UserAuthorizedTests {}
\ No newline at end of file

src/test/java/service/GeetestCaptchaServiceTest.java

@@ -13,6 +13,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import javax.annotation.Resource;
+import java.util.Map;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = Bootstrap.class)
@@ -22,9 +23,15 @@ public class GeetestCaptchaServiceTest {
     @Resource
     private IGeetestCaptchaService geetestCaptchaService;
 
+    private String phoneNo = "18010043006";
+    private String remoteIp = "127.0.0.1";
+    private ClientType clientType = ClientType.H5;
+    private Map<String, String> data = null;
+
     @Test
     public void testFetchGeetestCaptcha(){
-        Assert.assertNotNull(geetestCaptchaService.fetchGeetestCaptcha(PasswordUtil.MD5("18010043006"),"127.0.0.1", ClientType.APP));
+        data = geetestCaptchaService.fetchGeetestCaptcha(PasswordUtil.MD5(phoneNo), remoteIp, clientType);
+        Assert.assertNotNull(data);
     }
 
 
@@ -33,6 +40,6 @@ public class GeetestCaptchaServiceTest {
         String challenge = "d6e965e06b187c0a01276834d2ff00e6";
         String validate = "validate";
         String seccode = "seccode";
-        Assert.assertTrue(geetestCaptchaService.validGeetestCaptcha(ClientType.APP,"127.0.0.1", PasswordUtil.MD5("18010043006"),challenge,validate,seccode));
+        Assert.assertTrue(geetestCaptchaService.validGeetestCaptcha(PasswordUtil.MD5(phoneNo), remoteIp, clientType, challenge, validate, seccode));
     }
 }