Merge pull request #28 from testsigmahq/1.2.0-release

v1.2.0 release

Author: vikram-chaitanya

automator/src/com/testsigma/automator/actions/mobile/MobileElement.java

@@ -221,7 +221,8 @@ public MobileElement(Node node, Integer depth, Platform platform) {
 
   private void populateIosAttributes(RemoteWebElement remoteWebElement) {
     this.setName(remoteWebElement.getAttribute("name"));
-    this.setAccessibilityId(this.name);
+    this.setId(name);
+    this.setAccessibilityId(name);
     this.setType(remoteWebElement.getAttribute("type"));
     this.setLabel(remoteWebElement.getAttribute("label"));
   }
@@ -230,6 +231,7 @@ private void populateAndroidAttributes(RemoteWebElement remoteWebElement) {
     this.setName(remoteWebElement.getTagName());
     this.setType(remoteWebElement.getAttribute("class"));
     this.setResourceId(remoteWebElement.getAttribute("resource-id"));
+    this.setId(resourceId);
     this.setContentDesc(remoteWebElement.getAttribute("content-desc"));
     this.setAccessibilityId(this.contentDesc);
     this.setPassword(Boolean.valueOf(remoteWebElement.getAttribute("password")));

automator/src/com/testsigma/automator/constants/AutomatorMessages.java

@@ -27,6 +27,7 @@ public class AutomatorMessages {
   public final static String MSG_CONDITION_ELSE_IF_SUCCESS = "\"Else If\" condition matched to proceed with the steps under this condition.";
   public final static String MSG_CONDITION_ELSE_SUCCESS = "\"Else\" condition matched to proceed with the steps under this condition.";
   public static final String EXCEPTION_WEBDRIVER_NOTCREATED = "Unable to create a new Test Session due to unexpected failure(0x537). Please contact Support for more details.";
+  public static final String NO_PARALLEL_RUNS = "Parallel Executions Limit exceeded.Please upgrade to community edition for more parallel runs or Please contact support team for more details.";
   public static final String EXCEPTION_INVALID_PARAMETER_FORMAT = "Invalid value ?1 entered for parameter ?2 while executing the Custom Test Data Function \"?3\"";
   public static final String EXCEPTION_INVALID_CLASS_NAME = "Unsupported class \"?1\" used to generate test data from custom function";
   public static final String EXCEPTION_METHOD_NOT_FOUND = "No implementation found for this template";

automator/src/com/testsigma/automator/constants/ErrorCodes.java

@@ -37,7 +37,7 @@ public class ErrorCodes {
   public static Integer ERROR_TEST_DATA_FAILURE = 103;
   public static Integer ERROR_ELEMENT_FAILURE = 104;
   public static Integer BROWSER_VERSION_NOT_AVAILABLE = 109;
-
+  public static Integer NO_PARALLEL_RUN = 110;
   public static Integer TEST_CASE_DETAILS_FETCH_FAILED = 200;
 
   public static Integer WDA_INSTALLATION_FAILED = 300;

automator/src/com/testsigma/automator/drivers/DriverManager.java

@@ -7,6 +7,7 @@
 import com.testsigma.automator.constants.SessionErrorType;
 import com.testsigma.automator.entity.*;
 import com.testsigma.automator.exceptions.AutomatorException;
+import com.testsigma.automator.exceptions.TestsigmaNoParallelRunException;
 import com.testsigma.automator.runners.EnvironmentRunner;
 import com.testsigma.automator.utilities.RuntimeDataProvider;
 import com.testsigma.automator.utilities.TimeUtil;
@@ -22,7 +23,7 @@
 @Data
 public abstract class DriverManager {
   public static final String MSG_LAB_MINUTES_EXCEEDED = "Allowed test execution duration on cloud devices/machines exceeded.";
-  public static final String MSG_NO_PARALLEL_RUN = "Parallel runs are not allowed in Open Source, Please Change to Community edition for parallel Execution or Contact Support Team.";
+  public static final String MSG_NO_PARALLEL_RUN = "Parallel Executions Limit exceeded.Please upgrade to community edition for more parallel runs.";
   public static final String MSG_OS_NOT_SUPPORTED = "Selected device OS and version combination is no longer supported. Please edit the device and choose a supported OS and Version.";
   public static final String MSG_BROWSER_NOT_SUPPORTED = "Selected browser and version combination is no longer supported. Please edit the device and choose a supported browser and Version.";
 
@@ -136,7 +137,10 @@ public void startSession(DriverSessionType driverSessionType, Long entityId, Boo
       String errorMessage = parseErrorMessage(e.getMessage());
       if (StringUtils.isBlank(errorMessage)) {
         errorMessage = AutomatorMessages.EXCEPTION_WEBDRIVER_NOTCREATED + " - " + e.getMessage();
-      } else {
+      } else if(e.getMessage().contains("NO_PARALLEL_RUN")){
+        errorMessage = AutomatorMessages.NO_PARALLEL_RUNS;
+        throw new TestsigmaNoParallelRunException(ErrorCodes.NO_PARALLEL_RUN,errorMessage);
+      }else {
         errorMessage = "Unable to create a new Test Session due to unexpected failure(0x537). " + errorMessage;
       }
       endSession();

automator/src/com/testsigma/automator/entity/StepDetails.java

@@ -33,4 +33,5 @@ public class StepDetails {
   private Long parentId;
   private String testDataName;
   private String testDataValue;
+  private Boolean ignoreStepResult;
 }

automator/src/com/testsigma/automator/exceptions/TestsigmaNoParallelRunException.java

@@ -0,0 +1,24 @@
+package com.testsigma.automator.exceptions;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.extern.log4j.Log4j2;
+
+
+@Log4j2
+@Getter
+@Setter
+public class TestsigmaNoParallelRunException extends AutomatorException {
+
+  private Integer errorCode;
+  private String message;
+  private String dispMessage;
+
+  public TestsigmaNoParallelRunException(Integer errorCode, String message) {
+    super(errorCode, message);
+    this.errorCode = errorCode;
+    this.message = message;
+    this.dispMessage = message;
+    log.error(message);
+  }
+}

automator/src/com/testsigma/automator/runners/ActionStepExecutor.java

@@ -117,6 +117,10 @@ private void markTestcaseAborted(TestCaseResult testCaseResult, TestCaseStepResu
       result.setMessage(AutomatorMessages.MSG_STEP_MAJOR_STEP_FAILURE);
       testCaseResult.setResult(ResultConstant.ABORTED);
       testCaseResult.setMessage(AutomatorMessages.MSG_TEST_CASE_ABORTED);
+      if(!testCaseStepEntity.getStepDetails().getIgnoreStepResult()) {
+        testCaseResult.setResult(ResultConstant.ABORTED);
+        testCaseResult.setMessage(AutomatorMessages.MSG_TEST_CASE_ABORTED);
+      }
     } else {
       result.setResult(ResultConstant.FAILURE);
     }

automator/src/com/testsigma/automator/runners/AddonNaturalTextActionStepExecutor.java

@@ -78,6 +78,10 @@ private void markTestcaseAborted(TestCaseResult testCaseResult, TestCaseStepResu
       result.setMessage(AutomatorMessages.MSG_STEP_MAJOR_STEP_FAILURE);
       testCaseResult.setResult(ResultConstant.ABORTED);
       testCaseResult.setMessage(AutomatorMessages.MSG_TEST_CASE_ABORTED);
+      if(!testCaseStepEntity.getStepDetails().getIgnoreStepResult()) {
+        testCaseResult.setResult(ResultConstant.ABORTED);
+        testCaseResult.setMessage(AutomatorMessages.MSG_TEST_CASE_ABORTED);
+      }
     } else {
       result.setResult(ResultConstant.FAILURE);
     }

automator/src/com/testsigma/automator/runners/EnvironmentRunner.java

@@ -6,6 +6,7 @@
 import com.testsigma.automator.drivers.DriversUpdateService;
 import com.testsigma.automator.entity.*;
 import com.testsigma.automator.exceptions.AutomatorException;
+import com.testsigma.automator.exceptions.TestsigmaNoParallelRunException;
 import com.testsigma.automator.http.HttpClient;
 import com.testsigma.automator.utilities.ErrorUtil;
 import com.testsigma.automator.utilities.PathUtil;
@@ -117,6 +118,10 @@ public EnvironmentRunResult run() {
       afterExecute();
       setEnvironmentResult();
       setStoppedStatus();
+    } catch (TestsigmaNoParallelRunException e){
+      environmentRunResult.setResult(ResultConstant.STOPPED);
+      environmentRunResult.setErrorCode(e.getErrorCode());
+      environmentRunResult.setMessage(e.getMessage());
     } catch (AutomatorException e) {
       environmentRunResult.setResult(ResultConstant.NOT_EXECUTED);
       environmentRunResult.setErrorCode(e.getErrorCode());

automator/src/com/testsigma/automator/runners/TestcaseRunner.java

@@ -198,8 +198,8 @@ public TestCaseResult run() throws Exception {
         }
 
         //TODO:use check based step type
-        if (testCaseStepEntity.getConditionType() == null || testCaseStepEntity.getConditionType() == ConditionType.NOT_USED
-          || ConditionType.LOOP_FOR == testCaseStepEntity.getConditionType()) {
+        if ((testCaseStepEntity.getConditionType() == null || testCaseStepEntity.getConditionType() == ConditionType.NOT_USED
+            || ConditionType.LOOP_FOR == testCaseStepEntity.getConditionType()) && (!testCaseStepEntity.getStepDetails().getIgnoreStepResult()) ) {
           result = (result.getId() < testCaseStepResult.getResult().getId()) ? testCaseStepResult.getResult() : result;
         }
         int processedSteps = processedStepCount(testCaseStepsResult);