Skip to content

Commit bda69db

Browse files
tosh2230tosh2230
authored
Merge pull request #146 from tosh2230/keep-tests-clean
Keep tests clean
2 parents 7d4ac50 + 85ec711 commit bda69db

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+181
-263
lines changed

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ Top-level keys are table names, and values represents tables that are the data s
8888
"test_project.beam_streaming.taxirides_aggregation": {
8989
"test_project.beam_streaming.taxirides_realtime": {
9090
"TemplateSourceType": "File",
91-
"Key": "tests/sql/main/union_same_table.sql",
92-
"Uri": "/foo/bar/stairlight/tests/sql/main/union_same_table.sql",
91+
"Key": "tests/sql/union_same_table.sql",
92+
"Uri": "/foo/bar/stairlight/tests/sql/union_same_table.sql",
9393
"Lines": [
9494
{
9595
"LineNumber": 6,
@@ -265,7 +265,7 @@ Global:
265265
TABLE: taxirides
266266
Mapping:
267267
- TemplateSourceType: File
268-
FileSuffix: "tests/sql/main/union_same_table.sql"
268+
FileSuffix: "tests/sql/union_same_table.sql"
269269
Tables:
270270
- TableName: "test_project.beam_streaming.taxirides_aggregation"
271271
Parameters:

‎tests/config/file_storage/mapping_file.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ Global:
88

99
Mapping:
1010
- TemplateSourceType: File
11-
FileSuffix: "tests/sql/main/one_line_no_project.sql"
11+
FileSuffix: "tests/sql/one_line_no_project.sql"
1212
Tables:
1313
- TableName: "PROJECT_A.DATASET_B.TABLE_C"
1414
- TemplateSourceType: File
15-
FileSuffix: "tests/sql/main/cte_multi_line.sql"
15+
FileSuffix: "tests/sql/cte_multi_line.sql"
1616
Tables:
1717
- TableName: "PROJECT_D.DATASET_E.TABLE_F"
1818
IgnoreParameters:
@@ -39,7 +39,7 @@ Mapping:
3939
Source: file
4040
Test: b
4141
- TemplateSourceType: File
42-
FileSuffix: "tests/sql/main/cte_multi_line_params.sql"
42+
FileSuffix: "tests/sql/cte_multi_line_params.sql"
4343
Tables:
4444
- TableName: "PROJECT_J.DATASET_K.TABLE_L"
4545
Parameters:
@@ -51,7 +51,7 @@ Mapping:
5151
Source: file
5252
Test: c
5353
- TemplateSourceType: File
54-
FileSuffix: "tests/sql/main/cte_multi_line_params_copy.sql"
54+
FileSuffix: "tests/sql/cte_multi_line_params_copy.sql"
5555
Tables:
5656
- TableName: "PROJECT_J.DATASET_K.TABLE_L"
5757
Parameters:
@@ -63,30 +63,30 @@ Mapping:
6363
Source: file
6464
Test: c
6565
- TemplateSourceType: File
66-
FileSuffix: "tests/sql/main/one_line_1.sql"
66+
FileSuffix: "tests/sql/one_line_1.sql"
6767
Tables:
6868
- TableName: "PROJECT_j.DATASET_k.TABLE_l"
6969
- TemplateSourceType: File
70-
FileSuffix: "tests/sql/main/one_line_2.sql"
70+
FileSuffix: "tests/sql/one_line_2.sql"
7171
Tables:
7272
- TableName: "PROJECT_d.DATASET_e.TABLE_f"
7373
- TemplateSourceType: File
74-
FileSuffix: "tests/sql/main/one_line_3.sql"
74+
FileSuffix: "tests/sql/one_line_3.sql"
7575
Tables:
7676
- TableName: "PROJECT_d.DATASET_d.TABLE_d"
7777
- TemplateSourceType: File
78-
FileSuffix: "tests/sql/main/undefined_part.sql"
78+
FileSuffix: "tests/sql/undefined_part.sql"
7979
Tables:
8080
- TableName: "PROJECT_u.DATASET_u.TABLE_u"
8181
Parameters:
8282
params:
8383
main_table: "PROJECT_t.DATASET_t.TABLE_t"
8484
- TemplateSourceType: File
85-
FileSuffix: "tests/sql/main/union_same_table.sql"
85+
FileSuffix: "tests/sql/union_same_table.sql"
8686
Tables:
8787
- TableName: "test_project.beam_streaming.taxirides_aggregation"
8888
- TemplateSourceType: File
89-
FileSuffix: "tests/sql/main/not_found_test.sql"
89+
FileSuffix: "tests/sql/not_found_test.sql"
9090
Tables:
9191
- TableName: "test_project.not_found_test.not_found_test"
9292
ExtraLabels:

‎tests/config/file_storage/mapping_single.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Mapping:
22
- TemplateSourceType: File
3-
FileSuffix: "tests/sql/main/one_line_no_project.sql"
3+
FileSuffix: "tests/sql/one_line_no_project.sql"
44
Tables:
55
- TableName: "PROJECT_A.DATASET_B.TABLE_C"
66
Parameters:

‎tests/config/mapping.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ Global:
88

99
Mapping:
1010
- TemplateSourceType: File
11-
FileSuffix: "tests/sql/main/one_line_no_project.sql"
11+
FileSuffix: "tests/sql/one_line_no_project.sql"
1212
Tables:
1313
- TableName: "PROJECT_A.DATASET_B.TABLE_C"
1414
- TemplateSourceType: File
15-
FileSuffix: "tests/sql/main/cte_multi_line.sql"
15+
FileSuffix: "tests/sql/cte_multi_line.sql"
1616
Tables:
1717
- TableName: "PROJECT_D.DATASET_E.TABLE_F"
1818
IgnoreParameters:
@@ -39,7 +39,7 @@ Mapping:
3939
Source: file
4040
Test: b
4141
- TemplateSourceType: File
42-
FileSuffix: "tests/sql/main/cte_multi_line_params.sql"
42+
FileSuffix: "tests/sql/cte_multi_line_params.sql"
4343
Tables:
4444
- TableName: "PROJECT_J.DATASET_K.TABLE_L"
4545
Parameters:
@@ -51,7 +51,7 @@ Mapping:
5151
Source: file
5252
Test: c
5353
- TemplateSourceType: File
54-
FileSuffix: "tests/sql/main/cte_multi_line_params_copy.sql"
54+
FileSuffix: "tests/sql/cte_multi_line_params_copy.sql"
5555
Tables:
5656
- TableName: "PROJECT_J.DATASET_K.TABLE_L"
5757
Parameters:
@@ -63,26 +63,26 @@ Mapping:
6363
Source: file
6464
Test: c
6565
- TemplateSourceType: File
66-
FileSuffix: "tests/sql/main/one_line_1.sql"
66+
FileSuffix: "tests/sql/one_line_1.sql"
6767
Tables:
6868
- TableName: "PROJECT_j.DATASET_k.TABLE_l"
6969
- TemplateSourceType: File
70-
FileSuffix: "tests/sql/main/one_line_2.sql"
70+
FileSuffix: "tests/sql/one_line_2.sql"
7171
Tables:
7272
- TableName: "PROJECT_d.DATASET_e.TABLE_f"
7373
- TemplateSourceType: File
74-
FileSuffix: "tests/sql/main/one_line_3.sql"
74+
FileSuffix: "tests/sql/one_line_3.sql"
7575
Tables:
7676
- TableName: "PROJECT_d.DATASET_d.TABLE_d"
7777
- TemplateSourceType: File
78-
FileSuffix: "tests/sql/main/undefined_part.sql"
78+
FileSuffix: "tests/sql/undefined_part.sql"
7979
Tables:
8080
- TableName: "PROJECT_u.DATASET_u.TABLE_u"
8181
Parameters:
8282
params:
8383
main_table: "PROJECT_t.DATASET_t.TABLE_t"
8484
- TemplateSourceType: File
85-
FileSuffix: "tests/sql/main/union_same_table.sql"
85+
FileSuffix: "tests/sql/union_same_table.sql"
8686
Tables:
8787
- TableName: "test_project.beam_streaming.taxirides_aggregation"
8888
- TemplateSourceType: GCS

‎tests/config/stairlight.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Include:
22
- TemplateSourceType: File
33
FileSystemPath: "./tests/sql"
4-
Regex: .*/*\.sql$
4+
Regex: .*?/*\.sql$
55
DefaultTablePrefix: "PROJECT_A"
66
- TemplateSourceType: GCS
77
ProjectId: null
@@ -21,7 +21,7 @@ Include:
2121
DefaultTablePrefix: "PROJECT_A"
2222
Exclude:
2323
- TemplateSourceType: File
24-
Regex: main/exclude\.sql$
24+
Regex: exclude\.sql$
2525
Settings:
2626
MappingFilesRegex:
2727
- .*/file_storage/mapping\_file\.yaml$

‎tests/config/stairlight_dbt.yaml

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

‎tests/config/stairlight_file.yaml

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

‎tests/config/test_check/stairlight.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Include:
22
- TemplateSourceType: File
33
FileSystemPath: "./tests/sql"
4-
Regex: ".*/*.sql$"
4+
Regex: ".*?/*.sql$"
55
DefaultTablePrefix: "PROJECT_A"
66
Exclude:
77
- TemplateSourceType: File
8-
Regex: "main/exclude.sql$"
8+
Regex: "exclude.sql$"
99
Settings:
1010
MappingPrefix: "mapping"

‎tests/config/test_check_no_file_found/stairlight.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Include:
22
- TemplateSourceType: File
33
FileSystemPath: "tests/config/test_check_no_file_found"
4-
Regex: ".*/*.sql$"
4+
Regex: ".*?/*.sql$"
55
DefaultTablePrefix: "PROJECT_A"
66
Settings:
77
MappingPrefix: "mapping"

0 commit comments

Comments
 (0)