From 54ca0ab18c7a62d468aed49613969b66dbd2c443 Mon Sep 17 00:00:00 2001
From: Markus Scherer <markus.icu@gmail.com>
Date: Tue, 1 Mar 2016 23:47:06 +0000
Subject: [PATCH] ICU-11952 match whole select part string, not just prefix

X-SVN-Rev: 38456
---
 .../src/com/ibm/icu/text/MessagePattern.java  |  2 +-
 .../dev/test/format/TestMessageFormat.java    | 24 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/MessagePattern.java b/icu4j/main/classes/core/src/com/ibm/icu/text/MessagePattern.java
index 57110961699..c7fd2ab65ab 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/MessagePattern.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/MessagePattern.java
@@ -481,7 +481,7 @@ public final class MessagePattern implements Cloneable, Freezable<MessagePattern
      * @stable ICU 4.8
      */
     public boolean partSubstringMatches(Part part, String s) {
-        return msg.regionMatches(part.index, s, 0, part.length);
+        return part.length == s.length() && msg.regionMatches(part.index, s, 0, part.length);
     }
 
     /**
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TestMessageFormat.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TestMessageFormat.java
index b902497d742..44f5120b8a2 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TestMessageFormat.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TestMessageFormat.java
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
-* Copyright (c) 2004-2015, International Business Machines
+* Copyright (c) 2004-2016, International Business Machines
 * Corporation and others.  All Rights Reserved.
 **********************************************************************
 * Author: Alan Liu
@@ -23,6 +23,7 @@ import java.util.Iterator;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 
 import com.ibm.icu.text.DateFormat;
 import com.ibm.icu.text.DecimalFormat;
@@ -1934,4 +1935,25 @@ public class TestMessageFormat extends com.ibm.icu.dev.test.TestFmwk {
         assertEquals("offset-decimals format(1)", "2.5 meters",
                 m2.format(args, result, ignore).toString());
     }
+
+    public void TestArgIsPrefixOfAnother() {
+        // Ticket #11952
+        MessageFormat mf1 = new MessageFormat(
+                "{0,select,a{A}ab{AB}abc{ABC}other{?}}", ULocale.ENGLISH);
+        assertEquals("a", "A", mf1.format(new Object[] { "a" }));
+        assertEquals("ab", "AB", mf1.format(new Object[] { "ab" }));
+        assertEquals("abc", "ABC", mf1.format(new Object[] { "abc" }));
+
+        // Ticket #12172
+        MessageFormat mf2 = new MessageFormat("{a} {aa} {aaa}", ULocale.ENGLISH);
+        Map<String, Object> args = new TreeMap<String, Object>();
+        args.put("a", "A");
+        args.put("aa", "AB");
+        args.put("aaa", "ABC");
+        assertEquals("a aa aaa", "A AB ABC", mf2.format(args, new StringBuffer(), null).toString());
+
+        // Ticket #12172
+        MessageFormat mf3 = new MessageFormat("{aa} {aaa}", ULocale.ENGLISH);
+        assertEquals("aa aaa", "AB ABC", mf3.format(args, new StringBuffer(), null).toString());
+    }
 }
-- 
2.40.0