Minor test project refactor

adambajguz · Jul 12, 2021 · f928335 · f928335
1 parent e3e8c69
commit f928335
Show file tree

Hide file tree

Showing 137 changed files with 959 additions and 392 deletions.
diff --git a/src/Typin/Typin.Core/ApplicationConfiguration.cs b/src/Typin/Typin.Core/ApplicationConfiguration.cs
@@ -17,17 +17,17 @@ public class ApplicationConfiguration
         /// <summary>
         /// Command types defined in this application.
         /// </summary>
-        public IReadOnlyList<Type> CommandTypes { get; }
+        public IReadOnlyCollection<Type> CommandTypes { get; }
 
         /// <summary>
         /// Dynamic command types defined in this application.
         /// </summary>
-        public IReadOnlyList<Type> DynamicCommandTypes { get; }
+        public IReadOnlyCollection<Type> DynamicCommandTypes { get; }
 
         /// <summary>
         /// Custom directives defined in this application.
         /// </summary>
-        public IReadOnlyList<Type> DirectiveTypes { get; }
+        public IReadOnlyCollection<Type> DirectiveTypes { get; }
 
         /// <summary>
         /// Collection of middlewares in application.
@@ -48,9 +48,9 @@ public class ApplicationConfiguration
         /// Initializes an instance of <see cref="ApplicationConfiguration"/>.
         /// </summary>
         public ApplicationConfiguration(IReadOnlyList<Type> modeTypes,
-                                        IReadOnlyList<Type> commandTypes,
-                                        IReadOnlyList<Type> dynamicCommandTypes,
-                                        IReadOnlyList<Type> customDirectives,
+                                        IReadOnlyCollection<Type> commandTypes,
+                                        IReadOnlyCollection<Type> dynamicCommandTypes,
+                                        IReadOnlyCollection<Type> customDirectives,
                                         LinkedList<Type> middlewareTypes,
                                         Type startupMode,
                                         IEnumerable<ServiceDescriptor> services)

diff --git a/src/Typin/Typin.Core/ICliCommandExecutor.cs b/src/Typin/Typin.Core/ICliCommandExecutor.cs
@@ -12,7 +12,7 @@ public interface ICliCommandExecutor
         /// <summary>
         /// Executes a command.
         /// </summary>
-        Task<int> ExecuteCommandAsync(IEnumerable<string> commandLineArguments);
+        Task<int> ExecuteCommandAsync(IEnumerable<string> commandLineArguments); //TODO: add cancellation token
 
         /// <summary>
         /// Executes a command.

diff --git a/src/Typin/Typin.Core/Typin.Core.csproj b/src/Typin/Typin.Core/Typin.Core.csproj
@@ -35,6 +35,12 @@
     <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
       <_Parameter1>Typin</_Parameter1>
     </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
+      <_Parameter1>Typin.Tests</_Parameter1>
+    </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
+      <_Parameter1>Typin.Tests.Data.Common</_Parameter1>
+    </AssemblyAttribute>
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">

diff --git a/...Data/Commands/SelfSerializeCommandBase.cs → ...mmon/Commands/SelfSerializeCommandBase.cs b/...Data/Commands/SelfSerializeCommandBase.cs → ...mmon/Commands/SelfSerializeCommandBase.cs
@@ -1,4 +1,4 @@
-namespace Typin.Tests.Data.Commands
+namespace Typin.Tests.Data.Common.Commands
 {
     using System.Threading;
     using System.Threading.Tasks;

diff --git a/src/Typin/Typin.Tests/Data/Console/Ansi.cs → ...n/Typin.Tests.Data.Common/Console/Ansi.cs b/src/Typin/Typin.Tests/Data/Console/Ansi.cs → ...n/Typin.Tests.Data.Common/Console/Ansi.cs
diff --git a/....Tests/Data/Console/VirtualAnsiConsole.cs → ...Data.Common/Console/VirtualAnsiConsole.cs b/....Tests/Data/Console/VirtualAnsiConsole.cs → ...Data.Common/Console/VirtualAnsiConsole.cs
diff --git a/...a/CustomTypes/Initializable/CustomEnum.cs → ...n/CustomTypes/Initializable/CustomEnum.cs b/...a/CustomTypes/Initializable/CustomEnum.cs → ...n/CustomTypes/Initializable/CustomEnum.cs
diff --git a/...nitializable/CustomStringConstructible.cs → ...nitializable/CustomStringConstructible.cs b/...nitializable/CustomStringConstructible.cs → ...nitializable/CustomStringConstructible.cs
diff --git a/...pes/Initializable/CustomStringParsable.cs → ...pes/Initializable/CustomStringParsable.cs b/...pes/Initializable/CustomStringParsable.cs → ...pes/Initializable/CustomStringParsable.cs
diff --git a/...CustomStringParsableWithFormatProvider.cs → ...CustomStringParsableWithFormatProvider.cs b/...CustomStringParsableWithFormatProvider.cs → ...CustomStringParsableWithFormatProvider.cs
diff --git a/...rter/InitializableClassTypeByConverter.cs → ...rter/InitializableClassTypeByConverter.cs b/...rter/InitializableClassTypeByConverter.cs → ...rter/InitializableClassTypeByConverter.cs
diff --git a/...alizableClassTypeByConverter_Converter.cs → ...alizableClassTypeByConverter_Converter.cs b/...alizableClassTypeByConverter_Converter.cs → ...alizableClassTypeByConverter_Converter.cs
diff --git a/...eClassTypeByConverter_FailingConverter.cs → ...eClassTypeByConverter_FailingConverter.cs b/...eClassTypeByConverter_FailingConverter.cs → ...eClassTypeByConverter_FailingConverter.cs
diff --git a/...ter/InitializableEnumerableByConverter.cs → ...ter/InitializableEnumerableByConverter.cs b/...ter/InitializableEnumerableByConverter.cs → ...ter/InitializableEnumerableByConverter.cs
diff --git a/...lizableEnumerableByConverter_Converter.cs → ...lizableEnumerableByConverter_Converter.cs b/...lizableEnumerableByConverter_Converter.cs → ...lizableEnumerableByConverter_Converter.cs
diff --git a/...EnumerableByConverter_FailingConverter.cs → ...EnumerableByConverter_FailingConverter.cs b/...EnumerableByConverter_FailingConverter.cs → ...EnumerableByConverter_FailingConverter.cs
diff --git a/...ullableStructTypeByConverter_Converter.cs → ...ullableStructTypeByConverter_Converter.cs b/...ullableStructTypeByConverter_Converter.cs → ...ullableStructTypeByConverter_Converter.cs
diff --git a/...StructTypeByConverter_FailingConverter.cs → ...StructTypeByConverter_FailingConverter.cs b/...StructTypeByConverter_FailingConverter.cs → ...StructTypeByConverter_FailingConverter.cs
diff --git a/...ter/InitializableStructTypeByConverter.cs → ...ter/InitializableStructTypeByConverter.cs b/...ter/InitializableStructTypeByConverter.cs → ...ter/InitializableStructTypeByConverter.cs
diff --git a/...lizableStructTypeByConverter_Converter.cs → ...lizableStructTypeByConverter_Converter.cs b/...lizableStructTypeByConverter_Converter.cs → ...lizableStructTypeByConverter_Converter.cs
diff --git a/...StructTypeByConverter_FailingConverter.cs → ...StructTypeByConverter_FailingConverter.cs b/...StructTypeByConverter_FailingConverter.cs → ...StructTypeByConverter_FailingConverter.cs
diff --git a/...nitializable/NonInitializableClassType.cs → ...nitializable/NonInitializableClassType.cs b/...nitializable/NonInitializableClassType.cs → ...nitializable/NonInitializableClassType.cs
diff --git a/...itializable/NonInitializableEnumerable.cs → ...itializable/NonInitializableEnumerable.cs b/...itializable/NonInitializableEnumerable.cs → ...itializable/NonInitializableEnumerable.cs
diff --git a/...itializable/NonInitializableStructType.cs → ...itializable/NonInitializableStructType.cs b/...itializable/NonInitializableStructType.cs → ...itializable/NonInitializableStructType.cs
diff --git a/.../Typin.Tests/Extensions/JsonExtensions.cs → ....Data.Common/Extensions/JsonExtensions.cs b/.../Typin.Tests/Extensions/JsonExtensions.cs → ....Data.Common/Extensions/JsonExtensions.cs
@@ -2,7 +2,7 @@
 {
     using Newtonsoft.Json;
 
-    internal static class JsonExtensions
+    public static class JsonExtensions
     {
         private static readonly JsonSerializerSettings _settings;
 

diff --git a/...Tests/Extensions/TestStringExtenstions.cs → ...ommon/Extensions/TestStringExtenstions.cs b/...Tests/Extensions/TestStringExtenstions.cs → ...ommon/Extensions/TestStringExtenstions.cs
@@ -2,7 +2,7 @@
 {
     using System.Collections.Generic;
 
-    internal static class TestStringExtenstions
+    public static class TestStringExtenstions
     {
         public static string JoinToInteractiveCommand(this IEnumerable<string> commands)
         {

diff --git a/...ypin.Tests/Data/Help/DefaultHelpWriter.cs → ...sts.Data.Common/Help/DefaultHelpWriter.cs b/...ypin.Tests/Data/Help/DefaultHelpWriter.cs → ...sts.Data.Common/Help/DefaultHelpWriter.cs
diff --git a/.../Middlewares/DirectivesCheckMiddleware.cs → .../Middlewares/DirectivesCheckMiddleware.cs b/.../Middlewares/DirectivesCheckMiddleware.cs → .../Middlewares/DirectivesCheckMiddleware.cs
diff --git a/.../Middlewares/ExecutionTimingMiddleware.cs → .../Middlewares/ExecutionTimingMiddleware.cs b/.../Middlewares/ExecutionTimingMiddleware.cs → .../Middlewares/ExecutionTimingMiddleware.cs
diff --git a/...ts/Data/Middlewares/ExitCodeMiddleware.cs → ....Common/Middlewares/ExitCodeMiddleware.cs b/...ts/Data/Middlewares/ExitCodeMiddleware.cs → ....Common/Middlewares/ExitCodeMiddleware.cs
diff --git a/.../Typin.Tests/Data/Services/DependencyA.cs → ...Tests.Data.Common/Services/DependencyA.cs b/.../Typin.Tests/Data/Services/DependencyA.cs → ...Tests.Data.Common/Services/DependencyA.cs
diff --git a/.../Typin.Tests/Data/Services/DependencyB.cs → ...Tests.Data.Common/Services/DependencyB.cs b/.../Typin.Tests/Data/Services/DependencyB.cs → ...Tests.Data.Common/Services/DependencyB.cs
diff --git a/.../Typin.Tests/Data/Services/DependencyC.cs → ...Tests.Data.Common/Services/DependencyC.cs b/.../Typin.Tests/Data/Services/DependencyC.cs → ...Tests.Data.Common/Services/DependencyC.cs
diff --git a/...pin.Tests/Data/TestAutoCompleteHandler.cs → ...ts.Data.Common/TestAutoCompleteHandler.cs b/...pin.Tests/Data/TestAutoCompleteHandler.cs → ...ts.Data.Common/TestAutoCompleteHandler.cs
@@ -3,7 +3,7 @@
     using System;
     using Typin.AutoCompletion;
 
-    internal class TestAutoCompleteHandler : IAutoCompletionHandler
+    public class TestAutoCompleteHandler : IAutoCompletionHandler
     {
         public char[] Separators { get; set; } = new[] { ' ', '.', '/', '\\', ':' };
 

diff --git a/src/Typin/Typin.Tests.Data.Common/Typin.Tests.Data.Common.csproj b/src/Typin/Typin.Tests.Data.Common/Typin.Tests.Data.Common.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <Configurations>Debug;Release</Configurations>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Typin\Typin.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/...Commands/Valid/GenericExceptionCommand.cs → ...icatedCommands/GenericExceptionCommand.cs b/...Commands/Valid/GenericExceptionCommand.cs → ...icatedCommands/GenericExceptionCommand.cs
@@ -5,7 +5,7 @@
     using System.Threading.Tasks;
     using Typin.Attributes;
 
-    [Command("cmd")]
+    [Command("duplicated-ex")]
     public class GenericExceptionCommand : ICommand
     {
         [Option("msg", 'm')]

diff --git a/...nds/Valid/GenericInnerExceptionCommand.cs → ...dCommands/GenericInnerExceptionCommand.cs b/...nds/Valid/GenericInnerExceptionCommand.cs → ...dCommands/GenericInnerExceptionCommand.cs
@@ -5,7 +5,7 @@
     using System.Threading.Tasks;
     using Typin.Attributes;
 
-    [Command("cmd")]
+    [Command("duplicated-ex")]
     public class GenericInnerExceptionCommand : ICommand
     {
         [Option("msg", 'm')]

diff --git a/....Tests.Data.Invalid.DuplicatedCommands/Typin.Tests.Data.Invalid.DuplicatedCommands.csproj b/....Tests.Data.Invalid.DuplicatedCommands/Typin.Tests.Data.Invalid.DuplicatedCommands.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <Configurations>Debug;Release</Configurations>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Typin.Tests.Data.Common\Typin.Tests.Data.Common.csproj" />
+    <ProjectReference Include="..\Typin\Typin.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/.../Invalid/ConflictWithHelpOptionCommand.cs → ...Commands/ConflictWithHelpOptionCommand.cs b/.../Invalid/ConflictWithHelpOptionCommand.cs → ...Commands/ConflictWithHelpOptionCommand.cs
@@ -2,7 +2,7 @@
 {
     using Typin.Attributes;
     using Typin.Console;
-    using Typin.Tests.Data.Commands;
+    using Typin.Tests.Data.Common.Commands;
 
     [Command("cmd")]
     public class ConflictWithHelpOptionCommand : SelfSerializeCommandBase

diff --git a/...valid/ConflictWithVersionOptionCommand.cs → ...mands/ConflictWithVersionOptionCommand.cs b/...valid/ConflictWithVersionOptionCommand.cs → ...mands/ConflictWithVersionOptionCommand.cs
@@ -2,7 +2,7 @@
 {
     using Typin.Attributes;
     using Typin.Console;
-    using Typin.Tests.Data.Commands;
+    using Typin.Tests.Data.Common.Commands;
 
     // Must be default because version option is available only on default commands
     [Command]

diff --git a/...eOptionEnvironmentVariableNamesCommand.cs → ...eOptionEnvironmentVariableNamesCommand.cs b/...eOptionEnvironmentVariableNamesCommand.cs → ...eOptionEnvironmentVariableNamesCommand.cs
@@ -2,7 +2,7 @@
 {
     using Typin.Attributes;
     using Typin.Console;
-    using Typin.Tests.Data.Commands;
+    using Typin.Tests.Data.Common.Commands;
 
     [Command("cmd")]
     public class DuplicateOptionEnvironmentVariableNamesCommand : SelfSerializeCommandBase

diff --git a/...ds/Invalid/DuplicateOptionNamesCommand.cs → ...d/Commands/DuplicateOptionNamesCommand.cs b/...ds/Invalid/DuplicateOptionNamesCommand.cs → ...d/Commands/DuplicateOptionNamesCommand.cs
@@ -2,7 +2,7 @@
 {
     using Typin.Attributes;
     using Typin.Console;
-    using Typin.Tests.Data.Commands;
+    using Typin.Tests.Data.Common.Commands;
 
     [Command("cmd")]
     public class DuplicateOptionNamesCommand : SelfSerializeCommandBase

diff --git a/...valid/DuplicateOptionShortNamesCommand.cs → ...mands/DuplicateOptionShortNamesCommand.cs b/...valid/DuplicateOptionShortNamesCommand.cs → ...mands/DuplicateOptionShortNamesCommand.cs
@@ -2,7 +2,7 @@
 {
     using Typin.Attributes;
     using Typin.Console;
-    using Typin.Tests.Data.Commands;
+    using Typin.Tests.Data.Common.Commands;
 
     [Command("cmd")]
     public class DuplicateOptionShortNamesCommand : SelfSerializeCommandBase

diff --git a/.../Invalid/DuplicateParameterNameCommand.cs → ...Commands/DuplicateParameterNameCommand.cs b/.../Invalid/DuplicateParameterNameCommand.cs → ...Commands/DuplicateParameterNameCommand.cs
@@ -2,7 +2,7 @@
 {
     using Typin.Attributes;
     using Typin.Console;
-    using Typin.Tests.Data.Commands;
+    using Typin.Tests.Data.Common.Commands;
 
     [Command("cmd")]
     public class DuplicateParameterNameCommand : SelfSerializeCommandBase

diff --git a/...Invalid/DuplicateParameterOrderCommand.cs → ...ommands/DuplicateParameterOrderCommand.cs b/...Invalid/DuplicateParameterOrderCommand.cs → ...ommands/DuplicateParameterOrderCommand.cs
@@ -2,7 +2,7 @@
 {
     using Typin.Attributes;
     using Typin.Console;
-    using Typin.Tests.Data.Commands;
+    using Typin.Tests.Data.Common.Commands;
 
     [Command("cmd")]
     public class DuplicateParameterOrderCommand : SelfSerializeCommandBase

diff --git a/...ommands/Invalid/EmptyOptionNameCommand.cs → ...nvalid/Commands/EmptyOptionNameCommand.cs b/...ommands/Invalid/EmptyOptionNameCommand.cs → ...nvalid/Commands/EmptyOptionNameCommand.cs
@@ -2,7 +2,7 @@
 {
     using Typin.Attributes;
     using Typin.Console;
-    using Typin.Tests.Data.Commands;
+    using Typin.Tests.Data.Common.Commands;
 
     [Command("cmd")]
     public class EmptyOptionNameCommand : SelfSerializeCommandBase

diff --git a/.../Invalid/InvalidOptionConverterCommand.cs → ...Commands/InvalidOptionConverterCommand.cs b/.../Invalid/InvalidOptionConverterCommand.cs → ...Commands/InvalidOptionConverterCommand.cs
@@ -2,7 +2,7 @@
 {
     using Typin.Attributes;
     using Typin.Console;
-    using Typin.Tests.Data.Commands;
+    using Typin.Tests.Data.Common.Commands;
     using Typin.Tests.Data.CustomTypes.InitializableByConverter;
 
     [Command("cmd")]

diff --git a/...mands/Invalid/InvalidOptionNameCommand.cs → ...alid/Commands/InvalidOptionNameCommand.cs b/...mands/Invalid/InvalidOptionNameCommand.cs → ...alid/Commands/InvalidOptionNameCommand.cs
@@ -2,7 +2,7 @@
 {
     using Typin.Attributes;
     using Typin.Console;
-    using Typin.Tests.Data.Commands;
+    using Typin.Tests.Data.Common.Commands;
 
     [Command("cmd")]
     public class InvalidOptionNameCommand : SelfSerializeCommandBase

diff --git a/.../Invalid/InvalidOptionShortNameCommand.cs → ...Commands/InvalidOptionShortNameCommand.cs b/.../Invalid/InvalidOptionShortNameCommand.cs → ...Commands/InvalidOptionShortNameCommand.cs
@@ -2,7 +2,7 @@
 {
     using Typin.Attributes;
     using Typin.Console;
-    using Typin.Tests.Data.Commands;
+    using Typin.Tests.Data.Common.Commands;
 
     [Command("cmd")]
     public class InvalidOptionShortNameCommand : SelfSerializeCommandBase

diff --git a/...valid/InvalidParameterConverterCommand.cs → ...mands/InvalidParameterConverterCommand.cs b/...valid/InvalidParameterConverterCommand.cs → ...mands/InvalidParameterConverterCommand.cs
@@ -2,7 +2,7 @@
 {
     using Typin.Attributes;
     using Typin.Console;
-    using Typin.Tests.Data.Commands;
+    using Typin.Tests.Data.Common.Commands;
     using Typin.Tests.Data.CustomTypes.InitializableByConverter;
 
     [Command("cmd")]

diff --git a/...lid/MultipleNonScalarParametersCommand.cs → ...nds/MultipleNonScalarParametersCommand.cs b/...lid/MultipleNonScalarParametersCommand.cs → ...nds/MultipleNonScalarParametersCommand.cs
@@ -3,7 +3,7 @@
     using System.Collections.Generic;
     using Typin.Attributes;
     using Typin.Console;
-    using Typin.Tests.Data.Commands;
+    using Typin.Tests.Data.Common.Commands;
 
     [Command("cmd")]
     public class MultipleNonScalarParametersCommand : SelfSerializeCommandBase

diff --git a/...a/Commands/Invalid/NonAnnotatedCommand.cs → ...a.Invalid/Commands/NonAnnotatedCommand.cs b/...a/Commands/Invalid/NonAnnotatedCommand.cs → ...a.Invalid/Commands/NonAnnotatedCommand.cs
@@ -1,7 +1,7 @@
 namespace Typin.Tests.Data.Commands.Invalid
 {
     using Typin.Console;
-    using Typin.Tests.Data.Commands;
+    using Typin.Tests.Data.Common.Commands;
 
     public class NonAnnotatedCommand : SelfSerializeCommandBase
     {

diff --git a/...Commands/Invalid/NonImplementedCommand.cs → ...Invalid/Commands/NonImplementedCommand.cs b/...Commands/Invalid/NonImplementedCommand.cs → ...Invalid/Commands/NonImplementedCommand.cs
diff --git a/...valid/NonLastNonScalarParameterCommand.cs → ...mands/NonLastNonScalarParameterCommand.cs b/...valid/NonLastNonScalarParameterCommand.cs → ...mands/NonLastNonScalarParameterCommand.cs
@@ -3,7 +3,7 @@
     using System.Collections.Generic;
     using Typin.Attributes;
     using Typin.Console;
-    using Typin.Tests.Data.Commands;
+    using Typin.Tests.Data.Common.Commands;
 
     [Command("cmd")]
     public class NonLastNonScalarParameterCommand : SelfSerializeCommandBase

diff --git a/...nds/Invalid/NonLetterOptionNameCommand.cs → ...id/Commands/NonLetterOptionNameCommand.cs b/...nds/Invalid/NonLetterOptionNameCommand.cs → ...id/Commands/NonLetterOptionNameCommand.cs
@@ -2,7 +2,7 @@
 {
     using Typin.Attributes;
     using Typin.Console;
-    using Typin.Tests.Data.Commands;
+    using Typin.Tests.Data.Common.Commands;
 
     [Command("cmd")]
     public class NonLetterOptionName0Command : SelfSerializeCommandBase

diff --git a/...nvalid/NonLetterOptionShortNameCommand.cs → ...mmands/NonLetterOptionShortNameCommand.cs b/...nvalid/NonLetterOptionShortNameCommand.cs → ...mmands/NonLetterOptionShortNameCommand.cs
@@ -2,7 +2,7 @@
 {
     using Typin.Attributes;
     using Typin.Console;
-    using Typin.Tests.Data.Commands;
+    using Typin.Tests.Data.Common.Commands;
 
     [Command("cmd")]
     public class NonLetterOptionShortName0Command : SelfSerializeCommandBase

diff --git a/...a/Commands/Invalid/OtherDefaultCommand.cs → ...a.Invalid/Commands/OtherDefaultCommand.cs b/...a/Commands/Invalid/OtherDefaultCommand.cs → ...a.Invalid/Commands/OtherDefaultCommand.cs
@@ -2,7 +2,7 @@
 {
     using Typin.Attributes;
     using Typin.Console;
-    using Typin.Tests.Data.Commands;
+    using Typin.Tests.Data.Common.Commands;
 
     [Command]
     public class OtherDefaultCommand : SelfSerializeCommandBase

diff --git a/...valid/SingleCharacterOptionNameCommand.cs → ...mands/SingleCharacterOptionNameCommand.cs b/...valid/SingleCharacterOptionNameCommand.cs → ...mands/SingleCharacterOptionNameCommand.cs
@@ -2,7 +2,7 @@
 {
     using Typin.Attributes;
     using Typin.Console;
-    using Typin.Tests.Data.Commands;
+    using Typin.Tests.Data.Common.Commands;
 
     [Command("cmd")]
     public class SingleCharacterOptionNameCommand : SelfSerializeCommandBase

diff --git a/...omDirectives/Invalid/AbstractDirective.cs → ...lid/CustomDirectives/AbstractDirective.cs b/...omDirectives/Invalid/AbstractDirective.cs → ...lid/CustomDirectives/AbstractDirective.cs
diff --git a/...Directives/Invalid/DuplicatedDirective.cs → ...d/CustomDirectives/DuplicatedDirective.cs b/...Directives/Invalid/DuplicatedDirective.cs → ...d/CustomDirectives/DuplicatedDirective.cs
diff --git a/...mDirectives/Invalid/EmptyNameDirective.cs → ...id/CustomDirectives/EmptyNameDirective.cs b/...mDirectives/Invalid/EmptyNameDirective.cs → ...id/CustomDirectives/EmptyNameDirective.cs
diff --git a/...irectives/Invalid/NoAttributeDirective.cs → .../CustomDirectives/NoAttributeDirective.cs b/...irectives/Invalid/NoAttributeDirective.cs → .../CustomDirectives/NoAttributeDirective.cs
diff --git a/...irectives/Invalid/NoInterfaceDirective.cs → .../CustomDirectives/NoInterfaceDirective.cs b/...irectives/Invalid/NoInterfaceDirective.cs → .../CustomDirectives/NoInterfaceDirective.cs
diff --git a/src/Typin/Typin.Tests.Data.Invalid/DynamicCommands/InvalidDynamicCommand.cs b/src/Typin/Typin.Tests.Data.Invalid/DynamicCommands/InvalidDynamicCommand.cs
@@ -0,0 +1,38 @@
+namespace Typin.Tests.Data.DynamicCommands.Invalid
+{
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Newtonsoft.Json;
+    using Typin;
+    using Typin.Attributes;
+    using Typin.Console;
+    using Typin.DynamicCommands;
+
+    public class InvalidDynamicCommand : ICommand
+    {
+        private readonly IConsole _console;
+
+        [Parameter(0)]
+        public string Param0 { get; init; } = string.Empty;
+
+        [Option("opt0")]
+        public string Opt0 { get; init; } = string.Empty;
+
+        [Option("opt1")]
+        public int Opt1 { get; init; }
+
+        public IArgumentCollection Arguments { get; init; } = default!;
+
+        public InvalidDynamicCommand(IConsole console)
+        {
+            _console = console;
+        }
+
+        public ValueTask ExecuteAsync(CancellationToken cancellationToken)
+        {
+            _console.Output.WriteLine(JsonConvert.SerializeObject(this, Formatting.Indented));
+
+            return default;
+        }
+    }
+}
diff --git a/...odes/Invalid/InvalidAbstractCustomMode.cs → ...nvalid/Modes/InvalidAbstractCustomMode.cs b/...odes/Invalid/InvalidAbstractCustomMode.cs → ...nvalid/Modes/InvalidAbstractCustomMode.cs
diff --git a/...s/Data/Modes/Invalid/InvalidCustomMode.cs → ...s.Data.Invalid/Modes/InvalidCustomMode.cs b/...s/Data/Modes/Invalid/InvalidCustomMode.cs → ...s.Data.Invalid/Modes/InvalidCustomMode.cs
diff --git a/src/Typin/Typin.Tests.Data.Invalid/Typin.Tests.Data.Invalid.csproj b/src/Typin/Typin.Tests.Data.Invalid/Typin.Tests.Data.Invalid.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <Configurations>Debug;Release</Configurations>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Typin.Tests.Data.Common\Typin.Tests.Data.Common.csproj" />
+    <ProjectReference Include="..\Typin\Typin.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/...sts/Data/Commands/Valid/DefaultCommand.cs → ...a.Valid.DefaultCommands/DefaultCommand.cs b/...sts/Data/Commands/Valid/DefaultCommand.cs → ...a.Valid.DefaultCommands/DefaultCommand.cs
diff --git a/...ands/Valid/DefaultCommandWithParameter.cs → ...ltCommands/DefaultCommandWithParameter.cs b/...ands/Valid/DefaultCommandWithParameter.cs → ...ltCommands/DefaultCommandWithParameter.cs
diff --git a/...ypin/Typin.Tests.Data.Valid.DefaultCommands/Typin.Tests.Data.Valid.DefaultCommands.csproj b/...ypin/Typin.Tests.Data.Valid.DefaultCommands/Typin.Tests.Data.Valid.DefaultCommands.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <Configurations>Debug;Release</Configurations>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Typin.Tests.Data.Common\Typin.Tests.Data.Common.csproj" />
+    <ProjectReference Include="..\Typin\Typin.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/...Valid/WithDefaultValuesAndNamesCommand.cs → ...mands/WithDefaultValuesAndNamesCommand.cs b/...Valid/WithDefaultValuesAndNamesCommand.cs → ...mands/WithDefaultValuesAndNamesCommand.cs
@@ -3,7 +3,7 @@
     using System;
     using Typin.Attributes;
     using Typin.Console;
-    using Typin.Tests.Data.Commands;
+    using Typin.Tests.Data.Common.Commands;
 
     [Command("cmd")]
     public class WithDefaultValuesAndNamesCommand : SelfSerializeCommandBase

diff --git a/...ommands/Valid/WithDefaultValuesCommand.cs → ...faultCommands/WithDefaultValuesCommand.cs b/...ommands/Valid/WithDefaultValuesCommand.cs → ...faultCommands/WithDefaultValuesCommand.cs
@@ -3,7 +3,7 @@
     using System;
     using Typin.Attributes;
     using Typin.Console;
-    using Typin.Tests.Data.Commands;
+    using Typin.Tests.Data.Common.Commands;
 
     [Command("cmd")]
     public class WithDefaultValuesCommand : SelfSerializeCommandBase

diff --git a/...lid/WithEnumCollectionArgumentsCommand.cs → ...nds/WithEnumCollectionArgumentsCommand.cs b/...lid/WithEnumCollectionArgumentsCommand.cs → ...nds/WithEnumCollectionArgumentsCommand.cs
diff --git a/...NullableEnumCollectionArgumentsCommand.cs → ...NullableEnumCollectionArgumentsCommand.cs b/...NullableEnumCollectionArgumentsCommand.cs → ...NullableEnumCollectionArgumentsCommand.cs