Fix tests

Author: yyoncho

features/OrganizeImports.feature

@@ -79,8 +79,7 @@
 (And "^I add project \"\\([^\"]+\\)\" folder \"\\([^\"]+\\)\" to the list of workspace folders$"
      (lambda (project dir-name)
        (mkdir lsp-java-workspace-dir t)
-       (lsp--persist (f-join lsp-java-workspace-dir ".folders")
-                     (list (f-join lsp-java-test-root dir-name project)))))
+       (lsp-workspace-folders-add (f-join lsp-java-test-root dir-name project))))
 
 (And "^I start lsp-java$"
      (lambda () (lsp)))
@@ -89,11 +88,8 @@
       (lambda (status callback)
         (lsp-java-steps-async-wait
          (lambda ()
-           (if (s-equals? (s-trim (lsp-mode-line)) status)
-               t
-             (progn
-               (message "Server status is %s" (lsp-mode-line))
-               nil)))
+           (--some? (equal (lsp--workspace-status-string it) "::Started")
+                    (lsp--session-workspaces (lsp-session))))
          callback)))
 
 (And "^I use formatter profile \"\\([^\"]+\\)\" from \"\\([^\"]+\\)\"$"

features/step-definitions/lsp-java-steps.el

@@ -27,7 +27,8 @@
   (require 'lsp-java))
 
 (Setup
- (lsp-java-update-server))
+ (unless (file-directory-p (expand-file-name "plugins" lsp-java-server-install-dir))
+   (lsp-java-update-server)))
 
 (Before
  (require 'lsp-java)
@@ -39,7 +40,8 @@
        lsp-java-server-install-dir (locate-user-emacs-file "eclipse.jdt.ls/server/")
        lsp-response-timeout 30)
  (when (file-exists-p lsp-java-test-root)
-   (delete-directory lsp-java-test-root t)))
+   (delete-directory lsp-java-test-root t))
+ (setq lsp--session (make-lsp-session)))
 
 (After
  (mapc 'kill-buffer

features/support/env.el

@@ -664,11 +664,17 @@ server."
 
 (defun lsp-java--find-project-uri (file-uri)
   "Return the java project corresponding FILE-URI."
-  (->> (lsp--uri-to-path file-uri)
-       (lsp-find-workspace 'jdtls)
-       lsp-java--get-project-uris
-       (--filter (s-starts-with? (lsp--uri-to-path it) (lsp--uri-to-path file-uri)))
-       (--max-by (> (length it) (length other)))))
+  (let ((workspace (lsp-java--current-workspace-or-lose))
+        (session-folder (lsp-find-session-folder (lsp-session) (buffer-file-name))))
+    (with-lsp-workspace workspace
+      ;; look for a maven nested project or fallback to the session folder root.
+      (let ((project-folder (or (->> session-folder
+                                     lsp--path-to-uri
+                                     (lsp-send-execute-command "che.jdt.ls.extension.mavenProjects")
+                                     (--filter (f-ancestor-of? (lsp--uri-to-path (file-name-as-directory it)) buffer-file-name))
+                                     (--max-by (> (length it) (length other))))
+                                (lsp--path-to-uri (file-name-as-directory session-folder)))))
+        project-folder))))
 
 (defun lsp-java--nearest-widget ()
   "Return widget at point or next nearest widget."
@@ -682,7 +688,7 @@ server."
 (defun lsp-java--tree-under-cursor ()
   "Get tree under cursor."
   (-when-let (widget-under-cursor (lsp-java--nearest-widget))
-    (if (tree-widget-p widget-under-cursor )
+    (if (tree-widget-p widget-under-cursor)
         widget-under-cursor
       (widget-get widget-under-cursor :parent))))
 
@@ -877,7 +883,7 @@ PROJECT-URI uri of the item."
                                                            (buffer-string))))))
   :initialized-fn (lambda (workspace)
                     (with-lsp-workspace workspace
-                      (lsp-java-update-project-uris)))))
+                      (lsp-java-update-user-settings)))))
 
 (defun lsp-java-spring-initializr ()
   "Emacs frontend for https://start.spring.io/."