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

     1.1 --- a/test/script/basic/javaarrayconversion.js	Mon May 20 23:04:01 2013 +0530
     1.2 +++ b/test/script/basic/javaarrayconversion.js	Mon May 20 21:25:14 2013 +0200
     1.3 @@ -34,7 +34,7 @@
     1.4  var testCount = 0;
     1.5  
     1.6  function testF(inputValue, type, testFn) {
     1.7 -  var x = Java.toJavaArray([inputValue], type)[0];
     1.8 +  var x = Java.to([inputValue], type + "[]")[0];
     1.9    if(!testFn(x)) {
    1.10      throw ("unexpected value: " + x)
    1.11    }
    1.12 @@ -130,7 +130,7 @@
    1.13  
    1.14  function assertCantConvert(sourceType, targetType) {
    1.15    try {
    1.16 -    Java.toJavaArray([new Java.type(sourceType)()], targetType)
    1.17 +    Java.to([new Java.type(sourceType)()], targetType + "[]")
    1.18      throw "no TypeError encountered"
    1.19    } catch(e) {
    1.20        if(!(e instanceof TypeError)) {
    1.21 @@ -164,7 +164,7 @@
    1.22  intArray[0] = 1234;
    1.23  intArray[1] = 42;
    1.24  intArray[2] = 5;
    1.25 -var jsIntArray = Java.toJavaScriptArray(intArray)
    1.26 +var jsIntArray = Java.from(intArray)
    1.27  assert(jsIntArray instanceof Array);
    1.28  assert(jsIntArray[0] === 1234);
    1.29  assert(jsIntArray[1] === 42);
    1.30 @@ -179,7 +179,7 @@
    1.31  var byteArray = new (Java.type("byte[]"))(2)
    1.32  byteArray[0] = -128;
    1.33  byteArray[1] = 127;
    1.34 -var jsByteArray = Java.toJavaScriptArray(byteArray)
    1.35 +var jsByteArray = Java.from(byteArray)
    1.36  assert(jsByteArray instanceof Array);
    1.37  assert(jsByteArray[0] === -128);
    1.38  assert(jsByteArray[1] === 127);
    1.39 @@ -187,7 +187,7 @@
    1.40  var shortArray = new (Java.type("short[]"))(2)
    1.41  shortArray[0] = -32768;
    1.42  shortArray[1] = 32767;
    1.43 -var jsShortArray = Java.toJavaScriptArray(shortArray)
    1.44 +var jsShortArray = Java.from(shortArray)
    1.45  assert(jsShortArray instanceof Array);
    1.46  assert(jsShortArray[0] === -32768);
    1.47  assert(jsShortArray[1] === 32767);
    1.48 @@ -195,7 +195,7 @@
    1.49  var floatArray = new (Java.type("float[]"))(2)
    1.50  floatArray[0] = java.lang.Float.MIN_VALUE;
    1.51  floatArray[1] = java.lang.Float.MAX_VALUE;
    1.52 -var jsFloatArray = Java.toJavaScriptArray(floatArray)
    1.53 +var jsFloatArray = Java.from(floatArray)
    1.54  assert(jsFloatArray instanceof Array);
    1.55  assert(jsFloatArray[0] == java.lang.Float.MIN_VALUE);
    1.56  assert(jsFloatArray[1] == java.lang.Float.MAX_VALUE);
    1.57 @@ -204,7 +204,7 @@
    1.58  charArray[0] = "a";
    1.59  charArray[1] = "b";
    1.60  charArray[2] = "1";
    1.61 -var jsCharArray = Java.toJavaScriptArray(charArray)
    1.62 +var jsCharArray = Java.from(charArray)
    1.63  assert(jsCharArray instanceof Array);
    1.64  assert(jsCharArray[0] === 97);
    1.65  assert(jsCharArray[1] === 98);
    1.66 @@ -213,7 +213,7 @@
    1.67  var booleanArray = new (Java.type("boolean[]"))(2)
    1.68  booleanArray[0] = true;
    1.69  booleanArray[1] = false;
    1.70 -var jsBooleanArray = Java.toJavaScriptArray(booleanArray)
    1.71 +var jsBooleanArray = Java.from(booleanArray)
    1.72  assert(jsBooleanArray instanceof Array);
    1.73  assert(jsBooleanArray[0] === true);
    1.74  assert(jsBooleanArray[1] === false);