diff -r 589c15557c6b -r d6f27626d7bd src-test/org/openbravo/test/mobile/core/utils/AllowedErrorsHelper.java --- a/src-test/org/openbravo/test/mobile/core/utils/AllowedErrorsHelper.java Mon Mar 20 14:11:05 2017 +0100 +++ b/src-test/org/openbravo/test/mobile/core/utils/AllowedErrorsHelper.java Wed Mar 22 15:26:44 2017 +0100 @@ -286,6 +286,14 @@ testsAllowedToHaveJavascriptErrors.add("CheckShippingAddressMandatory"); testsAllowedToHaveJavascriptErrors.add("NewCustomerWithAddress"); + // I35383_NoEmptySearchsInProductInRemote, allow all errors in this test, instead of only accept + // the error : "serviceSuccess error: status: -1, error.message: OBPOS_ProductSearchTooBroad" + // so If this error happen in other test will make fail the test, since empty search's in remote + // are not allowed + testsAllowedToHaveJavascriptErrors.add("I35383_NoEmptySearchsInProductInRemote"); + testsAllowedToHaveJavascriptErrors.add("I35383_No1CharSearchsInProductInRemote"); + testsAllowedToHaveJavascriptErrors.add("I35383_No2CharSearchsInProductInRemote"); + return testsAllowedToHaveJavascriptErrors; } @@ -366,6 +374,14 @@ testsAllowedToHaveLogclientErrors .add("SelectPrinterTests.SwitchBetweenReceiptPrintersWhenError"); + // I35383_NoEmptySearchsInProductInRemote, allow all errors in this test, instead of only accept + // the error : "serviceSuccess error: status: -1, error.message: OBPOS_ProductSearchTooBroad" + // so If this error happen in other test will make fail the test, since empty search's in remote + // are not allowed + testsAllowedToHaveLogclientErrors.add("I35383_NoEmptySearchsInProductInRemote"); + testsAllowedToHaveLogclientErrors.add("I35383_No1CharSearchsInProductInRemote"); + testsAllowedToHaveLogclientErrors.add("I35383_No2CharSearchsInProductInRemote"); + return testsAllowedToHaveLogclientErrors; } diff -r 589c15557c6b -r d6f27626d7bd src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/stockcriteria/CheckAlwaysShowStockHelper.java --- a/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/stockcriteria/CheckAlwaysShowStockHelper.java Mon Mar 20 14:11:05 2017 +0100 +++ b/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/stockcriteria/CheckAlwaysShowStockHelper.java Wed Mar 22 15:26:44 2017 +0100 @@ -89,7 +89,7 @@ protected void changeFunction() { SeleniumHelper - .executeScript("OB.UTIL.showError = function(s) { OB.error(s); OB.MobileApp.model.temp = s;" + .executeScript("OB.UTIL.showWarning = function(s) { OB.error(s); OB.MobileApp.model.temp = s;" + "if (OB.MobileApp.model.hasPermission('OBMOBC_EnableErrorPopup', true)) {" + "return OB.UTIL.showConfirmation.display('', s);} " + "else {return OB.UTIL.showAlert.display(s, OB.I18N.getLabel('OBMOBC_LblError'), 'alert-error')}};"); diff -r 589c15557c6b -r d6f27626d7bd src-test/org/openbravo/test/mobile/retail/pack/selenium/TestIdPack.java --- a/src-test/org/openbravo/test/mobile/retail/pack/selenium/TestIdPack.java Mon Mar 20 14:11:05 2017 +0100 +++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/TestIdPack.java Wed Mar 22 15:26:44 2017 +0100 @@ -994,7 +994,7 @@ "Customize Coat", EnyoKind.SEARCHPRODUCT); // public static TestIdConstructor BUTTON_SEARCHPRODUCT_MASSAGE = new TestIdConstructor("Massage", EnyoKind.SEARCHPRODUCT); // - public static TestIdConstructor BUTTON_SEARCHPRODUCT_TV = new TestIdConstructor("TV", + public static TestIdConstructor BUTTON_SEARCHPRODUCT_TV = new TestIdConstructor("Flat Panel TV", EnyoKind.SEARCHPRODUCT); // public static TestIdConstructor BUTTON_SEARCHPRODUCT_BED = new TestIdConstructor("Bed", EnyoKind.SEARCHPRODUCT); // @@ -1648,6 +1648,22 @@ "productsCh_row7_renderProductCh", EnyoKind.BUTTON); // public static TestIdConstructor BUTTON_CHARACTERISTICS_ROW8 = new TestIdConstructor( "productsCh_row8_renderProductCh", EnyoKind.BUTTON); // + public static TestIdConstructor BUTTON_CHARACTERISTICS_ROW9 = new TestIdConstructor( + "productsCh_row9_renderProductCh", EnyoKind.BUTTON); // + public static TestIdConstructor BUTTON_CHARACTERISTICS_ROW10 = new TestIdConstructor( + "productsCh_row10_renderProductCh", EnyoKind.BUTTON); // + public static TestIdConstructor BUTTON_CHARACTERISTICS_ROW11 = new TestIdConstructor( + "productsCh_row11_renderProductCh", EnyoKind.BUTTON); // + public static TestIdConstructor BUTTON_CHARACTERISTICS_ROW12 = new TestIdConstructor( + "productsCh_row12_renderProductCh", EnyoKind.BUTTON); // + public static TestIdConstructor BUTTON_CHARACTERISTICS_ROW13 = new TestIdConstructor( + "productsCh_row13_renderProductCh", EnyoKind.BUTTON); // + public static TestIdConstructor BUTTON_CHARACTERISTICS_ROW14 = new TestIdConstructor( + "productsCh_row14_renderProductCh", EnyoKind.BUTTON); // + public static TestIdConstructor BUTTON_CHARACTERISTICS_ROW15 = new TestIdConstructor( + "productsCh_row15_renderProductCh", EnyoKind.BUTTON); // + public static TestIdConstructor BUTTON_POPUP_CHARACTERISTICS_ROW1 = new TestIdConstructor( + "valueslistitemprinter_row1_listValuesLineCheck"); // public static TestIdConstructor BUTTON_POPUP_CHARACTERISTICS_BACK = new TestIdConstructor( "modalProductChTopHeader_backChButton", EnyoKind.BUTTON); // public static TestIdConstructor BUTTON_POPUP_CHARACTERISTICS_DONE = new TestIdConstructor( diff -r 589c15557c6b -r d6f27626d7bd src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/highvolume/I35383_EnsureNormalSearchsInProductInRemoteContinueWorking.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/highvolume/I35383_EnsureNormalSearchsInProductInRemoteContinueWorking.java Wed Mar 22 15:26:44 2017 +0100 @@ -0,0 +1,73 @@ +/* + ************************************************************************* + * The contents of this file are subject to the Openbravo Public License + * Version 1.0 (the "License"), being the Mozilla Public License + * Version 1.1 with a permitted attribution clause; you may not use this + * file except in compliance with the License. You may obtain a copy of + * the License at http://www.openbravo.com/legal/license.html + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + * License for the specific language governing rights and limitations + * 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) 2017 Openbravo S.L.U. + * All Rights Reserved. + * Contributor(s): + ************************************************************************ + * + */ + +package org.openbravo.test.mobile.retail.pack.selenium.tests.highvolume; + +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.MatcherAssert.assertThat; + +import org.junit.Test; +import org.openbravo.test.mobile.core.selenium.SeleniumHelper; +import org.openbravo.test.mobile.retail.extmodules.selenium.TestIdExtModules; +import org.openbravo.test.mobile.retail.mobilecore.annotations.TestClassAnnotations; +import org.openbravo.test.mobile.retail.pack.selenium.TestIdPack; +import org.openbravo.test.mobile.retail.pack.selenium.terminals.WebPOSTerminalHelper; + +@TestClassAnnotations(isHighVolumeCompatible = true) +public class I35383_EnsureNormalSearchsInProductInRemoteContinueWorking extends + WebPOSTerminalHelper { + + @Test + public void test() { + + final Boolean isProductRemote = (Boolean) SeleniumHelper + .executeScriptWithReturn("OB.MobileApp.model.get('permissions')['OBPOS_remote.product'];"); + assertThat("Test must be run in High Volume mode", isProductRemote, equalTo(Boolean.TRUE)); + + // In this test the errors are not ignored, so if with valid searches it get an error will make + // the test fail + + // test name search (at least 3 characters) + tap(TestIdPack.BUTTON_SEARCH); + write(TestIdPack.FIELD_SEARCH_TEXT, "ski"); + tap(TestIdPack.BUTTON_SEARCH_EXECUTE); + verify(TestIdPack.LABEL_PRODUCT_ROW1, "Ski & snowboard helmet"); + + tap(TestIdPack.BUTTON_SEARCH_DELETE); + + // test with a filter + verify(TestIdPack.BUTTON_CHARACTERISTICS_ROW1, "Battery Life"); + tap(TestIdPack.BUTTON_CHARACTERISTICS_ROW1); + verify(TestIdPack.LABEL_CHARACTERISTICS_VALUE_ROW2, "20h"); + tap(TestIdPack.BUTTON_CHARACTERISTICS_VALUE_ROW2); + tap(TestIdPack.BUTTON_POPUP_CHARACTERISTICS_DONE); + verify(TestIdPack.LABEL_PRODUCT_ROW1, "Digital altimeter Blue"); + + tap(TestIdPack.BUTTON_SEARCH_DELETE); + + tap(TestIdExtModules.BUTTON_SEARCH); + TestIdExtModules.COMBO_PRODUCTCATEGORY.enyoNode().executeExtension(".setSelected(4)"); + tap(TestIdExtModules.BUTTON_SEARCH_EXECUTE); + verify(TestIdPack.LABEL_PRODUCT_ROW1, "Avalanche transceiver"); + + // // go back to initial tab, so next test finds the house clean + tap(TestIdPack.BUTTON_SCAN); + } +} \ No newline at end of file diff -r 589c15557c6b -r d6f27626d7bd src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/highvolume/I35383_No1CharSearchsInProductInRemote.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/highvolume/I35383_No1CharSearchsInProductInRemote.java Wed Mar 22 15:26:44 2017 +0100 @@ -0,0 +1,73 @@ +/* + ************************************************************************* + * The contents of this file are subject to the Openbravo Public License + * Version 1.0 (the "License"), being the Mozilla Public License + * Version 1.1 with a permitted attribution clause; you may not use this + * file except in compliance with the License. You may obtain a copy of + * the License at http://www.openbravo.com/legal/license.html + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + * License for the specific language governing rights and limitations + * 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) 2017 Openbravo S.L.U. + * All Rights Reserved. + * Contributor(s): + ************************************************************************ + * + */ + +package org.openbravo.test.mobile.retail.pack.selenium.tests.highvolume; + +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.MatcherAssert.assertThat; + +import org.junit.Test; +import org.openbravo.test.mobile.core.junit.SequentialTestInfo; +import org.openbravo.test.mobile.core.selenium.SeleniumHelper; +import org.openbravo.test.mobile.retail.mobilecore.annotations.TestClassAnnotations; +import org.openbravo.test.mobile.retail.pack.selenium.TestIdPack; +import org.openbravo.test.mobile.retail.pack.selenium.terminals.WebPOSTerminalHelper; + +@TestClassAnnotations(isHighVolumeCompatible = true) +public class I35383_No1CharSearchsInProductInRemote extends WebPOSTerminalHelper { + + private static final String MESSAGE_OBPOS_PRODUCT_SEARCH_TOO_BROAD = "message: OBPOS_ProductSearchTooBroad"; + + @Test + // @TestAnnotations(waitFixOf = 35383) + public void test() { + + // ensure we are in remote + final Boolean isProductRemote = (Boolean) SeleniumHelper + .executeScriptWithReturn("OB.MobileApp.model.get('permissions')['OBPOS_remote.product'];"); + assertThat("Test must be run in High Volume mode", isProductRemote, equalTo(Boolean.TRUE)); + + // To check if the message was ignored, the error is needed to add here the message. + // Note: still needed to add the error to AllowedErrorsHelper.java + SequentialTestInfo.addIgnoredJavascriptError(MESSAGE_OBPOS_PRODUCT_SEARCH_TOO_BROAD); + + // check that fail with 1 char + tap(TestIdPack.BUTTON_SEARCH); + write(TestIdPack.FIELD_SEARCH_TEXT, "s"); + try { + // If the search return no results it gives an exception + tap(TestIdPack.BUTTON_SEARCH_EXECUTE); + } catch (org.jboss.netty.handler.timeout.TimeoutException e) { + assertThat( + "Get different exception than expected one", + e.getMessage(), + equalTo("The 'table_products (testId = table_products)' scrollableTable has not been populated with any data")); + } + + // All the errors of this test are ignored, checking that we have get the error message that we + // expect when launching a search without filters + boolean isErrorShown = SequentialTestInfo + .wasJavascriptErrorIgnored(MESSAGE_OBPOS_PRODUCT_SEARCH_TOO_BROAD); + assertThat("The message has not been shown", isErrorShown, equalTo(true)); + + // // go back to initial tab, so next test finds the house clean + tap(TestIdPack.BUTTON_SCAN); + } +} \ No newline at end of file diff -r 589c15557c6b -r d6f27626d7bd src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/highvolume/I35383_No2CharSearchsInProductInRemote.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/highvolume/I35383_No2CharSearchsInProductInRemote.java Wed Mar 22 15:26:44 2017 +0100 @@ -0,0 +1,73 @@ +/* + ************************************************************************* + * The contents of this file are subject to the Openbravo Public License + * Version 1.0 (the "License"), being the Mozilla Public License + * Version 1.1 with a permitted attribution clause; you may not use this + * file except in compliance with the License. You may obtain a copy of + * the License at http://www.openbravo.com/legal/license.html + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + * License for the specific language governing rights and limitations + * 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) 2017 Openbravo S.L.U. + * All Rights Reserved. + * Contributor(s): + ************************************************************************ + * + */ + +package org.openbravo.test.mobile.retail.pack.selenium.tests.highvolume; + +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.MatcherAssert.assertThat; + +import org.junit.Test; +import org.openbravo.test.mobile.core.junit.SequentialTestInfo; +import org.openbravo.test.mobile.core.selenium.SeleniumHelper; +import org.openbravo.test.mobile.retail.mobilecore.annotations.TestClassAnnotations; +import org.openbravo.test.mobile.retail.pack.selenium.TestIdPack; +import org.openbravo.test.mobile.retail.pack.selenium.terminals.WebPOSTerminalHelper; + +@TestClassAnnotations(isHighVolumeCompatible = true) +public class I35383_No2CharSearchsInProductInRemote extends WebPOSTerminalHelper { + + private static final String MESSAGE_OBPOS_PRODUCT_SEARCH_TOO_BROAD = "message: OBPOS_ProductSearchTooBroad"; + + @Test + // @TestAnnotations(waitFixOf = 35383) + public void test() { + + // ensure we are in remote + final Boolean isProductRemote = (Boolean) SeleniumHelper + .executeScriptWithReturn("OB.MobileApp.model.get('permissions')['OBPOS_remote.product'];"); + assertThat("Test must be run in High Volume mode", isProductRemote, equalTo(Boolean.TRUE)); + + // To check if the message was ignored, the error is needed to add here the message. + // Note: still needed to add the error to AllowedErrorsHelper.java + SequentialTestInfo.addIgnoredJavascriptError(MESSAGE_OBPOS_PRODUCT_SEARCH_TOO_BROAD); + + // check that fail with 2 char search + tap(TestIdPack.BUTTON_SEARCH); + write(TestIdPack.FIELD_SEARCH_TEXT, "sk"); + try { + // If the search return no results it gives an exception + tap(TestIdPack.BUTTON_SEARCH_EXECUTE); + } catch (org.jboss.netty.handler.timeout.TimeoutException e) { + assertThat( + "Get different exception than expected one", + e.getMessage(), + equalTo("The 'table_products (testId = table_products)' scrollableTable has not been populated with any data")); + } + + // All the errors of this test are ignored, checking that we have get the error message that we + // expect when launching a search without filters + boolean isErrorShown = SequentialTestInfo + .wasJavascriptErrorIgnored(MESSAGE_OBPOS_PRODUCT_SEARCH_TOO_BROAD); + assertThat("The message has not been shown", isErrorShown, equalTo(true)); + + // // go back to initial tab, so next test finds the house clean + tap(TestIdPack.BUTTON_SCAN); + } +} \ No newline at end of file diff -r 589c15557c6b -r d6f27626d7bd src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/highvolume/I35383_NoEmptySearchsInProductInRemote.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/highvolume/I35383_NoEmptySearchsInProductInRemote.java Wed Mar 22 15:26:44 2017 +0100 @@ -0,0 +1,72 @@ +/* + ************************************************************************* + * The contents of this file are subject to the Openbravo Public License + * Version 1.0 (the "License"), being the Mozilla Public License + * Version 1.1 with a permitted attribution clause; you may not use this + * file except in compliance with the License. You may obtain a copy of + * the License at http://www.openbravo.com/legal/license.html + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + * License for the specific language governing rights and limitations + * 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) 2017 Openbravo S.L.U. + * All Rights Reserved. + * Contributor(s): + ************************************************************************ + * + */ + +package org.openbravo.test.mobile.retail.pack.selenium.tests.highvolume; + +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.MatcherAssert.assertThat; + +import org.junit.Test; +import org.openbravo.test.mobile.core.junit.SequentialTestInfo; +import org.openbravo.test.mobile.core.selenium.SeleniumHelper; +import org.openbravo.test.mobile.retail.mobilecore.annotations.TestClassAnnotations; +import org.openbravo.test.mobile.retail.pack.selenium.TestIdPack; +import org.openbravo.test.mobile.retail.pack.selenium.terminals.WebPOSTerminalHelper; + +@TestClassAnnotations(isHighVolumeCompatible = true) +public class I35383_NoEmptySearchsInProductInRemote extends WebPOSTerminalHelper { + + private static final String MESSAGE_OBPOS_PRODUCT_SEARCH_TOO_BROAD = "message: OBPOS_ProductSearchTooBroad"; + + @Test + // @TestAnnotations(waitFixOf = 35383) + public void test() { + + // ensure we are in remote + final Boolean isProductRemote = (Boolean) SeleniumHelper + .executeScriptWithReturn("OB.MobileApp.model.get('permissions')['OBPOS_remote.product'];"); + assertThat("Test must be run in High Volume mode", isProductRemote, equalTo(Boolean.TRUE)); + + // To check if the message was ignored, the error is needed to add here the message. + // Note: still needed to add the error to AllowedErrorsHelper.java + SequentialTestInfo.addIgnoredJavascriptError(MESSAGE_OBPOS_PRODUCT_SEARCH_TOO_BROAD); + + // check that fail with empty search + tap(TestIdPack.BUTTON_SEARCH); + try { + // If the search return no results it gives an exception + tap(TestIdPack.BUTTON_SEARCH_EXECUTE); + } catch (org.jboss.netty.handler.timeout.TimeoutException e) { + assertThat( + "Get different exception than expected one", + e.getMessage(), + equalTo("The 'table_products (testId = table_products)' scrollableTable has not been populated with any data")); + } + + // All the errors of this test are ignored, checking that we have get the error message that we + // expect when launching a search without filters + boolean isErrorShown = SequentialTestInfo + .wasJavascriptErrorIgnored(MESSAGE_OBPOS_PRODUCT_SEARCH_TOO_BROAD); + assertThat("The message has not been shown", isErrorShown, equalTo(true)); + + // // go back to initial tab, so next test finds the house clean + tap(TestIdPack.BUTTON_SCAN); + } +} \ No newline at end of file diff -r 589c15557c6b -r d6f27626d7bd src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/receipts/I32962_ReceiptCreateAssortmentAndLoaded.java --- a/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/receipts/I32962_ReceiptCreateAssortmentAndLoaded.java Mon Mar 20 14:11:05 2017 +0100 +++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/receipts/I32962_ReceiptCreateAssortmentAndLoaded.java Wed Mar 22 15:26:44 2017 +0100 @@ -28,6 +28,7 @@ import java.util.UUID; import org.junit.Test; +import org.openbravo.test.mobile.core.junit.SequentialTestInfo; import org.openbravo.test.mobile.retail.mobilecore.annotations.TestClassAnnotations; import org.openbravo.test.mobile.retail.mobilecore.database.DatabaseHelperInsertUpdateOrDelete; import org.openbravo.test.mobile.retail.pack.selenium.TestIdPack; @@ -52,6 +53,20 @@ logoutAndCloseBrowser(); logIn(); tap(TestIdPack.BUTTON_SEARCH); + + if (SequentialTestInfo.getHighVolumenMode()) { + tap(TestIdPack.BUTTON_CHARACTERISTICS_ROW14); + } else { + tap(TestIdPack.BUTTON_CHARACTERISTICS_ROW7); + } + verify(TestIdPack.LABEL_CHARACTERISTICS_VALUE_ROW1, + "High Mountaineering & Expeditions, Hiking & Trekking"); + verify(TestIdPack.LABEL_CHARACTERISTICS_VALUE_ROW2, + "High Mountaineering & Expeditions, Ski Touring"); + tap(TestIdPack.BUTTON_CHARACTERISTICS_VALUE_ROW1); + tap(TestIdPack.BUTTON_CHARACTERISTICS_VALUE_ROW2); + tap(TestIdPack.BUTTON_POPUP_CHARACTERISTICS_DONE); + tap(TestIdPack.BUTTON_SEARCH_EXECUTE); tap(TestIdPack.BUTTON_SEARCHPRODUCT_ALPINESKIING); verify(TestIdPack.LABEL_RECEIPT_ROW1_AMOUNT, "109.90");