diff --git a/src/main/java/nl/hsac/fitnesse/slim/StoryboardTable.java b/src/main/java/nl/hsac/fitnesse/slim/StoryboardTable.java index f16e232..da9ca23 100644 --- a/src/main/java/nl/hsac/fitnesse/slim/StoryboardTable.java +++ b/src/main/java/nl/hsac/fitnesse/slim/StoryboardTable.java @@ -67,7 +67,7 @@ protected void addScreenshotAssertionForRow(List assertions, int assertions.add(screenshotAssertion); } - private int addScreenshotColumn(int row) { + protected int addScreenshotColumn(int row) { table.addColumnToRow(row, ""); return table.getColumnCountInRow(row) - 1; } diff --git a/src/test/java/nl/hsac/fitnesse/slim/tables/HsacPlugiunFitNesseRunner.java b/src/test/java/nl/hsac/fitnesse/slim/tables/HsacPlugiunFitNesseRunner.java index 73686ec..0c6194b 100644 --- a/src/test/java/nl/hsac/fitnesse/slim/tables/HsacPlugiunFitNesseRunner.java +++ b/src/test/java/nl/hsac/fitnesse/slim/tables/HsacPlugiunFitNesseRunner.java @@ -34,7 +34,9 @@ public void run(final RunNotifier notifier) { super.run(notifier); } finally { checkHtmlResultContent(notifier, "usageCheck", "ScenarioUsageReport.html"); - checkHtmlResultContent(notifier, "storyboardCheck", "HsacPlugin.StoryboardTest.html"); + + checkHtmlResultContent(notifier, "storyboardCheck1", "HsacPlugin.StoryboardTest1.html"); + checkHtmlResultContent(notifier, "storyboardCheck2", "HsacPlugin.StoryboardTest2.html"); } } diff --git a/src/test/resources/Expected.HsacPlugin.StoryboardTest.html b/src/test/resources/Expected.HsacPlugin.StoryboardTest1.html similarity index 75% rename from src/test/resources/Expected.HsacPlugin.StoryboardTest.html rename to src/test/resources/Expected.HsacPlugin.StoryboardTest1.html index 3516eca..71b3eea 100644 --- a/src/test/resources/Expected.HsacPlugin.StoryboardTest.html +++ b/src/test/resources/Expected.HsacPlugin.StoryboardTest1.html @@ -1,4 +1,4 @@ -HsacPlugin.StoryboardTest

HsacPlugin.StoryboardTest



+HsacPlugin.StoryboardTest1

HsacPlugin.StoryboardTest1



@@ -40,13 +40,13 @@ - + - + @@ -61,7 +61,7 @@ - + @@ -72,14 +72,14 @@ - +
import
clone symbol a ascreenshot: storyboard/HsacPlugin.StoryboardTest/01-001
screenshot: storyboard/HsacPlugin.StoryboardTest1/01-001
check clone symbol b bscreenshot: storyboard/HsacPlugin.StoryboardTest/01-002
screenshot: storyboard/HsacPlugin.StoryboardTest1/01-002
hallo Johnclone symbol John Johnscreenshot: storyboard/HsacPlugin.StoryboardTest/01-003
screenshot: storyboard/HsacPlugin.StoryboardTest1/01-003
$resp<-[Hello John] clone symbolclone symbol Hello John Hello Johnscreenshot: storyboard/HsacPlugin.StoryboardTest/01-004
screenshot: storyboard/HsacPlugin.StoryboardTest1/01-004
check clone symbol $resp->[Hello John] Hello John - screenshot: storyboard/HsacPlugin.StoryboardTest/01-005 + screenshot: storyboard/HsacPlugin.StoryboardTest1/01-005

@@ -103,7 +103,7 @@ - + @@ -114,7 +114,7 @@ - +
clone symbol Pete Petescreenshot: storyboard/HsacPlugin.StoryboardTest/02-001
screenshot: storyboard/HsacPlugin.StoryboardTest1/02-001
$resp<-[Hello Pete] clone symbolclone symbol Hello Pete Hello Petescreenshot: storyboard/HsacPlugin.StoryboardTest/02-002
screenshot: storyboard/HsacPlugin.StoryboardTest1/02-002
Jim @@ -130,7 +130,7 @@ clone symbol Jim Jim - screenshot: storyboard/HsacPlugin.StoryboardTest/02-003 + screenshot: storyboard/HsacPlugin.StoryboardTest1/02-003 $resp<-[Hello Jim] clone symbol @@ -141,7 +141,7 @@ clone symbol Hello Jim Hello Jim - screenshot: storyboard/HsacPlugin.StoryboardTest/02-004 + screenshot: storyboard/HsacPlugin.StoryboardTest1/02-004
\ No newline at end of file diff --git a/src/test/resources/Expected.HsacPlugin.StoryboardTest2.html b/src/test/resources/Expected.HsacPlugin.StoryboardTest2.html new file mode 100644 index 0000000..8955dc3 --- /dev/null +++ b/src/test/resources/Expected.HsacPlugin.StoryboardTest2.html @@ -0,0 +1,147 @@ +HsacPlugin.StoryboardTest2

HsacPlugin.StoryboardTest2



+ + + + + + +
import
nl.hsac.fitnesse.slim.tables
+
+ + + + + + + + + + + + + + + + + + + + + + +
scenariohallo _name
checkclone symbol@{name}@{name}
$resp=clone symbolHello @{name}
checkclone symbolHello @{name}Hello @{name}
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
storyboardsample screenshot fixture
checkclone symbolaascreenshot: storyboard/HsacPlugin.StoryboardTest2/01-001
checkclone symbolbbscreenshot: storyboard/HsacPlugin.StoryboardTest2/01-002
halloJohn
+ + + + + + + + + + + + + + + + + + + + + + +
scenariohallo _name
checkclone symbolJohnJohnscreenshot: storyboard/HsacPlugin.StoryboardTest2/01-003
$resp<-[Hello John]clone symbolHello John
checkclone symbolHello JohnHello Johnscreenshot: storyboard/HsacPlugin.StoryboardTest2/01-004
checkclone symbol$resp->[Hello John]Hello Johnscreenshot: storyboard/HsacPlugin.StoryboardTest2/01-005
+

+ + + + + + + + + + + + + + + +
hallo
nameresp?
PeteHello Pete
+ + + + + + + + + + + + + + + + + + + + + + +
scenariohallo _name
checkclone symbolPetePetescreenshot: storyboard/HsacPlugin.StoryboardTest2/02-001
$resp<-[Hello Pete]clone symbolHello Pete
checkclone symbolHello PeteHello Petescreenshot: storyboard/HsacPlugin.StoryboardTest2/02-002
JimHello Jim
+ + + + + + + + + + + + + + + + + + + + + + +
scenariohallo _name
checkclone symbolJimJimscreenshot: storyboard/HsacPlugin.StoryboardTest2/02-003
$resp<-[Hello Jim]clone symbolHello Jim
checkclone symbolHello JimHello Jimscreenshot: storyboard/HsacPlugin.StoryboardTest2/02-004
+
\ No newline at end of file diff --git a/src/test/wiki/FitNesseRoot/HsacPlugin/StoryboardTest.wiki b/src/test/wiki/FitNesseRoot/HsacPlugin/StoryboardTest1.wiki similarity index 100% rename from src/test/wiki/FitNesseRoot/HsacPlugin/StoryboardTest.wiki rename to src/test/wiki/FitNesseRoot/HsacPlugin/StoryboardTest1.wiki diff --git a/src/test/wiki/FitNesseRoot/HsacPlugin/StoryboardTest2.wiki b/src/test/wiki/FitNesseRoot/HsacPlugin/StoryboardTest2.wiki new file mode 100644 index 0000000..c932f49 --- /dev/null +++ b/src/test/wiki/FitNesseRoot/HsacPlugin/StoryboardTest2.wiki @@ -0,0 +1,23 @@ +--- +Test +--- + +|import | +|nl.hsac.fitnesse.slim.tables| + +|scenario|hallo _ |name | +|check |clone symbol|@{name} |@{name} | +|$resp= |clone symbol|Hello @{name} | +|check |clone symbol|Hello @{name}|Hello @{name}| + +|storyboard|sample screenshot fixture | +|check |clone symbol|a |a | +|check |clone symbol|b |b | +|hallo |John | +|check |clone symbol|$resp|Hello John| + + +|hallo | +|name|resp? | +|Pete|Hello Pete| +|Jim |Hello Jim |