From f850fd08ffbdb37846d0b0169a8eb45b639eb755 Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Wed, 31 Jan 2024 14:29:46 +0100
Subject: [PATCH] Tests: Move sql scripts from Resources/ to Resources/Sql/

---
 .gitignore                                  | 2 +-
 Tests/DatabaseSetup.cs                      | 4 ++--
 Tests/HelperTests/BillingTest.cs            | 4 ++--
 Tests/Resources/{ => Sql}/BillingDelete.sql | 0
 Tests/Resources/{ => Sql}/BillingInsert.sql | 0
 Tests/Resources/{ => Sql}/Insert.sql        | 0
 Tests/Tests.csproj                          | 2 +-
 Tests/fetch-resources.bat                   | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename Tests/Resources/{ => Sql}/BillingDelete.sql (100%)
 rename Tests/Resources/{ => Sql}/BillingInsert.sql (100%)
 rename Tests/Resources/{ => Sql}/Insert.sql (100%)

diff --git a/.gitignore b/.gitignore
index 809c7ad..e4a3f8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@ bin/
 *.user
 .vs
 .idea
-Tests/Resources/Create.sql
+Tests/Resources/Sql/Create.sql
diff --git a/Tests/DatabaseSetup.cs b/Tests/DatabaseSetup.cs
index 05ca0ab..53523ab 100644
--- a/Tests/DatabaseSetup.cs
+++ b/Tests/DatabaseSetup.cs
@@ -13,8 +13,8 @@ namespace Tests {
         public async Task SetupDatabase() {
             AppDbContext.ConnectionStringOverride = $"Data Source=ElwigTestDB; Mode=Memory; Foreign Keys=True; Cache=Shared";
             Connection = await AppDbContext.ConnectAsync();
-            await AppDbContext.ExecuteEmbeddedScript(Connection, Assembly.GetExecutingAssembly(), "Tests.Resources.Create.sql");
-            await AppDbContext.ExecuteEmbeddedScript(Connection, Assembly.GetExecutingAssembly(), "Tests.Resources.Insert.sql");
+            await AppDbContext.ExecuteEmbeddedScript(Connection, Assembly.GetExecutingAssembly(), "Tests.Resources.Sql.Create.sql");
+            await AppDbContext.ExecuteEmbeddedScript(Connection, Assembly.GetExecutingAssembly(), "Tests.Resources.Sql.Insert.sql");
         }
 
         [OneTimeSetUp]
diff --git a/Tests/HelperTests/BillingTest.cs b/Tests/HelperTests/BillingTest.cs
index c2f6c13..de21ccc 100644
--- a/Tests/HelperTests/BillingTest.cs
+++ b/Tests/HelperTests/BillingTest.cs
@@ -15,13 +15,13 @@ namespace Tests.HelperTests {
         [OneTimeSetUp]
         public async Task SetupDatabase() {
             Connection = await AppDbContext.ConnectAsync();
-            await AppDbContext.ExecuteEmbeddedScript(Connection, Assembly.GetExecutingAssembly(), "Tests.Resources.BillingInsert.sql");
+            await AppDbContext.ExecuteEmbeddedScript(Connection, Assembly.GetExecutingAssembly(), "Tests.Resources.Sql.BillingInsert.sql");
         }
 
         [OneTimeTearDown]
         public async Task TeardownDatabase() {
             if (Connection == null) return;
-            await AppDbContext.ExecuteEmbeddedScript(Connection, Assembly.GetExecutingAssembly(), "Tests.Resources.BillingDelete.sql");
+            await AppDbContext.ExecuteEmbeddedScript(Connection, Assembly.GetExecutingAssembly(), "Tests.Resources.Sql.BillingDelete.sql");
             await Connection.DisposeAsync();
             Connection = null;
         }
diff --git a/Tests/Resources/BillingDelete.sql b/Tests/Resources/Sql/BillingDelete.sql
similarity index 100%
rename from Tests/Resources/BillingDelete.sql
rename to Tests/Resources/Sql/BillingDelete.sql
diff --git a/Tests/Resources/BillingInsert.sql b/Tests/Resources/Sql/BillingInsert.sql
similarity index 100%
rename from Tests/Resources/BillingInsert.sql
rename to Tests/Resources/Sql/BillingInsert.sql
diff --git a/Tests/Resources/Insert.sql b/Tests/Resources/Sql/Insert.sql
similarity index 100%
rename from Tests/Resources/Insert.sql
rename to Tests/Resources/Sql/Insert.sql
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index 838944b..1c5c576 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Resources\*.sql" />
+    <EmbeddedResource Include="Resources\Sql\*.sql" />
   </ItemGroup>
 
   <Target Name="FetchResources" BeforeTargets="BeforeBuild">
diff --git a/Tests/fetch-resources.bat b/Tests/fetch-resources.bat
index e964600..3afcb4e 100644
--- a/Tests/fetch-resources.bat
+++ b/Tests/fetch-resources.bat
@@ -1 +1 @@
-curl -s -L "https://www.necronda.net/elwig/files/create.sql?v=15" -u "elwig:ganzGeheim123!" -o "Resources\Create.sql"
+curl -s -L "https://www.necronda.net/elwig/files/create.sql?v=15" -u "elwig:ganzGeheim123!" -o "Resources\Sql\Create.sql"