Converted to use ForAttributeWithMetadataName Eliminated BuilderGenerator.Tests.Core Absorbed test classes back into their respective test projects

src/BuilderGenerator.Tests.Integration.Net60.PackageRef/BuilderGenerator.Tests.Integration.Net60.PackageRef.csproj

@@ -4,10 +4,10 @@
     <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\BuilderGenerator.Tests.Core\BuilderGenerator.Tests.Core.csproj" />
     <PackageReference Include="BuilderGenerator" Version="3.0.5-alpha" />
     <PackageReference Include="NUnit" Version="[3.14.0, 4.0.0)" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />

src/BuilderGenerator.Tests.Integration.Net60.PackageRef/Builders/CollectionTypeSampleBuilder.cs

@@ -1,4 +1,4 @@
-using BuilderGenerator.Tests.Core.Models.Entities;
+using BuilderGenerator.Tests.Integration.Net60.PackageRef.Models.Entities;
 
 namespace BuilderGenerator.Tests.Integration.Net60.PackageRef.Builders;
 

src/BuilderGenerator.Tests.Integration.Net60.PackageRef/Builders/OrderBuilder.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using BuilderGenerator.Tests.Core.Models.Entities;
+using BuilderGenerator.Tests.Integration.Net60.PackageRef.Models.Entities;
 
 namespace BuilderGenerator.Tests.Integration.Net60.PackageRef.Builders;
 

src/BuilderGenerator.Tests.Integration.Net60.PackageRef/Builders/OrderItemBuilder.cs

@@ -1,5 +1,5 @@
 using System;
-using BuilderGenerator.Tests.Core.Models.Entities;
+using BuilderGenerator.Tests.Integration.Net60.PackageRef.Models.Entities;
 
 namespace BuilderGenerator.Tests.Integration.Net60.PackageRef.Builders;
 

src/BuilderGenerator.Tests.Integration.Net60.PackageRef/Builders/UserBuilder.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using BuilderGenerator.Tests.Core.Models.Entities;
+using BuilderGenerator.Tests.Integration.Net60.PackageRef.Models.Entities;
 
 namespace BuilderGenerator.Tests.Integration.Net60.PackageRef.Builders;
 

src/BuilderGenerator.Tests.Core/Models/Entities/AuditableEntity.cs → src/BuilderGenerator.Tests.Integration.Net60.PackageRef/Models/Entities/AuditableEntity.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace BuilderGenerator.Tests.Core.Models.Entities;
+namespace BuilderGenerator.Tests.Integration.Net60.PackageRef.Models.Entities;
 
 public abstract class AuditableEntity : Entity
 {

src/BuilderGenerator.Tests.Core/Models/Entities/CollectionTypesSample.cs → src/BuilderGenerator.Tests.Integration.Net60.PackageRef/Models/Entities/CollectionTypesSample.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace BuilderGenerator.Tests.Core.Models.Entities;
+namespace BuilderGenerator.Tests.Integration.Net60.PackageRef.Models.Entities;
 
 public class CollectionTypesSample
 {

src/BuilderGenerator.Tests.Core/Models/Entities/Entity.cs → src/BuilderGenerator.Tests.Integration.Net60.PackageRef/Models/Entities/Entity.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace BuilderGenerator.Tests.Core.Models.Entities;
+namespace BuilderGenerator.Tests.Integration.Net60.PackageRef.Models.Entities;
 
 public abstract class Entity
 {

src/BuilderGenerator.Tests.Integration.Net60.PackageRef/Models/Entities/Order.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using OrderStatus = BuilderGenerator.Tests.Integration.Net60.PackageRef.Models.Enums.OrderStatus;
+
+namespace BuilderGenerator.Tests.Integration.Net60.PackageRef.Models.Entities;
+
+public class Order : Integration.Net60.PackageRef.Models.Entities.AuditableEntity
+{
+    public ICollection<OrderItem> Items { get; set; } = new List<OrderItem>();
+    public DateTime OrderDate { get; set; }
+    public ICollection<OrderItem> Orders { get; set; } = new List<OrderItem>();
+    public OrderStatus Status { get; set; }
+}

src/BuilderGenerator.Tests.Integration.Net60.PackageRef/Models/Entities/OrderItem.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace BuilderGenerator.Tests.Integration.Net60.PackageRef.Models.Entities;
+
+public class OrderItem : Integration.Net60.PackageRef.Models.Entities.AuditableEntity
+{
+    public Guid ItemId { get; set; }
+    public decimal Price { get; set; }
+    public int Quantity { get; set; }
+}

src/BuilderGenerator.Tests.Integration.Net60.PackageRef/Models/Entities/User.cs

@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+
+namespace BuilderGenerator.Tests.Integration.Net60.PackageRef.Models.Entities;
+
+public class User : Integration.Net60.PackageRef.Models.Entities.AuditableEntity
+{
+    public string FirstName { get; set; } = null!;
+    public string LastName { get; set; } = null!;
+    public string? MiddleName { get; set; }
+    public ICollection<Order> Orders { get; set; } = new List<Order>();
+}

src/BuilderGenerator.Tests.Core/Models/Enums/OrderStatus.cs → src/BuilderGenerator.Tests.Integration.Net60.PackageRef/Models/Enums/OrderStatus.cs

@@ -1,4 +1,4 @@
-namespace BuilderGenerator.Tests.Core.Models.Enums;
+namespace BuilderGenerator.Tests.Integration.Net60.PackageRef.Models.Enums;
 
 public enum OrderStatus
 {

src/BuilderGenerator.Tests.Integration.Net60.PackageRef/Tests/BuilderTests.cs

@@ -1,25 +1,25 @@
 using System;
-using BuilderGenerator.Tests.Core.Models.Entities;
+using BuilderGenerator.Tests.Integration.Net60.PackageRef.Builders;
+using BuilderGenerator.Tests.Integration.Net60.PackageRef.Models.Entities;
 using NUnit.Framework;
 using Shouldly;
-using UserBuilder = BuilderGenerator.Tests.Integration.Net60.PackageRef.Builders.UserBuilder;
 
 namespace BuilderGenerator.Tests.Integration.Net60.PackageRef.Tests;
 
 [TestFixture]
 public class BuilderTests
 {
-    private string _firstName;
+    private string _firstName = null!;
     private Guid _id;
-    private string _lastName;
-    private string _middleName;
-    private User _result;
+    private string _lastName = null!;
+    private string _middleName = null!;
+    private User _result = null!;
 
     [Test]
     public void Simple_does_not_populate_Orders()
     {
         var actual = UserBuilder.Simple().Build();
-        ShouldBeTestExtensions.ShouldBeOfType<User>(actual);
+        actual.ShouldBeOfType<User>();
         actual.Orders.ShouldBeNull();
     }
 
@@ -33,7 +33,7 @@ public void Simple_returns_a_UserBuilder()
     public void Typical_populates_Orders()
     {
         var actual = UserBuilder.Typical().Build();
-        ShouldBeTestExtensions.ShouldBeOfType<User>(actual);
+        actual.ShouldBeOfType<User>();
         actual.Orders.ShouldNotBeNull();
     }
 

src/BuilderGenerator.Tests.Integration.Net60.PackageRef/Tests/OrderBuilderTests.cs

@@ -1,19 +1,19 @@
 using System;
-using BuilderGenerator.Tests.Core.Models.Entities;
-using BuilderGenerator.Tests.Core.Models.Enums;
+using BuilderGenerator.Tests.Integration.Net60.PackageRef.Builders;
+using BuilderGenerator.Tests.Integration.Net60.PackageRef.Models.Entities;
+using BuilderGenerator.Tests.Integration.Net60.PackageRef.Models.Enums;
 using NUnit.Framework;
 using Shouldly;
-using OrderBuilder = BuilderGenerator.Tests.Integration.Net60.PackageRef.Builders.OrderBuilder;
 
 namespace BuilderGenerator.Tests.Integration.Net60.PackageRef.Tests;
 
 [TestFixture]
 public class OrderBuilderTests
 {
     private Guid _id;
-    private string _internalString;
+    private string _internalString = null!;
     private DateTime _orderDate;
-    private Order _result;
+    private Order _result = null!;
     private OrderStatus _status;
 
     [Test]
@@ -29,7 +29,7 @@ public void OrderBuilder_can_set_properties()
     public void Simple_does_not_populate_Items()
     {
         var actual = OrderBuilder.Simple().Build();
-        ShouldBeTestExtensions.ShouldBeOfType<Order>(actual);
+        actual.ShouldBeOfType<Order>();
         actual.Items.ShouldBeNull();
     }
 
@@ -43,7 +43,7 @@ public void Simple_returns_an_OrderBuilder()
     public void Typical_populates_Items()
     {
         var actual = OrderBuilder.Typical().Build();
-        ShouldBeTestExtensions.ShouldBeOfType<Order>(actual);
+        actual.ShouldBeOfType<Order>();
         actual.Items.ShouldNotBeNull();
     }
 

src/BuilderGenerator.Tests.Integration.Net60.PackageRef/Tests/UserBuilderTests.cs

@@ -1,25 +1,25 @@
 using System;
-using BuilderGenerator.Tests.Core.Models.Entities;
+using BuilderGenerator.Tests.Integration.Net60.PackageRef.Builders;
+using BuilderGenerator.Tests.Integration.Net60.PackageRef.Models.Entities;
 using NUnit.Framework;
 using Shouldly;
-using UserBuilder = BuilderGenerator.Tests.Integration.Net60.PackageRef.Builders.UserBuilder;
 
 namespace BuilderGenerator.Tests.Integration.Net60.PackageRef.Tests;
 
 [TestFixture]
 public class UserBuilderTests
 {
-    private string _firstName;
+    private string _firstName = null!;
     private Guid _id;
-    private string _lastName;
-    private string _middleName;
-    private User _result;
+    private string _lastName = null!;
+    private string _middleName = null!;
+    private User _result = null!;
 
     [Test]
     public void Simple_does_not_populate_Orders()
     {
         var actual = UserBuilder.Simple().Build();
-        ShouldBeTestExtensions.ShouldBeOfType<User>(actual);
+        actual.ShouldBeOfType<User>();
         actual.Orders.ShouldBeNull();
     }
 
@@ -33,7 +33,7 @@ public void Simple_returns_a_UserBuilder()
     public void Typical_populates_Orders()
     {
         var actual = UserBuilder.Typical().Build();
-        ShouldBeTestExtensions.ShouldBeOfType<User>(actual);
+        actual.ShouldBeOfType<User>();
         actual.Orders.ShouldNotBeNull();
     }
 

src/BuilderGenerator.Tests.Integration.Net60.ProjectRef/BuilderGenerator.Tests.Integration.Net60.ProjectRef.csproj

@@ -4,11 +4,11 @@
     <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\BuilderGenerator.Core\BuilderGenerator.Core.csproj" />
-    <ProjectReference Include="..\BuilderGenerator.Tests.Core\BuilderGenerator.Tests.Core.csproj" />
     <ProjectReference Include="..\BuilderGenerator\BuilderGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
     <PackageReference Include="NUnit" Version="4.3.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />

src/BuilderGenerator.Tests.Integration.Net60.ProjectRef/Builders/CollectionTypeSampleBuilder.cs

@@ -1,4 +1,4 @@
-using BuilderGenerator.Tests.Core.Models.Entities;
+using BuilderGenerator.Tests.Integration.Net60.ProjectRef.Models.Entities;
 
 namespace BuilderGenerator.Tests.Integration.Net60.ProjectRef.Builders;
 

src/BuilderGenerator.Tests.Integration.Net60.ProjectRef/Builders/OrderBuilder.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using BuilderGenerator.Tests.Core.Models.Entities;
+using BuilderGenerator.Tests.Integration.Net60.ProjectRef.Models.Entities;
 
 namespace BuilderGenerator.Tests.Integration.Net60.ProjectRef.Builders;
 

src/BuilderGenerator.Tests.Integration.Net60.ProjectRef/Builders/OrderItemBuilder.cs

@@ -1,5 +1,5 @@
 using System;
-using BuilderGenerator.Tests.Core.Models.Entities;
+using BuilderGenerator.Tests.Integration.Net60.ProjectRef.Models.Entities;
 
 namespace BuilderGenerator.Tests.Integration.Net60.ProjectRef.Builders;
 

src/BuilderGenerator.Tests.Integration.Net60.ProjectRef/Builders/UserBuilder.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using BuilderGenerator.Tests.Core.Models.Entities;
+using BuilderGenerator.Tests.Integration.Net60.ProjectRef.Models.Entities;
 
 namespace BuilderGenerator.Tests.Integration.Net60.ProjectRef.Builders;
 

src/BuilderGenerator.Tests.Integration.Net60.ProjectRef/Models/Entities/AuditableEntity.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace BuilderGenerator.Tests.Integration.Net60.ProjectRef.Models.Entities;
+
+public abstract class AuditableEntity : Entity
+{
+    public DateTime CreatedAt { get; set; }
+    public string CreatedBy { get; set; } = null!;
+    public DateTime UpdatedAt { get; set; }
+    public string UpdatedBy { get; set; } = null!;
+}

src/BuilderGenerator.Tests.Integration.Net60.ProjectRef/Models/Entities/CollectionTypesSample.cs

@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+
+namespace BuilderGenerator.Tests.Integration.Net60.ProjectRef.Models.Entities;
+
+public class CollectionTypesSample
+{
+    public string[] ReadOnlyArray { get; } = [];
+    public ICollection<string> ReadOnlyCollection { get; } = new List<string>();
+    public IEnumerable<string> ReadOnlyEnumerable { get; } = new List<string>();
+    public HashSet<string> ReadOnlyHashSet { get; } = [];
+    public List<string> ReadOnlyList { get; } = [];
+    public string[] ReadWriteArray { get; set; } = [];
+    public ICollection<string> ReadWriteCollection { get; set; } = new List<string>();
+    public IEnumerable<string> ReadWriteEnumerable { get; set; } = new List<string>();
+    public HashSet<string> ReadWriteHashSet { get; set; } = [];
+    public List<string> ReadWriteList { get; set; } = [];
+}

src/BuilderGenerator.Tests.Integration.Net60.ProjectRef/Models/Entities/Entity.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace BuilderGenerator.Tests.Integration.Net60.ProjectRef.Models.Entities;
+
+public abstract class Entity
+{
+    public Guid Id { get; set; }
+
+    // The Builders should only expose this in builder classes where the attribute has enabled it
+    internal string InternalString { get; set; } = null!;
+}

src/BuilderGenerator.Tests.Core/Models/Entities/Order.cs → src/BuilderGenerator.Tests.Integration.Net60.ProjectRef/Models/Entities/Order.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
-using BuilderGenerator.Tests.Core.Models.Enums;
+using OrderStatus = BuilderGenerator.Tests.Integration.Net60.ProjectRef.Models.Enums.OrderStatus;
 
-namespace BuilderGenerator.Tests.Core.Models.Entities;
+namespace BuilderGenerator.Tests.Integration.Net60.ProjectRef.Models.Entities;
 
 public class Order : AuditableEntity
 {

src/BuilderGenerator.Tests.Core/Models/Entities/OrderItem.cs → src/BuilderGenerator.Tests.Integration.Net60.ProjectRef/Models/Entities/OrderItem.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace BuilderGenerator.Tests.Core.Models.Entities;
+namespace BuilderGenerator.Tests.Integration.Net60.ProjectRef.Models.Entities;
 
 public class OrderItem : AuditableEntity
 {

src/BuilderGenerator.Tests.Core/Models/Entities/User.cs → src/BuilderGenerator.Tests.Integration.Net60.ProjectRef/Models/Entities/User.cs

@@ -1,11 +1,11 @@
 using System.Collections.Generic;
 
-namespace BuilderGenerator.Tests.Core.Models.Entities;
+namespace BuilderGenerator.Tests.Integration.Net60.ProjectRef.Models.Entities;
 
 public class User : AuditableEntity
 {
+    public string? MiddleName { get; set; }
     public string FirstName { get; set; } = null!;
     public string LastName { get; set; } = null!;
-    public string? MiddleName { get; set; }
     public ICollection<Order> Orders { get; set; } = new List<Order>();
 }