query test progress

src/validator/util.rs

@@ -10,12 +10,48 @@ struct TestSuite {
 }
 
 #[derive(Debug, Deserialize)]
-struct TestCase {
-  description: String,
-  data: serde_json::Value,
-  valid: bool,
-  // Support explicit schema ID target for test case
-  schema_id: String,
+pub struct TestCase {
+  pub description: String,
+
+  #[serde(default = "default_action")]
+  pub action: String, // "validate", "merge", or "query"
+
+  // For Validate & Query
+  #[serde(default)]
+  pub schema_id: String,
+
+  // For Query
+  #[serde(default)]
+  pub stem: Option<String>,
+
+  #[serde(default)]
+  pub filters: Option<serde_json::Value>,
+
+  // For Merge & Validate
+  #[serde(default)]
+  pub data: Option<serde_json::Value>,
+
+  // For Merge & Query mocks
+  #[serde(default)]
+  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 {
+  "validate".to_string()
+}
+
+#[derive(Debug, Deserialize)]
+pub struct ExpectBlock {
+  pub success: bool,
+  pub result: Option<serde_json::Value>,
+  pub errors: Option<Vec<serde_json::Value>>,
+  pub sql_patterns: Option<Vec<String>>,
 }
 
 // use crate::validator::registry::REGISTRY; // No longer used directly for tests!