aboutsummaryrefslogtreecommitdiffstats
path: root/tests/src/com/android/inputmethod/latin/utils/ResourceUtilsTests.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-05-23 16:43:12 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-23 16:43:12 +0000
commit6726bc90014c8d9c1710e4b52aa019d3e945f407 (patch)
tree0ceda5aefb24fa3ffa8e52e3d1f8a8757f27296e /tests/src/com/android/inputmethod/latin/utils/ResourceUtilsTests.java
parente3bfb825f558c6e46f75c11cbbe0b25ae36063ee (diff)
parenta91561aa58db1c43092c1caecc051a11fa5391c7 (diff)
downloadlatinime-6726bc90014c8d9c1710e4b52aa019d3e945f407.tar.gz
latinime-6726bc90014c8d9c1710e4b52aa019d3e945f407.tar.xz
latinime-6726bc90014c8d9c1710e4b52aa019d3e945f407.zip
Merge "Use Java 7 diamond operator"
Diffstat (limited to 'tests/src/com/android/inputmethod/latin/utils/ResourceUtilsTests.java')
-rw-r--r--tests/src/com/android/inputmethod/latin/utils/ResourceUtilsTests.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/src/com/android/inputmethod/latin/utils/ResourceUtilsTests.java b/tests/src/com/android/inputmethod/latin/utils/ResourceUtilsTests.java
index 3eb704093..8e764e40f 100644
--- a/tests/src/com/android/inputmethod/latin/utils/ResourceUtilsTests.java
+++ b/tests/src/com/android/inputmethod/latin/utils/ResourceUtilsTests.java
@@ -24,10 +24,10 @@ import java.util.HashMap;
@SmallTest
public class ResourceUtilsTests extends AndroidTestCase {
public void testFindConstantForKeyValuePairsSimple() {
- final HashMap<String,String> anyKeyValue = CollectionUtils.newHashMap();
+ final HashMap<String,String> anyKeyValue = new HashMap<>();
anyKeyValue.put("anyKey", "anyValue");
final HashMap<String,String> nullKeyValue = null;
- final HashMap<String,String> emptyKeyValue = CollectionUtils.newHashMap();
+ final HashMap<String,String> emptyKeyValue = new HashMap<>();
final String[] nullArray = null;
assertNull(ResourceUtils.findConstantForKeyValuePairs(anyKeyValue, nullArray));
@@ -48,7 +48,7 @@ public class ResourceUtilsTests extends AndroidTestCase {
"HARDWARE=mako,0.5",
};
- final HashMap<String,String> keyValues = CollectionUtils.newHashMap();
+ final HashMap<String,String> keyValues = new HashMap<>();
keyValues.put(HARDWARE_KEY, "grouper");
assertEquals("0.3", ResourceUtils.findConstantForKeyValuePairs(keyValues, array));
keyValues.put(HARDWARE_KEY, "mako");
@@ -88,7 +88,7 @@ public class ResourceUtilsTests extends AndroidTestCase {
"HARDWARE=mantaray:MODEL=Nexus 10:MANUFACTURER=samsung,0.2"
};
- final HashMap<String,String> keyValues = CollectionUtils.newHashMap();
+ final HashMap<String,String> keyValues = new HashMap<>();
keyValues.put(HARDWARE_KEY, "grouper");
keyValues.put(MODEL_KEY, "Nexus 7");
keyValues.put(MANUFACTURER_KEY, "asus");
@@ -126,7 +126,7 @@ public class ResourceUtilsTests extends AndroidTestCase {
"HARDWARE=manta.*:MODEL=Nexus 10:MANUFACTURER=samsung,0.2"
};
- final HashMap<String,String> keyValues = CollectionUtils.newHashMap();
+ final HashMap<String,String> keyValues = new HashMap<>();
keyValues.put(HARDWARE_KEY, "grouper");
keyValues.put(MODEL_KEY, "Nexus 7");
keyValues.put(MANUFACTURER_KEY, "asus");