Replace artifact folder ONBOARDED_PACKAGE in CSAR

[sdc.git] / ui-ci / src / main / java / org / openecomp / sdc / ci / tests / verificator / ErrorMessageUIVerificator.java

diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/ErrorMessageUIVerificator.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/ErrorMessageUIVerificator.java
index f53bfa4..0c83441 100644 (file)
--- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/ErrorMessageUIVerificator.java
+++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/ErrorMessageUIVerificator.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,6 +20,7 @@
 
 package org.openecomp.sdc.ci.tests.verificator;
 
+import com.aventstack.extentreports.Status;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.ci.tests.datatypes.ErrorMessageProperties;
 import org.openecomp.sdc.ci.tests.datatypes.enums.ErrorInfo;
@@ -28,37 +29,34 @@ import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils;
 import org.openecomp.sdc.ci.tests.utils.validation.ErrorValidationUtils;
 import org.testng.Assert;
 
-import com.aventstack.extentreports.Status;
-
 public class ErrorMessageUIVerificator {
 
-       private static ErrorMessageProperties getErrorByType(ActionStatus errorType){
-               try{
-                       ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(errorType.name());
-                       String messageId = errorInfo.getMessageId();
-                       String code = errorInfo.getCode().toString();
-                       
-                       return new ErrorMessageProperties(messageId, code);
-               }
-               catch(Exception e){
-                       return null;
-               }
-       }
+    private static ErrorMessageProperties getErrorByType(ActionStatus errorType) {
+        try {
+            ErrorInfo errorInfo = ErrorValidationUtils.parseErrorConfigYaml(errorType.name());
+            String messageId = errorInfo.getMessageId();
+            String code = errorInfo.getCode().toString();
+
+            return new ErrorMessageProperties(messageId, code);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    public static void validateErrorMessage(ActionStatus errorMessage) {
+        String errorMessageBox = null;
+        try {
+            //errorMessageBox = GeneralUIUtils.getWebElementByClassName("w-sdc-modal-caption").getText();
+            errorMessageBox = GeneralUIUtils.getWebElementByClassName("error-message-component").getText();
+        } catch (Exception e) {
+            ExtentTestActions.log(Status.INFO, "Did not find an error message popup.");
+            Assert.fail("Did not find an error message popup.");
+        }
 
-       public static void validateErrorMessage(ActionStatus errorMessage) {
-               String errorMessageBox = null;
-               try{
-                       errorMessageBox = GeneralUIUtils.getWebElementByClassName("w-sdc-modal-caption").getText();
-               }
-               catch(Exception e){
-                       ExtentTestActions.log(Status.INFO, "Did not find an error message popup.");
-                       Assert.fail("Did not find an error message popup.");
-               }
-               
-               ExtentTestActions.log(Status.INFO, "An error message raised, validating its content.");
-               ErrorMessageProperties expectedResponseError = getErrorByType(errorMessage);
-               Assert.assertTrue(errorMessageBox.contains(expectedResponseError.getCode()), "Error message code is not " + expectedResponseError.getCode());
-               Assert.assertTrue(errorMessageBox.contains(expectedResponseError.getMessageId()), "Error message ID is not " + expectedResponseError.getMessageId());
-       }
+        ExtentTestActions.log(Status.INFO, "An error message raised, validating its content.");
+        ErrorMessageProperties expectedResponseError = getErrorByType(errorMessage);
+        Assert.assertTrue(errorMessageBox.contains(expectedResponseError.getCode()), "Error message code is not " + expectedResponseError.getCode());
+        Assert.assertTrue(errorMessageBox.contains(expectedResponseError.getMessageId()), "Error message ID is not " + expectedResponseError.getMessageId());
+    }
 
 }