# HG changeset patch
Verifies issue 34856 : Modified automated test 'I30305_VerifyDiscountByMultiPaymentII'

diff -r b579cf4f48dd -r 75655f018efd src-test/org/openbravo/test/mobile/quarantine/extmodules/RAN/discounts_bypaymentmethod/I30305_VerifyDiscountByMultiPaymentII.java
--- a/src-test/org/openbravo/test/mobile/quarantine/extmodules/RAN/discounts_bypaymentmethod/I30305_VerifyDiscountByMultiPaymentII.java	Mon May 08 17:10:46 2017 +0530
+++ b/src-test/org/openbravo/test/mobile/quarantine/extmodules/RAN/discounts_bypaymentmethod/I30305_VerifyDiscountByMultiPaymentII.java	Tue May 09 12:46:34 2017 +0530
@@ -11,7 +11,7 @@
  * under the License.
  * The Original Code is Openbravo ERP.
  * The Initial Developer of the Original Code is Openbravo S.L.U.
- * All portions are Copyright (C) 2016 Openbravo S.L.U.
+ * All portions are Copyright (C) 2017 Openbravo S.L.U.
  * All Rights Reserved.
  * Contributor(s):
  ************************************************************************
@@ -23,12 +23,11 @@
 package org.openbravo.test.mobile.quarantine.extmodules.RAN.discounts_bypaymentmethod;
 
 import org.junit.Test;
-import org.openbravo.test.mobile.core.junit.TestAnnotations;
+import org.openbravo.test.mobile.retail.extmodules.selenium.TestIdExtModules;
 import org.openbravo.test.mobile.retail.extmodules.selenium.terminals.WebPOSExtModulesTerminalHelper;
 import org.openbravo.test.mobile.retail.mobilecore.database.DatabaseHelperInsertUpdateOrDelete;
 import org.openbravo.test.mobile.retail.mobilecore.javascript.BackboneHelper;
 import org.openbravo.test.mobile.retail.mobilecore.utils.RetailUtils;
-import org.openbravo.test.mobile.retail.pack.selenium.TestIdPack;
 
 public class I30305_VerifyDiscountByMultiPaymentII extends WebPOSExtModulesTerminalHelper {
 
@@ -36,50 +35,53 @@
   String wireTransferDiscountID = null;
 
   @Test
-  @TestAnnotations(waitFixOf = 34856)
   public void test() {
     // Verify Payments Card & Cash
     addProduct();
-    tap(TestIdPack.BUTTON_CARD);
-    isVisible(TestIdPack.LABEL_RECEIPT_PAY_EXTRAINFO, true);
-    tap(TestIdPack.BUTTON_KEYPAD_5);
-    tap(TestIdPack.BUTTON_KEYPAD_0);
-    tap(TestIdPack.BUTTON_KEYPAD_ENTER);
-    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT, "-5.56");
-    tap(TestIdPack.BUTTON_CASH);
-    isVisible(TestIdPack.LABEL_RECEIPT_PAY_EXTRAINFO, true);
-    tap(TestIdPack.BUTTON_PAYMENTSWITCH);
-    tap(TestIdPack.BUTTON_KEYPAD_5);
-    tap(TestIdPack.BUTTON_KEYPAD_0);
-    tap(TestIdPack.BUTTON_KEYPAD_ENTER);
-    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT, "-11.11");
-    tap(TestIdPack.BUTTON_CASHUSA);
-    isVisible(TestIdPack.LABEL_RECEIPT_PAY_EXTRAINFO, true);
-    isVisible(TestIdPack.BUTTON_PAY_EXACT, true);
-    tap(TestIdPack.BUTTON_PAY_EXACT);
-    isVisible(TestIdPack.BUTTON_PAY_EXACT, false);
-    isVisible(TestIdPack.BUTTON_PAY_DONE, true);
-    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTNAME, "-- 10% Discount on Cash Payment Method");
-    tap(TestIdPack.BUTTON_PAY_DONE);
-    verify(TestIdPack.LABEL_TOTALTOPAY, "0.00");
+    tap(TestIdExtModules.BUTTON_PAY);
+    tap(TestIdExtModules.BUTTON_CARD);
+    isVisible(TestIdExtModules.LABEL_RECEIPT_PAY_EXTRAINFO, true);
+    tap(TestIdExtModules.BUTTON_KEYPAD_5);
+    tap(TestIdExtModules.BUTTON_KEYPAD_0);
+    tap(TestIdExtModules.BUTTON_KEYPAD_ENTER);
+    verify(TestIdExtModules.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT, "-5.56");
+    tap(TestIdExtModules.BUTTON_CASH);
+    isVisible(TestIdExtModules.LABEL_RECEIPT_PAY_EXTRAINFO, true);
+    tap(TestIdExtModules.BUTTON_PAYMENTSWITCH);
+    tap(TestIdExtModules.BUTTON_KEYPAD_5);
+    tap(TestIdExtModules.BUTTON_KEYPAD_0);
+    tap(TestIdExtModules.BUTTON_KEYPAD_ENTER);
+    verify(TestIdExtModules.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT, "-11.11");
+    tap(TestIdExtModules.BUTTON_MORE_PAYMENTS_DIV);
+    TestIdExtModules.BUTTON_CASHUSA.enyoNode().waitUntilIsReady(100);
+    tap(TestIdExtModules.BUTTON_CASHUSA);
+    isVisible(TestIdExtModules.LABEL_RECEIPT_PAY_EXTRAINFO, true);
+    isVisible(TestIdExtModules.BUTTON_PAY_EXACT, true);
+    tap(TestIdExtModules.BUTTON_PAY_EXACT);
+    isVisible(TestIdExtModules.BUTTON_PAY_EXACT, false);
+    isVisible(TestIdExtModules.BUTTON_PAY_DONE, true);
+    verify(TestIdExtModules.LABEL_RECEIPT_ROW1_DISCOUNTNAME,
+        "-- 10% Discount on Cash Payment Method");
+    tap(TestIdExtModules.BUTTON_PAY_DONE);
+    verify(TestIdExtModules.LABEL_TOTALTOPAY, "0.00");
   }
 
   private void addProduct() {
     // Add Product
-    tap(TestIdPack.BUTTON_SEARCH);
-    write(TestIdPack.FIELD_SEARCH_TEXT, TestIdPack.BUTTON_SEARCHPRODUCT_BABYCARRIER.getRowName());
-    tap(TestIdPack.BUTTON_SEARCH_EXECUTE);
-    tap(TestIdPack.BUTTON_SEARCHPRODUCT_FIRSTROW);
-    verify(TestIdPack.LABEL_TOTALTOPAY, "110.50");
+    tap(TestIdExtModules.BUTTON_SEARCH);
+    write(TestIdExtModules.FIELD_SEARCH_TEXT,
+        TestIdExtModules.BUTTON_SEARCHPRODUCT_BABYCARRIER.getRowName());
+    tap(TestIdExtModules.BUTTON_SEARCH_EXECUTE);
+    tap(TestIdExtModules.BUTTON_SEARCHPRODUCT_FIRSTROW);
+    verify(TestIdExtModules.LABEL_TOTALTOPAY, "110.50");
 
     // Change Amount to 150
-    tap(TestIdPack.BUTTON_RECEIPT_ROW1);
-    tap(TestIdPack.BUTTON_KEYPAD_1);
-    tap(TestIdPack.BUTTON_KEYPAD_5);
-    tap(TestIdPack.BUTTON_KEYPAD_0);
-    tap(TestIdPack.BUTTON_KEYPAD_PRICE);
-    verify(TestIdPack.LABEL_TOTALTOPAY, "150.00");
-    tap(TestIdPack.BUTTON_PAY);
+    tap(TestIdExtModules.BUTTON_RECEIPT_ROW1);
+    tap(TestIdExtModules.BUTTON_KEYPAD_1);
+    tap(TestIdExtModules.BUTTON_KEYPAD_5);
+    tap(TestIdExtModules.BUTTON_KEYPAD_0);
+    tap(TestIdExtModules.BUTTON_KEYPAD_PRICE);
+    verify(TestIdExtModules.LABEL_TOTALTOPAY, "150.00");
   }
 
   @Override
diff -r b579cf4f48dd -r 75655f018efd src-test/org/openbravo/test/mobile/quarantine/extmodules/RAN/discounts_bypaymentmethod/I31850_VerifyDiscountByPaymentMethod.java
--- a/src-test/org/openbravo/test/mobile/quarantine/extmodules/RAN/discounts_bypaymentmethod/I31850_VerifyDiscountByPaymentMethod.java	Mon May 08 17:10:46 2017 +0530
+++ b/src-test/org/openbravo/test/mobile/quarantine/extmodules/RAN/discounts_bypaymentmethod/I31850_VerifyDiscountByPaymentMethod.java	Tue May 09 12:46:34 2017 +0530
@@ -23,10 +23,10 @@
 package org.openbravo.test.mobile.quarantine.extmodules.RAN.discounts_bypaymentmethod;
 
 import org.junit.Test;
+import org.openbravo.test.mobile.core.utils.OBUtils;
 import org.openbravo.test.mobile.retail.extmodules.selenium.TestIdExtModules;
 import org.openbravo.test.mobile.retail.extmodules.selenium.terminals.WebPOSExtModulesTerminalHelper;
 import org.openbravo.test.mobile.retail.mobilecore.database.DatabaseHelperInsertUpdateOrDelete;
-import org.openbravo.test.mobile.retail.pack.selenium.TestIdPack;
 
 public class I31850_VerifyDiscountByPaymentMethod extends WebPOSExtModulesTerminalHelper {
 
@@ -43,8 +43,14 @@
     isVisible(TestIdExtModules.LABEL_RECEIPT_PAY_EXTRAINFO, true);
     tap(TestIdExtModules.BUTTON_CARD);
     isVisible(TestIdExtModules.LABEL_RECEIPT_PAY_EXTRAINFO, true);
+    // tap(TestIdExtModules.BUTTON_CASHUSA);
+    tap(TestIdExtModules.BUTTON_MORE_PAYMENTS_DIV);
+    TestIdExtModules.BUTTON_CASHUSA.enyoNode().waitUntilIsReady(100);
     tap(TestIdExtModules.BUTTON_CASHUSA);
     isVisible(TestIdExtModules.LABEL_RECEIPT_PAY_EXTRAINFO, true);
+    // tap(TestIdExtModules.BUTTON_VOUCHER);
+    tap(TestIdExtModules.BUTTON_MORE_PAYMENTS_DIV);
+    TestIdExtModules.BUTTON_VOUCHER.enyoNode().waitUntilIsReady(100);
     tap(TestIdExtModules.BUTTON_VOUCHER);
     isVisible(TestIdExtModules.LABEL_RECEIPT_PAY_EXTRAINFO, false);
 
@@ -61,16 +67,19 @@
     tap(TestIdExtModules.BUTTON_KEYPAD_5);
     tap(TestIdExtModules.BUTTON_KEYPAD_0);
     tap(TestIdExtModules.BUTTON_KEYPAD_ENTER);
-    verify(TestIdPack.LABEL_RECEIPT_PAY_REMAINING, "137.50€");
+    verify(TestIdExtModules.LABEL_RECEIPT_PAY_REMAINING, "137.50€");
     tap(TestIdExtModules.BUTTON_CASH);
     tap(TestIdExtModules.BUTTON_PAY_EXACT);
+    OBUtils.pause(500);
     isVisible(TestIdExtModules.LABEL_RECEIPT_PAY_REMAINING, false);
     isVisible(TestIdExtModules.BUTTON_PAY_EXACT, false);
     isVisible(TestIdExtModules.BUTTON_PAY_DONE, true);
-    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTNAME, "-- 20% Discount on Card Payment Method");
-    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT, "-12.50");
-    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTNAME2, "-- 10% Discount on Cash Payment Method");
-    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT2, "-13.75");
+    verify(TestIdExtModules.LABEL_RECEIPT_ROW1_DISCOUNTNAME,
+        "-- 10% Discount on Cash Payment Method");
+    verify(TestIdExtModules.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT, "-13.75");
+    verify(TestIdExtModules.LABEL_RECEIPT_ROW1_DISCOUNTNAME2,
+        "-- 20% Discount on Card Payment Method");
+    verify(TestIdExtModules.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT2, "-12.50");
     tap(TestIdExtModules.BUTTON_RECEIPT_PAYMENT_ROW2_REMOVE);
     tap(TestIdExtModules.BUTTON_RECEIPT_PAYMENT_ROW1_REMOVE);
 
@@ -79,18 +88,20 @@
     tap(TestIdExtModules.BUTTON_KEYPAD_5);
     tap(TestIdExtModules.BUTTON_KEYPAD_0);
     tap(TestIdExtModules.BUTTON_CASH);
-    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTNAME, "-- 10% Discount on Cash Payment Method");
-    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT, "-5.56");
-    verify(TestIdPack.LABEL_RECEIPT_PAY_REMAINING, "144.44€");
+    verify(TestIdExtModules.LABEL_RECEIPT_ROW1_DISCOUNTNAME,
+        "-- 10% Discount on Cash Payment Method");
+    verify(TestIdExtModules.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT, "-5.56");
+    verify(TestIdExtModules.LABEL_RECEIPT_PAY_REMAINING, "144.44€");
     tap(TestIdExtModules.BUTTON_KEYPAD_2);
     tap(TestIdExtModules.BUTTON_KEYPAD_0);
     tap(TestIdExtModules.BUTTON_CASH);
-    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT, "-7.78");
-    verify(TestIdPack.LABEL_RECEIPT_PAY_REMAINING, "122.22€");
+    verify(TestIdExtModules.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT, "-7.78");
+    verify(TestIdExtModules.LABEL_RECEIPT_PAY_REMAINING, "122.22€");
     tap(TestIdExtModules.BUTTON_CARD);
     tap(TestIdExtModules.BUTTON_PAY_EXACT);
-    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTNAME2, "-- 20% Discount on Card Payment Method");
-    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT2, "-24.44");
+    verify(TestIdExtModules.LABEL_RECEIPT_ROW1_DISCOUNTNAME2,
+        "-- 20% Discount on Card Payment Method");
+    verify(TestIdExtModules.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT2, "-24.44");
     isVisible(TestIdExtModules.LABEL_RECEIPT_PAY_REMAINING, false);
     isVisible(TestIdExtModules.BUTTON_PAY_EXACT, false);
     isVisible(TestIdExtModules.BUTTON_PAY_DONE, true);
@@ -102,29 +113,34 @@
     tap(TestIdExtModules.BUTTON_KEYPAD_5);
     tap(TestIdExtModules.BUTTON_KEYPAD_0);
     tap(TestIdExtModules.BUTTON_CASH);
-    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTNAME, "-- 10% Discount on Cash Payment Method");
-    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT, "-5.56");
-    verify(TestIdPack.LABEL_RECEIPT_PAY_REMAINING, "144.44€");
+    verify(TestIdExtModules.LABEL_RECEIPT_ROW1_DISCOUNTNAME,
+        "-- 10% Discount on Cash Payment Method");
+    verify(TestIdExtModules.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT, "-5.56");
+    verify(TestIdExtModules.LABEL_RECEIPT_PAY_REMAINING, "144.44€");
     tap(TestIdExtModules.BUTTON_KEYPAD_2);
     tap(TestIdExtModules.BUTTON_KEYPAD_0);
     tap(TestIdExtModules.BUTTON_CASH);
-    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT, "-7.78");
-    verify(TestIdPack.LABEL_RECEIPT_PAY_REMAINING, "122.22€");
+    verify(TestIdExtModules.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT, "-7.78");
+    verify(TestIdExtModules.LABEL_RECEIPT_PAY_REMAINING, "122.22€");
     // Card Payment
     tap(TestIdExtModules.BUTTON_CARD);
     tap(TestIdExtModules.BUTTON_KEYPAD_5);
     tap(TestIdExtModules.BUTTON_KEYPAD_0);
     tap(TestIdExtModules.BUTTON_KEYPAD_ENTER);
-    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTNAME2, "-- 20% Discount on Card Payment Method");
-    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT2, "-12.50");
-    verify(TestIdPack.LABEL_RECEIPT_PAY_REMAINING, "59.72€");
+    verify(TestIdExtModules.LABEL_RECEIPT_ROW1_DISCOUNTNAME2,
+        "-- 20% Discount on Card Payment Method");
+    verify(TestIdExtModules.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT2, "-12.50");
+    verify(TestIdExtModules.LABEL_RECEIPT_PAY_REMAINING, "59.72€");
+    tap(TestIdExtModules.BUTTON_CARD);
     tap(TestIdExtModules.BUTTON_KEYPAD_2);
     tap(TestIdExtModules.BUTTON_KEYPAD_0);
     tap(TestIdExtModules.BUTTON_KEYPAD_ENTER);
-    verify(TestIdPack.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT2, "-17.50");
-    verify(TestIdPack.LABEL_RECEIPT_PAY_REMAINING, "34.72€");
+    verify(TestIdExtModules.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT2, "-17.50");
+    verify(TestIdExtModules.LABEL_RECEIPT_PAY_REMAINING, "34.72€");
 
+    tap(TestIdExtModules.BUTTON_CASH);
     tap(TestIdExtModules.BUTTON_PAY_EXACT);
+    OBUtils.pause(500);
     isVisible(TestIdExtModules.LABEL_RECEIPT_PAY_REMAINING, false);
     isVisible(TestIdExtModules.BUTTON_PAY_EXACT, false);
     isVisible(TestIdExtModules.BUTTON_PAY_DONE, true);