moved code to a single project

gicastel · Oct 5, 2022 · d3b0142 · d3b0142
1 parent 3e9b511
commit d3b0142
Show file tree

Hide file tree

Showing 14 changed files with 47 additions and 56 deletions.
diff --git a/src/TestBase/TestBase.csproj b/src/TestBase/TestBase.csproj
diff --git a/src/qest.sln b/src/qest.sln
@@ -1,31 +1,25 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-VisualStudioVersion = 17.0.32112.339
+VisualStudioVersion = 17.3.32922.545
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestBase", "TestBase\TestBase.csproj", "{B6FF040E-083C-472A-A76E-E4F439241D0A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "qest", "qest\qest.csproj", "{64110F91-7843-4F56-9B16-6F79FEFD2B39}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "qest", "qest\qest.csproj", "{79EF488B-B5FE-4DEE-807E-51CA359318C9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B6FF040E-083C-472A-A76E-E4F439241D0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B6FF040E-083C-472A-A76E-E4F439241D0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B6FF040E-083C-472A-A76E-E4F439241D0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B6FF040E-083C-472A-A76E-E4F439241D0A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{64110F91-7843-4F56-9B16-6F79FEFD2B39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{64110F91-7843-4F56-9B16-6F79FEFD2B39}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{64110F91-7843-4F56-9B16-6F79FEFD2B39}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{64110F91-7843-4F56-9B16-6F79FEFD2B39}.Release|Any CPU.Build.0 = Release|Any CPU
+		{79EF488B-B5FE-4DEE-807E-51CA359318C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{79EF488B-B5FE-4DEE-807E-51CA359318C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{79EF488B-B5FE-4DEE-807E-51CA359318C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{79EF488B-B5FE-4DEE-807E-51CA359318C9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {79F02C7F-71C9-4BA8-8776-A90C9E1764BB}
+		SolutionGuid = {012C640D-552E-4C1F-9A71-B754DB10D79C}
 	EndGlobalSection
 EndGlobal
diff --git a/src/qest/Commands/GenerateCommand.cs b/src/qest/Commands/GenerateCommand.cs
@@ -3,7 +3,7 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using TestBase;
+using qest.Models;
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;
 
@@ -33,7 +33,7 @@ ORDER BY
         internal const string yamlSchema = 
             @"# yaml-language-server: $schema=https://raw.githubusercontent.com/Geims83/qest/0.9.2/docs/yamlSchema.json";
 
-        internal static async Task Run(DirectoryInfo? folder, string tcs)
+        internal static async Task Execute(DirectoryInfo? folder, string tcs)
         {
             var sqlConnection = new SqlConnection(tcs);
 

diff --git a/src/qest/Commands/RunCommand.cs b/src/qest/Commands/RunCommand.cs
@@ -3,15 +3,16 @@
 using System.Data.SqlClient;
 using System.IO;
 using System.Linq;
-using TestBase;
+using qest.Models;
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;
 
 namespace qest.Commands
 {
-    internal static class RunTests
+    internal static class Run
     {
-        internal static void Run(FileInfo? file, DirectoryInfo? folder, string tcs)
+
+        internal static void Execute(FileInfo? file, DirectoryInfo? folder, string tcs)
         {
             List<Test> TestCollection = new List<Test>();
 

diff --git a/src/TestBase/Assert.cs → src/qest/Models/Assert.cs b/src/TestBase/Assert.cs → src/qest/Models/Assert.cs
@@ -1,6 +1,6 @@
 using System.Data;
 
-namespace TestBase
+namespace qest.Models
 {
     public class Assert
     {

diff --git a/src/TestBase/Script.cs → src/qest/Models/Script.cs b/src/TestBase/Script.cs → src/qest/Models/Script.cs
@@ -1,4 +1,8 @@
-namespace TestBase
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+namespace qest.Models
 {
     public class Script
     {

diff --git a/src/TestBase/Scripts.cs → src/qest/Models/Scripts.cs b/src/TestBase/Scripts.cs → src/qest/Models/Scripts.cs
@@ -1,6 +1,7 @@
+using System.Collections.Generic;
 using System.Data.SqlClient;
 
-namespace TestBase
+namespace qest.Models
 {
     public class Scripts : List<Script>
     {

diff --git a/src/TestBase/Test.cs → src/qest/Models/Test.cs b/src/TestBase/Test.cs → src/qest/Models/Test.cs
@@ -1,8 +1,11 @@
-using System.Data;
+using System;
+using System.Collections.Generic;
+using System.Data;
 using System.Data.SqlClient;
+using System.Linq;
 using YamlDotNet.Serialization;
 
-namespace TestBase
+namespace qest.Models
 {
     public class Test
     {

diff --git a/src/TestBase/TestCommand.cs → src/qest/Models/TestCommand.cs b/src/TestBase/TestCommand.cs → src/qest/Models/TestCommand.cs
@@ -1,6 +1,6 @@
-using System.Data;
+using System.Collections.Generic;
 
-namespace TestBase
+namespace qest.Models
 {
     public class TestCommand
     {

diff --git a/src/TestBase/TestResult.cs → src/qest/Models/TestResult.cs b/src/TestBase/TestResult.cs → src/qest/Models/TestResult.cs
@@ -1,6 +1,7 @@
-using System.Data;
+using System.Collections.Generic;
+using System.Data;
 
-namespace TestBase
+namespace qest.Models
 {
 
     public class ResultGroup

diff --git a/src/TestBase/TestStep.cs → src/qest/Models/TestStep.cs b/src/TestBase/TestStep.cs → src/qest/Models/TestStep.cs
@@ -1,4 +1,6 @@
-namespace TestBase
+using System.Collections.Generic;
+
+namespace qest.Models
 {
     public class TestStep
     {

diff --git a/src/qest/Program.cs b/src/qest/Program.cs
@@ -30,7 +30,7 @@ internal static Command CreateRunCommand()
 
             runCommand.SetHandler((file, folder, tcs) =>
                 {
-                    RunTests.Run(file, folder, tcs);
+                    Run.Execute(file, folder, tcs);
                 },
                 file, folder, tcs);
 
@@ -51,7 +51,7 @@ internal static Command CreateGenerateCommand()
 
             generateCommand.SetHandler(async(folder, tcs) =>
             {
-                await Generate.Run(folder, tcs);
+                await Generate.Execute(folder, tcs);
             },
                 folder, tcs);
 

diff --git a/src/TestBase/Utils.cs → src/qest/Utils/Utils.cs b/src/TestBase/Utils.cs → src/qest/Utils/Utils.cs
@@ -1,6 +1,9 @@
-using System.Data;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
 
-namespace TestBase
+namespace qest
 {
     internal static class Utils
     {
@@ -9,7 +12,7 @@ internal static class Utils
             SqlDbType.Bit => typeof(bool),
             SqlDbType.TinyInt => typeof(byte),
             SqlDbType.SmallInt => typeof(short),
-            SqlDbType.BigInt => typeof(Int64),
+            SqlDbType.BigInt => typeof(long),
             SqlDbType.Float => typeof(double),
             SqlDbType.Int => typeof(int),
             SqlDbType.NVarChar => typeof(string),
@@ -18,9 +21,9 @@ internal static class Utils
             SqlDbType.Date => typeof(DateTime),
             SqlDbType.DateTimeOffset => typeof(DateTimeOffset),
             SqlDbType.Time => typeof(TimeSpan),
-            SqlDbType.Real => typeof(Single),
-            SqlDbType.Decimal => typeof(Decimal),
-            SqlDbType.Money => typeof(Decimal),
+            SqlDbType.Real => typeof(float),
+            SqlDbType.Decimal => typeof(decimal),
+            SqlDbType.Money => typeof(decimal),
 
             _ => throw new ArgumentOutOfRangeException(nameof(type), $"Type not expected: {type}"),
         };

diff --git a/src/qest/qest.csproj b/src/qest/qest.csproj
@@ -11,11 +11,8 @@
 
   <ItemGroup>
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageReference Include="YamlDotNet" Version="12.0.0" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
+    <PackageReference Include="YamlDotNet" Version="12.0.1" />
   </ItemGroup>
 
-	<ItemGroup>
-	  <ProjectReference Include="..\TestBase\TestBase.csproj" />
-	</ItemGroup>
-
 </Project>