Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions Common.Test.props
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="17.14.2" />
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="1.6.3" />

<PackageReference Include="coverlet.collector" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Update="coverlet.collector" Version="6.0.4" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="10.0.102" />
<PackageReference Update="Microsoft.Testing.Extensions.CodeCoverage" Version="18.3.2" />
<PackageReference Update="Microsoft.Testing.Extensions.TrxReport" Version="2.0.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Common.props
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,6 @@

<ItemGroup>
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="all" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.102" PrivateAssets="all" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/AutoFixture.TUnit/AutoArgumentsAttribute.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Diagnostics.CodeAnalysis;
using System.Diagnostics.CodeAnalysis;
using AutoFixture.TUnit.Internal;

namespace AutoFixture.TUnit;
Expand Down Expand Up @@ -46,7 +46,7 @@ protected AutoArgumentsAttribute(Func<IFixture> fixtureFactory, params object?[]
public override IEnumerable<object?[]> GetData(DataGeneratorMetadata dataGeneratorMetadata)
{
return new AutoDataSource(this.FixtureFactory, new InlineDataSource(this.Values))
.GenerateDataSources(dataGeneratorMetadata)
.GetDataSources(dataGeneratorMetadata)
.Select(x => x());
}
}
4 changes: 2 additions & 2 deletions src/AutoFixture.TUnit/AutoClassDataSourceAttribute.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Diagnostics.CodeAnalysis;
using System.Diagnostics.CodeAnalysis;
using AutoFixture.TUnit.Internal;

namespace AutoFixture.TUnit;
Expand Down Expand Up @@ -88,6 +88,6 @@ protected AutoClassDataSourceAttribute(Func<IFixture> fixtureFactory, Type sourc
var source = new AutoDataSource(this.FixtureFactory,
new ClassDataSource(this.SourceType, this.Parameters));

return source.GenerateDataSources(dataGeneratorMetadata).Select(x => x());
return source.GetDataSources(dataGeneratorMetadata).Select(x => x());
}
}
4 changes: 2 additions & 2 deletions src/AutoFixture.TUnit/AutoDataSourceAttribute.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Diagnostics.CodeAnalysis;
using System.Diagnostics.CodeAnalysis;
using AutoFixture.TUnit.Internal;

namespace AutoFixture.TUnit;
Expand Down Expand Up @@ -46,6 +46,6 @@ protected AutoDataSourceAttribute(Func<IFixture> fixtureFactory)
{
var source = new AutoDataSource(this.FixtureFactory);

return source.GenerateDataSources(dataGeneratorMetadata).Select(x => x());
return source.GetDataSources(dataGeneratorMetadata).Select(x => x());
}
}
6 changes: 3 additions & 3 deletions src/AutoFixture.TUnit/AutoFixture.TUnit.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="..\..\Common.props" />

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>

<!-- NuGet options -->
<PackageId>AutoFixture.TUnit</PackageId>
Expand All @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="TUnit.Core" Version="0.16.56" />
<PackageReference Include="TUnit.Core" Version="1.12.65" />
<PackageReference Include="AutoFixture" Version="4.18.1" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/AutoFixture.TUnit/AutoMemberDataSourceAttribute.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Diagnostics.CodeAnalysis;
using System.Diagnostics.CodeAnalysis;
using AutoFixture.TUnit.Internal;

namespace AutoFixture.TUnit;
Expand Down Expand Up @@ -100,6 +100,6 @@ protected AutoMemberDataSourceAttribute(Func<IFixture> fixtureFactory, Type? mem
createFixture: this.FixtureFactory,
source: new MemberDataSource(sourceType, this.MemberName, this.Parameters));

return source.GenerateDataSources(dataGeneratorMetadata).Select(x => x());
return source.GetDataSources(dataGeneratorMetadata).Select(x => x());
}
}
11 changes: 8 additions & 3 deletions src/AutoFixture.TUnit/BaseDataSourceAttribute.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using AutoFixture.TUnit.Internal;
using AutoFixture.TUnit.Internal;

namespace AutoFixture.TUnit;

/// <summary>
/// Base class for data sources that provide AutoFixture test data for TUnit data driven tests.
/// </summary>
public abstract class BaseDataSourceAttribute : NonTypedDataSourceGeneratorAttribute, IDataSource
public abstract class BaseDataSourceAttribute : UntypedDataSourceGeneratorAttribute, IDataSource
{
/// <summary>
/// Returns the test data provided by the source.
Expand All @@ -20,7 +20,7 @@ public abstract class BaseDataSourceAttribute : NonTypedDataSourceGeneratorAttri
public abstract IEnumerable<object?[]?> GetData(DataGeneratorMetadata dataGeneratorMetadata);

/// <inheritdoc />
public override IEnumerable<Func<object?[]>> GenerateDataSources(DataGeneratorMetadata dataGeneratorMetadata)
protected override IEnumerable<Func<object?[]>> GenerateDataSources(DataGeneratorMetadata dataGeneratorMetadata)
{
if (dataGeneratorMetadata is null) throw new ArgumentNullException(nameof(dataGeneratorMetadata));

Expand Down Expand Up @@ -48,4 +48,9 @@ public abstract class BaseDataSourceAttribute : NonTypedDataSourceGeneratorAttri
}
}
}

public IEnumerable<Func<object?[]>> GetDataSources(DataGeneratorMetadata dataGeneratorMetadata)
{
return this.GenerateDataSources(dataGeneratorMetadata);
}
}
4 changes: 2 additions & 2 deletions src/AutoFixture.TUnit/CompositeDataSourceAttribute.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Diagnostics.CodeAnalysis;
using System.Diagnostics.CodeAnalysis;
using AutoFixture.TUnit.Internal;

namespace AutoFixture.TUnit;
Expand Down Expand Up @@ -44,7 +44,7 @@ public CompositeDataSourceAttribute(params BaseDataSourceAttribute[] attributes)
}

var results = this.attributes
.Select(attr => attr.GenerateDataSources(dataGeneratorMetadata))
.Select(attr => attr.GetDataSources(dataGeneratorMetadata))
.ToArray();

var theoryRows = results
Expand Down
2 changes: 1 addition & 1 deletion src/AutoFixture.TUnit/Internal/ClassDataSource.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Diagnostics.CodeAnalysis;
using System.Diagnostics.CodeAnalysis;

namespace AutoFixture.TUnit.Internal;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System.Reflection;
using System.Reflection;
using TUnit.Core.Enums;
using TUnit.Core.Extensions;

namespace AutoFixture.TUnit.Internal;

Expand All @@ -9,9 +10,9 @@ public static MethodBase GetMethod(this DataGeneratorMetadata dataGeneratorMetad
{
if (dataGeneratorMetadata.Type == DataGeneratorType.ClassParameters)
{
return dataGeneratorMetadata.TestClassType.GetConstructors().First();
return dataGeneratorMetadata.TestInformation.Class.Type.GetConstructors().First();
}

return dataGeneratorMetadata.TestInformation.ReflectionInformation;
return dataGeneratorMetadata.TestInformation.GetReflectionInfo();
}
}
2 changes: 1 addition & 1 deletion src/AutoFixture.TUnit/Internal/IDataSource.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace AutoFixture.TUnit.Internal;
namespace AutoFixture.TUnit.Internal;

/// <summary>
/// Exposes the factory method for a sequence of test data.
Expand Down
2 changes: 1 addition & 1 deletion src/AutoFixture.TUnit/Internal/MemberDataSource.cs
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,6 @@ private DataSource GetTestDataSource()
/// <inheritdoc/>
public IEnumerable<object?[]?> GetData(DataGeneratorMetadata dataGeneratorMetadata)
{
return this.Source.GenerateDataSources(dataGeneratorMetadata).Select(x => x());
return this.Source.GetDataSources(dataGeneratorMetadata).Select(x => x());
}
}
6 changes: 3 additions & 3 deletions tests/AutoFixture.TUnit.Tests/AutoArgumentsAttributeTests.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Reflection;
using System.Reflection;
using AutoFixture.TUnit.Tests.TestTypes;
using TestTypeFoundation;

Expand Down Expand Up @@ -99,7 +99,7 @@ public async Task GetDataOrdersCustomizationAttributes(string methodName)
var sut = new DerivedAutoArgumentsAttribute(() => fixture);

// Act
_ = sut.GenerateDataSources(DataGeneratorMetadataHelper.CreateDataGeneratorMetadata(typeof(TypeWithCustomizationAttributes), methodName))
_ = sut.GetDataSources(DataGeneratorMetadataHelper.CreateDataGeneratorMetadata(typeof(TypeWithCustomizationAttributes), methodName))
.Select(x => x())
.ToArray();

Expand All @@ -119,7 +119,7 @@ public async Task ReturnsSingleTestDataWithExpectedValues(BaseDataSourceAttribut
object[] expected)
{
// Act
var actual = attribute.GenerateDataSources(DataGeneratorMetadataHelper.CreateDataGeneratorMetadata(testMethod.DeclaringType, testMethod.Name)).ToArray();
var actual = attribute.GetDataSources(DataGeneratorMetadataHelper.CreateDataGeneratorMetadata(testMethod.DeclaringType, testMethod.Name)).ToArray();

// Assert
await Assert.That(actual).HasSingleItem();
Expand Down
12 changes: 6 additions & 6 deletions tests/AutoFixture.TUnit.Tests/AutoDataSourceAttributeTests.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using AutoFixture.Kernel;
using AutoFixture.Kernel;
using AutoFixture.TUnit.Tests.TestTypes;
using TestTypeFoundation;
using TUnit.Assertions.AssertConditions.Throws;
using ConcreteType = TestTypeFoundation.ConcreteType;

namespace AutoFixture.TUnit.Tests;

Expand Down Expand Up @@ -76,7 +76,7 @@ public async Task GetDataWithNullMethodThrows()
var sut = new AutoDataSourceAttribute();

// Act & assert
await Assert.That(() => sut.GenerateDataSources(DataGeneratorMetadataHelper.CreateDataGeneratorMetadata(null!, null!))).ThrowsException();
await Assert.That(() => sut.GetDataSources(DataGeneratorMetadataHelper.CreateDataGeneratorMetadata(null!, null!))).ThrowsException();
}

[Test]
Expand All @@ -103,7 +103,7 @@ public async Task GetDataReturnsCorrectResult()
var sut = new DerivedAutoDataSourceAttribute(() => composer);

// Act
var result = sut.GenerateDataSources(DataGeneratorMetadataHelper.CreateDataGeneratorMetadata(method))
var result = sut.GetDataSources(DataGeneratorMetadataHelper.CreateDataGeneratorMetadata(method))
.Select(x => x())
.ToArray();

Expand Down Expand Up @@ -140,7 +140,7 @@ public async Task GetDataOrdersCustomizationAttributes(string methodName)
var sut = new DerivedAutoDataSourceAttribute(() => fixture);

// Act
_ = sut.GenerateDataSources(DataGeneratorMetadataHelper.CreateDataGeneratorMetadata(method.DeclaringType, method.Name))
_ = sut.GetDataSources(DataGeneratorMetadataHelper.CreateDataGeneratorMetadata(method.DeclaringType, method.Name))
.Select(x => x())
.ToArray();

Expand Down Expand Up @@ -168,7 +168,7 @@ public async Task ShouldRecognizeAttributesImplementingIParameterCustomizationSo
var sut = new DerivedAutoDataSourceAttribute(() => fixture);

// Act
_ = sut.GenerateDataSources(DataGeneratorMetadataHelper.CreateDataGeneratorMetadata(method.DeclaringType, method.Name))
_ = sut.GetDataSources(DataGeneratorMetadataHelper.CreateDataGeneratorMetadata(method.DeclaringType, method.Name))
.Select(x => x())
.ToArray();

Expand Down
12 changes: 2 additions & 10 deletions tests/AutoFixture.TUnit.Tests/AutoFixture.TUnit.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,12 @@
<Import Project="..\..\Common.Test.props" />

<PropertyGroup>
<TargetFrameworks>net48;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<Nullable>disable</Nullable>
</PropertyGroup>

<Choose>
<When Condition="'$(TargetFramework)' == 'net48'">
<PropertyGroup>
<RuntimeIdentifier>win7-x86</RuntimeIdentifier>
</PropertyGroup>
</When>
</Choose>

<ItemGroup>
<PackageReference Include="TUnit" Version="0.19.32" />
<PackageReference Include="TUnit" Version="1.12.65" />
<PackageReference Include="AutoFixture" Version="4.18.1" />
<PackageReference Remove="StyleCop.Analyzers" />
</ItemGroup>
Expand Down
Loading
Loading