|
@@ -33,42 +33,43 @@ public class ProjectMatchPageTest {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- @AfterClass
|
|
|
- public void afterClass(){
|
|
|
- Driver.getDriver().quit();
|
|
|
- Driver.getThreadLocal().remove();
|
|
|
- }
|
|
|
-
|
|
|
-// @Test
|
|
|
-// @Description("正常测试用例:项目速配成功")
|
|
|
-// @Story("项目匹配")
|
|
|
-// public void projectMatchSuccsess(){
|
|
|
-//// assertTrue(Double.parseDouble(projectMatchPage.speedMatchList.get(0))>0);
|
|
|
-//// assertTrue(Integer.parseInt(projectMatchPage.speedMatchList.get(1).replaceAll("\\D",""))>0);
|
|
|
-//// assertTrue(Integer.parseInt(projectMatchPage.speedMatchList.get(2))>0);
|
|
|
-//// assertTrue(Integer.parseInt(projectMatchPage.speedMatchList.get(3))>=0);
|
|
|
-//// assertTrue(Integer.parseInt(projectMatchPage.speedMatchList.get(4))>=0);
|
|
|
-//// assertTrue(projectMatchPage.speedMatchList.get(5).length()>0);
|
|
|
-//// assertEquals(projectMatchPage.speedMatchList.get(12),"竞争性");
|
|
|
-//// assertEquals(projectMatchPage.speedMatchList.get(13),"竞争性项目指申报难度大、竞争性较强的项目,一般根据申报单位的综合实力决定申报结果,淘汰率高。");
|
|
|
-// try{
|
|
|
-// projectMatchPage.speedMatchingSuccess();
|
|
|
-// assertTrue(Double.parseDouble(projectMatchPage.speedMatchList.get(0))>0);
|
|
|
-// assertTrue(Integer.parseInt(projectMatchPage.speedMatchList.get(1).replaceAll("\\D",""))>0);
|
|
|
-// assertTrue(Integer.parseInt(projectMatchPage.speedMatchList.get(2))>0);
|
|
|
-// assertTrue(Integer.parseInt(projectMatchPage.speedMatchList.get(3))>=0);
|
|
|
-// assertTrue(Integer.parseInt(projectMatchPage.speedMatchList.get(4))>=0);
|
|
|
-// assertTrue(projectMatchPage.speedMatchList.get(5).length()>0);
|
|
|
-// }catch (AssertionError e){
|
|
|
-// Reporter.log("ProjectMatchPageTest.projectMatchSuccsess:项目速配成功,断言失败!");
|
|
|
-// throw e;
|
|
|
-// }catch (Exception e){
|
|
|
-// Reporter.log("ProjectMatchPageTest.projectMatchSuccsess:项目速配成功,元素定位失败!");
|
|
|
-// throw e;
|
|
|
-// }
|
|
|
+// @AfterClass
|
|
|
+// public void afterClass(){
|
|
|
+// Driver.getDriver().quit();
|
|
|
+// Driver.getThreadLocal().remove();
|
|
|
// }
|
|
|
|
|
|
@Test
|
|
|
+ @Description("正常测试用例:项目速配成功")
|
|
|
+ @Story("项目匹配")
|
|
|
+ public void projectMatchSuccsess(){
|
|
|
+// assertTrue(Double.parseDouble(projectMatchPage.speedMatchList.get(0))>0);
|
|
|
+// assertTrue(Integer.parseInt(projectMatchPage.speedMatchList.get(1).replaceAll("\\D",""))>0);
|
|
|
+// assertTrue(Integer.parseInt(projectMatchPage.speedMatchList.get(2))>0);
|
|
|
+// assertTrue(Integer.parseInt(projectMatchPage.speedMatchList.get(3))>=0);
|
|
|
+// assertTrue(Integer.parseInt(projectMatchPage.speedMatchList.get(4))>=0);
|
|
|
+// assertTrue(projectMatchPage.speedMatchList.get(5).length()>0);
|
|
|
+// assertEquals(projectMatchPage.speedMatchList.get(12),"竞争性");
|
|
|
+// assertEquals(projectMatchPage.speedMatchList.get(13),"竞争性项目指申报难度大、竞争性较强的项目,一般根据申报单位的综合实力决定申报结果,淘汰率高。");
|
|
|
+ try{
|
|
|
+ projectMatchPage.speedMatchingSuccess();
|
|
|
+ System.out.println(projectMatchPage.speedMatchList.toString());
|
|
|
+ assertTrue(Double.parseDouble(projectMatchPage.speedMatchList.get(0))>=0);
|
|
|
+ assertTrue(Integer.parseInt(projectMatchPage.speedMatchList.get(1).replaceAll("\\D",""))>0);
|
|
|
+ assertTrue(Integer.parseInt(projectMatchPage.speedMatchList.get(2))>0);
|
|
|
+ assertTrue(Integer.parseInt(projectMatchPage.speedMatchList.get(3))>=0);
|
|
|
+ assertTrue(Integer.parseInt(projectMatchPage.speedMatchList.get(4))>=0);
|
|
|
+ assertTrue(projectMatchPage.speedMatchList.get(5).length()>0);
|
|
|
+ }catch (AssertionError e){
|
|
|
+ Reporter.log("ProjectMatchPageTest.projectMatchSuccsess:项目速配成功,断言失败!");
|
|
|
+ throw e;
|
|
|
+ }catch (Exception e){
|
|
|
+ Reporter.log("ProjectMatchPageTest.projectMatchSuccsess:项目速配成功,元素定位失败!");
|
|
|
+ throw e;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ @Test
|
|
|
@Description("正常测试用例:精准匹配成功")
|
|
|
@Story("项目匹配")
|
|
|
public void preciseMatchingSuccess(){
|
|
@@ -92,7 +93,7 @@ public class ProjectMatchPageTest {
|
|
|
assertEquals((projectMatchPage.preciseMatchList.get(6)),"没有匹配到项目");
|
|
|
}else {
|
|
|
assertTrue(projectMatchPage.preciseMatchList.get(6).length()>0);
|
|
|
- assertTrue(Integer.parseInt(projectMatchPage.preciseMatchList.get(7))>=0);
|
|
|
+ assertTrue(Double.parseDouble(projectMatchPage.preciseMatchList.get(7))>=0);
|
|
|
assertTrue(Integer.parseInt(projectMatchPage.preciseMatchList.get(8))>=0);
|
|
|
assertTrue(Integer.parseInt(projectMatchPage.preciseMatchList.get(9))>=0);
|
|
|
assertTrue(Integer.parseInt(projectMatchPage.preciseMatchList.get(10))>=0);
|