Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Code scanning improvements #177

Merged
merged 2 commits into from
Nov 11, 2024
Merged

Code scanning improvements #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f564309
No need for memberType in the IDataItemExtender.Extend method
piotrzajac Nov 11, 2024
bc0bb2f
Ensure NullTheoryData always returns null.
piotrzajac Nov 11, 2024
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
2 changes: 1 addition & 1 deletion src/Objectivity.AutoFixture.XUnit2.Core.Tests/Attributes/MemberAutoDataBaseAttributeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class MemberAutoDataBaseAttributeTests
{ null, MemberType.Name },
};

public static TheoryData<string> NullTheoryData { get; }
public static TheoryData<string> NullTheoryData => null;

[AutoData]
[Theory(DisplayName = "GIVEN uninitialized fixture WHEN constructor is invoked THEN exception is thrown")]
Expand Down
11 changes: 5 additions & 6 deletions src/Objectivity.AutoFixture.XUnit2.Core.Tests/MemberData/MemberAutoDataItemExtenderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
[Trait("Category", "MemberData")]
public class MemberAutoDataItemExtenderTests
{
private static readonly Type MemberType = typeof(MemberAutoDataItemExtenderTests);
private static readonly MethodInfo TestMethod = MemberType.GetMethod(nameof(MethodUnderTest), BindingFlags.Instance | BindingFlags.NonPublic);
private static readonly MethodInfo TestMethod = typeof(MemberAutoDataItemExtenderTests).GetMethod(nameof(MethodUnderTest), BindingFlags.Instance | BindingFlags.NonPublic);
private readonly Fixture fixture = new();
private readonly Mock<IAutoFixtureInlineAttributeProvider> dataAttributeProvider = new();
private readonly Mock<DataAttribute> dataAttribute = new();
Expand Down Expand Up @@ -51,7 +50,7 @@ public void GivenProviderWithNoDataAttribute_WhenConvertIsInvoked_ThenNullReturn
var item = this.fixture.Create<object[]>();

// Act
var data = noDataConverter.Extend(TestMethod, item, this.memberName, MemberType);
var data = noDataConverter.Extend(TestMethod, item, this.memberName);

// Assert
data.Should().BeNull();
Expand All @@ -66,7 +65,7 @@ public void GivenValidParameters_WhenConvertIsInvoked_ThenAppropriateCodeIsInvok
var item = this.fixture.Create<object[]>();

// Act
var data = this.converter.Extend(TestMethod, item, this.memberName, MemberType);
var data = this.converter.Extend(TestMethod, item, this.memberName);

// Assert
data.Should().NotBeNull();
Expand All @@ -81,7 +80,7 @@ public void GivenUninitializedItem_WhenConvertInvoked_ThenNullReturned()
const object[] item = null;

// Act
var data = this.converter.Extend(TestMethod, item, this.memberName, MemberType);
var data = this.converter.Extend(TestMethod, item, this.memberName);

// Assert
data.Should().BeNull();
Expand All @@ -95,7 +94,7 @@ public void GivenUninitializedTestMethod_WhenConvertIsInvoked_ThenExceptionIsThr
var item = this.fixture.Create<object[]>();

// Act
Func<object> act = () => this.converter.Extend(method, item, this.memberName, MemberType);
Func<object> act = () => this.converter.Extend(method, item, this.memberName);

// Assert
act.Should().Throw<ArgumentNullException>()
Expand Down
2 changes: 1 addition & 1 deletion src/Objectivity.AutoFixture.XUnit2.Core/Attributes/MemberAutoDataBaseAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ private object[] ExtendDataItem(MethodInfo testMethod, object[] values)

var converter = new MemberAutoDataItemExtender(fixture, this.CreateProvider());

return converter.Extend(testMethod, values, this.MemberName, this.RetrieveMemberType(testMethod));
return converter.Extend(testMethod, values, this.MemberName);
}

private Type RetrieveMemberType(MethodInfo testMethod)
Expand Down
3 changes: 1 addition & 2 deletions src/Objectivity.AutoFixture.XUnit2.Core/MemberData/IDataItemExtender.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
namespace Objectivity.AutoFixture.XUnit2.Core.MemberData
{
using System;
using System.Reflection;

public interface IDataItemExtender
{
object[] Extend(MethodInfo testMethod, object[] values, string memberName, Type memberType);
object[] Extend(MethodInfo testMethod, object[] values, string memberName);
}
}
3 changes: 1 addition & 2 deletions src/Objectivity.AutoFixture.XUnit2.Core/MemberData/MemberAutoDataItemExtender.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
namespace Objectivity.AutoFixture.XUnit2.Core.MemberData
{
using System;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Reflection;
Expand All @@ -24,7 +23,7 @@ public MemberAutoDataItemExtender(IFixture fixture, IAutoFixtureInlineAttributeP
[SuppressMessage("ReSharper", "MemberCanBePrivate.Global", Justification = "Testable design.")]
public IAutoFixtureInlineAttributeProvider DataAttributeProvider { get; }

public object[] Extend(MethodInfo testMethod, object[] values, string memberName, Type memberType)
public object[] Extend(MethodInfo testMethod, object[] values, string memberName)
{
if (values is null)
{
Expand Down
Loading