Skip to content

Commit bd47d4f

Browse files
authored
Remove redundant assert_starts_with test helper (#13542)
Replace with usage of `DataFusionError::strip_backtrace`.
1 parent b42cb8b commit bd47d4f

File tree

1 file changed

+12
-23
lines changed

1 file changed

+12
-23
lines changed

datafusion/physical-plan/src/execution_plan.rs

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,9 +1098,9 @@ mod tests {
10981098
&vec![0],
10991099
);
11001100
assert!(result.is_err());
1101-
assert_starts_with(
1102-
result.err().unwrap().message().as_ref(),
1103-
"Invalid batch column at '0' has null but schema specifies non-nullable",
1101+
assert_eq!(
1102+
result.err().unwrap().strip_backtrace(),
1103+
"Execution error: Invalid batch column at '0' has null but schema specifies non-nullable",
11041104
);
11051105
Ok(())
11061106
}
@@ -1123,9 +1123,9 @@ mod tests {
11231123
&vec![0],
11241124
);
11251125
assert!(result.is_err());
1126-
assert_starts_with(
1127-
result.err().unwrap().message().as_ref(),
1128-
"Invalid batch column at '0' has null but schema specifies non-nullable",
1126+
assert_eq!(
1127+
result.err().unwrap().strip_backtrace(),
1128+
"Execution error: Invalid batch column at '0' has null but schema specifies non-nullable",
11291129
);
11301130
Ok(())
11311131
}
@@ -1147,9 +1147,9 @@ mod tests {
11471147
&vec![0],
11481148
);
11491149
assert!(result.is_err());
1150-
assert_starts_with(
1151-
result.err().unwrap().message().as_ref(),
1152-
"Invalid batch column at '0' has null but schema specifies non-nullable",
1150+
assert_eq!(
1151+
result.err().unwrap().strip_backtrace(),
1152+
"Execution error: Invalid batch column at '0' has null but schema specifies non-nullable",
11531153
);
11541154
Ok(())
11551155
}
@@ -1190,21 +1190,10 @@ mod tests {
11901190
&vec![0],
11911191
);
11921192
assert!(result.is_err());
1193-
assert_starts_with(
1194-
result.err().unwrap().message().as_ref(),
1195-
"Invalid batch column at '0' has null but schema specifies non-nullable",
1193+
assert_eq!(
1194+
result.err().unwrap().strip_backtrace(),
1195+
"Execution error: Invalid batch column at '0' has null but schema specifies non-nullable",
11961196
);
11971197
Ok(())
11981198
}
1199-
1200-
fn assert_starts_with(actual: impl AsRef<str>, expected_prefix: impl AsRef<str>) {
1201-
let actual = actual.as_ref();
1202-
let expected_prefix = expected_prefix.as_ref();
1203-
assert!(
1204-
actual.starts_with(expected_prefix),
1205-
"Expected '{}' to start with '{}'",
1206-
actual,
1207-
expected_prefix
1208-
);
1209-
}
12101199
}

0 commit comments

Comments
 (0)