[uim-commit] r3130 - trunk/test

yamaken at freedesktop.org yamaken at freedesktop.org
Mon Feb 20 02:26:17 PST 2006


Author: yamaken
Date: 2006-02-20 02:26:12 -0800 (Mon, 20 Feb 2006)
New Revision: 3130

Modified:
   trunk/test/test-action.scm
Log:
* test/test-action.scm
  - (test indicator-new, test activity-indicator-new, test
    widget-state, test widget-update-state!, test
    widget-debug-message, test indication-compose-label, test
    indication-compose-branch, test indication-compose-leaf, test
    widget-compose-live-branch, test
    context-propagate-prop-label-update, test
    context-propagate-prop-list-update, test
    context-propagate-widget-states, test
    context-propagate-widget-configuration): Follow the recent helper
    message format changes


Modified: trunk/test/test-action.scm
===================================================================
--- trunk/test/test-action.scm	2006-02-19 20:20:31 UTC (rev 3129)
+++ trunk/test/test-action.scm	2006-02-20 10:26:12 UTC (rev 3130)
@@ -29,7 +29,7 @@
 ;;; SUCH DAMAGE.
 ;;;;
 
-;; This file is tested with revision 1540 of new repository
+;; This file is tested with revision 3130 of new repository
 
 (use test.unit)
 
@@ -264,7 +264,7 @@
   ("test indicator-new"
    (uim '(begin
 	   (define test-indicator (indicator-new (lambda ()
-						   '(figure_unknown
+						   '(unknown
 						     "?"
 						     "unknown"
 						     "Unknown"))))
@@ -457,7 +457,7 @@
    ;; no activity case
    (uim '(define test-type-invalid 100))
    (uim '(test-context-set-kana-mode! tc test-type-invalid))
-   (assert-equal '(figure_unknown
+   (assert-equal '(unknown
 		   "?"
 		   "unknown"
 		   "unknown")
@@ -812,7 +812,7 @@
 				   (widget-new 'widget_test_null tc))
 				 #t)))
    (assert-true  (uim-bool '(equal? (list #f
-					  '(figure_unknown
+					  '(unknown
 					    "?"
 					    "unknown"
 					    "unknown"))
@@ -1018,7 +1018,7 @@
 
    ;; initial state
    (assert-true  (uim-bool '(equal? (list #f
-					  '(figure_unknown
+					  '(unknown
 					    "?"
 					    "unknown"
 					    "unknown"))
@@ -1027,13 +1027,13 @@
    ;; initial update
    (assert-true  (uim-bool '(widget-update-state! test-null)))
    (assert-true  (uim-bool '(equal? (list #f
-					  '(figure_unknown
+					  '(unknown
 					    "?"
 					    "unknown"
 					    "unknown"))
 				    (widget-state test-null))))
    (assert-true  (uim-bool '(equal? (list #f
-					  '(figure_unknown
+					  '(unknown
 					    "?"
 					    "unknown"
 					    "unknown"))
@@ -1041,13 +1041,13 @@
    ;; subsequent update
    (assert-false (uim-bool '(widget-update-state! test-null)))
    (assert-true  (uim-bool '(equal? (list #f
-					  '(figure_unknown
+					  '(unknown
 					    "?"
 					    "unknown"
 					    "unknown"))
 				    (widget-state test-null))))
    (assert-true  (uim-bool '(equal? (list #f
-					  '(figure_unknown
+					  '(unknown
 					    "?"
 					    "unknown"
 					    "unknown"))
@@ -1063,147 +1063,147 @@
 					     "something"))))
 
   ("test indication-compose-label"
-   (assert-equal "あ\tひらがな\n"
+   (assert-equal "figure_ja_hiragana\tあ\tひらがな\n"
 		 (uim '(indication-compose-label
 			(action-indicate (fetch-action 'action_test_hiragana)
 					 tc))))
-   (assert-equal "ア\tカタカナ\n"
+   (assert-equal "figure_ja_katakana\tア\tカタカナ\n"
 		 (uim '(indication-compose-label
 			(action-indicate (fetch-action 'action_test_katakana)
 					 tc))))
-   (assert-equal "ア\t半角カタカナ\n"
+   (assert-equal "figure_ja_hankana\tア\t半角カタカナ\n"
 		 (uim '(indication-compose-label
 			(action-indicate (fetch-action 'action_test_hankana)
 					 tc))))
-   (assert-equal "a\t直接入力\n"
+   (assert-equal "figure_ja_direct\ta\t直接入力\n"
 		 (uim '(indication-compose-label
 			(action-indicate (fetch-action 'action_test_direct)
 					 tc))))
-   (assert-equal "A\t全角英数\n"
+   (assert-equal "figure_ja_zenkaku\tA\t全角英数\n"
 		 (uim '(indication-compose-label
 			(action-indicate (fetch-action 'action_test_zenkaku)
 					 tc))))
-   (assert-equal "R\tローマ字\n"
+   (assert-equal "figure_ja_roma\tR\tローマ字\n"
 		 (uim '(indication-compose-label
 			(action-indicate (fetch-action 'action_test_roma)
 					 tc))))
-   (assert-equal "か\tかな\n"
+   (assert-equal "figure_ja_kana\tか\tかな\n"
 		 (uim '(indication-compose-label
 			(action-indicate (fetch-action 'action_test_kana)
 					 tc)))))
 
   ("test indication-compose-branch"
-   (assert-equal "branch\tあ\tひらがな\n"
+   (assert-equal "branch\tfigure_ja_hiragana\tあ\tひらがな\n"
 		 (uim '(indication-compose-branch
 			(action-indicate (fetch-action 'action_test_hiragana)
 					 tc))))
-   (assert-equal "branch\tア\tカタカナ\n"
+   (assert-equal "branch\tfigure_ja_katakana\tア\tカタカナ\n"
 		 (uim '(indication-compose-branch
 			(action-indicate (fetch-action 'action_test_katakana)
 					 tc))))
-   (assert-equal "branch\tア\t半角カタカナ\n"
+   (assert-equal "branch\tfigure_ja_hankana\tア\t半角カタカナ\n"
 		 (uim '(indication-compose-branch
 			(action-indicate (fetch-action 'action_test_hankana)
 					 tc))))
-   (assert-equal "branch\ta\t直接入力\n"
+   (assert-equal "branch\tfigure_ja_direct\ta\t直接入力\n"
 		 (uim '(indication-compose-branch
 			(action-indicate (fetch-action 'action_test_direct)
 					 tc))))
-   (assert-equal "branch\tA\t全角英数\n"
+   (assert-equal "branch\tfigure_ja_zenkaku\tA\t全角英数\n"
 		 (uim '(indication-compose-branch
 			(action-indicate (fetch-action 'action_test_zenkaku)
 					 tc))))
-   (assert-equal "branch\tR\tローマ字\n"
+   (assert-equal "branch\tfigure_ja_roma\tR\tローマ字\n"
 		 (uim '(indication-compose-branch
 			(action-indicate (fetch-action 'action_test_roma)
 					 tc))))
-   (assert-equal "branch\tか\tかな\n"
+   (assert-equal "branch\tfigure_ja_kana\tか\tかな\n"
 		 (uim '(indication-compose-branch
 			(action-indicate (fetch-action 'action_test_kana)
 					 tc)))))
 
   ("test indication-compose-leaf"
    ;; inactive leaves
-   (assert-equal "leaf\tあ\tひらがな\tひらがな入力モード\taction_test_hiragana\t\n"
+   (assert-equal "leaf\tfigure_ja_hiragana\tあ\tひらがな\tひらがな入力モード\taction_test_hiragana\t\n"
 		 (uim '(indication-compose-leaf
 			(action-indicate (fetch-action 'action_test_hiragana)
 					 tc)
 			'action_test_hiragana
 			#f)))
-   (assert-equal "leaf\tア\tカタカナ\tカタカナ入力モード\taction_test_katakana\t\n"
+   (assert-equal "leaf\tfigure_ja_katakana\tア\tカタカナ\tカタカナ入力モード\taction_test_katakana\t\n"
 		 (uim '(indication-compose-leaf
 			(action-indicate (fetch-action 'action_test_katakana)
 					 tc)
 			'action_test_katakana
 			#f)))
-   (assert-equal "leaf\tア\t半角カタカナ\t半角カタカナ入力モード\taction_test_hankana\t\n"
+   (assert-equal "leaf\tfigure_ja_hankana\tア\t半角カタカナ\t半角カタカナ入力モード\taction_test_hankana\t\n"
 		 (uim '(indication-compose-leaf
 			(action-indicate (fetch-action 'action_test_hankana)
 					 tc)
 			'action_test_hankana
 			#f)))
-   (assert-equal "leaf\ta\t直接入力\t直接(無変換)入力モード\taction_test_direct\t\n"
+   (assert-equal "leaf\tfigure_ja_direct\ta\t直接入力\t直接(無変換)入力モード\taction_test_direct\t\n"
 		 (uim '(indication-compose-leaf
 			(action-indicate (fetch-action 'action_test_direct)
 					 tc)
 			'action_test_direct
 			#f)))
-   (assert-equal "leaf\tA\t全角英数\t全角英数入力モード\taction_test_zenkaku\t\n"
+   (assert-equal "leaf\tfigure_ja_zenkaku\tA\t全角英数\t全角英数入力モード\taction_test_zenkaku\t\n"
 		 (uim '(indication-compose-leaf
 			(action-indicate (fetch-action 'action_test_zenkaku)
 					 tc)
 			'action_test_zenkaku
 			#f)))
-   (assert-equal "leaf\tR\tローマ字\tローマ字入力モード\taction_test_roma\t\n"
+   (assert-equal "leaf\tfigure_ja_roma\tR\tローマ字\tローマ字入力モード\taction_test_roma\t\n"
 		 (uim '(indication-compose-leaf
 			(action-indicate (fetch-action 'action_test_roma)
 					 tc)
 			'action_test_roma
 			#f)))
-   (assert-equal "leaf\tか\tかな\tかな入力モード\taction_test_kana\t\n"
+   (assert-equal "leaf\tfigure_ja_kana\tか\tかな\tかな入力モード\taction_test_kana\t\n"
 		 (uim '(indication-compose-leaf
 			(action-indicate (fetch-action 'action_test_kana)
 					 tc)
 			'action_test_kana
 			#f)))
    ;; active leaves
-   (assert-equal "leaf\tあ\tひらがな\tひらがな入力モード\taction_test_hiragana\t*\n"
+   (assert-equal "leaf\tfigure_ja_hiragana\tあ\tひらがな\tひらがな入力モード\taction_test_hiragana\t*\n"
 		 (uim '(indication-compose-leaf
 			(action-indicate (fetch-action 'action_test_hiragana)
 					 tc)
 			'action_test_hiragana
 			#t)))
-   (assert-equal "leaf\tア\tカタカナ\tカタカナ入力モード\taction_test_katakana\t*\n"
+   (assert-equal "leaf\tfigure_ja_katakana\tア\tカタカナ\tカタカナ入力モード\taction_test_katakana\t*\n"
 		 (uim '(indication-compose-leaf
 			(action-indicate (fetch-action 'action_test_katakana)
 					 tc)
 			'action_test_katakana
 			#t)))
-   (assert-equal "leaf\tア\t半角カタカナ\t半角カタカナ入力モード\taction_test_hankana\t*\n"
+   (assert-equal "leaf\tfigure_ja_hankana\tア\t半角カタカナ\t半角カタカナ入力モード\taction_test_hankana\t*\n"
 		 (uim '(indication-compose-leaf
 			(action-indicate (fetch-action 'action_test_hankana)
 					 tc)
 			'action_test_hankana
 			#t)))
-   (assert-equal "leaf\ta\t直接入力\t直接(無変換)入力モード\taction_test_direct\t*\n"
+   (assert-equal "leaf\tfigure_ja_direct\ta\t直接入力\t直接(無変換)入力モード\taction_test_direct\t*\n"
 		 (uim '(indication-compose-leaf
 			(action-indicate (fetch-action 'action_test_direct)
 					 tc)
 			'action_test_direct
 			#t)))
-   (assert-equal "leaf\tA\t全角英数\t全角英数入力モード\taction_test_zenkaku\t*\n"
+   (assert-equal "leaf\tfigure_ja_zenkaku\tA\t全角英数\t全角英数入力モード\taction_test_zenkaku\t*\n"
 		 (uim '(indication-compose-leaf
 			(action-indicate (fetch-action 'action_test_zenkaku)
 					 tc)
 			'action_test_zenkaku
 			#t)))
-   (assert-equal "leaf\tR\tローマ字\tローマ字入力モード\taction_test_roma\t*\n"
+   (assert-equal "leaf\tfigure_ja_roma\tR\tローマ字\tローマ字入力モード\taction_test_roma\t*\n"
 		 (uim '(indication-compose-leaf
 			(action-indicate (fetch-action 'action_test_roma)
 					 tc)
 			'action_test_roma
 			#t)))
-   (assert-equal "leaf\tか\tかな\tかな入力モード\taction_test_kana\t*\n"
+   (assert-equal "leaf\tfigure_ja_kana\tか\tかな\tかな入力モード\taction_test_kana\t*\n"
 		 (uim '(indication-compose-leaf
 			(action-indicate (fetch-action 'action_test_kana)
 					 tc)
@@ -1216,38 +1216,38 @@
 				   (widget-new 'widget_test_input_mode tc))
 				 #t)))
    (assert-equal (string-append
-		  "branch\ta\t直接入力\n"
-		  "leaf\tあ\tひらがな\tひらがな入力モード\taction_test_hiragana\t\n"
-		  "leaf\tア\tカタカナ\tカタカナ入力モード\taction_test_katakana\t\n"
-		  "leaf\tア\t半角カタカナ\t半角カタカナ入力モード\taction_test_hankana\t\n"
-		  "leaf\ta\t直接入力\t直接(無変換)入力モード\taction_test_direct\t*\n"
-		  "leaf\tA\t全角英数\t全角英数入力モード\taction_test_zenkaku\t\n")
+		  "branch\tfigure_ja_direct\ta\t直接入力\n"
+		  "leaf\tfigure_ja_hiragana\tあ\tひらがな\tひらがな入力モード\taction_test_hiragana\t\n"
+		  "leaf\tfigure_ja_katakana\tア\tカタカナ\tカタカナ入力モード\taction_test_katakana\t\n"
+		  "leaf\tfigure_ja_hankana\tア\t半角カタカナ\t半角カタカナ入力モード\taction_test_hankana\t\n"
+		  "leaf\tfigure_ja_direct\ta\t直接入力\t直接(無変換)入力モード\taction_test_direct\t*\n"
+		  "leaf\tfigure_ja_zenkaku\tA\t全角英数\t全角英数入力モード\taction_test_zenkaku\t\n")
 		 (uim '(widget-compose-live-branch test-input-mode)))
    (assert-true  (uim-bool '(widget-activate! test-input-mode
 					      'action_test_zenkaku)))
    (assert-equal (string-append
-		  "branch\tA\t全角英数\n"
-		  "leaf\tあ\tひらがな\tひらがな入力モード\taction_test_hiragana\t\n"
-		  "leaf\tア\tカタカナ\tカタカナ入力モード\taction_test_katakana\t\n"
-		  "leaf\tア\t半角カタカナ\t半角カタカナ入力モード\taction_test_hankana\t\n"
-		  "leaf\ta\t直接入力\t直接(無変換)入力モード\taction_test_direct\t\n"
-		  "leaf\tA\t全角英数\t全角英数入力モード\taction_test_zenkaku\t*\n")
+		  "branch\tfigure_ja_zenkaku\tA\t全角英数\n"
+		  "leaf\tfigure_ja_hiragana\tあ\tひらがな\tひらがな入力モード\taction_test_hiragana\t\n"
+		  "leaf\tfigure_ja_katakana\tア\tカタカナ\tカタカナ入力モード\taction_test_katakana\t\n"
+		  "leaf\tfigure_ja_hankana\tア\t半角カタカナ\t半角カタカナ入力モード\taction_test_hankana\t\n"
+		  "leaf\tfigure_ja_direct\ta\t直接入力\t直接(無変換)入力モード\taction_test_direct\t\n"
+		  "leaf\tfigure_ja_zenkaku\tA\t全角英数\t全角英数入力モード\taction_test_zenkaku\t*\n")
 		 (uim '(widget-compose-live-branch test-input-mode)))
    ;;; prop_test_kana_input_method
    (assert-true  (uim-bool '(and (define test-kana-input-method
 				   (widget-new 'widget_test_kana_input_method tc))
 				 #t)))
    (assert-equal (string-append
-		  "branch\tR\tローマ字\n"
-		  "leaf\tR\tローマ字\tローマ字入力モード\taction_test_roma\t*\n"
-		  "leaf\tか\tかな\tかな入力モード\taction_test_kana\t\n")
+		  "branch\tfigure_ja_roma\tR\tローマ字\n"
+		  "leaf\tfigure_ja_roma\tR\tローマ字\tローマ字入力モード\taction_test_roma\t*\n"
+		  "leaf\tfigure_ja_kana\tか\tかな\tかな入力モード\taction_test_kana\t\n")
 		 (uim '(widget-compose-live-branch test-kana-input-method)))
    (assert-true  (uim-bool '(widget-activate! test-kana-input-method
 					      'action_test_kana)))
    (assert-equal (string-append
-		  "branch\tか\tかな\n"
-		  "leaf\tR\tローマ字\tローマ字入力モード\taction_test_roma\t\n"
-		  "leaf\tか\tかな\tかな入力モード\taction_test_kana\t*\n")
+		  "branch\tfigure_ja_kana\tか\tかな\n"
+		  "leaf\tfigure_ja_roma\tR\tローマ字\tローマ字入力モード\taction_test_roma\t\n"
+		  "leaf\tfigure_ja_kana\tか\tかな\tかな入力モード\taction_test_kana\t*\n")
 		 (uim '(widget-compose-live-branch test-kana-input-method))))
 
   ("test context-init-widgets!"
@@ -1503,16 +1503,16 @@
 				       widget_test_kana_input_method))
 	   #t))
    (uim '(context-propagate-prop-label-update tc))
-   (assert-equal (string-append "a\t直接入力\n"
-				"R\tローマ字\n")
+   (assert-equal (string-append "figure_ja_direct\ta\t直接入力\n"
+				"figure_ja_roma\tR\tローマ字\n")
 		 (uim 'test-prop-label))
    ;; 2 widgets (updated state)
    (assert-true (uim-bool '(widget-activate! (assq 'widget_test_input_mode
 						   (context-widgets tc))
 					     'action_test_katakana)))
    (uim '(context-propagate-prop-label-update tc))
-   (assert-equal (string-append "ア\tカタカナ\n"
-				"R\tローマ字\n")
+   (assert-equal (string-append "figure_ja_katakana\tア\tカタカナ\n"
+				"figure_ja_roma\tR\tローマ字\n")
 		 (uim 'test-prop-label))
    ;; 2 widgets (without latter activity-indicator)
    (uim '(begin
@@ -1523,8 +1523,8 @@
 						   (context-widgets tc))
 					     'action_test_katakana)))
    (uim '(context-propagate-prop-label-update tc))
-   (assert-equal (string-append "ア\tカタカナ\n"
-				"?\tunknown\n")
+   (assert-equal (string-append "figure_ja_katakana\tア\tカタカナ\n"
+				"unknown\t?\tunknown\n")
 		 (uim 'test-prop-label))
    ;; 2 widgets with non-existent
    (uim '(begin
@@ -1533,22 +1533,22 @@
 				       widget_test_input_mode))
 	   #t))
    (uim '(context-propagate-prop-label-update tc))
-   (assert-equal (string-append "R\tローマ字\n"
-				"ア\tカタカナ\n")
+   (assert-equal (string-append "figure_ja_roma\tR\tローマ字\n"
+				"figure_ja_katakana\tア\tカタカナ\n")
 		 (uim 'test-prop-label))
    ;; no widgets
    (uim '(begin
 	   (context-init-widgets! tc ())
 	   #t))
    (uim '(context-propagate-prop-label-update tc))
-   (assert-equal "?\tunknown\n"
+   (assert-equal "unknown\t?\tunknown\n"
 		 (uim 'test-prop-label))
    ;; widget_test_null
    (uim '(begin
 	   (context-init-widgets! tc '(widget_test_null))
 	   #t))
    (uim '(context-propagate-prop-label-update tc))
-   (assert-equal "?\tunknown\n"
+   (assert-equal "unknown\t?\tunknown\n"
 		 (uim 'test-prop-label)))
 
   ("test context-propagate-prop-list-update"
@@ -1564,15 +1564,15 @@
 	   #t))
    (uim '(context-propagate-prop-list-update tc))
    (assert-equal (string-append
-		  "branch\ta\t直接入力\n"
-		  "leaf\tあ\tひらがな\tひらがな入力モード\taction_test_hiragana\t\n"
-		  "leaf\tア\tカタカナ\tカタカナ入力モード\taction_test_katakana\t\n"
-		  "leaf\tア\t半角カタカナ\t半角カタカナ入力モード\taction_test_hankana\t\n"
-		  "leaf\ta\t直接入力\t直接(無変換)入力モード\taction_test_direct\t*\n"
-		  "leaf\tA\t全角英数\t全角英数入力モード\taction_test_zenkaku\t\n"
-		  "branch\tR\tローマ字\n"
-		  "leaf\tR\tローマ字\tローマ字入力モード\taction_test_roma\t*\n"
-		  "leaf\tか\tかな\tかな入力モード\taction_test_kana\t\n")
+		  "branch\tfigure_ja_direct\ta\t直接入力\n"
+		  "leaf\tfigure_ja_hiragana\tあ\tひらがな\tひらがな入力モード\taction_test_hiragana\t\n"
+		  "leaf\tfigure_ja_katakana\tア\tカタカナ\tカタカナ入力モード\taction_test_katakana\t\n"
+		  "leaf\tfigure_ja_hankana\tア\t半角カタカナ\t半角カタカナ入力モード\taction_test_hankana\t\n"
+		  "leaf\tfigure_ja_direct\ta\t直接入力\t直接(無変換)入力モード\taction_test_direct\t*\n"
+		  "leaf\tfigure_ja_zenkaku\tA\t全角英数\t全角英数入力モード\taction_test_zenkaku\t\n"
+		  "branch\tfigure_ja_roma\tR\tローマ字\n"
+		  "leaf\tfigure_ja_roma\tR\tローマ字\tローマ字入力モード\taction_test_roma\t*\n"
+		  "leaf\tfigure_ja_kana\tか\tかな\tかな入力モード\taction_test_kana\t\n")
 		 (uim 'test-prop-list))
    ;; 2 widgets (updated state)
    (assert-true (uim-bool '(widget-activate! (assq 'widget_test_input_mode
@@ -1580,15 +1580,15 @@
 					     'action_test_katakana)))
    (uim '(context-propagate-prop-list-update tc))
    (assert-equal (string-append
-		  "branch\tア\tカタカナ\n"
-		  "leaf\tあ\tひらがな\tひらがな入力モード\taction_test_hiragana\t\n"
-		  "leaf\tア\tカタカナ\tカタカナ入力モード\taction_test_katakana\t*\n"
-		  "leaf\tア\t半角カタカナ\t半角カタカナ入力モード\taction_test_hankana\t\n"
-		  "leaf\ta\t直接入力\t直接(無変換)入力モード\taction_test_direct\t\n"
-		  "leaf\tA\t全角英数\t全角英数入力モード\taction_test_zenkaku\t\n"
-		  "branch\tR\tローマ字\n"
-		  "leaf\tR\tローマ字\tローマ字入力モード\taction_test_roma\t*\n"
-		  "leaf\tか\tかな\tかな入力モード\taction_test_kana\t\n")
+		  "branch\tfigure_ja_katakana\tア\tカタカナ\n"
+		  "leaf\tfigure_ja_hiragana\tあ\tひらがな\tひらがな入力モード\taction_test_hiragana\t\n"
+		  "leaf\tfigure_ja_katakana\tア\tカタカナ\tカタカナ入力モード\taction_test_katakana\t*\n"
+		  "leaf\tfigure_ja_hankana\tア\t半角カタカナ\t半角カタカナ入力モード\taction_test_hankana\t\n"
+		  "leaf\tfigure_ja_direct\ta\t直接入力\t直接(無変換)入力モード\taction_test_direct\t\n"
+		  "leaf\tfigure_ja_zenkaku\tA\t全角英数\t全角英数入力モード\taction_test_zenkaku\t\n"
+		  "branch\tfigure_ja_roma\tR\tローマ字\n"
+		  "leaf\tfigure_ja_roma\tR\tローマ字\tローマ字入力モード\taction_test_roma\t*\n"
+		  "leaf\tfigure_ja_kana\tか\tかな\tかな入力モード\taction_test_kana\t\n")
 		 (uim 'test-prop-list))
    ;; 2 widgets with non-existent
    (uim '(begin
@@ -1598,29 +1598,29 @@
 	   #t))
    (uim '(context-propagate-prop-list-update tc))
    (assert-equal (string-append
-		  "branch\tR\tローマ字\n"
-		  "leaf\tR\tローマ字\tローマ字入力モード\taction_test_roma\t*\n"
-		  "leaf\tか\tかな\tかな入力モード\taction_test_kana\t\n"
-		  "branch\tア\tカタカナ\n"
-		  "leaf\tあ\tひらがな\tひらがな入力モード\taction_test_hiragana\t\n"
-		  "leaf\tア\tカタカナ\tカタカナ入力モード\taction_test_katakana\t*\n"
-		  "leaf\tア\t半角カタカナ\t半角カタカナ入力モード\taction_test_hankana\t\n"
-		  "leaf\ta\t直接入力\t直接(無変換)入力モード\taction_test_direct\t\n"
-		  "leaf\tA\t全角英数\t全角英数入力モード\taction_test_zenkaku\t\n")
+		  "branch\tfigure_ja_roma\tR\tローマ字\n"
+		  "leaf\tfigure_ja_roma\tR\tローマ字\tローマ字入力モード\taction_test_roma\t*\n"
+		  "leaf\tfigure_ja_kana\tか\tかな\tかな入力モード\taction_test_kana\t\n"
+		  "branch\tfigure_ja_katakana\tア\tカタカナ\n"
+		  "leaf\tfigure_ja_hiragana\tあ\tひらがな\tひらがな入力モード\taction_test_hiragana\t\n"
+		  "leaf\tfigure_ja_katakana\tア\tカタカナ\tカタカナ入力モード\taction_test_katakana\t*\n"
+		  "leaf\tfigure_ja_hankana\tア\t半角カタカナ\t半角カタカナ入力モード\taction_test_hankana\t\n"
+		  "leaf\tfigure_ja_direct\ta\t直接入力\t直接(無変換)入力モード\taction_test_direct\t\n"
+		  "leaf\tfigure_ja_zenkaku\tA\t全角英数\t全角英数入力モード\taction_test_zenkaku\t\n")
 		 (uim 'test-prop-list))
    ;; no widgets
    (uim '(begin
 	   (context-init-widgets! tc ())
 	   #t))
    (uim '(context-propagate-prop-list-update tc))
-   (assert-equal "branch\t?\tunknown\n"
+   (assert-equal "branch\tunknown\t?\tunknown\n"
 		 (uim 'test-prop-list))
    ;; widget_test_null
    (uim '(begin
 	   (context-init-widgets! tc '(widget_test_null))
 	   #t))
    (uim '(context-propagate-prop-list-update tc))
-   (assert-equal "branch\t?\tunknown\n"
+   (assert-equal "branch\tunknown\t?\tunknown\n"
 		 (uim 'test-prop-list)))
 
   ;; TODO: context-update-mode
@@ -1635,18 +1635,18 @@
 	   (context-propagate-widget-states tc)
 	   #t))
    (assert-equal (string-append
-		  "branch\ta\t直接入力\n"
-		  "leaf\tあ\tひらがな\tひらがな入力モード\taction_test_hiragana\t\n"
-		  "leaf\tア\tカタカナ\tカタカナ入力モード\taction_test_katakana\t\n"
-		  "leaf\tア\t半角カタカナ\t半角カタカナ入力モード\taction_test_hankana\t\n"
-		  "leaf\ta\t直接入力\t直接(無変換)入力モード\taction_test_direct\t*\n"
-		  "leaf\tA\t全角英数\t全角英数入力モード\taction_test_zenkaku\t\n"
-		  "branch\tR\tローマ字\n"
-		  "leaf\tR\tローマ字\tローマ字入力モード\taction_test_roma\t*\n"
-		  "leaf\tか\tかな\tかな入力モード\taction_test_kana\t\n")
+		  "branch\tfigure_ja_direct\ta\t直接入力\n"
+		  "leaf\tfigure_ja_hiragana\tあ\tひらがな\tひらがな入力モード\taction_test_hiragana\t\n"
+		  "leaf\tfigure_ja_katakana\tア\tカタカナ\tカタカナ入力モード\taction_test_katakana\t\n"
+		  "leaf\tfigure_ja_hankana\tア\t半角カタカナ\t半角カタカナ入力モード\taction_test_hankana\t\n"
+		  "leaf\tfigure_ja_direct\ta\t直接入力\t直接(無変換)入力モード\taction_test_direct\t*\n"
+		  "leaf\tfigure_ja_zenkaku\tA\t全角英数\t全角英数入力モード\taction_test_zenkaku\t\n"
+		  "branch\tfigure_ja_roma\tR\tローマ字\n"
+		  "leaf\tfigure_ja_roma\tR\tローマ字\tローマ字入力モード\taction_test_roma\t*\n"
+		  "leaf\tfigure_ja_kana\tか\tかな\tかな入力モード\taction_test_kana\t\n")
 		 (uim 'test-prop-list))
-   (assert-equal (string-append "a\t直接入力\n"
-				"R\tローマ字\n")
+   (assert-equal (string-append "figure_ja_direct\ta\t直接入力\n"
+				"figure_ja_roma\tR\tローマ字\n")
 		 (uim 'test-prop-label))
    (assert-equal 3
 		 (uim 'test-updated-mode))
@@ -1658,18 +1658,18 @@
 	   (context-propagate-widget-states tc)
 	   #t))
    (assert-equal (string-append
-		  "branch\tア\tカタカナ\n"
-		  "leaf\tあ\tひらがな\tひらがな入力モード\taction_test_hiragana\t\n"
-		  "leaf\tア\tカタカナ\tカタカナ入力モード\taction_test_katakana\t*\n"
-		  "leaf\tア\t半角カタカナ\t半角カタカナ入力モード\taction_test_hankana\t\n"
-		  "leaf\ta\t直接入力\t直接(無変換)入力モード\taction_test_direct\t\n"
-		  "leaf\tA\t全角英数\t全角英数入力モード\taction_test_zenkaku\t\n"
-		  "branch\tR\tローマ字\n"
-		  "leaf\tR\tローマ字\tローマ字入力モード\taction_test_roma\t*\n"
-		  "leaf\tか\tかな\tかな入力モード\taction_test_kana\t\n")
+		  "branch\tfigure_ja_katakana\tア\tカタカナ\n"
+		  "leaf\tfigure_ja_hiragana\tあ\tひらがな\tひらがな入力モード\taction_test_hiragana\t\n"
+		  "leaf\tfigure_ja_katakana\tア\tカタカナ\tカタカナ入力モード\taction_test_katakana\t*\n"
+		  "leaf\tfigure_ja_hankana\tア\t半角カタカナ\t半角カタカナ入力モード\taction_test_hankana\t\n"
+		  "leaf\tfigure_ja_direct\ta\t直接入力\t直接(無変換)入力モード\taction_test_direct\t\n"
+		  "leaf\tfigure_ja_zenkaku\tA\t全角英数\t全角英数入力モード\taction_test_zenkaku\t\n"
+		  "branch\tfigure_ja_roma\tR\tローマ字\n"
+		  "leaf\tfigure_ja_roma\tR\tローマ字\tローマ字入力モード\taction_test_roma\t*\n"
+		  "leaf\tfigure_ja_kana\tか\tかな\tかな入力モード\taction_test_kana\t\n")
 		 (uim 'test-prop-list))
-   (assert-equal (string-append "ア\tカタカナ\n"
-				"R\tローマ字\n")
+   (assert-equal (string-append "figure_ja_katakana\tア\tカタカナ\n"
+				"figure_ja_roma\tR\tローマ字\n")
 		 (uim 'test-prop-label))
    (assert-equal 1
 		 (uim 'test-updated-mode))
@@ -1683,18 +1683,18 @@
 	   (context-propagate-widget-states tc)
 	   #t))
    (assert-equal (string-append
-		  "branch\tR\tローマ字\n"
-		  "leaf\tR\tローマ字\tローマ字入力モード\taction_test_roma\t*\n"
-		  "leaf\tか\tかな\tかな入力モード\taction_test_kana\t\n"
-		  "branch\tア\tカタカナ\n"
-		  "leaf\tあ\tひらがな\tひらがな入力モード\taction_test_hiragana\t\n"
-		  "leaf\tア\tカタカナ\tカタカナ入力モード\taction_test_katakana\t*\n"
-		  "leaf\tア\t半角カタカナ\t半角カタカナ入力モード\taction_test_hankana\t\n"
-		  "leaf\ta\t直接入力\t直接(無変換)入力モード\taction_test_direct\t\n"
-		  "leaf\tA\t全角英数\t全角英数入力モード\taction_test_zenkaku\t\n")
+		  "branch\tfigure_ja_roma\tR\tローマ字\n"
+		  "leaf\tfigure_ja_roma\tR\tローマ字\tローマ字入力モード\taction_test_roma\t*\n"
+		  "leaf\tfigure_ja_kana\tか\tかな\tかな入力モード\taction_test_kana\t\n"
+		  "branch\tfigure_ja_katakana\tア\tカタカナ\n"
+		  "leaf\tfigure_ja_hiragana\tあ\tひらがな\tひらがな入力モード\taction_test_hiragana\t\n"
+		  "leaf\tfigure_ja_katakana\tア\tカタカナ\tカタカナ入力モード\taction_test_katakana\t*\n"
+		  "leaf\tfigure_ja_hankana\tア\t半角カタカナ\t半角カタカナ入力モード\taction_test_hankana\t\n"
+		  "leaf\tfigure_ja_direct\ta\t直接入力\t直接(無変換)入力モード\taction_test_direct\t\n"
+		  "leaf\tfigure_ja_zenkaku\tA\t全角英数\t全角英数入力モード\taction_test_zenkaku\t\n")
 		 (uim 'test-prop-list))
-   (assert-equal (string-append "R\tローマ字\n"
-				"ア\tカタカナ\n")
+   (assert-equal (string-append "figure_ja_roma\tR\tローマ字\n"
+				"figure_ja_katakana\tア\tカタカナ\n")
 		 (uim 'test-prop-label))
    (assert-equal 1
 		 (uim 'test-updated-mode))
@@ -1705,9 +1705,9 @@
    (uim '(begin
 	   (context-propagate-widget-states tc)
 	   #t))
-   (assert-equal "branch\t?\tunknown\n"
+   (assert-equal "branch\tunknown\t?\tunknown\n"
 		 (uim 'test-prop-list))
-   (assert-equal "?\tunknown\n"
+   (assert-equal "unknown\t?\tunknown\n"
 		 (uim 'test-prop-label))
    (assert-equal 0
 		 (uim 'test-updated-mode))
@@ -1718,9 +1718,9 @@
    (uim '(begin
 	   (context-propagate-widget-states tc)
 	   #t))
-   (assert-equal "branch\t?\tunknown\n"
+   (assert-equal "branch\tunknown\t?\tunknown\n"
 		 (uim 'test-prop-list))
-   (assert-equal "?\tunknown\n"
+   (assert-equal "unknown\t?\tunknown\n"
 		 (uim 'test-prop-label))
    (assert-equal 0
 		 (uim 'test-updated-mode)))
@@ -1736,15 +1736,15 @@
 	   (context-propagate-widget-configuration tc)
 	   #t))
    (assert-equal (string-append
-		  "branch\ta\t直接入力\n"
-		  "leaf\tあ\tひらがな\tひらがな入力モード\taction_test_hiragana\t\n"
-		  "leaf\tア\tカタカナ\tカタカナ入力モード\taction_test_katakana\t\n"
-		  "leaf\tア\t半角カタカナ\t半角カタカナ入力モード\taction_test_hankana\t\n"
-		  "leaf\ta\t直接入力\t直接(無変換)入力モード\taction_test_direct\t*\n"
-		  "leaf\tA\t全角英数\t全角英数入力モード\taction_test_zenkaku\t\n"
-		  "branch\tR\tローマ字\n"
-		  "leaf\tR\tローマ字\tローマ字入力モード\taction_test_roma\t*\n"
-		  "leaf\tか\tかな\tかな入力モード\taction_test_kana\t\n")
+		  "branch\tfigure_ja_direct\ta\t直接入力\n"
+		  "leaf\tfigure_ja_hiragana\tあ\tひらがな\tひらがな入力モード\taction_test_hiragana\t\n"
+		  "leaf\tfigure_ja_katakana\tア\tカタカナ\tカタカナ入力モード\taction_test_katakana\t\n"
+		  "leaf\tfigure_ja_hankana\tア\t半角カタカナ\t半角カタカナ入力モード\taction_test_hankana\t\n"
+		  "leaf\tfigure_ja_direct\ta\t直接入力\t直接(無変換)入力モード\taction_test_direct\t*\n"
+		  "leaf\tfigure_ja_zenkaku\tA\t全角英数\t全角英数入力モード\taction_test_zenkaku\t\n"
+		  "branch\tfigure_ja_roma\tR\tローマ字\n"
+		  "leaf\tfigure_ja_roma\tR\tローマ字\tローマ字入力モード\taction_test_roma\t*\n"
+		  "leaf\tfigure_ja_kana\tか\tかな\tかな入力モード\taction_test_kana\t\n")
 		 (uim 'test-prop-list))
    (assert-equal '("ひらがな"
 		   "カタカナ"
@@ -1768,15 +1768,15 @@
 	   (context-propagate-widget-configuration tc)
 	   #t))
    (assert-equal (string-append
-		  "branch\tア\tカタカナ\n"
-		  "leaf\tあ\tひらがな\tひらがな入力モード\taction_test_hiragana\t\n"
-		  "leaf\tア\tカタカナ\tカタカナ入力モード\taction_test_katakana\t*\n"
-		  "leaf\tア\t半角カタカナ\t半角カタカナ入力モード\taction_test_hankana\t\n"
-		  "leaf\ta\t直接入力\t直接(無変換)入力モード\taction_test_direct\t\n"
-		  "leaf\tA\t全角英数\t全角英数入力モード\taction_test_zenkaku\t\n"
-		  "branch\tR\tローマ字\n"
-		  "leaf\tR\tローマ字\tローマ字入力モード\taction_test_roma\t*\n"
-		  "leaf\tか\tかな\tかな入力モード\taction_test_kana\t\n")
+		  "branch\tfigure_ja_katakana\tア\tカタカナ\n"
+		  "leaf\tfigure_ja_hiragana\tあ\tひらがな\tひらがな入力モード\taction_test_hiragana\t\n"
+		  "leaf\tfigure_ja_katakana\tア\tカタカナ\tカタカナ入力モード\taction_test_katakana\t*\n"
+		  "leaf\tfigure_ja_hankana\tア\t半角カタカナ\t半角カタカナ入力モード\taction_test_hankana\t\n"
+		  "leaf\tfigure_ja_direct\ta\t直接入力\t直接(無変換)入力モード\taction_test_direct\t\n"
+		  "leaf\tfigure_ja_zenkaku\tA\t全角英数\t全角英数入力モード\taction_test_zenkaku\t\n"
+		  "branch\tfigure_ja_roma\tR\tローマ字\n"
+		  "leaf\tfigure_ja_roma\tR\tローマ字\tローマ字入力モード\taction_test_roma\t*\n"
+		  "leaf\tfigure_ja_kana\tか\tかな\tかな入力モード\taction_test_kana\t\n")
 		 (uim 'test-prop-list))
    (assert-equal '("ひらがな"
 		   "カタカナ"
@@ -1802,15 +1802,15 @@
 	   (context-propagate-widget-configuration tc)
 	   #t))
    (assert-equal (string-append
-		  "branch\tR\tローマ字\n"
-		  "leaf\tR\tローマ字\tローマ字入力モード\taction_test_roma\t*\n"
-		  "leaf\tか\tかな\tかな入力モード\taction_test_kana\t\n"
-		  "branch\tア\tカタカナ\n"
-		  "leaf\tあ\tひらがな\tひらがな入力モード\taction_test_hiragana\t\n"
-		  "leaf\tア\tカタカナ\tカタカナ入力モード\taction_test_katakana\t*\n"
-		  "leaf\tア\t半角カタカナ\t半角カタカナ入力モード\taction_test_hankana\t\n"
-		  "leaf\ta\t直接入力\t直接(無変換)入力モード\taction_test_direct\t\n"
-		  "leaf\tA\t全角英数\t全角英数入力モード\taction_test_zenkaku\t\n")
+		  "branch\tfigure_ja_roma\tR\tローマ字\n"
+		  "leaf\tfigure_ja_roma\tR\tローマ字\tローマ字入力モード\taction_test_roma\t*\n"
+		  "leaf\tfigure_ja_kana\tか\tかな\tかな入力モード\taction_test_kana\t\n"
+		  "branch\tfigure_ja_katakana\tア\tカタカナ\n"
+		  "leaf\tfigure_ja_hiragana\tあ\tひらがな\tひらがな入力モード\taction_test_hiragana\t\n"
+		  "leaf\tfigure_ja_katakana\tア\tカタカナ\tカタカナ入力モード\taction_test_katakana\t*\n"
+		  "leaf\tfigure_ja_hankana\tア\t半角カタカナ\t半角カタカナ入力モード\taction_test_hankana\t\n"
+		  "leaf\tfigure_ja_direct\ta\t直接入力\t直接(無変換)入力モード\taction_test_direct\t\n"
+		  "leaf\tfigure_ja_zenkaku\tA\t全角英数\t全角英数入力モード\taction_test_zenkaku\t\n")
 		 (uim 'test-prop-list))
    (assert-equal '("ひらがな"
 		   "カタカナ"
@@ -1833,7 +1833,7 @@
    (uim '(begin
 	   (context-propagate-widget-configuration tc)
 	   #t))
-   (assert-equal "branch\t?\tunknown\n"
+   (assert-equal "branch\tunknown\t?\tunknown\n"
 		 (uim 'test-prop-list))
    (assert-equal '("unknown")
 		 (uim 'test-mode-list))
@@ -1848,7 +1848,7 @@
    (uim '(begin
 	   (context-propagate-widget-configuration tc)
 	   #t))
-   (assert-equal "branch\t?\tunknown\n"
+   (assert-equal "branch\tunknown\t?\tunknown\n"
 		 (uim 'test-prop-list))
    (assert-equal '("unknown")
 		 (uim 'test-mode-list))



More information about the uim-commit mailing list