Eazin 4 days ago
parent
commit
f86e0517de
30 changed files with 65 additions and 36 deletions
  1. 1 0
      allure-results/00697f7c-e65f-47fa-a73b-863bfd28182b-container.json
  2. 1 0
      allure-results/01ebe3c2-190a-4301-8bed-8b741395c5b4-container.json
  3. 1 0
      allure-results/0c34e87a-c1d6-435f-92d7-ab20ea7cb0ce-container.json
  4. 1 0
      allure-results/10d85a25-116e-452a-8d4b-f0c622bd60e8-container.json
  5. 1 0
      allure-results/1d064b11-af70-4b99-b720-ba59dcac4067-container.json
  6. 1 0
      allure-results/28b922a5-1c30-406c-a05a-a4194377a7eb-container.json
  7. 1 0
      allure-results/28e9e5dd-b319-408b-a608-7290a0823b95-container.json
  8. 1 0
      allure-results/2e9cd979-b9ae-4a02-980f-dcadf589a4a9-result.json
  9. 1 0
      allure-results/2f35e024-b6d2-4886-8646-3cafe64c64b4-result.json
  10. 1 0
      allure-results/2fa28b1c-eb65-42ca-a720-b2d516f688a0-container.json
  11. 1 0
      allure-results/2fa2e832-075c-4723-b057-ebda7ac6c5dd-container.json
  12. 1 0
      allure-results/36fa8b2e-2b20-4465-a144-bdde47b2dc30-result.json
  13. 1 0
      allure-results/3db69ae1-14cd-420b-a95c-64d066cef271-container.json
  14. 1 0
      allure-results/4b46471f-555b-463a-8a66-89a4f7f49f51-container.json
  15. 1 0
      allure-results/5543830c-89e9-41bd-b4a6-3b9e480f2b7e-result.json
  16. 1 0
      allure-results/6a3157bb-99e2-43cb-8bef-aa699af5c1ee-result.json
  17. 1 0
      allure-results/762bb1ca-d30f-427e-8510-0923350a6be9-container.json
  18. 1 0
      allure-results/7b12e21e-8d13-48fb-8ba6-a1687595ff5d-container.json
  19. 1 0
      allure-results/882742f6-fbfb-458b-acd1-5cc65e5ef5f1-container.json
  20. 1 0
      allure-results/8af7b5a5-a0b4-4cb2-a444-e1f4fae86d9f-container.json
  21. 1 0
      allure-results/8c4839d3-5bec-4ff7-bd53-2419359b51df-container.json
  22. 1 0
      allure-results/ad9b6fa6-8664-448c-8aff-22c994df949b-container.json
  23. 1 0
      allure-results/bdddc665-be21-4775-8fd8-40dae2877e71-container.json
  24. 1 0
      allure-results/d40858f8-b898-45be-bf0f-719ed048be8a-result.json
  25. 1 0
      allure-results/da7e7995-4d14-4a94-bdb6-1386bbe8068f-container.json
  26. 1 0
      allure-results/e5da44e5-8b16-4bee-8929-7a1462652077-container.json
  27. 1 0
      allure-results/e6ba1458-a41b-440f-9642-e63f08a053dc-container.json
  28. 1 0
      allure-results/f782950d-aee3-4e18-b022-d277c7444f1a-result.json
  29. 2 2
      src/main/java/page/ProjectMatchPage.java
  30. 35 34
      src/test/java/page/ProjectMatchPageTest.java

File diff suppressed because it is too large
+ 1 - 0
allure-results/00697f7c-e65f-47fa-a73b-863bfd28182b-container.json


+ 1 - 0
allure-results/01ebe3c2-190a-4301-8bed-8b741395c5b4-container.json

@@ -0,0 +1 @@
+{"uuid":"01ebe3c2-190a-4301-8bed-8b741395c5b4","name":"ShenBaoTong","children":["2f35e024-b6d2-4886-8646-3cafe64c64b4"],"befores":[],"afters":[],"start":1749688651677,"stop":1749688681144}

+ 1 - 0
allure-results/0c34e87a-c1d6-435f-92d7-ab20ea7cb0ce-container.json

@@ -0,0 +1 @@
+{"uuid":"0c34e87a-c1d6-435f-92d7-ab20ea7cb0ce","name":"page.ProjectMatchPageTest","children":["36fa8b2e-2b20-4465-a144-bdde47b2dc30"],"befores":[{"name":"beforeClass","status":"passed","stage":"finished","description":"","steps":[],"attachments":[],"parameters":[],"start":1749689471263,"stop":1749689482700}],"afters":[],"start":1749689471220,"stop":1749689495661}

File diff suppressed because it is too large
+ 1 - 0
allure-results/10d85a25-116e-452a-8d4b-f0c622bd60e8-container.json


+ 1 - 0
allure-results/1d064b11-af70-4b99-b720-ba59dcac4067-container.json

@@ -0,0 +1 @@
+{"uuid":"1d064b11-af70-4b99-b720-ba59dcac4067","name":"ShenBaoTong","children":["36fa8b2e-2b20-4465-a144-bdde47b2dc30"],"befores":[],"afters":[],"start":1749689471218,"stop":1749689495653}

+ 1 - 0
allure-results/28b922a5-1c30-406c-a05a-a4194377a7eb-container.json

@@ -0,0 +1 @@
+{"uuid":"28b922a5-1c30-406c-a05a-a4194377a7eb","name":"ShenBaoTong","children":["2e9cd979-b9ae-4a02-980f-dcadf589a4a9"],"befores":[],"afters":[],"start":1749689265483,"stop":1749689285436}

File diff suppressed because it is too large
+ 1 - 0
allure-results/28e9e5dd-b319-408b-a608-7290a0823b95-container.json


File diff suppressed because it is too large
+ 1 - 0
allure-results/2e9cd979-b9ae-4a02-980f-dcadf589a4a9-result.json


File diff suppressed because it is too large
+ 1 - 0
allure-results/2f35e024-b6d2-4886-8646-3cafe64c64b4-result.json


+ 1 - 0
allure-results/2fa28b1c-eb65-42ca-a720-b2d516f688a0-container.json

@@ -0,0 +1 @@
+{"uuid":"2fa28b1c-eb65-42ca-a720-b2d516f688a0","name":"Default Suite","children":["28b922a5-1c30-406c-a05a-a4194377a7eb"],"befores":[],"afters":[],"start":1749689265482,"stop":1749689285448}

+ 1 - 0
allure-results/2fa2e832-075c-4723-b057-ebda7ac6c5dd-container.json

@@ -0,0 +1 @@
+{"uuid":"2fa2e832-075c-4723-b057-ebda7ac6c5dd","name":"page.ProjectMatchPageTest","children":["2e9cd979-b9ae-4a02-980f-dcadf589a4a9"],"befores":[{"name":"beforeClass","status":"passed","stage":"finished","description":"","steps":[],"attachments":[],"parameters":[],"start":1749689265520,"stop":1749689276123}],"afters":[],"start":1749689265485,"stop":1749689285444}

File diff suppressed because it is too large
+ 1 - 0
allure-results/36fa8b2e-2b20-4465-a144-bdde47b2dc30-result.json


+ 1 - 0
allure-results/3db69ae1-14cd-420b-a95c-64d066cef271-container.json

@@ -0,0 +1 @@
+{"uuid":"3db69ae1-14cd-420b-a95c-64d066cef271","name":"Default Suite","children":["7b12e21e-8d13-48fb-8ba6-a1687595ff5d"],"befores":[],"afters":[],"start":1749688820131,"stop":1749688849449}

+ 1 - 0
allure-results/4b46471f-555b-463a-8a66-89a4f7f49f51-container.json

@@ -0,0 +1 @@
+{"uuid":"4b46471f-555b-463a-8a66-89a4f7f49f51","name":"Default Suite","children":["1d064b11-af70-4b99-b720-ba59dcac4067"],"befores":[],"afters":[],"start":1749689471216,"stop":1749689495665}

File diff suppressed because it is too large
+ 1 - 0
allure-results/5543830c-89e9-41bd-b4a6-3b9e480f2b7e-result.json


File diff suppressed because it is too large
+ 1 - 0
allure-results/6a3157bb-99e2-43cb-8bef-aa699af5c1ee-result.json


File diff suppressed because it is too large
+ 1 - 0
allure-results/762bb1ca-d30f-427e-8510-0923350a6be9-container.json


+ 1 - 0
allure-results/7b12e21e-8d13-48fb-8ba6-a1687595ff5d-container.json

@@ -0,0 +1 @@
+{"uuid":"7b12e21e-8d13-48fb-8ba6-a1687595ff5d","name":"ShenBaoTong","children":["d40858f8-b898-45be-bf0f-719ed048be8a"],"befores":[],"afters":[],"start":1749688820133,"stop":1749688849429}

+ 1 - 0
allure-results/882742f6-fbfb-458b-acd1-5cc65e5ef5f1-container.json

@@ -0,0 +1 @@
+{"uuid":"882742f6-fbfb-458b-acd1-5cc65e5ef5f1","name":"ShenBaoTong","children":["5543830c-89e9-41bd-b4a6-3b9e480f2b7e"],"befores":[],"afters":[],"start":1749688877540,"stop":1749688897870}

+ 1 - 0
allure-results/8af7b5a5-a0b4-4cb2-a444-e1f4fae86d9f-container.json

@@ -0,0 +1 @@
+{"uuid":"8af7b5a5-a0b4-4cb2-a444-e1f4fae86d9f","name":"Default Suite","children":["882742f6-fbfb-458b-acd1-5cc65e5ef5f1"],"befores":[],"afters":[],"start":1749688877538,"stop":1749688897909}

+ 1 - 0
allure-results/8c4839d3-5bec-4ff7-bd53-2419359b51df-container.json

@@ -0,0 +1 @@
+{"uuid":"8c4839d3-5bec-4ff7-bd53-2419359b51df","name":"ShenBaoTong","children":["f782950d-aee3-4e18-b022-d277c7444f1a"],"befores":[],"afters":[],"start":1749689150103,"stop":1749689169834}

+ 1 - 0
allure-results/ad9b6fa6-8664-448c-8aff-22c994df949b-container.json

@@ -0,0 +1 @@
+{"uuid":"ad9b6fa6-8664-448c-8aff-22c994df949b","name":"Default Suite","children":["e6ba1458-a41b-440f-9642-e63f08a053dc"],"befores":[],"afters":[],"start":1749689104651,"stop":1749689125310}

File diff suppressed because it is too large
+ 1 - 0
allure-results/bdddc665-be21-4775-8fd8-40dae2877e71-container.json


File diff suppressed because it is too large
+ 1 - 0
allure-results/d40858f8-b898-45be-bf0f-719ed048be8a-result.json


+ 1 - 0
allure-results/da7e7995-4d14-4a94-bdb6-1386bbe8068f-container.json

@@ -0,0 +1 @@
+{"uuid":"da7e7995-4d14-4a94-bdb6-1386bbe8068f","name":"Default Suite","children":["01ebe3c2-190a-4301-8bed-8b741395c5b4"],"befores":[],"afters":[],"start":1749688651673,"stop":1749688681162}

+ 1 - 0
allure-results/e5da44e5-8b16-4bee-8929-7a1462652077-container.json

@@ -0,0 +1 @@
+{"uuid":"e5da44e5-8b16-4bee-8929-7a1462652077","name":"Default Suite","children":["8c4839d3-5bec-4ff7-bd53-2419359b51df"],"befores":[],"afters":[],"start":1749689150101,"stop":1749689169856}

+ 1 - 0
allure-results/e6ba1458-a41b-440f-9642-e63f08a053dc-container.json

@@ -0,0 +1 @@
+{"uuid":"e6ba1458-a41b-440f-9642-e63f08a053dc","name":"ShenBaoTong","children":["6a3157bb-99e2-43cb-8bef-aa699af5c1ee"],"befores":[],"afters":[],"start":1749689104653,"stop":1749689125282}

File diff suppressed because it is too large
+ 1 - 0
allure-results/f782950d-aee3-4e18-b022-d277c7444f1a-result.json


+ 2 - 2
src/main/java/page/ProjectMatchPage.java

@@ -195,7 +195,7 @@ public class ProjectMatchPage extends Method {
         enterProjectMatch();
         find(speedMatchBtn).click();
         try {
-            Thread.sleep(6000);
+            Thread.sleep(10000);
         }catch (Exception e){
             e.printStackTrace();
         }
@@ -221,7 +221,7 @@ public class ProjectMatchPage extends Method {
         }
         find(preciseMatchBtn).click();
         try {
-            Thread.sleep(6000);
+            Thread.sleep(10000);
         }catch (Exception e){
             e.printStackTrace();
         }

+ 35 - 34
src/test/java/page/ProjectMatchPageTest.java

@@ -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);