From e3254fc2b0db245f900ae8f49dd1b976e0281351 Mon Sep 17 00:00:00 2001
From: Marc-Antoine Ouimet <ouimetmarcantoine@gmail.com>
Date: Fri, 4 Aug 2023 22:08:59 -0400
Subject: [PATCH] Reorganize test cases

Some test case results were leftover from deleted test cases.
Other test cases that were intended to fail actually succeed with the changes to the code that have been made since.
---
 .admissible-fail                                           | 1 -
 t/code/error/funpat2.bel.out                               | 4 ----
 t/code/error/ifguard.bel.out                               | 3 ---
 t/code/error/modules/module_type1                          | 7 -------
 t/code/error/modules/module_type1.bel.out                  | 1 -
 t/code/error/stratify/alg-equal-ctxrel.bel.out             | 1 -
 t/code/success/base/trec.bel.out                           | 3 ---
 .../match-param2.bel => success/coverage/match-param.bel}  | 0
 t/code/{error => success}/implicitctx.bel                  | 3 ---
 t/code/{error => success}/subst-vars-simple.bel            | 0
 t/code/{error => success}/subst-vars-simple1.bel           | 0
 11 files changed, 23 deletions(-)
 delete mode 100644 t/code/error/funpat2.bel.out
 delete mode 100644 t/code/error/ifguard.bel.out
 delete mode 100644 t/code/error/modules/module_type1
 delete mode 100644 t/code/error/modules/module_type1.bel.out
 delete mode 100644 t/code/error/stratify/alg-equal-ctxrel.bel.out
 delete mode 100644 t/code/success/base/trec.bel.out
 rename t/code/{error/coverage/match-param2.bel => success/coverage/match-param.bel} (100%)
 rename t/code/{error => success}/implicitctx.bel (86%)
 rename t/code/{error => success}/subst-vars-simple.bel (100%)
 rename t/code/{error => success}/subst-vars-simple1.bel (100%)

diff --git a/.admissible-fail b/.admissible-fail
index d1e2c7ce1..ccbe5de9d 100644
--- a/.admissible-fail
+++ b/.admissible-fail
@@ -7,7 +7,6 @@
 ./t/interactive/test_split/meta_3.1.bel
 ./t/interactive/test_printhole-lf.bel
 ./t/interactive/test_split/deptypes.bel
-./t/interactive/test_split/sn2.bel
 ./t/interactive/test_split/sn3.bel
 ./t/interactive/test_split/sn-full.bel
 ./t/harpoon/nats_and_bools_tps_auto_invert.input
diff --git a/t/code/error/funpat2.bel.out b/t/code/error/funpat2.bel.out
deleted file mode 100644
index 5adf193b8..000000000
--- a/t/code/error/funpat2.bel.out
+++ /dev/null
@@ -1,4 +0,0 @@
-Ill-typed pattern.
-    Expected type: [ |- nat] -> [ |- nat]
-    Inferred type: Bool
-In pattern: ttrue
diff --git a/t/code/error/ifguard.bel.out b/t/code/error/ifguard.bel.out
deleted file mode 100644
index 5d61e3b14..000000000
--- a/t/code/error/ifguard.bel.out
+++ /dev/null
@@ -1,3 +0,0 @@
-Type error in guard of if expression.
-    Expected type: Bool
-    Actual type: [ |- nat]
diff --git a/t/code/error/modules/module_type1 b/t/code/error/modules/module_type1
deleted file mode 100644
index fc2070662..000000000
--- a/t/code/error/modules/module_type1
+++ /dev/null
@@ -1,7 +0,0 @@
-module type NATS = sig
-  nat : type.
-  z : nat.
-  s : nat -> nat.
-end;
-
-let x = [ |- NATS.s NATS.z];
diff --git a/t/code/error/modules/module_type1.bel.out b/t/code/error/modules/module_type1.bel.out
deleted file mode 100644
index 845fb2190..000000000
--- a/t/code/error/modules/module_type1.bel.out
+++ /dev/null
@@ -1 +0,0 @@
-Type synthesis of term failed (use typing annotation).
diff --git a/t/code/error/stratify/alg-equal-ctxrel.bel.out b/t/code/error/stratify/alg-equal-ctxrel.bel.out
deleted file mode 100644
index f4ece2bbf..000000000
--- a/t/code/error/stratify/alg-equal-ctxrel.bel.out
+++ /dev/null
@@ -1 +0,0 @@
-Datatype Crel has not been checked for stratification or positivity.
diff --git a/t/code/success/base/trec.bel.out b/t/code/success/base/trec.bel.out
deleted file mode 100644
index 032772ee4..000000000
--- a/t/code/success/base/trec.bel.out
+++ /dev/null
@@ -1,3 +0,0 @@
-File "./t/base/trec.bel", line 17, characters 10-15:
-Expected type  [. exp T2]
-Inferred type  [. exp nat]
diff --git a/t/code/error/coverage/match-param2.bel b/t/code/success/coverage/match-param.bel
similarity index 100%
rename from t/code/error/coverage/match-param2.bel
rename to t/code/success/coverage/match-param.bel
diff --git a/t/code/error/implicitctx.bel b/t/code/success/implicitctx.bel
similarity index 86%
rename from t/code/error/implicitctx.bel
rename to t/code/success/implicitctx.bel
index 6c6b878be..a1e61da57 100644
--- a/t/code/error/implicitctx.bel
+++ b/t/code/success/implicitctx.bel
@@ -17,9 +17,6 @@ LF list:type =
 | cons: tm -> list -> list
 ;
 
-
-
-%Implicit type/context args e.g.(g:tctx) doesn't work on ctype
 inductive LSiz:(g:tctx) [g |- list] -> [ |- nat] -> ctype =
 | EmpSiz: LSiz [g |- nil] [ |- zero]
 | SucSiz: LSiz [g |- L] [ |- N] -> LSiz [g |- cons X L] [ |- succ N]
diff --git a/t/code/error/subst-vars-simple.bel b/t/code/success/subst-vars-simple.bel
similarity index 100%
rename from t/code/error/subst-vars-simple.bel
rename to t/code/success/subst-vars-simple.bel
diff --git a/t/code/error/subst-vars-simple1.bel b/t/code/success/subst-vars-simple1.bel
similarity index 100%
rename from t/code/error/subst-vars-simple1.bel
rename to t/code/success/subst-vars-simple1.bel