Skip to content

Commit

Permalink
Checkpoint on test fixing
Browse files Browse the repository at this point in the history
  • Loading branch information
QMalcolm committed Jul 11, 2023
1 parent 19ba616 commit dbe943b
Show file tree
Hide file tree
Showing 11 changed files with 221 additions and 3 deletions.
26 changes: 26 additions & 0 deletions tests/functional/access/test_access.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,31 @@
select 1 as id, 'Callum' as first_name, 'McCann' as last_name, 'emerald' as favorite_color, true as loves_dbt, 0 as tenure, current_timestamp as created_at
"""

people_semantic_model_yml = """
semantic_models:
- name: semantic_people
model: ref('people')
dimensions:
- name: favorite_color
type: categorical
- name: created_at
type: TIME
type_params:
time_granularity: day
measures:
- name: years_tenure
agg: SUM
expr: tenure
- name: people
agg: count
expr: id
entities:
- name: id
type: primary
defaults:
agg_time_dimension: created_at
"""

people_metric_yml = """
metrics:
Expand Down Expand Up @@ -278,6 +303,7 @@ def test_access_attribute(self, project):
write_file(v5_schema_yml, project.project_root, "models", "schema.yml")
rm_file(project.project_root, "models", "simple_exposure.yml")
write_file(people_model_sql, "models", "people_model.sql")
write_file(people_semantic_model_yml, "models", "people_semantic_model.yml")
write_file(people_metric_yml, "models", "people_metric.yml")
# Should succeed
manifest = run_dbt(["parse"])
Expand Down
23 changes: 23 additions & 0 deletions tests/functional/artifacts/test_previous_version_state.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,29 @@
tests:
- not_null
semantic_models:
- name: semantic_people
model: ref('people')
dimensions:
- name: favorite_color
type: categorical
- name: created_at
type: TIME
type_params:
time_granularity: day
measures:
- name: years_tenure
agg: SUM
expr: tenure
- name: people
agg: count
expr: id
entities:
- name: id
type: primary
defaults:
agg_time_dimension: created_at
metrics:
- name: my_metric
label: Count records
Expand Down
24 changes: 24 additions & 0 deletions tests/functional/exposures/fixtures.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
"""


metricflow_time_spine_sql = """
SELECT to_date('02/20/2023, 'mm/dd/yyyy') as date_day
"""


source_schema_yml = """version: 2
sources:
Expand All @@ -15,6 +20,25 @@
- name: test_table
"""


semantic_models_schema_yml = """version: 2
semantic_models:
- name: semantic_model
model: ref('model')
measures:
- name: distinct_metrics
agg: count_distinct
expr: id
entities:
- name: model
type: primary
expr: id
defaults:
agg_time_dimension: created_at
"""


metrics_schema_yml = """version: 2
metrics:
Expand Down
4 changes: 4 additions & 0 deletions tests/functional/exposures/test_exposure_configs.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
enabled_yaml_level_exposure_yml,
invalid_config_exposure_yml,
source_schema_yml,
metricflow_time_spine_sql,
semantic_models_schema_yml,
metrics_schema_yml,
)

Expand All @@ -30,9 +32,11 @@ class TestExposureEnabledConfigProjectLevel(ExposureConfigTests):
def models(self):
return {
"model.sql": models_sql,
"metricflow_time_spine.sql": metricflow_time_spine_sql,
"second_model.sql": second_model_sql,
"exposure.yml": simple_exposure_yml,
"schema.yml": source_schema_yml,
"semantic_models.yml": semantic_models_schema_yml,
"metrics.yml": metrics_schema_yml,
}

Expand Down
4 changes: 4 additions & 0 deletions tests/functional/exposures/test_exposures.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
simple_exposure_yml,
source_schema_yml,
metrics_schema_yml,
semantic_models_schema_yml,
metricflow_time_spine_sql,
)


Expand All @@ -16,8 +18,10 @@ def models(self):
return {
"exposure.yml": simple_exposure_yml,
"model.sql": models_sql,
"metricflow_time_spine.sql": metricflow_time_spine_sql,
"second_model.sql": second_model_sql,
"schema.yml": source_schema_yml,
"semantic_models.yml": semantic_models_schema_yml,
"metrics.yml": metrics_schema_yml,
}

Expand Down
35 changes: 33 additions & 2 deletions tests/functional/metrics/fixtures.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,36 @@
models_people_sql = """
select 1 as id, 'Drew' as first_name, 'Banin' as last_name, 'yellow' as favorite_color, true as loves_dbt, 5 as tenure, current_timestamp as created_at
union all
select 1 as id, 'Jeremy' as first_name, 'Cohen' as last_name, 'indigo' as favorite_color, true as loves_dbt, 4 as tenure, current_timestamp as created_at
select 2 as id, 'Jeremy' as first_name, 'Cohen' as last_name, 'indigo' as favorite_color, true as loves_dbt, 4 as tenure, current_timestamp as created_at
union all
select 1 as id, 'Callum' as first_name, 'McCann' as last_name, 'emerald' as favorite_color, true as loves_dbt, 0 as tenure, current_timestamp as created_at
select 3 as id, 'Callum' as first_name, 'McCann' as last_name, 'emerald' as favorite_color, true as loves_dbt, 0 as tenure, current_timestamp as created_at
"""

semantic_model_people_yml = """
version: 2
semantic_models:
- name: semantic_people
model: ref('people')
dimensions:
- name: favorite_color
type: categorical
- name: created_at
type: TIME
type_params:
time_granularity: day
measures:
- name: years_tenure
agg: SUM
expr: tenure
- name: people
agg: count
expr: id
entities:
- name: id
type: primary
defaults:
agg_time_dimension: created_at
"""

basic_metrics_yml = """
Expand Down Expand Up @@ -63,6 +90,10 @@
expr: "average_tenure + 1"
"""

metricflow_time_spine_sql = """
SELECT to_date('02/20/2023, 'mm/dd/yyyy') as date_day
"""

models_people_metrics_yml = """
version: 2
Expand Down
6 changes: 6 additions & 0 deletions tests/functional/metrics/test_metric_configs.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@
from tests.functional.metrics.fixtures import (
models_people_sql,
models_people_metrics_yml,
metricflow_time_spine_sql,
disabled_metric_level_schema_yml,
enabled_metric_level_schema_yml,
models_people_metrics_sql,
invalid_config_metric_yml,
semantic_model_people_yml,
)


Expand All @@ -29,6 +31,7 @@ class TestMetricEnabledConfigProjectLevel(MetricConfigTests):
def models(self):
return {
"people.sql": models_people_sql,
"semantic_model_people.yml": semantic_model_people_yml,
"schema.yml": models_people_metrics_yml,
}

Expand Down Expand Up @@ -69,6 +72,7 @@ class TestConfigYamlMetricLevel(MetricConfigTests):
def models(self):
return {
"people.sql": models_people_sql,
"semantic_model_people.yml": semantic_model_people_yml,
"schema.yml": disabled_metric_level_schema_yml,
}

Expand All @@ -85,6 +89,7 @@ class TestMetricConfigsInheritence(MetricConfigTests):
def models(self):
return {
"people.sql": models_people_sql,
"semantic_model_people.yml": semantic_model_people_yml,
"schema.yml": enabled_metric_level_schema_yml,
}

Expand Down Expand Up @@ -112,6 +117,7 @@ class TestDisabledMetricRef(MetricConfigTests):
def models(self):
return {
"people.sql": models_people_sql,
"metricflow_time_spine.sql": metricflow_time_spine_sql,
"people_metrics.sql": models_people_metrics_sql,
"schema.yml": models_people_metrics_yml,
}
Expand Down
31 changes: 31 additions & 0 deletions tests/functional/partial_parsing/fixtures.py
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,10 @@
"""

metricflow_time_spine_sql = """
SELECT to_date('02/20/2023, 'mm/dd/yyyy') as date_day
"""

env_var_schema3_yml = """
models:
Expand All @@ -421,6 +425,33 @@
"""

people_semantic_models_yml = """
version: 2
semantic_models:
- name: semantic_people
model: ref('people')
dimensions:
- name: favorite_color
type: categorical
- name: created_at
type: TIME
type_params:
time_granularity: day
measures:
- name: years_tenure
agg: SUM
expr: tenure
- name: people
agg: count
expr: id
entities:
- name: id
type: primary
defaults:
agg_time_dimension: created_at
"""

env_var_metrics_yml = """
metrics:
Expand Down
54 changes: 54 additions & 0 deletions tests/functional/partial_parsing/test_pp_disabled_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,24 @@
models:
- name: model_one
semantic_models:
- name: semantic_people
model: ref('people')
dimensions:
- name: created_at
type: TIME
type_params:
time_granularity: day
measures:
- name: people
agg: count
expr: fun
entities:
- name: fun
type: primary
defaults:
agg_time_dimension: created_at
metrics:
- name: number_of_people
Expand Down Expand Up @@ -39,6 +57,24 @@
models:
- name: model_one
semantic_models:
- name: semantic_people
model: ref('people')
dimensions:
- name: created_at
type: TIME
type_params:
time_granularity: day
measures:
- name: people
agg: count
expr: fun
entities:
- name: fun
type: primary
defaults:
agg_time_dimension: created_at
metrics:
- name: number_of_people
Expand Down Expand Up @@ -71,6 +107,24 @@
models:
- name: model_one
semantic_models:
- name: semantic_people
model: ref('people')
dimensions:
- name: created_at
type: TIME
type_params:
time_granularity: day
measures:
- name: people
agg: count
expr: fun
entities:
- name: fun
type: primary
defaults:
agg_time_dimension: created_at
metrics:
- name: number_of_people
Expand Down
9 changes: 8 additions & 1 deletion tests/functional/partial_parsing/test_pp_metrics.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from dbt.tests.util import run_dbt, write_file, get_manifest
from tests.functional.partial_parsing.fixtures import (
people_sql,
people_semantic_models_yml,
people_metrics_yml,
people_metrics2_yml,
metric_model_a_sql,
Expand All @@ -26,7 +27,13 @@ def test_metrics(self, project):
manifest = get_manifest(project.project_root)
assert len(manifest.nodes) == 1

# Add metrics yaml file
# Add metrics yaml file (and necessary semantic models yaml)
write_file(
people_semantic_models_yml,
project.project_root,
"models",
"people_semantic_models.yml",
)
write_file(people_metrics_yml, project.project_root, "models", "people_metrics.yml")
results = run_dbt(["run"])
assert len(results) == 1
Expand Down
Loading

0 comments on commit dbe943b

Please sign in to comment.