aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2013-10-31 14:31:22 +0100
committerMichael Albinus2013-10-31 14:31:22 +0100
commit1affc48a70d1587712346034d0f653e347ebfb91 (patch)
tree04d17a34c18245a03e6b76932ef6c79c78fd3225
parent26ca88709291b49e64bf1182c85cbf4b8374edda (diff)
downloademacs-1affc48a70d1587712346034d0f653e347ebfb91.tar.gz
emacs-1affc48a70d1587712346034d0f653e347ebfb91.zip
* 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 @@
12013-10-31 Michael Albinus <michael.albinus@gmx.de>
2
3 * automated/ert-tests.el (ert-test-stats-set-test-and-result):
4 Add a skipping test.
5
12013-10-29 Stefan Monnier <monnier@iro.umontreal.ca> 62013-10-29 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * indent/prolog.prolog: Test alignment of ->; with operator at bol. 8 * 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."
777 (stats (ert--make-stats (list test-1 test-2) 't)) 777 (stats (ert--make-stats (list test-1 test-2) 't))
778 (failed (make-ert-test-failed :condition nil 778 (failed (make-ert-test-failed :condition nil
779 :backtrace nil 779 :backtrace nil
780 :infos nil))) 780 :infos nil))
781 (skipped (make-ert-test-skipped :condition nil
782 :backtrace nil
783 :infos nil)))
781 (should (eql 2 (ert-stats-total stats))) 784 (should (eql 2 (ert-stats-total stats)))
782 (should (eql 0 (ert-stats-completed stats))) 785 (should (eql 0 (ert-stats-completed stats)))
783 (should (eql 0 (ert-stats-completed-expected stats))) 786 (should (eql 0 (ert-stats-completed-expected stats)))
784 (should (eql 0 (ert-stats-completed-unexpected stats))) 787 (should (eql 0 (ert-stats-completed-unexpected stats)))
788 (should (eql 0 (ert-stats-skipped stats)))
785 (ert--stats-set-test-and-result stats 0 test-1 (make-ert-test-passed)) 789 (ert--stats-set-test-and-result stats 0 test-1 (make-ert-test-passed))
786 (should (eql 2 (ert-stats-total stats))) 790 (should (eql 2 (ert-stats-total stats)))
787 (should (eql 1 (ert-stats-completed stats))) 791 (should (eql 1 (ert-stats-completed stats)))
788 (should (eql 1 (ert-stats-completed-expected stats))) 792 (should (eql 1 (ert-stats-completed-expected stats)))
789 (should (eql 0 (ert-stats-completed-unexpected stats))) 793 (should (eql 0 (ert-stats-completed-unexpected stats)))
794 (should (eql 0 (ert-stats-skipped stats)))
790 (ert--stats-set-test-and-result stats 0 test-1 failed) 795 (ert--stats-set-test-and-result stats 0 test-1 failed)
791 (should (eql 2 (ert-stats-total stats))) 796 (should (eql 2 (ert-stats-total stats)))
792 (should (eql 1 (ert-stats-completed stats))) 797 (should (eql 1 (ert-stats-completed stats)))
793 (should (eql 0 (ert-stats-completed-expected stats))) 798 (should (eql 0 (ert-stats-completed-expected stats)))
794 (should (eql 1 (ert-stats-completed-unexpected stats))) 799 (should (eql 1 (ert-stats-completed-unexpected stats)))
800 (should (eql 0 (ert-stats-skipped stats)))
795 (ert--stats-set-test-and-result stats 0 test-1 nil) 801 (ert--stats-set-test-and-result stats 0 test-1 nil)
796 (should (eql 2 (ert-stats-total stats))) 802 (should (eql 2 (ert-stats-total stats)))
797 (should (eql 0 (ert-stats-completed stats))) 803 (should (eql 0 (ert-stats-completed stats)))
798 (should (eql 0 (ert-stats-completed-expected stats))) 804 (should (eql 0 (ert-stats-completed-expected stats)))
799 (should (eql 0 (ert-stats-completed-unexpected stats))) 805 (should (eql 0 (ert-stats-completed-unexpected stats)))
806 (should (eql 0 (ert-stats-skipped stats)))
800 (ert--stats-set-test-and-result stats 0 test-3 failed) 807 (ert--stats-set-test-and-result stats 0 test-3 failed)
801 (should (eql 2 (ert-stats-total stats))) 808 (should (eql 2 (ert-stats-total stats)))
802 (should (eql 1 (ert-stats-completed stats))) 809 (should (eql 1 (ert-stats-completed stats)))
803 (should (eql 0 (ert-stats-completed-expected stats))) 810 (should (eql 0 (ert-stats-completed-expected stats)))
804 (should (eql 1 (ert-stats-completed-unexpected stats))) 811 (should (eql 1 (ert-stats-completed-unexpected stats)))
812 (should (eql 0 (ert-stats-skipped stats)))
805 (ert--stats-set-test-and-result stats 1 test-2 (make-ert-test-passed)) 813 (ert--stats-set-test-and-result stats 1 test-2 (make-ert-test-passed))
806 (should (eql 2 (ert-stats-total stats))) 814 (should (eql 2 (ert-stats-total stats)))
807 (should (eql 2 (ert-stats-completed stats))) 815 (should (eql 2 (ert-stats-completed stats)))
808 (should (eql 1 (ert-stats-completed-expected stats))) 816 (should (eql 1 (ert-stats-completed-expected stats)))
809 (should (eql 1 (ert-stats-completed-unexpected stats))) 817 (should (eql 1 (ert-stats-completed-unexpected stats)))
818 (should (eql 0 (ert-stats-skipped stats)))
810 (ert--stats-set-test-and-result stats 0 test-1 (make-ert-test-passed)) 819 (ert--stats-set-test-and-result stats 0 test-1 (make-ert-test-passed))
811 (should (eql 2 (ert-stats-total stats))) 820 (should (eql 2 (ert-stats-total stats)))
812 (should (eql 2 (ert-stats-completed stats))) 821 (should (eql 2 (ert-stats-completed stats)))
813 (should (eql 2 (ert-stats-completed-expected stats))) 822 (should (eql 2 (ert-stats-completed-expected stats)))
814 (should (eql 0 (ert-stats-completed-unexpected stats))))) 823 (should (eql 0 (ert-stats-completed-unexpected stats)))
824 (should (eql 0 (ert-stats-skipped stats)))
825 (ert--stats-set-test-and-result stats 0 test-1 skipped)
826 (should (eql 2 (ert-stats-total stats)))
827 (should (eql 2 (ert-stats-completed stats)))
828 (should (eql 1 (ert-stats-completed-expected stats)))
829 (should (eql 0 (ert-stats-completed-unexpected stats)))
830 (should (eql 1 (ert-stats-skipped stats)))))
815 831
816 832
817(provide 'ert-tests) 833(provide 'ert-tests)