| Index: runtime/vm/dart_api_impl_test.cc
|
| diff --git a/runtime/vm/dart_api_impl_test.cc b/runtime/vm/dart_api_impl_test.cc
|
| index 29e159cdd2b4db1e1c8a80504ee137f8b396a3bd..6cf231701a4246c69dddeabe2dac4f4976cf95ce 100644
|
| --- a/runtime/vm/dart_api_impl_test.cc
|
| +++ b/runtime/vm/dart_api_impl_test.cc
|
| @@ -339,11 +339,11 @@ UNIT_TEST_CASE(IntegerValues) {
|
| EXPECT(!fits);
|
|
|
| int64_t out = 0;
|
| - result = Dart_IntegerValue(val1, &out);
|
| + result = Dart_IntegerToInt64(val1, &out);
|
| EXPECT_VALID(result);
|
| EXPECT_EQ(kIntegerVal1, out);
|
|
|
| - result = Dart_IntegerValue(val2, &out);
|
| + result = Dart_IntegerToInt64(val2, &out);
|
| EXPECT_VALID(result);
|
| EXPECT_EQ(kIntegerVal2, out);
|
|
|
| @@ -389,7 +389,7 @@ UNIT_TEST_CASE(ArrayValues) {
|
| result = Dart_ListGetAt(val, i);
|
| EXPECT_VALID(result);
|
| int64_t value;
|
| - result = Dart_IntegerValue(result, &value);
|
| + result = Dart_IntegerToInt64(result, &value);
|
| EXPECT_VALID(result);
|
| EXPECT_EQ(i, value);
|
| }
|
| @@ -446,19 +446,19 @@ UNIT_TEST_CASE(ListAccess) {
|
|
|
| result = Dart_ListGetAt(ListAccessTestObj, 0);
|
| EXPECT_VALID(result);
|
| - result = Dart_IntegerValue(result, &value);
|
| + result = Dart_IntegerToInt64(result, &value);
|
| EXPECT_VALID(result);
|
| EXPECT_EQ(10, value);
|
|
|
| result = Dart_ListGetAt(ListAccessTestObj, 1);
|
| EXPECT_VALID(result);
|
| - result = Dart_IntegerValue(result, &value);
|
| + result = Dart_IntegerToInt64(result, &value);
|
| EXPECT_VALID(result);
|
| EXPECT_EQ(20, value);
|
|
|
| result = Dart_ListGetAt(ListAccessTestObj, 2);
|
| EXPECT_VALID(result);
|
| - result = Dart_IntegerValue(result, &value);
|
| + result = Dart_IntegerToInt64(result, &value);
|
| EXPECT_VALID(result);
|
| EXPECT_EQ(30, value);
|
|
|
| @@ -478,19 +478,19 @@ UNIT_TEST_CASE(ListAccess) {
|
| // Now try and access these elements in the array.
|
| result = Dart_ListGetAt(ListAccessTestObj, 0);
|
| EXPECT_VALID(result);
|
| - result = Dart_IntegerValue(result, &value);
|
| + result = Dart_IntegerToInt64(result, &value);
|
| EXPECT_VALID(result);
|
| EXPECT_EQ(0, value);
|
|
|
| result = Dart_ListGetAt(ListAccessTestObj, 1);
|
| EXPECT_VALID(result);
|
| - result = Dart_IntegerValue(result, &value);
|
| + result = Dart_IntegerToInt64(result, &value);
|
| EXPECT_VALID(result);
|
| EXPECT_EQ(1, value);
|
|
|
| result = Dart_ListGetAt(ListAccessTestObj, 2);
|
| EXPECT_VALID(result);
|
| - result = Dart_IntegerValue(result, &value);
|
| + result = Dart_IntegerToInt64(result, &value);
|
| EXPECT_VALID(result);
|
| EXPECT_EQ(2, value);
|
|
|
| @@ -513,7 +513,7 @@ UNIT_TEST_CASE(ListAccess) {
|
| EXPECT_EQ(30, native_array[2]);
|
| result = Dart_ListGetAt(ListAccessTestObj, 2);
|
| EXPECT_VALID(result);
|
| - result = Dart_IntegerValue(result, &value);
|
| + result = Dart_IntegerToInt64(result, &value);
|
| EXPECT_VALID(result);
|
| EXPECT_EQ(30, value);
|
|
|
| @@ -856,7 +856,7 @@ UNIT_TEST_CASE(FieldAccess) {
|
| result = Dart_GetStaticField(cls, Dart_NewString("fld4"));
|
| EXPECT_VALID(result);
|
| int64_t value = 0;
|
| - result = Dart_IntegerValue(result, &value);
|
| + result = Dart_IntegerToInt64(result, &value);
|
| EXPECT_EQ(10, value);
|
| result = Dart_SetStaticField(cls,
|
| Dart_NewString("fld4"),
|
| @@ -868,7 +868,7 @@ UNIT_TEST_CASE(FieldAccess) {
|
| Dart_NewString("fld3"),
|
| Dart_NewInteger(200));
|
| EXPECT_VALID(result);
|
| - result = Dart_IntegerValue(result, &value);
|
| + result = Dart_IntegerToInt64(result, &value);
|
| EXPECT_EQ(200, value);
|
|
|
| // Now access and set various instance fields of the returned object.
|
| @@ -876,11 +876,11 @@ UNIT_TEST_CASE(FieldAccess) {
|
| EXPECT(Dart_IsError(result));
|
| result = Dart_GetInstanceField(retobj, Dart_NewString("fld1"));
|
| EXPECT_VALID(result);
|
| - result = Dart_IntegerValue(result, &value);
|
| + result = Dart_IntegerToInt64(result, &value);
|
| EXPECT_EQ(10, value);
|
| result = Dart_GetInstanceField(retobj, Dart_NewString("fld2"));
|
| EXPECT_VALID(result);
|
| - result = Dart_IntegerValue(result, &value);
|
| + result = Dart_IntegerToInt64(result, &value);
|
| EXPECT_EQ(20, value);
|
| result = Dart_SetInstanceField(retobj,
|
| Dart_NewString("fld2"),
|
| @@ -892,7 +892,7 @@ UNIT_TEST_CASE(FieldAccess) {
|
| EXPECT_VALID(result);
|
| result = Dart_GetInstanceField(retobj, Dart_NewString("fld1"));
|
| EXPECT_VALID(result);
|
| - result = Dart_IntegerValue(result, &value);
|
| + result = Dart_IntegerToInt64(result, &value);
|
| EXPECT_EQ(40, value);
|
|
|
| Dart_ExitScope(); // Exit the Dart API scope.
|
| @@ -943,7 +943,7 @@ UNIT_TEST_CASE(HiddenFieldAccess) {
|
| result = Dart_GetStaticField(cls, Dart_NewString("_fld4"));
|
| EXPECT_VALID(result);
|
| int64_t value = 0;
|
| - result = Dart_IntegerValue(result, &value);
|
| + result = Dart_IntegerToInt64(result, &value);
|
| EXPECT_EQ(10, value);
|
| result = Dart_SetStaticField(cls,
|
| Dart_NewString("_fld4"),
|
| @@ -955,7 +955,7 @@ UNIT_TEST_CASE(HiddenFieldAccess) {
|
| Dart_NewString("_fld3"),
|
| Dart_NewInteger(200));
|
| EXPECT_VALID(result);
|
| - result = Dart_IntegerValue(result, &value);
|
| + result = Dart_IntegerToInt64(result, &value);
|
| EXPECT_EQ(200, value);
|
|
|
| // Now access and set various instance fields of the returned object.
|
| @@ -963,11 +963,11 @@ UNIT_TEST_CASE(HiddenFieldAccess) {
|
| EXPECT(Dart_IsError(result));
|
| result = Dart_GetInstanceField(retobj, Dart_NewString("_fld1"));
|
| EXPECT_VALID(result);
|
| - result = Dart_IntegerValue(result, &value);
|
| + result = Dart_IntegerToInt64(result, &value);
|
| EXPECT_EQ(10, value);
|
| result = Dart_GetInstanceField(retobj, Dart_NewString("_fld2"));
|
| EXPECT_VALID(result);
|
| - result = Dart_IntegerValue(result, &value);
|
| + result = Dart_IntegerToInt64(result, &value);
|
| EXPECT_EQ(20, value);
|
| result = Dart_SetInstanceField(retobj,
|
| Dart_NewString("_fld2"),
|
| @@ -979,7 +979,7 @@ UNIT_TEST_CASE(HiddenFieldAccess) {
|
| EXPECT_VALID(result);
|
| result = Dart_GetInstanceField(retobj, Dart_NewString("_fld1"));
|
| EXPECT_VALID(result);
|
| - result = Dart_IntegerValue(result, &value);
|
| + result = Dart_IntegerToInt64(result, &value);
|
| EXPECT_EQ(40, value);
|
|
|
| Dart_ExitScope(); // Exit the Dart API scope.
|
| @@ -1136,11 +1136,11 @@ UNIT_TEST_CASE(NativeFieldAccess) {
|
| result = Dart_GetInstanceField(retobj, Dart_NewString("fld1"));
|
| EXPECT_VALID(result);
|
| int64_t value = 0;
|
| - result = Dart_IntegerValue(result, &value);
|
| + result = Dart_IntegerToInt64(result, &value);
|
| EXPECT_EQ(10, value);
|
| result = Dart_GetInstanceField(retobj, Dart_NewString("fld2"));
|
| EXPECT_VALID(result);
|
| - result = Dart_IntegerValue(result, &value);
|
| + result = Dart_IntegerToInt64(result, &value);
|
| EXPECT_EQ(20, value);
|
| result = Dart_SetInstanceField(retobj,
|
| Dart_NewString("fld2"),
|
| @@ -1152,7 +1152,7 @@ UNIT_TEST_CASE(NativeFieldAccess) {
|
| EXPECT_VALID(result);
|
| result = Dart_GetInstanceField(retobj, Dart_NewString("fld1"));
|
| EXPECT_VALID(result);
|
| - result = Dart_IntegerValue(result, &value);
|
| + result = Dart_IntegerToInt64(result, &value);
|
| EXPECT_EQ(40, value);
|
|
|
| // Now access and set various native instance fields of the returned object.
|
| @@ -1191,11 +1191,11 @@ UNIT_TEST_CASE(NativeFieldAccess) {
|
| // to ensure that there was no corruption while setting native fields.
|
| result = Dart_GetInstanceField(retobj, Dart_NewString("fld1"));
|
| EXPECT_VALID(result);
|
| - result = Dart_IntegerValue(result, &value);
|
| + result = Dart_IntegerToInt64(result, &value);
|
| EXPECT_EQ(40, value);
|
| result = Dart_GetInstanceField(retobj, Dart_NewString("fld2"));
|
| EXPECT_VALID(result);
|
| - result = Dart_IntegerValue(result, &value);
|
| + result = Dart_IntegerToInt64(result, &value);
|
| EXPECT_EQ(20, value);
|
|
|
| Dart_ExitScope(); // Exit the Dart API scope.
|
| @@ -1323,12 +1323,12 @@ UNIT_TEST_CASE(GetStaticField_RunsInitializer) {
|
| result = Dart_GetStaticField(cls, Dart_NewString("fld1"));
|
| EXPECT_VALID(result);
|
| int64_t value = 0;
|
| - result = Dart_IntegerValue(result, &value);
|
| + result = Dart_IntegerToInt64(result, &value);
|
| EXPECT_EQ(7, value);
|
|
|
| result = Dart_GetStaticField(cls, Dart_NewString("fld2"));
|
| EXPECT_VALID(result);
|
| - result = Dart_IntegerValue(result, &value);
|
| + result = Dart_IntegerToInt64(result, &value);
|
| EXPECT_EQ(11, value);
|
|
|
| // Overwrite fld2
|
| @@ -1340,7 +1340,7 @@ UNIT_TEST_CASE(GetStaticField_RunsInitializer) {
|
| // We now get the new value for fld2, not the initializer
|
| result = Dart_GetStaticField(cls, Dart_NewString("fld2"));
|
| EXPECT_VALID(result);
|
| - result = Dart_IntegerValue(result, &value);
|
| + result = Dart_IntegerToInt64(result, &value);
|
| EXPECT_EQ(13, value);
|
|
|
| Dart_ExitScope(); // Exit the Dart API scope.
|
| @@ -1437,7 +1437,7 @@ UNIT_TEST_CASE(InvokeDynamic) {
|
| EXPECT_VALID(result);
|
| EXPECT(Dart_IsInteger(result));
|
| int64_t value = 0;
|
| - result = Dart_IntegerValue(result, &value);
|
| + result = Dart_IntegerToInt64(result, &value);
|
| EXPECT_EQ(41, value);
|
|
|
| result = Dart_InvokeDynamic(retobj, Dart_NewString("method2"), 0, NULL);
|
| @@ -1505,7 +1505,7 @@ UNIT_TEST_CASE(InvokeClosure) {
|
| EXPECT_VALID(result);
|
| EXPECT(Dart_IsInteger(result));
|
| int64_t value = 0;
|
| - result = Dart_IntegerValue(result, &value);
|
| + result = Dart_IntegerToInt64(result, &value);
|
| EXPECT_EQ(51, value);
|
|
|
| // Invoke closure with wrong number of args, should result in exception.
|
| @@ -1602,7 +1602,7 @@ UNIT_TEST_CASE(ThrowException) {
|
| EXPECT_VALID(result);
|
| EXPECT(Dart_IsInteger(result));
|
| int64_t value = 0;
|
| - result = Dart_IntegerValue(result, &value);
|
| + result = Dart_IntegerToInt64(result, &value);
|
| EXPECT_EQ(5, value);
|
|
|
| Dart_ExitScope(); // Exit the Dart API scope.
|
| @@ -1653,7 +1653,7 @@ UNIT_TEST_CASE(GetNativeArgumentCount) {
|
| EXPECT(Dart_IsInteger(result));
|
|
|
| int64_t value = 0;
|
| - result = Dart_IntegerValue(result, &value);
|
| + result = Dart_IntegerToInt64(result, &value);
|
| EXPECT_VALID(result);
|
| EXPECT_EQ(3, value);
|
|
|
|
|