# HG changeset patch
# User Prakash M <prakash@qualiantech.com>
# Date 1585814068 -19800
#      Thu Apr 02 13:24:28 2020 +0530
# Node ID fdc33cbd86914a34be0d66698f59f47b49164987
# Parent  94e7ba4ede556246a184f29f3f070630e7ab078e
Related to BUG-43372: Changed error display in password expiry

diff -r 94e7ba4ede55 -r fdc33cbd8691 src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/forgotpassword/FP030_70_ForgotPasswordButton.java
--- a/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/forgotpassword/FP030_70_ForgotPasswordButton.java	Sun Mar 29 20:25:57 2020 -0400
+++ b/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/forgotpassword/FP030_70_ForgotPasswordButton.java	Thu Apr 02 13:24:28 2020 +0530
@@ -67,7 +67,7 @@
     tap(TestIdCore.BUTTON_APPLY_NEW_PASSWORD);
 
     // Check pop up body message changes. Then change the password
-    verify(TestIdExtModules.LABEL_LOGIN_NEWPASSWORD, "Password must be the same in both fields");
+    verify(TestIdExtModules.LABEL_LOGIN_ERROR, "Password must be the same in both fields");
     write(TestIdExtModules.FIELD_LOGIN_NEWPASSWORD, USER.getNewPassword());
     write(TestIdExtModules.FIELD_LOGIN_CONFIRMPASSWORD, USER.getNewPassword());
     tap(TestIdExtModules.BUTTON_APPLY_NEW_PASSWORD);
diff -r 94e7ba4ede55 -r fdc33cbd8691 src-test/org/openbravo/test/mobile/retail/mobilecore/selenium/TestIdCore.java
--- a/src-test/org/openbravo/test/mobile/retail/mobilecore/selenium/TestIdCore.java	Sun Mar 29 20:25:57 2020 -0400
+++ b/src-test/org/openbravo/test/mobile/retail/mobilecore/selenium/TestIdCore.java	Thu Apr 02 13:24:28 2020 +0530
@@ -43,6 +43,7 @@
   public static TestIdConstructor FIELD_LOGIN_CONFIRMPASSWORD = new TestIdConstructor(
       "coreElementContainer_confirmpassword"); //
   public static TestIdConstructor LABEL_LOGIN_NEWPASSWORD = new TestIdConstructor("body_newheader"); //
+  public static TestIdConstructor LABEL_LOGIN_ERROR = new TestIdConstructor("body_error"); //
   public static TestIdConstructor BUTTON_EXPIRATIONOK = new TestIdConstructor(
       "footer_expirationOkButton", EnyoKind.BUTTON); //
   public static TestIdConstructor BUTTON_CONFIRM_POPUP_LOGIN_OK = new TestIdConstructor(
diff -r 94e7ba4ede55 -r fdc33cbd8691 src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/loginout/ChangeExpiredPassword.java
--- a/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/loginout/ChangeExpiredPassword.java	Sun Mar 29 20:25:57 2020 -0400
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/loginout/ChangeExpiredPassword.java	Thu Apr 02 13:24:28 2020 +0530
@@ -83,7 +83,7 @@
     write(TestIdPack.FIELD_CONFIRM_NEW_PASSWORD, weakPassword);
     OBUtils.pause(OBConstants.WAIT_FORUITOUPDATE);
     tap(TestIdPack.BUTTON_APPLY_NEW_PASSWORD);
-    verify(TestIdPack.LABEL_LOGIN_NEWPASSWORD, "Weak password. Please provide a stronger one");
+    verify(TestIdPack.LABEL_LOGIN_ERROR, "Passwords must have at least 8 characters and contain at least three of the following: uppercase letters, lowercase letters, numbers and symbols.");
 
     tap(TestIdPack.BUTTON_CANCEL_NEW_PASSWORD);
     logIn();
diff -r 94e7ba4ede55 -r fdc33cbd8691 src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/system/I31796_ChangePassword.java
--- a/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/system/I31796_ChangePassword.java	Sun Mar 29 20:25:57 2020 -0400
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/system/I31796_ChangePassword.java	Thu Apr 02 13:24:28 2020 +0530
@@ -64,20 +64,20 @@
       write(TestIdPack.FIELD_LOGIN_NEWPASSWORD, originalPassword);
       write(TestIdPack.FIELD_LOGIN_CONFIRMPASSWORD, originalPassword);
       tap(TestIdPack.BUTTON_EXPIRATIONOK);
-      verify(TestIdPack.LABEL_LOGIN_NEWPASSWORD,
+      verify(TestIdPack.LABEL_LOGIN_ERROR,
           "Password must be different from the previous one");
 
       // Add wrong confirm pwd
       write(TestIdPack.FIELD_LOGIN_NEWPASSWORD, originalPassword);
       write(TestIdPack.FIELD_LOGIN_CONFIRMPASSWORD, newPassword);
       tap(TestIdPack.BUTTON_EXPIRATIONOK);
-      verify(TestIdPack.LABEL_LOGIN_NEWPASSWORD, "Password must be the same in both fields");
+      verify(TestIdPack.LABEL_LOGIN_ERROR, "Password must be the same in both fields");
 
       // Add wrong confirm pwd
       write(TestIdPack.FIELD_LOGIN_NEWPASSWORD, newPassword);
       write(TestIdPack.FIELD_LOGIN_CONFIRMPASSWORD, originalPassword);
       tap(TestIdPack.BUTTON_EXPIRATIONOK);
-      verify(TestIdPack.LABEL_LOGIN_NEWPASSWORD, "Password must be the same in both fields");
+      verify(TestIdPack.LABEL_LOGIN_ERROR, "Password must be the same in both fields");
 
       // Add new pwd
       write(TestIdPack.FIELD_LOGIN_NEWPASSWORD, newPassword);