[jbehave-scm] [scm-web][1/1] JBEHAVE-968: Fixed issue with reporting of the output. Replaced generated storyPath with the resource uri.

[Mauro Talevi]

commit db7df8fb01654d83bafde4587733120ed7f290b9
Author:     Mauro Talevi <mauro.tal...@aquilonia.org>
AuthorDate: Sat, 14 Dec 2013 17:41:12 +0000
Commit:     Mauro Talevi <mauro.tal...@aquilonia.org>
CommitDate: Sat, 14 Dec 2013 17:41:12 +0000

    JBEHAVE-968:  Fixed issue with reporting of the output.  Replaced generated 
storyPath with the resource uri.

diff --git 
a/web-runner/src/main/java/org/jbehave/web/runner/wicket/pages/RunResource.java 
b/web-runner/src/main/java/org/jbehave/web/runner/wicket/pages/RunResource.java
index 95f303f..952a5ee 100644
--- 
a/web-runner/src/main/java/org/jbehave/web/runner/wicket/pages/RunResource.java
+++ 
b/web-runner/src/main/java/org/jbehave/web/runner/wicket/pages/RunResource.java
@@ -5,8 +5,6 @@ import static org.apache.commons.lang.StringUtils.isNotBlank;
 
 import java.io.OutputStream;
 import java.io.PrintStream;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.Properties;
 
 import org.apache.wicket.markup.html.basic.MultiLineLabel;
@@ -48,7 +46,7 @@ public class RunResource extends Template {
         add(new NoMarkupMultiLineLabel("output", "", "brush: plain"));        
         add(new NoMarkupMultiLineLabel("failure", new 
PropertyModel<String>(storyContext, "failureStackTrace"),
                 "brush: java; gutter: false; collapse: true"));
-        showOutput(parameters);
+        loadAndRun(parameters.get("uri").toString());
        }
        
     private void reportTo(OutputStream ouputStream) {
@@ -63,21 +61,19 @@ public class RunResource extends Template {
         });
     }
 
-    private void showOutput(PageParameters parameters) {
-               String uri = parameters.get("uri").toString();
-               String content = loader.loadResourceAsText(uri);
-               storyContext.setInput(content);
-               run();
+    private void loadAndRun(String uri) {
+               String input = loader.loadResourceAsText(uri);
+               storyContext.setInput(input);
+               run(uri);
         MultiLineLabel output = (MultiLineLabel) get("output");
-        output.setDefaultModelObject(content);
+        output.setDefaultModelObject(storyContext.getOutput());
     }
     
-    private void run() {
+    private void run(String storyPath) {
         if (isNotBlank(storyContext.getInput())) {
             outputStream.reset();
             storyContext.clearFailureCause();
             embedder.useMetaFilters(asList(storyContext.getMetaFilter()));
-            String storyPath = storyPath();
             Story story = storyManager.storyOfText(storyContext.getInput(), 
storyPath);
             storyManager.runningStories(asList(story), embedder.metaFilter(), 
null);
             BatchFailures failures = new BatchFailures();
@@ -89,8 +85,4 @@ public class RunResource extends Template {
         }
     }
 
-    private String storyPath() {
-        return "web-" + new SimpleDateFormat("yyyyMMdd-HHmmss").format(new 
Date(System.currentTimeMillis()));
-    }
-
 }