add

src/test/java/http/cases/GameTest/Game_AccessTest.java

 package http.cases.GameTest;
 
-import com.duiba.qa.duiba.common.DuibaConfig;
-import com.duiba.qa.duiba.service.Activity.ManagerService;
-import com.duiba.qa.duiba.service.Activity.NgapiService;
-import com.duiba.qa.duiba.service.Authorization;
-import com.duiba.qa.duiba.service.hd.ActivityService;
-import com.duiba.qa.duiba.utils.MatcherString;
-import com.duiba.qa.publics.datadriver.ExcelDataProvider;
-import com.duiba.qa.publics.util.DuibaLog;
+
+import base.DuibaLog;
+import http.service.Activity.ManagerService;
+import http.service.Activity.NgapiService;
+import http.service.Authorization;
+import http.service.hd.ActivityService;
 import io.restassured.response.Response;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -16,6 +14,8 @@ import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
+import utils.ExcelDataProvider;
+import utils.MatcherString;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
@@ -33,7 +33,6 @@ import static org.hamcrest.Matchers.equalTo;
  * case3:游戏测试：马上使用跳转优惠券兑换记录页的链接
  * case4:游戏测试：马上使用跳转福袋的链接
  */
-@ContextConfiguration(classes = DuibaConfig.class)
 public class Game_AccessTest extends AbstractTestNGSpringContextTests {
 
     @Autowired

src/test/java/http/cases/GameTest/游戏_中奖异常流程测试_AccessTest.java

@@ -7,16 +7,16 @@
  */
 package http.cases.GameTest;
 
-import com.duiba.qa.duiba.common.DuibaConfig;
-import com.duiba.qa.duiba.common.DuibaTestBase;
-import com.duiba.qa.duiba.service.Activity.NewGameService;
-import com.duiba.qa.duiba.utils.MatcherString;
-import com.duiba.qa.publics.util.DuibaLog;
+
+import base.DuibaLog;
+import base.DuibaTestBase;
+import http.service.Activity.NewGameService;
 import io.restassured.response.Response;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.testng.Assert;
 import org.testng.annotations.Test;
+import utils.MatcherString;
 
 import java.util.Map;
 
@@ -27,8 +27,7 @@ import java.util.Map;
  * @create 2018/4/24
  * @since 1.0.0
  */
-@ContextConfiguration(classes = DuibaConfig.class)
-public class 游戏_中奖异常流程测试_AccessTest extends DuibaTestBase{
+public class 游戏_中奖异常流程测试_AccessTest extends DuibaTestBase {
 
     @Autowired
     NewGameService newGameService;

src/test/java/http/cases/GameTest/游戏_区间中奖_AccessTest.java

@@ -7,17 +7,17 @@
  */
 package http.cases.GameTest;
 
-import com.duiba.qa.duiba.common.DuibaConfig;
-import com.duiba.qa.duiba.common.DuibaTestBase;
-import com.duiba.qa.duiba.service.Activity.NewGameService;
-import com.duiba.qa.duiba.utils.MatcherString;
-import com.duiba.qa.publics.util.DuibaLog;
+
+import base.DuibaLog;
+import base.DuibaTestBase;
+import http.service.Activity.NewGameService;
 import io.restassured.response.Response;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.Test;
+import utils.MatcherString;
 
 import java.util.List;
 import java.util.Map;
@@ -29,8 +29,7 @@ import java.util.Map;
  * @create 2018/5/13
  * @since 1.0.0
  */
-@ContextConfiguration(classes = DuibaConfig.class)
-public class 游戏_区间中奖_AccessTest extends DuibaTestBase{
+public class 游戏_区间中奖_AccessTest extends DuibaTestBase {
 
 
 

src/test/java/http/cases/GameTest/游戏_区间外不中奖_AccessTest.java

@@ -7,16 +7,16 @@
  */
 package http.cases.GameTest;
 
-import com.duiba.qa.duiba.common.DuibaConfig;
-import com.duiba.qa.duiba.common.DuibaTestBase;
-import com.duiba.qa.duiba.service.Activity.NewGameService;
-import com.duiba.qa.duiba.utils.MatcherString;
-import com.duiba.qa.publics.util.DuibaLog;
+
+import base.DuibaLog;
+import base.DuibaTestBase;
+import http.service.Activity.NewGameService;
 import io.restassured.response.Response;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.testng.Assert;
 import org.testng.annotations.Test;
+import utils.MatcherString;
 
 /**
  * 〈〉
@@ -25,7 +25,6 @@ import org.testng.annotations.Test;
  * @create 2018/6/7
  * @since 1.0.0
  */
-@ContextConfiguration(classes = DuibaConfig.class)
 public class 游戏_区间外不中奖_AccessTest extends DuibaTestBase {
 
 

src/test/java/http/cases/GameTest/游戏_区间奖品不足测试_AccessTest.java

@@ -7,16 +7,16 @@
  */
 package http.cases.GameTest;
 
-import com.duiba.qa.duiba.common.DuibaConfig;
-import com.duiba.qa.duiba.common.DuibaTestBase;
-import com.duiba.qa.duiba.service.Activity.NewGameService;
-import com.duiba.qa.duiba.utils.MatcherString;
-import com.duiba.qa.publics.util.DuibaLog;
+
+import base.DuibaLog;
+import base.DuibaTestBase;
+import http.service.Activity.NewGameService;
 import io.restassured.response.Response;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.testng.Assert;
 import org.testng.annotations.Test;
+import utils.MatcherString;
 
 import java.util.List;
 import java.util.Map;
@@ -28,7 +28,6 @@ import java.util.Map;
  * @create 2018/6/8
  * @since 1.0.0
  */
-@ContextConfiguration(classes = DuibaConfig.class)
 public class 游戏_区间奖品不足测试_AccessTest extends DuibaTestBase {
 
 

src/test/java/http/cases/GameTest/游戏_参加游戏测试_AccessTest.java

@@ -7,13 +7,11 @@
  */
 package http.cases.GameTest;
 
-import com.duiba.qa.duiba.common.DuibaConfig;
-import com.duiba.qa.duiba.common.DuibaTestBase;
-import com.duiba.qa.duiba.service.Activity.ManagerService;
-import com.duiba.qa.duiba.service.Activity.NewGameService;
-import com.duiba.qa.duiba.service.Authorization;
-import com.duiba.qa.duiba.utils.MatcherString;
-import com.duiba.qa.publics.util.DuibaLog;
+import base.DuibaLog;
+import base.DuibaTestBase;
+import http.service.Activity.ManagerService;
+import http.service.Activity.NewGameService;
+import http.service.Authorization;
 import io.restassured.response.Response;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -21,6 +19,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.Test;
+import utils.MatcherString;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -35,8 +34,7 @@ import static org.hamcrest.Matchers.equalTo;
  * @create 2018/5/1
  * @since 1.0.0
  */
-@ContextConfiguration(classes = DuibaConfig.class)
-public class 游戏_参加游戏测试_AccessTest extends DuibaTestBase{
+public class 游戏_参加游戏测试_AccessTest extends DuibaTestBase {
 
     @Autowired
     ManagerService managerService;

src/test/java/http/cases/GameTest/游戏_开大奖测试_AccessTest.java

@@ -7,18 +7,16 @@
  */
 package http.cases.GameTest;
 
+import base.DuibaLog;
+import base.DuibaTestBase;
 import com.alibaba.fastjson.JSONObject;
-import com.duiba.qa.duiba.common.DuibaConfig;
-import com.duiba.qa.duiba.common.DuibaTestBase;
-import com.duiba.qa.duiba.model.GameOptionVo;
-import com.duiba.qa.duiba.model.GameVo;
-import com.duiba.qa.duiba.model.UserInfo;
-import com.duiba.qa.duiba.service.Activity.NewGameService;
-import com.duiba.qa.duiba.service.Manager.EditManagerInfoService;
-import com.duiba.qa.duiba.service.hd.DeveloperService;
-import com.duiba.qa.duiba.utils.MatcherString;
-import com.duiba.qa.duiba.utils.TypeChangeUtil;
-import com.duiba.qa.publics.util.DuibaLog;
+
+import http.model.GameOptionVo;
+import http.model.GameVo;
+import http.model.UserInfo;
+import http.service.Activity.NewGameService;
+import http.service.Manager.EditManagerInfoService;
+import http.service.hd.DeveloperService;
 import io.restassured.response.Response;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
@@ -28,6 +26,8 @@ import org.springframework.test.context.ContextConfiguration;
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
+import utils.MatcherString;
+import utils.TypeChangeUtil;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -41,7 +41,6 @@ import java.util.Map;
  * @create 2018/9/4
  * @since 1.0.0
  */
-@ContextConfiguration(classes = DuibaConfig.class)
 public class 游戏_开大奖测试_AccessTest extends DuibaTestBase {
 
 

src/test/java/http/cases/GameTest/游戏_推币机回收率低测试_AccessTest.java

@@ -7,16 +7,16 @@
  */
 package http.cases.GameTest;
 
-import com.duiba.qa.duiba.common.DuibaConfig;
-import com.duiba.qa.duiba.common.DuibaTestBase;
-import com.duiba.qa.duiba.service.Activity.NewGameService;
-import com.duiba.qa.duiba.utils.MatcherString;
-import com.duiba.qa.publics.util.DuibaLog;
+
+import base.DuibaLog;
+import base.DuibaTestBase;
+import http.service.Activity.NewGameService;
 import io.restassured.response.Response;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.testng.Assert;
 import org.testng.annotations.Test;
+import utils.MatcherString;
 
 import java.util.Map;
 
@@ -27,8 +27,7 @@ import java.util.Map;
  * @create 2018/9/3
  * @since 1.0.0
  */
-@ContextConfiguration(classes = DuibaConfig.class)
-public class 游戏_推币机回收率低测试_AccessTest extends DuibaTestBase{
+public class 游戏_推币机回收率低测试_AccessTest extends DuibaTestBase {
 
 
     @Autowired

src/test/java/http/cases/GameTest/游戏_新建无大奖游戏_AccessTest.java

@@ -7,11 +7,11 @@
  */
 package http.cases.GameTest;
 
+import base.DuibaLog;
+import base.DuibaTestBase;
 import com.alibaba.fastjson.JSONObject;
-import com.duiba.qa.duiba.common.DuibaConfig;
-import com.duiba.qa.duiba.common.DuibaTestBase;
-import com.duiba.qa.duiba.service.Authorization;
-import com.duiba.qa.publics.util.DuibaLog;
+
+import http.service.Authorization;
 import io.restassured.response.Response;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -34,8 +34,7 @@ import static io.restassured.RestAssured.given;
  * @create 2018/5/27
  * @since 1.0.0
  */
-@ContextConfiguration(classes = DuibaConfig.class)
-public class 游戏_新建无大奖游戏_AccessTest extends DuibaTestBase{
+public class 游戏_新建无大奖游戏_AccessTest extends DuibaTestBase {
 
     private DuibaLog logger = DuibaLog.getLogger();
 

src/test/java/http/cases/GameTest/游戏_用户达到永久限制参加_AccessTest.java

@@ -7,13 +7,12 @@
  */
 package http.cases.GameTest;
 
-import com.duiba.qa.duiba.common.DuibaConfig;
-import com.duiba.qa.duiba.common.DuibaTestBase;
-import com.duiba.qa.duiba.service.Activity.ManagerService;
-import com.duiba.qa.duiba.service.Activity.NewGameService;
-import com.duiba.qa.duiba.service.Authorization;
-import com.duiba.qa.duiba.utils.MatcherString;
-import com.duiba.qa.publics.util.DuibaLog;
+
+import base.DuibaLog;
+import base.DuibaTestBase;
+import http.service.Activity.ManagerService;
+import http.service.Activity.NewGameService;
+import http.service.Authorization;
 import io.restassured.response.Response;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -21,6 +20,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.Test;
+import utils.MatcherString;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -34,8 +34,7 @@ import static io.restassured.RestAssured.given;
  * @create 2018/5/1
  * @since 1.0.0
  */
-@ContextConfiguration(classes = DuibaConfig.class)
-public class 游戏_用户达到永久限制参加_AccessTest extends DuibaTestBase{
+public class 游戏_用户达到永久限制参加_AccessTest extends DuibaTestBase {
 
     @Autowired
     ManagerService managerService;