lv

src/test/java/http/cases/ExchangeTest/自有_商品兑换限制/自有新实物_兑换流程测试_ExchangeTest.java

@@ -378,10 +378,8 @@ public class 自有新实物_兑换流程测试_ExchangeTest extends CheckTemple
     }
 
 
-<<<<<<< HEAD
     //测试使用
     //@Test(enabled=true, dataProvider="testdp", threadPoolSize=1, invocationCount=100)
-=======
     @DataProvider(name = "testdp", parallel = true)
     public static Object[][]testdp(){
         return new Object[][]{
@@ -399,7 +397,6 @@ public class 自有新实物_兑换流程测试_ExchangeTest extends CheckTemple
     }
 
 //    @Test(enabled=true, dataProvider="testdp", threadPoolSize=1, invocationCount=100)
->>>>>>> mabo
     public void test(int uid) throws Exception {
 //        System.out.println("Current Thread Id: " + Thread.currentThread().getId() + ". Dataprovider number: "+ dpNumber);
 //        Thread.sleep(5000);