fixed #2542. waitBefore, waitAfter doScreenshotBefore and doScreensho…

…tAfter is now also ducplicated when duplicating a testcase.
cerberustesting · Nov 8, 2024 · 3022a9b · 3022a9b
1 parent d44f57f
commit 3022a9b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/source/src/main/java/org/cerberus/core/crud/dao/impl/TestCaseStepActionControlDAO.java b/source/src/main/java/org/cerberus/core/crud/dao/impl/TestCaseStepActionControlDAO.java
@@ -514,8 +514,8 @@ public Answer create(TestCaseStepActionControl testCaseStepActionControl) {
         StringBuilder query = new StringBuilder();
         query.append("INSERT INTO testcasestepactioncontrol (`test`, `testcase`, `stepId`, `actionId`, `controlId`, `sort`, ");
         query.append("`conditionOperator`, `conditionValue1`, `conditionValue2`, `conditionValue3`, `conditionOptions`, `control`, ");
-        query.append("`value1`, `value2`, `value3`, `Options`, `isFatal`, `Description`, `screenshotfilename`, `usrCreated`) ");
-        query.append("VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
+        query.append("`value1`, `value2`, `value3`, `Options`, `isFatal`, `Description`, `screenshotfilename`, `waitBefore`, `waitAfter`, `doScreenshotBefore`, `doScreenshotAfter`, `usrCreated`) ");
+        query.append("VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
 
         // Debug message on SQL.
         if (LOG.isDebugEnabled()) {
@@ -544,6 +544,10 @@ public Answer create(TestCaseStepActionControl testCaseStepActionControl) {
             preStat.setBoolean(i++, testCaseStepActionControl.isFatal());
             preStat.setString(i++, testCaseStepActionControl.getDescription());
             preStat.setString(i++, testCaseStepActionControl.getScreenshotFilename());
+            preStat.setInt(i++, testCaseStepActionControl.getWaitBefore());
+            preStat.setInt(i++, testCaseStepActionControl.getWaitAfter());
+            preStat.setBoolean(i++, testCaseStepActionControl.isDoScreenshotBefore());
+            preStat.setBoolean(i++, testCaseStepActionControl.isDoScreenshotAfter());
             preStat.setString(i++, testCaseStepActionControl.getUsrCreated() == null ? "" : testCaseStepActionControl.getUsrCreated());
             preStat.executeUpdate();
 

diff --git a/source/src/main/java/org/cerberus/core/crud/dao/impl/TestCaseStepActionDAO.java b/source/src/main/java/org/cerberus/core/crud/dao/impl/TestCaseStepActionDAO.java
@@ -532,8 +532,9 @@ public Answer create(TestCaseStepAction testCaseStepAction) {
         MessageEvent msg = null;
         StringBuilder query = new StringBuilder();
         query.append("INSERT INTO testcasestepaction (`test`, `testcase`, `stepId`, `actionId`, `sort`, ")
-                .append("`conditionOperator`, `conditionValue1`, `conditionValue2`, `conditionValue3`, `conditionOptions`, `action`, `Value1`, `Value2`, `Value3`, `Options`, `IsFatal`, `description`, `screenshotfilename`, `usrCreated`) ");
-        query.append("VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
+                .append("`conditionOperator`, `conditionValue1`, `conditionValue2`, `conditionValue3`, `conditionOptions`, `action`, `Value1`, `Value2`, `Value3`, `Options`"
+                        + ", `IsFatal`, `description`, `screenshotfilename`, `waitBefore`, `waitAfter`, `doScreenshotBefore`, `doScreenshotAfter`, `usrCreated`) ");
+        query.append("VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
 
         // Debug message on SQL.
         if (LOG.isDebugEnabled()) {
@@ -561,6 +562,10 @@ public Answer create(TestCaseStepAction testCaseStepAction) {
             preStat.setBoolean(i++, testCaseStepAction.isFatal());
             preStat.setString(i++, testCaseStepAction.getDescription());
             preStat.setString(i++, testCaseStepAction.getScreenshotFilename());
+            preStat.setInt(i++, testCaseStepAction.getWaitBefore());
+            preStat.setInt(i++, testCaseStepAction.getWaitAfter());
+            preStat.setBoolean(i++, testCaseStepAction.isDoScreenshotBefore());
+            preStat.setBoolean(i++, testCaseStepAction.isDoScreenshotAfter());
             preStat.setString(i++, testCaseStepAction.getUsrCreated() == null ? "" : testCaseStepAction.getUsrCreated());
             preStat.executeUpdate();