tests

Author: comphead

datafusion/common/src/error.rs

@@ -276,13 +276,18 @@ impl From<GenericError> for DataFusionError {
     }
 }
 
+fn get_back_trace() -> String {
+    let back_trace = Backtrace::capture();
+    if back_trace.status() == BacktraceStatus::Captured {
+        return format!("\nback trace: {}", back_trace);
+    }
+
+    "".to_string()
+}
+
 impl Display for DataFusionError {
     fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
-        let back_trace = Backtrace::capture();
-        let mut back_trace_desc: String = "".to_string();
-        if back_trace.status() == BacktraceStatus::Captured {
-            back_trace_desc = format!("\nback trace: {}", back_trace);
-        }
+        let back_trace_desc: String = get_back_trace();
 
         match *self {
             DataFusionError::ArrowError(ref desc) => {

datafusion/core/src/catalog/mod.rs

@@ -237,7 +237,7 @@ mod tests {
 
         match catalog.register_schema("foo", schema) {
             Ok(_) => panic!("unexpected OK"),
-            Err(e) => assert_eq!(e.to_string(), "This feature is not implemented: Registering new schemas is not supported"),
+            Err(e) => assert!(e.to_string().starts_with("This feature is not implemented: Registering new schemas is not supported")),
         };
     }
 

datafusion/core/src/dataframe.rs

@@ -1428,7 +1428,7 @@ mod tests {
             // try to sort on some value not present in input to distinct
             .sort(vec![col("c2").sort(true, true)])
             .unwrap_err();
-        assert_eq!(err.to_string(), "Error during planning: For SELECT DISTINCT, ORDER BY expressions c2 must appear in select list");
+        assert!(err.to_string().starts_with("Error during planning: For SELECT DISTINCT, ORDER BY expressions c2 must appear in select list"));
 
         Ok(())
     }
@@ -1486,7 +1486,7 @@ mod tests {
             .join_on(right, JoinType::Inner, [col("c1").eq(col("c1"))])
             .expect_err("join didn't fail check");
         let expected = "Schema error: Ambiguous reference to unqualified field c1";
-        assert_eq!(join.to_string(), expected);
+        assert!(join.to_string().starts_with(expected));
 
         Ok(())
     }
@@ -1843,7 +1843,7 @@ mod tests {
             .with_column_renamed("c2", "AAA")
             .unwrap_err();
         let expected_err = "Schema error: Ambiguous reference to unqualified field c2";
-        assert_eq!(actual_err.to_string(), expected_err);
+        assert!(actual_err.to_string().starts_with(expected_err));
 
         Ok(())
     }

datafusion/core/src/datasource/listing/table.rs

@@ -1862,7 +1862,8 @@ mod tests {
         )
         .await
         .expect_err("Example should fail!");
-        assert_eq!("Invalid or Unsupported Configuration: zstd compression requires specifying a level such as zstd(4)", format!("{e}"));
+        assert!(e.to_string().starts_with("Invalid or Unsupported Configuration: zstd compression requires specifying a level such as zstd(4)"));
+
         Ok(())
     }
 

datafusion/core/src/datasource/physical_plan/csv.rs

@@ -835,9 +835,9 @@ mod tests {
         // errors due to https://github.com/apache/arrow-datafusion/issues/4918
         let mut it = csv.execute(0, task_ctx)?;
         let err = it.next().await.unwrap().unwrap_err().to_string();
-        assert_eq!(
-            err,
-            "Arrow error: Csv error: incorrect number of fields for line 1, expected 14 got 13"
+        assert!(
+            err.to_string().starts_with(
+            "Arrow error: Csv error: incorrect number of fields for line 1, expected 14 got 13")
         );
         Ok(())
     }
@@ -1074,7 +1074,7 @@ mod tests {
             .write_csv(out_dir_url)
             .await
             .expect_err("should fail because input file does not match inferred schema");
-        assert_eq!("Arrow error: Parser error: Error while parsing value d for column 0 at line 4", format!("{e}"));
+        assert!(e.to_string().starts_with("Arrow error: Parser error: Error while parsing value d for column 0 at line 4"));
         Ok(())
     }
 

datafusion/core/src/datasource/physical_plan/json.rs

@@ -792,7 +792,7 @@ mod tests {
             .write_json(out_dir_url)
             .await
             .expect_err("should fail because input file does not match inferred schema");
-        assert_eq!("Arrow error: Parser error: Error while parsing value d for column 0 at line 4", format!("{e}"));
+        assert!(e.to_string().starts_with("Arrow error: Parser error: Error while parsing value d for column 0 at line 4"));
         Ok(())
     }
 

datafusion/core/src/datasource/physical_plan/parquet.rs

@@ -935,7 +935,7 @@ mod tests {
             .write_parquet(out_dir_url, None)
             .await
             .expect_err("should fail because input file does not match inferred schema");
-        assert_eq!("Arrow error: Parser error: Error while parsing value d for column 0 at line 4", format!("{e}"));
+        assert!(e.to_string().starts_with("Arrow error: Parser error: Error while parsing value d for column 0 at line 4"));
         Ok(())
     }
 

datafusion/core/src/execution/context.rs

@@ -2356,11 +2356,9 @@ mod tests {
         let ctx = SessionContext::new();
 
         let err = plan_and_collect(&ctx, "SElECT @=   X3").await.unwrap_err();
-
-        assert_eq!(
-            err.to_string(),
+        assert!(err.to_string().starts_with(
             "Error during planning: variable [\"@=\"] has no type information"
-        );
+        ));
         Ok(())
     }
 

datafusion/core/src/physical_plan/stream.rs

@@ -450,7 +450,7 @@ mod test {
         // get the first result, which should be an error
         let first_batch = stream.next().await.unwrap();
         let first_err = first_batch.unwrap_err();
-        assert_eq!(first_err.to_string(), "Execution error: Test1");
+        assert!(first_err.to_string().starts_with("Execution error: Test1"));
 
         // There should be no more batches produced (should not get the second error)
         assert!(stream.next().await.is_none());