test: combine a few more tests (#3722)

Author: aljazerzen

Cargo.lock

@@ -6,7 +6,6 @@ members = [
   "prqlc/prql-compiler-macros",
   "prqlc/prqlc",
   "prqlc/prql-compiler/examples/compile-files", # An example
-  "prqlc/tests_misc",
   "prqlc/bindings/elixir/native/prql",
   "prqlc/bindings/java",
   "prqlc/bindings/js",

Cargo.toml

@@ -16,40 +16,28 @@ fmt:
             --config=.prettierrc.yaml \
             --ignore-path=.prettierignore \
             --ignore-unknown \
-            --log-level=warn
+            --log-level=warn &
 
 
 prqlc-lint:
     @echo '--- clippy ---'
     @cargo clippy --all --fix --allow-staged
 
 
-target := 'x86_64-unknown-linux-gnu'
-
 # Test prqlc
-prqlc-test:
-    @echo "Testing prqlc…"
+packages := '--package=prqlc-ast --package=prqlc-parser --package=prql-compiler --package=prqlc'
+prqlc-test-fast:
+    cargo clippy --all-targets {{packages}} -- -D warnings
 
-    cargo clippy --all-targets --target={{ target }} -- -D warnings
+    # cargo insta test, but allowing multiple --package arguments
+    INSTA_FORCE_PASS=1 cargo test --locked {{packages}}
 
-    @# Note that `--all-targets` doesn't refer to targets like
-    @# `wasm32-unknown-unknown`; it refers to lib / bin / tests etc.
-    @#
-    @# Autoformatting does not make this clear to read, but this tertiary
-    @# expression states to run:
-    @# - External DB integration tests — `--features=test-dbs-external`
-    @#   on Linux
-    @# - No features on Windows
-    @# - Internal DB integration tests — `--features=test-dbs` otherwise
-    @#
-    @# Below, we also add:
-    @# - Unreferenced snapshots - `--unreferenced=auto` on Linux
-    @#
-    @# We'd like to reenable on Windows, ref https://github.com/wangfenjin/duckdb-rs/issues/179.
+    cargo insta review
 
-    cargo test --no-run --locked --target={{ target }}
+prqlc-test:
+    cargo clippy --all-targets {{packages}} -- -D warnings
 
-    cargo insta test --target={{ target }}
+    INSTA_FORCE_PASS=1 cargo test --locked
 
 prqlc-python-build mode='debug':
     #!/usr/bin/env bash

justfile

@@ -59,6 +59,7 @@ tokio-util = {version = "0.7", optional = true, features = ["compat"]}
 cfg-if = "1.0"
 insta = {version = "1.34", features = ["colors", "glob", "yaml"]}
 similar-asserts = "1.5.0"
+similar = {version = "2.3.0"}
 
 [target.'cfg(not(target_family="wasm"))'.dev-dependencies]
 criterion = {version = "0.5.1"}

prqlc/prql-compiler/Cargo.toml

@@ -378,13 +378,31 @@ impl<S: ToString> From<S> for SourceTree {
 mod tests {
     use crate::Target;
     use insta::assert_debug_snapshot;
+    use prqlc_ast::expr::Ident;
     use std::str::FromStr;
 
     pub fn compile(prql: &str) -> Result<String, super::ErrorMessages> {
         anstream::ColorChoice::Never.write_global();
         super::compile(prql, &super::Options::default().no_signature())
     }
 
+    #[test]
+    fn test_starts_with() {
+        // Over-testing, from co-pilot, can remove some of them.
+        let a = Ident::from_path(vec!["a", "b", "c"]);
+        let b = Ident::from_path(vec!["a", "b"]);
+        let c = Ident::from_path(vec!["a", "b", "c", "d"]);
+        let d = Ident::from_path(vec!["a", "b", "d"]);
+        let e = Ident::from_path(vec!["a", "c"]);
+        let f = Ident::from_path(vec!["b", "c"]);
+        assert!(a.starts_with(&b));
+        assert!(a.starts_with(&a));
+        assert!(!a.starts_with(&c));
+        assert!(!a.starts_with(&d));
+        assert!(!a.starts_with(&e));
+        assert!(!a.starts_with(&f));
+    }
+
     #[test]
     fn test_target_from_str() {
         assert_debug_snapshot!(Target::from_str("sql.postgres"), @r###"

prqlc/prql-compiler/src/lib.rs

@@ -3,7 +3,7 @@
 //! See also [test_bad_error_messages.rs](test_bad_error_messages.rs) for error
 //! messages which need to be improved.
 
-use super::compile;
+use super::sql::compile;
 use insta::assert_display_snapshot;
 
 #[test]

prqlc/tests_misc/tests/ast_code_matches.rs renamed to prqlc/prql-compiler/tests/sql/ast_code_matches.rs

@@ -1,5 +1,7 @@
-mod test;
-mod test_bad_error_messages;
-mod test_error_messages;
+mod ast_code_matches;
+mod bad_error_messages;
+mod error_messages;
+mod parser;
+mod sql;
 
-use test::compile;
+use sql::compile;

prqlc/prql-compiler/tests/sql/test_bad_error_messages.rs renamed to prqlc/prql-compiler/tests/sql/bad_error_messages.rs

@@ -1,24 +1,20 @@
-#![cfg(test)]
-
-use super::*;
 use insta::{assert_debug_snapshot, assert_yaml_snapshot};
-use prqlc_ast::expr::{Expr, FuncCall};
+use itertools::Itertools;
+use prqlc_ast::error::*;
+use prqlc_ast::expr::*;
+use prqlc_ast::stmt::*;
 
 /// Helper that does not track source_ids
 fn parse_single(source: &str) -> Result<Vec<Stmt>, Vec<Error>> {
-    parse_source(source, 0)
+    prqlc_parser::parse_source(source, 0)
 }
 
 fn parse_expr(source: &str) -> Result<Expr, Vec<Error>> {
-    let tokens = Parser::parse(&lexer::lexer(), source).map_err(|errs| {
-        errs.into_iter()
-            .map(|e| convert_lexer_error(source, e, 0))
-            .collect::<Vec<_>>()
-    })?;
-
-    let stream = prepare_stream(tokens, source, 0);
-    Parser::parse(&expr::expr_call().then_ignore(end()), stream)
-        .map_err(|errs| errs.into_iter().map(construct_parser_error).collect())
+    let source = format!("let result = ({source}\n)");
+
+    let stmts = parse_single(&source)?;
+    let stmt = stmts.into_iter().exactly_one().unwrap();
+    Ok(*stmt.kind.into_var_def().unwrap().value)
 }
 
 #[test]