Fix framework-specific testing command working incorrectly when `eldev-test-framework' is explicitly set to a list of frameworks.

Author: doublep

eldev.el

@@ -3236,6 +3236,8 @@ for details."
       (if (cdr used-frameworks)
           ;; Print summary over all test types if we have run more than one.
           (unless (eq pass 'count)
+            ;; Using "(s)" because if replaced with proper singular/plural form of word
+            ;; "test", "of them" becomes weird.
             (let ((summary (eldev-format-message "\nTesting summary: %d test(s), of them %d passed, %d failed, %d skipped"
                                                  (+ eldev-test-num-passed eldev-test-num-failed eldev-test-num-skipped)
                                                  eldev-test-num-passed eldev-test-num-failed eldev-test-num-skipped)))
@@ -3304,14 +3306,19 @@ framework(s) are autodetected where possible, among those allowed
 by parameter POSSIBLE-FRAMEWORKS (if that is not specified, only
 frameworks based on `.el' files, i.e. ERT and Buttercup, are
 considered allowed)."
-  (let ((frameworks (or (eldev-listify eldev-test-framework)
-                        (mapcar #'car (eldev-filter (let* ((framework (car it))
-                                                           (detect    (when (if possible-frameworks
-                                                                                (memq framework possible-frameworks)
-                                                                              (null (cdr (assq 'fileset (cdr it)))))
-                                                                        (cdr (assq 'detect (cdr it))))))
-                                                      (and detect (funcall detect)))
-                                                    eldev-test-known-frameworks)))))
+  (let ((frameworks (eldev-listify eldev-test-framework)))
+    (setf frameworks (if frameworks
+                         (eldev-filter (if possible-frameworks
+                                           (memq it possible-frameworks)
+                                         (null (eldev-test-get-framework-entry it 'fileset)))
+                                       frameworks)
+                       (mapcar #'car (eldev-filter (let* ((framework (car it))
+                                                          (detect    (when (if possible-frameworks
+                                                                               (memq framework possible-frameworks)
+                                                                             (null (cdr (assq 'fileset (cdr it)))))
+                                                                       (cdr (assq 'detect (cdr it))))))
+                                                     (and detect (funcall detect)))
+                                                   eldev-test-known-frameworks))))
     (if (cdr frameworks) frameworks (car frameworks))))
 
 (defun eldev-test-preprocess-selectors (framework selectors)

test/integration/buttercup.el

@@ -17,6 +17,33 @@
     (should (= exit-code 0))))
 
 
+;; `project-i' has two ERT and two Buttercup tests.  Make sure that this combination works
+;; both in autodetermined and explicit ways.
+
+(eldev-ert-defargtest eldev-test-buttercup-project-i-1 (command explicitly-configured)
+                      (('test           nil)
+                       ('test           t)
+                       ('test-ert       nil)
+                       ('test-ert       t)
+                       ('test-buttercup nil)
+                       ('test-buttercup t))
+  (eldev--test-run "project-i" (:eval `(,@(if explicitly-configured
+                                              '("--setup" (setf eldev-test-framework '(ert buttercup)))
+                                            '("--setup" (setf eldev-test-framework nil)))
+                                        ,command))
+    ;; Make sure that the exact tests executed match the issued command.
+    (let ((ran-ert       (string-match-p "Running 2 tests"            stdout))
+          (ran-buttercup (string-match-p "Running 2 specs"            stdout))
+          (ran-both      (string-match-p "Testing summary: 4 test(s)" stdout)))
+      (pcase command
+        (`test           (should     (and ran-ert ran-buttercup ran-both)))
+        (`test-ert       (should     ran-ert)
+                         (should-not (or ran-buttercup ran-both)))
+        (`test-buttercup (should     ran-buttercup)
+                         (should-not (or ran-ert ran-both))))
+      (should (= exit-code 0)))))
+
+
 (ert-deftest eldev-test-buttercup-erroneous-backtrace-1 ()
   ;; Until Eldev 0.7 (and Buttercup 1.23) a pointless and unneded backtrace would have
   ;; been printed if a test failed and Eldev was in debug mode.

test/project-i/project-i.el

@@ -1,4 +1,4 @@
-;;; project-i.el --- Test project with autoload cookies in multiple files
+;;; project-i.el --- Test project with autoload cookies in multiple files and both ERT and Buttercup tests
 
 ;; Version: 1.0
 ;; Homepage: https://example.com/

test/project-i/test/buttercup.el

@@ -0,0 +1,12 @@
+(require 'project-i)
+(require 'project-i-advanced)
+(require 'buttercup)
+
+;; All tests pass.
+
+(describe "Project D tests"
+  (it "has working `project-i-hello'"
+    (expect (project-i-hello) :to-equal "Hello"))
+
+  (it "has working `project-i-hello-to'"
+    (expect (project-i-hello-to "world") :to-equal "Hello, world!")))

test/project-i/test/ert.el

@@ -0,0 +1,11 @@
+(require 'project-i)
+(require 'project-i-advanced)
+(require 'ert)
+
+;; All tests pass.
+
+(ert-deftest project-i-test-hello ()
+  (should (string= (project-i-hello) "Hello")))
+
+(ert-deftest project-i-test-hello-advanced ()
+  (should (string= (project-i-hello-to "world") "Hello, world!")))