Merge branch 'mr/adjust_tests' into 'edge'

Adjust the baselines of two tests to the new behaviour of gpr2 See merge request eng/ide/ada_language_server!1602
AdaCore · Jul 2, 2024 · 3cc3b36 · 3cc3b36
2 parents 247721e + f556f3d
commit 3cc3b36
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 50 deletions.
diff --git a/testsuite/ada_lsp/project_config/project_config_2.json b/testsuite/ada_lsp/project_config/project_config_2.json
@@ -73,17 +73,18 @@
                     }
                 }
             },
+            "comment": "NOTE: we are loading an invalid project which has two files containing the same compilation unit: the behavior is undetermined.",
             "wait":[{
                 "id": "defname-1",
                 "result":{
-                    "uri": "$URI{third.ads}",
+                    "uri": "$URI{second.ads}",
                     "range": {
                         "start": {
-                            "line": 3,
+                            "line": 0,
                             "character": 10
                         },
                         "end": {
-                            "line": 3,
+                            "line": 0,
                             "character": 22
                         }
                     }

diff --git a/testsuite/ada_lsp/refactoring_diagnostics/test.json b/testsuite/ada_lsp/refactoring_diagnostics/test.json
@@ -169,27 +169,10 @@
                         },
                         "severity": 4,
                         "source": "project",
-                        "message": "Project Problems",
-                        "relatedInformation": [
-                           {
-                              "location": {
-                                 "uri": "$URI{default.gpr}",
-                                 "range": {
-                                    "start": {
-                                       "line": 0,
-                                       "character": 0
-                                    },
-                                    "end": {
-                                       "line": 0,
-                                       "character": 0
-                                    }
-                                 }
-                              },
-                              "message": "Unique project in root directory was found and loaded, but it wasn't explicitly configured."
-                           }
-                        ]
+                        "message": "Unique project in root directory was found and loaded, but it wasn't explicitly configured."
                      },
                      {
+                        "message": "Failed to execute the Add Parameter refactoring.",
                         "range": {
                            "start": {
                               "line": 12,
@@ -200,38 +183,38 @@
                               "character": 16
                            }
                         },
-                        "severity": 1,
-                        "source": "Ada",
-                        "message": "Failed to execute the Add Parameter refactoring.",
                         "relatedInformation": [
-                           {
-                              "location": {
-                                 "uri": "$URI{test.ads}",
-                                 "range": {
-                                    "start": {
-                                       "line": 12,
-                                       "character": 3
-                                    },
-                                    "end": {
-                                       "line": 14,
-                                       "character": 16
-                                    }
-                                 }
-                              },
-                              "message": "Can't change the controlling parameter of a primitive"
-                           }
-                        ]
+                          {
+                            "location": {
+                               "range": {
+                                  "start": {
+                                     "line": 12,
+                                     "character": 3
+                                  },
+                                  "end": {
+                                     "line": 14,
+                                     "character": 16
+                                  }
+                               },
+                              "uri": "$URI{test.ads}"
+                            },
+                            "message": "Can't change the controlling parameter of a primitive"
+                          }
+                        ],
+                        "severity": 1,
+                        "source": "Ada"
                      }
                   ]
-               }
-            },
-            {
-               "id": 8,
+                }
+             },
+             {
                "error": {
-                  "code": -32001,
-                  "message": "Failed to execute the Add Parameter refactoring."
-               }
-            }
+                 "code": -32001,
+                 "message": "Failed to execute the Add Parameter refactoring."
+               },
+               "id": 8,
+               "jsonrpc": "2.0"
+             }
          ]
       }
    },