commit e8e544dc8909155560af0c7381df3833b2e7f701
author Tobias Thierer <tobiast@google.com> Mon Jan 22 21:20:09 2018 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 15 08:18:19 2020 +0000
tree 4b8aeefcbbd0fc5bea795194bacd6c0cf812f7d0
parent 628f48871a9c7a1f18c2d5e1a76aa7afc716810d

Revert "Work around a art test script bug mixing up bootclasspaths."

This reverts commit 437b54c730ab306208af5aa035b85c294d090024.

Reason for revert: This workaround should no longer be needed after CLs [1-2].

Bug: 70521453
Test: art/test/testrunner/run_build_test_target.py -j40 art-interpreter

[1] https://android-review.googlesource.com/c/platform/build/+/573902
[2] https://android-review.googlesource.com/c/platform/build/soong/+/578623

Change-Id: I09276cc5c2aae01dcd4a288881510d09ec144985

test/070-nio-buffer/src/Main.java

diff --git a/test/070-nio-buffer/src/Main.java b/test/070-nio-buffer/src/Main.java
index 86eb553..a3eeb3f 100644
--- a/test/070-nio-buffer/src/Main.java
+++ b/test/070-nio-buffer/src/Main.java
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import java.nio.Buffer;
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -51,9 +50,9 @@
             1024, 1025, 1026, 1027, 1028, 1029, 1030, 1031
         };
 
-        ((Buffer) shortBuf).position(0);
+        shortBuf.position(0);
         shortBuf.put(myShorts, 0, 32);      // should work
-        ((Buffer) shortBuf).position(0);
+        shortBuf.position(0);
         shortBuf.put(myShorts, 16, 16);     // should work
         shortBuf.put(myShorts, 16, 16);     // advance to end
 
@@ -65,7 +64,7 @@
         }
 
         try {
-            ((Buffer) shortBuf).position(0);
+            shortBuf.position(0);
             shortBuf.put(myShorts, 0, 33);     // should fail
             System.out.println("ERROR: out-of-bounds put succeeded\n");
         } catch (IndexOutOfBoundsException ioobe) {
@@ -73,7 +72,7 @@
         }
 
         try {
-            ((Buffer) shortBuf).position(16);
+            shortBuf.position(16);
             shortBuf.put(myShorts, 0, 17);     // should fail
             System.out.println("ERROR: out-of-bounds put succeeded\n");
         } catch (BufferOverflowException boe) {
@@ -94,13 +93,13 @@
         int data[] = new int[25];
         //FloatBuffer int1 = direct.asFloatBuffer();
         //float data[] = new float[25];
-        ((Buffer) int1).clear();
-        int1.put(data);
-        ((Buffer) int1).position(0);
-
-        ((Buffer) int1).clear();
+        int1.clear ();
         int1.put (data);
-        ((Buffer) int1).position(0);
+        int1.position (0);
+
+        int1.clear ();
+        int1.put (data);
+        int1.position (0);
     }
 
     /*
@@ -120,7 +119,7 @@
     }
 
     static void storeValues(ByteBuffer directBuf) {
-        ((Buffer) directBuf).position(0);
+        directBuf.position(0);
         ShortBuffer shortBuf = directBuf.asShortBuffer();
         CharBuffer charBuf = directBuf.asCharBuffer();
         IntBuffer intBuf = directBuf.asIntBuffer();
@@ -158,7 +157,7 @@
             throw new RuntimeException("double get/store failed");
         }
 
-        ((Buffer) directBuf).position(0);
+        directBuf.position(0);
         char[] outBuf = new char[directBuf.limit() * 2];
         for (int i = 0; i < directBuf.limit(); i++) {
             byte b = directBuf.get();