nunit-dev team mailing list archive
-
nunit-dev team
-
Mailing list archive
-
Message #00131
FW: [Merge] lp:~charlie.poole/nunit-2.5/bug-414073 into lp:nunit-2.5
Hi All,
If you got this note, but did not receive the attached merge request in
your inbox, please let me know. I'm still not sure this is set up correctly.
Charlie
-----Original Message-----
From: bounces@xxxxxxxxxxxxx [mailto:bounces@xxxxxxxxxxxxx] On Behalf Of
Charlie Poole
Sent: Sunday, August 16, 2009 7:10 PM
To: mp+10223@xxxxxxxxxxxxxxxxxx
Subject: [Merge] lp:~charlie.poole/nunit-2.5/bug-414073 into lp:nunit-2.5
Charlie Poole has proposed merging lp:~charlie.poole/nunit-2.5/bug-414073
into lp:nunit-2.5.
Requested reviews:
NUnit Developers (nunit-dev)
Fixes bug 414073, ensuring that the FullName of the fixture, which may
include parameters, is used as the prefix for the FullName of all contained
methods. Tested using both normal test methods and methods with parameters.
--
https://code.launchpad.net/~charlie.poole/nunit-2.5/bug-414073/+merge/10223
You are the owner of lp:~charlie.poole/nunit-2.5/bug-414073.
=== modified file 'solutions/vs2005/tests/test-assembly/test-assembly.csproj'
--- solutions/vs2005/tests/test-assembly/test-assembly.csproj 2009-04-22 01:21:06 +0000
+++ solutions/vs2005/tests/test-assembly/test-assembly.csproj 2009-08-17 01:31:21 +0000
@@ -1,213 +1,216 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
- <PropertyGroup>
- <ProjectType>Local</ProjectType>
- <ProductVersion>8.0.50727</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{1960CAC4-9A82-47C5-A9B3-55BC37572C3C}</ProjectGuid>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ApplicationIcon>
- </ApplicationIcon>
- <AssemblyKeyContainerName>
- </AssemblyKeyContainerName>
- <AssemblyName>test-assembly</AssemblyName>
- <AssemblyOriginatorKeyFile>
- </AssemblyOriginatorKeyFile>
- <DefaultClientScript>JScript</DefaultClientScript>
- <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
- <DefaultTargetSchema>IE50</DefaultTargetSchema>
- <DelaySign>false</DelaySign>
- <OutputType>Library</OutputType>
- <RootNamespace>NUnit.TestData</RootNamespace>
- <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
- <StartupObject>
- </StartupObject>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <OutputPath>..\..\bin\Debug\tests\</OutputPath>
- <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
- <BaseAddress>285212672</BaseAddress>
- <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
- <ConfigurationOverrideFile>
- </ConfigurationOverrideFile>
- <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
- <DocumentationFile>
- </DocumentationFile>
- <DebugSymbols>true</DebugSymbols>
- <FileAlignment>4096</FileAlignment>
- <NoStdLib>false</NoStdLib>
- <NoWarn>618,672</NoWarn>
- <Optimize>false</Optimize>
- <RegisterForComInterop>false</RegisterForComInterop>
- <RemoveIntegerChecks>false</RemoveIntegerChecks>
- <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
- <WarningLevel>4</WarningLevel>
- <DebugType>full</DebugType>
- <ErrorReport>prompt</ErrorReport>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <OutputPath>..\..\bin\Release\tests\</OutputPath>
- <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
- <BaseAddress>285212672</BaseAddress>
- <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
- <ConfigurationOverrideFile>
- </ConfigurationOverrideFile>
- <DefineConstants>TRACE;NET_2_0</DefineConstants>
- <DocumentationFile>
- </DocumentationFile>
- <DebugSymbols>false</DebugSymbols>
- <FileAlignment>4096</FileAlignment>
- <NoStdLib>false</NoStdLib>
- <NoWarn>618,672</NoWarn>
- <Optimize>true</Optimize>
- <RegisterForComInterop>false</RegisterForComInterop>
- <RemoveIntegerChecks>false</RemoveIntegerChecks>
- <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
- <WarningLevel>4</WarningLevel>
- <DebugType>none</DebugType>
- <ErrorReport>prompt</ErrorReport>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="System">
- <Name>System</Name>
- </Reference>
- <Reference Include="System.Data">
- <Name>System.Data</Name>
- </Reference>
- <Reference Include="System.Xml">
- <Name>System.XML</Name>
- </Reference>
- <ProjectReference Include="..\..\NUnitCore\core\nunit.core.dll.csproj">
- <Name>nunit.core.dll</Name>
- <Project>{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}</Project>
- <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
- <Private>False</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\NUnitCore\interfaces\nunit.core.interfaces.dll.csproj">
- <Name>nunit.core.interfaces.dll</Name>
- <Project>{435428F8-5995-4CE4-8022-93D595A8CC0F}</Project>
- <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
- <Private>False</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\NUnitFramework\framework\nunit.framework.dll.csproj">
- <Name>nunit.framework.dll</Name>
- <Project>{83DD7E12-A705-4DBA-9D71-09C8973D9382}</Project>
- <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <Compile Include="..\..\..\..\src\CommonAssemblyInfo.cs">
- <Link>CommonAssemblyInfo.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\AttributeDescriptionTests.cs">
- <Link>AttributeDescriptionTests.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\AttributeInheritance.cs">
- <Link>AttributeInheritance.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\CategoryAttributeTests.cs">
- <Link>CategoryAttributeTests.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\ConsoleRunnerTest.cs">
- <Link>ConsoleRunnerTest.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\CultureAttributeTests.cs">
- <Link>CultureAttributeTests.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\ExpectExceptionTest.cs">
- <Link>ExpectExceptionTest.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\FailFixtureTests.cs">
- <Link>FailFixtureTests.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\FixtureSetUpTearDownTests.cs">
- <Link>FixtureSetUpTearDownTests.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\IgnoreFixtureTests.cs">
- <Link>IgnoreFixtureTests.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\PropertyAttributeTests.cs">
- <Link>PropertyAttributeTests.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\RepeatedTestFixtureTests.cs">
- <Link>RepeatedTestFixtureTests.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\SetupFixtureTests.cs">
- <Link>SetupFixtureTests.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\SetUpTest.cs">
- <Link>SetUpTest.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\SuiteBuilderTests.cs">
- <Link>SuiteBuilderTests.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\TestCaseAttributeFixture.cs">
- <Link>TestCaseAttributeFixture.cs</Link>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\TestCaseSourceAttributeFixture.cs">
- <Link>TestCaseSourceAttributeFixture.cs</Link>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\TestCaseTest.cs">
- <Link>TestCaseTest.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\TestData.cs">
- <Link>TestData.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\TestFixtureBuilderTests.cs">
- <Link>TestFixtureBuilderTests.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\TestFixtureExtensionTests.cs">
- <Link>TestFixtureExtensionTests.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\TestFixtureTests.cs">
- <Link>TestFixtureTests.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\TestMethodSignatureFixture.cs">
- <Link>TestMethodSignatureFixture.cs</Link>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\TheoryFixture.cs">
- <Link>TheoryFixture.cs</Link>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\ThreadingFixture.cs">
- <Link>ThreadingFixture.cs</Link>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\UnhandledExceptions.cs">
- <Link>UnhandledExceptions.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\MaxTimeFixture.cs">
- <Link>MaxTimeFixture.cs</Link>
- </Compile>
- </ItemGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <PropertyGroup>
- <PreBuildEvent>
- </PreBuildEvent>
- <PostBuildEvent>
- </PostBuildEvent>
- </PropertyGroup>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <PropertyGroup>
+ <ProjectType>Local</ProjectType>
+ <ProductVersion>8.0.50727</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{1960CAC4-9A82-47C5-A9B3-55BC37572C3C}</ProjectGuid>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ApplicationIcon>
+ </ApplicationIcon>
+ <AssemblyKeyContainerName>
+ </AssemblyKeyContainerName>
+ <AssemblyName>test-assembly</AssemblyName>
+ <AssemblyOriginatorKeyFile>
+ </AssemblyOriginatorKeyFile>
+ <DefaultClientScript>JScript</DefaultClientScript>
+ <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+ <DefaultTargetSchema>IE50</DefaultTargetSchema>
+ <DelaySign>false</DelaySign>
+ <OutputType>Library</OutputType>
+ <RootNamespace>NUnit.TestData</RootNamespace>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+ <StartupObject>
+ </StartupObject>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <OutputPath>..\..\bin\Debug\tests\</OutputPath>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+ <DocumentationFile>
+ </DocumentationFile>
+ <DebugSymbols>true</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn>618,672</NoWarn>
+ <Optimize>false</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>full</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <OutputPath>..\..\bin\Release\tests\</OutputPath>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>TRACE;NET_2_0</DefineConstants>
+ <DocumentationFile>
+ </DocumentationFile>
+ <DebugSymbols>false</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn>618,672</NoWarn>
+ <Optimize>true</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>none</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System">
+ <Name>System</Name>
+ </Reference>
+ <Reference Include="System.Data">
+ <Name>System.Data</Name>
+ </Reference>
+ <Reference Include="System.Xml">
+ <Name>System.XML</Name>
+ </Reference>
+ <ProjectReference Include="..\..\NUnitCore\core\nunit.core.dll.csproj">
+ <Name>nunit.core.dll</Name>
+ <Project>{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}</Project>
+ <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+ <Private>False</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\NUnitCore\interfaces\nunit.core.interfaces.dll.csproj">
+ <Name>nunit.core.interfaces.dll</Name>
+ <Project>{435428F8-5995-4CE4-8022-93D595A8CC0F}</Project>
+ <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+ <Private>False</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\NUnitFramework\framework\nunit.framework.dll.csproj">
+ <Name>nunit.framework.dll</Name>
+ <Project>{83DD7E12-A705-4DBA-9D71-09C8973D9382}</Project>
+ <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="..\..\..\..\src\CommonAssemblyInfo.cs">
+ <Link>CommonAssemblyInfo.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\AttributeDescriptionTests.cs">
+ <Link>AttributeDescriptionTests.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\AttributeInheritance.cs">
+ <Link>AttributeInheritance.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\CategoryAttributeTests.cs">
+ <Link>CategoryAttributeTests.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\ConsoleRunnerTest.cs">
+ <Link>ConsoleRunnerTest.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\CultureAttributeTests.cs">
+ <Link>CultureAttributeTests.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\ExpectExceptionTest.cs">
+ <Link>ExpectExceptionTest.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\FailFixtureTests.cs">
+ <Link>FailFixtureTests.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\FixtureSetUpTearDownTests.cs">
+ <Link>FixtureSetUpTearDownTests.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\IgnoreFixtureTests.cs">
+ <Link>IgnoreFixtureTests.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\ParameterizedTestFixture.cs">
+ <Link>ParameterizedTestFixture.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\PropertyAttributeTests.cs">
+ <Link>PropertyAttributeTests.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\RepeatedTestFixtureTests.cs">
+ <Link>RepeatedTestFixtureTests.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\SetupFixtureTests.cs">
+ <Link>SetupFixtureTests.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\SetUpTest.cs">
+ <Link>SetUpTest.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\SuiteBuilderTests.cs">
+ <Link>SuiteBuilderTests.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\TestCaseAttributeFixture.cs">
+ <Link>TestCaseAttributeFixture.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\TestCaseSourceAttributeFixture.cs">
+ <Link>TestCaseSourceAttributeFixture.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\TestCaseTest.cs">
+ <Link>TestCaseTest.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\TestData.cs">
+ <Link>TestData.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\TestFixtureBuilderTests.cs">
+ <Link>TestFixtureBuilderTests.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\TestFixtureExtensionTests.cs">
+ <Link>TestFixtureExtensionTests.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\TestFixtureTests.cs">
+ <Link>TestFixtureTests.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\TestMethodSignatureFixture.cs">
+ <Link>TestMethodSignatureFixture.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\TheoryFixture.cs">
+ <Link>TheoryFixture.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\ThreadingFixture.cs">
+ <Link>ThreadingFixture.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\UnhandledExceptions.cs">
+ <Link>UnhandledExceptions.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\MaxTimeFixture.cs">
+ <Link>MaxTimeFixture.cs</Link>
+ </Compile>
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <PropertyGroup>
+ <PreBuildEvent>
+ </PreBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
+ </PropertyGroup>
</Project>
\ No newline at end of file
=== modified file 'solutions/vs2008/tests/test-assembly/test-assembly.csproj'
--- solutions/vs2008/tests/test-assembly/test-assembly.csproj 2009-04-22 01:21:06 +0000
+++ solutions/vs2008/tests/test-assembly/test-assembly.csproj 2009-08-17 01:31:21 +0000
@@ -1,247 +1,248 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="3.5">
- <PropertyGroup>
- <ProjectType>Local</ProjectType>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{1960CAC4-9A82-47C5-A9B3-55BC37572C3C}</ProjectGuid>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ApplicationIcon>
- </ApplicationIcon>
- <AssemblyKeyContainerName>
- </AssemblyKeyContainerName>
- <AssemblyName>test-assembly</AssemblyName>
- <AssemblyOriginatorKeyFile>
- </AssemblyOriginatorKeyFile>
- <DefaultClientScript>JScript</DefaultClientScript>
- <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
- <DefaultTargetSchema>IE50</DefaultTargetSchema>
- <DelaySign>false</DelaySign>
- <OutputType>Library</OutputType>
- <RootNamespace>NUnit.TestData</RootNamespace>
- <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
- <StartupObject>
- </StartupObject>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
- <OldToolsVersion>2.0</OldToolsVersion>
- <PublishUrl>http://localhost/test-assembly/</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Web</InstallFrom>
- <UpdateEnabled>true</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>true</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <OutputPath>..\..\bin\Debug\tests\</OutputPath>
- <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
- <BaseAddress>285212672</BaseAddress>
- <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
- <ConfigurationOverrideFile>
- </ConfigurationOverrideFile>
- <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
- <DocumentationFile>
- </DocumentationFile>
- <DebugSymbols>true</DebugSymbols>
- <FileAlignment>4096</FileAlignment>
- <NoStdLib>false</NoStdLib>
- <NoWarn>618,672</NoWarn>
- <Optimize>false</Optimize>
- <RegisterForComInterop>false</RegisterForComInterop>
- <RemoveIntegerChecks>false</RemoveIntegerChecks>
- <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
- <WarningLevel>4</WarningLevel>
- <DebugType>full</DebugType>
- <ErrorReport>prompt</ErrorReport>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <OutputPath>..\..\bin\Release\tests\</OutputPath>
- <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
- <BaseAddress>285212672</BaseAddress>
- <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
- <ConfigurationOverrideFile>
- </ConfigurationOverrideFile>
- <DefineConstants>TRACE;NET_2_0</DefineConstants>
- <DocumentationFile>
- </DocumentationFile>
- <DebugSymbols>false</DebugSymbols>
- <FileAlignment>4096</FileAlignment>
- <NoStdLib>false</NoStdLib>
- <NoWarn>618,672</NoWarn>
- <Optimize>true</Optimize>
- <RegisterForComInterop>false</RegisterForComInterop>
- <RemoveIntegerChecks>false</RemoveIntegerChecks>
- <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
- <WarningLevel>4</WarningLevel>
- <DebugType>none</DebugType>
- <ErrorReport>prompt</ErrorReport>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="System">
- <Name>System</Name>
- </Reference>
- <Reference Include="System.Data">
- <Name>System.Data</Name>
- </Reference>
- <Reference Include="System.Xml">
- <Name>System.XML</Name>
- </Reference>
- <ProjectReference Include="..\..\NUnitCore\core\nunit.core.dll.csproj">
- <Name>nunit.core.dll</Name>
- <Project>{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}</Project>
- <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
- <Private>False</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\NUnitCore\interfaces\nunit.core.interfaces.dll.csproj">
- <Name>nunit.core.interfaces.dll</Name>
- <Project>{435428F8-5995-4CE4-8022-93D595A8CC0F}</Project>
- <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
- <Private>False</Private>
- </ProjectReference>
- <ProjectReference Include="..\..\NUnitFramework\framework\nunit.framework.dll.csproj">
- <Name>nunit.framework.dll</Name>
- <Project>{83DD7E12-A705-4DBA-9D71-09C8973D9382}</Project>
- <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
- <Private>True</Private>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <Compile Include="..\..\..\..\src\CommonAssemblyInfo.cs">
- <Link>CommonAssemblyInfo.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\AttributeDescriptionTests.cs">
- <Link>AttributeDescriptionTests.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\AttributeInheritance.cs">
- <Link>AttributeInheritance.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\CategoryAttributeTests.cs">
- <Link>CategoryAttributeTests.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\ConsoleRunnerTest.cs">
- <Link>ConsoleRunnerTest.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\CultureAttributeTests.cs">
- <Link>CultureAttributeTests.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\ExpectExceptionTest.cs">
- <Link>ExpectExceptionTest.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\FailFixtureTests.cs">
- <Link>FailFixtureTests.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\FixtureSetUpTearDownTests.cs">
- <Link>FixtureSetUpTearDownTests.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\IgnoreFixtureTests.cs">
- <Link>IgnoreFixtureTests.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\PropertyAttributeTests.cs">
- <Link>PropertyAttributeTests.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\RepeatedTestFixtureTests.cs">
- <Link>RepeatedTestFixtureTests.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\SetupFixtureTests.cs">
- <Link>SetupFixtureTests.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\SetUpTest.cs">
- <Link>SetUpTest.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\SuiteBuilderTests.cs">
- <Link>SuiteBuilderTests.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\TestCaseAttributeFixture.cs">
- <Link>TestCaseAttributeFixture.cs</Link>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\TestCaseTest.cs">
- <Link>TestCaseTest.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\TestData.cs">
- <Link>TestData.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\TestFixtureBuilderTests.cs">
- <Link>TestFixtureBuilderTests.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\TestFixtureExtensionTests.cs">
- <Link>TestFixtureExtensionTests.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\TestFixtureTests.cs">
- <Link>TestFixtureTests.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\TestMethodSignatureFixture.cs">
- <Link>TestMethodSignatureFixture.cs</Link>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\UnhandledExceptions.cs">
- <Link>UnhandledExceptions.cs</Link>
- <SubType>Code</SubType>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\MaxTimeFixture.cs">
- <Link>MaxTimeFixture.cs</Link>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\ThreadingFixture.cs">
- <Link>ThreadingFixture.cs</Link>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\TheoryFixture.cs">
- <Link>TheoryFixture.cs</Link>
- </Compile>
- <Compile Include="..\..\..\..\src\tests\test-assembly\TestCaseSourceAttributeFixture.cs">
- <Link>TestCaseSourceAttributeFixture.cs</Link>
- </Compile>
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
- <Visible>False</Visible>
- <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- </ItemGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <PropertyGroup>
- <PreBuildEvent>
- </PreBuildEvent>
- <PostBuildEvent>
- </PostBuildEvent>
- </PropertyGroup>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="3.5">
+ <PropertyGroup>
+ <ProjectType>Local</ProjectType>
+ <ProductVersion>9.0.30729</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{1960CAC4-9A82-47C5-A9B3-55BC37572C3C}</ProjectGuid>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ApplicationIcon>
+ </ApplicationIcon>
+ <AssemblyKeyContainerName>
+ </AssemblyKeyContainerName>
+ <AssemblyName>test-assembly</AssemblyName>
+ <AssemblyOriginatorKeyFile>
+ </AssemblyOriginatorKeyFile>
+ <DefaultClientScript>JScript</DefaultClientScript>
+ <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+ <DefaultTargetSchema>IE50</DefaultTargetSchema>
+ <DelaySign>false</DelaySign>
+ <OutputType>Library</OutputType>
+ <RootNamespace>NUnit.TestData</RootNamespace>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+ <StartupObject>
+ </StartupObject>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ <OldToolsVersion>2.0</OldToolsVersion>
+ <PublishUrl>http://localhost/test-assembly/</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Web</InstallFrom>
+ <UpdateEnabled>true</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>true</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <OutputPath>..\..\bin\Debug\tests\</OutputPath>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+ <DocumentationFile>
+ </DocumentationFile>
+ <DebugSymbols>true</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn>618,672</NoWarn>
+ <Optimize>false</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>full</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <OutputPath>..\..\bin\Release\tests\</OutputPath>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>TRACE;NET_2_0</DefineConstants>
+ <DocumentationFile>
+ </DocumentationFile>
+ <DebugSymbols>false</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn>618,672</NoWarn>
+ <Optimize>true</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>none</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System">
+ <Name>System</Name>
+ </Reference>
+ <Reference Include="System.Data">
+ <Name>System.Data</Name>
+ </Reference>
+ <Reference Include="System.Xml">
+ <Name>System.XML</Name>
+ </Reference>
+ <ProjectReference Include="..\..\NUnitCore\core\nunit.core.dll.csproj">
+ <Name>nunit.core.dll</Name>
+ <Project>{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}</Project>
+ <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+ <Private>False</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\NUnitCore\interfaces\nunit.core.interfaces.dll.csproj">
+ <Name>nunit.core.interfaces.dll</Name>
+ <Project>{435428F8-5995-4CE4-8022-93D595A8CC0F}</Project>
+ <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+ <Private>False</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\NUnitFramework\framework\nunit.framework.dll.csproj">
+ <Name>nunit.framework.dll</Name>
+ <Project>{83DD7E12-A705-4DBA-9D71-09C8973D9382}</Project>
+ <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+ <Private>True</Private>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="..\..\..\..\src\CommonAssemblyInfo.cs">
+ <Link>CommonAssemblyInfo.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\AttributeDescriptionTests.cs">
+ <Link>AttributeDescriptionTests.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\AttributeInheritance.cs">
+ <Link>AttributeInheritance.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\CategoryAttributeTests.cs">
+ <Link>CategoryAttributeTests.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\ConsoleRunnerTest.cs">
+ <Link>ConsoleRunnerTest.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\CultureAttributeTests.cs">
+ <Link>CultureAttributeTests.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\ExpectExceptionTest.cs">
+ <Link>ExpectExceptionTest.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\FailFixtureTests.cs">
+ <Link>FailFixtureTests.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\FixtureSetUpTearDownTests.cs">
+ <Link>FixtureSetUpTearDownTests.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\IgnoreFixtureTests.cs">
+ <Link>IgnoreFixtureTests.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\PropertyAttributeTests.cs">
+ <Link>PropertyAttributeTests.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\RepeatedTestFixtureTests.cs">
+ <Link>RepeatedTestFixtureTests.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\SetupFixtureTests.cs">
+ <Link>SetupFixtureTests.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\SetUpTest.cs">
+ <Link>SetUpTest.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\SuiteBuilderTests.cs">
+ <Link>SuiteBuilderTests.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\TestCaseAttributeFixture.cs">
+ <Link>TestCaseAttributeFixture.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\TestCaseTest.cs">
+ <Link>TestCaseTest.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\TestData.cs">
+ <Link>TestData.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\TestFixtureBuilderTests.cs">
+ <Link>TestFixtureBuilderTests.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\TestFixtureExtensionTests.cs">
+ <Link>TestFixtureExtensionTests.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\TestFixtureTests.cs">
+ <Link>TestFixtureTests.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\TestMethodSignatureFixture.cs">
+ <Link>TestMethodSignatureFixture.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\UnhandledExceptions.cs">
+ <Link>UnhandledExceptions.cs</Link>
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\MaxTimeFixture.cs">
+ <Link>MaxTimeFixture.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\ThreadingFixture.cs">
+ <Link>ThreadingFixture.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\TheoryFixture.cs">
+ <Link>TheoryFixture.cs</Link>
+ </Compile>
+ <Compile Include="..\..\..\..\src\tests\test-assembly\TestCaseSourceAttributeFixture.cs">
+ <Link>TestCaseSourceAttributeFixture.cs</Link>
+ </Compile>
+ <Compile Include="ParameterizedTestFixture.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <PropertyGroup>
+ <PreBuildEvent>
+ </PreBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
+ </PropertyGroup>
</Project>
\ No newline at end of file
=== modified file 'src/NUnitCore/core/Builders/NUnitTestCaseBuilder.cs'
--- src/NUnitCore/core/Builders/NUnitTestCaseBuilder.cs 2009-08-08 23:42:03 +0000
+++ src/NUnitCore/core/Builders/NUnitTestCaseBuilder.cs 2009-08-17 01:31:21 +0000
@@ -83,7 +83,7 @@
{
return CoreExtensions.Host.TestCaseProviders.HasTestCasesFor(method)
? BuildParameterizedMethodSuite(method, parentSuite)
- : BuildSingleTestMethod(method, null);
+ : BuildSingleTestMethod(method, parentSuite, null);
}
#endregion
@@ -142,7 +142,7 @@
}
}
- TestMethod test = BuildSingleTestMethod(method, parms);
+ TestMethod test = BuildSingleTestMethod(method, parentSuite, parms);
methodSuite.Add(test);
}
@@ -157,10 +157,18 @@
/// <param name="method">The MethodInfo from which to construct the TestMethod</param>
/// <param name="parms">The ParameterSet to be used, or null</param>
/// <returns></returns>
- public static NUnitTestMethod BuildSingleTestMethod(MethodInfo method, ParameterSet parms)
+ public static NUnitTestMethod BuildSingleTestMethod(MethodInfo method, Test parentSuite, ParameterSet parms)
{
- NUnitTestMethod testMethod = new NUnitTestMethod(method);
-
+ NUnitTestMethod testMethod = new NUnitTestMethod(method);
+
+ string prefix = method.ReflectedType.FullName;
+
+ if (parentSuite != null)
+ {
+ prefix = parentSuite.TestName.FullName;
+ testMethod.TestName.FullName = prefix + "." + testMethod.TestName.Name;
+ }
+
if (CheckTestMethodSignature(testMethod, parms))
{
NUnitFramework.ApplyCommonAttributes(method, testMethod);
@@ -172,17 +180,18 @@
// NOTE: After the call to CheckTestMethodSignature, the Method
// property of testMethod may no longer be the same as the
// original MethodInfo, so we reassign it here.
- method = testMethod.Method;
+ method = testMethod.Method;
+
if (parms.TestName != null)
{
- testMethod.TestName.Name = parms.TestName;
- testMethod.TestName.FullName = method.ReflectedType.FullName + "." + parms.TestName;
+ testMethod.TestName.Name = parms.TestName;
+ testMethod.TestName.FullName = prefix + "." + parms.TestName;
}
else if (parms.Arguments != null)
{
string name = MethodHelper.GetDisplayName(method, parms.Arguments);
- testMethod.TestName.Name = name;
- testMethod.TestName.FullName = method.ReflectedType.FullName + "." + name;
+ testMethod.TestName.Name = name;
+ testMethod.TestName.FullName = prefix + "." + name;
}
if (parms.Ignored)
=== modified file 'src/NUnitCore/tests/ParameterizedTestFixtureTests.cs'
--- src/NUnitCore/tests/ParameterizedTestFixtureTests.cs 2009-07-06 05:27:45 +0000
+++ src/NUnitCore/tests/ParameterizedTestFixtureTests.cs 2009-08-17 01:31:21 +0000
@@ -6,7 +6,8 @@
using System;
using System.Collections;
-using NUnit.Framework;
+using NUnit.Framework;
+using NUnit.TestUtilities;
namespace NUnit.Core.Tests
{
@@ -94,5 +95,71 @@
{
Assert.That(answer % x == 0);
}
+ }
+
+ public class ParameterizedTestFixtureNamingTests
+ {
+ Test fixture;
+ Test[] instances;
+
+ [SetUp]
+ public void MakeFixture()
+ {
+ fixture = TestBuilder.MakeFixture(typeof(NUnit.TestData.ParameterizedTestFixture));
+ }
+
+ [Test]
+ public void TopLevelSuiteIsNamedCorrectly()
+ {
+ Assert.That(fixture.TestName.Name, Is.EqualTo("ParameterizedTestFixture"));
+ Assert.That(fixture.TestName.FullName, Is.EqualTo("NUnit.TestData.ParameterizedTestFixture"));
+ }
+
+ [Test]
+ public void SuiteHasCorrectNumberOfInstances()
+ {
+ Assert.That(fixture.Tests.Count, Is.EqualTo(2));
+ }
+
+ [Test]
+ public void FixtureInstancesAreNamedCorrectly()
+ {
+ ArrayList names = new ArrayList();
+ ArrayList fullnames = new ArrayList();
+ foreach (Test test in fixture.Tests)
+ {
+ names.Add(test.TestName.Name);
+ fullnames.Add(test.TestName.FullName);
+ }
+
+ Assert.That(names, Is.EquivalentTo(new string[] {
+ "ParameterizedTestFixture(1)", "ParameterizedTestFixture(2)" }));
+ Assert.That(fullnames, Is.EquivalentTo(new string[] {
+ "NUnit.TestData.ParameterizedTestFixture(1)", "NUnit.TestData.ParameterizedTestFixture(2)" }));
+ }
+
+ [Test]
+ public void MethodWithoutParamsIsNamedCorrectly()
+ {
+ Test instance = (Test)fixture.Tests[0];
+ Test method = TestFinder.Find("MethodWithoutParams", instance, false);
+ Assert.That(method, Is.Not.Null );
+ Assert.That(method.TestName.FullName, Is.EqualTo(instance.TestName.FullName + ".MethodWithoutParams"));
+ }
+
+ [Test]
+ public void MethodWithParamsIsNamedCorrectly()
+ {
+ Test instance = (Test)fixture.Tests[0];
+ Test method = TestFinder.Find("MethodWithParams", instance, false);
+ Assert.That(method, Is.Not.Null);
+
+ Test testcase = (Test)method.Tests[0];
+ Assert.That(testcase.TestName.Name, Is.EqualTo("MethodWithParams(10,20)"));
+ Assert.That(testcase.TestName.FullName, Is.EqualTo(instance.TestName.FullName + ".MethodWithParams(10,20)"));
+ }
+
+ //[Test]
+ //public void M
}
}
=== added file 'src/tests/test-assembly/ParameterizedTestFixture.cs'
--- src/tests/test-assembly/ParameterizedTestFixture.cs 1970-01-01 00:00:00 +0000
+++ src/tests/test-assembly/ParameterizedTestFixture.cs 2009-08-17 01:31:21 +0000
@@ -0,0 +1,20 @@
+using System;
+using NUnit.Framework;
+
+namespace NUnit.TestData
+{
+ [TestFixture(1)]
+ [TestFixture(2)]
+ public class ParameterizedTestFixture
+ {
+ [Test]
+ public void MethodWithoutParams()
+ {
+ }
+
+ [TestCase(10,20)]
+ public void MethodWithParams(int x, int y)
+ {
+ }
+ }
+}
=== modified file 'src/tests/test-assembly/test-assembly.build'
--- src/tests/test-assembly/test-assembly.build 2009-04-22 01:21:06 +0000
+++ src/tests/test-assembly/test-assembly.build 2009-08-17 01:31:21 +0000
@@ -1,63 +1,64 @@
-<?xml version="1.0"?>
-<project name="TestAssembly" default="build" basedir=".">
-
- <patternset id="source-files">
- <include name="AttributeDescriptionTests.cs"/>
- <include name="AttributeInheritance.cs"/>
- <include name="CategoryAttributeTests.cs"/>
- <include name="ConsoleRunnerTest.cs"/>
- <include name="CultureAttributeTests.cs"/>
- <include name="ExpectExceptionTest.cs"/>
- <include name="FailFixtureTests.cs"/>
- <include name="FixtureSetUpTearDownTests.cs"/>
- <include name="IgnoreFixtureTests.cs"/>
- <include name="MaxTimeFixture.cs"/>
- <include name="ParameterizedTestMethodFixture.cs"/>
- <include name="PropertyAttributeTests.cs"/>
- <include name="RepeatedTestFixtureTests.cs"/>
- <include name="SetupFixtureTests.cs"/>
- <include name="SetUpTest.cs"/>
- <include name="SuiteBuilderTests.cs"/>
- <include name="TestCaseAttributeFixture.cs"/>
- <include name="TestCaseSourceAttributeFixture.cs"/>
- <include name="TestCaseTest.cs"/>
- <include name="TestData.cs"/>
- <include name="TestFixtureBuilderTests.cs"/>
- <include name="TestFixtureExtensionTests.cs"/>
- <include name="TestFixtureTests.cs"/>
- <include name="TestMethodSignatureFixture.cs"/>
- <include name="TheoryFixture.cs"/>
- <include name="ThreadingFixture.cs"/>
- <include name="UnhandledExceptions.cs"/>
- </patternset>
-
- <target name="build">
- <csc target="library"
- output="${current.test.dir}/test-assembly.dll"
- debug="${build.debug}" define="${build.defines}">
- <sources>
- <patternset refid="source-files"/>
- <include name="../../GeneratedAssemblyInfo.cs"/>
- </sources>
- <nowarn>
- <warning number="618,672"/>
- </nowarn>
- <references>
- <include name="${current.framework.dir}/nunit.framework.dll"/>
- <include name="${current.framework.dir}/nunit.framework.extensions.dll"/>
- <include name="${current.lib.dir}/nunit.core.interfaces.dll"/>
- <include name="${current.lib.dir}/nunit.core.dll"/>
- </references>
- </csc>
- </target>
-
- <target name="package">
- <copy todir="${package.src.dir}/tests/test-assembly">
- <fileset>
- <patternset refid="source-files" />
- <include name="test-assembly.build"/>
- </fileset>
- </copy>
- </target>
-
+<?xml version="1.0"?>
+<project name="TestAssembly" default="build" basedir=".">
+
+ <patternset id="source-files">
+ <include name="AttributeDescriptionTests.cs"/>
+ <include name="AttributeInheritance.cs"/>
+ <include name="CategoryAttributeTests.cs"/>
+ <include name="ConsoleRunnerTest.cs"/>
+ <include name="CultureAttributeTests.cs"/>
+ <include name="ExpectExceptionTest.cs"/>
+ <include name="FailFixtureTests.cs"/>
+ <include name="FixtureSetUpTearDownTests.cs"/>
+ <include name="IgnoreFixtureTests.cs"/>
+ <include name="MaxTimeFixture.cs"/>
+ <include name="ParameterizedTestFixture.cs"/>
+ <include name="ParameterizedTestMethodFixture.cs"/>
+ <include name="PropertyAttributeTests.cs"/>
+ <include name="RepeatedTestFixtureTests.cs"/>
+ <include name="SetupFixtureTests.cs"/>
+ <include name="SetUpTest.cs"/>
+ <include name="SuiteBuilderTests.cs"/>
+ <include name="TestCaseAttributeFixture.cs"/>
+ <include name="TestCaseSourceAttributeFixture.cs"/>
+ <include name="TestCaseTest.cs"/>
+ <include name="TestData.cs"/>
+ <include name="TestFixtureBuilderTests.cs"/>
+ <include name="TestFixtureExtensionTests.cs"/>
+ <include name="TestFixtureTests.cs"/>
+ <include name="TestMethodSignatureFixture.cs"/>
+ <include name="TheoryFixture.cs"/>
+ <include name="ThreadingFixture.cs"/>
+ <include name="UnhandledExceptions.cs"/>
+ </patternset>
+
+ <target name="build">
+ <csc target="library"
+ output="${current.test.dir}/test-assembly.dll"
+ debug="${build.debug}" define="${build.defines}">
+ <sources>
+ <patternset refid="source-files"/>
+ <include name="../../GeneratedAssemblyInfo.cs"/>
+ </sources>
+ <nowarn>
+ <warning number="618,672"/>
+ </nowarn>
+ <references>
+ <include name="${current.framework.dir}/nunit.framework.dll"/>
+ <include name="${current.framework.dir}/nunit.framework.extensions.dll"/>
+ <include name="${current.lib.dir}/nunit.core.interfaces.dll"/>
+ <include name="${current.lib.dir}/nunit.core.dll"/>
+ </references>
+ </csc>
+ </target>
+
+ <target name="package">
+ <copy todir="${package.src.dir}/tests/test-assembly">
+ <fileset>
+ <patternset refid="source-files" />
+ <include name="test-assembly.build"/>
+ </fileset>
+ </copy>
+ </target>
+
</project>
\ No newline at end of file
