diff --git a/README.adoc b/README.adoc index 7ec92e2d3..6a209d1fa 100644 --- a/README.adoc +++ b/README.adoc @@ -35,7 +35,7 @@ Tool used for Continuous Integration and Continuous Delivery. Inside of this Jen * **Mr Checker** -MrChecker is a testing framework included in devonfw with several useful modules, from which we will focus on the Selenium Module, a module designed to make end-to-end testing easier to implement. More about it [here](https://github.com/devonfw/devonfw-testing/wiki). +MrChecker is a testing framework included in devonfw with several useful modules, from which we will focus on the Selenium Module, a module designed to make end-to-end testing easier to implement. More about it link:https://github.com/devonfw/devonfw-testing/wiki[here]. === Deprecated diff --git a/mrchecker/endtoend-test/pom.xml b/mrchecker/endtoend-test/pom.xml index 035b49159..0d7593a11 100644 --- a/mrchecker/endtoend-test/pom.xml +++ b/mrchecker/endtoend-test/pom.xml @@ -75,7 +75,7 @@ 4.12.0.10 - 3.8.1.12 + 3.8.1.13 1.1.3 1.1.5 @@ -139,12 +139,30 @@ ${mrchecker-core-module.version} + + + + + + + + com.capgemini.mrchecker + + mrchecker-selenium-module + + ${mrchecker-selenium-module.version} + + + + + + diff --git a/mrchecker/endtoend-test/src/test/java/com/devonfw/mts/common/readProperties/ConfigFileReader.java b/mrchecker/endtoend-test/src/test/java/com/devonfw/mts/common/readProperties/ConfigFileReader.java index 6dbbb5652..c937a4ac8 100644 --- a/mrchecker/endtoend-test/src/test/java/com/devonfw/mts/common/readProperties/ConfigFileReader.java +++ b/mrchecker/endtoend-test/src/test/java/com/devonfw/mts/common/readProperties/ConfigFileReader.java @@ -1,5 +1,10 @@ package com.devonfw.mts.common.readProperties; +/** + * @author Juan Andrés Ambuludi Olmedo + * @author Jorge Dacal Cantos + * @author Carlos Micó Egea + */ import java.io.BufferedReader; import java.io.FileNotFoundException; import java.io.FileReader; diff --git a/mrchecker/endtoend-test/src/test/java/com/devonfw/mts/common/utils/Utils.java b/mrchecker/endtoend-test/src/test/java/com/devonfw/mts/common/utils/Utils.java index c11277a14..6517a923f 100644 --- a/mrchecker/endtoend-test/src/test/java/com/devonfw/mts/common/utils/Utils.java +++ b/mrchecker/endtoend-test/src/test/java/com/devonfw/mts/common/utils/Utils.java @@ -72,9 +72,10 @@ public static void sendKeysWithCheck(String text, By textFieldSearchCriteria, IN } catch (TimeoutException e) { System.out.println("Character not written: " + character); + System.out.println("Waiting for it to be written..."); } } - System.out.println("Progress: " + text.substring(0, i + 1)); + // System.out.println("Progress: " + text.substring(0, i + 1)); } } diff --git a/mrchecker/endtoend-test/src/test/java/com/devonfw/mts/pages/ThaiDateTimePage.java b/mrchecker/endtoend-test/src/test/java/com/devonfw/mts/pages/ThaiDateTimePage.java index e529f00e9..c2e125564 100644 --- a/mrchecker/endtoend-test/src/test/java/com/devonfw/mts/pages/ThaiDateTimePage.java +++ b/mrchecker/endtoend-test/src/test/java/com/devonfw/mts/pages/ThaiDateTimePage.java @@ -41,10 +41,8 @@ public void setUpDateAndTime() { WebElement arrowButton = getDriver().findElementDynamic(arrowSearch); WebElement ticButton = getDriver().findElementDynamic(ticSearch); - System.out.println("cosas hechas"); arrowButton.click(); ticButton.click(); - System.out.println("clicks hechos"); } } diff --git a/mrchecker/endtoend-test/src/test/java/com/devonfw/mts/pages/ThaiHomePage.java b/mrchecker/endtoend-test/src/test/java/com/devonfw/mts/pages/ThaiHomePage.java index 07768a14b..d4021b57e 100644 --- a/mrchecker/endtoend-test/src/test/java/com/devonfw/mts/pages/ThaiHomePage.java +++ b/mrchecker/endtoend-test/src/test/java/com/devonfw/mts/pages/ThaiHomePage.java @@ -14,8 +14,11 @@ import com.devonfw.mts.common.readProperties.ConfigFileReader; /** - * @author jambulud + * @author Juan Andrés Ambuludi Olmedo + * @author Jorge Dacal Cantos + * @author Carlos Micó Egea */ + // @Configuration // no se si esto hace falta o no, lo he copiado de otra version (Carlos) // @PropertySource("file:config.properties") public class ThaiHomePage extends BasePage { diff --git a/mrchecker/endtoend-test/src/test/java/com/devonfw/mts/pages/ThaiReservationsPage.java b/mrchecker/endtoend-test/src/test/java/com/devonfw/mts/pages/ThaiReservationsPage.java index fd2068bf8..4195e8448 100644 --- a/mrchecker/endtoend-test/src/test/java/com/devonfw/mts/pages/ThaiReservationsPage.java +++ b/mrchecker/endtoend-test/src/test/java/com/devonfw/mts/pages/ThaiReservationsPage.java @@ -19,8 +19,11 @@ import com.devonfw.mts.common.utils.Utils; /** - * @author jambulud + * @author Juan Andrés Ambuludi Olmedo + * @author Jorge Dacal Cantos + * @author Carlos Micó Egea */ + public class ThaiReservationsPage extends BasePage { /* Search criteria */ @@ -161,7 +164,6 @@ private HashMap> getReservationsShownByDate( reservations = getDriver().findElementDynamics(reservationsTableSearch); for (int i = 1; i <= reservations.size(); i++) { - System.out.println(reservations.size()); date = getDriver().findElementDynamic(findDataCell(i, 1)).getText(); email = getDriver().findElementDynamic(findDataCell(i, 2)).getText(); @@ -173,7 +175,7 @@ private HashMap> getReservationsShownByDate( e.printStackTrace(); } - System.out.printf("date: %s, email: %s, id: %s\n", date, email, id); + // System.out.printf("date: %s, email: %s, id: %s\n", date, email, id); reservationsByDate = idReservations.getOrDefault(date, new LinkedList()); reservationsByDate.add(new Reservation(date, email, id)); diff --git a/mrchecker/endtoend-test/src/test/java/com/devonfw/mts/pages/ThaiTableBodyPage.java b/mrchecker/endtoend-test/src/test/java/com/devonfw/mts/pages/ThaiTableBodyPage.java index e01b45a52..70f8cc22f 100644 --- a/mrchecker/endtoend-test/src/test/java/com/devonfw/mts/pages/ThaiTableBodyPage.java +++ b/mrchecker/endtoend-test/src/test/java/com/devonfw/mts/pages/ThaiTableBodyPage.java @@ -14,9 +14,11 @@ import com.devonfw.mts.common.data.Reservation; /** - * @author jambulud - * + * @author Juan Andrés Ambuludi Olmedo + * @author Jorge Dacal Cantos + * @author Carlos Micó Egea */ + public class ThaiTableBodyPage extends BasePage { /* Search criteria */ @@ -70,7 +72,7 @@ public Map> getReservations(Map()); reservationsByDate.add(new Reservation(date, email, id)); diff --git a/mrchecker/endtoend-test/src/test/java/com/devonfw/mts/tests/MyThaiStarTest.java b/mrchecker/endtoend-test/src/test/java/com/devonfw/mts/tests/MyThaiStarTest.java index 9eb7c76dc..d3add1b65 100644 --- a/mrchecker/endtoend-test/src/test/java/com/devonfw/mts/tests/MyThaiStarTest.java +++ b/mrchecker/endtoend-test/src/test/java/com/devonfw/mts/tests/MyThaiStarTest.java @@ -114,7 +114,6 @@ private void bookTable(Reservation reservation) { ThaiBookPage myBookPage = this.myThaiStarHome.clickBookTable(); - System.out.println("Reserva in bookTable: " + reservation.getDate()); ThaiConfirmBookPage myComfirmPage = myBookPage.enterBookingData(reservation); myComfirmPage.confirmBookingData(); myBookPage.checkConfirmationDialog(); @@ -125,7 +124,6 @@ private void verifyBooking(Reservation reservation) { ThaiWaiterPage myWaiterPage = new ThaiWaiterPage(); ThaiReservationsPage myReservationsPage = myWaiterPage.switchToReservations(); HashMap> reservations = myReservationsPage.searchDatesByEmail(reservation.getEmail()); - System.out.println("Reserva in verifyBooking: " + reservation.getDate()); Assert.assertTrue("Booking not found", reservations.containsKey(reservation.getDate())); List reservationsForDate = reservations.get(reservation.getDate()); Assert.assertFalse("Booking not found", reservationsForDate.isEmpty());