From c74b0f8bc0989c0e3f15a679bfc373a9d504cce4 Mon Sep 17 00:00:00 2001 From: Maximilian Wolff Date: Sun, 30 May 2021 12:36:26 +0200 Subject: [PATCH] [org] Remove unit tests for non existing function for we do not longer require to replace org with org-plus-contrib on the fly. --- layers/+emacs/org/packages.el | 2 +- tests/core/core-configuration-layer-utest.el | 120 ------------------- tests/core/core-spacemacs-ftest.el | 2 +- 3 files changed, 2 insertions(+), 122 deletions(-) diff --git a/layers/+emacs/org/packages.el b/layers/+emacs/org/packages.el index 52bed749d..eda23c162 100644 --- a/layers/+emacs/org/packages.el +++ b/layers/+emacs/org/packages.el @@ -31,7 +31,7 @@ gnuplot (helm-org-rifle :toggle (configuration-layer/layer-used-p 'helm)) htmlize - ;; ob, org, org-agenda and org-contacts are installed by `org-plus-contrib' + ;; ob, org, org-agenda and org-contacts are installed by `org-contrib' (ob :location built-in) (org :location built-in) (org-agenda :location built-in) diff --git a/tests/core/core-configuration-layer-utest.el b/tests/core/core-configuration-layer-utest.el index 9345f0261..dfb5ce787 100644 --- a/tests/core/core-configuration-layer-utest.el +++ b/tests/core/core-configuration-layer-utest.el @@ -3084,126 +3084,6 @@ (cadr (assq 'local stats)) (cadr (assq 'built-in stats))))))) -;; --------------------------------------------------------------------------- -;; configuration-layer//package-install-org -;; --------------------------------------------------------------------------- - -(defun --test-package-install-org--symbol-name (pkg-name) - (mocker-let - ((package-installed-p (org-plus-contrib) - ((:record-cls 'mocker-stub-record - :output nil :occur 1))) - (identity (x) ((:input '(org-plus-contrib) :output nil :occur 1)))) - (configuration-layer//package-install-org 'identity pkg-name))) - -(defun --package-install-org--symbol-name-already-installed (pkg-name) - (mocker-let - ((package-installed-p (org-plus-contrib) - ((:record-cls 'mocker-stub-record - :output t :occur 1)))) - (configuration-layer//package-install-org 'identity pkg-name))) - -(defun --test-package-install-org--package-desc-name (pkg-desc) - (mocker-let - ((package-installed-p (org-plus-contrib) - ((:record-cls 'mocker-stub-record - :output nil :occur 1))) - (identity (x) ((:input `(,pkg-desc) :output nil :occur 1)))) - (configuration-layer//package-install-org 'identity pkg-desc))) - -(defun --package-install-org--package-desc-name-already-installed (pkg-desc) - (mocker-let - ((package-installed-p (org-plus-contrib) - ((:record-cls 'mocker-stub-record - :output t :occur 1)))) - (configuration-layer//package-install-org 'identity pkg-desc))) - -(defun --test-package-install-org--package-desc-reqs (pkg-desc) - (mocker-let - ((package-installed-p (x) ((:record-cls 'mocker-stub-record - :output nil :occur 1)))) - (configuration-layer//package-install-org 'identity pkg-desc))) - -(ert-deftest test-package-install-org--symbol-name-org () - (--test-package-install-org--symbol-name 'org)) - -(ert-deftest test-package-install-org--symbol-name-org-plus-contrib () - (--test-package-install-org--symbol-name 'org-plus-contrib)) - -(ert-deftest test-package-install-org--symbol-name-org-already-installed () - (should (null (--package-install-org--symbol-name-already-installed 'org)))) - -(ert-deftest - test-package-install-org--symbol-name-org-plus-contrib-already-installed () - (should (null (--package-install-org--symbol-name-already-installed - 'org-plus-contrib)))) - -(ert-deftest test-package-install-org--no-effect-on-symbol-name-other-packages () - (let ((pkg (configuration-layer//package-install-org 'identity 'foo))) - (should (eq 'foo pkg)))) - -(ert-deftest test-package-install-org--package-desc-name-org () - (let ((pkg (package-desc-create :name 'org - :version '(7) - :summary "Dummy Org package desc" - :reqs nil))) - (--test-package-install-org--package-desc-name pkg))) - -(ert-deftest test-package-install-org--package-desc-name-org-already-installed () - (let ((pkg (package-desc-create :name 'org - :version '(7) - :summary "Dummy Org package desc" - :reqs nil))) - (--package-install-org--package-desc-name-already-installed pkg))) - -(ert-deftest test-package-install-org--package-desc-name-org-plus-contrib () - (let ((pkg (package-desc-create :name 'org-plus-contrib - :version '(7) - :summary "Dummy org-plus-contrib package desc" - :reqs nil))) - (--test-package-install-org--package-desc-name pkg))) - -(ert-deftest - test-package-install-org--package-desc-name-org-plus-contrib-already-installed () - (let ((pkg (package-desc-create :name 'org-plus-contrib - :version '(7) - :summary "Dummy org-plus-contrib package desc" - :reqs nil))) - (--package-install-org--package-desc-name-already-installed pkg))) - -(ert-deftest test-package-install-org--package-desc-reqs-org () - (let ((pkg (package-desc-create :name 'dummy - :version '(7) - :summary "Dummy package desc" - :reqs '((org 7))))) - (mocker-let - ((package-installed-p (x) ((:record-cls 'mocker-stub-record - :output nil :occur 1)))) - (let ((patched-pkg (configuration-layer//package-install-org - 'identity pkg))) - (should (equal - (package-desc-create :name 'dummy - :version '(7) - :summary "Dummy package desc" - :reqs '((org-plus-contrib 7))) - patched-pkg)))))) - -(ert-deftest test-package-install-org--package-desc-reqs-org-contrib-plus () - (let ((pkg (package-desc-create :name 'dummy - :version '(7) - :summary "Dummy package desc" - :reqs '((org-plus-contrib 7))))) - (let ((patched-pkg (configuration-layer//package-install-org 'identity pkg))) - (should (equal pkg patched-pkg))))) - -(ert-deftest test-package-install-org--no-effect-on-package-desc-other-packages () - (let ((pkg (package-desc-create :name 'dummy - :version '(7) - :summary "Dummy package desc" - :reqs '((foo 7))))) - (let ((patched-pkg (configuration-layer//package-install-org 'identity pkg))) - (should (equal pkg patched-pkg))))) - ;; --------------------------------------------------------------------------- ;; configuration-layer//stable-elpa-verify-archive ;; --------------------------------------------------------------------------- diff --git a/tests/core/core-spacemacs-ftest.el b/tests/core/core-spacemacs-ftest.el index a75e67509..8f5c44ef5 100644 --- a/tests/core/core-spacemacs-ftest.el +++ b/tests/core/core-spacemacs-ftest.el @@ -24,7 +24,7 @@ (require 'core-spacemacs) (ert-deftest assertion-library-should-work () - "the assertion library should works" + "the assertion library should work" (mocker-let ((foo (n) ((:input '(1) :output 1))) (bar (n m)