move end2end tests code to a single directory (#197)

* move end2end tests code to a single directory

Author: SockworkOrange

.github/workflows/build.yml

@@ -61,6 +61,7 @@ jobs:
         with:
           name: wasm-file
           path: dist/plugin.wasm
+          
   lint:
     name: Lint
     needs: [build-wasm]
@@ -92,6 +93,11 @@ jobs:
      steps:
        - uses: actions/checkout@v4
 
+       - name: Verify pushed generated tests code is synced
+         run: |
+           ./end2end/scripts/generate_tests.sh
+           git diff --quiet
+           
        - uses: actions/download-artifact@v4
          with:
            name: wasm-file

.github/workflows/legacy-tests.yml

@@ -73,9 +73,9 @@ jobs:
               Get-ChildItem -Path examples -Recurse -Filter *.csproj |
                 Where-Object { $_.FullName -like '*Legacy*' } |
                 ForEach-Object { nuget restore $_.FullName }
-              nuget restore ./EndToEndCommon/EndToEndCommon.csproj
-              nuget restore ./EndToEndTestsLegacy/EndToEndTestsLegacy.csproj
-              msbuild.exe ./EndToEndTestsLegacy/EndToEndTestsLegacy.csproj -p:Configuration=Release -p:FrameworkVersion=v4.7.2
+              nuget restore ./end2end/EndToEndCommon/EndToEndCommon.csproj
+              nuget restore ./end2end/EndToEndTestsLegacy/EndToEndTestsLegacy.csproj
+              msbuild.exe ./end2end/EndToEndTestsLegacy/EndToEndTestsLegacy.csproj -p:Configuration=Release -p:FrameworkVersion=v4.7.2
               return $LASTEXITCODE
             }
   
@@ -108,4 +108,4 @@ jobs:
         run: |
           $path = vswhere -latest -products * -requires Microsoft.VisualStudio.Workload.ManagedDesktop Microsoft.VisualStudio.Workload.Web -requiresAny -property installationPath
           $path = join-path $path 'Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe'
-          & $path ./EndToEndTestsLegacy/bin/Release/net472/EndToEndTestsLegacy.dll
+          & $path ./end2end/EndToEndTestsLegacy/bin/Release/net472/EndToEndTestsLegacy.dll

.github/workflows/tests.yml

@@ -47,4 +47,4 @@ jobs:
         uses: hoverkraft-tech/[email protected]
 
       - name: Run Tests
-        run: ./scripts/run_end2end_tests.sh
+        run: ./end2end/scripts/run_tests.sh

Makefile

@@ -11,7 +11,7 @@ unit-tests:
 	dotnet test SqlcGenCsharpTests
 
 run-end2end-tests:
-	./scripts/run_end2end_tests.sh
+	./end2end/scripts/run_tests.sh
 
 # process type plugin
 dotnet-build-process: protobuf-generate dotnet-format

MySqlConnectorTester.generated.cs

@@ -47,7 +47,7 @@ private static string ParseConfigNode(YamlNode node)
         return $"""
                 ## Engine `{item["engine"]}`: [{projectName}]({outputDirectory})
 
-                ### [Schema]({item["schema"]}) | [Queries]({queryFiles}) | [End2End Test]({testProject}/{testClassName}.cs)
+                ### [Schema]({item["schema"]}) | [Queries]({queryFiles}) | [End2End Test](end2end/{testProject}/{testClassName}.cs)
 
                 ### Config
                 ```yaml

docs/03_Usage.md

@@ -6,10 +6,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <Content Include="../.env">
+        <Content Include="../../.env">
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
         </Content>
-        <Content Include="../examples/config/sqlite/schema.sql">
+        <Content Include="../../examples/config/sqlite/schema.sql">
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
             <TargetPath>sqlite.schema.sql</TargetPath>
         </Content>

docs/ExamplesDocGen/Program.cs

@@ -11,7 +11,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\PluginOptions\PluginOptions.csproj" />
+      <ProjectReference Include="..\..\PluginOptions\PluginOptions.csproj" />
     </ItemGroup>
 
 </Project>

EndToEndCommon/DataGenerator.cs end2end/EndToEndCommon/DataGenerator.cs

@@ -7,10 +7,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <Content Include="../.env">
+        <Content Include="../../.env">
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
         </Content>
-        <Content Include="../examples/config/sqlite/schema.sql">
+        <Content Include="../../examples/config/sqlite/schema.sql">
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
             <TargetPath>sqlite.schema.sql</TargetPath>
         </Content>
@@ -26,11 +26,11 @@
 
     <ItemGroup>
       <ProjectReference Include="..\EndToEndCommon\EndToEndCommon.csproj" />
-      <ProjectReference Include="..\examples\MySqlConnectorDapperExample\MySqlConnectorDapperExample.csproj" />
-      <ProjectReference Include="..\examples\MySqlConnectorExample\MySqlConnectorExample.csproj" />
-      <ProjectReference Include="..\examples\NpgsqlDapperExample\NpgsqlDapperExample.csproj" />
-      <ProjectReference Include="..\examples\NpgsqlExample\NpgsqlExample.csproj" />
-      <ProjectReference Include="..\examples\SqliteDapperExample\SqliteDapperExample.csproj" />
-      <ProjectReference Include="..\examples\SqliteExample\SqliteExample.csproj" />
+      <ProjectReference Include="..\..\examples\MySqlConnectorDapperExample\MySqlConnectorDapperExample.csproj" />
+      <ProjectReference Include="..\..\examples\MySqlConnectorExample\MySqlConnectorExample.csproj" />
+      <ProjectReference Include="..\..\examples\NpgsqlDapperExample\NpgsqlDapperExample.csproj" />
+      <ProjectReference Include="..\..\examples\NpgsqlExample\NpgsqlExample.csproj" />
+      <ProjectReference Include="..\..\examples\SqliteDapperExample\SqliteDapperExample.csproj" />
+      <ProjectReference Include="..\..\examples\SqliteExample\SqliteExample.csproj" />
     </ItemGroup>
 </Project>

EndToEndCommon/EndToEndCommon.cs end2end/EndToEndCommon/EndToEndCommon.cs

@@ -6,10 +6,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <Content Include="../.env">
+        <Content Include="../../.env">
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
         </Content>
-        <Content Include="../examples/config/sqlite/schema.sql">
+        <Content Include="../../examples/config/sqlite/schema.sql">
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
             <TargetPath>sqlite.schema.sql</TargetPath>
         </Content>
@@ -25,12 +25,12 @@
 
     <ItemGroup>
         <ProjectReference Include="..\EndToEndCommon\EndToEndCommon.csproj" />
-        <ProjectReference Include="..\examples\MySqlConnectorDapperLegacyExample\MySqlConnectorDapperLegacyExample.csproj" />
-        <ProjectReference Include="..\examples\MySqlConnectorLegacyExample\MySqlConnectorLegacyExample.csproj" />
-        <ProjectReference Include="..\examples\NpgsqlDapperLegacyExample\NpgsqlDapperLegacyExample.csproj" />
-        <ProjectReference Include="..\examples\NpgsqlLegacyExample\NpgsqlLegacyExample.csproj" />
-        <ProjectReference Include="..\examples\SqliteDapperLegacyExample\SqliteDapperLegacyExample.csproj" />
-        <ProjectReference Include="..\examples\SqliteLegacyExample\SqliteLegacyExample.csproj" />
+        <ProjectReference Include="..\..\examples\MySqlConnectorDapperLegacyExample\MySqlConnectorDapperLegacyExample.csproj" />
+        <ProjectReference Include="..\..\examples\MySqlConnectorLegacyExample\MySqlConnectorLegacyExample.csproj" />
+        <ProjectReference Include="..\..\examples\NpgsqlDapperLegacyExample\NpgsqlDapperLegacyExample.csproj" />
+        <ProjectReference Include="..\..\examples\NpgsqlLegacyExample\NpgsqlLegacyExample.csproj" />
+        <ProjectReference Include="..\..\examples\SqliteDapperLegacyExample\SqliteDapperLegacyExample.csproj" />
+        <ProjectReference Include="..\..\examples\SqliteLegacyExample\SqliteLegacyExample.csproj" />
     </ItemGroup>
 
 </Project>

EndToEndCommon/EndToEndCommon.csproj end2end/EndToEndCommon/EndToEndCommon.csproj

@@ -16,15 +16,15 @@ generate() {
   export TEST_CLASS_NAME="$1"
   local TEST_FILENAME="${TEST_CLASS_NAME}.generated.cs"
   echo "generating EndToEndTests/$TEST_FILENAME..."
-  dotnet run --project ./EndToEndScaffold/EndToEndScaffold.csproj > ./EndToEndTests/"$TEST_FILENAME"
+  dotnet run --project ./end2end/EndToEndScaffold/EndToEndScaffold.csproj > ./end2end/EndToEndTests/"$TEST_FILENAME"
 }
 
 generate_legacy() {
   export IS_LEGACY=true
   export TEST_CLASS_NAME="$1"
   local TEST_FILENAME="${TEST_CLASS_NAME}.generated.cs"
   echo "generating EndToEndTestsLegacy/$TEST_FILENAME..."
-  dotnet run --project ./EndToEndScaffold/EndToEndScaffold.csproj > ./EndToEndTestsLegacy/"$TEST_FILENAME"
+  dotnet run --project ./end2end/EndToEndScaffold/EndToEndScaffold.csproj > ./end2end/EndToEndTestsLegacy/"$TEST_FILENAME"
 }
 
 for target in "${TARGETS[@]}"; do

EndToEndCommon/TestInterfaces.cs end2end/EndToEndCommon/TestInterfaces.cs

@@ -4,13 +4,13 @@ set -ex
 
 if [ "$GITHUB_ACTIONS" = "true" ]; then
     echo "Running in Github Actions"
-    dotnet test ./EndToEndTests/EndToEndTests.csproj
+    dotnet test ./end2end/EndToEndTests/EndToEndTests.csproj
 else
     echo "Running in local"
 
     destroy() { docker-compose down --volumes; }
     trap destroy EXIT
 
     docker-compose up --detach --build --force-recreate --remove-orphans --wait
-    dotnet test ./EndToEndTests/EndToEndTests.csproj
+    dotnet test ./end2end/EndToEndTests/EndToEndTests.csproj
 fi

EndToEndScaffold/Config.cs end2end/EndToEndScaffold/Config.cs

@@ -9,7 +9,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Extensions", "Extensions\Ex
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drivers", "Drivers\Drivers.csproj", "{6C698DAA-5151-4241-B07E-3435A717ABFB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EndToEndTests", "EndToEndTests\EndToEndTests.csproj", "{3675F864-9CD2-49C0-9754-56E490F15DF0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EndToEndTests", "end2end\EndToEndTests\EndToEndTests.csproj", "{3675F864-9CD2-49C0-9754-56E490F15DF0}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WasmRunner", "WasmRunner\WasmRunner.csproj", "{D3095033-1C96-42D9-AE44-3D4F1B24CB51}"
 EndProject
@@ -21,7 +21,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeGenerator", "CodeGenera
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluginOptions", "PluginOptions\PluginOptions.csproj", "{ABD93C33-BEBE-4DE9-9ABF-430DAC1A938C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EndToEndTestsLegacy", "EndToEndTestsLegacy\EndToEndTestsLegacy.csproj", "{7409C5C4-61B4-4219-930B-9FC9CD5C91A8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EndToEndTestsLegacy", "end2end\EndToEndTestsLegacy\EndToEndTestsLegacy.csproj", "{7409C5C4-61B4-4219-930B-9FC9CD5C91A8}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{9404C766-3491-4959-A575-D6015FFB7AE6}"
 EndProject
@@ -51,13 +51,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqliteExample", "examples\S
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqlcGenCsharpTests", "SqlcGenCsharpTests\SqlcGenCsharpTests.csproj", "{9FD3C47C-88A5-4C4A-A807-1E36114CBB38}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EndToEndCommon", "EndToEndCommon\EndToEndCommon.csproj", "{FE5AA465-DC0E-4B14-9BD3-16B47813FB97}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EndToEndCommon", "end2end\EndToEndCommon\EndToEndCommon.csproj", "{FE5AA465-DC0E-4B14-9BD3-16B47813FB97}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{4688A74C-E49F-4AF2-9443-C490D7956E0D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExampleDocGen", "docs\ExamplesDocGen\ExampleDocGen.csproj", "{48A7802E-3D90-4F19-B14A-9662CDEA86E3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EndToEndScaffold", "EndToEndScaffold\EndToEndScaffold.csproj", "{2A101C54-4F0C-41AC-86B2-FFF6DFBFD0C0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EndToEndScaffold", "end2end\EndToEndScaffold\EndToEndScaffold.csproj", "{2A101C54-4F0C-41AC-86B2-FFF6DFBFD0C0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution