21, Allow preservation of explicitly-set Object value

src/BuilderGenerator.IntegrationTests.Core/BuilderGenerator.IntegrationTests.Core.csproj → src/BuilderGenerator.Tests.Core/BuilderGenerator.Tests.Core.csproj

@@ -7,10 +7,10 @@
   </PropertyGroup>
   <ItemGroup>
     <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
-      <_Parameter1>BuilderGenerator.IntegrationTests.Net60</_Parameter1>
+      <_Parameter1>BuilderGenerator.Tests.Integration.Net60</_Parameter1>
     </AssemblyAttribute>
     <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
-      <_Parameter1>BuilderGenerator.IntegrationTests.Net60</_Parameter1>
+      <_Parameter1>BuilderGenerator.Tests.Integration.Net60</_Parameter1>
     </AssemblyAttribute>
   </ItemGroup>
 </Project>

src/BuilderGenerator.IntegrationTests.Core/Models/Entities/AuditableEntity.cs → src/BuilderGenerator.Tests.Core/Models/Entities/AuditableEntity.cs

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

src/BuilderGenerator.IntegrationTests.Core/Models/Entities/CollectionTypesSample.cs → src/BuilderGenerator.Tests.Core/Models/Entities/CollectionTypesSample.cs

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

src/BuilderGenerator.IntegrationTests.Core/Models/Entities/Entity.cs → src/BuilderGenerator.Tests.Core/Models/Entities/Entity.cs

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

src/BuilderGenerator.IntegrationTests.Core/Models/Entities/Order.cs → src/BuilderGenerator.Tests.Core/Models/Entities/Order.cs

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

src/BuilderGenerator.IntegrationTests.Core/Models/Entities/OrderItem.cs → src/BuilderGenerator.Tests.Core/Models/Entities/OrderItem.cs

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

src/BuilderGenerator.IntegrationTests.Core/Models/Entities/User.cs → src/BuilderGenerator.Tests.Core/Models/Entities/User.cs

@@ -2,12 +2,12 @@
 
 using System.Collections.Generic;
 
-namespace BuilderGenerator.IntegrationTests.Core.Models.Entities;
+namespace BuilderGenerator.Tests.Core.Models.Entities;
 
 public partial class User : AuditableEntity
 {
     public string FirstName { get; set; }
     public string LastName { get; set; }
     public string? MiddleName { get; set; }
 }
 

src/BuilderGenerator.IntegrationTests.Core/Models/Enums/OrderStatus.cs → src/BuilderGenerator.Tests.Core/Models/Enums/OrderStatus.cs

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

src/BuilderGenerator.IntegrationTests.Net60/BuilderGenerator.IntegrationTests.Net60.csproj → src/BuilderGenerator.Tests.Integration.Net60/BuilderGenerator.Tests.Integration.Net60.csproj

@@ -7,15 +7,13 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\BuilderGenerator.Tests.Core\BuilderGenerator.Tests.Core.csproj" />
+    <ProjectReference Include="..\BuilderGenerator.Tests.Unit\BuilderGenerator.Tests.Unit.csproj" />
     <ProjectReference Include="..\BuilderGenerator\BuilderGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageReference Include="Shouldly" Version="4.2.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\BuilderGenerator.IntegrationTests.Core\BuilderGenerator.IntegrationTests.Core.csproj" />
-  </ItemGroup>
-
 </Project>

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

@@ -0,0 +1,8 @@
+using BuilderGenerator.Tests.Core.Models.Entities;
+
+namespace BuilderGenerator.Tests.Integration.Net60.Builders;
+
+[BuilderFor(typeof(CollectionTypesSample))]
+public partial class CollectionTypeSampleBuilder
+{
+}

src/BuilderGenerator.IntegrationTests.Net60/Builders/OrderBuilder.cs → src/BuilderGenerator.Tests.Integration.Net60/Builders/OrderBuilder.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
-using BuilderGenerator.IntegrationTests.Core.Models.Entities;
+using BuilderGenerator.Tests.Core.Models.Entities;
 
-namespace BuilderGenerator.IntegrationTests.Net60.Builders;
+namespace BuilderGenerator.Tests.Integration.Net60.Builders;
 
 [BuilderFor(typeof(Order), true)]
 public partial class OrderBuilder

src/BuilderGenerator.IntegrationTests.Net60/Builders/OrderItemBuilder.cs → src/BuilderGenerator.Tests.Integration.Net60/Builders/OrderItemBuilder.cs

@@ -1,7 +1,7 @@
 using System;
-using BuilderGenerator.IntegrationTests.Core.Models.Entities;
+using BuilderGenerator.Tests.Core.Models.Entities;
 
-namespace BuilderGenerator.IntegrationTests.Net60.Builders;
+namespace BuilderGenerator.Tests.Integration.Net60.Builders;
 
 [BuilderFor(typeof(OrderItem))]
 public partial class OrderItemBuilder

src/BuilderGenerator.IntegrationTests.Net60/Builders/UserBuilder.cs → src/BuilderGenerator.Tests.Integration.Net60/Builders/UserBuilder.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
-using BuilderGenerator.IntegrationTests.Core.Models.Entities;
+using BuilderGenerator.Tests.Core.Models.Entities;
 
-namespace BuilderGenerator.IntegrationTests.Net60.Builders;
+namespace BuilderGenerator.Tests.Integration.Net60.Builders;
 
 [BuilderFor(typeof(User))]
 public partial class UserBuilder

src/BuilderGenerator.IntegrationTests.Net60/Tests/BuilderTests.cs → src/BuilderGenerator.Tests.Integration.Net60/Tests/BuilderTests.cs

@@ -1,10 +1,10 @@
 using System;
-using BuilderGenerator.IntegrationTests.Core.Models.Entities;
-using BuilderGenerator.IntegrationTests.Net60.Builders;
+using BuilderGenerator.Tests.Core.Models.Entities;
+using BuilderGenerator.Tests.Integration.Net60.Builders;
 using NUnit.Framework;
 using Shouldly;
 
-namespace BuilderGenerator.IntegrationTests.Net60.Tests;
+namespace BuilderGenerator.Tests.Integration.Net60.Tests;
 
 [TestFixture]
 public class BuilderTests

src/BuilderGenerator.IntegrationTests.Net60/Tests/OrderBuilderTests.cs → src/BuilderGenerator.Tests.Integration.Net60/Tests/OrderBuilderTests.cs

@@ -1,11 +1,11 @@
 using System;
-using BuilderGenerator.IntegrationTests.Core.Models.Entities;
-using BuilderGenerator.IntegrationTests.Core.Models.Enums;
-using BuilderGenerator.IntegrationTests.Net60.Builders;
+using BuilderGenerator.Tests.Core.Models.Entities;
+using BuilderGenerator.Tests.Core.Models.Enums;
+using BuilderGenerator.Tests.Integration.Net60.Builders;
 using NUnit.Framework;
 using Shouldly;
 
-namespace BuilderGenerator.IntegrationTests.Net60.Tests;
+namespace BuilderGenerator.Tests.Integration.Net60.Tests;
 
 [TestFixture]
 public class OrderBuilderTests

src/BuilderGenerator.IntegrationTests.Net60/Tests/UserBuilderTests.cs → src/BuilderGenerator.Tests.Integration.Net60/Tests/UserBuilderTests.cs

@@ -1,10 +1,10 @@
 using System;
-using BuilderGenerator.IntegrationTests.Core.Models.Entities;
-using BuilderGenerator.IntegrationTests.Net60.Builders;
+using BuilderGenerator.Tests.Core.Models.Entities;
+using BuilderGenerator.Tests.Integration.Net60.Builders;
 using NUnit.Framework;
 using Shouldly;
 
-namespace BuilderGenerator.IntegrationTests.Net60.Tests;
+namespace BuilderGenerator.Tests.Integration.Net60.Tests;
 
 [TestFixture]
 public class UserBuilderTests

src/BuilderGenerator.Tests.Unit/BuilderGenerator - Backup.UnitTests.csproj

@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="Examples\Input.cs" />
+    <Compile Remove="Examples\Output.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Examples\Input.cs" />
+    <EmbeddedResource Include="Examples\Output.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\BuilderGenerator\BuilderGenerator.csproj" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
+    <PackageReference Include="NUnit.Analyzers" Version="3.6.1" />
+    <PackageReference Include="coverlet.collector" Version="3.2.0" />
+    <PackageReference Include="Shouldly" Version="4.2.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>

src/BuilderGenerator.UnitTests/BuilderGenerator.UnitTests.csproj → src/BuilderGenerator.Tests.Unit/BuilderGenerator.Tests.Unit.csproj

@@ -15,6 +15,11 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Remove="Examples\.editorconfig" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Examples\.editorconfig" />
     <EmbeddedResource Include="Examples\InputWithInternals.cs" />
     <EmbeddedResource Include="Examples\InputWithoutInternals.cs" />
     <EmbeddedResource Include="Examples\OutputWithInternals.cs" />
@@ -32,18 +37,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
+    <Folder Include="Properties\" />
   </ItemGroup>
 
 </Project>

src/BuilderGenerator.Tests.Unit/BuilderGenerator.UnitTests.csproj.DotSettings

@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=examples/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

src/BuilderGenerator.Tests.Unit/Examples/.editorconfig

@@ -0,0 +1,16 @@
+root=true
+# To learn more about .editorconfig see https://aka.ms/editorconfigdocs
+# When specifying tool-specific properties, such as ReSharper's extended properties (https://www.jetbrains.com/help/resharper/EditorConfig_Index.html)
+# Use the most generically-named version of the property (i.e. choose "brace_style" over "csharp_brace_style" or "resharper_csharp_brace_style")
+# Hopefully, these settings become supported by Visual Studio, or add-ins liks CodeMaid.
+
+
+# This file is the top-most EditorConfig file
+
+# All Files (Unless overridden elsewhere)
+[*]
+charset=utf-8
+end_of_line=crlf
+indent_size=4
+indent_style=space
+insert_final_newline=false

src/BuilderGenerator.UnitTests/Examples/OutputWithInternals.cs → src/BuilderGenerator.Tests.Unit/Examples/OutputWithInternals.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.CodeDom.Compiler;
 using BuilderGenerator;
 
@@ -15,24 +13,32 @@ public override BuilderGenerator.UnitTests.Person Build()
         {
             if (Object?.IsValueCreated != true)
             {
-                Object = new System.Lazy<BuilderGenerator.UnitTests.Person>(() =>
-                {
-                    var result = new BuilderGenerator.UnitTests.Person
-                    {
-                        FirstName = FirstName.Value,
-                        InternalString = InternalString.Value,
-                        LastName = LastName.Value,
-                    };
-
-                    return result;
-                });
-
-                PostProcess(Object.Value);
+                Object = new System.Lazy<BuilderGenerator.UnitTests.Person>(new BuilderGenerator.UnitTests.Person());
             }
 
+            Object.Value.FirstName = FirstName.Value;
+            Object.Value.InternalString = InternalString.Value;
+            Object.Value.LastName = LastName.Value;
+
+            PostProcess(Object.Value);
+
             return Object.Value;
         }
 
+        /// <summary>Sets the object to be returned by this instance.</summary>
+        /// <param name="value">The object to be returned.</param>
+        /// <returns>A reference to this builder instance.</returns>
+        public override Builder<BuilderGenerator.UnitTests.Person> WithObject(BuilderGenerator.UnitTests.Person value)
+        {
+            base.WithObject(value);
+
+            WithFirstName(value.FirstName);
+            WithInternalString(value.InternalString);
+            WithLastName(value.LastName);
+
+            return this;
+        }
+
         public PersonBuilderWithInternals WithFirstName(string value)
         {
             return WithFirstName(() => value);

src/BuilderGenerator.UnitTests/Examples/OutputWithoutInternals.cs → src/BuilderGenerator.Tests.Unit/Examples/OutputWithoutInternals.cs

@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.CodeDom.Compiler;
 using BuilderGenerator;
 
@@ -14,23 +12,30 @@ public override BuilderGenerator.UnitTests.Person Build()
         {
             if (Object?.IsValueCreated != true)
             {
-                Object = new System.Lazy<BuilderGenerator.UnitTests.Person>(() =>
-                {
-                    var result = new BuilderGenerator.UnitTests.Person
-                    {
-                        FirstName = FirstName.Value,
-                        LastName = LastName.Value,
-                    };
+                Object = new System.Lazy<BuilderGenerator.UnitTests.Person>(new BuilderGenerator.UnitTests.Person());
+            }
 
-                    return result;
-                });
+            Object.Value.FirstName = FirstName.Value;
+            Object.Value.LastName = LastName.Value;
 
-                PostProcess(Object.Value);
-            }
+            PostProcess(Object.Value);
 
             return Object.Value;
         }
 
+        /// <summary>Sets the object to be returned by this instance.</summary>
+        /// <param name="value">The object to be returned.</param>
+        /// <returns>A reference to this builder instance.</returns>
+        public override Builder<BuilderGenerator.UnitTests.Person> WithObject(BuilderGenerator.UnitTests.Person value)
+        {
+            base.WithObject(value);
+
+            WithFirstName(value.FirstName);
+            WithLastName(value.LastName);
+
+            return this;
+        }
+
         public PersonBuilderWithoutInternals WithFirstName(string value)
         {
             return WithFirstName(() => value);

src/BuilderGenerator.UnitTests/Given_a_BuilderGenerator.cs → src/BuilderGenerator.Tests.Unit/Given_a_BuilderGenerator.cs

@@ -7,14 +7,14 @@
 
 // ReSharper disable InconsistentNaming
 
-namespace BuilderGenerator.UnitTests;
+namespace BuilderGenerator.Tests.Unit;
 
 public abstract class Given_a_BuilderGenerator
 {
     public static string GetResourceAsString(Assembly assembly, string resourceName)
     {
         var manifestResourceNames = assembly.GetManifestResourceNames();
-        resourceName = manifestResourceNames.Single(x => x.Equals($"BuilderGenerator.UnitTests.Examples.{resourceName}", StringComparison.OrdinalIgnoreCase));
+        resourceName = manifestResourceNames.Single(x => x.Equals($"BuilderGenerator.Tests.Unit.Examples.{resourceName}", StringComparison.OrdinalIgnoreCase));
 
         using (var stream = assembly.GetManifestResourceStream(resourceName))
         {