fix: move all tests to be under unit-tests directory

.github/workflows/tests.yml

@@ -37,8 +37,8 @@ jobs:
 
       - name: Run Tests
         run: |
-          dotnet test RepositoryTests
-          dotnet test CodegenTests
+          dotnet test unit-tests/RepositoryTests
+          dotnet test unit-tests/CodegenTests
 
   end2end-tests:
     name: End-to-End Tests

CodegenTests/test-requests/DefaultSchemaEnum/request.json

@@ -3,10 +3,10 @@
     "version": "2",
     "engine": "mysql",
     "schema": [
-      "CodegenTests/test-requests/DefaultSchemaEnum/schema.sql"
+      "unit-tests/CodegenTests/test-requests/DefaultSchemaEnum/schema.sql"
     ],
     "queries": [
-      "CodegenTests/test-requests/DefaultSchemaEnum/query.sql"
+      "unit-tests/CodegenTests/test-requests/DefaultSchemaEnum/query.sql"
     ],
     "codegen": {
       "out": "./CodegenTests/test-requests/DefaultSchemaEnum",

CodegenTests/test-requests/DefaultSchemaEnum/request.message

@@ -1,6 +1,6 @@
 
-â

-
2mysql7CodegenTests/test-requests/DefaultSchemaEnum/schema.sql"6CodegenTests/test-requests/DefaultSchemaEnum/query.sqlbe
+ø

+
2mysqlBunit-tests/CodegenTests/test-requests/DefaultSchemaEnum/schema.sql"Aunit-tests/CodegenTests/test-requests/DefaultSchemaEnum/query.sqlbe
 ../CodegenTests/test-requests/DefaultSchemaEnumcsharp{"debugRequest":true}*
 ./dist/LocalRunner‚
public"xpublicL
 dummy_table;

CodegenTests/test-requests/SchemaScopedEnum/request.json

@@ -3,10 +3,10 @@
     "version": "2",
     "engine": "mysql",
     "schema": [
-      "./CodegenTests/test-requests/SchemaScopedEnum/schema.sql"
+      "unit-tests/CodegenTests/test-requests/SchemaScopedEnum/schema.sql"
     ],
     "queries": [
-      "./CodegenTests/test-requests/SchemaScopedEnum/query.sql"
+      "unit-tests/CodegenTests/test-requests/SchemaScopedEnum/query.sql"
     ],
     "codegen": {
       "out": "./CodegenTests/test-requests/SchemaScopedEnum",

CodegenTests/test-requests/SchemaScopedEnum/request.message

@@ -1,6 +1,6 @@
 
-ã

-
2mysql8./CodegenTests/test-requests/SchemaScopedEnum/schema.sql"7./CodegenTests/test-requests/SchemaScopedEnum/query.sqlbd
+õ

+
2mysqlAunit-tests/CodegenTests/test-requests/SchemaScopedEnum/schema.sql"@unit-tests/CodegenTests/test-requests/SchemaScopedEnum/query.sqlbd
 -./CodegenTests/test-requests/SchemaScopedEnumcsharp{"debugRequest":true}*
 ./dist/LocalRunner®
public"*public" 
 dummy_table_dummy_column
x
y"xdummy_schemah

Makefile

@@ -4,10 +4,11 @@ PWD 		:= $(shell pwd)
 dotnet-build:
 	dotnet build
 
+.PHONY: unit-tests
 unit-tests:
-	dotnet test RepositoryTests
+	dotnet test unit-tests/RepositoryTests
 	sqlc generate -f sqlc.unit.test.yaml
-	dotnet test CodegenTests
+	dotnet test unit-tests/CodegenTests
 
 generate-end2end-tests:
 	./end2end/scripts/generate_tests.sh

sqlc-gen-csharp.sln

@@ -49,7 +49,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqliteDapperExample", "exam
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqliteExample", "examples\SqliteExample\SqliteExample.csproj", "{0A345279-6E13-4E7E-B1A0-E1E6ABDAE06F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodegenTests", "CodegenTests\CodegenTests.csproj", "{9FD3C47C-88A5-4C4A-A807-1E36114CBB38}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodegenTests", "unit-tests\CodegenTests\CodegenTests.csproj", "{9FD3C47C-88A5-4C4A-A807-1E36114CBB38}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EndToEndCommon", "end2end\EndToEndCommon\EndToEndCommon.csproj", "{FE5AA465-DC0E-4B14-9BD3-16B47813FB97}"
 EndProject
@@ -59,9 +59,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExampleDocGen", "docs\Examp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EndToEndScaffold", "end2end\EndToEndScaffold\EndToEndScaffold.csproj", "{2A101C54-4F0C-41AC-86B2-FFF6DFBFD0C0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RepositoryTests", "RepositoryTests\RepositoryTests.csproj", "{7FEF697A-841D-4E32-A8ED-0F36C4436B55}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RequestRunner", "RequestRunner\RequestRunner.csproj", "{645E834B-743F-4D80-9073-98878995FE87}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RepositoryTests", "unit-tests\RepositoryTests\RepositoryTests.csproj", "{7FEF697A-841D-4E32-A8ED-0F36C4436B55}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

sqlc.unit.test.yaml

@@ -4,17 +4,17 @@ plugins:
     process:
       cmd: ./dist/LocalRunner
 sql:
-  - schema: "CodegenTests/test-requests/DefaultSchemaEnum/schema.sql"
-    queries: "CodegenTests/test-requests/DefaultSchemaEnum/query.sql"
+  - schema: "unit-tests/CodegenTests/test-requests/DefaultSchemaEnum/schema.sql"
+    queries: "unit-tests/CodegenTests/test-requests/DefaultSchemaEnum/query.sql"
     engine: "mysql"
     codegen:
       - plugin: csharp
         out: ./CodegenTests/test-requests/DefaultSchemaEnum
         options:
           debugRequest: true
 
-  - schema: "./CodegenTests/test-requests/SchemaScopedEnum/schema.sql"
-    queries: "./CodegenTests/test-requests/SchemaScopedEnum/query.sql"
+  - schema: "unit-tests/CodegenTests/test-requests/SchemaScopedEnum/schema.sql"
+    queries: "unit-tests/CodegenTests/test-requests/SchemaScopedEnum/query.sql"
     engine: "mysql"
     codegen:
       - plugin: csharp

CodegenTests/CodegenCsprojTests.cs → unit-tests/CodegenTests/CodegenCsprojTests.cs

@@ -1,4 +1,5 @@
 using Google.Protobuf;
+using NUnit.Framework;
 using Plugin;
 using SqlcGenCsharp;
 using System.Text;

CodegenTests/CodegenSchemaTests.cs → unit-tests/CodegenTests/CodegenSchemaTests.cs

@@ -1,4 +1,5 @@
 using Microsoft.CodeAnalysis.CSharp.Syntax;
+using NUnit.Framework;
 using SqlcGenCsharp;
 using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
 

unit-tests/CodegenTests/CodegenTests.csproj

@@ -0,0 +1,57 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <IsPackable>false</IsPackable>
+        <IsTestProject>true</IsTestProject>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <Content Include="test-requests/**">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </Content>
+        <Content Include="../../examples/NpgsqlExample/request.message">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+            <TargetPath>NpgsqlExampleRequest.message</TargetPath>
+        </Content>
+        <Content Include="../../examples/NpgsqlDapperExample/request.message">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+            <TargetPath>NpgsqlDapperExampleRequest.message</TargetPath>
+        </Content>
+        <Content Include="../../examples/MySqlConnectorExample/request.message">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+            <TargetPath>MySqlConnectorExampleRequest.message</TargetPath>
+        </Content>
+        <Content Include="../../examples/MySqlConnectorDapperExample/request.message">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+            <TargetPath>MySqlConnectorDapperExampleRequest.message</TargetPath>
+        </Content>
+        <Content Include="../../examples/SqliteExample/request.message">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+            <TargetPath>SqliteExampleRequest.message</TargetPath>
+        </Content>
+        <Content Include="../../examples/SqliteDapperExample/request.message">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+            <TargetPath>SqliteDapperExampleRequest.message</TargetPath>
+        </Content>
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="coverlet.collector" Version="6.0.0"/>
+        <PackageReference Include="dotenv.net" Version="3.2.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
+        <PackageReference Include="NUnit" Version="3.14.0"/>
+        <PackageReference Include="NUnit.Analyzers" Version="3.9.0"/>
+        <PackageReference Include="NUnit3TestAdapter" Version="4.5.0"/>
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2"/>
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\..\CodeGenerator\CodeGenerator.csproj" />
+      <ProjectReference Include="..\..\Drivers\Drivers.csproj" />
+      <ProjectReference Include="..\..\GeneratedProtobuf\GeneratedProtobuf.csproj" />
+    </ItemGroup>
+
+</Project>

CodegenTests/CodegenTypeOverrideTests.cs → unit-tests/CodegenTests/CodegenTypeOverrideTests.cs

@@ -1,4 +1,5 @@
 using Google.Protobuf;
+using NUnit.Framework;
 using Plugin;
 using SqlcGenCsharp;
 using System.Text;

CodegenTests/CodegenUtilsTests.cs → unit-tests/CodegenTests/CodegenUtilsTests.cs

@@ -1,5 +1,6 @@
 using Google.Protobuf;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
+using NUnit.Framework;
 using Plugin;
 using SqlcGenCsharp;
 using SqlcGenCsharp.Drivers;

unit-tests/CodegenTests/ExampleTests.cs

@@ -0,0 +1,35 @@
+using NUnit.Framework;
+using SqlcGenCsharp;
+
+namespace CodegenTests;
+
+public class ExampleTests
+{
+    [Test]
+    public static void TestNpgsqlExample() => AssertRequestSuccess("NpgsqlExampleRequest.message");
+
+    [Test]
+    public static void TestNpgsqlDapperExample() => AssertRequestSuccess("NpgsqlDapperExampleRequest.message");
+
+    [Test]
+    public static void TestMySqlConnectorExample() => AssertRequestSuccess("MySqlConnectorExampleRequest.message");
+
+    [Test]
+    public static void TestMySqlConnectorDapperExample() => AssertRequestSuccess("MySqlConnectorDapperExampleRequest.message");
+
+    [Test]
+    public static void TestSqliteExample() => AssertRequestSuccess("SqliteExampleRequest.message");
+
+    [Test]
+    public static void TestSqliteDapperExample() => AssertRequestSuccess("SqliteDapperExampleRequest.message");
+
+    private static void AssertRequestSuccess(string requestFile)
+    {
+        Assert.DoesNotThrowAsync(async () =>
+        {
+            var request = Plugin.GenerateRequest.Parser.ParseFrom(File.ReadAllBytes(requestFile));
+            var codeGenerator = new CodeGenerator();
+            await codeGenerator.Generate(request);
+        });
+    }
+}

CodegenTests/TestRequestHelper.cs → unit-tests/CodegenTests/TestRequestHelper.cs

@@ -1,5 +1,3 @@
-using File = System.IO.File;
-
 namespace CodegenTests;
 
 public static class TestRequestHelper