Mercurial > jdk8-mips64-public > nashorn / file diff

     1.1 --- a/test/script/basic/NASHORN-556.js	Mon May 20 23:04:01 2013 +0530
     1.2 +++ b/test/script/basic/NASHORN-556.js	Mon May 20 21:25:14 2013 +0200
     1.3 @@ -47,7 +47,7 @@
     1.4    // (NoTypeArrayData)
     1.5    var empty = {};
     1.6    empty.length = 10;
     1.7 -  Java.toJavaArray(empty);
     1.8 +  Java.to(empty);
     1.9    delete empty[0];
    1.10    Array.prototype.slice.call(empty, 0, 1);
    1.11    Array.prototype.pop.call(empty);
    1.12 @@ -63,7 +63,7 @@
    1.13  function f2() {
    1.14    // DeletedArrayFilter
    1.15    var deleted = [,1,,2,,3,,4,,];
    1.16 -  assertEq(2, Java.toJavaArray(deleted)[3]);
    1.17 +  assertEq(2, Java.to(deleted)[3]);
    1.18    assertEq(undefined, deleted.pop());
    1.19    assertEq(4, deleted.pop());
    1.20    deleted.unshift(5);
    1.21 @@ -78,7 +78,7 @@
    1.22  function f3() {
    1.23    // DeletedRangeArrayFilter
    1.24    var delrange = [1,2,3,,,,,,,,,,];
    1.25 -  Java.toJavaArray(delrange);
    1.26 +  Java.to(delrange);
    1.27    delrange.unshift(4);
    1.28    p.apply(null, delrange);
    1.29    print(delrange.slice(1,3), delrange.slice(2,6));
    1.30 @@ -88,7 +88,7 @@
    1.31  function f4() {
    1.32    // NumberArrayData
    1.33    var num = [1.1,2.2,3.3,4.4,5.5];
    1.34 -  Java.toJavaArray(num);
    1.35 +  Java.to(num);
    1.36    assertEq(2, num[3] >>> 1);
    1.37    assertEq(5, num[4] | 0);
    1.38    assertEq(5.5, num.pop());
    1.39 @@ -104,7 +104,7 @@
    1.40  function f5() {
    1.41    // ObjectArrayData
    1.42    var obj = [2,"two",3.14,"pi",14,"fourteen"];
    1.43 -  Java.toJavaArray(obj);
    1.44 +  Java.to(obj);
    1.45    assertEq(-12.86, obj[2] - 16);
    1.46    assertEq(7, obj[4] >>> 1);
    1.47    obj.unshift("one");
    1.48 @@ -131,14 +131,14 @@
    1.49    sparse.length = 1024*1024;
    1.50    sparse.push(sparse.length);
    1.51    delete sparse[sparse.length-1];
    1.52 -  //print(Java.toJavaArray(sparse).length);
    1.53 +  //print(Java.to(sparse).length);
    1.54    (function(){}).apply(null, sparse);
    1.55  }
    1.56  
    1.57  function f7() {
    1.58    // UndefinedArrayFilter
    1.59    var undef = [1,2,3,4,5,undefined,7,8,9,19];
    1.60 -  Java.toJavaArray(undef);
    1.61 +  Java.to(undef);
    1.62    assertEq(4, undef[8] >>> 1);
    1.63    var tmp = undef[9] >>> 1;
    1.64    undef[8] = tmp;
    1.65 @@ -154,8 +154,8 @@
    1.66  
    1.67  function f8() {
    1.68    // LongArrayData
    1.69 -  var j = Java.toJavaScriptArray(Java.toJavaArray([23,37,42,86,47], "long"));
    1.70 -  Java.toJavaArray(j);
    1.71 +  var j = Java.from(Java.to([23,37,42,86,47], "long[]"));
    1.72 +  Java.to(j);
    1.73    p.apply(null, j);
    1.74    assertEq(43, j[3] >>> 1);
    1.75    assertEq(36, j[4] - 11);
    1.76 @@ -164,12 +164,12 @@
    1.77    assertEq(7, j.shift());
    1.78    assertEq(47, j.pop());
    1.79    j.push("asdf");
    1.80 -  j = Java.toJavaScriptArray(Java.toJavaArray([23,37,42,86,47], "long"));
    1.81 +  j = Java.from(Java.to([23,37,42,86,47], "long[]"));
    1.82    j.length = 3;
    1.83    j[0] = 13;
    1.84 -  j = Java.toJavaScriptArray(Java.toJavaArray([23,37,42,86,47], "long"));
    1.85 +  j = Java.from(Java.to([23,37,42,86,47], "long[]"));
    1.86    delete j[0];
    1.87 -  j = Java.toJavaScriptArray(Java.toJavaArray([23,37,42,86,47], "long"));
    1.88 +  j = Java.from(Java.to([23,37,42,86,47], "long[]"));
    1.89    j.length = 20;
    1.90    j[0] = 13.37;
    1.91  }