Move a test I wrote under our wing.

I put this in amongst the harmony tests before we started our own little
tree of tests.

3 files changed, 29 insertions, 13 deletions

diff --git a/luni/src/test/java/java/util/AllTests.java b/luni/src/test/java/java/util/AllTests.java
index f675328..774d48b 100644
--- a/luni/src/test/java/java/util/AllTests.java
+++ b/luni/src/test/java/java/util/AllTests.java
@@ -25,6 +25,7 @@ public class AllTests {
         suite.addTestSuite(java.util.CurrencyTest.class);
         suite.addTestSuite(java.util.DateTest.class);
         suite.addTestSuite(java.util.FormatterTest.class);
+        suite.addTestSuite(java.util.TimeZoneTest.class);
         return suite;
     }
 }
diff --git a/luni/src/test/java/java/util/TimeZoneTest.java b/luni/src/test/java/java/util/TimeZoneTest.java
new file mode 100644
index 0000000..ec4879f
--- /dev/null
+++ b/luni/src/test/java/java/util/TimeZoneTest.java
@@ -0,0 +1,28 @@
+/*
+ * 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 java.util;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class TimeZoneTest extends junit.framework.TestCase {
+    // http://code.google.com/p/android/issues/detail?id=877
+    public void test_useDaylightTime() {
+        TimeZone asiaTaipei = TimeZone.getTimeZone("Asia/Taipei");
+        assertFalse("Taiwan doesn't use DST", asiaTaipei.useDaylightTime());
+    }
+}
diff --git a/luni/src/test/java/tests/api/java/util/TimeZoneTest.java b/luni/src/test/java/tests/api/java/util/TimeZoneTest.java
index d6c6900..aacf6ce 100644
--- a/luni/src/test/java/tests/api/java/util/TimeZoneTest.java
+++ b/luni/src/test/java/tests/api/java/util/TimeZoneTest.java
@@ -394,19 +394,6 @@ public class TimeZoneTest extends junit.framework.TestCase {
     @TestTargetNew(
         level = TestLevel.COMPLETE,
         notes = "",
-        method = "useDaylightTime",
-        args = {}
-    )
-    public void test_useDaylightTime() {
-        // http://code.google.com/p/android/issues/detail?id=877
-        
-        TimeZone asiaTaipei = TimeZone.getTimeZone("Asia/Taipei");
-        assertFalse("Taiwan doesn't use DST", asiaTaipei.useDaylightTime());
-    }
-    
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
-        notes = "",
         method = "setID",
         args = {java.lang.String.class}
     )