Skip to content

Commit

Permalink
Reorganize directory structure to put files for NUnitLite and full NU…
Browse files Browse the repository at this point in the history
…nit and files shared by both in separate directories.

--HG--
branch : nunitlite
rename : src/framework/Framework/Assume.cs => src/framework/NUnit/Framework/Assume.cs
rename : src/framework/Framework/CategoryAttribute.cs => src/framework/NUnit/Framework/CategoryAttribute.cs
rename : src/framework/Framework/CollectionAssert.cs => src/framework/NUnit/Framework/CollectionAssert.cs
rename : src/framework/Framework/Constraints/DelayedConstraint.cs => src/framework/NUnit/Framework/Constraints/DelayedConstraint.cs
rename : src/framework/Framework/Constraints/DirectoryConstraints.cs => src/framework/NUnit/Framework/Constraints/DirectoryConstraints.cs
rename : src/framework/Framework/Constraints/PredicateConstraint.cs => src/framework/NUnit/Framework/Constraints/PredicateConstraint.cs
rename : src/framework/Framework/DatapointAttributes.cs => src/framework/NUnit/Framework/DatapointAttributes.cs
rename : src/framework/Framework/DirectoryAssert.cs => src/framework/NUnit/Framework/DirectoryAssert.cs
rename : src/framework/Framework/ExplicitAttribute.cs => src/framework/NUnit/Framework/ExplicitAttribute.cs
rename : src/framework/Framework/FileAssert.cs => src/framework/NUnit/Framework/FileAssert.cs
rename : src/framework/Framework/IgnoreException.cs => src/framework/NUnit/Framework/IgnoreException.cs
rename : src/framework/Framework/IncludeExcludeAttributes.cs => src/framework/NUnit/Framework/IncludeExcludeAttributes.cs
rename : src/framework/Framework/InconclusiveException.cs => src/framework/NUnit/Framework/InconclusiveException.cs
rename : src/framework/Framework/Iz.cs => src/framework/NUnit/Framework/Iz.cs
rename : src/framework/Framework/JoinTypeAttributes.cs => src/framework/NUnit/Framework/JoinTypeAttributes.cs
rename : src/framework/Framework/List.cs => src/framework/NUnit/Framework/List.cs
rename : src/framework/Framework/MaxTimeAttribute.cs => src/framework/NUnit/Framework/MaxTimeAttribute.cs
rename : src/framework/Framework/RandomAttribute.cs => src/framework/NUnit/Framework/RandomAttribute.cs
rename : src/framework/Framework/Randomizer.cs => src/framework/NUnit/Framework/Randomizer.cs
rename : src/framework/Framework/RangeAttribute.cs => src/framework/NUnit/Framework/RangeAttribute.cs
rename : src/framework/Framework/RepeatAttribute.cs => src/framework/NUnit/Framework/RepeatAttribute.cs
rename : src/framework/Framework/RequiredAddinAttribute.cs => src/framework/NUnit/Framework/RequiredAddinAttribute.cs
rename : src/framework/Framework/SetCultureAttribute.cs => src/framework/NUnit/Framework/SetCultureAttribute.cs
rename : src/framework/Framework/SetUICultureAttribute.cs => src/framework/NUnit/Framework/SetUICultureAttribute.cs
rename : src/framework/Framework/SetUpFixtureAttribute.cs => src/framework/NUnit/Framework/SetUpFixtureAttribute.cs
rename : src/framework/Framework/StringAssert.cs => src/framework/NUnit/Framework/StringAssert.cs
rename : src/framework/Framework/SuccessException.cs => src/framework/NUnit/Framework/SuccessException.cs
rename : src/framework/Framework/SuiteAttribute.cs => src/framework/NUnit/Framework/SuiteAttribute.cs
rename : src/framework/Framework/TestFixtureSetUpAttribute.cs => src/framework/NUnit/Framework/TestFixtureSetUpAttribute.cs
rename : src/framework/Framework/TestFixtureTearDownAttribute.cs => src/framework/NUnit/Framework/TestFixtureTearDownAttribute.cs
rename : src/framework/Framework/Text.cs => src/framework/NUnit/Framework/Text.cs
rename : src/framework/Framework/TheoryAttribute.cs => src/framework/NUnit/Framework/TheoryAttribute.cs
rename : src/framework/Framework/ThreadingAttributes.cs => src/framework/NUnit/Framework/ThreadingAttributes.cs
rename : src/framework/Framework/ValueSourceAttribute.cs => src/framework/NUnit/Framework/ValueSourceAttribute.cs
rename : src/framework/Framework/ValuesAttribute.cs => src/framework/NUnit/Framework/ValuesAttribute.cs
rename : src/framework/Framework/Contains.cs => src/framework/NUnitLite/Framework/Contains.cs
rename : src/framework/Framework/Assert.cs => src/framework/Shared/Framework/Assert.cs
rename : src/framework/Framework/AssertionException.cs => src/framework/Shared/Framework/AssertionException.cs
rename : src/framework/Framework/AssertionHelper.cs => src/framework/Shared/Framework/AssertionHelper.cs
rename : src/framework/Framework/Constraints/AttributeConstraints.cs => src/framework/Shared/Framework/Constraints/AttributeConstraints.cs
rename : src/framework/Framework/Constraints/BasicConstraints.cs => src/framework/Shared/Framework/Constraints/BasicConstraints.cs
rename : src/framework/Framework/Constraints/BinaryOperations.cs => src/framework/Shared/Framework/Constraints/BinaryOperations.cs
rename : src/framework/Framework/Constraints/BinarySerializableConstraint.cs => src/framework/Shared/Framework/Constraints/BinarySerializableConstraint.cs
rename : src/framework/Framework/Constraints/CollectionConstraints.cs => src/framework/Shared/Framework/Constraints/CollectionConstraints.cs
rename : src/framework/Framework/Constraints/ComparisonAdapter.cs => src/framework/Shared/Framework/Constraints/ComparisonAdapter.cs
rename : src/framework/Framework/Constraints/ComparisonConstraints.cs => src/framework/Shared/Framework/Constraints/ComparisonConstraints.cs
rename : src/framework/Framework/Constraints/Constraint.cs => src/framework/Shared/Framework/Constraints/Constraint.cs
rename : src/framework/Framework/Constraints/ConstraintBuilder.cs => src/framework/Shared/Framework/Constraints/ConstraintBuilder.cs
rename : src/framework/Framework/Constraints/ConstraintExpression.cs => src/framework/Shared/Framework/Constraints/ConstraintExpression.cs
rename : src/framework/Framework/Constraints/ConstraintExpressionBase.cs => src/framework/Shared/Framework/Constraints/ConstraintExpressionBase.cs
rename : src/framework/Framework/Constraints/ConstraintFactory.cs => src/framework/Shared/Framework/Constraints/ConstraintFactory.cs
rename : src/framework/Framework/Constraints/ConstraintOperators.cs => src/framework/Shared/Framework/Constraints/ConstraintOperators.cs
rename : src/framework/Framework/Constraints/ContainsConstraint.cs => src/framework/Shared/Framework/Constraints/ContainsConstraint.cs
rename : src/framework/Framework/Constraints/EmptyConstraint.cs => src/framework/Shared/Framework/Constraints/EmptyConstraint.cs
rename : src/framework/Framework/Constraints/EqualConstraint.cs => src/framework/Shared/Framework/Constraints/EqualConstraint.cs
rename : src/framework/Framework/Constraints/EqualityAdapter.cs => src/framework/Shared/Framework/Constraints/EqualityAdapter.cs
rename : src/framework/Framework/Constraints/FloatingPointNumerics.cs => src/framework/Shared/Framework/Constraints/FloatingPointNumerics.cs
rename : src/framework/Framework/Constraints/IResolveConstraint.cs => src/framework/Shared/Framework/Constraints/IResolveConstraint.cs
rename : src/framework/Framework/Constraints/MessageWriter.cs => src/framework/Shared/Framework/Constraints/MessageWriter.cs
rename : src/framework/Framework/Constraints/MsgUtils.cs => src/framework/Shared/Framework/Constraints/MsgUtils.cs
rename : src/framework/Framework/Constraints/NUnitComparer.cs => src/framework/Shared/Framework/Constraints/NUnitComparer.cs
rename : src/framework/Framework/Constraints/NUnitEqualityComparer.cs => src/framework/Shared/Framework/Constraints/NUnitEqualityComparer.cs
rename : src/framework/Framework/Constraints/Numerics.cs => src/framework/Shared/Framework/Constraints/Numerics.cs
rename : src/framework/Framework/Constraints/PathConstraints.cs => src/framework/Shared/Framework/Constraints/PathConstraints.cs
rename : src/framework/Framework/Constraints/PrefixConstraints.cs => src/framework/Shared/Framework/Constraints/PrefixConstraints.cs
rename : src/framework/Framework/Constraints/PropertyConstraint.cs => src/framework/Shared/Framework/Constraints/PropertyConstraint.cs
rename : src/framework/Framework/Constraints/RangeConstraint.cs => src/framework/Shared/Framework/Constraints/RangeConstraint.cs
rename : src/framework/Framework/Constraints/ResolvableConstraintExpression.cs => src/framework/Shared/Framework/Constraints/ResolvableConstraintExpression.cs
rename : src/framework/Framework/Constraints/SameAsConstraint.cs => src/framework/Shared/Framework/Constraints/SameAsConstraint.cs
rename : src/framework/Framework/Constraints/StringConstraints.cs => src/framework/Shared/Framework/Constraints/StringConstraints.cs
rename : src/framework/Framework/Constraints/ThrowsConstraint.cs => src/framework/Shared/Framework/Constraints/ThrowsConstraint.cs
rename : src/framework/Framework/Constraints/Tolerance.cs => src/framework/Shared/Framework/Constraints/Tolerance.cs
rename : src/framework/Framework/Constraints/TypeConstraints.cs => src/framework/Shared/Framework/Constraints/TypeConstraints.cs
rename : src/framework/Framework/Constraints/XmlSerializableConstraint.cs => src/framework/Shared/Framework/Constraints/XmlSerializableConstraint.cs
rename : src/framework/Framework/DescriptionAttribute.cs => src/framework/Shared/Framework/DescriptionAttribute.cs
rename : src/framework/Framework/ExpectedExceptionAttribute.cs => src/framework/Shared/Framework/ExpectedExceptionAttribute.cs
rename : src/framework/Framework/GlobalSettings.cs => src/framework/Shared/Framework/GlobalSettings.cs
rename : src/framework/Framework/Has.cs => src/framework/Shared/Framework/Has.cs
rename : src/framework/Framework/IExpectException.cs => src/framework/Shared/Framework/IExpectException.cs
rename : src/framework/Framework/IgnoreAttribute.cs => src/framework/Shared/Framework/IgnoreAttribute.cs
rename : src/framework/Framework/Is.cs => src/framework/Shared/Framework/Is.cs
rename : src/framework/Framework/ListMapper.cs => src/framework/Shared/Framework/ListMapper.cs
rename : src/framework/Framework/PropertyAttribute.cs => src/framework/Shared/Framework/PropertyAttribute.cs
rename : src/framework/Framework/SetUpAttribute.cs => src/framework/Shared/Framework/SetUpAttribute.cs
rename : src/framework/Framework/SpecialValue.cs => src/framework/Shared/Framework/SpecialValue.cs
rename : src/framework/Framework/TearDownAttribute.cs => src/framework/Shared/Framework/TearDownAttribute.cs
rename : src/framework/Framework/TestAttribute.cs => src/framework/Shared/Framework/TestAttribute.cs
rename : src/framework/Framework/TestCaseAttribute.cs => src/framework/Shared/Framework/TestCaseAttribute.cs
rename : src/framework/Framework/TestCaseData.cs => src/framework/Shared/Framework/TestCaseData.cs
rename : src/framework/Framework/TestCaseSourceAttribute.cs => src/framework/Shared/Framework/TestCaseSourceAttribute.cs
rename : src/framework/Framework/TestFixtureAttribute.cs => src/framework/Shared/Framework/TestFixtureAttribute.cs
rename : src/framework/Framework/TextMessageWriter.cs => src/framework/Shared/Framework/TextMessageWriter.cs
rename : src/framework/Framework/Throws.cs => src/framework/Shared/Framework/Throws.cs
extra : convert_revision : charlie%40nunit.com-20090906205407-nb13b93v0amhqmdn
  • Loading branch information
Charlie Poole committed Sep 6, 2009
1 parent 5c790ae commit bdf3cbf
Show file tree
Hide file tree
Showing 100 changed files with 693 additions and 792 deletions.
11 changes: 1 addition & 10 deletions .bzrignore
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
build
obj
*.suo
solutions/vs2008/bin
solutions/vs2008/framework/Framework
solutions/vs2008/tests/Framework
solutions/vs2008/nunitlite/Framework
solutions/vs2008/nunitlite.tests/Framework
solutions/vs2005/bin
solutions/vs2005/framework/Framework
solutions/vs2005/tests/Framework
solutions/vs2005/nunitlite/Framework
solutions/vs2005/nunitlite.tests/Framework
solutions/**/*
GeneratedAssemblyInfo.cs
nunit.framework.xml
*.user
Expand Down
372 changes: 186 additions & 186 deletions solutions/vs2005/framework/nunit.framework.csproj

Large diffs are not rendered by default.

315 changes: 159 additions & 156 deletions solutions/vs2005/nunitlite/nunitlite.csproj

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions solutions/vs2005/tests/nunit.framework.tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,6 @@
<Compile Include="..\..\..\src\CommonAssemblyInfo.cs">
<Link>CommonAssemblyInfo.cs</Link>
</Compile>
<Compile Include="..\..\..\src\framework\Framework\Constraints\BinarySerializableConstraint.cs">
<Link>Framework\Constraints\BinarySerializableConstraint.cs</Link>
</Compile>
<Compile Include="..\..\..\src\framework\Framework\Constraints\XmlSerializableConstraint.cs">
<Link>Framework\Constraints\XmlSerializableConstraint.cs</Link>
</Compile>
<Compile Include="..\..\..\src\tests\Framework\AlwaysEqualComparer.cs">
<Link>Framework\AlwaysEqualComparer.cs</Link>
</Compile>
Expand Down
372 changes: 186 additions & 186 deletions solutions/vs2008/framework/nunit.framework.csproj

Large diffs are not rendered by default.

315 changes: 159 additions & 156 deletions solutions/vs2008/nunitlite/nunitlite.csproj

Large diffs are not rendered by default.

84 changes: 0 additions & 84 deletions src/framework/Framework/ITestCaseData.cs

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@ namespace NUnit.Framework
/// and provide them with their arguments.
/// </summary>
[AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
public class TestCaseAttribute : Attribute
#if !NUNITLITE
, ITestCaseData
#endif
public class TestCaseAttribute : Attribute, ITestCaseData
{
private object[] arguments;
#if !NUNITLITE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,7 @@ namespace NUnit.Framework
/// Note: Instance modifiers are getters that return
/// the same instance after modifying it's state.
/// </summary>
public class TestCaseData
#if !NUNITLITE
: ITestCaseData
#endif
public class TestCaseData : ITestCaseData
{
#region Constants
//private static readonly string DESCRIPTION = "_DESCRIPTION";
Expand Down
File renamed without changes.

0 comments on commit bdf3cbf

Please sign in to comment.