Libs/AssertExtensions.dll Libs/xunit.dll Libs/xunit.extensions.dll Libs/xunit.extensions.xml Libs/xunit.xml @@ -66,4 +66,25 @@ namespace xUnit.GWT get { return "As_A"; } } } + + + public class Feature : Attribute, IStoryAttribute + { + private readonly string Text; + + public Feature(string text) + { + Text = text; + } + + public string Value + { + get { return Text;} + } + + public string Type + { + get { return "Feature"; } + } + } } xUnit.GWT/Attributes.cs @@ -15,7 +15,7 @@ namespace xUnit.GWT.CustomResults public override XmlNode ToXml(XmlNode parentNode) { - XmlUtility.AddAttribute(parentNode, "story", "THIS IS MY STORY"); + XmlUtility.AddAttribute(parentNode, "story", ""); XmlNode node = base.ToXml(parentNode); XmlUtility.AddAttribute(node, "result", "Pending"); XmlUtility.AddCDataSection(XmlUtility.AddElement(XmlUtility.AddElement(node, "reason"), "message"), Reason); xUnit.GWT/CustomResults/PendingResult.cs @@ -1,9 +1,9 @@ namespace xUnit.GWT.Example { - [As_A("User...")] - [I_Want("To...")] - [So_That("I...")] - //[Story("As a user... I want to... So that I...")] + //[As_A("User...")] + //[I_Want("To...")] + //[So_That("I...")] + [Feature("As a user... I want to... So that I...")] public class This_is_my_story : This_is_my_story_Base { [Scenario] xUnit.GWT/Example/This_is_my_story.cs @@ -78,9 +78,9 @@ <xsl:if test="@result!='Pending'"><span class="timing"><xsl:value-of select="@time"/>s</span></xsl:if> <xsl:if test="@result='Pending'"><span class="timing"></span><span class="skipped">P</span></xsl:if> <xsl:if test="@result='Fail'"><span class="failure"> - <img src="C:\Documents and Settings\ben.hall\My Documents\Visual Studio 2008\Projects\xUnit.GWT\xUnit.GWT\Failed.png" /> + <img src="Failed.png" /> </span></xsl:if> - <xsl:if test="@result='Pass'"><span class="success"><img src="C:\Documents and Settings\ben.hall\My Documents\Visual Studio 2008\Projects\xUnit.GWT\xUnit.GWT\Passed.png" /></span></xsl:if> + <xsl:if test="@result='Pass'"><span class="success"><img src="Passed.png" /></span></xsl:if> &#160;<xsl:value-of select="@name"/> <xsl:if test="@result='Fail'"> <br/> @@ -104,7 +104,7 @@ <xsl:attribute name="onclick">ToggleClass('class<xsl:value-of select="position()"/>')</xsl:attribute> <xsl:attribute name="ondblclick">ToggleClass('class<xsl:value-of select="position()"/>')</xsl:attribute> <b> - Story - <xsl:value-of select="@story"/> + Feature - <xsl:value-of select="@story"/> </b> <span> <small> xUnit.GWT/HtmlReporter.xslt @@ -29,6 +29,7 @@ namespace xUnit.GWT string AsA = string.Empty; string IWant = string.Empty; string SoThat = string.Empty; + string FeatureText = string.Empty; foreach (var attribute in o.GetType().GetCustomAttributes(true)) { IStoryAttribute a = attribute as IStoryAttribute; @@ -43,9 +44,16 @@ namespace xUnit.GWT case "So_That": SoThat = a.Value; break; + case "Feature": + FeatureText = a.Value; + break; } } - return string.Format("As a {0} I want {1} so that {2}", AsA, IWant, SoThat); + + if (!string.IsNullOrEmpty(AsA) || !string.IsNullOrEmpty(IWant) || !string.IsNullOrEmpty(SoThat)) + return string.Format("As a {0} I want {1} so that {2}", AsA, IWant, SoThat); + else + return FeatureText; } } } \ No newline at end of file xUnit.GWT/ScenarioAttribute.cs @@ -33,7 +33,7 @@ <ItemGroup> <Reference Include="AssertExtensions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\Desktop\xunit-1.1\AssertExtensions.dll</HintPath> + <HintPath>..\Libs\AssertExtensions.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.Core"> @@ -49,11 +49,11 @@ <Reference Include="System.Xml" /> <Reference Include="xunit, Version=1.1.0.1323, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\Desktop\xunit-1.1\xunit.dll</HintPath> + <HintPath>..\Libs\xunit.dll</HintPath> </Reference> <Reference Include="xunit.extensions, Version=1.1.0.1323, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\..\..\..\Desktop\xunit-1.1\xunit.extensions.dll</HintPath> + <HintPath>..\Libs\xunit.extensions.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> xUnit.GWT/xUnit.GWT.csproj d6aaee0ec59522673f99d91e07a22000b894551b Ben Hall Ben@BenHall.me.uk http://github.com/BenHall/xUnit.GWT/commit/b53bc5d1fc3b4212f03ffc4134198b37652b6853 b53bc5d1fc3b4212f03ffc4134198b37652b6853 2009-05-27T02:30:21-07:00 2009-05-27T02:30:21-07:00 Added a feature attribute b57d6b7619d460646cc3d1946fd25ff8769697b8 Ben Hall Ben@BenHall.me.uk