From d5b635f34e3d5ad9b380535d1f07084a91074883 Mon Sep 17 00:00:00 2001 From: Nikolaj Schumacher Date: Mon, 2 Sep 2013 18:10:36 +0200 Subject: [PATCH] Convert tests to ERT. --- window-numbering-tests.el | 64 ++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/window-numbering-tests.el b/window-numbering-tests.el index b897a97..54a6ea2 100644 --- a/window-numbering-tests.el +++ b/window-numbering-tests.el @@ -1,35 +1,37 @@ -(require 'elk-test) +(require 'ert) +(require 'window-numbering) -(deftest "window-numbering-assign" - (let ((window-numbering-windows (make-vector 10 nil)) - (window-numbering-numbers (make-hash-table :size 10)) - (window-numbering-left '(1 2 3))) - (assert-nonnil (window-numbering-assign 'xx 7)) - (assert-nil (window-numbering-assign 'yy 7)) - (assert-nonnil (window-numbering-assign 'zz 8)) - (assert-equal 8 (gethash 'zz window-numbering-numbers)) - (assert-equal 7 (gethash 'xx window-numbering-numbers)) - (assert-equal 'zz (aref window-numbering-windows 8)) - (assert-equal 'xx (aref window-numbering-windows 7)) - )) - -(deftest "window-numbering-assign auto" - (let ((window-numbering-windows (make-vector 10 nil)) - (window-numbering-numbers (make-hash-table :size 10)) - (window-numbering-left '(1 2 3 4))) - (assert-eq 1 (window-numbering-assign 'xx)) - (assert-nonnil (window-numbering-assign 'yy 3)) - (assert-eq 2 (window-numbering-assign 'zz)) - (assert-eq 4 (window-numbering-assign 'aa)) -)) +(ert-deftest window-numbering-assign () + (let ((window-numbering-windows (make-vector 10 nil)) + (window-numbering-numbers (make-hash-table :size 10)) + (window-numbering-left '(1 2 3))) + (should (not (null (window-numbering-assign 'xx 7)))) + (should (null (window-numbering-assign 'yy 7))) + (should (not (null (window-numbering-assign 'zz 8)))) + (should (equal 8 (gethash 'zz window-numbering-numbers))) + (should (equal 7 (gethash 'xx window-numbering-numbers))) + (should (equal 'zz (aref window-numbering-windows 8))) + (should (equal 'xx (aref window-numbering-windows 7))) + )) -(deftest "window-numbering-calculate-left" - (assert-equal '(6) (window-numbering-calculate-left - [t t t t t nil t t t t])) - (assert-equal '(1 2 3) (window-numbering-calculate-left - [nil nil nil t t t t t t t])) - (assert-equal '(1 2 3 4 5 6 7 8 9 0) - (window-numbering-calculate-left - [nil nil nil nil nil nil nil nil nil nil])) +(ert-deftest window-numbering-assign-auto () + (let ((window-numbering-windows (make-vector 10 nil)) + (window-numbering-numbers (make-hash-table :size 10)) + (window-numbering-left '(1 2 3 4))) + (should (eq 1 (window-numbering-assign 'xx))) + (should (not (null (window-numbering-assign 'yy 3)))) + (should (eq 2 (window-numbering-assign 'zz))) + (should (eq 4 (window-numbering-assign 'aa))) + )) + + +(ert-deftest window-numbering-calculate-left () + (should (equal '(6) (window-numbering-calculate-left + [t t t t t nil t t t t]))) + (should (equal '(1 2 3) (window-numbering-calculate-left + [nil nil nil t t t t t t t]))) + (should (equal '(1 2 3 4 5 6 7 8 9 0) + (window-numbering-calculate-left + [nil nil nil nil nil nil nil nil nil nil]))) )