Skip to content

Commit e14908e

Browse files
danieljharveyhasura-bot
authored andcommitted
Use file globs in metadata-resolve tests (#728)
<!-- Thank you for submitting this PR! :) --> ## Description Because we globbed for folders, we had to put a test in the root of each folder which is messy. If we glob for files instead, like the `failing` tests do, we can have a better time. Functional no-op. V3_GIT_ORIGIN_REV_ID: 381f5a44d9ae6100198bd28a286493bc3a2ba98e
1 parent 5ad33bd commit e14908e

File tree

5 files changed

+7
-15
lines changed

5 files changed

+7
-15
lines changed

v3/crates/metadata-resolve/tests/metadata_golden_tests.rs

+7-15
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,20 @@
22
//! or fail in the expected way.
33
44
use std::fs;
5-
use std::path::{Path, PathBuf};
6-
7-
use serde_json::Value;
5+
use std::path::PathBuf;
86

97
use metadata_resolve::MetadataResolveFlagsInternal;
108

11-
#[test_each::path(glob = "crates/metadata-resolve/tests/passing/**/", name(segments = 2))]
12-
#[allow(clippy::needless_pass_by_value)] // must receive a `PathBuf`
13-
fn test_passing_metadata(comparison_folder_path: PathBuf) -> anyhow::Result<()> {
14-
let passing_example = comparison_folder_path.join("metadata.json");
15-
9+
#[test_each::file(
10+
glob = "crates/metadata-resolve/tests/passing/**/metadata.json",
11+
name(segments = 2)
12+
)]
13+
fn test_passing_metadata(metadata_json_text: &str) -> anyhow::Result<()> {
1614
let metadata_resolve_flags_internal = MetadataResolveFlagsInternal {
1715
enable_boolean_expression_types: true,
1816
};
1917

20-
let metadata_json_value = read_json(&passing_example)?;
18+
let metadata_json_value = serde_json::from_str(metadata_json_text)?;
2119

2220
let metadata = open_dds::traits::OpenDd::deserialize(metadata_json_value)?;
2321
let resolved = metadata_resolve::resolve(metadata, &metadata_resolve_flags_internal);
@@ -67,9 +65,3 @@ fn test_failing_metadata(
6765

6866
Ok(())
6967
}
70-
71-
fn read_json(path: &Path) -> anyhow::Result<Value> {
72-
let json_string = fs::read_to_string(path)?;
73-
let value = serde_json::from_str(&json_string)?;
74-
Ok(value)
75-
}

0 commit comments

Comments
 (0)