OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "sync/test/fake_server/android/fake_server_helper_android.h" | 5 #include "sync/test/fake_server/android/fake_server_helper_android.h" |
6 | 6 |
7 #include <jni.h> | 7 #include <jni.h> |
8 | 8 |
9 #include "base/android/jni_string.h" | |
9 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
11 #include "base/logging.h" | |
12 #include "base/memory/scoped_ptr.h" | |
10 #include "jni/FakeServerHelper_jni.h" | 13 #include "jni/FakeServerHelper_jni.h" |
14 #include "sync/internal_api/public/base/model_type.h" | |
11 #include "sync/internal_api/public/network_resources.h" | 15 #include "sync/internal_api/public/network_resources.h" |
12 #include "sync/test/fake_server/fake_server.h" | 16 #include "sync/test/fake_server/fake_server.h" |
13 #include "sync/test/fake_server/fake_server_network_resources.h" | 17 #include "sync/test/fake_server/fake_server_network_resources.h" |
18 #include "sync/test/fake_server/fake_server_verifier.h" | |
19 #include "testing/gtest/include/gtest/gtest.h" | |
14 | 20 |
15 FakeServerHelperAndroid::FakeServerHelperAndroid(JNIEnv* env, jobject obj) { | 21 FakeServerHelperAndroid::FakeServerHelperAndroid(JNIEnv* env, jobject obj) { |
16 } | 22 } |
17 | 23 |
18 FakeServerHelperAndroid::~FakeServerHelperAndroid() { } | 24 FakeServerHelperAndroid::~FakeServerHelperAndroid() { } |
19 | 25 |
20 static jlong Init(JNIEnv* env, jobject obj) { | 26 static jlong Init(JNIEnv* env, jobject obj) { |
21 FakeServerHelperAndroid* fake_server_android = | 27 FakeServerHelperAndroid* fake_server_android = |
22 new FakeServerHelperAndroid(env, obj); | 28 new FakeServerHelperAndroid(env, obj); |
23 return reinterpret_cast<intptr_t>(fake_server_android); | 29 return reinterpret_cast<intptr_t>(fake_server_android); |
(...skipping 15 matching lines...) Expand all Loading... | |
39 } | 45 } |
40 | 46 |
41 void FakeServerHelperAndroid::DeleteFakeServer(JNIEnv* env, | 47 void FakeServerHelperAndroid::DeleteFakeServer(JNIEnv* env, |
42 jobject obj, | 48 jobject obj, |
43 jlong fake_server) { | 49 jlong fake_server) { |
44 fake_server::FakeServer* fake_server_ptr = | 50 fake_server::FakeServer* fake_server_ptr = |
45 reinterpret_cast<fake_server::FakeServer*>(fake_server); | 51 reinterpret_cast<fake_server::FakeServer*>(fake_server); |
46 delete fake_server_ptr; | 52 delete fake_server_ptr; |
47 } | 53 } |
48 | 54 |
55 jboolean FakeServerHelperAndroid::VerifyEntityCountByTypeAndName( | |
56 JNIEnv* env, | |
57 jobject obj, | |
58 jlong fake_server, | |
59 jlong count, | |
60 jstring model_type_string, | |
61 jstring name) { | |
62 syncer::ModelType model_type; | |
63 if (!NotificationTypeToRealModelType(base::android::ConvertJavaStringToUTF8( | |
64 env, model_type_string), &model_type)) { | |
65 LOG(WARNING) << "Invalid ModelType string."; | |
66 return false; | |
67 } | |
68 fake_server::FakeServer* fake_server_ptr = | |
69 reinterpret_cast<fake_server::FakeServer*>(fake_server); | |
70 fake_server::FakeServerVerifier fake_server_verifier(fake_server_ptr); | |
71 testing::AssertionResult result = | |
72 fake_server_verifier.VerifyEntityCountByTypeAndName( | |
73 count, model_type, base::android::ConvertJavaStringToUTF8(env, name)); | |
74 | |
75 LOG(WARNING) << result.message(); | |
nyquist
2015/01/24 01:54:41
Nit: Should this always be a warning?
pval...(no longer on Chromium)
2015/01/27 22:14:47
fixed to only log when returning false
| |
76 return result; | |
77 } | |
78 | |
49 // static | 79 // static |
50 bool FakeServerHelperAndroid::Register(JNIEnv* env) { | 80 bool FakeServerHelperAndroid::Register(JNIEnv* env) { |
51 return RegisterNativesImpl(env); | 81 return RegisterNativesImpl(env); |
52 } | 82 } |
OLD | NEW |