Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Side by Side Diff: sync/test/fake_server/android/fake_server_helper_android.cc

Issue 881753003: Revert of Create a Android Sync integration test for typed URLs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « sync/test/fake_server/android/fake_server_helper_android.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
10 #include "base/basictypes.h" 9 #include "base/basictypes.h"
11 #include "base/logging.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "jni/FakeServerHelper_jni.h" 10 #include "jni/FakeServerHelper_jni.h"
14 #include "sync/internal_api/public/base/model_type.h"
15 #include "sync/internal_api/public/network_resources.h" 11 #include "sync/internal_api/public/network_resources.h"
16 #include "sync/test/fake_server/fake_server.h" 12 #include "sync/test/fake_server/fake_server.h"
17 #include "sync/test/fake_server/fake_server_network_resources.h" 13 #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"
20 14
21 FakeServerHelperAndroid::FakeServerHelperAndroid(JNIEnv* env, jobject obj) { 15 FakeServerHelperAndroid::FakeServerHelperAndroid(JNIEnv* env, jobject obj) {
22 } 16 }
23 17
24 FakeServerHelperAndroid::~FakeServerHelperAndroid() { } 18 FakeServerHelperAndroid::~FakeServerHelperAndroid() { }
25 19
26 static jlong Init(JNIEnv* env, jobject obj) { 20 static jlong Init(JNIEnv* env, jobject obj) {
27 FakeServerHelperAndroid* fake_server_android = 21 FakeServerHelperAndroid* fake_server_android =
28 new FakeServerHelperAndroid(env, obj); 22 new FakeServerHelperAndroid(env, obj);
29 return reinterpret_cast<intptr_t>(fake_server_android); 23 return reinterpret_cast<intptr_t>(fake_server_android);
(...skipping 15 matching lines...) Expand all
45 } 39 }
46 40
47 void FakeServerHelperAndroid::DeleteFakeServer(JNIEnv* env, 41 void FakeServerHelperAndroid::DeleteFakeServer(JNIEnv* env,
48 jobject obj, 42 jobject obj,
49 jlong fake_server) { 43 jlong fake_server) {
50 fake_server::FakeServer* fake_server_ptr = 44 fake_server::FakeServer* fake_server_ptr =
51 reinterpret_cast<fake_server::FakeServer*>(fake_server); 45 reinterpret_cast<fake_server::FakeServer*>(fake_server);
52 delete fake_server_ptr; 46 delete fake_server_ptr;
53 } 47 }
54 48
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 if (!result)
76 LOG(WARNING) << result.message();
77
78 return result;
79 }
80
81 // static 49 // static
82 bool FakeServerHelperAndroid::Register(JNIEnv* env) { 50 bool FakeServerHelperAndroid::Register(JNIEnv* env) {
83 return RegisterNativesImpl(env); 51 return RegisterNativesImpl(env);
84 } 52 }
OLDNEW
« no previous file with comments | « sync/test/fake_server/android/fake_server_helper_android.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698