fix(tests): simplifying tests, reverting some things

Signed-off-by: Cortland Goffena <30168413+cmgoffena13@users.noreply.github.com>

Author: cmgoffena13

sqlmesh/cli/project_init.py

@@ -229,7 +229,7 @@ def _gen_example_objects(schema_name: str) -> ExampleObjects:
 FROM
   {seed_model_name}
 WHERE
-  event_date BETWEEN @start_date AND @end_date
+  event_date BETWEEN @start_ds AND @end_ds
   """
 
     sql_models[seed_model_name] = f"""MODEL (
@@ -286,25 +286,6 @@ def _gen_example_objects(schema_name: str) -> ExampleObjects:
         num_orders: 1
   """
 
-    tests["test_incremental_model"] = f"""test_example_incremental_model:
-  model: {incremental_model_name}
-  vars:
-    start: 2020-01-01
-    end: 2020-01-02
-  inputs:
-    {seed_model_name}:
-      rows:
-      - id: 1
-        item_id: 1
-        event_date: 2020-01-01
-  outputs:
-    query:
-      rows:
-      - id: 1
-        item_id: 1
-        event_date: 2020-01-01
-  """
-
     return ExampleObjects(
         sql_models=sql_models,
         python_models=python_models,

tests/cli/test_cli.py

@@ -59,6 +59,31 @@ def create_example_project(temp_dir, template=ProjectTemplate.DEFAULT) -> None:
         )
 
 
+def add_unchanged_incremental_model_test(temp_dir) -> None:
+    with open(temp_dir / "tests" / "test_incremental_model.yaml", "w", encoding="utf-8") as f:
+        f.write(
+            """
+test_example_incremental_model:
+  model: sqlmesh_example.incremental_model
+  vars:
+    start: 2020-01-01
+    end: 2020-01-02
+  inputs:
+    sqlmesh_example.seed_model:
+      rows:
+      - id: 1
+        item_id: 1
+        event_date: 2020-01-01
+  outputs:
+    query:
+      rows:
+      - id: 1
+        item_id: 1
+        event_date: 2020-01-01
+"""
+        )
+
+
 def update_incremental_model(temp_dir) -> None:
     with open(temp_dir / "models" / "incremental_model.sql", "w", encoding="utf-8") as f:
         f.write(
@@ -117,7 +142,7 @@ def init_prod_and_backfill(runner, temp_dir) -> None:
 
 
 def assert_duckdb_test(result) -> None:
-    assert "Successfully Ran 2 tests against duckdb" in result.output
+    assert "Successfully Ran 1 tests against duckdb" in result.output
 
 
 def assert_new_env(result, new_env="prod", from_env="prod", initialize=True) -> None:
@@ -188,7 +213,7 @@ def test_plan_skip_tests(runner, tmp_path):
         cli, ["--log-file-dir", tmp_path, "--paths", tmp_path, "plan", "--skip-tests"], input="y\n"
     )
     assert result.exit_code == 0
-    assert "Successfully Ran 2 tests against duckdb" not in result.output
+    assert "Successfully Ran 1 tests against duckdb" not in result.output
     assert_new_env(result)
     assert_backfill_success(result)
 
@@ -201,7 +226,7 @@ def test_plan_no_changes_runs_tests_by_default(runner, tmp_path):
         cli, ["--log-file-dir", tmp_path, "--paths", tmp_path, "plan", "--no-prompts"], input="\n"
     )
     assert result.exit_code == 0
-    assert "Successfully Ran 2 tests against duckdb" in result.output
+    assert "Successfully Ran 1 tests against duckdb" in result.output
     assert "No changes to plan" in result.output or "No changes" in result.output
 
 
@@ -229,6 +254,7 @@ def test_plan_test_changed_only_with_no_changes(runner, tmp_path):
 def test_plan_test_changed_only_runs_only_changed_model_tests(runner, tmp_path):
     create_example_project(tmp_path)
     init_prod_and_backfill(runner, tmp_path)
+    add_unchanged_incremental_model_test(tmp_path)
 
     full_model_path = tmp_path / "models" / "full_model.sql"
     full_model_path.write_text(
@@ -256,14 +282,18 @@ def test_plan_test_changed_only_runs_only_changed_model_tests(runner, tmp_path):
 def test_plan_select_model_test_changed_only_scopes_tests(runner, tmp_path):
     create_example_project(tmp_path)
     init_prod_and_backfill(runner, tmp_path)
+    add_unchanged_incremental_model_test(tmp_path)
 
     full_model_path = tmp_path / "models" / "full_model.sql"
     full_model_path.write_text(
         full_model_path.read_text().replace("COUNT(DISTINCT id)", "COUNT(id)")
     )
     incremental_model_path = tmp_path / "models" / "incremental_model.sql"
     incremental_model_path.write_text(
-        incremental_model_path.read_text().replace("'a' as new_col,", "'b' as new_col,")
+        incremental_model_path.read_text().replace(
+            "  item_id,\n  event_date,",
+            "  item_id,\n  'b' as new_col,\n  event_date,",
+        )
     )
 
     result = runner.invoke(
@@ -355,7 +385,7 @@ def test_plan_skip_backfill(runner, tmp_path, flag):
     assert_virtual_layer_updated(result)
     assert "Model batches executed" not in result.output
     # Dry-run still runs plan-scoped unit tests
-    assert "Successfully Ran 2 tests against duckdb" in result.output
+    assert "Successfully Ran 1 tests against duckdb" in result.output
 
 
 def test_plan_min_intervals(runner, tmp_path):

tests/core/test_test.py

@@ -2622,13 +2622,13 @@ def test_test_output_with_invalid_model_name(tmp_path: Path) -> None:
         f"""Model '"invalid_model"' was not found at {wrong_test_file}"""
         in mock_logger.call_args[0][0]
     )
-    assert "Successfully Ran 2 tests" in output.stdout
+    assert "Successfully Ran 1 test" in output.stdout
 
 
 def test_number_of_tests_found(tmp_path: Path) -> None:
     init_example_project(tmp_path, engine_type="duckdb")
 
-    # Example project contains 2 tests and we add a new file with 2 tests
+    # Example project contains 1 test and we add a new file with 2 tests
     test_file = tmp_path / "tests" / "test_new.yaml"
     test_file.write_text(
         """
@@ -2674,9 +2674,9 @@ def test_number_of_tests_found(tmp_path: Path) -> None:
 
     context = Context(paths=tmp_path)
 
-    # Case 1: All 4 tests should run without any tests specified
+    # Case 1: All 3 tests should run without any tests specified
     results = context.test()
-    assert len(results.successes) == 4
+    assert len(results.successes) == 3
 
     # Case 2: The "new_test.yaml" should amount to 2 subtests
     results = context.test(tests=[f"{test_file}"])