forked from extern/nushell
d95375d494
* Resolve rebase artifacts * Remove leftover dependencies on removed feature * Remove unnecessary 'pub' * Start taking notes and fooling around * Split canonicalize to two versions; Add TODOs One that takes `relative_to` and one that doesn't. More TODO notes. * Merge absolutize to and rename resolve_dots * Add custom absolutize fn and use it in path expand * Convert a couple of dunce::canonicalize to ours * Update nu-path description * Replace all canonicalize with nu-path version * Remove leftover dunce dependencies * Fix broken autocd with trailing slash Trailing slash is preserved *only* in paths that do not contain "." or "..". This should be fixed in the future to cover all paths but for now it at least covers basic cases. * Use dunce::canonicalize for canonicalizing * Alow cd recovery from non-existent cwd * Disable removed canonicalize functionality tests Remove unused import * Break down nu-path into separate modules * Remove unused public imports * Remove abundant cow mapping * Fix clippy warning * Reformulate old canonicalize tests to expand_path They wouldn't work with the new canonicalize. * Canonicalize also ~ and ndots; Unify path joining Also, add doc comments in nu_path::expansions. * Add comment * Avoid expanding ndots if path is not valid UTF-8 With this change, no lossy path->string conversion should happen in the nu-path crate. * Fmt * Slight expand_tilde refactor; Add doc comments * Start nu-path integration tests * Add tests TODO * Fix docstring typo * Fix some doc strings * Add README for nu-path crate * Add a couple of canonicalize tests * Add nu-path integration tests * Add trim trailing slashes tests * Update nu-path dependency * Remove unused import * Regenerate lockfile
214 lines
6.9 KiB
Rust
214 lines
6.9 KiB
Rust
extern crate nu_json;
|
|
extern crate nu_test_support;
|
|
extern crate serde;
|
|
extern crate serde_json;
|
|
|
|
use nu_json::Value;
|
|
use regex::Regex;
|
|
use std::fs;
|
|
use std::io;
|
|
use std::path::{Path, PathBuf};
|
|
|
|
fn txt(text: &str) -> String {
|
|
let out = String::from_utf8_lossy(text.as_bytes());
|
|
|
|
#[cfg(windows)]
|
|
{
|
|
out.replace("\r\n", "").replace("\n", "")
|
|
}
|
|
|
|
#[cfg(not(windows))]
|
|
{
|
|
out.to_string()
|
|
}
|
|
}
|
|
|
|
fn hjson_expectations() -> PathBuf {
|
|
let assets = nu_test_support::fs::assets().join("nu_json");
|
|
|
|
nu_path::canonicalize(assets.clone()).unwrap_or_else(|e| {
|
|
panic!(
|
|
"Couldn't canonicalize hjson assets path {}: {:?}",
|
|
assets.display(),
|
|
e
|
|
)
|
|
})
|
|
}
|
|
|
|
fn get_test_content(name: &str) -> io::Result<String> {
|
|
let expectations = hjson_expectations();
|
|
|
|
let mut p = format!("{}/{}_test.hjson", expectations.display(), name);
|
|
|
|
if !Path::new(&p).exists() {
|
|
p = format!("{}/{}_test.json", expectations.display(), name);
|
|
}
|
|
|
|
fs::read_to_string(&p)
|
|
}
|
|
|
|
fn get_result_content(name: &str) -> io::Result<(String, String)> {
|
|
let expectations = hjson_expectations();
|
|
|
|
let p1 = format!("{}/{}_result.json", expectations.display(), name);
|
|
let p2 = format!("{}/{}_result.hjson", expectations.display(), name);
|
|
|
|
Ok((fs::read_to_string(&p1)?, fs::read_to_string(&p2)?))
|
|
}
|
|
|
|
macro_rules! run_test {
|
|
// {{ is a workaround for rust stable
|
|
($v: ident, $list: expr, $fix: expr) => {{
|
|
let name = stringify!($v);
|
|
$list.push(format!("{}_test", name));
|
|
println!("- running {}", name);
|
|
let should_fail = name.starts_with("fail");
|
|
let test_content = get_test_content(name).unwrap();
|
|
let data: nu_json::Result<Value> = nu_json::from_str(&test_content);
|
|
assert!(should_fail == data.is_err());
|
|
|
|
if !should_fail {
|
|
let udata = data.unwrap();
|
|
let (rjson, rhjson) = get_result_content(name).unwrap();
|
|
let rjson = txt(&rjson);
|
|
let rhjson = txt(&rhjson);
|
|
let actual_hjson = nu_json::to_string(&udata).unwrap();
|
|
let actual_hjson = txt(&actual_hjson);
|
|
let actual_json = $fix(serde_json::to_string_pretty(&udata).unwrap());
|
|
let actual_json = txt(&actual_json);
|
|
if rhjson != actual_hjson {
|
|
println!(
|
|
"{:?}\n---hjson expected\n{}\n---hjson actual\n{}\n---\n",
|
|
name, rhjson, actual_hjson
|
|
);
|
|
}
|
|
if rjson != actual_json {
|
|
println!(
|
|
"{:?}\n---json expected\n{}\n---json actual\n{}\n---\n",
|
|
name, rjson, actual_json
|
|
);
|
|
}
|
|
assert!(rhjson == actual_hjson && rjson == actual_json);
|
|
}
|
|
}};
|
|
}
|
|
|
|
// add fixes where rust's json differs from javascript
|
|
|
|
fn std_fix(json: String) -> String {
|
|
// serde_json serializes integers with a superfluous .0 suffix
|
|
let re = Regex::new(r"(?m)(?P<d>\d)\.0(?P<s>,?)$").unwrap();
|
|
re.replace_all(&json, "$d$s").to_string()
|
|
}
|
|
|
|
fn fix_kan(json: String) -> String {
|
|
std_fix(json).replace(" -0,", " 0,")
|
|
}
|
|
|
|
fn fix_pass1(json: String) -> String {
|
|
std_fix(json)
|
|
.replace("1.23456789e34", "1.23456789e+34")
|
|
.replace("2.3456789012e76", "2.3456789012e+76")
|
|
}
|
|
|
|
#[test]
|
|
fn test_hjson() {
|
|
let mut done: Vec<String> = Vec::new();
|
|
|
|
println!();
|
|
run_test!(charset, done, std_fix);
|
|
run_test!(comments, done, std_fix);
|
|
run_test!(empty, done, std_fix);
|
|
run_test!(failCharset1, done, std_fix);
|
|
run_test!(failJSON02, done, std_fix);
|
|
run_test!(failJSON05, done, std_fix);
|
|
run_test!(failJSON06, done, std_fix);
|
|
run_test!(failJSON07, done, std_fix);
|
|
run_test!(failJSON08, done, std_fix);
|
|
run_test!(failJSON10, done, std_fix);
|
|
run_test!(failJSON11, done, std_fix);
|
|
run_test!(failJSON12, done, std_fix);
|
|
run_test!(failJSON13, done, std_fix);
|
|
run_test!(failJSON14, done, std_fix);
|
|
run_test!(failJSON15, done, std_fix);
|
|
run_test!(failJSON16, done, std_fix);
|
|
run_test!(failJSON17, done, std_fix);
|
|
run_test!(failJSON19, done, std_fix);
|
|
run_test!(failJSON20, done, std_fix);
|
|
run_test!(failJSON21, done, std_fix);
|
|
run_test!(failJSON22, done, std_fix);
|
|
run_test!(failJSON23, done, std_fix);
|
|
run_test!(failJSON24, done, std_fix);
|
|
run_test!(failJSON26, done, std_fix);
|
|
run_test!(failJSON28, done, std_fix);
|
|
run_test!(failJSON29, done, std_fix);
|
|
run_test!(failJSON30, done, std_fix);
|
|
run_test!(failJSON31, done, std_fix);
|
|
run_test!(failJSON32, done, std_fix);
|
|
run_test!(failJSON33, done, std_fix);
|
|
run_test!(failJSON34, done, std_fix);
|
|
run_test!(failKey1, done, std_fix);
|
|
run_test!(failKey2, done, std_fix);
|
|
run_test!(failKey3, done, std_fix);
|
|
run_test!(failKey4, done, std_fix);
|
|
run_test!(failMLStr1, done, std_fix);
|
|
run_test!(failObj1, done, std_fix);
|
|
run_test!(failObj2, done, std_fix);
|
|
run_test!(failObj3, done, std_fix);
|
|
run_test!(failStr1a, done, std_fix);
|
|
run_test!(failStr1b, done, std_fix);
|
|
run_test!(failStr1c, done, std_fix);
|
|
run_test!(failStr1d, done, std_fix);
|
|
run_test!(failStr2a, done, std_fix);
|
|
run_test!(failStr2b, done, std_fix);
|
|
run_test!(failStr2c, done, std_fix);
|
|
run_test!(failStr2d, done, std_fix);
|
|
run_test!(failStr3a, done, std_fix);
|
|
run_test!(failStr3b, done, std_fix);
|
|
run_test!(failStr3c, done, std_fix);
|
|
run_test!(failStr3d, done, std_fix);
|
|
run_test!(failStr4a, done, std_fix);
|
|
run_test!(failStr4b, done, std_fix);
|
|
run_test!(failStr4c, done, std_fix);
|
|
run_test!(failStr4d, done, std_fix);
|
|
run_test!(failStr5a, done, std_fix);
|
|
run_test!(failStr5b, done, std_fix);
|
|
run_test!(failStr5c, done, std_fix);
|
|
run_test!(failStr5d, done, std_fix);
|
|
run_test!(failStr6a, done, std_fix);
|
|
run_test!(failStr6b, done, std_fix);
|
|
run_test!(failStr6c, done, std_fix);
|
|
run_test!(failStr6d, done, std_fix);
|
|
run_test!(kan, done, fix_kan);
|
|
run_test!(keys, done, std_fix);
|
|
run_test!(oa, done, std_fix);
|
|
run_test!(pass1, done, fix_pass1);
|
|
run_test!(pass2, done, std_fix);
|
|
run_test!(pass3, done, std_fix);
|
|
run_test!(pass4, done, std_fix);
|
|
run_test!(passSingle, done, std_fix);
|
|
run_test!(root, done, std_fix);
|
|
run_test!(stringify1, done, std_fix);
|
|
run_test!(strings, done, std_fix);
|
|
run_test!(trail, done, std_fix);
|
|
|
|
// check if we include all assets
|
|
let paths = fs::read_dir(hjson_expectations()).unwrap();
|
|
|
|
let all = paths
|
|
.map(|item| String::from(item.unwrap().path().file_stem().unwrap().to_str().unwrap()))
|
|
.filter(|x| x.contains("_test"));
|
|
|
|
let missing = all
|
|
.into_iter()
|
|
.filter(|x| done.iter().find(|y| &x == y) == None)
|
|
.collect::<Vec<String>>();
|
|
|
|
if !missing.is_empty() {
|
|
for item in missing {
|
|
println!("missing: {}", item);
|
|
}
|
|
panic!();
|
|
}
|
|
}
|