Also change namespaces for tests under Serenity.Net.CodeGenerator.Tes…

…ts and Serene.Tests to match the namespace of the type that is under test.

serene/tests/Serene.Tests/extensions/BasePermissionServiceTTests.cs

@@ -1,9 +1,7 @@
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Options;
-using Serenity.Extensions;
-
-namespace Serenity.Tests.Extensions;
+namespace Serenity.Extensions;
 
 public class BasePermissionServiceTTests
 {

serene/tests/Serene.Tests/extensions/ExtensionsTypeSourceTests.cs

@@ -1,6 +1,4 @@
-using Serenity.Extensions;
-
-namespace Serenity.Tests.Extensions;
+namespace Serenity.Extensions;
 
 public class ExtensionsTypeSourceTests
 {

serene/tests/Serene.Tests/modules/appservices/TypeSourceTests.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Builder;
 
-namespace Serene.Tests;
+namespace Serene;
 
 public class TypeSourceTests
 {

serene/tests/Serene.Tests/testutils/mocks/MockUserPermissionRow.cs

@@ -1,4 +1,4 @@
-namespace Serenity.Tests;
+namespace Serenity.TestUtils;
 
 public sealed class MockUserPermissionRow : Row<MockUserPermissionRow.RowFields>, IUserPermissionRow
 {

serene/tests/Serene.Tests/testutils/mocks/MockUserRoleRow.cs

@@ -1,4 +1,4 @@
-namespace Serenity.Tests;
+namespace Serenity.TestUtils;
 
 public class MockUserRoleRow : Row<MockUserRoleRow.RowFields>, IUserRoleRow
 {

tests/Serenity.Net.CodeGenerator.Tests/ArgumentReaderTests.cs

@@ -1,6 +1,4 @@
-using Serenity.CodeGenerator;
-
-namespace Serenity.Tests.CodeGenerator;
+namespace Serenity.CodeGenerator;
 
 public partial class ArgumentReaderTests
 {

tests/Serenity.Net.CodeGenerator.Tests/CliTests.cs

@@ -1,8 +1,7 @@
-using Serenity.CodeGenerator;
 using Xunit.Sdk;
-using CallType = Serenity.Tests.MockGeneratorConsole.CallType;
+using CallType = Serenity.TestUtils.MockGeneratorConsole.CallType;
 
-namespace Serenity.Tests.CodeGenerator;
+namespace Serenity.CodeGenerator;
 
 public partial class CliTests
 {

tests/Serenity.Net.CodeGenerator.Tests/EntityModelGeneratorTests/CustomerDataSchema.cs

@@ -1,8 +1,7 @@
-using static Serenity.Tests.CustomerEntityInputs;
-using Serenity.CodeGenerator;
+using static Serenity.CodeGenerator.CustomerEntityInputs;
 using Serenity.Data.Schema;
 
-namespace Serenity.Tests;
+namespace Serenity.CodeGenerator;
 
 public class CustomerDataSchema : IEntityDataSchema
 {

tests/Serenity.Net.CodeGenerator.Tests/EntityModelGeneratorTests/CustomerEntityInputs.cs

@@ -1,7 +1,5 @@
-
-using Serenity.CodeGenerator;
 
-namespace Serenity.Tests;
+namespace Serenity.CodeGenerator;
 
 public class CustomerEntityInputs : EntityModelInputs
 {

tests/Serenity.Net.CodeGenerator.Tests/EntityModelGeneratorTests/EntityModelGeneratorTests.cs

@@ -1,9 +1,8 @@
-using Serenity.CodeGenerator;
-using static Serenity.Tests.CustomerEntityInputs;
+using static Serenity.CodeGenerator.CustomerEntityInputs;
 
-namespace Serenity.Tests.CodeGenerator;
+namespace Serenity.CodeGenerator;
 
-public partial class EntiyModelGeneratorTests
+public partial class EntityModelFactoryTests
 {
     [Fact]
     public void Throws_ArgumentNull_If_Inputs_Is_Null()

tests/Serenity.Net.CodeGenerator.Tests/GeneratorConfigTests/GeneratorConfigTests.Extends.cs

@@ -1,6 +1,4 @@
-using Serenity.CodeGenerator;
-
-namespace Serenity.Tests.CodeGenerator;
+namespace Serenity.CodeGenerator;
 
 public partial class GeneratorConfigTests
 {

tests/Serenity.Net.CodeGenerator.Tests/MvcCommandTests/MvcCommandTests.cs

@@ -1,6 +1,4 @@
-using Serenity.CodeGenerator;
-
-namespace Serenity.Tests.CodeGenerator;
+namespace Serenity.CodeGenerator;
 
 public partial class MvcCommandTests
 {

tests/Serenity.Net.CodeGenerator.Tests/ServerTypingsGeneratorTests.DynamicPropertyType.cs

@@ -1,6 +1,6 @@
 using ServerTypingsTest.DynamicPropertyType;
 
-namespace Serenity.Tests.CodeGenerator
+namespace Serenity.CodeGeneration
 {
     public partial class ServerTypingsGeneratorTests
     {

tests/Serenity.Net.CodeGenerator.Tests/ServerTypingsGeneratorTests.FormUnknownEditorType.cs

@@ -1,26 +1,26 @@
-namespace Serenity.Tests.CodeGenerator
+namespace Serenity.CodeGeneration;
+
+public partial class ServerTypingsGeneratorTests
 {
-    public partial class ServerTypingsGeneratorTests
+    [Fact]
+    public void Form_WithUnknownEditorType_Generates_WidgetAny()
     {
-        [Fact]
-        public void Form_WithUnknownEditorType_Generates_WidgetAny()
+        var generator = CreateGenerator(typeof(FormWithUnknownEditor));
+        generator.AddTSType(new()
         {
-            var generator = CreateGenerator(typeof(FormWithUnknownEditor));
-            generator.AddTSType(new()
-            {
-                Name = "Widget",
-                Module = "@serenity-is/corelib",
-                GenericParameters =
-                [
-                    new()
-                    {
-                        Name = "TOptions",
-                    }
-                ]
-            });
-            var result = generator.Run();
-            var code = Assert.Single(result).Text;
-            Assert.Equal(NormalizeTS(@"import { Widget, PrefixedContext, initFormType } from ""@serenity-is/corelib"";
+            Name = "Widget",
+            Module = "@serenity-is/corelib",
+            GenericParameters =
+            [
+                new()
+                {
+                    Name = "TOptions",
+                }
+            ]
+        });
+        var result = generator.Run();
+        var code = Assert.Single(result).Text;
+        Assert.Equal(NormalizeTS(@"import { Widget, PrefixedContext, initFormType } from ""@serenity-is/corelib"";
 
 export interface FormWithUnknownEditor {
     Test: Widget;
@@ -44,13 +44,12 @@ export class FormWithUnknownEditor extends PrefixedContext {
         }
     }
 }"), NormalizeTS(code));
-        }
     }
+}
 
-    [FormScript("FormWithUnknownEditor")]
-    public class FormWithUnknownEditor
-    {
-        [EditorType("UnknownEditorKey")]
-        public string Test { get; set; }
-    }
+[FormScript("FormWithUnknownEditor")]
+public class FormWithUnknownEditor
+{
+    [EditorType("UnknownEditorKey")]
+    public string Test { get; set; }
 }

tests/Serenity.Net.CodeGenerator.Tests/ServerTypingsGeneratorTests.PermissionKeys.cs

@@ -1,6 +1,6 @@
 using ServerTypingsTest.PermissionKeys;
 
-namespace Serenity.Tests.CodeGenerator
+namespace Serenity.CodeGeneration
 {
     public partial class ServerTypingsGeneratorTests
     {

tests/Serenity.Net.CodeGenerator.Tests/ServerTypingsGeneratorTests.RowLocalTextPrefix.cs

@@ -1,6 +1,6 @@
 using ServerTypingsTest.SomeModule.Entities;
 
-namespace Serenity.Tests.CodeGenerator
+namespace Serenity.CodeGeneration
 {
     public partial class ServerTypingsGeneratorTests
     {

tests/Serenity.Net.CodeGenerator.Tests/ServerTypingsGeneratorTests.RowLookupKey.cs

@@ -1,8 +1,7 @@
 using ServerTypingsTest.RowLookupKeyModule.Entities;
 
-namespace Serenity.Tests.CodeGenerator
+namespace Serenity.CodeGeneration
 {
-
     public partial class ServerTypingsGeneratorTests
     {
         [Fact]

tests/Serenity.Net.CodeGenerator.Tests/ServerTypingsGeneratorTests.RowNameProperty.cs

@@ -1,4 +1,4 @@
-namespace Serenity.Tests.CodeGenerator
+namespace Serenity.CodeGeneration
 {
     public partial class ServerTypingsGeneratorTests
     {

tests/Serenity.Net.CodeGenerator.Tests/ServerTypingsGeneratorTests.ServiceReturnTypes.cs

@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using ServerTypingsTest.ServiceReturnTypes;
 
-namespace Serenity.Tests.CodeGenerator
+namespace Serenity.CodeGeneration
 {
     public partial class ServerTypingsGeneratorTests
     {

tests/Serenity.Net.CodeGenerator.Tests/ServerTypingsGeneratorTests.TypeWithGenericParameters.cs

@@ -1,6 +1,6 @@
 using ServerTypingsTest.TypeWithGenericParameters;
 
-namespace Serenity.Tests.CodeGenerator
+namespace Serenity.CodeGeneration
 {
     public partial class ServerTypingsGeneratorTests
     {

tests/Serenity.Net.CodeGenerator.Tests/ServerTypingsGeneratorTests.cs

@@ -1,7 +1,6 @@
 using Mono.Cecil;
-using Serenity.CodeGeneration;
 
-namespace Serenity.Tests.CodeGenerator;
+namespace Serenity.CodeGeneration;
 
 public partial class ServerTypingsGeneratorTests
 {

tests/Serenity.Net.CodeGenerator.Tests/TSConfigHelperTests/TSConfigHelperTests.ListFiles.cs

@@ -1,6 +1,4 @@
-using Serenity.CodeGenerator;
-
-namespace Serenity.Tests.CodeGenerator;
+namespace Serenity.CodeGenerator;
 
 public partial class TSConfigHelperTests
 {

tests/Serenity.Net.CodeGenerator.Tests/TSTypeListerASTTests/TSTypeListerASTTests.BuiltinTSTypesGenerator.cs

@@ -1,7 +1,6 @@
-using Serenity.CodeGenerator;
 using Serenity.Reflection;
 
-namespace Serenity.Tests.CodeGenerator;
+namespace Serenity.CodeGenerator;
 
 public partial class TSTypeListerASTTests
 {

tests/Serenity.Net.CodeGenerator.Tests/TSTypeListerASTTests/TSTypeListerASTTests.ModuleDTS.cs

@@ -1,6 +1,4 @@
-using Serenity.CodeGenerator;
-
-namespace Serenity.Tests.CodeGenerator;
+namespace Serenity.CodeGenerator;
 
 public partial class TSTypeListerASTTests
 {

tests/Serenity.Net.CodeGenerator.Tests/TSTypeListerASTTests/TSTypeListerASTTests.ModuleExportedType.cs

@@ -1,6 +1,4 @@
-using Serenity.CodeGenerator;
-
-namespace Serenity.Tests.CodeGenerator;
+namespace Serenity.CodeGenerator;
 
 public partial class TSTypeListerASTTests
 {

tests/Serenity.Net.CodeGenerator.Tests/TSTypeListerASTTests/TSTypeListerASTTests.ModuleResolution.cs

@@ -1,6 +1,4 @@
-using Serenity.CodeGenerator;
-
-namespace Serenity.Tests.CodeGenerator;
+namespace Serenity.CodeGenerator;
 
 public partial class TSTypeListerASTTests
 {

tests/Serenity.Net.CodeGenerator.Tests/TSTypeListerASTTests/TSTypeListerASTTests.ModuleTypeReference.cs

@@ -1,6 +1,4 @@
-using Serenity.CodeGenerator;
-
-namespace Serenity.Tests.CodeGenerator;
+namespace Serenity.CodeGenerator;
 
 public partial class TSTypeListerASTTests
 {

tests/Serenity.Net.CodeGenerator.Tests/TSTypeListerASTTests/TSTypeListerASTTests.NamespaceDTS.cs

@@ -1,6 +1,4 @@
-using Serenity.CodeGenerator;
-
-namespace Serenity.Tests.CodeGenerator;
+namespace Serenity.CodeGenerator;
 
 public partial class TSTypeListerASTTests
 {

tests/Serenity.Net.CodeGenerator.Tests/TSTypeListerASTTests/TSTypeListerASTTests.NamespaceDecoratorRefs.cs

@@ -1,6 +1,4 @@
-using Serenity.CodeGenerator;
-
-namespace Serenity.Tests.CodeGenerator;
+namespace Serenity.CodeGenerator;
 
 public partial class TSTypeListerASTTests
 {

tests/Serenity.Net.CodeGenerator.Tests/TSTypeListerASTTests/TSTypeListerASTTests.NamespaceTypeRefs.cs

@@ -1,6 +1,4 @@
-using Serenity.CodeGenerator;
-
-namespace Serenity.Tests.CodeGenerator;
+namespace Serenity.CodeGenerator;
 
 public partial class TSTypeListerASTTests
 {

tests/Serenity.Net.CodeGenerator.Tests/TemplateTests/BaseTemplateTest.cs

@@ -1,6 +1,6 @@
-using Serenity.CodeGenerator;
+using Serenity.CodeGenerator;
 
-namespace Serenity.Tests.CodeGenerator;
+namespace Serenity.CodeGenerator;
 
 public abstract class BaseTemplateTest
 {

tests/Serenity.Net.CodeGenerator.Tests/TemplateTests/ColumnsTemplateTests/ColumnsTemplateTests.Customer_Defaults.cs

@@ -1,4 +1,4 @@
-namespace Serenity.Tests.CodeGenerator;
+namespace Serenity.CodeGenerator;
 
 public partial class ColumnsTemplateTests : BaseTemplateTest
 {

tests/Serenity.Net.CodeGenerator.Tests/TemplateTests/CustomerEntityModel.cs

@@ -1,7 +1,6 @@
-using Serenity.CodeGenerator;
-using static Serenity.Tests.CustomerEntityInputs;
+using static Serenity.CodeGenerator.CustomerEntityInputs;
 
-namespace Serenity.Tests;
+namespace Serenity.CodeGenerator;
 
 public class CustomerEntityModel : EntityModel
 {

tests/Serenity.Net.CodeGenerator.Tests/TemplateTests/FormTemplateTests/FormTemplateTests.Customer_Defaults.cs

@@ -1,4 +1,4 @@
-namespace Serenity.Tests.CodeGenerator;
+namespace Serenity.CodeGenerator;
 
 public partial class FormTemplateTests : BaseTemplateTest
 {

tests/Serenity.Net.CodeGenerator.Tests/TemplateTests/RowTemplateTests/RowTemplateTests.Customer_DeclareJoinConstants.cs

@@ -1,4 +1,4 @@
-namespace Serenity.Tests.CodeGenerator;
+namespace Serenity.CodeGenerator;
 
 public partial class RowTemplateTests
 {

tests/Serenity.Net.CodeGenerator.Tests/TemplateTests/RowTemplateTests/RowTemplateTests.Customer_Defaults.cs

@@ -1,4 +1,4 @@
-namespace Serenity.Tests.CodeGenerator;
+namespace Serenity.CodeGenerator;
 
 public partial class RowTemplateTests : BaseTemplateTest
 {

tests/Serenity.Net.CodeGenerator.Tests/TemplateTests/RowTemplateTests/RowTemplateTests.Customer_EnableGenerateFields.cs

@@ -1,4 +1,4 @@
-namespace Serenity.Tests.CodeGenerator;
+namespace Serenity.CodeGenerator;
 
 public partial class RowTemplateTests
 {

tests/Serenity.Net.CodeGenerator.Tests/TemplateTests/RowTemplateTests/RowTemplateTests.Customer_EnableRowTemplates.cs

@@ -1,4 +1,4 @@
-namespace Serenity.Tests.CodeGenerator;
+namespace Serenity.CodeGenerator;
 
 public partial class RowTemplateTests
 {

tests/Serenity.Net.CodeGenerator.Tests/TemplateTests/RowTemplateTests/RowTemplateTests.Customer_FileScopedNamespace.cs

@@ -1,4 +1,4 @@
-namespace Serenity.Tests.CodeGenerator;
+namespace Serenity.CodeGenerator;
 
 public partial class RowTemplateTests
 {

tests/Serenity.Net.CodeGenerator.Tests/TemplateTests/RowTemplateTests/RowTemplateTests.Customer_GlobalUsings.cs

@@ -1,4 +1,4 @@
-namespace Serenity.Tests.CodeGenerator;
+namespace Serenity.CodeGenerator;
 
 public partial class RowTemplateTests
 {

tests/Serenity.Net.CodeGenerator.Tests/TypeScriptTests/TypeScriptTests.AwaitImport.cs

@@ -1,6 +1,4 @@
-using Serenity.TypeScript;
-
-namespace Serenity.Tests.CodeGenerator;
+namespace Serenity.TypeScript;
 
 public partial class TypeScriptTests
 {