Fix build.
Change-Id: I468ea840f098f3c119ce01227151e86ba3fb5d90
diff --git a/luni/src/test/java/com/ibm/icu4jni/util/ICUTest.java b/luni/src/test/java/com/ibm/icu4jni/util/ICUTest.java
index 0deaa68..c950e0a 100644
--- a/luni/src/test/java/com/ibm/icu4jni/util/ICUTest.java
+++ b/luni/src/test/java/com/ibm/icu4jni/util/ICUTest.java
@@ -40,24 +40,6 @@
assertNotNull(ICU.getAvailableLocales()[0]);
}
- public void test_getKnownTimezones() throws Exception {
- // Check that corrupting our array doesn't affect other callers.
- assertNotNull(ICU.getKnownTimezones()[0]);
- ICU.getKnownTimezones()[0] = null;
- assertNotNull(ICU.getKnownTimezones()[0]);
- }
-
- public void test_getDisplayTimeZones() throws Exception {
- // Check that corrupting our array doesn't affect other callers.
- assertNotNull(ICU.getDisplayTimeZones(null)[0]);
- ICU.getDisplayTimeZones(null)[0] = null;
- assertNotNull(ICU.getDisplayTimeZones(null)[0]);
- // getDisplayTimezones actually returns a String[][] rather than a String[].
- assertNotNull(ICU.getDisplayTimeZones(null)[0][0]);
- ICU.getDisplayTimeZones(null)[0][0] = null;
- assertNotNull(ICU.getDisplayTimeZones(null)[0][0]);
- }
-
public void test_localeFromString() throws Exception {
// localeFromString is pretty lenient. Some of these can't be round-tripped
// through Locale.toString.
diff --git a/luni/src/test/java/com/ibm/icu4jni/text/NativePluralRulesTest.java b/luni/src/test/java/libcore/icu/NativePluralRulesTest.java
similarity index 98%
rename from luni/src/test/java/com/ibm/icu4jni/text/NativePluralRulesTest.java
rename to luni/src/test/java/libcore/icu/NativePluralRulesTest.java
index a4681ef..ccc3ca6 100644
--- a/luni/src/test/java/com/ibm/icu4jni/text/NativePluralRulesTest.java
+++ b/luni/src/test/java/libcore/icu/NativePluralRulesTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.ibm.icu4jni.text;
+package libcore.icu;
import java.util.Locale;
diff --git a/luni/src/test/java/libcore/icu/TimeZonesTest.java b/luni/src/test/java/libcore/icu/TimeZonesTest.java
new file mode 100644
index 0000000..6c41d86
--- /dev/null
+++ b/luni/src/test/java/libcore/icu/TimeZonesTest.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package libcore.icu;
+
+import java.util.Locale;
+
+public class TimeZonesTest extends junit.framework.TestCase {
+ public void test_getZoneStrings() throws Exception {
+ // Check that corrupting our array doesn't affect other callers.
+ assertNotNull(TimeZones.getZoneStrings(null)[0]);
+ TimeZones.getZoneStrings(null)[0] = null;
+ assertNotNull(TimeZones.getZoneStrings(null)[0]);
+ // getDisplayTimezones actually returns a String[][] rather than a String[].
+ assertNotNull(TimeZones.getZoneStrings(null)[0][0]);
+ TimeZones.getZoneStrings(null)[0][0] = null;
+ assertNotNull(TimeZones.getZoneStrings(null)[0][0]);
+ }
+}