You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/02/13 09:30:47 UTC

svn commit: r909772 - in /harmony/enhanced/classlib/trunk/modules/luni/src/test/impl/common/org/apache/harmony/luni/tests/internal: ./ nls/ nls/MessagesTest.java

Author: hindessm
Date: Sat Feb 13 08:30:47 2010
New Revision: 909772

URL: http://svn.apache.org/viewvc?rev=909772&view=rev
Log:
Migrate old MsgHelpTest to new class.

Added:
    harmony/enhanced/classlib/trunk/modules/luni/src/test/impl/common/org/apache/harmony/luni/tests/internal/
    harmony/enhanced/classlib/trunk/modules/luni/src/test/impl/common/org/apache/harmony/luni/tests/internal/nls/
    harmony/enhanced/classlib/trunk/modules/luni/src/test/impl/common/org/apache/harmony/luni/tests/internal/nls/MessagesTest.java
      - copied, changed from r909601, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/util/MsgHelpTest.java

Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/impl/common/org/apache/harmony/luni/tests/internal/nls/MessagesTest.java (from r909601, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/util/MsgHelpTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/impl/common/org/apache/harmony/luni/tests/internal/nls/MessagesTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/impl/common/org/apache/harmony/luni/tests/internal/nls/MessagesTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/util/MsgHelpTest.java&r1=909601&r2=909772&rev=909772&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/util/MsgHelpTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/impl/common/org/apache/harmony/luni/tests/internal/nls/MessagesTest.java Sat Feb 13 08:30:47 2010
@@ -16,13 +16,13 @@
 
 package org.apache.harmony.luni.tests.util;
 
-import org.apache.harmony.luni.util.MsgHelp;
+import org.apache.harmony.luni.internal.nls.Messages;
 
 import junit.framework.TestCase;
 
-public class MsgHelpTest extends TestCase {
+public class MessagesTest extends TestCase {
 
-    public MsgHelpTest(String name) {
+    public MessagesTest(String name) {
         super(name);
     }
 
@@ -31,40 +31,40 @@
      * Object[])'
      */
     public void testFormatLjava_lang_String$Ljava_lang_Object() {
-        assertEquals("empty", MsgHelp.format("empty", new Object[0]));
+        assertEquals("empty", Messages.format("empty", new Object[0]));
 
-        assertEquals("<null>", MsgHelp.format("{0}", new Object[1]));
-        assertEquals("<missing argument>", MsgHelp.format("{0}", new Object[0]));
-        assertEquals("fixture {} fixture", MsgHelp.format("{0} \\{} {0}",
+        assertEquals("<null>", Messages.format("{0}", new Object[1]));
+        assertEquals("<missing argument>", Messages.format("{0}", new Object[0]));
+        assertEquals("fixture {} fixture", Messages.format("{0} \\{} {0}",
                 new Object[] { "fixture" }));
 
-        assertEquals("<null> fixture", MsgHelp.format("{0} {1}", new Object[] {
+        assertEquals("<null> fixture", Messages.format("{0} {1}", new Object[] {
                 null, "fixture" }));
-        assertEquals("<null> fixture <missing argument>", MsgHelp.format(
+        assertEquals("<null> fixture <missing argument>", Messages.format(
                 "{0} {1} {2}", new Object[] { null, "fixture" }));
-        assertEquals("<null> fixture", MsgHelp.format("{0} {1}", new Object[] {
+        assertEquals("<null> fixture", Messages.format("{0} {1}", new Object[] {
                 null, "fixture", "extra" }));
 
-        assertEquals("0 1 2 3 4 5 6 7 8 9", MsgHelp.format(
+        assertEquals("0 1 2 3 4 5 6 7 8 9", Messages.format(
                 "{0} {1} {2} {3} {4} {5} {6} {7} {8} {9}", new Object[] { "0",
                         "1", "2", "3", "4", "5", "6", "7", "8", "9" }));
-        assertEquals("9 8 7 6 5 4 3 2 1 0", MsgHelp.format(
+        assertEquals("9 8 7 6 5 4 3 2 1 0", Messages.format(
                 "{0} {1} {2} {3} {4} {5} {6} {7} {8} {9}", new Object[] { "9",
                         "8", "7", "6", "5", "4", "3", "2", "1", "0" }));
 
-        assertEquals("0 1 2 3 4 5 6 7 8 9 {10}", MsgHelp.format(
+        assertEquals("0 1 2 3 4 5 6 7 8 9 {10}", Messages.format(
                 "{0} {1} {2} {3} {4} {5} {6} {7} {8} {9} {10}",
                 new Object[] { "0", "1", "2", "3", "4", "5", "6", "7", "8",
                         "9", "10" }));
         
         try {
-            MsgHelp.format(null, new Object[0]);
+            Messages.format(null, new Object[0]);
             fail("No NPE");
         } catch (NullPointerException e) {
         }
         
         try {
-            MsgHelp.format("fixture", null);
+            Messages.format("fixture", null);
             fail("No NPE");
         } catch (NullPointerException e) {
         }