Ran all tests and tested against the merged changes from Upstream. Th…

…ere were a few issues, but nothing that couldn't be fixed. All tests pass and everything seems to be working.
xerxesb · Jun 18, 2010 · 0731e89 · 0731e89
1 parent 0247caa
commit 0731e89
Show file tree

Hide file tree

Showing 9 changed files with 254 additions and 231 deletions.
diff --git a/IdeIntegration/MonoDevelopIntegration/MonoDevelop.TechTalk.SpecFlow.csproj b/IdeIntegration/MonoDevelopIntegration/MonoDevelop.TechTalk.SpecFlow.csproj
@@ -54,6 +54,7 @@
   <ItemGroup>
     <Folder Include="Templates\" />
     <Folder Include="Gui\" />
+    <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="MonoDevelop.Ide, Version=2.4.0.0, Culture=neutral, PublicKeyToken=null">
@@ -70,6 +71,10 @@
   <ItemGroup>
     <Compile Include="SingleFeatureFileGenerator.cs" />
     <Compile Include="MonoDevelopProjectReader.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+	<Compile Include="..\..\VersionInfo.cs">
+      <Link>VersionInfo.cs</Link>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Generator\TechTalk.SpecFlow.Generator.csproj">

diff --git a/IdeIntegration/MonoDevelopIntegration/Properties/AssemblyInfo.cs b/IdeIntegration/MonoDevelopIntegration/Properties/AssemblyInfo.cs
@@ -0,0 +1,24 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("MonoDevelop.TechTalk.SpecFlow")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("MonoDevelop.TechTalk.SpecFlow")]
+[assembly: AssemblyCopyright("Copyright © TechTalk, SineSignal, LLC 2010")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("0ACD56A4-7A81-11DF-93DF-699DDFD72085")]
+
diff --git a/Reporting/ReportParameters.cs b/Reporting/ReportParameters.cs
@@ -1,3 +1,4 @@
+using System;
 using System.IO;
 
 namespace TechTalk.SpecFlow.Reporting
@@ -12,7 +13,7 @@ protected ReportParameters(string projectFile, string outputFile, string xsltFil
         {
             this.ProjectFile = projectFile;
             this.OutputFile = Path.GetFullPath(outputFile);
-            this.XsltFile = Path.GetFullPath(xsltFile);
+			this.XsltFile = !String.IsNullOrEmpty(xsltFile) ? Path.GetFullPath(xsltFile) : String.Empty;
         }
     }
 }
diff --git a/Reporting/XmlResourceResolver.cs b/Reporting/XmlResourceResolver.cs
@@ -8,27 +8,7 @@ namespace TechTalk.SpecFlow.Reporting
 {
     public class XmlResourceResolver : XmlUrlResolver
     {
-        //public override Uri ResolveUri(Uri baseUri, string relativeUri)
-		//{
-		//	if (baseUri == null)
-		//	{
-		//		if (relativeUri == null)
-		//			throw new ArgumentNullException ("Either baseUri or relativeUri are required.");
-		//		
-		//		if (relativeUri.StartsWith ("resource:"))
-		//		{
-		//			return new Uri(relativeUri);
-		//		}
-		//		else
-		//		{
-		//			return base.ResolveUri(baseUri, relativeUri);
-		//		}
-		//	}
-
-		//	return base.ResolveUri(baseUri, relativeUri);
-		//}
-
-		public override object GetEntity(Uri absoluteUri, string role, Type ofObjectToReturn)
+        public override object GetEntity(Uri absoluteUri, string role, Type ofObjectToReturn)
         {
             if (absoluteUri == null || !"resource".Equals(absoluteUri.Scheme, StringComparison.InvariantCultureIgnoreCase))
                 return base.GetEntity(absoluteUri, role, ofObjectToReturn);

diff --git a/TechTalk.SpecFlow.MonoDevelop.sln b/TechTalk.SpecFlow.MonoDevelop.sln
diff --git a/Tests/ReportingTest.SampleProject/NUnitResult/generate b/Tests/ReportingTest.SampleProject/NUnitResult/generate
@@ -0,0 +1,2 @@
+#!/bin/bash
+mono ../../../lib/nunit/nunit-console.exe ../bin/Debug/ReportingTest.SampleProject.dll -labels -xml=TestResult.xml -out:TestResult.txt -err:TestResult.err
diff --git a/Tests/ReportingTest.SampleProject/ReportingTest.SampleProject.csproj b/Tests/ReportingTest.SampleProject/ReportingTest.SampleProject.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -31,10 +31,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=2.5.1.9189, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\nunit\nunit.framework.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -47,6 +43,10 @@
     </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
+    <Reference Include="nunit.framework, Version=2.5.5.10112, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\nunit\nunit.framework.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -59,19 +59,23 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
+    <None Include="App.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="FeatureWithFailingScenarios.feature">
     </None>
     <None Include="FeatureWithSuccessfulScenarios.feature">
     </None>
     <None Include="NUnitResult\generate.cmd" />
+    <None Include="NUnitResult\generate" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="NUnitResult\TestResult.txt" />
     <Content Include="NUnitResult\TestResult.xml" />
     <Content Include="readme.txt" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/Tests/ReportingTests/StepDefinitions/Setup.cs b/Tests/ReportingTests/StepDefinitions/Setup.cs
@@ -32,12 +32,13 @@ public class SampleProjectInfo : IDisposable
 
         public SampleProjectInfo()
         {
+			string projectFolderLocation = String.Format("..{0}..{0}..{0}ReportingTest.SampleProject", Path.DirectorySeparatorChar);
             ProjectFolder = Path.GetFullPath(
-                Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), @"..\..\..\ReportingTest.SampleProject"));
+                Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), projectFolderLocation));
             ProjectFilePath = Path.Combine(ProjectFolder, @"ReportingTest.SampleProject.csproj");
 
-            NUnitXmlResultPath = Path.Combine(ProjectFolder, @"NUnitResult\TestResult.xml");
-            NUnitTextResultPath = Path.Combine(ProjectFolder, @"NUnitResult\TestResult.txt");
+            NUnitXmlResultPath = Path.Combine(ProjectFolder, String.Format("NUnitResult{0}TestResult.xml", Path.DirectorySeparatorChar));
+            NUnitTextResultPath = Path.Combine(ProjectFolder, String.Format("NUnitResult{0}TestResult.txt", Path.DirectorySeparatorChar));
 
             OutputFilePath = GenerateTempFilePath(".html");
         }

diff --git a/Tools/TechTalk.SpecFlow.Tools.csproj b/Tools/TechTalk.SpecFlow.Tools.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -12,8 +12,6 @@
     <AssemblyName>specflow</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <StartupObject>
-    </StartupObject>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -86,6 +84,7 @@
     </Content>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#!/bin/bash
		mono ../../../lib/nunit/nunit-console.exe ../bin/Debug/ReportingTest.SampleProject.dll -labels -xml=TestResult.xml -out:TestResult.txt -err:TestResult.err