Merge b85f89cc991180b9fe53d609af06a8755a1a22b9 into c2a877744a00d92ba70f01a01afba5e322f9c0a1

.travis.yml

@@ -1,3 +1,13 @@
 language: java
 jdk:
-  - oraclejdk8
+  - oraclejdk8
+
+before_script:
+  - mvn jetty:run & # start a Web server
+  - sleep 15
+
+script:
+  - mvn test
+
+after_script:
+  - mvn jetty:stop

README.md

@@ -9,4 +9,4 @@ Development blog: https://citerus.github.io/dddsample-core/
 
 Trello board: https://trello.com/b/PTDFRyxd
 
-[![Build Status](https://travis-ci.org/citerus/dddsample-core.svg?branch=master)](https://travis-ci.org/citerus/dddsample-core)
+[![Build Status](https://travis-ci.org/andeemarks/dddsample-core.svg?branch=master)](https://travis-ci.org/andeemarks/dddsample-core)

pom.xml

@@ -88,15 +88,40 @@
         </configuration>
       </plugin>
 
+        <!-- Downloader for Selenium server -->
+        <plugin>
+            <groupId>com.lazerycode.selenium</groupId>
+            <artifactId>driver-binary-downloader-maven-plugin</artifactId>
+            <version>1.0.14</version>
+            <configuration>
+                <!-- root directory that downloaded driver binaries will be stored in -->
+                <rootStandaloneServerDirectory>/tmp</rootStandaloneServerDirectory>
+                <!-- Where you want to store downloaded zip files -->
+                <downloadedZipFileDirectory>/tmp</downloadedZipFileDirectory>
+            </configuration>
+            <executions>
+                <execution>
+                    <goals>
+                        <goal>selenium</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
+
       <!-- Jetty plugin -->
-      <plugin>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>maven-jetty-plugin</artifactId>
-      </plugin>
+        <plugin>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-maven-plugin</artifactId>
+            <configuration>
+                <stopPort>9966</stopPort>
+                <stopKey>foo</stopKey>
+                <stopWait>10</stopWait>
+            </configuration>
+        </plugin>
 
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>${maven-jar-plugin.version}</version>
+        <plugin>
+            <artifactId>maven-jar-plugin</artifactId>
+            <version>${maven-jar-plugin.version}</version>
         <executions>
 
           <!-- Package booking service facade classes in separate jar -->
@@ -141,6 +166,18 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>org.seleniumhq.selenium</groupId>
+      <artifactId>selenium-server</artifactId>
+      <version>3.4.0</version>
+      <scope>test</scope>
+    </dependency>
+      <dependency>
+          <groupId>org.seleniumhq.selenium</groupId>
+          <artifactId>selenium-java</artifactId>
+          <version>2.28.0</version>
+          <scope>test</scope>
+      </dependency>
+      <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
       <version>${spring.version}</version>

src/main/java/se/citerus/dddsample/application/util/SampleDataGenerator.java

@@ -1,5 +1,7 @@
 package se.citerus.dddsample.application.util;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.hibernate.SessionFactory;
 import org.hibernate.Session;
 import org.springframework.beans.factory.BeanFactoryUtils;
@@ -33,6 +35,7 @@ import java.util.Date;
  * Provides sample data.
  */
 public class SampleDataGenerator implements ServletContextListener {
+  private static final Log logger = LogFactory.getLog(SampleDataGenerator.class);
 
   private static final Timestamp base; 
   static {
@@ -202,7 +205,7 @@ public class SampleDataGenerator implements ServletContextListener {
   }
 
   public static void loadHibernateData(TransactionTemplate tt, final SessionFactory sf, final HandlingEventFactory handlingEventFactory, final HandlingEventRepository handlingEventRepository) {
-    System.out.println("*** Loading Hibernate data ***");
+    logger.info("*** Loading Hibernate data ***");
     tt.execute(new TransactionCallbackWithoutResult() {
       @Override
       protected void doInTransactionWithoutResult(TransactionStatus status) {

src/main/resources/log4j.properties

@@ -6,5 +6,5 @@ log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m%n
 
 log4j.logger.net.sf.ehcache.config.ConfigurationFactory=error
 
-log4j.logger.org.hibernate.SQL=debug
-log4j.logger.org.hibernate.hbm2ddl=debug
+log4j.logger.org.hibernate.SQL=info
+log4j.logger.org.hibernate.hbm2ddl=info

src/test/java/se/citerus/dddsample/acceptance/AbstractAcceptanceTest.java

@@ -0,0 +1,24 @@
+package se.citerus.dddsample.acceptance;
+
+import org.junit.*;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.phantomjs.PhantomJSDriver;
+
+public abstract class AbstractAcceptanceTest {
+    protected WebDriver driver;
+
+    @Before
+    public void setup() {
+        driver = new PhantomJSDriver();
+        screenshotTestRule.updateDriver(driver);
+    }
+
+    @After
+    public void tearDown() {
+        driver.quit();
+
+    }
+    @Rule
+    public ScreenshotTestRule screenshotTestRule = new ScreenshotTestRule();
+
+}

src/test/java/se/citerus/dddsample/acceptance/AdminAcceptanceTest.java

@@ -0,0 +1,50 @@
+package se.citerus.dddsample.acceptance;
+
+import org.junit.Test;
+import se.citerus.dddsample.acceptance.pages.*;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+
+import static junit.framework.TestCase.assertTrue;
+
+public class AdminAcceptanceTest extends AbstractAcceptanceTest {
+    @Test
+    public void adminSiteCargoListContainsCannedCargo() {
+        LaunchPage home = new LaunchPage(driver,"http://localhost:8080/");
+        AdminPage page = home.goToAdminPage();
+        page.listAllCargo();
+
+        assertTrue("Cargo list doesn't contain ABC123", page.listedCargoContains("ABC123"));
+        assertTrue("Cargo list doesn't contain JKL567", page.listedCargoContains("JKL567"));
+    }
+
+    @Test
+    public void adminSiteCanBookNewCargo() {
+        LaunchPage home = new LaunchPage(driver,"http://localhost:8080/");
+        AdminPage adminPage = home.goToAdminPage();
+
+        CargoBookingPage cargoBookingPage = adminPage.bookNewCargo();
+        cargoBookingPage.selectOrigin("NLRTM");
+        cargoBookingPage.selectDestination("USDAL");
+        LocalDate arrivalDeadline = LocalDate.now().plus(3, ChronoUnit.WEEKS);
+        cargoBookingPage.selectArrivalDeadline(arrivalDeadline);
+        CargoDetailsPage cargoDetailsPage = cargoBookingPage.book();
+
+        String newCargoTrackingId = cargoDetailsPage.getTrackingId();
+        adminPage = cargoDetailsPage.listAllCargo();
+        assertTrue("Cargo list doesn't contain " + newCargoTrackingId, adminPage.listedCargoContains(newCargoTrackingId));
+
+        cargoDetailsPage = adminPage.showDetailsFor(newCargoTrackingId);
+        cargoDetailsPage.expectOriginOf("NLRTM");
+        cargoDetailsPage.expectDestinationOf("USDAL");
+
+        CargoDestinationPage cargoDestinationPage = cargoDetailsPage.changeDestination();
+        cargoDetailsPage = cargoDestinationPage.selectDestinationTo("AUMEL");
+        cargoDetailsPage.expectDestinationOf("AUMEL");
+        cargoDetailsPage.expectArrivalDeadlineOf(arrivalDeadline);
+
+    }
+}

src/test/java/se/citerus/dddsample/acceptance/CustomerAcceptanceTest.java

@@ -0,0 +1,35 @@
+package se.citerus.dddsample.acceptance;
+
+import org.junit.Before;
+import org.junit.Test;
+import se.citerus.dddsample.acceptance.pages.CustomerPage;
+import se.citerus.dddsample.acceptance.pages.LaunchPage;
+
+public class CustomerAcceptanceTest extends AbstractAcceptanceTest {
+    private CustomerPage customerPage;
+
+    @Before
+    public void goToCustomerPage() {
+        LaunchPage home = new LaunchPage(driver,"http://localhost:8080/");
+        customerPage = home.goToCustomerPage();
+    }
+
+    @Test
+    public void customerSiteCanTrackValidCargo() {
+        customerPage.trackCargoWithIdOf("ABC123");
+        customerPage.expectCargoLocation("New York");
+    }
+
+    @Test
+    public void customerSiteErrorsOnInvalidCargo() {
+        customerPage.trackCargoWithIdOf("XXX999");
+        customerPage.expectErrorFor("Unknown tracking id");
+    }
+
+    @Test
+    public void customerSiteNotifiesOnMisdirectedCargo() {
+        customerPage.trackCargoWithIdOf("JKL567");
+        customerPage.expectNotificationOf("Cargo is misdirected");
+    }
+
+}

src/test/java/se/citerus/dddsample/acceptance/ScreenshotTestRule.java

@@ -0,0 +1,43 @@
+package se.citerus.dddsample.acceptance;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.rules.MethodRule;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.Statement;
+import org.openqa.selenium.OutputType;
+import org.openqa.selenium.TakesScreenshot;
+import org.openqa.selenium.WebDriver;
+
+import java.io.File;
+
+class ScreenshotTestRule implements MethodRule {
+    private WebDriver driver;
+
+    public Statement apply(final Statement statement, final FrameworkMethod frameworkMethod, final Object o) {
+        return new Statement() {
+            @Override
+            public void evaluate() throws Throwable {
+                try {
+                    statement.evaluate();
+                } catch (Throwable t) {
+                    captureScreenshot(frameworkMethod.getName());
+                    throw t;
+                }
+            }
+
+            public void captureScreenshot(String fileName) {
+                try {
+                    new File("target/surefire-reports/").mkdirs(); // Insure directory is there
+                    File scrFile = ((TakesScreenshot)driver).getScreenshotAs(OutputType.FILE);
+                    FileUtils.copyFile(scrFile, new File("target/surefire-reports/screenshot-" + fileName + ".png"));
+                } catch (Exception e) {
+                    System.err.println("ERROR: " + e);
+                }
+            }
+        };
+    }
+
+    public void updateDriver(WebDriver driver) {
+        this.driver = driver;
+    }
+}

src/test/java/se/citerus/dddsample/acceptance/pages/AdminPage.java

@@ -0,0 +1,42 @@
+package se.citerus.dddsample.acceptance.pages;
+
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+
+import java.util.List;
+import java.util.Optional;
+
+import static org.junit.Assert.assertEquals;
+
+public class AdminPage {
+    private final WebDriver driver;
+
+    public AdminPage(WebDriver driver) {
+        this.driver = driver;
+        assertEquals("Cargo Administration", driver.getTitle());
+    }
+
+    public void listAllCargo() {
+        driver.findElement(By.linkText("List all cargos")).click();
+        assertEquals("Cargo Administration", driver.getTitle());
+    }
+
+    public CargoBookingPage bookNewCargo() {
+        driver.findElement(By.linkText("Book new cargo")).click();
+
+        return new CargoBookingPage(driver);
+    }
+
+    public boolean listedCargoContains(String expectedTrackingId) {
+        List<WebElement> cargoList = driver.findElements(By.cssSelector("#body table tbody tr td a"));
+        Optional<WebElement> matchingCargo = cargoList.stream().filter(cargo -> cargo.getText().equals(expectedTrackingId)).findFirst();
+        return matchingCargo.isPresent();
+    }
+
+    public CargoDetailsPage showDetailsFor(String cargoTrackingId) {
+        driver.findElement(By.linkText(cargoTrackingId)).click();
+
+        return new CargoDetailsPage(driver);
+    }
+}

src/test/java/se/citerus/dddsample/acceptance/pages/CargoBookingPage.java

@@ -0,0 +1,47 @@
+package se.citerus.dddsample.acceptance.pages;
+
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.ui.Select;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
+public class CargoBookingPage {
+
+    private final WebDriver driver;
+
+    public CargoBookingPage(WebDriver driver) {
+        this.driver = driver;
+
+        WebElement newCargoTableCaption = driver.findElement(By.cssSelector("table caption"));
+
+        assertEquals("Book new cargo", newCargoTableCaption.getText());
+    }
+
+    public void selectOrigin(String origin) {
+        Select select = new Select(driver.findElement(By.name("originUnlocode")));
+        select.selectByVisibleText(origin);
+    }
+
+    public void selectDestination(String destination) {
+        Select select = new Select(driver.findElement(By.name("destinationUnlocode")));
+        select.selectByVisibleText(destination);
+    }
+
+    public CargoDetailsPage book() {
+        driver.findElement(By.name("originUnlocode")).submit();
+
+        return new CargoDetailsPage(driver);
+    }
+
+    public void selectArrivalDeadline(LocalDate arrivalDeadline) {
+        WebElement datePicker = driver.findElement(By.id("arrivalDeadline"));
+        datePicker.clear();
+        datePicker.sendKeys(arrivalDeadline.format(DateTimeFormatter.ofPattern("MM/dd/yyyy")));
+    }
+}

src/test/java/se/citerus/dddsample/acceptance/pages/CargoDestinationPage.java

@@ -0,0 +1,29 @@
+package se.citerus.dddsample.acceptance.pages;
+
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.ui.Select;
+
+import static junit.framework.TestCase.assertTrue;
+
+public class CargoDestinationPage {
+    private final WebDriver driver;
+
+    public CargoDestinationPage(WebDriver driver) {
+        this.driver = driver;
+        WebElement cargoDestinationHeader = driver.findElement(By.cssSelector("table caption"));
+
+        assertTrue(cargoDestinationHeader.getText().startsWith("Change destination for cargo "));
+    }
+
+    public CargoDetailsPage selectDestinationTo(String destination) {
+        WebElement destinationPicker = driver.findElement(By.name("unlocode"));
+        Select select = new Select(destinationPicker);
+        select.selectByVisibleText(destination);
+
+        destinationPicker.submit();
+
+        return new CargoDetailsPage(driver);
+    }
+}

src/test/java/se/citerus/dddsample/acceptance/pages/CargoDetailsPage.java

@@ -0,0 +1,61 @@
+package se.citerus.dddsample.acceptance.pages;
+
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+import static junit.framework.TestCase.assertTrue;
+import static org.junit.Assert.assertEquals;
+
+public class CargoDetailsPage {
+    public static final String TRACKING_ID_HEADER = "Details for cargo ";
+    private final WebDriver driver;
+    private String trackingId;
+
+    public CargoDetailsPage(WebDriver driver) {
+        this.driver = driver;
+
+        WebElement newCargoTableCaption = driver.findElement(By.cssSelector("table caption"));
+
+        assertTrue(newCargoTableCaption.getText().startsWith(TRACKING_ID_HEADER));
+        trackingId = newCargoTableCaption.getText().replaceFirst(TRACKING_ID_HEADER, "");
+    }
+
+    public String getTrackingId() {
+        return trackingId;
+    }
+
+    public AdminPage listAllCargo() {
+        driver.findElement(By.linkText("List all cargos")).click();
+
+        return new AdminPage(driver);
+    }
+
+    public void expectOriginOf(String expectedOrigin) {
+        String actualOrigin = driver.findElement(By.xpath("//div[@id='container']/table/tbody/tr[1]/td[2]")).getText();
+
+        assertEquals(expectedOrigin, actualOrigin);
+    }
+
+    public void expectDestinationOf(String expectedDestination) {
+        String actualDestination = driver.findElement(By.xpath("//div[@id='container']/table/tbody/tr[2]/td[2]")).getText();
+
+        assertEquals(expectedDestination, actualDestination);
+    }
+
+    public CargoDestinationPage changeDestination() {
+        driver.findElement(By.linkText("Change destination")).click();
+
+        return new CargoDestinationPage(driver);
+    }
+
+    public void expectArrivalDeadlineOf(LocalDate expectedArrivalDeadline) {
+        String actualArrivalDeadline = driver.findElement(By.xpath("//div[@id='container']/table/tbody/tr[4]/td[2]")).getText();
+
+        assertEquals(expectedArrivalDeadline.format(DateTimeFormatter.ofPattern("dd/MM/yyyy")), actualArrivalDeadline);
+    }
+}

src/test/java/se/citerus/dddsample/acceptance/pages/CustomerPage.java

@@ -0,0 +1,39 @@
+package se.citerus.dddsample.acceptance.pages;
+
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class CustomerPage {
+    private final WebDriver driver;
+
+    public CustomerPage(WebDriver driver) {
+        this.driver = driver;
+        assertEquals("Tracking cargo", driver.getTitle());
+    }
+
+    public void trackCargoWithIdOf(String trackingId) {
+        WebElement element = driver.findElement(By.id("idInput"));
+        element.sendKeys(trackingId);
+        element.submit();
+
+    }
+
+    public void expectCargoLocation(String expectedLocation) {
+        WebElement cargoSummary = driver.findElement(By.cssSelector("#result h2"));
+        assertTrue(cargoSummary.getText().endsWith(expectedLocation));
+    }
+
+    public void expectErrorFor(String expectedErrorMessage) {
+        WebElement error = driver.findElement(By.cssSelector(".error"));
+        assertTrue(error.getText().endsWith(expectedErrorMessage));
+    }
+
+    public void expectNotificationOf(String expectedNotificationMessage) {
+        WebElement error = driver.findElement(By.cssSelector(".notify"));
+        assertTrue(error.getText().endsWith(expectedNotificationMessage));
+    }
+}

src/test/java/se/citerus/dddsample/acceptance/pages/LaunchPage.java

@@ -0,0 +1,30 @@
+package se.citerus.dddsample.acceptance.pages;
+
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+
+import static org.junit.Assert.assertEquals;
+
+public class LaunchPage {
+    private final WebDriver driver;
+    private final String baseUrl;
+
+    public LaunchPage(WebDriver driver, String baseUrl) {
+        this.driver = driver;
+        this.baseUrl = baseUrl;
+        driver.get(baseUrl);
+        assertEquals("DDDSample", driver.getTitle());
+    }
+
+    public CustomerPage goToCustomerPage() {
+        driver.findElement(By.linkText("cargo tracking")).click();
+
+        return new CustomerPage(driver);
+    }
+
+    public AdminPage goToAdminPage() {
+        driver.findElement(By.linkText("booking and routing")).click();
+
+        return new AdminPage(driver);
+    }
+}

src/test/java/se/citerus/dddsample/infrastructure/messaging/stub/SynchronousApplicationEventsStub.java

@@ -1,5 +1,7 @@
 package se.citerus.dddsample.infrastructure.messaging.stub;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import se.citerus.dddsample.application.ApplicationEvents;
 import se.citerus.dddsample.application.CargoInspectionService;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
@@ -9,6 +11,7 @@ import se.citerus.dddsample.interfaces.handling.HandlingEventRegistrationAttempt
 public class SynchronousApplicationEventsStub implements ApplicationEvents {
 
   CargoInspectionService cargoInspectionService;
+  private final Log logger = LogFactory.getLog(getClass());
 
   public void setCargoInspectionService(CargoInspectionService cargoInspectionService) {
     this.cargoInspectionService = cargoInspectionService;
@@ -16,22 +19,22 @@ public class SynchronousApplicationEventsStub implements ApplicationEvents {
 
   @Override
   public void cargoWasHandled(HandlingEvent event) {
-    System.out.println("EVENT: cargo was handled: " + event);
+    logger.info("EVENT: cargo was handled: " + event);
     cargoInspectionService.inspectCargo(event.cargo().trackingId());
   }
 
   @Override
   public void cargoWasMisdirected(Cargo cargo) {
-    System.out.println("EVENT: cargo was misdirected");
+    logger.info("EVENT: cargo was misdirected");
   }
 
   @Override
   public void cargoHasArrived(Cargo cargo) {
-    System.out.println("EVENT: cargo has arrived: " + cargo.trackingId().idString());
+    logger.info("EVENT: cargo has arrived: " + cargo.trackingId().idString());
   }
 
   @Override
   public void receivedHandlingEventRegistrationAttempt(HandlingEventRegistrationAttempt attempt) {
-    System.out.println("EVENT: received handling event registration attempt");
+    logger.info("EVENT: received handling event registration attempt");
   }
 }

src/test/resources/log4j.properties

@@ -1,4 +1,4 @@
-log4j.rootLogger=info, stdout
+log4j.rootLogger=warn, stdout
 
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
@@ -6,8 +6,8 @@ log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m%n
 
 log4j.logger.net.sf.ehcache.config.ConfigurationFactory=error
 
-log4j.logger.se.citerus.dddsample=debug
-log4j.logger.org.hibernate.SQL=debug
+#log4j.logger.se.citerus.dddsample=info
+#log4j.logger.org.hibernate.SQL=info
 #log4j.logger.org.hibernate.tool.hbm2ddl.SchemaExport=debug
 
 #log4j.logger.org.springframework.orm=debug