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

Jump to bottom

Add ThatAre[Not]Abstract to TypeSelector #2058

Merged
merged 13 commits into from Dec 19, 2022
Merged

Add ThatAre[Not]Abstract to TypeSelector #2058

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
81119dc
Add ThatAre[Not]Abstract to TypeSelector
94sedighi Dec 5, 2022
d9c90ae
Updated docs and realease notes
94sedighi Dec 6, 2022
ccfb465
changes
94sedighi Dec 6, 2022
fb79125
Merge branch 'develop' into TypeSelectorAbstractFeature
94sedighi Dec 8, 2022
c80dc36
Update Src/FluentAssertions/Types/TypeSelector.cs
94sedighi Dec 8, 2022
541c8f3
Update Src/FluentAssertions/Types/TypeSelector.cs
94sedighi Dec 8, 2022
702582d
Removed IsAbstract
94sedighi Dec 8, 2022
a0fb24f
Removed IsAbstract to .IsCSharpAbstract()
94sedighi Dec 8, 2022
8fea2b4
Removed <return><return/> from documentations
94sedighi Dec 8, 2022
825937c
Changed the tests after changing .IsAbstract to .IsCSharpAbstract()
94sedighi Dec 8, 2022
3c8194b
Merge branch 'develop' into TypeSelectorAbstractFeature
94sedighi Dec 16, 2022
4b5e7ef
Updated the code docs
94sedighi Dec 19, 2022
00843d0
Merge branch 'TypeSelectorAbstractFeature' of https://github.com/94se…
94sedighi Dec 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 20 additions & 0 deletions Src/FluentAssertions/Types/TypeSelector.cs
View file
Open in desktop
Expand Up @@ -183,6 +183,26 @@ public TypeSelector ThatAreNotClasses()
return this;
}

/// <summary>
/// Determines the type is abstract and must be overridden
94sedighi marked this conversation as resolved.
Show resolved Hide resolved
/// </summary>
/// <returns></returns>
public TypeSelector ThatAreAbstract()
{
types = types.Where(t => t.IsAbstract).ToList();
jnyrup marked this conversation as resolved.
Show resolved Hide resolved
return this;
}

/// <summary>
/// Determines wheter the type is not abstract
94sedighi marked this conversation as resolved.
Show resolved Hide resolved
/// </summary>
/// <returns></returns>
public TypeSelector ThatAreNotAbstract()
{
types = types.Where(t => !t.IsAbstract).ToList();
return this;
}

/// <summary>
/// Determines whether the type is static
/// </summary>
Expand Down
2 changes: 2 additions & 0 deletions Tests/Approval.Tests/ApprovedApi/FluentAssertions/net47.verified.txt
View file
Open in desktop
Expand Up @@ -2647,12 +2647,14 @@ namespace FluentAssertions.Types
public TypeSelector(System.Collections.Generic.IEnumerable<System.Type> types) { }
public TypeSelector(System.Type type) { }
public System.Collections.Generic.IEnumerator<System.Type> GetEnumerator() { }
public FluentAssertions.Types.TypeSelector ThatAreAbstract() { }
public FluentAssertions.Types.TypeSelector ThatAreClasses() { }
public FluentAssertions.Types.TypeSelector ThatAreDecoratedWith<TAttribute>()
where TAttribute : System.Attribute { }
public FluentAssertions.Types.TypeSelector ThatAreDecoratedWithOrInherit<TAttribute>()
where TAttribute : System.Attribute { }
public FluentAssertions.Types.TypeSelector ThatAreInNamespace(string @namespace) { }
public FluentAssertions.Types.TypeSelector ThatAreNotAbstract() { }
public FluentAssertions.Types.TypeSelector ThatAreNotClasses() { }
public FluentAssertions.Types.TypeSelector ThatAreNotDecoratedWith<TAttribute>()
where TAttribute : System.Attribute { }
Expand Down
2 changes: 2 additions & 0 deletions Tests/Approval.Tests/ApprovedApi/FluentAssertions/net6.0.verified.txt
View file
Open in desktop
Expand Up @@ -2777,12 +2777,14 @@ namespace FluentAssertions.Types
public TypeSelector(System.Collections.Generic.IEnumerable<System.Type> types) { }
public TypeSelector(System.Type type) { }
public System.Collections.Generic.IEnumerator<System.Type> GetEnumerator() { }
public FluentAssertions.Types.TypeSelector ThatAreAbstract() { }
public FluentAssertions.Types.TypeSelector ThatAreClasses() { }
public FluentAssertions.Types.TypeSelector ThatAreDecoratedWith<TAttribute>()
where TAttribute : System.Attribute { }
public FluentAssertions.Types.TypeSelector ThatAreDecoratedWithOrInherit<TAttribute>()
where TAttribute : System.Attribute { }
public FluentAssertions.Types.TypeSelector ThatAreInNamespace(string @namespace) { }
public FluentAssertions.Types.TypeSelector ThatAreNotAbstract() { }
public FluentAssertions.Types.TypeSelector ThatAreNotClasses() { }
public FluentAssertions.Types.TypeSelector ThatAreNotDecoratedWith<TAttribute>()
where TAttribute : System.Attribute { }
Expand Down
2 changes: 2 additions & 0 deletions Tests/Approval.Tests/ApprovedApi/FluentAssertions/netcoreapp2.1.verified.txt
View file
Open in desktop
Expand Up @@ -2649,12 +2649,14 @@ namespace FluentAssertions.Types
public TypeSelector(System.Collections.Generic.IEnumerable<System.Type> types) { }
public TypeSelector(System.Type type) { }
public System.Collections.Generic.IEnumerator<System.Type> GetEnumerator() { }
public FluentAssertions.Types.TypeSelector ThatAreAbstract() { }
public FluentAssertions.Types.TypeSelector ThatAreClasses() { }
public FluentAssertions.Types.TypeSelector ThatAreDecoratedWith<TAttribute>()
where TAttribute : System.Attribute { }
public FluentAssertions.Types.TypeSelector ThatAreDecoratedWithOrInherit<TAttribute>()
where TAttribute : System.Attribute { }
public FluentAssertions.Types.TypeSelector ThatAreInNamespace(string @namespace) { }
public FluentAssertions.Types.TypeSelector ThatAreNotAbstract() { }
public FluentAssertions.Types.TypeSelector ThatAreNotClasses() { }
public FluentAssertions.Types.TypeSelector ThatAreNotDecoratedWith<TAttribute>()
where TAttribute : System.Attribute { }
Expand Down
2 changes: 2 additions & 0 deletions Tests/Approval.Tests/ApprovedApi/FluentAssertions/netcoreapp3.0.verified.txt
View file
Open in desktop
Expand Up @@ -2649,12 +2649,14 @@ namespace FluentAssertions.Types
public TypeSelector(System.Collections.Generic.IEnumerable<System.Type> types) { }
public TypeSelector(System.Type type) { }
public System.Collections.Generic.IEnumerator<System.Type> GetEnumerator() { }
public FluentAssertions.Types.TypeSelector ThatAreAbstract() { }
public FluentAssertions.Types.TypeSelector ThatAreClasses() { }
public FluentAssertions.Types.TypeSelector ThatAreDecoratedWith<TAttribute>()
where TAttribute : System.Attribute { }
public FluentAssertions.Types.TypeSelector ThatAreDecoratedWithOrInherit<TAttribute>()
where TAttribute : System.Attribute { }
public FluentAssertions.Types.TypeSelector ThatAreInNamespace(string @namespace) { }
public FluentAssertions.Types.TypeSelector ThatAreNotAbstract() { }
public FluentAssertions.Types.TypeSelector ThatAreNotClasses() { }
public FluentAssertions.Types.TypeSelector ThatAreNotDecoratedWith<TAttribute>()
where TAttribute : System.Attribute { }
Expand Down
2 changes: 2 additions & 0 deletions Tests/Approval.Tests/ApprovedApi/FluentAssertions/netstandard2.0.verified.txt
View file
Open in desktop
Expand Up @@ -2598,12 +2598,14 @@ namespace FluentAssertions.Types
public TypeSelector(System.Collections.Generic.IEnumerable<System.Type> types) { }
public TypeSelector(System.Type type) { }
public System.Collections.Generic.IEnumerator<System.Type> GetEnumerator() { }
public FluentAssertions.Types.TypeSelector ThatAreAbstract() { }
public FluentAssertions.Types.TypeSelector ThatAreClasses() { }
public FluentAssertions.Types.TypeSelector ThatAreDecoratedWith<TAttribute>()
where TAttribute : System.Attribute { }
public FluentAssertions.Types.TypeSelector ThatAreDecoratedWithOrInherit<TAttribute>()
where TAttribute : System.Attribute { }
public FluentAssertions.Types.TypeSelector ThatAreInNamespace(string @namespace) { }
public FluentAssertions.Types.TypeSelector ThatAreNotAbstract() { }
public FluentAssertions.Types.TypeSelector ThatAreNotClasses() { }
public FluentAssertions.Types.TypeSelector ThatAreNotDecoratedWith<TAttribute>()
where TAttribute : System.Attribute { }
Expand Down
2 changes: 2 additions & 0 deletions Tests/Approval.Tests/ApprovedApi/FluentAssertions/netstandard2.1.verified.txt
View file
Open in desktop
Expand Up @@ -2649,12 +2649,14 @@ namespace FluentAssertions.Types
public TypeSelector(System.Collections.Generic.IEnumerable<System.Type> types) { }
public TypeSelector(System.Type type) { }
public System.Collections.Generic.IEnumerator<System.Type> GetEnumerator() { }
public FluentAssertions.Types.TypeSelector ThatAreAbstract() { }
public FluentAssertions.Types.TypeSelector ThatAreClasses() { }
public FluentAssertions.Types.TypeSelector ThatAreDecoratedWith<TAttribute>()
where TAttribute : System.Attribute { }
public FluentAssertions.Types.TypeSelector ThatAreDecoratedWithOrInherit<TAttribute>()
where TAttribute : System.Attribute { }
public FluentAssertions.Types.TypeSelector ThatAreInNamespace(string @namespace) { }
public FluentAssertions.Types.TypeSelector ThatAreNotAbstract() { }
public FluentAssertions.Types.TypeSelector ThatAreNotClasses() { }
public FluentAssertions.Types.TypeSelector ThatAreNotDecoratedWith<TAttribute>()
where TAttribute : System.Attribute { }
Expand Down
46 changes: 46 additions & 0 deletions Tests/FluentAssertions.Specs/Types/TypeSelectorSpecs.cs
View file
Open in desktop
Expand Up @@ -4,6 +4,7 @@
using System.Reflection;
using System.Threading.Tasks;
using FluentAssertions.Types;
using Internal.AbstractAndNotAbstractClasses.Test;
using Internal.Main.Test;
using Internal.NotOnlyClasses.Test;
using Internal.Other.Test;
Expand Down Expand Up @@ -495,6 +496,40 @@ public void When_selecting_types_that_are_not_classes_it_should_return_the_corre
.And.Contain(typeof(NotOnlyClassesEnumeration));
}

[Fact]
public void When_selecting_types_that_are_abstract_classes_it_should_return_the_correct_types()
{
// Arrange
Assembly assembly = typeof(AbstractClass).GetTypeInfo().Assembly;

// Act
IEnumerable<Type> types = AllTypes.From(assembly)
.ThatAreInNamespace("Internal.AbstractAndNotAbstractClasses.Test")
.ThatAreAbstract();

// Assert
types.Should()
.ContainSingle()
.Which.Should().Be(typeof(AbstractClass));
}

[Fact]
public void When_selecting_types_that_are_not_abstract_classes_it_should_return_the_correct_types()
{
// Arrange
Assembly assembly = typeof(NotAbstractClass).GetTypeInfo().Assembly;

// Act
IEnumerable<Type> types = AllTypes.From(assembly)
.ThatAreInNamespace("Internal.AbstractAndNotAbstractClasses.Test")
.ThatAreNotAbstract();

// Assert
types.Should()
.ContainSingle()
.Which.Should().Be(typeof(NotAbstractClass));
}

[Fact]
public void When_selecting_types_that_are_static_classes_it_should_return_the_correct_types()
{
Expand Down Expand Up @@ -695,6 +730,17 @@ internal class NotAStaticClass
}
}

namespace Internal.AbstractAndNotAbstractClasses.Test
{
internal abstract class AbstractClass
{
}

internal class NotAbstractClass
{
}
}

namespace Internal.UnwrapSelectorTestTypes.Test
{
internal class ClassToExploreUnwrappedTaskTypes
Expand Down
1 change: 1 addition & 0 deletions docs/_pages/releases.md
View file
Open in desktop
Expand Up @@ -10,6 +10,7 @@ sidebar:
## Unreleased

### What's new
* Added `ThatAre[Not]Abstract` method for filtering the types - [#2058](https://github.com/fluentassertions/fluentassertions/pull/2058)
* Added `ThatAre[Not]Abstract`, `ThatAre[Not]Static` and `ThatAre[Not]Virtual` properties for filtering in `PropertyInfoSelector.cs` - [#2054](https://github.com/fluentassertions/fluentassertions/pull/2054)
* Added `BeOneOf` methods for object comparisons and `IComparable`s - [#2028](https://github.com/fluentassertions/fluentassertions/pull/2028)
* Added `BeCloseTo` and `NotBeCloseTo` to `TimeOnly` - [#2030](https://github.com/fluentassertions/fluentassertions/pull/2030)
Expand Down