Closes #3

build.gradle

@@ -30,13 +30,16 @@ repositories {
 
 dependencies {
   compile "org.springframework.boot:spring-boot-starter-web:${springBootVersion}",
-      "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
+      "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion",
+      "commons-io:commons-io:$commonsIoVersion"
   testCompile 'junit:junit:4.12',
       "net.serenity-bdd:serenity-junit:$serenityVersion",
       "net.serenity-bdd:serenity-screenplay:$serenityVersion",
       "net.serenity-bdd:serenity-screenplay-webdriver:$serenityVersion"
 }
 
+sourceSets.test.java.srcDirs = ['src/programmer-test/java', 'src/customer-test/java']
+
 defaultTasks 'build'
 
 

gradle.properties

@@ -1,2 +1,3 @@
+commonsIoVersion = 2.5
 serenityVersion = 1.2.4
 springBootVersion = 1.5.3.RELEASE

src/test/java/com/remonsinnema/awe/acceptance/abilities/BrowseTheFileSystem.java → src/customer-test/java/abilities/BrowseTheFileSystem.java

@@ -1,4 +1,4 @@
-package com.remonsinnema.awe.acceptance.abilities;
+package abilities;
 
 import java.io.File;
 import java.io.FileInputStream;

src/customer-test/java/actions/LoadWork.java

@@ -0,0 +1,34 @@
+package actions;
+
+import static net.serenitybdd.screenplay.Tasks.instrumented;
+
+import net.serenitybdd.screenplay.Actor;
+import net.serenitybdd.screenplay.Interaction;
+import net.serenitybdd.screenplay.Performable;
+import net.serenitybdd.screenplay.actions.Click;
+import net.serenitybdd.screenplay.actions.Enter;
+
+import ui.Prompt;
+import ui.WorkPage;
+
+
+public class LoadWork implements Interaction {
+
+  private final String fileName;
+
+  public LoadWork(String fileName) {
+    this.fileName = fileName;
+  }
+
+  @Override
+  public <T extends Actor> void performAs(T actor) {
+    actor.attemptsTo(Click.on(WorkPage.LOAD_BUTTON),
+        Enter.theValue(fileName).into(Prompt.ANSWER_FIELD),
+        Click.on(Prompt.OK_BUTTON));
+  }
+
+  public static Performable from(String fileName) {
+    return instrumented(LoadWork.class, fileName);
+  }
+
+}

src/test/java/com/remonsinnema/awe/acceptance/action/SaveWork.java → src/customer-test/java/actions/SaveWork.java

@@ -1,4 +1,4 @@
-package com.remonsinnema.awe.acceptance.action;
+package actions;
 
 import static net.serenitybdd.screenplay.Tasks.instrumented;
 
@@ -7,16 +7,16 @@
 import net.serenitybdd.screenplay.Performable;
 import net.serenitybdd.screenplay.actions.Click;
 
-import com.remonsinnema.awe.acceptance.ui.Prompt;
-import com.remonsinnema.awe.acceptance.ui.WorkPage;
+import ui.Prompt;
+import ui.WorkPage;
 
 
 public class SaveWork implements Interaction {
 
   @Override
   public <T extends Actor> void performAs(T actor) {
     actor.attemptsTo(Click.on(WorkPage.SAVE_BUTTON),
-        Click.on(Prompt.OK));
+        Click.on(Prompt.OK_BUTTON));
   }
 
   public static Performable toTheServer() {

src/test/java/com/remonsinnema/awe/acceptance/action/Set.java → src/customer-test/java/actions/Set.java

@@ -1,4 +1,4 @@
-package com.remonsinnema.awe.acceptance.action;
+package actions;
 
 import static org.openqa.selenium.Keys.TAB;
 
@@ -9,7 +9,7 @@
 import net.serenitybdd.screenplay.Performable;
 import net.serenitybdd.screenplay.actions.Enter;
 
-import com.remonsinnema.awe.acceptance.ui.WorkPage;
+import ui.WorkPage;
 
 
 public final class Set {
@@ -55,7 +55,7 @@ public SetContents(String contents) {
     @Override
     public <T extends Actor> void performAs(T actor) {
       actor.attemptsTo(Enter.theValue(contents)
-          .into(WorkPage.CONTENTS_FIELD)
+          .into(WorkPage.TEXT_FIELD)
           .thenHit(TAB));
     }
   }

src/test/java/com/remonsinnema/awe/acceptance/action/ShutDown.java → src/customer-test/java/actions/ShutDown.java

@@ -1,4 +1,4 @@
-package com.remonsinnema.awe.acceptance.action;
+package actions;
 
 import static net.serenitybdd.screenplay.Tasks.instrumented;
 

src/test/java/com/remonsinnema/awe/acceptance/action/StartUp.java → src/customer-test/java/actions/StartUp.java

@@ -1,4 +1,4 @@
-package com.remonsinnema.awe.acceptance.action;
+package actions;
 
 import static net.serenitybdd.screenplay.Tasks.instrumented;
 

src/test/java/com/remonsinnema/awe/acceptance/features/WhenWritingHeartbreakingWorkOfStaggeringGenius.java → src/customer-test/java/features/WhenPersistingWritings.java

@@ -1,4 +1,4 @@
-package com.remonsinnema.awe.acceptance.features;
+package features;
 
 import static org.hamcrest.CoreMatchers.is;
 
@@ -18,23 +18,28 @@
 import net.serenitybdd.screenplay.abilities.BrowseTheWeb;
 import net.thucydides.core.annotations.Managed;
 
-import com.remonsinnema.awe.acceptance.abilities.BrowseTheFileSystem;
-import com.remonsinnema.awe.acceptance.questions.TheContents;
-import com.remonsinnema.awe.acceptance.questions.TheText;
-import com.remonsinnema.awe.acceptance.questions.TheTitle;
-import com.remonsinnema.awe.acceptance.tasks.Name;
-import com.remonsinnema.awe.acceptance.tasks.Save;
-import com.remonsinnema.awe.acceptance.tasks.Start;
-import com.remonsinnema.awe.acceptance.tasks.Stop;
-import com.remonsinnema.awe.acceptance.tasks.Write;
+import abilities.BrowseTheFileSystem;
+import questions.TheContents;
+import questions.TheText;
+import questions.TheTitle;
+import tasks.Load;
+import tasks.Name;
+import tasks.Save;
+import tasks.Start;
+import tasks.Stop;
+import tasks.Write;
 
 
 @RunWith(SerenityRunner.class)
-public class WhenWritingHeartbreakingWorkOfStaggeringGenius {
+public class WhenPersistingWritings {
+
+  private static final String TITLE = "Once upon a time";
+  private static final String TEXT = "The end.";
+  private static final String FILE_NAME = "once-upon-a-time.txt";
 
-  private final Actor allen = Actor.named("Allen");
   @Managed(driver = "phantomjs")
   private WebDriver theBrowser;
+  private final Actor allen = Actor.named("Allen");
 
   @Before
   public void init() {
@@ -49,15 +54,23 @@ public void done() {
   }
 
   @Test
-  public void shouldWriteAndSaveWork() {
-    when(allen).attemptsTo(Name.theWork("Once upon a time"));
-    then(allen).should(seeThat(TheTitle.ofTheWork(), is("Once upon a time")));
+  public void shouldSaveAndLoadWork() {
+    when(allen).attemptsTo(Name.theWork(TITLE));
+    then(allen).should(seeThat(TheTitle.ofTheWork(), is(TITLE)));
 
-    when(allen).attemptsTo(Write.text("The end."));
-    then(allen).should(seeThat(TheText.ofTheWork(), is("The end.")));
+    when(allen).attemptsTo(Write.text(TEXT));
+    then(allen).should(seeThat(TheText.ofTheWork(), is(TEXT)));
 
     when(allen).attemptsTo(Save.theWork());
-    then(allen).should(seeThat(TheContents.ofTheFile("once-upon-a-time.txt"), is("The end.")));
+    then(allen).should(seeThat(TheContents.ofTheFile(FILE_NAME), is(TEXT)));
+
+    when(allen).attemptsTo(
+        Name.theWork("Er was eens"),
+        Write.text("En ze leefden nog lang en gelukkig."),
+        Load.theWorkFrom(FILE_NAME));
+    then(allen).should(
+        seeThat(TheTitle.ofTheWork(), is(TITLE)),
+        seeThat(TheText.ofTheWork(), is(TEXT)));
   }
 
 }

src/test/java/com/remonsinnema/awe/acceptance/questions/TheContents.java → src/customer-test/java/questions/TheContents.java

@@ -1,12 +1,12 @@
-package com.remonsinnema.awe.acceptance.questions;
+package questions;
 
 import static net.serenitybdd.core.steps.Instrumented.instanceOf;
 
 import net.serenitybdd.screenplay.Actor;
 import net.serenitybdd.screenplay.Question;
 import net.serenitybdd.screenplay.annotations.Subject;
 
-import com.remonsinnema.awe.acceptance.abilities.BrowseTheFileSystem;
+import abilities.BrowseTheFileSystem;
 
 
 @Subject("the contents of the file '#fileName'")

src/test/java/com/remonsinnema/awe/acceptance/questions/TheText.java → src/customer-test/java/questions/TheText.java

@@ -1,4 +1,4 @@
-package com.remonsinnema.awe.acceptance.questions;
+package questions;
 
 import static net.serenitybdd.core.steps.Instrumented.instanceOf;
 
@@ -7,15 +7,15 @@
 import net.serenitybdd.screenplay.annotations.Subject;
 import net.serenitybdd.screenplay.questions.Value;
 
-import com.remonsinnema.awe.acceptance.ui.WorkPage;
+import ui.WorkPage;
 
 
 @Subject("the work's text")
 public class TheText implements Question<String> {
 
   @Override
   public String answeredBy(Actor actor) {
-    return Value.of(WorkPage.CONTENTS_FIELD)
+    return Value.of(WorkPage.TEXT_FIELD)
         .viewedBy(actor)
         .asString();
   }

src/test/java/com/remonsinnema/awe/acceptance/questions/TheTitle.java → src/customer-test/java/questions/TheTitle.java

@@ -1,4 +1,4 @@
-package com.remonsinnema.awe.acceptance.questions;
+package questions;
 
 import static net.serenitybdd.core.steps.Instrumented.instanceOf;
 
@@ -7,7 +7,7 @@
 import net.serenitybdd.screenplay.annotations.Subject;
 import net.serenitybdd.screenplay.questions.Value;
 
-import com.remonsinnema.awe.acceptance.ui.WorkPage;
+import ui.WorkPage;
 
 
 @Subject("the work's title")

src/customer-test/java/tasks/Load.java

@@ -0,0 +1,31 @@
+package tasks;
+
+import static net.serenitybdd.screenplay.Tasks.instrumented;
+
+import net.serenitybdd.screenplay.Actor;
+import net.serenitybdd.screenplay.Performable;
+import net.serenitybdd.screenplay.Task;
+import net.thucydides.core.annotations.Step;
+
+import actions.LoadWork;
+
+
+public class Load implements Task {
+
+  private final String fileName;
+
+  public Load(String fileName) {
+    this.fileName = fileName;
+  }
+
+  @Override
+  @Step("{0} loads the file '#fileName'")
+  public <T extends Actor> void performAs(T actor) {
+    actor.attemptsTo(LoadWork.from(fileName));
+  }
+
+  public static Performable theWorkFrom(String fileName) {
+    return instrumented(Load.class, fileName);
+  }
+
+}

src/test/java/com/remonsinnema/awe/acceptance/tasks/Name.java → src/customer-test/java/tasks/Name.java

@@ -1,4 +1,4 @@
-package com.remonsinnema.awe.acceptance.tasks;
+package tasks;
 
 import static net.serenitybdd.screenplay.Tasks.instrumented;
 
@@ -7,7 +7,7 @@
 import net.serenitybdd.screenplay.Task;
 import net.thucydides.core.annotations.Step;
 
-import com.remonsinnema.awe.acceptance.action.Set;
+import actions.Set;
 
 
 public class Name implements Task {

src/test/java/com/remonsinnema/awe/acceptance/tasks/Save.java → src/customer-test/java/tasks/Save.java

@@ -1,4 +1,4 @@
-package com.remonsinnema.awe.acceptance.tasks;
+package tasks;
 
 import static net.serenitybdd.screenplay.Tasks.instrumented;
 
@@ -7,7 +7,7 @@
 import net.serenitybdd.screenplay.Task;
 import net.thucydides.core.annotations.Step;
 
-import com.remonsinnema.awe.acceptance.action.SaveWork;
+import actions.SaveWork;
 
 
 public class Save implements Task {

src/test/java/com/remonsinnema/awe/acceptance/tasks/Start.java → src/customer-test/java/tasks/Start.java

@@ -1,4 +1,4 @@
-package com.remonsinnema.awe.acceptance.tasks;
+package tasks;
 
 import static net.serenitybdd.screenplay.Tasks.instrumented;
 
@@ -8,7 +8,7 @@
 import net.serenitybdd.screenplay.actions.Open;
 import net.thucydides.core.annotations.Step;
 
-import com.remonsinnema.awe.acceptance.action.StartUp;
+import actions.StartUp;
 
 
 public class Start implements Task {

src/test/java/com/remonsinnema/awe/acceptance/tasks/Stop.java → src/customer-test/java/tasks/Stop.java

@@ -1,4 +1,4 @@
-package com.remonsinnema.awe.acceptance.tasks;
+package tasks;
 
 import static net.serenitybdd.screenplay.Tasks.instrumented;
 
@@ -7,7 +7,7 @@
 import net.serenitybdd.screenplay.Task;
 import net.thucydides.core.annotations.Step;
 
-import com.remonsinnema.awe.acceptance.action.ShutDown;
+import actions.ShutDown;
 
 
 public class Stop implements Task {

src/test/java/com/remonsinnema/awe/acceptance/tasks/Write.java → src/customer-test/java/tasks/Write.java

@@ -1,4 +1,4 @@
-package com.remonsinnema.awe.acceptance.tasks;
+package tasks;
 
 import static net.serenitybdd.screenplay.Tasks.instrumented;
 
@@ -7,7 +7,7 @@
 import net.serenitybdd.screenplay.Task;
 import net.thucydides.core.annotations.Step;
 
-import com.remonsinnema.awe.acceptance.action.Set;
+import actions.Set;
 
 
 public class Write implements Task {

src/customer-test/java/ui/Prompt.java

@@ -0,0 +1,11 @@
+package ui;
+
+import net.serenitybdd.screenplay.targets.Target;
+
+
+public interface Prompt  {
+
+  Target OK_BUTTON = Target.the("the OK button").locatedBy("#ok");
+  Target ANSWER_FIELD = Target.the("the Answer field").locatedBy("#answer");
+
+}

src/customer-test/java/ui/WorkPage.java

@@ -0,0 +1,13 @@
+package ui;
+
+import net.serenitybdd.screenplay.targets.Target;
+
+
+public interface WorkPage {
+
+  Target TITLE_FIELD = Target.the("the Title field").locatedBy("#title");
+  Target TEXT_FIELD = Target.the("the Text field").locatedBy("#text");
+  Target SAVE_BUTTON = Target.the("the Save button").locatedBy("#save");
+  Target LOAD_BUTTON = Target.the("the Load button").locatedBy("#load");
+
+}