From 3aec490f397315f354b368308d9925cb9de4dc4c Mon Sep 17 00:00:00 2001 From: felipegchi Date: Mon, 28 Nov 2022 14:49:49 -0300 Subject: [PATCH] refactor: moved tests folder --- Cargo.lock | 17 ++++++++++--- Cargo.toml | 1 + crates/kind-cli/Cargo.toml | 8 +------ .../checker/derive/fail/WrongU120.golden | 24 ------------------- .../suite/checker/derive/fail/WrongU120.kind2 | 6 ----- crates/kind-tests/Cargo.toml | 15 ++++++++++++ crates/{kind-cli => kind-tests}/tests/mod.rs | 0 .../tests/suite/checker/derive/Eq.golden | 0 .../tests/suite/checker/derive/Eq.kind2 | 0 .../tests/suite/checker/derive/Nat.golden | 0 .../tests/suite/checker/derive/Nat.kind2 | 0 .../tests/suite/checker/derive/User.golden | 0 .../tests/suite/checker/derive/User.kind2 | 0 .../tests/suite/checker/derive/Vec.golden | 0 .../tests/suite/checker/derive/Vec.kind2 | 0 .../checker/derive/fail/IncompleteCase.golden | 0 .../checker/derive/fail/IncompleteCase.kind2 | 0 .../suite/checker/derive/fail/Repeated.golden | 0 .../suite/checker/derive/fail/Repeated.kind2 | 0 .../checker/derive/fail/RepeatedDef.golden | 0 .../checker/derive/fail/RepeatedDef.kind2 | 0 .../checker/derive/fail/WrongU120Eq.golden | 0 .../checker/derive/fail/WrongU120Eq.kind2 | 0 .../tests/suite/eval/User.golden | 0 .../tests/suite/eval/User.kind2 | 0 25 files changed, 31 insertions(+), 40 deletions(-) delete mode 100644 crates/kind-cli/tests/suite/checker/derive/fail/WrongU120.golden delete mode 100644 crates/kind-cli/tests/suite/checker/derive/fail/WrongU120.kind2 create mode 100644 crates/kind-tests/Cargo.toml rename crates/{kind-cli => kind-tests}/tests/mod.rs (100%) rename crates/{kind-cli => kind-tests}/tests/suite/checker/derive/Eq.golden (100%) rename crates/{kind-cli => kind-tests}/tests/suite/checker/derive/Eq.kind2 (100%) rename crates/{kind-cli => kind-tests}/tests/suite/checker/derive/Nat.golden (100%) rename crates/{kind-cli => kind-tests}/tests/suite/checker/derive/Nat.kind2 (100%) rename crates/{kind-cli => kind-tests}/tests/suite/checker/derive/User.golden (100%) rename crates/{kind-cli => kind-tests}/tests/suite/checker/derive/User.kind2 (100%) rename crates/{kind-cli => kind-tests}/tests/suite/checker/derive/Vec.golden (100%) rename crates/{kind-cli => kind-tests}/tests/suite/checker/derive/Vec.kind2 (100%) rename crates/{kind-cli => kind-tests}/tests/suite/checker/derive/fail/IncompleteCase.golden (100%) rename crates/{kind-cli => kind-tests}/tests/suite/checker/derive/fail/IncompleteCase.kind2 (100%) rename crates/{kind-cli => kind-tests}/tests/suite/checker/derive/fail/Repeated.golden (100%) rename crates/{kind-cli => kind-tests}/tests/suite/checker/derive/fail/Repeated.kind2 (100%) rename crates/{kind-cli => kind-tests}/tests/suite/checker/derive/fail/RepeatedDef.golden (100%) rename crates/{kind-cli => kind-tests}/tests/suite/checker/derive/fail/RepeatedDef.kind2 (100%) rename crates/{kind-cli => kind-tests}/tests/suite/checker/derive/fail/WrongU120Eq.golden (100%) rename crates/{kind-cli => kind-tests}/tests/suite/checker/derive/fail/WrongU120Eq.kind2 (100%) rename crates/{kind-cli => kind-tests}/tests/suite/eval/User.golden (100%) rename crates/{kind-cli => kind-tests}/tests/suite/eval/User.kind2 (100%) diff --git a/Cargo.lock b/Cargo.lock index b8693f9c..bb13cbcf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -545,9 +545,6 @@ dependencies = [ "kind-driver", "kind-query", "kind-report", - "ntest", - "pretty_assertions", - "walkdir", ] [[package]] @@ -555,6 +552,7 @@ name = "kind-derive" version = "0.1.0" dependencies = [ "fxhash", + "im", "kind-report", "kind-span", "kind-tree", @@ -657,6 +655,19 @@ dependencies = [ "tiny-keccak", ] +[[package]] +name = "kind-tests" +version = "0.1.0" +dependencies = [ + "kind-checker", + "kind-driver", + "kind-query", + "kind-report", + "ntest", + "pretty_assertions", + "walkdir", +] + [[package]] name = "kind-tree" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index 80c1ef82..e9411a70 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,6 +12,7 @@ members = [ "crates/kind-target-kdl", "crates/kind-target-hvm", "crates/kind-derive", + "crates/kind-tests", # "crates/kind-optimization", # "crates/kind-lint", # "crates/kind-query", diff --git a/crates/kind-cli/Cargo.toml b/crates/kind-cli/Cargo.toml index b2094b84..b73f573b 100644 --- a/crates/kind-cli/Cargo.toml +++ b/crates/kind-cli/Cargo.toml @@ -19,10 +19,4 @@ kind-report = { path = "../kind-report" } kind-checker = { path = "../kind-checker" } kind-query = { path = "../kind-query" } -clap = { version = "4.0.10", features = ["derive"] } - -[dev-dependencies] - -pretty_assertions = "1.3.0" -ntest = "0.8.1" -walkdir = "2" +clap = { version = "4.0.10", features = ["derive"] } \ No newline at end of file diff --git a/crates/kind-cli/tests/suite/checker/derive/fail/WrongU120.golden b/crates/kind-cli/tests/suite/checker/derive/fail/WrongU120.golden deleted file mode 100644 index 76ca4020..00000000 --- a/crates/kind-cli/tests/suite/checker/derive/fail/WrongU120.golden +++ /dev/null @@ -1,24 +0,0 @@ - ERROR Required functions are not implemented for this type. - - /--[tests/suite/checker/derive/fail/WrongU120.kind2:5:12] - | - 4 | - 5 | Teste : Eq 123u120 124u120 - | v------ - | \You cannot use this expression! - 6 | Teste = Eq.rfl - - Hint: You must implement 'U120.new' in order to use the u120 notation. - - ERROR Required functions are not implemented for this type. - - /--[tests/suite/checker/derive/fail/WrongU120.kind2:5:20] - | - 4 | - 5 | Teste : Eq 123u120 124u120 - | v------ - | \You cannot use this expression! - 6 | Teste = Eq.rfl - - Hint: You must implement 'U120.new' in order to use the u120 notation. - diff --git a/crates/kind-cli/tests/suite/checker/derive/fail/WrongU120.kind2 b/crates/kind-cli/tests/suite/checker/derive/fail/WrongU120.kind2 deleted file mode 100644 index efcd5df9..00000000 --- a/crates/kind-cli/tests/suite/checker/derive/fail/WrongU120.kind2 +++ /dev/null @@ -1,6 +0,0 @@ -type Eq (a: t) ~ (b: t) { - rfl: Eq t a a -} - -Teste : Eq 123u120 124u120 -Teste = Eq.rfl \ No newline at end of file diff --git a/crates/kind-tests/Cargo.toml b/crates/kind-tests/Cargo.toml new file mode 100644 index 00000000..ca18c48f --- /dev/null +++ b/crates/kind-tests/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "kind-tests" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +kind-driver = { path = "../kind-driver" } +kind-report = { path = "../kind-report" } +kind-checker = { path = "../kind-checker" } +kind-query = { path = "../kind-query" } +pretty_assertions = "1.3.0" +ntest = "0.8.1" +walkdir = "2" diff --git a/crates/kind-cli/tests/mod.rs b/crates/kind-tests/tests/mod.rs similarity index 100% rename from crates/kind-cli/tests/mod.rs rename to crates/kind-tests/tests/mod.rs diff --git a/crates/kind-cli/tests/suite/checker/derive/Eq.golden b/crates/kind-tests/tests/suite/checker/derive/Eq.golden similarity index 100% rename from crates/kind-cli/tests/suite/checker/derive/Eq.golden rename to crates/kind-tests/tests/suite/checker/derive/Eq.golden diff --git a/crates/kind-cli/tests/suite/checker/derive/Eq.kind2 b/crates/kind-tests/tests/suite/checker/derive/Eq.kind2 similarity index 100% rename from crates/kind-cli/tests/suite/checker/derive/Eq.kind2 rename to crates/kind-tests/tests/suite/checker/derive/Eq.kind2 diff --git a/crates/kind-cli/tests/suite/checker/derive/Nat.golden b/crates/kind-tests/tests/suite/checker/derive/Nat.golden similarity index 100% rename from crates/kind-cli/tests/suite/checker/derive/Nat.golden rename to crates/kind-tests/tests/suite/checker/derive/Nat.golden diff --git a/crates/kind-cli/tests/suite/checker/derive/Nat.kind2 b/crates/kind-tests/tests/suite/checker/derive/Nat.kind2 similarity index 100% rename from crates/kind-cli/tests/suite/checker/derive/Nat.kind2 rename to crates/kind-tests/tests/suite/checker/derive/Nat.kind2 diff --git a/crates/kind-cli/tests/suite/checker/derive/User.golden b/crates/kind-tests/tests/suite/checker/derive/User.golden similarity index 100% rename from crates/kind-cli/tests/suite/checker/derive/User.golden rename to crates/kind-tests/tests/suite/checker/derive/User.golden diff --git a/crates/kind-cli/tests/suite/checker/derive/User.kind2 b/crates/kind-tests/tests/suite/checker/derive/User.kind2 similarity index 100% rename from crates/kind-cli/tests/suite/checker/derive/User.kind2 rename to crates/kind-tests/tests/suite/checker/derive/User.kind2 diff --git a/crates/kind-cli/tests/suite/checker/derive/Vec.golden b/crates/kind-tests/tests/suite/checker/derive/Vec.golden similarity index 100% rename from crates/kind-cli/tests/suite/checker/derive/Vec.golden rename to crates/kind-tests/tests/suite/checker/derive/Vec.golden diff --git a/crates/kind-cli/tests/suite/checker/derive/Vec.kind2 b/crates/kind-tests/tests/suite/checker/derive/Vec.kind2 similarity index 100% rename from crates/kind-cli/tests/suite/checker/derive/Vec.kind2 rename to crates/kind-tests/tests/suite/checker/derive/Vec.kind2 diff --git a/crates/kind-cli/tests/suite/checker/derive/fail/IncompleteCase.golden b/crates/kind-tests/tests/suite/checker/derive/fail/IncompleteCase.golden similarity index 100% rename from crates/kind-cli/tests/suite/checker/derive/fail/IncompleteCase.golden rename to crates/kind-tests/tests/suite/checker/derive/fail/IncompleteCase.golden diff --git a/crates/kind-cli/tests/suite/checker/derive/fail/IncompleteCase.kind2 b/crates/kind-tests/tests/suite/checker/derive/fail/IncompleteCase.kind2 similarity index 100% rename from crates/kind-cli/tests/suite/checker/derive/fail/IncompleteCase.kind2 rename to crates/kind-tests/tests/suite/checker/derive/fail/IncompleteCase.kind2 diff --git a/crates/kind-cli/tests/suite/checker/derive/fail/Repeated.golden b/crates/kind-tests/tests/suite/checker/derive/fail/Repeated.golden similarity index 100% rename from crates/kind-cli/tests/suite/checker/derive/fail/Repeated.golden rename to crates/kind-tests/tests/suite/checker/derive/fail/Repeated.golden diff --git a/crates/kind-cli/tests/suite/checker/derive/fail/Repeated.kind2 b/crates/kind-tests/tests/suite/checker/derive/fail/Repeated.kind2 similarity index 100% rename from crates/kind-cli/tests/suite/checker/derive/fail/Repeated.kind2 rename to crates/kind-tests/tests/suite/checker/derive/fail/Repeated.kind2 diff --git a/crates/kind-cli/tests/suite/checker/derive/fail/RepeatedDef.golden b/crates/kind-tests/tests/suite/checker/derive/fail/RepeatedDef.golden similarity index 100% rename from crates/kind-cli/tests/suite/checker/derive/fail/RepeatedDef.golden rename to crates/kind-tests/tests/suite/checker/derive/fail/RepeatedDef.golden diff --git a/crates/kind-cli/tests/suite/checker/derive/fail/RepeatedDef.kind2 b/crates/kind-tests/tests/suite/checker/derive/fail/RepeatedDef.kind2 similarity index 100% rename from crates/kind-cli/tests/suite/checker/derive/fail/RepeatedDef.kind2 rename to crates/kind-tests/tests/suite/checker/derive/fail/RepeatedDef.kind2 diff --git a/crates/kind-cli/tests/suite/checker/derive/fail/WrongU120Eq.golden b/crates/kind-tests/tests/suite/checker/derive/fail/WrongU120Eq.golden similarity index 100% rename from crates/kind-cli/tests/suite/checker/derive/fail/WrongU120Eq.golden rename to crates/kind-tests/tests/suite/checker/derive/fail/WrongU120Eq.golden diff --git a/crates/kind-cli/tests/suite/checker/derive/fail/WrongU120Eq.kind2 b/crates/kind-tests/tests/suite/checker/derive/fail/WrongU120Eq.kind2 similarity index 100% rename from crates/kind-cli/tests/suite/checker/derive/fail/WrongU120Eq.kind2 rename to crates/kind-tests/tests/suite/checker/derive/fail/WrongU120Eq.kind2 diff --git a/crates/kind-cli/tests/suite/eval/User.golden b/crates/kind-tests/tests/suite/eval/User.golden similarity index 100% rename from crates/kind-cli/tests/suite/eval/User.golden rename to crates/kind-tests/tests/suite/eval/User.golden diff --git a/crates/kind-cli/tests/suite/eval/User.kind2 b/crates/kind-tests/tests/suite/eval/User.kind2 similarity index 100% rename from crates/kind-cli/tests/suite/eval/User.kind2 rename to crates/kind-tests/tests/suite/eval/User.kind2