commit 8a26c5c4c74b09e2887593c733a22652a9f80d7c
author Elliott Hughes <enh@google.com> Mon Aug 15 18:35:43 2011 -0700
committer Elliott Hughes <enh@google.com> Mon Aug 15 18:35:43 2011 -0700
tree 880dee46cc2e56c3903c216ad0e846dccc37a71a
parent f2682d5a6ce0f7de58da8fd4ec8aec200c43b92e

Implement NewStringUTF and SetObjectArrayElement.

Turns out there are a couple more calls needed by aexec.

I've added a placeholder AddLocalReference too, so we can add calls
rather than TODOs.

Change-Id: I3228a68527540b7cca665a8f35143a7401107e24

src/jni_internal_test.cc

diff --git a/src/jni_internal_test.cc b/src/jni_internal_test.cc
index df9844f..e5ba913 100644
--- a/src/jni_internal_test.cc
+++ b/src/jni_internal_test.cc
@@ -64,23 +64,23 @@
 
   // TODO: check returned array class.
 
-  CHECK(env_->NewBooleanArray(0) != NULL);
-  CHECK(env_->NewByteArray(0) != NULL);
-  CHECK(env_->NewCharArray(0) != NULL);
-  CHECK(env_->NewDoubleArray(0) != NULL);
-  CHECK(env_->NewFloatArray(0) != NULL);
-  CHECK(env_->NewIntArray(0) != NULL);
-  CHECK(env_->NewLongArray(0) != NULL);
-  CHECK(env_->NewShortArray(0) != NULL);
+  EXPECT_TRUE(env_->NewBooleanArray(0) != NULL);
+  EXPECT_TRUE(env_->NewByteArray(0) != NULL);
+  EXPECT_TRUE(env_->NewCharArray(0) != NULL);
+  EXPECT_TRUE(env_->NewDoubleArray(0) != NULL);
+  EXPECT_TRUE(env_->NewFloatArray(0) != NULL);
+  EXPECT_TRUE(env_->NewIntArray(0) != NULL);
+  EXPECT_TRUE(env_->NewLongArray(0) != NULL);
+  EXPECT_TRUE(env_->NewShortArray(0) != NULL);
 
-  CHECK(env_->NewBooleanArray(1) != NULL);
-  CHECK(env_->NewByteArray(1) != NULL);
-  CHECK(env_->NewCharArray(1) != NULL);
-  CHECK(env_->NewDoubleArray(1) != NULL);
-  CHECK(env_->NewFloatArray(1) != NULL);
-  CHECK(env_->NewIntArray(1) != NULL);
-  CHECK(env_->NewLongArray(1) != NULL);
-  CHECK(env_->NewShortArray(1) != NULL);
+  EXPECT_TRUE(env_->NewBooleanArray(1) != NULL);
+  EXPECT_TRUE(env_->NewByteArray(1) != NULL);
+  EXPECT_TRUE(env_->NewCharArray(1) != NULL);
+  EXPECT_TRUE(env_->NewDoubleArray(1) != NULL);
+  EXPECT_TRUE(env_->NewFloatArray(1) != NULL);
+  EXPECT_TRUE(env_->NewIntArray(1) != NULL);
+  EXPECT_TRUE(env_->NewLongArray(1) != NULL);
+  EXPECT_TRUE(env_->NewShortArray(1) != NULL);
 }
 
 TEST_F(JniInternalTest, NewObjectArray) {
@@ -94,9 +94,16 @@
 
   jclass c = env_->FindClass("[Ljava.lang.String;");
 
-  CHECK(env_->NewObjectArray(0, c, NULL) != NULL);
+  EXPECT_TRUE(env_->NewObjectArray(0, c, NULL) != NULL);
 
-  CHECK(env_->NewObjectArray(1, c, NULL) != NULL);
+  EXPECT_TRUE(env_->NewObjectArray(1, c, NULL) != NULL);
+}
+
+TEST_F(JniInternalTest, NewStringUTF) {
+  EXPECT_TRUE(env_->NewStringUTF(NULL) == NULL);
+  EXPECT_TRUE(env_->NewStringUTF("") != NULL);
+  EXPECT_TRUE(env_->NewStringUTF("hello") != NULL);
+  // TODO: check some non-ASCII strings.
 }
 
 bool EnsureInvokeStub(Method* method);