summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorfgorski <fgorski@chromium.org>2015-08-31 15:39:10 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-31 22:39:42 +0000
commiteeea62d3d48453de1a593b9f944523b4ec4f3efc (patch)
tree5ccb975fb1c712ee6d8aa4bdaaa59844b951b53b /base
parent7ba4133165466b9b69345e50f45dd5e92ba55c1e (diff)
downloadchromium_src-eeea62d3d48453de1a593b9f944523b4ec4f3efc.zip
chromium_src-eeea62d3d48453de1a593b9f944523b4ec4f3efc.tar.gz
chromium_src-eeea62d3d48453de1a593b9f944523b4ec4f3efc.tar.bz2
[Android] Adding tests for jlongArray conversions to vectors
I noticed that I didn't have the test for my last checkin and that the method I based mine on didn't have one (perhaps for the same issue I had to add my method). This patch is fixing that. Original checkin: https://codereview.chromium.org/1314753002/ Review URL: https://codereview.chromium.org/1316243003 Cr-Commit-Position: refs/heads/master@{#346498}
Diffstat (limited to 'base')
-rw-r--r--base/android/jni_array_unittest.cc55
1 files changed, 55 insertions, 0 deletions
diff --git a/base/android/jni_array_unittest.cc b/base/android/jni_array_unittest.cc
index 7cb896c..58b2443 100644
--- a/base/android/jni_array_unittest.cc
+++ b/base/android/jni_array_unittest.cc
@@ -112,6 +112,61 @@ TEST(JniArray, JavaIntArrayToIntVector) {
}
}
+TEST(JniArray, JavaLongArrayToInt64Vector) {
+ const int64 kInt64s[] = {0LL, 1LL, -1LL};
+ const size_t kLen = arraysize(kInt64s);
+
+ JNIEnv* env = AttachCurrentThread();
+ ScopedJavaLocalRef<jlongArray> jlongs(env, env->NewLongArray(kLen));
+ ASSERT_TRUE(jlongs.obj());
+
+ for (size_t i = 0; i < kLen; ++i) {
+ jlong j = static_cast<jlong>(kInt64s[i]);
+ env->SetLongArrayRegion(jlongs.obj(), i, 1, &j);
+ ASSERT_FALSE(HasException(env));
+ }
+
+ std::vector<int64> int64s;
+ JavaLongArrayToInt64Vector(env, jlongs.obj(), &int64s);
+
+ ASSERT_EQ(static_cast<jsize>(int64s.size()),
+ env->GetArrayLength(jlongs.obj()));
+
+ jlong value;
+ for (size_t i = 0; i < kLen; ++i) {
+ env->GetLongArrayRegion(jlongs.obj(), i, 1, &value);
+ ASSERT_EQ(int64s[i], value);
+ ASSERT_EQ(kInt64s[i], int64s[i]);
+ }
+}
+
+TEST(JniArray, JavaLongArrayToLongVector) {
+ const int64 kInt64s[] = {0LL, 1LL, -1LL};
+ const size_t kLen = arraysize(kInt64s);
+
+ JNIEnv* env = AttachCurrentThread();
+ ScopedJavaLocalRef<jlongArray> jlongs(env, env->NewLongArray(kLen));
+ ASSERT_TRUE(jlongs.obj());
+
+ for (size_t i = 0; i < kLen; ++i) {
+ jlong j = static_cast<jlong>(kInt64s[i]);
+ env->SetLongArrayRegion(jlongs.obj(), i, 1, &j);
+ ASSERT_FALSE(HasException(env));
+ }
+
+ std::vector<jlong> jlongs_vector;
+ JavaLongArrayToLongVector(env, jlongs.obj(), &jlongs_vector);
+
+ ASSERT_EQ(static_cast<jsize>(jlongs_vector.size()),
+ env->GetArrayLength(jlongs.obj()));
+
+ jlong value;
+ for (size_t i = 0; i < kLen; ++i) {
+ env->GetLongArrayRegion(jlongs.obj(), i, 1, &value);
+ ASSERT_EQ(jlongs_vector[i], value);
+ }
+}
+
TEST(JniArray, JavaFloatArrayToFloatVector) {
const float kFloats[] = {0.0, 0.5, -0.5};
const size_t kLen = arraysize(kFloats);