Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions crates/workshop-rs-cli/tests/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -338,12 +338,19 @@ fn census_runs_with_machine_readable_results() {
.is_some_and(|shards| !shards.is_empty())
);
assert!(report["results"].as_array().is_some_and(|results| {
results
.iter()
.any(|result| result["status"] == "inconclusive")
&& results
.iter()
.any(|result| result["status"] == "unexpected-regression")
!results.is_empty()
&& results.iter().all(|result| {
matches!(
result["status"].as_str(),
Some(
"matched"
| "unsupported"
| "known-gap"
| "unexpected-regression"
| "inconclusive"
)
)
})
}));

let output = run(&["census", "--json", "extra"]);
Expand Down
61 changes: 0 additions & 61 deletions crates/workshop-rs/src/analysis/semantic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -352,64 +352,3 @@ fn inspect_value_tree(
}
}
}

#[cfg(test)]
mod tests {
use super::*;
use crate::settings::{Settings, SettingsNode};
use crate::{Action, Condition, Event, Program, Rule, Value};

#[test]
fn reports_preserved_and_unknown_nodes() {
let catalog = Catalog::builtin().expect("builtin catalog");
let mut program = Program::new();
program.settings = Some(Settings {
span: None,
children: vec![SettingsNode::Raw {
name: "Future Setting".to_string(),
value: "opaque".to_string(),
span: None,
}],
});
program.rule(
Rule::new("residuals", Event::Global)
.condition(Condition::new(Value::call("futureValue", [])))
.action(Action::call("rawWorkshopAction", []))
.action(Action::call("futureAction", [])),
);

let issues = inspect(&program, &catalog);
assert!(
issues
.iter()
.any(|issue| issue.kind == IncompletenessKind::RawSetting)
);
assert!(
issues
.iter()
.any(|issue| issue.kind == IncompletenessKind::OpaqueAction)
);
assert!(
issues
.iter()
.any(|issue| issue.kind == IncompletenessKind::UnknownAction)
);
assert!(
issues
.iter()
.any(|issue| issue.kind == IncompletenessKind::UnknownValue)
);
assert!(issues.iter().any(|issue| {
issue.kind == IncompletenessKind::RawSetting
&& issue.classification == ResidualClassification::ProjectDefinedConstruct
}));
assert!(issues.iter().any(|issue| {
issue.kind == IncompletenessKind::OpaqueAction
&& issue.classification == ResidualClassification::LegacyOpaque
}));
assert!(issues.iter().any(|issue| {
issue.kind == IncompletenessKind::UnknownValue
&& issue.classification == ResidualClassification::UnresolvedIdentifier
}));
}
}
9 changes: 0 additions & 9 deletions crates/workshop-rs/src/core/ids.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ mod tests {
use super::Id;

struct File;
struct Rule;

#[test]
fn ids_are_cheap_copyable_and_comparable() {
Expand All @@ -96,14 +95,6 @@ mod tests {
assert_eq!(std::mem::size_of::<Id<File>>(), 4);
}

#[test]
fn id_types_are_not_interchangeable() {
let _file: Id<File> = Id::from_index(0);
let _rule: Id<Rule> = Id::from_index(0);
let _ = _file;
let _ = _rule;
}

#[test]
fn ids_survive_hashing() {
use std::collections::HashSet;
Expand Down
4 changes: 0 additions & 4 deletions crates/workshop-rs/src/tests.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#[path = "../tests/audit_benchmarks.rs"]
mod audit_benchmarks;
#[path = "../tests/audit_regressions.rs"]
mod audit_regressions;
#[path = "../tests/closure.rs"]
Expand All @@ -20,8 +18,6 @@ mod language_conformance;
mod locale;
#[path = "../tests/parser.rs"]
mod parser;
#[path = "../tests/perf_large_project.rs"]
mod perf_large_project;
#[path = "../tests/roundtrip.rs"]
mod roundtrip;
#[path = "../tests/rule_events.rs"]
Expand Down
Loading
Loading