commit cc712ee0fb8f98d9cce21b52c5f6f2a8272104d0
author Fabrice Di Meglio <fdimeglio@google.com> Tue Jan 12 09:34:09 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 12 09:34:09 2010 -0800
tree a265bb25e665e56cfdfe4921bb9e82769beff45a
parent b9ffcb6072c77d637dafe83fc201d01ee16376c4
parent aecd08721007e2cb5c8ebff166d701799fba22b7

Merge "Second step to CTS account manager" into eclair

tests/tests/text/src/android/text/format/cts/TimeTest.java

diff --git a/tests/tests/text/src/android/text/format/cts/TimeTest.java b/tests/tests/text/src/android/text/format/cts/TimeTest.java
index 45dcfed..a8f2acd 100644
--- a/tests/tests/text/src/android/text/format/cts/TimeTest.java
+++ b/tests/tests/text/src/android/text/format/cts/TimeTest.java
@@ -17,6 +17,7 @@
 package android.text.format.cts;
 
 import java.util.Calendar;
+import java.util.TimeZone;
 
 import android.test.AndroidTestCase;
 import android.text.format.Time;
@@ -653,7 +654,7 @@
     public void testSet0() throws Exception {
         Time t = new Time(Time.TIMEZONE_UTC);
         long time = System.currentTimeMillis();
-        Calendar date = Calendar.getInstance();
+        Calendar date = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
         date.setTimeInMillis(time);
         t.set(time);
         assertEquals(date.get(Calendar.YEAR), t.year);

tests/tests/view/src/android/view/cts/KeyEventTest.java

diff --git a/tests/tests/view/src/android/view/cts/KeyEventTest.java b/tests/tests/view/src/android/view/cts/KeyEventTest.java
index 6da754f..dc1696c6 100644
--- a/tests/tests/view/src/android/view/cts/KeyEventTest.java
+++ b/tests/tests/view/src/android/view/cts/KeyEventTest.java
@@ -532,35 +532,6 @@
 
     @TestTargetNew(
         level = TestLevel.COMPLETE,
-        notes = "Test {@link KeyEvent#getMatch(char[], int)}",
-        method = "getMatch",
-        args = {char[].class, int.class}
-    )
-    @ToBeFixed(bug = "1695243", explanation = "Android API javadocs are incomplete, " +
-            "should add NPE description in javadoc.")
-    public void testGetMatch2() {
-        char[] codes1 = { '0', '1', '2' };
-        assertEquals('\0', mKeyEvent.getMatch(codes1, KeyEvent.KEYCODE_SHIFT_LEFT));
-
-        char[] codes2 = { 'A', 'B', 'C' };
-        assertEquals('\0', mKeyEvent.getMatch(codes2, KeyEvent.KEYCODE_SHIFT_LEFT));
-        assertEquals('\0', mKeyEvent.getMatch(codes2, 0));
-
-        char[] codes3 = { '2', 's' };
-        mKeyEvent = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_S);
-        assertEquals('\0', mKeyEvent.getMatch(codes3, KeyEvent.KEYCODE_ALT_LEFT));
-        assertEquals('s', mKeyEvent.getMatch(codes3, 0));
-
-        try {
-            mKeyEvent.getMatch(null, 0);
-            fail("Should throw NullPointerException ");
-        } catch (NullPointerException e) {
-            // empty
-        }
-    }
-
-    @TestTargetNew(
-        level = TestLevel.COMPLETE,
         notes = "Test {@link KeyEvent#getAction()}",
         method = "getAction",
         args = {}