Skip to content

Commit

Permalink
Ensure storyboard counters are properly reset when multiple pages use…
Browse files Browse the repository at this point in the history
… them
  • Loading branch information
fhoeben committed Nov 30, 2017
1 parent b77f0c2 commit d303c2c
Show file tree
Hide file tree
Showing 6 changed files with 184 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/main/java/nl/hsac/fitnesse/slim/StoryboardTable.java
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ protected void addScreenshotAssertionForRow(List<SlimAssertion> assertions, int
assertions.add(screenshotAssertion);
}

private int addScreenshotColumn(int row) {
protected int addScreenshotColumn(int row) {
table.addColumnToRow(row, "");
return table.getColumnCountInRow(row) - 1;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<html><head><title>HsacPlugin.StoryboardTest</title><meta http-equiv='Content-Type' content='text/html;charset=UTF-8'/><link rel='stylesheet' type='text/css' href='css/fitnesse.css'/><script src='javascript/jquery-1.11.3.min.js' type='text/javascript'></script><script src='javascript/fitnesse.js' type='text/javascript'></script></head><body><header><h2>HsacPlugin.StoryboardTest</h2></header><article><br/><br/><table>
<html><head><title>HsacPlugin.StoryboardTest1</title><meta http-equiv='Content-Type' content='text/html;charset=UTF-8'/><link rel='stylesheet' type='text/css' href='css/fitnesse.css'/><script src='javascript/jquery-1.11.3.min.js' type='text/javascript'></script><script src='javascript/fitnesse.js' type='text/javascript'></script></head><body><header><h2>HsacPlugin.StoryboardTest1</h2></header><article><br/><br/><table>
<tr class="slimRowTitle">
<td>import</td>
</tr>
Expand Down Expand Up @@ -40,13 +40,13 @@
<td>clone symbol</td>
<td>a</td>
<td><span class="pass">a</span></td>
<td>screenshot: storyboard/HsacPlugin.StoryboardTest/01-001</td></tr>
<td>screenshot: storyboard/HsacPlugin.StoryboardTest1/01-001</td></tr>
<tr>
<td>check</td>
<td>clone symbol</td>
<td>b</td>
<td><span class="pass">b</span></td>
<td>screenshot: storyboard/HsacPlugin.StoryboardTest/01-002</td></tr>
<td>screenshot: storyboard/HsacPlugin.StoryboardTest1/01-002</td></tr>
<tr class="scenario closed">
<td class="pass">hallo</td>
<td colspan="3" class="pass">John</td>
Expand All @@ -61,7 +61,7 @@
<td>clone symbol</td>
<td>John</td>
<td><span class="pass">John</span></td>
<td>screenshot: storyboard/HsacPlugin.StoryboardTest/01-003</td></tr>
<td>screenshot: storyboard/HsacPlugin.StoryboardTest1/01-003</td></tr>
<tr class="slimRowColor9">
<td>$resp&lt;-[Hello John]</td>
<td>clone symbol</td>
Expand All @@ -72,14 +72,14 @@
<td>clone symbol</td>
<td>Hello John</td>
<td><span class="pass">Hello John</span></td>
<td>screenshot: storyboard/HsacPlugin.StoryboardTest/01-004</td></tr>
<td>screenshot: storyboard/HsacPlugin.StoryboardTest1/01-004</td></tr>
</table></td></tr>
<tr>
<td>check</td>
<td>clone symbol</td>
<td>$resp->[Hello John]</td>
<td><span class="pass">Hello John</span></td>
<td>screenshot: storyboard/HsacPlugin.StoryboardTest/01-005</td></tr>
<td>screenshot: storyboard/HsacPlugin.StoryboardTest1/01-005</td></tr>
</table>
<br/><br/><table>
<tr>
Expand All @@ -103,7 +103,7 @@
<td>clone symbol</td>
<td>Pete</td>
<td><span class="pass">Pete</span></td>
<td>screenshot: storyboard/HsacPlugin.StoryboardTest/02-001</td></tr>
<td>screenshot: storyboard/HsacPlugin.StoryboardTest1/02-001</td></tr>
<tr class="slimRowColor9">
<td>$resp&lt;-[Hello Pete]</td>
<td>clone symbol</td>
Expand All @@ -114,7 +114,7 @@
<td>clone symbol</td>
<td>Hello Pete</td>
<td><span class="pass">Hello Pete</span></td>
<td>screenshot: storyboard/HsacPlugin.StoryboardTest/02-002</td></tr>
<td>screenshot: storyboard/HsacPlugin.StoryboardTest1/02-002</td></tr>
</table></td></tr>
<tr class="scenario closed">
<td class="pass">Jim</td>
Expand All @@ -130,7 +130,7 @@
<td>clone symbol</td>
<td>Jim</td>
<td><span class="pass">Jim</span></td>
<td>screenshot: storyboard/HsacPlugin.StoryboardTest/02-003</td></tr>
<td>screenshot: storyboard/HsacPlugin.StoryboardTest1/02-003</td></tr>
<tr class="slimRowColor9">
<td>$resp&lt;-[Hello Jim]</td>
<td>clone symbol</td>
Expand All @@ -141,7 +141,7 @@
<td>clone symbol</td>
<td>Hello Jim</td>
<td><span class="pass">Hello Jim</span></td>
<td>screenshot: storyboard/HsacPlugin.StoryboardTest/02-004</td></tr>
<td>screenshot: storyboard/HsacPlugin.StoryboardTest1/02-004</td></tr>
</table></td></tr>
</table>
</article></body></html>
147 changes: 147 additions & 0 deletions src/test/resources/Expected.HsacPlugin.StoryboardTest2.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
<html><head><title>HsacPlugin.StoryboardTest2</title><meta http-equiv='Content-Type' content='text/html;charset=UTF-8'/><link rel='stylesheet' type='text/css' href='css/fitnesse.css'/><script src='javascript/jquery-1.11.3.min.js' type='text/javascript'></script><script src='javascript/fitnesse.js' type='text/javascript'></script></head><body><header><h2>HsacPlugin.StoryboardTest2</h2></header><article><br/><br/><table>
<tr class="slimRowTitle">
<td>import</td>
</tr>
<tr class="slimRowColor0">
<td><span class="pass">nl.hsac.fitnesse.slim.tables</span></td>
</tr>
</table>
<br/><table>
<tr class="slimRowTitle">
<td>scenario</td>
<td>hallo _</td>
<td colspan="2">name</td>
</tr>
<tr class="slimRowColor0">
<td>check</td>
<td>clone symbol</td>
<td>@{name}</td>
<td>@{name}</td>
</tr>
<tr class="slimRowColor9">
<td>$resp=</td>
<td>clone symbol</td>
<td colspan="2">Hello @{name}</td>
</tr>
<tr class="slimRowColor0">
<td>check</td>
<td>clone symbol</td>
<td>Hello @{name}</td>
<td>Hello @{name}</td>
</tr>
</table>
<br/><table>
<tr>
<td>storyboard</td>
<td colspan="3"><span class="pass">sample screenshot fixture</span></td>
</tr>
<tr>
<td>check</td>
<td>clone symbol</td>
<td>a</td>
<td><span class="pass">a</span></td>
<td>screenshot: storyboard/HsacPlugin.StoryboardTest2/01-001</td></tr>
<tr>
<td>check</td>
<td>clone symbol</td>
<td>b</td>
<td><span class="pass">b</span></td>
<td>screenshot: storyboard/HsacPlugin.StoryboardTest2/01-002</td></tr>
<tr class="scenario closed">
<td class="pass">hallo</td>
<td colspan="3" class="pass">John</td>
</tr><tr class="scenario-detail closed-detail"><td colspan="4"><table>
<tr class="slimRowTitle">
<td>scenario</td>
<td>hallo _</td>
<td colspan="2">name</td>
</tr>
<tr class="slimRowColor0">
<td>check</td>
<td>clone symbol</td>
<td>John</td>
<td><span class="pass">John</span></td>
<td>screenshot: storyboard/HsacPlugin.StoryboardTest2/01-003</td></tr>
<tr class="slimRowColor9">
<td>$resp&lt;-[Hello John]</td>
<td>clone symbol</td>
<td colspan="2">Hello John</td>
</tr>
<tr class="slimRowColor0">
<td>check</td>
<td>clone symbol</td>
<td>Hello John</td>
<td><span class="pass">Hello John</span></td>
<td>screenshot: storyboard/HsacPlugin.StoryboardTest2/01-004</td></tr>
</table></td></tr>
<tr>
<td>check</td>
<td>clone symbol</td>
<td>$resp->[Hello John]</td>
<td><span class="pass">Hello John</span></td>
<td>screenshot: storyboard/HsacPlugin.StoryboardTest2/01-005</td></tr>
</table>
<br/><br/><table>
<tr>
<td colspan="2">hallo</td>
</tr>
<tr>
<td>name</td>
<td>resp?</td>
</tr>
<tr class="scenario closed">
<td class="pass">Pete</td>
<td class="pass"><span class="pass">Hello Pete</span></td>
</tr><tr class="scenario-detail closed-detail"><td colspan="2"><table>
<tr class="slimRowTitle">
<td>scenario</td>
<td>hallo _</td>
<td colspan="2">name</td>
</tr>
<tr class="slimRowColor0">
<td>check</td>
<td>clone symbol</td>
<td>Pete</td>
<td><span class="pass">Pete</span></td>
<td>screenshot: storyboard/HsacPlugin.StoryboardTest2/02-001</td></tr>
<tr class="slimRowColor9">
<td>$resp&lt;-[Hello Pete]</td>
<td>clone symbol</td>
<td colspan="2">Hello Pete</td>
</tr>
<tr class="slimRowColor0">
<td>check</td>
<td>clone symbol</td>
<td>Hello Pete</td>
<td><span class="pass">Hello Pete</span></td>
<td>screenshot: storyboard/HsacPlugin.StoryboardTest2/02-002</td></tr>
</table></td></tr>
<tr class="scenario closed">
<td class="pass">Jim</td>
<td class="pass"><span class="pass">Hello Jim</span></td>
</tr><tr class="scenario-detail closed-detail"><td colspan="2"><table>
<tr class="slimRowTitle">
<td>scenario</td>
<td>hallo _</td>
<td colspan="2">name</td>
</tr>
<tr class="slimRowColor0">
<td>check</td>
<td>clone symbol</td>
<td>Jim</td>
<td><span class="pass">Jim</span></td>
<td>screenshot: storyboard/HsacPlugin.StoryboardTest2/02-003</td></tr>
<tr class="slimRowColor9">
<td>$resp&lt;-[Hello Jim]</td>
<td>clone symbol</td>
<td colspan="2">Hello Jim</td>
</tr>
<tr class="slimRowColor0">
<td>check</td>
<td>clone symbol</td>
<td>Hello Jim</td>
<td><span class="pass">Hello Jim</span></td>
<td>screenshot: storyboard/HsacPlugin.StoryboardTest2/02-004</td></tr>
</table></td></tr>
</table>
</article></body></html>
23 changes: 23 additions & 0 deletions src/test/wiki/FitNesseRoot/HsacPlugin/StoryboardTest2.wiki
Original file line number Diff line number Diff line change
@@ -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 |

0 comments on commit d303c2c

Please sign in to comment.