Skip to content

Commit

Permalink
A few fixes and patches. Prepare for HTML parsing of Slim Tables.
Browse files Browse the repository at this point in the history
git-svn-id: https://fitnesse.svn.sourceforge.net/svnroot/fitnesse/trunk@383 57a019cf-8a1a-0410-8d1a-f715e8e97b57
  • Loading branch information
robertmartin committed Nov 29, 2008
1 parent 0ff71b6 commit a2e6e7b
Show file tree
Hide file tree
Showing 30 changed files with 264 additions and 281 deletions.
Original file line number Diff line number Diff line change
@@ -1,40 +1,21 @@
{{{java.io.InvalidClassException: fitnesse.wiki.CachingPage; local class incompatible: stream classdesc serialVersionUID = 3185659053189820297, local class serialVersionUID = -8781683459235419
java.io.ObjectStreamClass.initNonProxy(ObjectStreamClass.java:546)
java.io.ObjectInputStream.readNonProxyDesc(ObjectInputStream.java:1552)
java.io.ObjectInputStream.readClassDesc(ObjectInputStream.java:1466)
java.io.ObjectInputStream.readNonProxyDesc(ObjectInputStream.java:1552)
java.io.ObjectInputStream.readClassDesc(ObjectInputStream.java:1466)
java.io.ObjectInputStream.readOrdinaryObject(ObjectInputStream.java:1699)
java.io.ObjectInputStream.readObject0(ObjectInputStream.java:1305)
java.io.ObjectInputStream.readObject(ObjectInputStream.java:348)
fitnesse.wiki.ProxyPage.getObjectFromUrl(ProxyPage.java:155)
fitnesse.wiki.ProxyPage.retrievePage(ProxyPage.java:51)
fitnesse.wiki.VirtualCouplingExtension.loadVirtualChildren(VirtualCouplingExtension.java:52)
fitnesse.wiki.VirtualCouplingExtension.detectAndLoadVirtualChildren(VirtualCouplingExtension.java:45)
fitnesse.wiki.VirtualCouplingExtension.getVirtualCoupling(VirtualCouplingExtension.java:37)
fitnesse.wikitext.widgets.TOCWidget.buildListOfChildPages(TOCWidget.java:85)
fitnesse.wikitext.widgets.TOCWidget.buildList(TOCWidget.java:45)
fitnesse.wikitext.widgets.TOCWidget.buildContentsDiv(TOCWidget.java:37)
fitnesse.wikitext.widgets.TOCWidget.buildListItem(TOCWidget.java:58)
fitnesse.wikitext.widgets.TOCWidget.buildList(TOCWidget.java:47)
fitnesse.wikitext.widgets.TOCWidget.buildContentsDiv(TOCWidget.java:37)
fitnesse.wikitext.widgets.TOCWidget.buildListItem(TOCWidget.java:58)
fitnesse.wikitext.widgets.TOCWidget.buildList(TOCWidget.java:47)
fitnesse.wikitext.widgets.TOCWidget.buildContentsDiv(TOCWidget.java:37)
fitnesse.wikitext.widgets.TOCWidget.render(TOCWidget.java:30)
fitnesse.wikitext.widgets.ParentWidget.childHtml(ParentWidget.java:63)
fitnesse.wikitext.widgets.WidgetRoot.render(WidgetRoot.java:69)
fitnesse.wiki.PageData.processHTMLWidgets(PageData.java:171)
fitnesse.wiki.PageData.getHtml(PageData.java:139)
fitnesse.html.HtmlUtil.testableHtml(HtmlUtil.java:328)
fitnesse.html.HtmlUtil.testableHtml(HtmlUtil.java:280)
fitnesse.responders.WikiPageResponder.makeHtml(WikiPageResponder.java:73)
fitnesse.responders.WikiPageResponder.makeResponse(WikiPageResponder.java:42)
fitnesse.FitNesseExpediter.createGoodResponse(FitNesseExpediter.java:130)
fitnesse.FitNesseExpediter.makeResponse(FitNesseExpediter.java:112)
fitnesse.FitNesseExpediter.start(FitNesseExpediter.java:39)
fitnesse.FitNesseServer.serve(FitNesseServer.java:28)
fitnesse.FitNesseServer.serve(FitNesseServer.java:19)
fitnesse.socketservice.SocketService$ServerRunner.run(SocketService.java:100)
{{{java.io.StreamCorruptedException: invalid stream header
java.io.ObjectInputStream.readStreamHeader(ObjectInputStream.java:764)
java.io.ObjectInputStream.<init>(ObjectInputStream.java:277)
fitnesse.wiki.ProxyPage.getObjectFromUrl(ProxyPage.java:164)
fitnesse.wiki.ProxyPage.retrievePage(ProxyPage.java:58)
fitnesse.wiki.VirtualCouplingExtension.loadVirtualChildren(VirtualCouplingExtension.java:54)
fitnesse.wiki.VirtualCouplingExtension.detectAndLoadVirtualChildren(VirtualCouplingExtension.java:47)
fitnesse.wiki.VirtualCouplingExtension.getVirtualCoupling(VirtualCouplingExtension.java:39)
fitnesse.responders.run.SuiteResponder.addTestPagesToList(SuiteResponder.java:276)
fitnesse.responders.run.SuiteResponder.addTestPagesToList(SuiteResponder.java:279)
fitnesse.responders.run.SuiteResponder.getAllTestPagesUnder(SuiteResponder.java:239)
fitnesse.responders.run.SuiteResponder.getAllPagesToRunForThisSuite(SuiteResponder.java:212)
fitnesse.responders.run.SuiteResponder.makeMapOfPagesByTestSystem(SuiteResponder.java:324)
fitnesse.responders.run.SuiteResponder.executeTestPages(SuiteResponder.java:58)
fitnesse.responders.run.SuiteResponder.performExecution(SuiteResponder.java:40)
fitnesse.responders.run.TestResponder.doSending(TestResponder.java:53)
fitnesse.responders.ChunkingResponder.startSending(ChunkingResponder.java:69)
fitnesse.responders.ChunkingResponder.access$000(ChunkingResponder.java:17)
fitnesse.responders.ChunkingResponder$RespondingRunnable.run(ChunkingResponder.java:120)
java.lang.Thread.run(Thread.java:613)
}}}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<properties>
<Files/>
<LastModified>20070619094958</LastModified>
<LastModified>20081128122223</LastModified>
<RecentChanges/>
<WhereUsed/>
</properties>
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,20 @@
java.net.URL.<init>(URL.java:567)
java.net.URL.<init>(URL.java:464)
java.net.URL.<init>(URL.java:413)
fitnesse.wiki.ProxyPage.retrievePage(ProxyPage.java:50)
fitnesse.wiki.VirtualCouplingExtension.loadVirtualChildren(VirtualCouplingExtension.java:52)
fitnesse.wiki.VirtualCouplingExtension.detectAndLoadVirtualChildren(VirtualCouplingExtension.java:45)
fitnesse.wiki.VirtualCouplingExtension.getVirtualCoupling(VirtualCouplingExtension.java:37)
fitnesse.wikitext.widgets.TOCWidget.buildListOfChildPages(TOCWidget.java:85)
fitnesse.wikitext.widgets.TOCWidget.buildList(TOCWidget.java:45)
fitnesse.wikitext.widgets.TOCWidget.buildContentsDiv(TOCWidget.java:37)
fitnesse.wikitext.widgets.TOCWidget.buildListItem(TOCWidget.java:58)
fitnesse.wikitext.widgets.TOCWidget.buildList(TOCWidget.java:47)
fitnesse.wikitext.widgets.TOCWidget.buildContentsDiv(TOCWidget.java:37)
fitnesse.wikitext.widgets.TOCWidget.buildListItem(TOCWidget.java:58)
fitnesse.wikitext.widgets.TOCWidget.buildList(TOCWidget.java:47)
fitnesse.wikitext.widgets.TOCWidget.buildContentsDiv(TOCWidget.java:37)
fitnesse.wikitext.widgets.TOCWidget.render(TOCWidget.java:30)
fitnesse.wikitext.widgets.ParentWidget.childHtml(ParentWidget.java:63)
fitnesse.wikitext.widgets.WidgetRoot.render(WidgetRoot.java:69)
fitnesse.wiki.PageData.processHTMLWidgets(PageData.java:171)
fitnesse.wiki.PageData.getHtml(PageData.java:139)
fitnesse.html.HtmlUtil.testableHtml(HtmlUtil.java:328)
fitnesse.html.HtmlUtil.testableHtml(HtmlUtil.java:280)
fitnesse.responders.WikiPageResponder.makeHtml(WikiPageResponder.java:73)
fitnesse.responders.WikiPageResponder.makeResponse(WikiPageResponder.java:42)
fitnesse.FitNesseExpediter.createGoodResponse(FitNesseExpediter.java:130)
fitnesse.FitNesseExpediter.makeResponse(FitNesseExpediter.java:112)
fitnesse.FitNesseExpediter.start(FitNesseExpediter.java:39)
fitnesse.FitNesseServer.serve(FitNesseServer.java:28)
fitnesse.FitNesseServer.serve(FitNesseServer.java:19)
fitnesse.socketservice.SocketService$ServerRunner.run(SocketService.java:100)
fitnesse.wiki.ProxyPage.retrievePage(ProxyPage.java:57)
fitnesse.wiki.VirtualCouplingExtension.loadVirtualChildren(VirtualCouplingExtension.java:54)
fitnesse.wiki.VirtualCouplingExtension.detectAndLoadVirtualChildren(VirtualCouplingExtension.java:47)
fitnesse.wiki.VirtualCouplingExtension.getVirtualCoupling(VirtualCouplingExtension.java:39)
fitnesse.responders.run.SuiteResponder.addTestPagesToList(SuiteResponder.java:276)
fitnesse.responders.run.SuiteResponder.addTestPagesToList(SuiteResponder.java:279)
fitnesse.responders.run.SuiteResponder.getAllTestPagesUnder(SuiteResponder.java:239)
fitnesse.responders.run.SuiteResponder.getAllPagesToRunForThisSuite(SuiteResponder.java:212)
fitnesse.responders.run.SuiteResponder.makeMapOfPagesByTestSystem(SuiteResponder.java:324)
fitnesse.responders.run.SuiteResponder.executeTestPages(SuiteResponder.java:58)
fitnesse.responders.run.SuiteResponder.performExecution(SuiteResponder.java:40)
fitnesse.responders.run.TestResponder.doSending(TestResponder.java:53)
fitnesse.responders.ChunkingResponder.startSending(ChunkingResponder.java:69)
fitnesse.responders.ChunkingResponder.access$000(ChunkingResponder.java:17)
fitnesse.responders.ChunkingResponder$RespondingRunnable.run(ChunkingResponder.java:120)
java.lang.Thread.run(Thread.java:613)
}}}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<properties>
<Edit>true</Edit>
<Files>true</Files>
<LastModified>20070619094959</LastModified>
<LastModified>20081128122222</LastModified>
<Properties>true</Properties>
<RecentChanges>true</RecentChanges>
<Refactor>true</Refactor>
Expand Down
3 changes: 3 additions & 0 deletions FitNesseRoot/FitNesse/SliM/ScriptTable/content.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
|ensure|login with username|Bob|and password|xyzzy|
|note|this is a comment|
|show|number of login attempts|
|$symbol=|login message|

The fixture for this table is:
{{{public class LoginDialogDriver {
Expand Down Expand Up @@ -58,5 +59,7 @@ This should be pretty clear. Each row is a single instruction in the script.

* If the word ''show'' is in the first cell, then it should be followed by a function. A new cell will be added when the test is run, and it will contain the return value of the function.

* If a symbol assignment is in the first cell, then it should be followed by a functions. The symbol is assigned the value returned by that function.



6 changes: 3 additions & 3 deletions FitNesseRoot/FitNesse/SliM/ScriptTable/properties.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Edit/>
<Files/>
<Help/>
<LastModified>20081117121916</LastModified>
<LastModified>20081129072939</LastModified>
<Properties/>
<RecentChanges/>
<Refactor/>
Expand All @@ -12,6 +12,6 @@
<Test/>
<Versions/>
<WhereUsed/>
<saveId>1225339583890</saveId>
<ticketId>-1709707407730454200</ticketId>
<saveId>1227965379500</saveId>
<ticketId>-3789012764868938316</ticketId>
</properties>
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,20 @@
java.net.URL.<init>(URL.java:567)
java.net.URL.<init>(URL.java:464)
java.net.URL.<init>(URL.java:413)
fitnesse.wiki.ProxyPage.retrievePage(ProxyPage.java:50)
fitnesse.wiki.VirtualCouplingExtension.loadVirtualChildren(VirtualCouplingExtension.java:52)
fitnesse.wiki.VirtualCouplingExtension.detectAndLoadVirtualChildren(VirtualCouplingExtension.java:45)
fitnesse.wiki.VirtualCouplingExtension.getVirtualCoupling(VirtualCouplingExtension.java:37)
fitnesse.wikitext.widgets.TOCWidget.buildListOfChildPages(TOCWidget.java:85)
fitnesse.wikitext.widgets.TOCWidget.buildList(TOCWidget.java:45)
fitnesse.wikitext.widgets.TOCWidget.buildContentsDiv(TOCWidget.java:37)
fitnesse.wikitext.widgets.TOCWidget.buildListItem(TOCWidget.java:58)
fitnesse.wikitext.widgets.TOCWidget.buildList(TOCWidget.java:47)
fitnesse.wikitext.widgets.TOCWidget.buildContentsDiv(TOCWidget.java:37)
fitnesse.wikitext.widgets.TOCWidget.buildListItem(TOCWidget.java:58)
fitnesse.wikitext.widgets.TOCWidget.buildList(TOCWidget.java:47)
fitnesse.wikitext.widgets.TOCWidget.buildContentsDiv(TOCWidget.java:37)
fitnesse.wikitext.widgets.TOCWidget.render(TOCWidget.java:30)
fitnesse.wikitext.widgets.ParentWidget.childHtml(ParentWidget.java:63)
fitnesse.wikitext.widgets.WidgetRoot.render(WidgetRoot.java:69)
fitnesse.wiki.PageData.processHTMLWidgets(PageData.java:171)
fitnesse.wiki.PageData.getHtml(PageData.java:139)
fitnesse.html.HtmlUtil.testableHtml(HtmlUtil.java:328)
fitnesse.html.HtmlUtil.testableHtml(HtmlUtil.java:280)
fitnesse.responders.WikiPageResponder.makeHtml(WikiPageResponder.java:73)
fitnesse.responders.WikiPageResponder.makeResponse(WikiPageResponder.java:42)
fitnesse.FitNesseExpediter.createGoodResponse(FitNesseExpediter.java:130)
fitnesse.FitNesseExpediter.makeResponse(FitNesseExpediter.java:112)
fitnesse.FitNesseExpediter.start(FitNesseExpediter.java:39)
fitnesse.FitNesseServer.serve(FitNesseServer.java:28)
fitnesse.FitNesseServer.serve(FitNesseServer.java:19)
fitnesse.socketservice.SocketService$ServerRunner.run(SocketService.java:100)
fitnesse.wiki.ProxyPage.retrievePage(ProxyPage.java:57)
fitnesse.wiki.VirtualCouplingExtension.loadVirtualChildren(VirtualCouplingExtension.java:54)
fitnesse.wiki.VirtualCouplingExtension.detectAndLoadVirtualChildren(VirtualCouplingExtension.java:47)
fitnesse.wiki.VirtualCouplingExtension.getVirtualCoupling(VirtualCouplingExtension.java:39)
fitnesse.responders.run.SuiteResponder.addTestPagesToList(SuiteResponder.java:276)
fitnesse.responders.run.SuiteResponder.addTestPagesToList(SuiteResponder.java:279)
fitnesse.responders.run.SuiteResponder.getAllTestPagesUnder(SuiteResponder.java:239)
fitnesse.responders.run.SuiteResponder.getAllPagesToRunForThisSuite(SuiteResponder.java:212)
fitnesse.responders.run.SuiteResponder.makeMapOfPagesByTestSystem(SuiteResponder.java:324)
fitnesse.responders.run.SuiteResponder.executeTestPages(SuiteResponder.java:58)
fitnesse.responders.run.SuiteResponder.performExecution(SuiteResponder.java:40)
fitnesse.responders.run.TestResponder.doSending(TestResponder.java:53)
fitnesse.responders.ChunkingResponder.startSending(ChunkingResponder.java:69)
fitnesse.responders.ChunkingResponder.access$000(ChunkingResponder.java:17)
fitnesse.responders.ChunkingResponder$RespondingRunnable.run(ChunkingResponder.java:120)
java.lang.Thread.run(Thread.java:613)
}}}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<properties>
<Edit>true</Edit>
<Files>true</Files>
<LastModified>20070619095002</LastModified>
<LastModified>20081128122222</LastModified>
<Properties>true</Properties>
<RecentChanges>true</RecentChanges>
<Refactor>true</Refactor>
Expand Down
22 changes: 11 additions & 11 deletions FitNesseRoot/RecentChanges/content.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
|JunkParent.SlimTest||07:34:27 Sat, Nov 29, 2008|
|FitNesse.SliM.ScriptTable||07:29:39 Sat, Nov 29, 2008|
|JunkParent.FitTest||17:29:10 Fri, Nov 28, 2008|
|ProjectPage.JukeBox.JukeBoxStories.CashManagement||11:13:12 Fri, Nov 28, 2008|
|ProjectPage.JukeBox.JukeBoxStories||10:13:29 Fri, Nov 28, 2008|
|ToDo||07:44:35 Tue, Nov 25, 2008|
|ProjectPage.ComposedTests.ComposedDecisionTable||07:34:42 Tue, Nov 25, 2008|
|ProjectPage.ComposedTests.ComposedScriptTable||07:29:12 Tue, Nov 25, 2008|
|ProjectPage.ComposedTests||07:16:16 Tue, Nov 25, 2008|
|ProjectPage||06:56:43 Tue, Nov 25, 2008|
|JunkParent.VirtualPage||05:53:10 Tue, Nov 25, 2008|
|ProjectPage.JukeBox.JukeBoxStories.YouDecide||10:41:57 Mon, Nov 24, 2008|
|ProjectPage.JukeBox.SongInventory||08:37:03 Mon, Nov 24, 2008|
|ProjectPage.JukeBox.JukeBoxStories||08:28:29 Mon, Nov 24, 2008|
|ProjectPage.JukeBox.JukeBoxStories.PlayThreeSongs||21:44:03 Sun, Nov 23, 2008|
|ProjectPage.JukeBox.JukeBoxStories.PlayOneSong||21:40:17 Sun, Nov 23, 2008|
|ProjectPage.JukeBox.SetUp||21:39:37 Sun, Nov 23, 2008|
|JunkParent.SlimTest||18:24:48 Tue, Nov 18, 2008|
|FrontPage||10:27:05 Tue, Nov 18, 2008|
|ProjectPage.JukeBox.JukeBoxStories.CreditsAccumulateWithPayment||01:48:51 Tue, Nov 18, 2008|
|ProjectPage.JukeBox||12:14:43 Mon, Nov 17, 2008|
|ProjectPage.JukeBox.JukeBoxStories.PaymentDeterminesCredits||12:04:43 Mon, Nov 17, 2008|
|ProjectPage||11:58:43 Mon, Nov 17, 2008|
|FitNesse.SuiteAcceptanceTests.SuiteTestRunnerTests.CreateSamplePages||16:49:58 Sat, Nov 15, 2008|
|FitNesse.SuiteAcceptanceTests.SuiteTestRunnerTests.TestRunnerExitValue||15:14:40 Sat, Nov 15, 2008|
|FitNesse.CommandLineTestRunner||16:54:04 Fri, Nov 14, 2008|
Expand Down Expand Up @@ -55,7 +63,6 @@
|FitNesse.SliM.TableTable||16:56:43 Fri, Oct 31, 2008|
|FitNesse.SliM.DataTypes||14:33:04 Fri, Oct 31, 2008|
|FitNesse.SliM.CustomTypes||06:39:27 Fri, Oct 31, 2008|
|FitNesse.SliM.ScriptTable||23:06:23 Wed, Oct 29, 2008|
|FitNesse.SliM.ValueComparisons||10:35:38 Wed, Oct 29, 2008|
|FitNesse.SliM.SymbolsInTables||10:23:23 Wed, Oct 29, 2008|
|FitNesse.SliM.ConstructorArguments||10:16:58 Wed, Oct 29, 2008|
Expand Down Expand Up @@ -91,10 +98,3 @@
|FitNesse.SuiteAcceptanceTests.SuiteWidgetTests.TestIncludeCollapsed||20:39:11 Sat, Oct 25, 2008|
|FitNesse.SuiteAcceptanceTests.SuiteWidgetTests.TestIncludeBackwardsSearchPage||20:38:18 Sat, Oct 25, 2008|
|FitNesse.SuiteAcceptanceTests.SuiteWidgetTests.TestInclude||20:37:02 Sat, Oct 25, 2008|
|FitNesse.SuiteAcceptanceTests.SuiteWidgetTests.TestExpression||20:25:50 Sat, Oct 25, 2008|
|FitNesse.SuiteAcceptanceTests.SuiteWidgetTests.TestContentsWithRecursion||19:58:31 Sat, Oct 25, 2008|
|FitNesse.SuiteAcceptanceTests.SuiteWidgetTests.TestContentsRegraced||19:56:50 Sat, Oct 25, 2008|
|FitNesse.SuiteAcceptanceTests.SuiteWidgetTests.TestContentsProperties||19:55:42 Sat, Oct 25, 2008|
|FitNesse.SuiteAcceptanceTests.SuiteWidgetTests.ContentsTestsIncludeWithHelp||19:54:02 Sat, Oct 25, 2008|
|FitNesse.SuiteAcceptanceTests.SuiteWidgetTests.TestContentsHelp||19:53:27 Sat, Oct 25, 2008|
|FitNesse.SuiteAcceptanceTests.SuiteWidgetTests.TestContentsFilters||19:48:52 Sat, Oct 25, 2008|
2 changes: 1 addition & 1 deletion FitNesseRoot/RecentChanges/properties.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<properties>
<Files/>
<LastModified>20081124104157</LastModified>
<LastModified>20081129073427</LastModified>
<Properties/>
<RecentChanges/>
<Refactor/>
Expand Down
2 changes: 1 addition & 1 deletion FitNesseRoot/properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#FitNesse properties
#Mon Nov 24 10:12:56 CST 2008
#Sat Nov 29 07:25:42 CST 2008
WikiImportFormatUpdate=applied
PropertiesToXmlUpdate=applied
FilesAttributeUpdate=applied
Expand Down
1 change: 1 addition & 0 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
<include name="build.xml" />
<include name="dotnet/**" />
<include name="BUILD_README.txt" />
<include name="templates/**" />
<exclude name="**/fitnesse*.zip" />
</fileset>
</zip>
Expand Down
5 changes: 5 additions & 0 deletions changeLog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
20081128 UB
* Added &debug flag to TestResponder url. This forces the test to run ''inside'' the fitnesse process. If you are running fitnesse in a debugger, you can breakpoint your fixtures.
* Symbols can be java properties or environment variables. Symbols first, env variables second, java properties third.
* If the first cell of a script table is a symbol assignment ($V=) then the rest must be a function call. The symbol is assigned the return value of the function.

20081118 UB
Fixed some bugs in Decision Table that misreported exceptions when the execute
method was not present.
Expand Down
4 changes: 3 additions & 1 deletion src/fitnesse/components/ClassPathBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import fitnesse.util.Wildcard;
import fitnesse.wiki.InheritedItemBuilder;
import fitnesse.wiki.WikiPage;
import fitnesse.wiki.PageData;

import java.io.File;
import java.util.ArrayList;
Expand All @@ -26,7 +27,8 @@ public String getClasspath(WikiPage page) throws Exception

public String getPathSeparator(WikiPage page) throws Exception
{
String separator = page.getData().getVariable("PATH_SEPARATOR");
PageData pageData = page.getData();
String separator = pageData.getVariable("PATH_SEPARATOR");
if(separator == null)
separator = (String) System.getProperties().get("path.separator");

Expand Down
3 changes: 1 addition & 2 deletions src/fitnesse/components/ClassPathBuilderTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ public void testGetClasspath() throws Exception
assertEquals(expected, builder.getClasspath(root.getChildPage("TestPage")));
}

//Todo get this test to pass...
public void _testPathSeparatorVariable() throws Exception
public void testPathSeparatorVariable() throws Exception
{
WikiPage page = crawler.addPage(root, PathParser.parse("TestPage"),
"!path fitnesse.jar\n" +
Expand Down
6 changes: 6 additions & 0 deletions src/fitnesse/responders/run/TestResponder.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import java.util.LinkedList;

public class TestResponder extends ChunkingResponder implements TestSystemListener, SecureResponder {
private static final String PATH_SEPARATOR = System.getProperty("path.separator");
protected static final int htmlDepth = 2;
private static LinkedList<TestEventListener> eventListeners = new LinkedList<TestEventListener>();
protected HtmlPage html;
Expand All @@ -39,6 +40,7 @@ public class TestResponder extends ChunkingResponder implements TestSystemListen
private boolean fastTest = false;

protected void doSending() throws Exception {
fastTest |= request.hasInput("debug");
data = page.getData();
classPath = buildClassPath();
startHtml();
Expand Down Expand Up @@ -253,4 +255,8 @@ public static void registerListener(TestEventListener listener) {
public void setFastTest(boolean fastTest) {
this.fastTest = fastTest;
}

public boolean isFastTest() {
return fastTest;
}
}
10 changes: 10 additions & 0 deletions src/fitnesse/responders/run/TestResponderTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,16 @@ public void testExecutionStatusOk() throws Exception {
assertEquals("ok.gif", getExecutionStatusIconFilename());
}

@Test
public void debugTest() throws Exception {
responder.setFastTest(false);
request.addInput("debug", "");
doSimpleRun(passFixtureTable());
assertEquals("Tests Executed OK", getExecutionStatusMessage());
assertEquals("ok.gif", getExecutionStatusIconFilename());
assertTrue("should be fast test", responder.isFastTest());
}

@Test
public void testExecutionStatusOutputCaptured() throws Exception {
responder.setFastTest(false);
Expand Down
Loading

0 comments on commit a2e6e7b

Please sign in to comment.