Merge origin/master

cerberustesting · Aug 24, 2024 · 79ce445 · 79ce445
2 parents 076707d + 2f79a1b
commit 79ce445
Show file tree

Hide file tree

Showing 21 changed files with 522 additions and 9 deletions.
diff --git a/source/src/main/java/org/cerberus/core/crud/dao/impl/RobotExecutorDAO.java b/source/src/main/java/org/cerberus/core/crud/dao/impl/RobotExecutorDAO.java
@@ -170,7 +170,7 @@ public AnswerList<RobotExecutor> readByVariousByCriteria(List<String> robot, Str
             searchSQL.append(" and (").append(SqlUtil.generateInClause("rbe.`robot`", robot)).append(")");
         }
         if (!StringUtil.isEmptyOrNull(active)) {
-            searchSQL.append(" and (`active` = ? )");
+            searchSQL.append(" and (`isactive` = ? )");
         }
         query.append(searchSQL);
 

diff --git a/source/src/main/java/org/cerberus/core/crud/entity/TestCaseExecution.java b/source/src/main/java/org/cerberus/core/crud/entity/TestCaseExecution.java
@@ -318,6 +318,33 @@ public void addcountryEnvApplicationParams(List<CountryEnvironmentParameters> co
         });
     }
 
+    public TestCaseStepExecution getTestCaseStepExecutionBySortId(int sortID){
+        for(TestCaseStepExecution tcse : this.testCaseStepExecutionList){
+            if (sortID == tcse.getTestCaseStep().getSort()){
+                return tcse;
+            }
+        }
+        return null;
+    }
+
+    public TestCaseStepExecution getTestCaseStepExecutionByStepId(int stepId){
+        for(TestCaseStepExecution tcse : this.testCaseStepExecutionList){
+            if (stepId == tcse.getTestCaseStep().getStepId()){
+                return tcse;
+            }
+        }
+        return null;
+    }
+
+    public TestCaseStepExecution getTestCaseStepExecutionExecuting(){
+        for(TestCaseStepExecution tcse : this.testCaseStepExecutionList){
+            if ("PE".equals(tcse.getReturnCode())){
+                return tcse;
+            }
+        }
+        return null;
+    }
+
     /**
      * Convert the current TestCaseExecution into JSON format
      *

diff --git a/source/src/main/java/org/cerberus/core/crud/entity/TestCaseStepActionControlExecution.java b/source/src/main/java/org/cerberus/core/crud/entity/TestCaseStepActionControlExecution.java
@@ -88,6 +88,7 @@ public class TestCaseStepActionControlExecution {
      *
      */
     private TestCaseStepActionExecution testCaseStepActionExecution;
+    private TestCaseStepActionControl testCaseStepActionControl;
     private List<TestCaseExecutionFile> fileList; // Host the list of the files stored at control level
     private MessageEvent controlResultMessage;
     private MessageGeneral executionResultMessage;
@@ -415,6 +416,14 @@ public void setValue3Init(String value3Init) {
         this.value3Init = value3Init;
     }
 
+    public TestCaseStepActionControl getTestCaseStepActionControl() {
+        return testCaseStepActionControl;
+    }
+
+    public void setTestCaseStepActionControl(TestCaseStepActionControl testCaseStepActionControl) {
+        this.testCaseStepActionControl = testCaseStepActionControl;
+    }
+
     /**
      * Convert the current TestCaseStepActionControlExecution into JSON format
      * Note that if withChilds and withParents are both set to true, only the

diff --git a/source/src/main/java/org/cerberus/core/crud/entity/TestCaseStepActionExecution.java b/source/src/main/java/org/cerberus/core/crud/entity/TestCaseStepActionExecution.java
@@ -449,6 +449,23 @@ public void addTestCaseStepActionExecutionList(List<TestCaseStepActionControlExe
         }
     }
 
+    public TestCaseStepActionControlExecution getTestCaseStepActionControlExecutionBySortId(int sortID){
+        for(TestCaseStepActionControlExecution tcsace : this.testCaseStepActionControlExecutionList){
+            if (sortID == tcsace.getTestCaseStepActionControl().getSort()){
+                return tcsace;
+            }
+        }
+        return null;
+    }
+
+    public TestCaseStepActionControlExecution getTestCaseStepActionControlExecutionByControlId(int sortID){
+        for(TestCaseStepActionControlExecution tcsace : this.testCaseStepActionControlExecutionList){
+            if (sortID == tcsace.getTestCaseStepActionControl().getControlId()){
+                return tcsace;
+            }
+        }
+        return null;
+    }
     public String getDescription() {
         return description;
     }

diff --git a/source/src/main/java/org/cerberus/core/crud/entity/TestCaseStepExecution.java b/source/src/main/java/org/cerberus/core/crud/entity/TestCaseStepExecution.java
@@ -399,6 +399,33 @@ public void addActionExecutionList(List<TestCaseStepActionExecution> actionExecu
         }
     }
 
+    public TestCaseStepActionExecution getTestCaseStepActionExecutionBySortId(int sortID){
+        for(TestCaseStepActionExecution tcsae : this.testCaseStepActionExecutionList){
+            if (sortID == tcsae.getTestCaseStepAction().getSort()){
+                return tcsae;
+            }
+        }
+        return null;
+    }
+
+    public TestCaseStepActionExecution getTestCaseStepActionExecutionByActionId(int sortID){
+        for(TestCaseStepActionExecution tcsae : this.testCaseStepActionExecutionList){
+            if (sortID == tcsae.getTestCaseStepAction().getActionId()){
+                return tcsae;
+            }
+        }
+        return null;
+    }
+
+    public TestCaseStepActionExecution getTestCaseStepActionExecutionExecuting(){
+        for(TestCaseStepActionExecution tcsae : this.testCaseStepActionExecutionList){
+            if ("PE".equals(tcsae.getReturnCode())){
+                return tcsae;
+            }
+        }
+        return null;
+    }
+
     public String getDescription() {
         return description;
     }

diff --git a/source/src/main/java/org/cerberus/core/engine/entity/Identifier.java b/source/src/main/java/org/cerberus/core/engine/entity/Identifier.java
@@ -71,6 +71,7 @@ public interface Identifiers {
     public static final String IDENTIFIER_TEXT = "text";
 
     public static final String IDENTIFIER_COORD = "coord";
+    public static final String IDENTIFIER_OFFSET = "offset";
 
     public static final String IDENTIFIER_TITLE = "title";
     public static final String IDENTIFIER_REGEXTITLE = "regexTitle";

diff --git a/source/src/main/java/org/cerberus/core/engine/execution/enums/ConditionOperatorEnum.java b/source/src/main/java/org/cerberus/core/engine/execution/enums/ConditionOperatorEnum.java
@@ -47,6 +47,12 @@ public enum ConditionOperatorEnum {
     CONDITIONOPERATOR_IFSTRINGNOTCONTAINS("ifStringNotContains", false),
     CONDITIONOPERATOR_IFTEXTINELEMENT("ifTextInElement", true),
     CONDITIONOPERATOR_IFTEXTNOTINELEMENT("ifTextNotInElement", true),
+    CONDITIONOPERATOR_IFSTEPSTATUSOK("ifStepStatusOK", false),
+    CONDITIONOPERATOR_IFSTEPSTATUSNE("ifStepStatusNE", false),
+    CONDITIONOPERATOR_IFACTIONSTATUSOK("ifActionStatusOK", false),
+    CONDITIONOPERATOR_IFACTIONSTATUSNE("ifActionStatusNE", false),
+    CONDITIONOPERATOR_IFCONTROLSTATUSOK("ifControlStatusOK", false),
+    CONDITIONOPERATOR_IFCONTROLSTATUSNE("ifControlStatusNE", false),
     CONDITIONOPERATOR_NEVER("never", false);
 
     private final String condition;