From ac10b7f1ab11cbafb2dd9f383195414918e937c0 Mon Sep 17 00:00:00 2001 From: seagull <24163551@qq.com> Date: Wed, 2 Aug 2017 19:03:49 +0800 Subject: [PATCH] =?UTF-8?q?1:=E4=BF=AE=E5=A4=8D=E5=BC=95=E7=94=A8=E5=8F=98?= =?UTF-8?q?=E9=87=8F=E7=9A=84=E6=97=B6=E5=80=99BUG=202:=E4=BF=AE=E5=A4=8Dw?= =?UTF-8?q?eb=E6=B5=8B=E8=AF=95=E4=B8=AD=E9=A1=B9=E7=9B=AE=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/luckyclient/caserun/exinterface/TestCaseDebug.java | 6 +++--- .../luckyclient/caserun/exinterface/TestCaseExecution.java | 6 +++--- .../caserun/exinterface/ThreadForExecuteCase.java | 6 +++--- .../caserun/exinterface/testlink/TestLinkCaseDebug.java | 6 +++--- .../caserun/exinterface/testlink/TestLinkCaseExecution.java | 6 +++--- .../exinterface/testlink/ThreadForTestLinkExecuteCase.java | 6 +++--- .../luckyclient/caserun/exwebdriver/WebTestControl.java | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/java/luckyclient/caserun/exinterface/TestCaseDebug.java b/src/main/java/luckyclient/caserun/exinterface/TestCaseDebug.java index bdde22e..34f82d2 100644 --- a/src/main/java/luckyclient/caserun/exinterface/TestCaseDebug.java +++ b/src/main/java/luckyclient/caserun/exinterface/TestCaseDebug.java @@ -104,7 +104,7 @@ public class TestCaseDebug{ String key = null; while(keys.hasNext()){ key = (String)keys.next(); - if(uservariable.equals(key)){ + if(uservariable.indexOf(key)>-1){ keyexistidentity = 1; uservariable = key; break; @@ -115,7 +115,7 @@ public class TestCaseDebug{ while(keys.hasNext()){ keyexistidentity = 0; key = (String)keys.next(); - if(uservariable1.equals(key)){ + if(uservariable.indexOf(key)>-1){ keyexistidentity = 1; uservariable1 = key; break; @@ -127,7 +127,7 @@ public class TestCaseDebug{ while(keys.hasNext()){ keyexistidentity = 0; key = (String)keys.next(); - if(uservariable2.equals(key)){ + if(uservariable.indexOf(key)>-1){ keyexistidentity = 1; uservariable2 = key; break; diff --git a/src/main/java/luckyclient/caserun/exinterface/TestCaseExecution.java b/src/main/java/luckyclient/caserun/exinterface/TestCaseExecution.java index d9b0809..cfffa2c 100644 --- a/src/main/java/luckyclient/caserun/exinterface/TestCaseExecution.java +++ b/src/main/java/luckyclient/caserun/exinterface/TestCaseExecution.java @@ -100,7 +100,7 @@ public class TestCaseExecution { String key = null; while (keys.hasNext()) { key = (String) keys.next(); - if (uservariable.equals(key)) { + if (uservariable.indexOf(key)>-1) { keyexistidentity = 1; uservariable = key; break; @@ -111,7 +111,7 @@ public class TestCaseExecution { while (keys.hasNext()) { keyexistidentity = 0; key = (String) keys.next(); - if (uservariable1.equals(key)) { + if (uservariable.indexOf(key)>-1) { keyexistidentity = 1; uservariable1 = key; break; @@ -123,7 +123,7 @@ public class TestCaseExecution { while (keys.hasNext()) { keyexistidentity = 0; key = (String) keys.next(); - if (uservariable2.equals(key)) { + if (uservariable.indexOf(key)>-1) { keyexistidentity = 1; uservariable2 = key; break; diff --git a/src/main/java/luckyclient/caserun/exinterface/ThreadForExecuteCase.java b/src/main/java/luckyclient/caserun/exinterface/ThreadForExecuteCase.java index ae27f2c..200e14f 100644 --- a/src/main/java/luckyclient/caserun/exinterface/ThreadForExecuteCase.java +++ b/src/main/java/luckyclient/caserun/exinterface/ThreadForExecuteCase.java @@ -114,7 +114,7 @@ public class ThreadForExecuteCase extends Thread{ String key = null; while(keys.hasNext()){ key = (String)keys.next(); - if(uservariable.equals(key)){ + if(uservariable.indexOf(key)>-1){ //去判断是否字符串里面包含变量键值 keyexistidentity = 1; uservariable = key; break; @@ -125,7 +125,7 @@ public class ThreadForExecuteCase extends Thread{ while(keys.hasNext()){ keyexistidentity = 0; key = (String)keys.next(); - if(uservariable1.equals(key)){ + if(uservariable1.indexOf(key)>-1){ keyexistidentity = 1; uservariable1 = key; break; @@ -137,7 +137,7 @@ public class ThreadForExecuteCase extends Thread{ while(keys.hasNext()){ keyexistidentity = 0; key = (String)keys.next(); - if(uservariable2.equals(key)){ + if(uservariable2.indexOf(key)>-1){ keyexistidentity = 1; uservariable2 = key; break; diff --git a/src/main/java/luckyclient/caserun/exinterface/testlink/TestLinkCaseDebug.java b/src/main/java/luckyclient/caserun/exinterface/testlink/TestLinkCaseDebug.java index eb23556..2c768a7 100644 --- a/src/main/java/luckyclient/caserun/exinterface/testlink/TestLinkCaseDebug.java +++ b/src/main/java/luckyclient/caserun/exinterface/testlink/TestLinkCaseDebug.java @@ -99,7 +99,7 @@ public class TestLinkCaseDebug{ String key = null; while(keys.hasNext()){ key = (String)keys.next(); - if(uservariable.equals(key)){ + if(uservariable.indexOf(key)>-1){ keyexistidentity = 1; uservariable = key; break; @@ -110,7 +110,7 @@ public class TestLinkCaseDebug{ while(keys.hasNext()){ keyexistidentity = 0; key = (String)keys.next(); - if(uservariable1.equals(key)){ + if(uservariable.indexOf(key)>-1){ keyexistidentity = 1; uservariable1 = key; break; @@ -122,7 +122,7 @@ public class TestLinkCaseDebug{ while(keys.hasNext()){ keyexistidentity = 0; key = (String)keys.next(); - if(uservariable2.equals(key)){ + if(uservariable.indexOf(key)>-1){ keyexistidentity = 1; uservariable2 = key; break; diff --git a/src/main/java/luckyclient/caserun/exinterface/testlink/TestLinkCaseExecution.java b/src/main/java/luckyclient/caserun/exinterface/testlink/TestLinkCaseExecution.java index 695c34c..b62fbb9 100644 --- a/src/main/java/luckyclient/caserun/exinterface/testlink/TestLinkCaseExecution.java +++ b/src/main/java/luckyclient/caserun/exinterface/testlink/TestLinkCaseExecution.java @@ -94,7 +94,7 @@ public class TestLinkCaseExecution{ String key = null; while(keys.hasNext()){ key = (String)keys.next(); - if(uservariable.equals(key)){ + if(uservariable.indexOf(key)>-1){ keyexistidentity = 1; uservariable = key; break; @@ -105,7 +105,7 @@ public class TestLinkCaseExecution{ while(keys.hasNext()){ keyexistidentity = 0; key = (String)keys.next(); - if(uservariable1.equals(key)){ + if(uservariable.indexOf(key)>-1){ keyexistidentity = 1; uservariable1 = key; break; @@ -117,7 +117,7 @@ public class TestLinkCaseExecution{ while(keys.hasNext()){ keyexistidentity = 0; key = (String)keys.next(); - if(uservariable2.equals(key)){ + if(uservariable.indexOf(key)>-1){ keyexistidentity = 1; uservariable2 = key; break; diff --git a/src/main/java/luckyclient/caserun/exinterface/testlink/ThreadForTestLinkExecuteCase.java b/src/main/java/luckyclient/caserun/exinterface/testlink/ThreadForTestLinkExecuteCase.java index dcd7fce..292d57e 100644 --- a/src/main/java/luckyclient/caserun/exinterface/testlink/ThreadForTestLinkExecuteCase.java +++ b/src/main/java/luckyclient/caserun/exinterface/testlink/ThreadForTestLinkExecuteCase.java @@ -112,7 +112,7 @@ public class ThreadForTestLinkExecuteCase extends Thread{ String key = null; while(keys.hasNext()){ key = (String)keys.next(); - if(uservariable.equals(key)){ + if(uservariable.indexOf(key)>-1){ keyexistidentity = 1; uservariable = key; break; @@ -123,7 +123,7 @@ public class ThreadForTestLinkExecuteCase extends Thread{ while(keys.hasNext()){ keyexistidentity = 0; key = (String)keys.next(); - if(uservariable1.equals(key)){ + if(uservariable.indexOf(key)>-1){ keyexistidentity = 1; uservariable1 = key; break; @@ -135,7 +135,7 @@ public class ThreadForTestLinkExecuteCase extends Thread{ while(keys.hasNext()){ keyexistidentity = 0; key = (String)keys.next(); - if(uservariable2.equals(key)){ + if(uservariable.indexOf(key)>-1){ keyexistidentity = 1; uservariable2 = key; break; diff --git a/src/main/java/luckyclient/caserun/exwebdriver/WebTestControl.java b/src/main/java/luckyclient/caserun/exwebdriver/WebTestControl.java index 6928763..d56009d 100644 --- a/src/main/java/luckyclient/caserun/exwebdriver/WebTestControl.java +++ b/src/main/java/luckyclient/caserun/exwebdriver/WebTestControl.java @@ -109,7 +109,7 @@ public class WebTestControl{ luckyclient.publicclass.LogUtil.APP.info("当前用例：【" + testcase.getFullExternalId() + "】执行完成......进入下一条"); } tastcount = LogOperation.UpdateTastdetail(taskid, testCases.length); - }else if(task.getTestJob().getProjecttype()==1){ + }else if(task.getTestJob().getProjecttype()==0){ List cases=GetServerAPI.getCasesbyplanid(task.getTestJob().getPlanid()); luckyclient.publicclass.LogUtil.APP.info("当前计划中读取到用例共 " + cases.size() + " 个"); LogOperation.UpdateTastStatus(taskid,cases.size());