summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2013-10-31 14:31:22 +0100
committerMichael Albinus <michael.albinus@gmx.de>2013-10-31 14:31:22 +0100
commit1affc48a70d1587712346034d0f653e347ebfb91 (patch)
tree04d17a34c18245a03e6b76932ef6c79c78fd3225
parent26ca88709291b49e64bf1182c85cbf4b8374edda (diff)
downloademacs-1affc48a70d1587712346034d0f653e347ebfb91.tar.gz
* automated/ert-tests.el (ert-test-stats-set-test-and-result):
Add a skipping test.
-rw-r--r--test/ChangeLog5
-rw-r--r--test/automated/ert-tests.el20
2 files changed, 23 insertions, 2 deletions
diff --git a/test/ChangeLog b/test/ChangeLog
index eadff76e7b6..726cacc13b0 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-31 Michael Albinus <michael.albinus@gmx.de>
+
+ * automated/ert-tests.el (ert-test-stats-set-test-and-result):
+ Add a skipping test.
+
2013-10-29 Stefan Monnier <monnier@iro.umontreal.ca>
* indent/prolog.prolog: Test alignment of ->; with operator at bol.
diff --git a/test/automated/ert-tests.el b/test/automated/ert-tests.el
index cc82893dace..2561942b83d 100644
--- a/test/automated/ert-tests.el
+++ b/test/automated/ert-tests.el
@@ -777,41 +777,57 @@ This macro is used to test if macroexpansion in `should' works."
(stats (ert--make-stats (list test-1 test-2) 't))
(failed (make-ert-test-failed :condition nil
:backtrace nil
- :infos nil)))
+ :infos nil))
+ (skipped (make-ert-test-skipped :condition nil
+ :backtrace nil
+ :infos nil)))
(should (eql 2 (ert-stats-total stats)))
(should (eql 0 (ert-stats-completed stats)))
(should (eql 0 (ert-stats-completed-expected stats)))
(should (eql 0 (ert-stats-completed-unexpected stats)))
+ (should (eql 0 (ert-stats-skipped stats)))
(ert--stats-set-test-and-result stats 0 test-1 (make-ert-test-passed))
(should (eql 2 (ert-stats-total stats)))
(should (eql 1 (ert-stats-completed stats)))
(should (eql 1 (ert-stats-completed-expected stats)))
(should (eql 0 (ert-stats-completed-unexpected stats)))
+ (should (eql 0 (ert-stats-skipped stats)))
(ert--stats-set-test-and-result stats 0 test-1 failed)
(should (eql 2 (ert-stats-total stats)))
(should (eql 1 (ert-stats-completed stats)))
(should (eql 0 (ert-stats-completed-expected stats)))
(should (eql 1 (ert-stats-completed-unexpected stats)))
+ (should (eql 0 (ert-stats-skipped stats)))
(ert--stats-set-test-and-result stats 0 test-1 nil)
(should (eql 2 (ert-stats-total stats)))
(should (eql 0 (ert-stats-completed stats)))
(should (eql 0 (ert-stats-completed-expected stats)))
(should (eql 0 (ert-stats-completed-unexpected stats)))
+ (should (eql 0 (ert-stats-skipped stats)))
(ert--stats-set-test-and-result stats 0 test-3 failed)
(should (eql 2 (ert-stats-total stats)))
(should (eql 1 (ert-stats-completed stats)))
(should (eql 0 (ert-stats-completed-expected stats)))
(should (eql 1 (ert-stats-completed-unexpected stats)))
+ (should (eql 0 (ert-stats-skipped stats)))
(ert--stats-set-test-and-result stats 1 test-2 (make-ert-test-passed))
(should (eql 2 (ert-stats-total stats)))
(should (eql 2 (ert-stats-completed stats)))
(should (eql 1 (ert-stats-completed-expected stats)))
(should (eql 1 (ert-stats-completed-unexpected stats)))
+ (should (eql 0 (ert-stats-skipped stats)))
(ert--stats-set-test-and-result stats 0 test-1 (make-ert-test-passed))
(should (eql 2 (ert-stats-total stats)))
(should (eql 2 (ert-stats-completed stats)))
(should (eql 2 (ert-stats-completed-expected stats)))
- (should (eql 0 (ert-stats-completed-unexpected stats)))))
+ (should (eql 0 (ert-stats-completed-unexpected stats)))
+ (should (eql 0 (ert-stats-skipped stats)))
+ (ert--stats-set-test-and-result stats 0 test-1 skipped)
+ (should (eql 2 (ert-stats-total stats)))
+ (should (eql 2 (ert-stats-completed stats)))
+ (should (eql 1 (ert-stats-completed-expected stats)))
+ (should (eql 0 (ert-stats-completed-unexpected stats)))
+ (should (eql 1 (ert-stats-skipped stats)))))
(provide 'ert-tests)