commit 19a6c8bdd6a7749c73630ba4d1079904ff858a53
author Jeff Brown <jeffbrown@google.com> Wed Feb 15 15:43:57 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 15 15:43:57 2012 -0800
tree c1f432267d70327714cb89a4626d30294fe27a52
parent bcbbbdd340e02324eabb5fd4c4f0ec5a39a3557c
parent d5f04893f0c1a7663ff195a9b373d100e2741518

Merge "Simplify Choreographer API."

tests/tests/renderscript/src/android/renderscript/cts/ElementTest.java

diff --git a/tests/tests/renderscript/src/android/renderscript/cts/ElementTest.java b/tests/tests/renderscript/src/android/renderscript/cts/ElementTest.java
index 4f8185a..1bf5f53 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/ElementTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/ElementTest.java
@@ -412,6 +412,9 @@
     }
 
     public void testDataType() {
+        // Uncomment when NONE is no longer hidden.
+        //assertEquals(DataType.NONE, DataType.valueOf("NONE"));
+
         assertEquals(DataType.FLOAT_32, DataType.valueOf("FLOAT_32"));
         assertEquals(DataType.FLOAT_64, DataType.valueOf("FLOAT_64"));
         assertEquals(DataType.SIGNED_8, DataType.valueOf("SIGNED_8"));
@@ -444,7 +447,7 @@
         assertEquals(DataType.RS_PROGRAM_RASTER, DataType.valueOf("RS_PROGRAM_RASTER"));
         assertEquals(DataType.RS_PROGRAM_STORE, DataType.valueOf("RS_PROGRAM_STORE"));
         // Make sure no new enums are added
-        assertEquals(27, DataType.values().length);
+        assertEquals(28, DataType.values().length);
 
         for (DataType dt : DataType.values()) {
             Element.createVector(mRS, dt, 2);

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 3779305..1d24497 100644
--- a/tests/tests/text/src/android/text/format/cts/TimeTest.java
+++ b/tests/tests/text/src/android/text/format/cts/TimeTest.java
@@ -482,10 +482,10 @@
 
     public void testSetToNow0() throws Exception {
         Time t = new Time(Time.TIMEZONE_UTC);
-        t.setToNow();
         long currentTime = System.currentTimeMillis();
+        t.setToNow();
         long time = t.toMillis(false);
-        assertEquals(currentTime, time, 500);
+        assertEquals(currentTime, time, 999);
     }
 
     public void testMillis0() throws Exception {