Merge branch 'zr' into develop

src/test/java/http/cases/DefinedActivityTest/CustomActivity_DuibaTest.java

@@ -253,6 +253,7 @@ public class CustomActivity_DuibaTest extends DuibaTestBase {
         String orderId = response.jsonPath().getString("orderId");
         newActivityService.submit(orderId);
 
+        Thread.sleep(1000);
         response = newActivityService.getOrderStatus2(orderId, device);
         String result = String.valueOf(response.jsonPath().getString("result"));
         int i = 8;

src/test/java/http/cases/DefinedActivityTest/答题_答对题数抽奖_DuibaTest.java

@@ -61,19 +61,32 @@ public class 答题_答对题数抽奖_DuibaTest extends AbstractTestNGSpringCon
              Assert.assertEquals(submitResponse.jsonPath().getString("message"),message);
         } else {
             Assert.assertEquals(submitResponse.jsonPath().getInt("rightCount"),rightCount);
-            for (int i =1; i <= 5; i++)   {
-                  //获取中奖结果，校验中奖结果
-                  Response lotterysResponse = activityCtrlService.getOrderStatus(orderId);
-                  int result = lotterysResponse.jsonPath().getInt("result");
-                  if(result != 0) {
-                      Assert.assertTrue(lotterysResponse.jsonPath().getBoolean("success"));
-                      //   Assert.assertEquals(lotterysResponse.jsonPath().getString("lottery.type"),prize);
-                      Assert.assertTrue(prize.contains(lotterysResponse.jsonPath().getString("lottery.type")));
-                      break;
-                  }
-                  Thread.sleep(500);
+//            for (int i =1; i <= 5; i++)   {
+//                  //获取中奖结果，校验中奖结果
+//                  Response lotterysResponse = activityCtrlService.getOrderStatus(orderId);
+//                  int result = lotterysResponse.jsonPath().getInt("result");
+//                  if(result != 0) {
+//                      Assert.assertTrue(lotterysResponse.jsonPath().getBoolean("success"));
+//                      //   Assert.assertEquals(lotterysResponse.jsonPath().getString("lottery.type"),prize);
+//                      Assert.assertTrue(prize.contains(lotterysResponse.jsonPath().getString("lottery.type")));
+//                      break;
+//                  }
+//                  Thread.sleep(500);
+//            }
+            Thread.sleep(2000);
+            Response lotterysResponse = activityCtrlService.getOrderStatus(orderId);
+            String result = lotterysResponse.jsonPath().getString("result");
+            int i= 30;
+            while(i>0&&(result.equals("0"))){
+                Thread.sleep(1000);
+                lotterysResponse = activityCtrlService.getOrderStatus(orderId);
+                result = lotterysResponse.jsonPath().getString("result");
+                i--;
+                lotterysResponse.prettyPrint();
             }
-            Assert.assertFalse(false,caseDesc+" 测试失败，轮询5次未请求到中奖结果");
+            Assert.assertTrue(lotterysResponse.jsonPath().getBoolean("success"));
+            Assert.assertTrue(prize.contains(lotterysResponse.jsonPath().getString("lottery.type")));
+  //          Assert.assertFalse(false,caseDesc+" 测试失败，轮询5次未请求到中奖结果");
         }
     }
 

src/test/java/http/cases/NewActivityTest/无积分测试_DuibaTest.java

@@ -62,7 +62,7 @@ public class 无积分测试_DuibaTest extends DuibaTestBase {
                 Assert.assertEquals(response_ajax.jsonPath().getString("element.status"),"4","校验status失败");
                 logger.info("ajax校验项:status成功");
                 Assert.assertEquals(response.jsonPath().getString("message"),"永久次数已用完","校验message失败");
-                Assert.assertEquals(response.jsonPath().getString("status"),"3","校验status失败");
+                Assert.assertEquals(response.jsonPath().getString("status"),"4","校验status失败");
                 Assert.assertEquals(response.jsonPath().getString("success"),"false","校验success失败");
                 logger.info("doJoin校验项:message,status,success成功");
                 break;
@@ -84,7 +84,7 @@ public class 无积分测试_DuibaTest extends DuibaTestBase {
         }
 
         //切换回2720用户
-        authorization.dafuwengLogin(2720,true);
+        //authorization.dafuwengLogin(2720,true);
     }
 
 

src/test/java/http/service/hd/ActivityCtrlService.java

@@ -48,8 +48,8 @@ public class ActivityCtrlService {
         params.put("actId",actId);
 
         Response response = given().contentType("application/x-www-form-urlencoded;charset=UTF-8").cookies(authorization.dafuwengLogin(uid)).params(params)
-                .post(activityHost+"/newActivity/ajaxElement");
-        logger.info("请求/newActivity/ajaxElement接口，响应结果："+response.asString());
+                .post(activityHost+"/hdtool/ajaxElement");
+        logger.info("请求/hdtool/ajaxElement接口，响应结果："+response.asString());
         return response;
     }
 
@@ -58,8 +58,8 @@ public class ActivityCtrlService {
         params.put("activityId",activityId);
         params.put("token",token);
         Response response = given().contentType("application/x-www-form-urlencoded;charset=UTF-8").cookies(authorization.dafuwengLogin(uid)).params(params)
-                .post(activityHost+"/newActivity/doJoin");
-        logger.info("请求/newActivity/doJoin接口，响应结果："+response.asString());
+                .post(activityHost+"/hdtool/doJoin");
+        logger.info("请求/hdtool/doJoin接口，响应结果："+response.asString());
         return response;
     }
 
@@ -84,8 +84,8 @@ public class ActivityCtrlService {
         params.put("answerData",answerData);
         params.put("token",token);
         Response response = given().contentType("application/x-www-form-urlencoded;charset=UTF-8").cookies(authorization.dafuwengLogin(uid)).params(params)
-                .post(activityHost+"/newActivity/submit");
-        logger.info("请求/newActivity/submit接口，响应结果："+response.asString());
+                .post(activityHost+"/hdtool/submit");
+        logger.info("请求/hdtool/submit接口，响应结果："+response.asString());
         return response;
     }
 
@@ -96,14 +96,14 @@ public class ActivityCtrlService {
      */
     public Response getOrderStatus(long orderId) throws Exception{
         Response response = given().contentType("application/x-www-form-urlencoded;charset=UTF-8").cookies(authorization.dafuwengLogin(uid)).param("orderId",orderId)
-                .post(activityHost+"/newActivity/getOrderStatus");
-        logger.info("请求/newActivity/getOrderStatus接口，响应结果："+response.asString());
+                .post(activityHost+"/hdtool/getOrderStatus");
+        logger.info("请求/hdtool/getOrderStatus接口，响应结果："+response.asString());
         try{
             Assert.assertEquals(response.jsonPath().getString("success"),"true");
         }catch(Exception e){
-            throw new Exception("/newActivity/getOrderStatus接口失败,返回信息："+response.asString());
+            throw new Exception("/hdtool/getOrderStatus接口失败,返回信息："+response.asString());
         }catch(Error er){
-            throw new Exception("/newActivity/getOrderStatus接口失败,返回信息："+response.asString());
+            throw new Exception("/hdtool/getOrderStatus接口失败,返回信息："+response.asString());
 
         }
         return response;