more tests progress

src/tests/fixtures.rs

@@ -1463,12 +1463,6 @@ fn test_queryer_0_8() {
     crate::tests::runner::run_test_case(&path, 0, 8).unwrap();
 }
 
-#[test]
-fn test_queryer_0_9() {
-    let path = format!("{}/fixtures/queryer.json", env!("CARGO_MANIFEST_DIR"));
-    crate::tests::runner::run_test_case(&path, 0, 9).unwrap();
-}
-
 #[test]
 fn test_not_0_0() {
     let path = format!("{}/fixtures/not.json", env!("CARGO_MANIFEST_DIR"));
@@ -8536,3 +8530,21 @@ fn test_merger_0_4() {
     let path = format!("{}/fixtures/merger.json", env!("CARGO_MANIFEST_DIR"));
     crate::tests::runner::run_test_case(&path, 0, 4).unwrap();
 }
+
+#[test]
+fn test_merger_0_5() {
+    let path = format!("{}/fixtures/merger.json", env!("CARGO_MANIFEST_DIR"));
+    crate::tests::runner::run_test_case(&path, 0, 5).unwrap();
+}
+
+#[test]
+fn test_merger_0_6() {
+    let path = format!("{}/fixtures/merger.json", env!("CARGO_MANIFEST_DIR"));
+    crate::tests::runner::run_test_case(&path, 0, 6).unwrap();
+}
+
+#[test]
+fn test_merger_0_7() {
+    let path = format!("{}/fixtures/merger.json", env!("CARGO_MANIFEST_DIR"));
+    crate::tests::runner::run_test_case(&path, 0, 7).unwrap();
+}

src/tests/runner.rs

@@ -95,17 +95,6 @@ pub fn run_test_case(path: &str, suite_idx: usize, case_idx: usize) -> Result<()
   let mut failures = Vec::<String>::new();
 
   // 4. Run Tests
-  // Provide fallback for legacy expectations if `expect` block was missing despite migration script
-  let _expected_success = test
-    .expect
-    .as_ref()
-    .map(|e| e.success)
-    .unwrap_or(test.valid.unwrap_or(false));
-  let _expected_errors = test
-    .expect
-    .as_ref()
-    .and_then(|e| e.errors.clone())
-    .unwrap_or(test.expect_errors.clone().unwrap_or(vec![]));
 
   match test.action.as_str() {
     "validate" => {

src/tests/types/case.rs

@@ -31,10 +31,6 @@ pub struct TestCase {
   pub mocks: Option<serde_json::Value>,
 
   pub expect: Option<ExpectBlock>,
-
-  // Legacy support for older tests to avoid migrating them all instantly
-  pub valid: Option<bool>,
-  pub expect_errors: Option<Vec<serde_json::Value>>,
 }
 
 fn default_action() -> String {
@@ -59,18 +55,7 @@ impl TestCase {
 
     let validator = Validator::new(db);
 
-    let expected_success = self
-      .expect
-      .as_ref()
-      .map(|e| e.success)
-      .unwrap_or(self.valid.unwrap_or(false));
-
-    // _expected_errors is preserved for future diffing if needed
-    let _expected_errors = self
-      .expect
-      .as_ref()
-      .and_then(|e| e.errors.clone())
-      .unwrap_or(self.expect_errors.clone().unwrap_or(vec![]));
+    let expected_success = self.expect.as_ref().map(|e| e.success).unwrap_or(false);
 
     let schema_id = &self.schema_id;
     if !validator.db.schemas.contains_key(schema_id) {
@@ -102,6 +87,12 @@ impl TestCase {
   }
 
   pub fn run_merge(&self, db: Arc<Database>) -> Result<(), String> {
+    if let Some(mocks) = &self.mocks {
+      if let Some(arr) = mocks.as_array() {
+        db.executor.set_mocks(arr.clone());
+      }
+    }
+
     use crate::merger::Merger;
     let merger = Merger::new(db.clone());
 
@@ -134,6 +125,12 @@ impl TestCase {
   }
 
   pub fn run_query(&self, db: Arc<Database>) -> Result<(), String> {
+    if let Some(mocks) = &self.mocks {
+      if let Some(arr) = mocks.as_array() {
+        db.executor.set_mocks(arr.clone());
+      }
+    }
+
     use crate::queryer::Queryer;
     let queryer = Queryer::new(db.clone());