[uim-commit] r183 - in trunk: scm test

[yamaken@freedesktop.org]

Author: yamaken
Date: 2005-01-09 00:38:51 -0800 (Sun, 09 Jan 2005)
New Revision: 183

Modified:
   trunk/scm/custom-vars.scm
   trunk/scm/custom.scm
   trunk/test/test-custom.scm
Log:
* scm/custom.scm
  - All changes are validated by test-custom.scm
  - (custom-define-group): Rename to define-custom-group
  - (define-custom-group): Renamed from custom-define-group
* scm/custom-vars.scm
  - Replace all custom-define-group with define-custom-group
* test/test-custom.scm
  - (test custom-define-group, custom-group-rec): Rename to
    'define-custom-group, custom-group-rec'
  - (test define-custom-group, custom-group-rec):
    * Renamed from 'custom-define-group, custom-group-rec'
    * Follow the renaming
  - (testcase custom custom-group methods): Replace all custom-define-group
    with define-custom-group in setup


Modified: trunk/scm/custom-vars.scm
===================================================================
--- trunk/scm/custom-vars.scm	2005-01-09 08:24:56 UTC (rev 182)
+++ trunk/scm/custom-vars.scm	2005-01-09 08:38:51 UTC (rev 183)
@@ -85,11 +85,11 @@
 (define spellcheck-im-canonical-name (_ "Spellcheck"))
 (define spellcheck-im-desc (_ "long description will be here."))
 
-(custom-define-group 'global
+(define-custom-group 'global
 		     (_ "Global settings")
 		     (_ "long description will be here."))
 
-(custom-define-group 'advanced
+(define-custom-group 'advanced
 		     (_ "Advanced settings")
 		     (_ "long description will be here."))
 
@@ -106,7 +106,7 @@
 ;; 
 ;; default-im-name
 ;;
-(custom-define-group 'default-im-name
+(define-custom-group 'default-im-name
 		     (_ "Default input method")
 		     (_ "long description will be here."))
 
@@ -190,7 +190,7 @@
 ;;
 ;; im-switching
 ;;
-(custom-define-group 'im-switching
+(define-custom-group 'im-switching
 		     (_ "Input method switching")
 		     (_ "long description will be here."))
 
@@ -222,7 +222,7 @@
 
 ;; anthy
 
-(custom-define-group 'anthy
+(define-custom-group 'anthy
 		     anthy-im-canonical-name
 		     anthy-im-desc)
 
@@ -260,7 +260,7 @@
 
 ;; canna
 
-(custom-define-group 'canna
+(define-custom-group 'canna
 		     canna-im-canonical-name
 		     canna-im-desc)
 
@@ -297,7 +297,7 @@
 ;;
 ;; canna-server-name
 ;;
-(custom-define-group 'cannaserver
+(define-custom-group 'cannaserver
 		     (_ "Canna server")
 		     (_ "long description will be here."))
 
@@ -358,7 +358,7 @@
 
 ;; skk
 
-(custom-define-group 'skk
+(define-custom-group 'skk
 		     skk-im-canonical-name
 		     skk-im-desc)
 
@@ -431,7 +431,7 @@
 
 ;; prime
 
-(custom-define-group 'prime
+(define-custom-group 'prime
 		     prime-im-canonical-name
 		     prime-im-desc)
 
@@ -481,7 +481,7 @@
 
 ;; Other IMs
 
-(custom-define-group 'other-ims
+(define-custom-group 'other-ims
 		     (_ "Other input methods")
 		     (_ "long description will be here."))
 
@@ -507,7 +507,7 @@
 
 ;; Spellcheck
 
-(custom-define-group 'spellcheck
+(define-custom-group 'spellcheck
 		     spellcheck-im-canonical-name
 		     spellcheck-im-desc)
 

Modified: trunk/scm/custom.scm
===================================================================
--- trunk/scm/custom.scm	2005-01-09 08:24:56 UTC (rev 182)
+++ trunk/scm/custom.scm	2005-01-09 08:38:51 UTC (rev 183)
@@ -114,7 +114,7 @@
     (label "")
     (desc  "")))
 
-(define custom-define-group
+(define define-custom-group
   (lambda (gsym label desc)
     (let ((grec (custom-group-rec-new gsym label desc)))
       (if (not (custom-group-rec gsym))

Modified: trunk/test/test-custom.scm
===================================================================
--- trunk/test/test-custom.scm	2005-01-09 08:24:56 UTC (rev 182)
+++ trunk/test/test-custom.scm	2005-01-09 08:38:51 UTC (rev 183)
@@ -214,12 +214,12 @@
    (assert-equal (uim '(list #f "" ""))
 		 (uim '(custom-group-rec-new))))
 
-  ("test custom-define-group, custom-group-rec"
+  ("test define-custom-group, custom-group-rec"
    (uim '(set! test-group-recs-length
 	       (length custom-group-rec-alist)))
 
    (assert-false (uim-bool '(custom-group-rec 'test-group)))
-   (uim '(custom-define-group
+   (uim '(define-custom-group
 	  'test-group
 	  "test group"
 	  "long description of test group"))
@@ -232,7 +232,7 @@
 		 (uim '(length custom-group-rec-alist)))
 
    (assert-false (uim-bool '(custom-group-rec 'test-group2)))
-   (uim '(custom-define-group
+   (uim '(define-custom-group
 	  'test-group2
 	  "test group 2"
 	  "long description of test group 2"))
@@ -245,7 +245,7 @@
 		 (uim '(length custom-group-rec-alist)))
 
    (assert-false (uim-bool '(custom-group-rec 'test-group3)))
-   (uim '(custom-define-group
+   (uim '(define-custom-group
 	  'test-group3
 	  "test group 3"
 	  "long description of test group 3"))
@@ -300,19 +300,19 @@
   (setup
    (lambda ()
      ;;(uim '(load "custom.scm"))
-     (uim '(custom-define-group
+     (uim '(define-custom-group
 	    'test-group
 	    "test group"
 	    "long description of test group"))
-     (uim '(custom-define-group
+     (uim '(define-custom-group
 	    'test-group2
 	    "test group 2"
 	    "long description of test group 2"))
-     (uim '(custom-define-group
+     (uim '(define-custom-group
 	    'test-group3
 	    "test group 3"
 	    "long description of test group 3"))
-     (uim '(custom-define-group
+     (uim '(define-custom-group
 	    'test-group4
 	    "test group 4"
 	    "long description of test group 4"))