Skip to content

Commit

Permalink
Merge branch 'master' of github.com:smwhit/SpecFlow into xsltcustomis…
Browse files Browse the repository at this point in the history
…ation

Conflicts:
	Reporting/TechTalk.SpecFlow.Reporting.csproj
  • Loading branch information
smwhit committed May 15, 2010
2 parents 4b6cfb2 + e251314 commit 591eb8a
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 4 deletions.
1 change: 1 addition & 0 deletions Reporting/TechTalk.SpecFlow.Reporting.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
<Compile Include="StepDefinitionReport\ReportElements\StepDefinitionReport.cs" />
<Compile Include="ResourceXmlReader.cs" />
<Compile Include="StepDefinitionReport\StepDefinitionReportGenerator.cs" />
<Compile Include="TestExecutionReport\TestExecutionReportGenerator.cs" />
<Compile Include="XmlResourceResolver.cs" />
<Compile Include="XsltHelper.cs" />
</ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion Reporting/XsltHelper.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Xml;
Expand Down
3 changes: 0 additions & 3 deletions Runtime/Configuration/RuntimeConfiguration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,6 @@ public static RuntimeConfiguration LoadFromConfigFile(ConfigurationSectionHandle

foreach (var element in configSection.StepAssemblies)
{
// string stepAssemblyFileName = ((StepAssemblyConfigElement)element).File;
// string fullPath = Path.GetFullPath(stepAssemblyFileName);
// Assembly stepAssembly = Assembly.LoadFile(fullPath);
Assembly stepAssembly = Assembly.Load(((StepAssemblyConfigElement)element).Assembly);
config._additionalStepAssemblies.Add(stepAssembly);
}
Expand Down
1 change: 1 addition & 0 deletions Runtime/TechTalk.SpecFlow.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
<Compile Include="Tracing\DefaultListener.cs" />
<Compile Include="ErrorHandling\ErrorProvider.cs" />
<Compile Include="Tracing\LanguageHelper.cs" />
<Compile Include="Tracing\NullListener.cs" />
<Compile Include="Tracing\StepDefinitonSkeletonProvider.cs" />
<Compile Include="Tracing\StepFormatter.cs" />
<Compile Include="UnitTestProvider\XUnitRuntimeProvider.cs" />
Expand Down
20 changes: 20 additions & 0 deletions Tools/Program.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
using System;
using System.IO;
using System.Xml;
using System.Xml.Linq;
using System.Xml.Xsl;
using NConsoler;
using TechTalk.SpecFlow.Generator;
using TechTalk.SpecFlow.Generator.Configuration;
using TechTalk.SpecFlow.Reporting.NUnitExecutionReport;
using TechTalk.SpecFlow.Reporting.StepDefinitionReport;
using TechTalk.SpecFlow.Reporting.TestExecutionReport;

namespace TechTalk.SpecFlow.Tools
{
Expand Down Expand Up @@ -55,6 +59,22 @@ public static void NUnitExecutionReport([Required(Description = "Visual Studio P
generator.TransformReport(Path.GetFullPath(outputFile), xsltFile);
}

[Action("Formats an Test Execution report to SpecFlow style")]
public static void TestExecutionReport([Required(Description = "Visual Studio Project File containing specs")] string projectFile,
[Optional("TestResult.xml", Description = "Xml Test Result file generated by Gallio. Defaults to TestResult.xml")] string xmlTestResult,
[Optional("TestResult.txt", "testOutput")] string labeledTestOutput,
[Optional("TestResult.html", "out", Description = "Generated Output File. Defaults to TestResult.html")] string outputFile)
{
TestExecutionReportGenerator reportGenerator = new TestExecutionReportGenerator();
reportGenerator.GenerateNUnitXmlFromGallio(xmlTestResult);

var generator = new NUnitExecutionReportGenerator(projectFile, Path.GetFullPath("TestResult.xml"),
Path.GetFullPath(labeledTestOutput));

generator.GenerateReport();
generator.TransformReport(Path.GetFullPath(outputFile));
}

#endregion
}
}
3 changes: 3 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ New features:
+ Single installer for Visual Studio 2008 and 2010 (Issue 6, 10, 11)
+ Place GeneratedCodeAttribute and 'Designer generated code' region on generated code to
avoid having this code parsed by code analysis. (Issue 33)
+ Configuration option to disable all output. (Issue 29)
Use the following config to disable output:
<trace listener="TechTalk.SpecFlow.Tracing.NullListener, TechTalk.SpecFlow" />

Fixed issues:
+ SpecFlow Reporting doesn't work with Firefox (Issue 31)
Expand Down

0 comments on commit 591eb8a

Please sign in to comment.