♻️ more internalising

fluffynuts · Apr 16, 2024 · 2709cf6 · 2709cf6
1 parent 04c1215
commit 2709cf6
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 20 deletions.
diff --git a/...TestUtils/PeanutButter.TestUtils.AspNetCore/Builders/AuthorizationFilterContextBuilder.cs b/...TestUtils/PeanutButter.TestUtils.AspNetCore/Builders/AuthorizationFilterContextBuilder.cs
@@ -15,7 +15,7 @@
 #if BUILD_PEANUTBUTTER_INTERNAL
 using Imported.PeanutButter.TestUtils.AspNetCore.Fakes;
 using Imported.PeanutButter.Utils;
-namespace ImportedPeanutButter.TestUtils.AspNetCore.Builders;
+namespace Imported.PeanutButter.TestUtils.AspNetCore.Builders;
 #else
 using PeanutButter.TestUtils.AspNetCore.Fakes;
 using PeanutButter.Utils;

diff --git a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Builders/StringMapDerivativeBuilder.cs b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Builders/StringMapDerivativeBuilder.cs
@@ -1,8 +1,8 @@
-using PeanutButter.TestUtils.AspNetCore.Fakes;
-
-#if BUILD_PEANUTBUTTER_INTERNAL
+#if BUILD_PEANUTBUTTER_INTERNAL
+using Imported.PeanutButter.TestUtils.AspNetCore.Fakes;
 namespace Imported.PeanutButter.TestUtils.AspNetCore.Builders;
 #else
+using PeanutButter.TestUtils.AspNetCore.Fakes;
 namespace PeanutButter.TestUtils.AspNetCore.Builders;
 #endif
 

diff --git a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Builders/WebSocketManagerBuilder.cs b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Builders/WebSocketManagerBuilder.cs
@@ -3,11 +3,12 @@
 using System.Net.WebSockets;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
-using PeanutButter.TestUtils.AspNetCore.Fakes;
 
 #if BUILD_PEANUTBUTTER_INTERNAL
+using Imported.PeanutButter.TestUtils.AspNetCore.Fakes;
 namespace Imported.PeanutButter.TestUtils.AspNetCore.Builders;
 #else
+using PeanutButter.TestUtils.AspNetCore.Fakes;
 namespace PeanutButter.TestUtils.AspNetCore.Builders;
 #endif
 

diff --git a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Fakes/FakeFormFile.cs b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Fakes/FakeFormFile.cs
@@ -4,15 +4,16 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
-using PeanutButter.Utils;
 
 // ReSharper disable UnusedAutoPropertyAccessor.Global
 // ReSharper disable MemberCanBePrivate.Global
 // ReSharper disable ConstantNullCoalescingCondition
 
 #if BUILD_PEANUTBUTTER_INTERNAL
+using Imported.PeanutButter.Utils;
 namespace Imported.PeanutButter.TestUtils.AspNetCore.Fakes;
 #else
+using PeanutButter.Utils;
 namespace PeanutButter.TestUtils.AspNetCore.Fakes;
 #endif
 

diff --git a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Fakes/FakeHttpRequest.cs b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Fakes/FakeHttpRequest.cs
@@ -7,18 +7,20 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
-using PeanutButter.TestUtils.AspNetCore.Utils;
-using PeanutButter.Utils;
 // ReSharper disable RedundantNameQualifier
-
 // ReSharper disable ConstantConditionalAccessQualifier
-
 // ReSharper disable ConstantNullCoalescingCondition
 // ReSharper disable MemberCanBePrivate.Global
 
 #if BUILD_PEANUTBUTTER_INTERNAL
+using Imported.PeanutButter.TestUtils.AspNetCore.Utils;
+using Imported.PeanutButter.Utils;
+
 namespace Imported.PeanutButter.TestUtils.AspNetCore.Fakes;
 #else
+using PeanutButter.TestUtils.AspNetCore.Utils;
+using PeanutButter.Utils;
+
 namespace PeanutButter.TestUtils.AspNetCore.Fakes;
 #endif
 

diff --git a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Fakes/FakeModelMetadata.cs b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Fakes/FakeModelMetadata.cs
@@ -2,16 +2,17 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
-using static PeanutButter.RandomGenerators.RandomValueGen;
 
 // ReSharper disable ConditionIsAlwaysTrueOrFalse
 // ReSharper disable HeuristicUnreachableCode
 
 // ReSharper disable InconsistentNaming
 
 #if BUILD_PEANUTBUTTER_INTERNAL
+using static Imported.PeanutButter.RandomGenerators.RandomValueGen;
 namespace Imported.PeanutButter.TestUtils.AspNetCore.Fakes;
 #else
+using static PeanutButter.RandomGenerators.RandomValueGen;
 namespace PeanutButter.TestUtils.AspNetCore.Fakes;
 #endif
 

diff --git a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Fakes/FakeRequestCookieCollection.cs b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Fakes/FakeRequestCookieCollection.cs
@@ -2,11 +2,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Http;
-using PeanutButter.Utils;
 
 #if BUILD_PEANUTBUTTER_INTERNAL
+using Imported.PeanutButter.Utils;
 namespace Imported.PeanutButter.TestUtils.AspNetCore.Fakes;
 #else
+using PeanutButter.Utils;
 namespace PeanutButter.TestUtils.AspNetCore.Fakes;
 #endif
 

diff --git a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Fakes/StringValueMap.cs b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Fakes/StringValueMap.cs
@@ -2,13 +2,14 @@
 using System.Collections;
 using System.Collections.Generic;
 using Microsoft.Extensions.Primitives;
-using PeanutButter.Utils.Dictionaries;
 
 // ReSharper disable PublicConstructorInAbstractClass
 
 #if BUILD_PEANUTBUTTER_INTERNAL
+using Imported.PeanutButter.Utils.Dictionaries;
 namespace Imported.PeanutButter.TestUtils.AspNetCore.Fakes;
 #else
+using PeanutButter.Utils.Dictionaries;
 namespace PeanutButter.TestUtils.AspNetCore.Fakes;
 #endif
 

diff --git a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/HttpResponseExtensions.cs b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/HttpResponseExtensions.cs
@@ -1,9 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Generic;
 using System.Net;
 using Microsoft.AspNetCore.Http;
-using PeanutButter.Utils;
 
 #if BUILD_PEANUTBUTTER_INTERNAL
 namespace Imported.PeanutButter.TestUtils.AspNetCore;
@@ -14,7 +11,12 @@ namespace PeanutButter.TestUtils.AspNetCore;
 /// <summary>
 /// Provides extensions for asp.net HttpResponse objects
 /// </summary>
-public static class HttpResponseExtensions
+#if BUILD_PEANUTBUTTER_INTERNAL
+internal
+#else
+public
+#endif
+    static class HttpResponseExtensions
 {
     /// <summary>
     /// ASP.NET core HttpResponse objects don't provide

diff --git a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Utils/FormFileExtensions.cs b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Utils/FormFileExtensions.cs
@@ -1,11 +1,12 @@
 using System.IO;
 using System.Text;
 using Microsoft.AspNetCore.Http;
-using PeanutButter.Utils;
 
 #if BUILD_PEANUTBUTTER_INTERNAL
+using Imported.PeanutButter.Utils;
 namespace Imported.PeanutButter.TestUtils.AspNetCore.Utils;
 #else
+using PeanutButter.Utils;
 namespace PeanutButter.TestUtils.AspNetCore.Utils;
 #endif
 

diff --git a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Utils/UrlEncodedBodyEncoder.cs b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Utils/UrlEncodedBodyEncoder.cs
@@ -1,11 +1,12 @@
 using System.IO;
 using System.Net;
 using Microsoft.AspNetCore.Http;
-using PeanutButter.Utils;
 
 #if BUILD_PEANUTBUTTER_INTERNAL
+using Imported.PeanutButter.Utils;
 namespace Imported.PeanutButter.TestUtils.AspNetCore.Utils;
 #else
+using PeanutButter.Utils;
 namespace PeanutButter.TestUtils.AspNetCore.Utils;
 #endif