[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r113694: Extract truncate-string-to-width tests to a
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r113694: Extract truncate-string-to-width tests to a separate file |
Date: |
Mon, 05 Aug 2013 01:32:03 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 113694
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2013-08-04 18:32:00 -0700
message:
Extract truncate-string-to-width tests to a separate file
* test/automated/mule-util.el: New file, with tests extracted from
lisp/international/mule-util.el.
Copyright years based on when the original test-suite comment was
added to lisp/international/mule-util.el (in 2002).
* lisp/international/mule-util.el: Extract comment test-suite out to
separate file.
added:
test/automated/mule-util.el muleutil.el-20130805012709-k3ki2fxykv0sqxnl-1
modified:
lisp/international/mule-util.el
muleutil.el-20091113204419-o5vbwnq5f7feedwu-1045
test/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-8588
=== modified file 'lisp/international/mule-util.el'
--- a/lisp/international/mule-util.el 2013-04-02 01:18:40 +0000
+++ b/lisp/international/mule-util.el 2013-08-05 01:32:00 +0000
@@ -125,59 +125,6 @@
(concat head-padding (substring str from-idx idx)
tail-padding ellipsis))))
-;;; Test suite for truncate-string-to-width
-;; (dolist (test '((("" 0) . "")
-;; (("x" 1) . "x")
-;; (("xy" 1) . "x")
-;; (("xy" 2 1) . "y")
-;; (("xy" 0) . "")
-;; (("xy" 3) . "xy")
-;; (("中" 0) . "")
-;; (("中" 1) . "")
-;; (("中" 2) . "中")
-;; (("中" 1 nil ? ) . " ")
-;; (("中文" 3 1 ? ) . " ")
-;; (("x中x" 2) . "x")
-;; (("x中x" 3) . "x中")
-;; (("x中x" 3) . "x中")
-;; (("x中x" 4 1) . "中x")
-;; (("kor한e글an" 8 1 ? ) . "or한e글")
-;; (("kor한e글an" 7 2 ? ) . "r한e ")
-;; (("" 0 nil nil "...") . "")
-;; (("x" 3 nil nil "...") . "x")
-;; (("中" 3 nil nil "...") . "中")
-;; (("foo" 3 nil nil "...") . "foo")
-;; (("foo" 2 nil nil "...") . "fo") ;; XEmacs failure?
-;; (("foobar" 6 0 nil "...") . "foobar")
-;; (("foobarbaz" 6 nil nil "...") . "foo...")
-;; (("foobarbaz" 7 2 nil "...") . "ob...")
-;; (("foobarbaz" 9 3 nil "...") . "barbaz")
-;; (("こhんeにlちlはo" 15 1 ? t) . " hんeにlちlはo")
-;; (("こhんeにlちlはo" 14 1 ? t) . " hんeにlち...")
-;; (("x" 3 nil nil "粵語") . "x")
-;; (("中" 2 nil nil "粵語") . "中")
-;; (("中" 1 nil ?x "粵語") . "x") ;; XEmacs error
-;; (("中文" 3 nil ? "粵語") . "中 ") ;; XEmacs error
-;; (("foobarbaz" 4 nil nil "粵語") . "粵語")
-;; (("foobarbaz" 5 nil nil "粵語") . "f粵語")
-;; (("foobarbaz" 6 nil nil "粵語") . "fo粵語")
-;; (("foobarbaz" 8 3 nil "粵語") . "b粵語")
-;; (("こhんeにlちlはo" 14 4 ?x "日本語") . "xeに日本語")
-;; (("こhんeにlちlはo" 13 4 ?x "日本語") . "xex日本語")
-;; ))
-;; (let (ret)
-;; (condition-case e
-;; (setq ret (apply #'truncate-string-to-width (car test)))
-;; (error (setq ret e)))
-;; (unless (equal ret (cdr test))
-;; (error "%s: expected %s, got %s"
-;; (prin1-to-string (cons 'truncate-string-to-width (car test)))
-;; (prin1-to-string (cdr test))
-;; (if (consp ret)
-;; (format "error: %s: %s" (car ret)
-;; (prin1-to-string (cdr ret)))
-;; (prin1-to-string ret))))))
-
;;; Nested alist handler. Nested alist is alist whose elements are
;;; also nested alist.
=== modified file 'test/ChangeLog'
--- a/test/ChangeLog 2013-08-04 20:18:11 +0000
+++ b/test/ChangeLog 2013-08-05 01:32:00 +0000
@@ -1,3 +1,8 @@
+2013-08-05 Glenn Morris <address@hidden>
+
+ * automated/mule-util.el: New file, with tests extracted from
+ lisp/international/mule-util.el.
+
2013-08-04 Stefan Monnier <address@hidden>
* automated/advice-tests.el (advice-tests-nadvice): Test removal
=== added file 'test/automated/mule-util.el'
--- a/test/automated/mule-util.el 1970-01-01 00:00:00 +0000
+++ b/test/automated/mule-util.el 2013-08-05 01:32:00 +0000
@@ -0,0 +1,84 @@
+;;; mule-util --- tests for international/mule-util.el -*- coding: utf-8; -*-
+
+;; Copyright (C) 2002-2013 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'ert)
+(require 'mule-util)
+
+(defconst mule-util-test-truncate-data
+ '((("" 0) . "")
+ (("x" 1) . "x")
+ (("xy" 1) . "x")
+ (("xy" 2 1) . "y")
+ (("xy" 0) . "")
+ (("xy" 3) . "xy")
+ (("中" 0) . "")
+ (("中" 1) . "")
+ (("中" 2) . "中")
+ (("中" 1 nil ? ) . " ")
+ (("中文" 3 1 ? ) . " ")
+ (("x中x" 2) . "x")
+ (("x中x" 3) . "x中")
+ (("x中x" 3) . "x中")
+ (("x中x" 4 1) . "中x")
+ (("kor한e글an" 8 1 ? ) . "or한e글")
+ (("kor한e글an" 7 2 ? ) . "r한e ")
+ (("" 0 nil nil "...") . "")
+ (("x" 3 nil nil "...") . "x")
+ (("中" 3 nil nil "...") . "中")
+ (("foo" 3 nil nil "...") . "foo")
+ (("foo" 2 nil nil "...") . "fo") ;; XEmacs failure?
+ (("foobar" 6 0 nil "...") . "foobar")
+ (("foobarbaz" 6 nil nil "...") . "foo...")
+ (("foobarbaz" 7 2 nil "...") . "ob...")
+ (("foobarbaz" 9 3 nil "...") . "barbaz")
+ (("こhんeにlちlはo" 15 1 ? t) . " hんeにlちlはo")
+ (("こhんeにlちlはo" 14 1 ? t) . " hんeにlち...")
+ (("x" 3 nil nil "粵語") . "x")
+ (("中" 2 nil nil "粵語") . "中")
+ (("中" 1 nil ?x "粵語") . "x") ;; XEmacs error
+ (("中文" 3 nil ? "粵語") . "中 ") ;; XEmacs error
+ (("foobarbaz" 4 nil nil "粵語") . "粵語")
+ (("foobarbaz" 5 nil nil "粵語") . "f粵語")
+ (("foobarbaz" 6 nil nil "粵語") . "fo粵語")
+ (("foobarbaz" 8 3 nil "粵語") . "b粵語")
+ (("こhんeにlちlはo" 14 4 ?x "日本語") . "xeに日本語")
+ (("こhんeにlちlはo" 13 4 ?x "日本語") . "xex日本語")
+ )
+ "Test data for `truncate-string-to-width'.")
+
+(defun mule-util-test-truncate-create (n)
+ "Create a test for element N of the `mule-util-test-truncate-data' constant."
+ (let ((testname (intern (format "mule-util-test-truncate-%.2d" n)))
+ (testdoc (format "Test element %d of `mule-util-test-truncate-data'."
+ n))
+ (testdata (nth n mule-util-test-truncate-data)))
+ (eval
+ `(ert-deftest ,testname ()
+ ,testdoc
+ (should (equal (apply 'truncate-string-to-width ',(car testdata))
+ ,(cdr testdata)))))))
+
+(dotimes (i (length mule-util-test-truncate-data))
+ (mule-util-test-truncate-create i))
+
+;;; mule-util.el ends here
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r113694: Extract truncate-string-to-width tests to a separate file,
Glenn Morris <=