Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 119 additions & 1 deletion test-app/app/src/main/assets/app/tests/testPrimitiveTypeConversion.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,122 @@ describe("Tests primitive type conversion", function () {
});


});
});
describe("Tests char conversion of non-ASCII values", function () {

var T = com.tns.tests.CharConversionTest;

// U+00E9, U+20AC, U+4E2D, a lone high surrogate, an ASCII control, ASCII.
var samples = ["é", "€", "中", "\ud83d", "\u0007", "x"];

function codeUnits(javaIntArray) {
var result = [];
for (var i = 0; i < javaIntArray.length; i++) {
result.push(javaIntArray[i]);
}
return result;
}

function expectedUnits(values) {
return values.map(function (s) { return s.charCodeAt(0); });
}

it("char_conversion_char_cast_argument_keeps_the_utf16_code_unit", function () {
samples.forEach(function (s) {
expect(T.codeUnitOf(char(s))).toBe(s.charCodeAt(0));
});
});

it("char_conversion_char_return_value_round_trips", function () {
samples.forEach(function (s) {
expect(T.echo(char(s))).toBe(s);
});
});

it("char_conversion_js_array_to_char_array_argument", function () {
expect(codeUnits(T.codeUnitsOf(samples))).toEqual(expectedUnits(samples));
});

it("char_conversion_char_array_element_get", function () {
var arr = T.charsOf(samples.join(""));
for (var i = 0; i < samples.length; i++) {
expect(arr[i]).toBe(samples[i]);
}
});

it("char_conversion_char_array_element_set", function () {
var arr = T.charsOf("aaaaaa");
for (var i = 0; i < samples.length; i++) {
arr[i] = samples[i];
}
expect(codeUnits(T.codeUnitsOf(arr))).toEqual(expectedUnits(samples));
for (var j = 0; j < samples.length; j++) {
expect(arr[j]).toBe(samples[j]);
}
});

it("char_conversion_element_set_takes_first_code_unit_or_nul", function () {
var arr = T.charsOf("aaa");
arr[0] = "€b";
arr[1] = "";
arr[2] = "😀";
expect(codeUnits(T.codeUnitsOf(arr))).toEqual([0x20ac, 0, 0xd83d]);
});

it("char_conversion_char_field_set_and_get", function () {
var t = new T();
samples.forEach(function (s) {
t.charField = s;
expect(t.charFieldCodeUnit()).toBe(s.charCodeAt(0));
expect(t.charField).toBe(s);

T.staticCharField = s;
expect(T.staticCharFieldCodeUnit()).toBe(s.charCodeAt(0));
expect(T.staticCharField).toBe(s);
});
});

it("char_conversion_char_field_set_takes_first_code_unit_or_nul", function () {
var t = new T();
t.charField = "€b";
expect(t.charFieldCodeUnit()).toBe(0x20ac);
t.charField = "";
expect(t.charFieldCodeUnit()).toBe(0);
});

it("char_conversion_char_cast_returned_from_js_callback", function () {
var seen = [];
var callback = new com.tns.tests.CharConversionTest.CharEcho({
echo: function (c) {
seen.push(c);
return char(c);
}
});
samples.forEach(function (s) {
expect(T.codeUnitFromCallback(callback, char(s))).toBe(s.charCodeAt(0));
});
expect(seen).toEqual(samples);
});

it("char_conversion_plain_string_argument_takes_first_code_unit_or_nul", function () {
samples.forEach(function (s) {
expect(T.codeUnitOf(s)).toBe(s.charCodeAt(0));
expect(T.echo(s)).toBe(s);
expect(T.codeUnitOf(new String(s))).toBe(s.charCodeAt(0));
});
expect(T.codeUnitOf("\u20acb")).toBe(0x20ac);
expect(T.codeUnitOf("")).toBe(0);
});

it("boolean_field_get_returns_the_java_value", function () {
var t = new T();
expect(t.booleanField).toBe(false);
t.booleanField = true;
expect(t.booleanField).toBe(true);

T.staticBooleanField = true;
expect(T.staticBooleanField).toBe(true);
T.staticBooleanField = false;
expect(T.staticBooleanField).toBe(false);
});
});
41 changes: 41 additions & 0 deletions test-app/app/src/main/java/com/tns/tests/CharConversionTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,49 @@ public static interface Logger {
public void print(Object value);
}

public static interface CharEcho {
char echo(char value);
}

public static void printWithChar(Logger logger, char value) {
assert logger != null;
logger.print(value);
}

public char charField;
public static char staticCharField;
public boolean booleanField;
public static boolean staticBooleanField;

public static int codeUnitOf(char value) {
return value;
}

public static char echo(char value) {
return value;
}

public static int[] codeUnitsOf(char[] values) {
int[] units = new int[values.length];
for (int i = 0; i < values.length; i++) {
units[i] = values[i];
}
return units;
}

public static char[] charsOf(String value) {
return value.toCharArray();
}

public int charFieldCodeUnit() {
return charField;
}

public static int staticCharFieldCodeUnit() {
return staticCharField;
}

public static int codeUnitFromCallback(CharEcho callback, char value) {
return callback.echo(value);
}
}
11 changes: 11 additions & 0 deletions test-app/runtime/src/main/cpp/ArgConverter.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,17 @@ class ArgConverter {
return v8String;
}

// The Java char for a JS string: its first UTF-16 code unit, or U+0000 for an
// empty string. A character outside the BMP yields its high surrogate.
inline static jchar ToJavaChar(v8::Isolate* isolate, const v8::Local<v8::String>& value) {
if (value->Length() == 0) {
return 0;
}
uint16_t unit;
value->WriteV2(isolate, 0, 1, &unit);
return static_cast<jchar>(unit);
}

// For property keys: an internalized key skips the string-table insert a
// fresh key costs on every property lookup.
static v8::Local<v8::String> jstringToInternalizedV8String(v8::Isolate* isolate, JNIEnv* env, jstring value) {
Expand Down
15 changes: 3 additions & 12 deletions test-app/runtime/src/main/cpp/ArrayElementAccessor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ Local<Value> ArrayElementAccessor::GetArrayElement(Local<Context> context, const
const jsize length = 1;

const string elementSignature = arraySignature.substr(1);
jboolean isCopy = false;

if (elementSignature == "Z") {
jbooleanArray boolArr = static_cast<jbooleanArray>(arr);
Expand All @@ -42,10 +41,7 @@ Local<Value> ArrayElementAccessor::GetArrayElement(Local<Context> context, const
jcharArray charArr = static_cast<jcharArray>(arr);
jchar charArrValue;
env.GetCharArrayRegion(charArr, startIndex, length, &charArrValue);
JniLocalRef s(env.NewString(&charArrValue, 1));
const char* singleChar = env.GetStringUTFChars(s, &isCopy);
value = ConvertToJsValue(isolate, objectManager, env, elementSignature, singleChar);
env.ReleaseStringUTFChars(s, singleChar);
value = ConvertToJsValue(isolate, objectManager, env, elementSignature, &charArrValue);
} else if (elementSignature == "S") {
jshortArray shortArr = static_cast<jshortArray>(arr);
jshort shortArrValue;
Expand Down Expand Up @@ -93,7 +89,6 @@ void ArrayElementAccessor::SetArrayElement(Local<Context> context, const Local<O
assertNonNullNativeArray(arr);

const string elementSignature = arraySignature.substr(1);
jboolean isCopy = false;

if (elementSignature == "Z") { //bool
jboolean boolElementValue = (jboolean) value->BooleanValue(isolate);
Expand All @@ -104,11 +99,7 @@ void ArrayElementAccessor::SetArrayElement(Local<Context> context, const Local<O
jbyteArray byteArr = static_cast<jbyteArray>(arr);
env.SetByteArrayRegion(byteArr, index, 1, &byteElementValue);
} else if (elementSignature == "C") { //char
String::Utf8Value utf8(isolate, value->ToString(context).ToLocalChecked());
JniLocalRef s(env.NewString((jchar*) *utf8, 1));
const char* singleChar = env.GetStringUTFChars(s, &isCopy);
jchar charElementValue = *singleChar;
env.ReleaseStringUTFChars(s, singleChar);
jchar charElementValue = ArgConverter::ToJavaChar(isolate, value->ToString(context).ToLocalChecked());
jcharArray charArr = static_cast<jcharArray>(arr);
env.SetCharArrayRegion(charArr, index, 1, &charElementValue);
} else if (elementSignature == "S") { //short
Expand Down Expand Up @@ -164,7 +155,7 @@ Local<Value> ArrayElementAccessor::ConvertToJsValue(Isolate* isolate, ObjectMana
} else if (elementSignature == "B") {
jsValue = Integer::New(isolate, *(jbyte*) value);
} else if (elementSignature == "C") {
jsValue = ArgConverter::ConvertToV8String(isolate, (const char*) value, 1);
jsValue = ArgConverter::jcharToV8String(isolate, *(jchar*) value);
} else if (elementSignature == "S") {
jsValue = Integer::New(isolate, *(jshort*) value);
} else if (elementSignature == "I") {
Expand Down
13 changes: 4 additions & 9 deletions test-app/runtime/src/main/cpp/FieldAccessor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ Local<Value> FieldAccessor::GetJavaField(Isolate* isolate, const Local<Object>&
} else {
result = env.GetBooleanField(targetJavaObject, fieldId);
}
fieldResult = Boolean::New(isolate, (result == JNI_TRUE));
fieldResult = handleScope.Escape(Boolean::New(isolate, (result == JNI_TRUE)));
break;
}
case 'B': { //byte
Expand Down Expand Up @@ -252,17 +252,12 @@ void FieldAccessor::SetJavaField(Isolate* isolate, const Local<Object>& target,
break;
}
case 'C': { //char
//TODO: validate value is a single char
String::Utf8Value stringValue(isolate, value->ToString(context).ToLocalChecked());
JniLocalRef strValue(env.NewStringUTF(*stringValue));
const char* chars = env.GetStringUTFChars(strValue, 0);

jchar charValue = ArgConverter::ToJavaChar(isolate, value->ToString(context).ToLocalChecked());
if (isStatic) {
env.SetStaticCharField(clazz, fieldId, chars[0]);
env.SetStaticCharField(clazz, fieldId, charValue);
} else {
env.SetCharField(targetJavaObject, fieldId, chars[0]);
env.SetCharField(targetJavaObject, fieldId, charValue);
}
env.ReleaseStringUTFChars(strValue, chars);
break;
}
case 'S': { //short
Expand Down
18 changes: 10 additions & 8 deletions test-app/runtime/src/main/cpp/JsArgConverter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -334,9 +334,7 @@ bool JsArgConverter::ConvertArg(const Local<Value> &jsArg, int index) {
case CastType::Char:
castValue = NumericCasts::GetCastValue(jsObject);
if (castValue->IsString()) {
string value = ArgConverter::ConvertToString(
castValue->ToString(context).ToLocalChecked());
m_args[index].c = (jchar) value[0];
m_args[index].c = ArgConverter::ToJavaChar(m_isolate, castValue.As<String>());
success = true;
}
break;
Expand Down Expand Up @@ -559,6 +557,14 @@ bool JsArgConverter::ConvertJavaScriptBoolean(const Local<Value> &jsValue, int i
}

bool JsArgConverter::ConvertJavaScriptString(const Local<Value> &jsValue, int index) {
if (m_tokens->at(index) == "C") {
Local<String> str = jsValue->IsStringObject()
? jsValue.As<StringObject>()->ValueOf()
: jsValue.As<String>();
m_args[index].c = ArgConverter::ToJavaChar(m_isolate, str);
return true;
}

jstring stringObject = ArgConverter::ConvertToJavaString(jsValue);
SetConvertedObject(index, stringObject);

Expand Down Expand Up @@ -627,11 +633,7 @@ bool JsArgConverter::ConvertJavaScriptArray(const Local<Object> &source, size_t
if (!elementAt(i, element) || !element->ToString(context).ToLocal(&str)) {
return false;
}
String::Utf8Value utf8(m_isolate, str);
JniLocalRef s(env.NewString((jchar *) *utf8, 1));
const char *singleChar = env.GetStringUTFChars(s, nullptr);
chars[i] = *singleChar;
env.ReleaseStringUTFChars(s, singleChar);
chars[i] = ArgConverter::ToJavaChar(m_isolate, str);
}
arr = env.NewCharArray(arrLength);
env.SetCharArrayRegion((jcharArray) arr, 0, arrLength, chars.data());
Expand Down
4 changes: 1 addition & 3 deletions test-app/runtime/src/main/cpp/JsArgToArrayConverter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,7 @@ bool JsArgToArrayConverter::ConvertArg(Local<Context> context, const Local<Value
castValue = NumericCasts::GetCastValue(jsObj);
charValue = '\0';
if (castValue->IsString()) {
string str = ArgConverter::ConvertToString(
castValue->ToString(context).ToLocalChecked());
charValue = (jchar) str[0];
charValue = ArgConverter::ToJavaChar(isolate, castValue.As<String>());
}
javaObject = JType::NewChar(env, charValue);
SetConvertedObject(env, index, javaObject);
Expand Down