Changeset 15374

Timestamp:

07/07/08 17:20:58 (5 years ago)

Author:

nowelium

Message:

 

Location:

lang/io/MessageResource

Files:

• io/MessageResource.io (modified) (3 diffs)
• tests/MessageResourceTest.io (modified) (2 diffs)

lang/io/MessageResource/io/MessageResource.io

@@ -1 +1 @@
 MessageResource := Object clone do (
+    lang ::= nil
+    locale ::= nil
+    encoding ::= "UTF8"
+
     init := method(
         replace := Map clone
         replace atPut("-", "")
 
-        self lang := System getEnvironmentVariable("LANG")
+        self setLang(System getEnvironmentVariable("LANG"))
         split := lang splitNoEmpties(".")
-        self locale := split at(0)
-        self encoding := split at(1)
-        self encodeName := self encoding replaceMap(replace)
+
+        self setLocale(split at(0))
+        self setEncoding(split at(1) uppercase)
+        self encodeName := encoding replaceMap(replace)
         self encodingMessage := ("as" .. encoding) asMessage
     )
+    __getLocaleMessage := method(locale, id,
+        resourceLocale := self getSlot(locale)
+        if(resourceLocale isNil) then (
+            resourceLocale = self getSlot("C")
+        )
+        if(resourceLocale isNil) then (
+            Exception raise("locale not found locale: " .. locale)
+        )
+        message := resourceLocale getSlot(id)
+        if(message isNil) then (
+            Exception raise("message not found id: " .. id)
+        )
+        message
+    )
     getMessage := method(messageId, params,
-        message := self getSlot(locale) getSlot(messageId)
-        message interpolateInPlace(params)
+        message := __getLocaleMessage(locale, messageId)
+        message asMutable doMessage(encodingMessage) interpolateInPlace(params)
     )
     curlyBrackets := method(
@@ -25 +44 @@
     forward := method(
         name := call message name
-        message := self getSlot(locale) getSlot(name)
+        message := __getLocaleMessage(locale, name)
         message container := self
         message encodingMessage := self encodingMessage
@@ -34 +53 @@
         message
     )
+
+    UnitTest := Object clone do (
+        on := method(
+            target := call sender
+            target messageResource := MessageResource clone
+            target getArgs := method(a, b, msg,
+                messageResource := self messageResource
+                args := list()
+                if(a isNil not) then (
+                    if(a encoding != messageResource encoding) then (
+                        a = a doMessage(messageResource encodingMessage)
+                    )
+                )
+                if(b isNil not) then(
+                    if(b encoding != messageResource encoding) then (
+                        b = b doMessage(messageResource encodingMessage)
+                    )
+                )
+                args append(a, b, msg)
+                args
+            )
+            target __assert := method(name, args, UnitTest performWithArgList(name, args))
+            target assertEquals = method(a, b, msg,
+                __assert(call message name, getArgs(a, b, msg))
+            )
+            target assertNotEquals = method(a, b, msg,
+                __assert(call message name, getArgs(a, b, msg))
+            )
+        )
+    )
 )

lang/io/MessageResource/tests/MessageResourceTest.io

@@ -1 +1 @@
 MessageResourceTest := UnitTest clone do(
     type := "MessageResourceTest"
-    init := method(
-    )
     setUp := method(
     )
     tearDown := method(
     )
+    testMessage := method(
+        serverStart := HogeMessage SERVER_START {name := "hoge"}
+        assertEquals(serverStart, "サーバ hoge が始動しました")
+        assertNotEquals(serverStart, "サーバ #{name} が始動しました")
+        assertNotEquals(serverStart, "サーバ aaaa が始動しました")
+    )
     testGetMessage := method(
-        serverStart := HogeMessage SERVER_START {name := "hoge"}
-        assertEquals(serverStart, "サーバ hoge が始動しました" asUTF8)
+        params := Object clone do(
+            name := "foo"
+        )
+        serverStop := HogeMessage getMessage("SERVER_STOP", params)
+        assertEquals(serverStop, "サーバ foo が停止しました")
+    )
+    testLocaleMessage := method(
+        serverStart := FooMessage SERVER_START {name := "hoge"}
+        assertEquals(serverStart, "server hoge has started")
+        assertNotEquals(serverStart, "サーバ hoge が始動しました")
+    )
+    testMessageNotFound := method(
+        assertRaisesException(HogeMessage hello)
+        assertRaisesException(HogeMessage getMessage("world", nil))
+    )
+    testNilMessageParams := method(
+        assertRaisesException(HogeMessage SERVER_START {nil})
+        assertRaisesException(HogeMessage getMessage(SERVER_START, nil))
+        e := try (
+            assertNotNil(HogeMessage NONE_MSG)
+            assertEquals(HogeMessage NONE_MSG, "ほげ")
+        ); e catch(Exception,
+            fail("パラメータが無いので、メッセージのままでOK")
+        )
+        e1 := try (
+            assertNotNil(HogeMessage getMessage("NONE_MSG"))
+            assertEquals(HogeMessage getMessage("NONE_MSG"), "ほげ")
+        ); e1 catch(Exception,
+            fail("パラメータが無いので、メッセージのままでOK")
+        )
+    )
+    testUnknownLocale := method(
+        serverStart := BarMessage SERVER_START {name := "hoge"}
+        assertEquals(serverStart, "server hoge has started")
+        assertNotEquals(serverStart, "サーバ hoge が始動しました")
     )
 
-    HogeMessage := MessageResource clone do(
+    HogeMessage := MessageResource clone do (
         ja_JP := {
             SERVER_START := "サーバ #{name} が始動しました",
-            SERVER_STOP := "サーバ #{name} が停止しました"
+            SERVER_STOP := "サーバ #{name} が停止しました",
+            NONE_MSG := "ほげ"
         }
+    )
+    FooMessage := MessageResource clone do (
+        locale := "C"
         C := {
             SERVER_START := "server #{name} has started",
@@ -22 +63 @@
         }
     )
+    BarMessage := FooMessage clone do (
+        locale := "bar"
+    )
+    MessageResource UnitTest on
 )