Skip to content

Commit 843cbcc

Browse files
fix: move all tests to be under unit-tests directory (#319)
* fix: move all tests to be under unit-tests directory * fix: have RequestRunner be available as convenient separated tests * fix: unit tests command
1 parent 5ccbb4c commit 843cbcc

File tree

28 files changed

+332
-107
lines changed

28 files changed

+332
-107
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ jobs:
3737
3838
- name: Run Tests
3939
run: |
40-
dotnet test RepositoryTests
41-
dotnet test CodegenTests
40+
dotnet test unit-tests/RepositoryTests
41+
dotnet test unit-tests/CodegenTests
4242
4343
end2end-tests:
4444
name: End-to-End Tests

CodegenTests/CodegenTests.csproj

Lines changed: 0 additions & 37 deletions
This file was deleted.

CodegenTests/test-requests/DefaultSchemaEnum/request.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"version": "2",
44
"engine": "mysql",
55
"schema": [
6-
"CodegenTests/test-requests/DefaultSchemaEnum/schema.sql"
6+
"unit-tests/CodegenTests/test-requests/DefaultSchemaEnum/schema.sql"
77
],
88
"queries": [
9-
"CodegenTests/test-requests/DefaultSchemaEnum/query.sql"
9+
"unit-tests/CodegenTests/test-requests/DefaultSchemaEnum/query.sql"
1010
],
1111
"codegen": {
1212
"out": "./CodegenTests/test-requests/DefaultSchemaEnum",

CodegenTests/test-requests/DefaultSchemaEnum/request.message

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
�
3-
2mysql7CodegenTests/test-requests/DefaultSchemaEnum/schema.sql"6CodegenTests/test-requests/DefaultSchemaEnum/query.sqlbe
2+
�
3+
2mysqlBunit-tests/CodegenTests/test-requests/DefaultSchemaEnum/schema.sql"Aunit-tests/CodegenTests/test-requests/DefaultSchemaEnum/query.sqlbe
44
../CodegenTests/test-requests/DefaultSchemaEnumcsharp{"debugRequest":true}*
55
./dist/LocalRunner�public"xpublicL
66
 dummy_table;

CodegenTests/test-requests/SchemaScopedEnum/request.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"version": "2",
44
"engine": "mysql",
55
"schema": [
6-
"./CodegenTests/test-requests/SchemaScopedEnum/schema.sql"
6+
"unit-tests/CodegenTests/test-requests/SchemaScopedEnum/schema.sql"
77
],
88
"queries": [
9-
"./CodegenTests/test-requests/SchemaScopedEnum/query.sql"
9+
"unit-tests/CodegenTests/test-requests/SchemaScopedEnum/query.sql"
1010
],
1111
"codegen": {
1212
"out": "./CodegenTests/test-requests/SchemaScopedEnum",

CodegenTests/test-requests/SchemaScopedEnum/request.message

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
�
3-
2mysql8./CodegenTests/test-requests/SchemaScopedEnum/schema.sql"7./CodegenTests/test-requests/SchemaScopedEnum/query.sqlbd
2+
�
3+
2mysqlAunit-tests/CodegenTests/test-requests/SchemaScopedEnum/schema.sql"@unit-tests/CodegenTests/test-requests/SchemaScopedEnum/query.sqlbd
44
-./CodegenTests/test-requests/SchemaScopedEnumcsharp{"debugRequest":true}*
55
./dist/LocalRunner�public"*public"
66
dummy_table_dummy_columnxy"x dummy_schemah

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ PWD := $(shell pwd)
44
dotnet-build:
55
dotnet build
66

7+
.PHONY: unit-tests
78
unit-tests:
8-
dotnet test RepositoryTests
9+
dotnet test unit-tests/RepositoryTests
910
sqlc generate -f sqlc.unit.test.yaml
10-
dotnet test CodegenTests
11+
dotnet test unit-tests/CodegenTests
1112

1213
generate-end2end-tests:
1314
./end2end/scripts/generate_tests.sh

RequestRunner/App.cs

Lines changed: 0 additions & 29 deletions
This file was deleted.

RequestRunner/RequestRunner.csproj

Lines changed: 0 additions & 15 deletions
This file was deleted.

sqlc-gen-csharp.sln

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqliteDapperExample", "exam
4949
EndProject
5050
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqliteExample", "examples\SqliteExample\SqliteExample.csproj", "{0A345279-6E13-4E7E-B1A0-E1E6ABDAE06F}"
5151
EndProject
52-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodegenTests", "CodegenTests\CodegenTests.csproj", "{9FD3C47C-88A5-4C4A-A807-1E36114CBB38}"
52+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodegenTests", "unit-tests\CodegenTests\CodegenTests.csproj", "{9FD3C47C-88A5-4C4A-A807-1E36114CBB38}"
5353
EndProject
5454
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EndToEndCommon", "end2end\EndToEndCommon\EndToEndCommon.csproj", "{FE5AA465-DC0E-4B14-9BD3-16B47813FB97}"
5555
EndProject
@@ -59,9 +59,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExampleDocGen", "docs\Examp
5959
EndProject
6060
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EndToEndScaffold", "end2end\EndToEndScaffold\EndToEndScaffold.csproj", "{2A101C54-4F0C-41AC-86B2-FFF6DFBFD0C0}"
6161
EndProject
62-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RepositoryTests", "RepositoryTests\RepositoryTests.csproj", "{7FEF697A-841D-4E32-A8ED-0F36C4436B55}"
63-
EndProject
64-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RequestRunner", "RequestRunner\RequestRunner.csproj", "{645E834B-743F-4D80-9073-98878995FE87}"
62+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RepositoryTests", "unit-tests\RepositoryTests\RepositoryTests.csproj", "{7FEF697A-841D-4E32-A8ED-0F36C4436B55}"
6563
EndProject
6664
Global
6765
GlobalSection(SolutionConfigurationPlatforms) = preSolution

0 commit comments

Comments
 (0)