Necessary test fixes from other branches

Author: necto

fixtures/compile_commands.json

@@ -1,7 +1,7 @@
 [
 {
   "directory": ".",
-  "command": "/usr/bin/c++ sample.cpp",
+  "command": "c++ sample.cpp",
   "file": "sample.cpp",
   "output": "dummy"
 }

test/lsp-sonarlint-integration-test.el

@@ -26,6 +26,8 @@
 
 (require 'lsp-mode)
 (require 'lsp-sonarlint)
+(load-file (expand-file-name "lsp-sonarlint-test-utils.el"
+                             (file-name-directory (or load-file-name (buffer-file-name)))))
 
 (defun lsp-sonarlint--wait-for (predicate hook timeout)
   "Register PREDICATE to run on HOOK, and wait until it returns t.
@@ -100,18 +102,6 @@ only works for specific textDocument/didOpen:languageId."
   "Extract the code of each of ISSUES."
   (sort (mapcar (lambda (issue) (gethash "code" issue)) issues) #'string-lessp))
 
-
-(defun lsp-sonarlint--fixtures-dir ()
-  "Directory of the test fixtures for these tests."
-  (concat
-   (file-name-directory
-    (directory-file-name (file-name-directory (symbol-file #'lsp-sonarlint--fixtures-dir))))
-   "fixtures/"))
-
-(defun lsp-sonarlint--sample-file (fname)
-  "Get the full path of the sample file FNAME."
-  (concat (lsp-sonarlint--fixtures-dir) fname))
-
 (defun lsp-sonarlint--get-all-issue-codes (sample-filename &optional major-mode)
   "Get all SonarLint issue-codes for given SAMPLE-FILENAME.
 This functions takes some time to wait for the LSP mode to init
@@ -120,7 +110,7 @@ MAJOR-MODE specifies the major mode enabled to trigger the analysis.
 Some analyzers like cfamily require specific major-modes.
 If nil, use python-mode by default."
   (lsp-sonarlint--exec-with-diags
-   (lsp-sonarlint--sample-file sample-filename)
+   (lsp-sonarlint-sample-file sample-filename)
    (lambda (diags)
      (lsp-sonarlint--get-codes-of-issues diags))
    (if major-mode major-mode 'python-mode)))
@@ -208,7 +198,7 @@ If nil, use python-mode by default."
 (ert-deftest lsp-sonarlint-display-rule-descr-test ()
   "Check whether you can display rule description for a SonarLint issue."
   (lsp-sonarlint--exec-with-diags
-   (lsp-sonarlint--sample-file "sample.py")
+   (lsp-sonarlint-sample-file "sample.py")
    (lambda (diags)
      (lsp-sonarlint--go-to-first-diag diags)
      (let ((descr-action (lsp-sonarlint--find-descr-action-at-point)))

test/lsp-sonarlint-test-utils.el

@@ -0,0 +1,38 @@
+;;; integration.el --- Integration tests for Sonarlint LSP client   -*- lexical-binding: t; -*-
+;;;
+;; Author: Arseniy Zaostrovnykh
+;; Created: 11 July 2023
+;; License: GPL-3.0-or-later
+;;
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;; Utility functions for the LSP SonarLint tests.
+
+;;; Code:
+
+(defun lsp-sonarlint-fixtures-dir ()
+  "Directory of the test fixtures for these tests."
+  (concat
+   (file-name-directory
+    (directory-file-name (file-name-directory (symbol-file #'lsp-sonarlint-fixtures-dir))))
+   "fixtures/"))
+
+(defun lsp-sonarlint-sample-file (fname)
+  "Get the full path of the sample file FNAME."
+  (concat (lsp-sonarlint-fixtures-dir) fname))
+
+(provide 'lsp-sonarlint-test-utils)
+
+;;; lsp-sonarlint-test-utils.el ends here