Skip to content

Commit

Permalink
td/btd: Rename test sample
Browse files Browse the repository at this point in the history 
Summary: Clearer intent.

Reviewed By: r39xu

Differential Revision: D61735328

fbshipit-source-id: 2057a2b7002195774280862009ea9031198fca9a
  • Loading branch information
@facebook-github-bot
Aniket Mathur authored and facebook-github-bot committed Aug 26, 2024
1 parent ae13bb7 commit e83f577
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 22 deletions.
10 changes: 5 additions & 5 deletions btd/src/check.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ mod tests {
target_entry("aaa", &[]),
target_entry("bbb", &["aaa", "ccc"])
]),
&[(&modified_target, ImpactTraceData::sample(),)],
&[(&modified_target, ImpactTraceData::testing())],
&[TargetPattern::new("foo//...")],
)
.len(),
Expand All @@ -375,7 +375,7 @@ mod tests {
target_entry("bbb", &["aaa"]),
target_entry("ccc", &["ddd"])
]),
&[(&modified_target, ImpactTraceData::sample(),)],
&[(&modified_target, ImpactTraceData::testing())],
&[TargetPattern::new("foo//...")],
)
.len(),
Expand All @@ -394,7 +394,7 @@ mod tests {
target_entry("aaa", &["ccc"]),
target_entry("bbb", &["aaa"])
]),
&[(&modified_target, ImpactTraceData::sample(),)],
&[(&modified_target, ImpactTraceData::testing())],
&[TargetPattern::new("foo//...")],
)
.len(),
Expand All @@ -412,7 +412,7 @@ mod tests {
target_entry("aaa", &["ccc"]),
target_entry("bbb", &["aaa"])
]),
&[(&modified_target, ImpactTraceData::sample(),)],
&[(&modified_target, ImpactTraceData::testing())],
&[TargetPattern::new("foo//...")],
)
.len(),
Expand All @@ -430,7 +430,7 @@ mod tests {
target_entry("aaa", &[]),
target_entry("bbb", &["aaa"])
]),
&[(&modified_target, ImpactTraceData::sample(),)],
&[(&modified_target, ImpactTraceData::testing())],
&[TargetPattern::new("foo//...")],
)
.len(),
Expand Down
27 changes: 14 additions & 13 deletions btd/src/diff.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ impl ImpactTraceData {
}

#[cfg(test)]
pub fn sample() -> Self {
pub fn testing() -> Self {
ImpactTraceData {
affected_dep: "cell//foo:bar".to_owned(),
root_cause: ("cell//baz:qux".to_owned(), RootImpactKind::Inputs),
Expand Down Expand Up @@ -776,7 +776,7 @@ mod tests {

let changes = GraphImpact {
recursive: Vec::new(),
non_recursive: vec![(diff.targets().next().unwrap(), ImpactTraceData::sample())],
non_recursive: vec![(diff.targets().next().unwrap(), ImpactTraceData::testing())],
..Default::default()
};
let res = recursive_target_changes(&diff, &changes, Some(2), |_| true);
Expand Down Expand Up @@ -818,8 +818,8 @@ mod tests {
]);

let changes = GraphImpact {
recursive: vec![(diff.targets().next().unwrap(), ImpactTraceData::sample())],
non_recursive: vec![(diff.targets().nth(1).unwrap(), ImpactTraceData::sample())],
recursive: vec![(diff.targets().next().unwrap(), ImpactTraceData::testing())],
non_recursive: vec![(diff.targets().nth(1).unwrap(), ImpactTraceData::testing())],
..Default::default()
};
let res = recursive_target_changes(&diff, &changes, Some(2), |_| true);
Expand Down Expand Up @@ -856,7 +856,7 @@ mod tests {

let changes = GraphImpact::from_recursive(vec![(
diff.targets().next().unwrap(),
ImpactTraceData::sample(),
ImpactTraceData::testing(),
)]);
let res = recursive_target_changes(&diff, &changes, Some(3), |_| true);
let res = res.map(|xs| {
Expand Down Expand Up @@ -933,7 +933,7 @@ mod tests {
let change_target =
BuckTarget::testing("dep", "code//foo", "prelude//rules.bzl:cxx_library");
let changes =
GraphImpact::from_recursive(vec![(&change_target, ImpactTraceData::sample())]);
GraphImpact::from_recursive(vec![(&change_target, ImpactTraceData::testing())]);
let res = recursive_target_changes(&diff, &changes, Some(1), |_| true);
let res = res.map(|xs| {
let mut xs = xs.map(|(x, _)| x.name.as_str());
Expand Down Expand Up @@ -963,7 +963,7 @@ mod tests {
let changes = GraphImpact::from_recursive(
diff.targets()
.take(2)
.map(|x| (x, ImpactTraceData::sample()))
.map(|x| (x, ImpactTraceData::testing()))
.collect(),
);
let res = recursive_target_changes(&diff, &changes, None, |_| true);
Expand Down Expand Up @@ -1142,9 +1142,10 @@ mod tests {
.count(),
2
);
impact
.recursive
.push((targets.targets().nth(1).unwrap(), ImpactTraceData::sample()));
impact.recursive.push((
targets.targets().nth(1).unwrap(),
ImpactTraceData::testing(),
));
assert_eq!(
recursive_target_changes(&targets, &impact, None, |_| true)
.iter()
Expand Down Expand Up @@ -1172,7 +1173,7 @@ mod tests {

let changes = GraphImpact::from_recursive(vec![(
diff.targets().next().unwrap(),
ImpactTraceData::sample(),
ImpactTraceData::testing(),
)]);
let res = recursive_target_changes(&diff, &changes, Some(3), |_| true);
assert_eq!(res[0].len(), 1);
Expand Down Expand Up @@ -1220,14 +1221,14 @@ mod tests {

let changes = GraphImpact::from_recursive(vec![(
diff.targets().find(|t| t.name.as_str() == "g").unwrap(),
ImpactTraceData::sample(),
ImpactTraceData::testing(),
)]);
check(&changes, 5, &["a", "x", "y", "z"]);
check(&changes, 1, &["z"]);

let changes = GraphImpact::from_recursive(vec![(
diff.targets().find(|t| t.name.as_str() == "c").unwrap(),
ImpactTraceData::sample(),
ImpactTraceData::testing(),
)]);
check(&changes, 5, &["a", "x"]);
check(&changes, 1, &["x"]);
Expand Down
8 changes: 4 additions & 4 deletions btd/src/output.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ mod tests {
false,
ImpactTraceData {
root_cause: ("fbcode//me:test".to_owned(), RootImpactKind::Inputs),
..ImpactTraceData::sample()
..ImpactTraceData::testing()
},
);
assert_eq!(serde_json::to_value(&output).unwrap(), json);
Expand All @@ -134,15 +134,15 @@ mod tests {
"depth": 3,
"labels": ["my_label", "another_label"],
"oncall": Value::Null,
"reason": ImpactTraceData::sample(),
"reason": ImpactTraceData::testing(),
}
);
assert_eq!(
serde_json::to_value(Output::from_target(
&target_no_oncall,
3,
false,
ImpactTraceData::sample(),
ImpactTraceData::testing(),
))
.unwrap(),
json_no_oncall
Expand All @@ -156,7 +156,7 @@ mod tests {
package_values: PackageValues::new(&["must-come-first"], serde_json::Value::Null),
..BuckTarget::testing("test", "fbcode//me", "prelude//rules.bzl:python_library")
};
let output = Output::from_target(&target, 3, false, ImpactTraceData::sample());
let output = Output::from_target(&target, 3, false, ImpactTraceData::testing());
assert_eq!(
output.labels,
Labels::new(&["must-come-first", "target_label"])
Expand Down

0 comments on commit e83f577

Please sign in to comment.