nunit-core team mailing list archive
-
nunit-core team
-
Mailing list archive
-
Message #01757
[Merge] lp:~saidout/nunit-3.0/constraint-class-refactoring into lp:nunit-3.0
Said Outgajjouft has proposed merging lp:~saidout/nunit-3.0/constraint-class-refactoring into lp:nunit-3.0.
Requested reviews:
NUnit Core Developers (nunit-core)
For more details, see:
https://code.launchpad.net/~saidout/nunit-3.0/constraint-class-refactoring/+merge/63479
Change signature of Matches to return IConstraintResult.
Added one class StandardConstraintResult.cs to the Constraint folder.
Note that this has only been done for the NUnitFrameworkVS2010.sln solution located in the \src\NUnitFramework folder.
--
https://code.launchpad.net/~saidout/nunit-3.0/constraint-class-refactoring/+merge/63479
Your team NUnit Core Developers is requested to review the proposed merge of lp:~saidout/nunit-3.0/constraint-class-refactoring into lp:nunit-3.0.
=== added file 'src/NUnitFramework/framework/Constraints/IConstraintResult.cs'
--- src/NUnitFramework/framework/Constraints/IConstraintResult.cs 1970-01-01 00:00:00 +0000
+++ src/NUnitFramework/framework/Constraints/IConstraintResult.cs 2011-06-04 22:55:51 +0000
@@ -0,0 +1,105 @@
+// ***********************************************************************
+// Copyright (c) 2011 Charlie Poole
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+// ***********************************************************************
+
+namespace NUnit.Framework.Constraints
+{
+
+ /// <summary>
+ /// Contain the result of <see cref="Constraint.Matches(object)"/> executed against an actual value.
+ /// </summary>
+ public interface IConstraintResult
+ {
+ /// <summary>
+ /// True if actual value meets the Constraint criteria otherwise false.
+ /// </summary>
+ bool HasSucceeded { get; }
+
+ /// <summary>
+ /// The actual value that were passed to the <see cref="Constraint.Matches(object)"/> method.
+ /// </summary>
+ object Actual { get; }
+
+ /// <summary>
+ /// The expected criteria the Constraint matches the actual value against.
+ /// </summary>
+ object Expected { get; }
+
+ #region Constraint Information
+
+ /// <summary>
+ /// Display friendly name of the constraint.
+ /// </summary>
+ string Name { get; }
+
+ /// <summary>
+ /// Description of the constraint may be affected by the state the constraint hade
+ /// when <see cref="Constraint.Matches(object)"/> was performed against the actual value.
+ /// </summary>
+ string Description { get; }
+
+ /// <summary>
+ /// Predicate that were used when <see cref="Constraint.Matches(object)"/> was performed,
+ /// set to empty string if no predicate were used.
+ /// </summary>
+ string Predicate { get; }
+
+ /// <summary>
+ /// Modifier that were used when <see cref="Constraint.Matches(object)"/> was performed,
+ /// set to empty string if no modifier were used.
+ /// </summary>
+ string Modifier { get; }
+
+ #endregion
+
+ #region Write Methods
+
+ /// <summary>
+ /// Write the constraint description to a MessageWriter
+ /// </summary>
+ /// <param name="writer">The writer on which the description is displayed</param>
+ void WriteDescriptionTo(MessageWriter writer);
+
+ /// <summary>
+ /// Write the failure message to the MessageWriter provided
+ /// as an argument. The default implementation simply passes
+ /// the constraint and the actual value to the writer, which
+ /// then displays the constraint description and the value.
+ ///
+ /// Constraints that need to provide additional details,
+ /// such as where the error occured can override this.
+ /// </summary>
+ /// <param name="writer">The MessageWriter on which to display the message</param>
+ void WriteMessageTo(MessageWriter writer);
+
+ /// <summary>
+ /// Write the actual value for a failing constraint test to a
+ /// MessageWriter. The default implementation simply writes
+ /// the raw value of actual, leaving it to the writer to
+ /// perform any formatting.
+ /// </summary>
+ /// <param name="writer">The writer on which the actual value is displayed</param>
+ void WriteActualValueTo(MessageWriter writer);
+
+ #endregion
+ }
+}
=== modified file 'src/NUnitFramework/framework/nunit.framework-vs2010.csproj'
--- src/NUnitFramework/framework/nunit.framework-vs2010.csproj 2011-06-04 16:54:09 +0000
+++ src/NUnitFramework/framework/nunit.framework-vs2010.csproj 2011-06-04 22:55:51 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<PropertyGroup>
@@ -40,12 +41,57 @@
<DocumentationFile>..\..\..\bin\Release\nunit.framework.xml</DocumentationFile>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+=======
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{12B66B03-90F1-4992-BD33-BDF3C69AE49E}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>NUnit.Framework</RootNamespace>
+ <AssemblyName>nunit.framework</AssemblyName>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ <SignAssembly>true</SignAssembly>
+ <AssemblyOriginatorKeyFile>nunit.snk</AssemblyOriginatorKeyFile>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\bin\Debug\</OutputPath>
+ <DefineConstants>TRACE;DEBUG;NET_3_5;CLR_2_0</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <DocumentationFile>..\..\..\bin\Debug\nunit.framework.xml</DocumentationFile>
+ <NoWarn>1699</NoWarn>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>..\..\..\bin\Release\</OutputPath>
+ <DefineConstants>TRACE;NET_3_5;CLR_2_0</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <DocumentationFile>..\..\..\bin\Release\nunit.framework.xml</DocumentationFile>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+>>>>>>> MERGE-SOURCE
<!-- 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">
</Target>
<Target Name="AfterBuild">
</Target>
+<<<<<<< TREE
-->
<ItemGroup>
<None Include="nunit.snk" />
@@ -344,4 +390,308 @@
<Reference Include="System.Configuration" />
<Reference Include="System.Xml" />
</ItemGroup>
+=======
+ -->
+ <ItemGroup>
+ <None Include="nunit.snk" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="..\CommonAssemblyInfo.cs">
+ <Link>CommonAssemblyInfo.cs</Link>
+ </Compile>
+ <Compile Include="Api\IApplyToTest.cs" />
+ <Compile Include="Api\IParameterDataSource.cs" />
+ <Compile Include="Api\IPropertyBag.cs" />
+ <Compile Include="Api\IPropertySet.cs" />
+ <Compile Include="Api\ITest.cs" />
+ <Compile Include="Api\ITestAssemblyBuilder.cs" />
+ <Compile Include="Api\ITestAssemblyRunner.cs" />
+ <Compile Include="Api\ITestCaseData.cs" />
+ <Compile Include="Api\ITestCaseSource.cs" />
+ <Compile Include="Api\ITestCaseSourceProvider.cs" />
+ <Compile Include="Api\ITestFilter.cs" />
+ <Compile Include="Api\ITestListener.cs" />
+ <Compile Include="Api\ITestResult.cs" />
+ <Compile Include="Api\IXmlNodeBuilder.cs" />
+ <Compile Include="Api\PropertyEntry.cs" />
+ <Compile Include="Api\PropertyNames.cs" />
+ <Compile Include="Api\ResultState.cs" />
+ <Compile Include="Api\RunState.cs" />
+ <Compile Include="Api\TestController.cs" />
+ <Compile Include="Api\TestOutput.cs" />
+ <Compile Include="Api\TestStatus.cs" />
+ <Compile Include="AssemblyInfo.cs" />
+ <Compile Include="Assert.cs" />
+ <Compile Include="AssertionHelper.cs" />
+ <Compile Include="Assume.cs" />
+ <Compile Include="Attributes\CategoryAttribute.cs" />
+ <Compile Include="Attributes\CombinatorialAttribute.cs" />
+ <Compile Include="Attributes\CultureAttribute.cs" />
+ <Compile Include="Attributes\DataAttribute.cs" />
+ <Compile Include="Attributes\DatapointAttribute.cs" />
+ <Compile Include="Attributes\DatapointsAttribute.cs" />
+ <Compile Include="Attributes\DatapointSourceAttribute.cs" />
+ <Compile Include="Attributes\DescriptionAttribute.cs" />
+ <Compile Include="Attributes\ExpectedExceptionAttribute.cs" />
+ <Compile Include="Attributes\ExplicitAttribute.cs" />
+ <Compile Include="Attributes\IgnoreAttribute.cs" />
+ <Compile Include="Attributes\IncludeExcludeAttribute.cs" />
+ <Compile Include="Attributes\MaxTimeAttribute.cs" />
+ <Compile Include="Attributes\NUnitAttribute.cs" />
+ <Compile Include="Attributes\PairwiseAttribute.cs" />
+ <Compile Include="Attributes\PlatformAttribute.cs" />
+ <Compile Include="Attributes\PropertyAttribute.cs" />
+ <Compile Include="Attributes\RandomAttribute.cs" />
+ <Compile Include="Attributes\RangeAttribute.cs" />
+ <Compile Include="Attributes\RepeatAttribute.cs" />
+ <Compile Include="Attributes\RequiredAddinAttribute.cs" />
+ <Compile Include="Attributes\RequiresMTAAtribute.cs" />
+ <Compile Include="Attributes\RequiresSTAAttribute.cs" />
+ <Compile Include="Attributes\RequiresThreadAttribute.cs" />
+ <Compile Include="Attributes\SequentialAttribute.cs" />
+ <Compile Include="Attributes\SetCultureAttribute.cs" />
+ <Compile Include="Attributes\SetUICultureAttribute.cs" />
+ <Compile Include="Attributes\SetUpAttribute.cs" />
+ <Compile Include="Attributes\SetUpFixtureAttribute.cs" />
+ <Compile Include="Attributes\SuiteAttribute.cs" />
+ <Compile Include="Attributes\TearDownAttribute.cs" />
+ <Compile Include="Attributes\TestAttribute.cs" />
+ <Compile Include="Attributes\TestCaseAttribute.cs" />
+ <Compile Include="Attributes\TestCaseSourceAttribute.cs" />
+ <Compile Include="Attributes\TestFixtureAttribute.cs" />
+ <Compile Include="Attributes\TestFixtureSetUpAttribute.cs" />
+ <Compile Include="Attributes\TestFixtureTearDownAttribute.cs" />
+ <Compile Include="Attributes\TestModificationAttribute.cs" />
+ <Compile Include="Attributes\TheoryAttribute.cs" />
+ <Compile Include="Attributes\TimeoutAttribute.cs" />
+ <Compile Include="Attributes\ValuesAttribute.cs" />
+ <Compile Include="Attributes\ValueSourceAttribute.cs" />
+ <Compile Include="CollectionAssert.cs" />
+ <Compile Include="Constraints\AllItemsConstraint.cs" />
+ <Compile Include="Constraints\AndConstraint.cs" />
+ <Compile Include="Constraints\AssignableFromConstraint.cs" />
+ <Compile Include="Constraints\AssignableToConstraint.cs" />
+ <Compile Include="Constraints\AttributeConstraint.cs" />
+ <Compile Include="Constraints\AttributeExistsConstraint.cs" />
+ <Compile Include="Constraints\BasicConstraint.cs" />
+ <Compile Include="Constraints\BinaryConstraint.cs" />
+ <Compile Include="Constraints\BinarySerializableConstraint.cs" />
+ <Compile Include="Constraints\CollectionConstraint.cs" />
+ <Compile Include="Constraints\CollectionContainsConstraint.cs" />
+ <Compile Include="Constraints\CollectionEquivalentConstraint.cs" />
+ <Compile Include="Constraints\CollectionItemsEqualConstraint.cs" />
+ <Compile Include="Constraints\CollectionOrderedConstraint.cs" />
+ <Compile Include="Constraints\CollectionSubsetConstraint.cs" />
+ <Compile Include="Constraints\CollectionTally.cs" />
+ <Compile Include="Constraints\ComparisonAdapter.cs" />
+ <Compile Include="Constraints\ComparisonConstraint.cs" />
+ <Compile Include="Constraints\Constraint.cs" />
+ <Compile Include="Constraints\ConstraintBuilder.cs" />
+ <Compile Include="Constraints\ConstraintExpression.cs" />
+ <Compile Include="Constraints\ConstraintExpressionBase.cs" />
+ <Compile Include="Constraints\ConstraintFactory.cs" />
+ <Compile Include="Constraints\IConstraintResult.cs" />
+ <Compile Include="Constraints\ContainsConstraint.cs" />
+ <Compile Include="Constraints\DelayedConstraint.cs" />
+ <Compile Include="Constraints\EmptyCollectionConstraint.cs" />
+ <Compile Include="Constraints\EmptyConstraint.cs" />
+ <Compile Include="Constraints\EmptyDirectoryConstraint.cs" />
+ <Compile Include="Constraints\EmptyStringConstraint.cs" />
+ <Compile Include="Constraints\EndsWithConstraint.cs" />
+ <Compile Include="Constraints\EqualConstraint.cs" />
+ <Compile Include="Constraints\EqualityAdapter.cs" />
+ <Compile Include="Constraints\ExactTypeConstraint.cs" />
+ <Compile Include="Constraints\FalseConstraint.cs" />
+ <Compile Include="Constraints\FloatingPointNumerics.cs" />
+ <Compile Include="Constraints\GreaterThanConstraint.cs" />
+ <Compile Include="Constraints\GreaterThanOrEqualConstraint.cs" />
+ <Compile Include="Constraints\InstanceOfTypeConstraint.cs" />
+ <Compile Include="Constraints\IResolveConstraint.cs" />
+ <Compile Include="Constraints\LessThanConstraint.cs" />
+ <Compile Include="Constraints\LessThanOrEqualConstraint.cs" />
+ <Compile Include="Constraints\MessageWriter.cs" />
+ <Compile Include="Constraints\MsgUtils.cs" />
+ <Compile Include="Constraints\NaNConstraint.cs" />
+ <Compile Include="Constraints\NoItemConstraint.cs" />
+ <Compile Include="Constraints\NotConstraint.cs" />
+ <Compile Include="Constraints\NullConstraint.cs" />
+ <Compile Include="Constraints\NullOrEmptyStringConstraint.cs" />
+ <Compile Include="Constraints\Numerics.cs" />
+ <Compile Include="Constraints\NUnitComparer.cs" />
+ <Compile Include="Constraints\NUnitEqualityComparer.cs" />
+ <Compile Include="Constraints\Operators\AndOperator.cs" />
+ <Compile Include="Constraints\Operators\AttributeOperator.cs" />
+ <Compile Include="Constraints\Operators\BinaryOperator.cs" />
+ <Compile Include="Constraints\Operators\CollectionOperator.cs" />
+ <Compile Include="Constraints\Operators\ConstraintOperator.cs" />
+ <Compile Include="Constraints\Operators\NotOperator.cs" />
+ <Compile Include="Constraints\Operators\OrOperator.cs" />
+ <Compile Include="Constraints\Operators\PrefixOperator.cs" />
+ <Compile Include="Constraints\Operators\PropOperator.cs" />
+ <Compile Include="Constraints\Operators\SelfResolvingOperator.cs" />
+ <Compile Include="Constraints\Operators\ThrowsOperator.cs" />
+ <Compile Include="Constraints\Operators\WithOperator.cs" />
+ <Compile Include="Constraints\OrConstraint.cs" />
+ <Compile Include="Constraints\PathConstraint.cs" />
+ <Compile Include="Constraints\PredicateConstraint.cs" />
+ <Compile Include="Constraints\PrefixConstraint.cs" />
+ <Compile Include="Constraints\PropertyConstraint.cs" />
+ <Compile Include="Constraints\PropertyExistsConstraint.cs" />
+ <Compile Include="Constraints\RangeConstraint.cs" />
+ <Compile Include="Constraints\RegexConstraint.cs" />
+ <Compile Include="Constraints\ResolvableConstraintExpression.cs" />
+ <Compile Include="Constraints\ReusableConstraint.cs" />
+ <Compile Include="Constraints\SameAsConstraint.cs" />
+ <Compile Include="Constraints\SamePathConstraint.cs" />
+ <Compile Include="Constraints\SamePathOrUnderConstraint.cs" />
+ <Compile Include="Constraints\SomeItemsConstraint.cs" />
+ <Compile Include="Constraints\StartsWithConstraint.cs" />
+ <Compile Include="Constraints\StringConstraint.cs" />
+ <Compile Include="Constraints\SubstringConstraint.cs" />
+ <Compile Include="Constraints\ThrowsConstraint.cs" />
+ <Compile Include="Constraints\ThrowsNothingConstraint.cs" />
+ <Compile Include="Constraints\Tolerance.cs" />
+ <Compile Include="Constraints\ToleranceMode.cs" />
+ <Compile Include="Constraints\TrueConstraint.cs" />
+ <Compile Include="Constraints\TypeConstraint.cs" />
+ <Compile Include="Constraints\UniqueItemsConstraint.cs" />
+ <Compile Include="Constraints\XmlSerializableConstraint.cs" />
+ <Compile Include="Contains.cs" />
+ <Compile Include="Env.cs" />
+ <Compile Include="Exceptions\AssertionException.cs" />
+ <Compile Include="Exceptions\IgnoreException.cs" />
+ <Compile Include="Exceptions\InconclusiveException.cs" />
+ <Compile Include="Exceptions\SuccessException.cs" />
+ <Compile Include="Extensibility\Addin.cs" />
+ <Compile Include="Extensibility\AddinStatus.cs" />
+ <Compile Include="Extensibility\ExtensionType.cs" />
+ <Compile Include="Extensibility\IAddin.cs" />
+ <Compile Include="Extensibility\IAddinRegistry.cs" />
+ <Compile Include="Extensibility\IExtensionHost.cs" />
+ <Compile Include="Extensibility\IExtensionPoint.cs" />
+ <Compile Include="Extensibility\IParameterDataProvider.cs" />
+ <Compile Include="Extensibility\ISuiteBuilder.cs" />
+ <Compile Include="Extensibility\ITestCaseBuilder.cs" />
+ <Compile Include="Extensibility\ITestCaseProvider.cs" />
+ <Compile Include="Extensibility\ITestDecorator.cs" />
+ <Compile Include="Extensibility\NUnitAddinAttribute.cs" />
+ <Compile Include="Extensibility\TestFramework.cs" />
+ <Compile Include="FileAssert.cs" />
+ <Compile Include="GlobalSettings.cs" />
+ <Compile Include="Has.cs" />
+ <Compile Include="IExpectException.cs" />
+ <Compile Include="Internal\AssemblyHelper.cs" />
+ <Compile Include="Internal\AssemblyReader.cs" />
+ <Compile Include="Internal\AsyncResult.cs" />
+ <Compile Include="Internal\Builders\CombinatorialStrategy.cs" />
+ <Compile Include="Internal\Builders\CombinatorialTestCaseProvider.cs" />
+ <Compile Include="Internal\Builders\CombiningStrategy.cs" />
+ <Compile Include="Internal\Builders\DataAttributeTestCaseProvider.cs" />
+ <Compile Include="Internal\Builders\DatapointProvider.cs" />
+ <Compile Include="Internal\Builders\LegacySuiteBuilder.cs" />
+ <Compile Include="Internal\Builders\NUnitTestCaseBuilder.cs" />
+ <Compile Include="Internal\Builders\NUnitTestFixtureBuilder.cs" />
+ <Compile Include="Internal\Builders\PairwiseStrategy.cs" />
+ <Compile Include="Internal\Builders\ParameterDataProvider.cs" />
+ <Compile Include="Internal\Builders\ProviderCache.cs" />
+ <Compile Include="Internal\Builders\SequentialStrategy.cs" />
+ <Compile Include="Internal\Builders\SetUpFixtureBuilder.cs" />
+ <Compile Include="Internal\Commands\CommandBuilder.cs" />
+ <Compile Include="Internal\Commands\DelegatingTestCommand.cs" />
+ <Compile Include="Internal\Commands\ExpectedExceptionCommand.cs" />
+ <Compile Include="Internal\Commands\ITestCommand.cs" />
+ <Compile Include="Internal\Commands\MaxTimeCommand.cs" />
+ <Compile Include="Internal\Commands\RepeatedTestCommand.cs" />
+ <Compile Include="Internal\Commands\SetUpTearDownCommand.cs" />
+ <Compile Include="Internal\Commands\SkipCommand.cs" />
+ <Compile Include="Internal\Commands\TestCaseCommand.cs" />
+ <Compile Include="Internal\Commands\TestCommand.cs" />
+ <Compile Include="Internal\Commands\TestExecutionContextCommand.cs" />
+ <Compile Include="Internal\Commands\TestMethodCommand.cs" />
+ <Compile Include="Internal\Commands\TestSuiteCommand.cs" />
+ <Compile Include="Internal\Commands\ThreadedTestCommand.cs" />
+ <Compile Include="Internal\CoreExtensions.cs" />
+ <Compile Include="Internal\CultureDetector.cs" />
+ <Compile Include="Internal\DefaultTestAssemblyBuilder.cs" />
+ <Compile Include="Internal\DefaultTestAssemblyRunner.cs" />
+ <Compile Include="Internal\DirectorySwapper.cs" />
+ <Compile Include="Internal\EventListenerTextWriter.cs" />
+ <Compile Include="Internal\EventPump.cs" />
+ <Compile Include="Internal\EventQueue.cs" />
+ <Compile Include="Internal\ExceptionHelper.cs" />
+ <Compile Include="Internal\ExpectedExceptionProcessor.cs" />
+ <Compile Include="Internal\Extensibility\EventListenerCollection.cs" />
+ <Compile Include="Internal\Extensibility\ExtensionHost.cs" />
+ <Compile Include="Internal\Extensibility\ExtensionPoint.cs" />
+ <Compile Include="Internal\Extensibility\ExtensionsCollection.cs" />
+ <Compile Include="Internal\Extensibility\ParameterDataProviders.cs" />
+ <Compile Include="Internal\Extensibility\SuiteBuilderCollection.cs" />
+ <Compile Include="Internal\Extensibility\TestCaseBuilderCollection.cs" />
+ <Compile Include="Internal\Extensibility\TestCaseProviders.cs" />
+ <Compile Include="Internal\Extensibility\TestDecoratorCollection.cs" />
+ <Compile Include="Internal\Filters\SimpleNameFilter.cs" />
+ <Compile Include="Internal\InternalTrace.cs" />
+ <Compile Include="Internal\InvalidTestFixtureException.cs" />
+ <Compile Include="Internal\Log4NetCapture.cs" />
+ <Compile Include="Internal\LogCapture.cs" />
+ <Compile Include="Internal\MethodHelper.cs" />
+ <Compile Include="Internal\NamespaceTreeBuilder.cs" />
+ <Compile Include="Internal\NUnitException.cs" />
+ <Compile Include="Internal\OSPlatform.cs" />
+ <Compile Include="Internal\ParameterSet.cs" />
+ <Compile Include="Internal\PlatformHelper.cs" />
+ <Compile Include="Internal\PropertyBag.cs" />
+ <Compile Include="Internal\PropertySet.cs" />
+ <Compile Include="Internal\QueuingEventListener.cs" />
+ <Compile Include="Internal\Randomizer.cs" />
+ <Compile Include="Internal\Reflect.cs" />
+ <Compile Include="Internal\Results\TestResult.cs" />
+ <Compile Include="Internal\RuntimeFramework.cs" />
+ <Compile Include="Internal\TestExecutionContext.cs" />
+ <Compile Include="Internal\TestFilter.cs" />
+ <Compile Include="Internal\TestFixtureBuilder.cs" />
+ <Compile Include="Internal\TestListener.cs" />
+ <Compile Include="Internal\TestProgressReporter.cs" />
+ <Compile Include="Internal\Tests\LegacySuite.cs" />
+ <Compile Include="Internal\Tests\ParameterizedFixtureSuite.cs" />
+ <Compile Include="Internal\Tests\ParameterizedMethodSuite.cs" />
+ <Compile Include="Internal\Tests\SetUpFixture.cs" />
+ <Compile Include="Internal\Tests\Test.cs" />
+ <Compile Include="Internal\Tests\TestAssembly.cs" />
+ <Compile Include="Internal\Tests\TestFixture.cs" />
+ <Compile Include="Internal\Tests\TestMethod.cs" />
+ <Compile Include="Internal\Tests\TestSuite.cs" />
+ <Compile Include="Internal\TextCapture.cs" />
+ <Compile Include="Internal\TextMessageWriter.cs" />
+ <Compile Include="Internal\TypeHelper.cs" />
+ <Compile Include="Internal\XmlHelper.cs" />
+ <Compile Include="Is.cs" />
+ <Compile Include="Iz.cs" />
+ <Compile Include="List.cs" />
+ <Compile Include="ListMapper.cs" />
+ <Compile Include="MessageMatch.cs" />
+ <Compile Include="ObjectList.cs" />
+ <Compile Include="SpecialValue.cs" />
+ <Compile Include="StringAssert.cs" />
+ <Compile Include="TestCaseData.cs" />
+ <Compile Include="TestContext.cs" />
+ <Compile Include="Throws.cs" />
+ <Compile Include="Internal\Results\TestCaseResult.cs" />
+ <Compile Include="Internal\Results\TestSuiteResult.cs" />
+ <None Include="nunit.framework.build" />
+ <None Include="nunitlite.build" />
+ </ItemGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Core">
+ <RequiredTargetFramework>3.5</RequiredTargetFramework>
+ </Reference>
+ <Reference Include="System.Data" />
+ <Reference Include="System.Configuration" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Content Include="SyntaxElements.txt" />
+ </ItemGroup>
+>>>>>>> MERGE-SOURCE
</Project>
\ No newline at end of file
