test: promote positive changes to the test suite

ocaml · Dec 1, 2022 · a1ffdc0 · a1ffdc0
1 parent b21c8ba
commit a1ffdc0
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 23 deletions.
diff --git a/tests/test-dirs/locate-type.t/run.t b/tests/test-dirs/locate-type.t/run.t
@@ -7,7 +7,7 @@
       "file": "$TESTCASE_ROOT/a.ml",
       "pos": {
         "line": 2,
-        "col": 2
+        "col": 7
       }
     },
     "notifications": []
@@ -20,7 +20,7 @@
       "file": "$TESTCASE_ROOT/a.ml",
       "pos": {
         "line": 2,
-        "col": 2
+        "col": 7
       }
     },
     "notifications": []

diff --git a/tests/test-dirs/locate/context-detection/cd-field.t/run.t b/tests/test-dirs/locate/context-detection/cd-field.t/run.t
@@ -6,7 +6,7 @@
       "file": "$TESTCASE_ROOT/field.ml",
       "pos": {
         "line": 1,
-        "col": 0
+        "col": 5
       }
     },
     "notifications": []
@@ -19,7 +19,7 @@
       "file": "$TESTCASE_ROOT/field.ml",
       "pos": {
         "line": 1,
-        "col": 0
+        "col": 5
       }
     },
     "notifications": []
@@ -34,7 +34,7 @@ the field bar rather than the identifier.
       "file": "$TESTCASE_ROOT/field.ml",
       "pos": {
         "line": 10,
-        "col": 2
+        "col": 7
       }
     },
     "notifications": []

diff --git a/tests/test-dirs/locate/context-detection/cd-label.t/run.t b/tests/test-dirs/locate/context-detection/cd-label.t/run.t
@@ -42,14 +42,14 @@
   }
 
 FIXME: this is not a very satisfying answer. 
-We could expect 2:12 or at least 2:4
+We could expect 2:12
   $ $MERLIN single locate  -look-for ml -position 3:24 \
   > -filename ./record.ml < ./record.ml | jq '.value'
   {
     "file": "$TESTCASE_ROOT/record.ml",
     "pos": {
       "line": 1,
-      "col": 0
+      "col": 5
     }
   }
 

diff --git a/tests/test-dirs/locate/context-detection/cd-test.t/run.t b/tests/test-dirs/locate/context-detection/cd-test.t/run.t
@@ -13,6 +13,8 @@ Trying them all:
     "notifications": []
   }
 
+FIXME we would expect 3:13
+
   $ $MERLIN single locate -look-for ml -position 7:17 -filename ./test.ml < ./test.ml
   {
     "class": "return",
@@ -54,14 +56,16 @@ FIXME this should say "Already at definition point" (we're defining the label):
     "notifications": []
   }
 
+We expect 1:5
+
   $ $MERLIN single locate -look-for ml -position 13:16 -filename ./test.ml < ./test.ml
   {
     "class": "return",
     "value": {
       "file": "$TESTCASE_ROOT/test.ml",
       "pos": {
         "line": 1,
-        "col": 0
+        "col": 5
       }
     },
     "notifications": []
@@ -89,14 +93,16 @@ FIXME we failed to parse/reconstruct the ident, that's interesting
     "notifications": []
   }
 
+We expect 1:5
+
   $ $MERLIN single locate -look-for ml -position 16:20 -filename ./test.ml < ./test.ml
   {
     "class": "return",
     "value": {
       "file": "$TESTCASE_ROOT/test.ml",
       "pos": {
         "line": 1,
-        "col": 0
+        "col": 5
       }
     },
     "notifications": []
@@ -115,6 +121,8 @@ FIXME we failed to parse/reconstruct the ident, that's interesting
     "notifications": []
   }
 
+FIXME unprecise, we expect 11:11
+
   $ $MERLIN single locate -look-for ml -position 18:15 -filename ./test.ml < ./test.ml
   {
     "class": "return",
@@ -144,14 +152,16 @@ FIXME this should jump to line 11:
     "notifications": []
   }
 
+FIXME unprecise, we want 13:12
+
   $ $MERLIN single locate -look-for ml -position 23:13 -filename ./test.ml < ./test.ml
   {
     "class": "return",
     "value": {
       "file": "$TESTCASE_ROOT/test.ml",
       "pos": {
         "line": 13,
-        "col": 0
+        "col": 5
       }
     },
     "notifications": []
@@ -177,7 +187,7 @@ FIXME this should jump to line 11:
       "file": "$TESTCASE_ROOT/test.ml",
       "pos": {
         "line": 13,
-        "col": 0
+        "col": 5
       }
     },
     "notifications": []

diff --git a/tests/test-dirs/locate/functors/f-all_local.t/run.t b/tests/test-dirs/locate/functors/f-all_local.t/run.t
@@ -7,7 +7,7 @@ Check that we can jump locally inside the functor:
       "file": "$TESTCASE_ROOT/all_local.ml",
       "pos": {
         "line": 12,
-        "col": 2
+        "col": 7
       }
     },
     "notifications": []
@@ -53,7 +53,7 @@ Check the argument is substituted for the parameter
       "file": "$TESTCASE_ROOT/all_local.ml",
       "pos": {
         "line": 6,
-        "col": 2
+        "col": 7
       }
     },
     "notifications": []

diff --git a/tests/test-dirs/locate/functors/f-from_application.t/run.t b/tests/test-dirs/locate/functors/f-from_application.t/run.t
@@ -23,7 +23,7 @@ Jump from inside the functor application to inside the functor application:
       "file": "$TESTCASE_ROOT/from_application.ml",
       "pos": {
         "line": 14,
-        "col": 4
+        "col": 9
       }
     },
     "notifications": []
@@ -38,7 +38,7 @@ Jump from inside the functor application to the outer scope:
       "file": "$TESTCASE_ROOT/from_application.ml",
       "pos": {
         "line": 9,
-        "col": 0
+        "col": 5
       }
     },
     "notifications": []

diff --git a/tests/test-dirs/locate/functors/f-nested_applications.t/run.t b/tests/test-dirs/locate/functors/f-nested_applications.t/run.t
@@ -7,7 +7,7 @@
       "file": "$TESTCASE_ROOT/nested_applications.ml",
       "pos": {
         "line": 10,
-        "col": 2
+        "col": 7
       }
     },
     "notifications": []
@@ -21,7 +21,7 @@
       "file": "$TESTCASE_ROOT/nested_applications.ml",
       "pos": {
         "line": 10,
-        "col": 2
+        "col": 7
       }
     },
     "notifications": []
@@ -35,7 +35,7 @@
       "file": "$TESTCASE_ROOT/nested_applications.ml",
       "pos": {
         "line": 10,
-        "col": 2
+        "col": 7
       }
     },
     "notifications": []
@@ -49,7 +49,7 @@
       "file": "$TESTCASE_ROOT/nested_applications.ml",
       "pos": {
         "line": 10,
-        "col": 2
+        "col": 7
       }
     },
     "notifications": []
@@ -63,7 +63,7 @@
       "file": "$TESTCASE_ROOT/nested_applications.ml",
       "pos": {
         "line": 10,
-        "col": 2
+        "col": 7
       }
     },
     "notifications": []

diff --git a/tests/test-dirs/locate/locate-constrs.t b/tests/test-dirs/locate/locate-constrs.t
@@ -18,15 +18,14 @@ We expect 1:27
     }
   }
 
-FIXME: this is not a very satisfying answer. 
-We expect 1:18
+We expect 1:23
   $ $MERLIN single locate  -look-for ml -position 2:12 \
   > -filename ./constr.ml < ./constr.ml | jq '.value'
   {
     "file": "$TESTCASE_ROOT/constr.ml",
     "pos": {
       "line": 1,
-      "col": 18
+      "col": 23
     }
   }