From 7ecc1cd40666cf2bb23cc72a6cc892bea567a2c7 Mon Sep 17 00:00:00 2001
From: maxbogue <maxbogue@chromium.org>
Date: Tue, 7 Jul 2015 11:05:47 -0700
Subject: [Sync] Test downloading a bookmark modification on Android.

BUG=480604

Review URL: https://codereview.chromium.org/1224813002

Cr-Commit-Position: refs/heads/master@{#337641}
---
 .../android/fake_server_helper_android.cc          | 28 +++++++++++++++++++++-
 .../android/fake_server_helper_android.h           | 16 +++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

(limited to 'sync/test')

diff --git a/sync/test/fake_server/android/fake_server_helper_android.cc b/sync/test/fake_server/android/fake_server_helper_android.cc
index c66c1ac..f27e3cd 100644
--- a/sync/test/fake_server/android/fake_server_helper_android.cc
+++ b/sync/test/fake_server/android/fake_server_helper_android.cc
@@ -143,7 +143,33 @@ void FakeServerHelperAndroid::InjectBookmarkEntity(
     jstring parent_id) {
   fake_server::FakeServer* fake_server_ptr =
       reinterpret_cast<fake_server::FakeServer*>(fake_server);
+  fake_server_ptr->InjectEntity(
+      CreateBookmarkEntity(env, title, url, parent_id));
+}
+
+void FakeServerHelperAndroid::ModifyBookmarkEntity(JNIEnv* env,
+                                                   jobject obj,
+                                                   jlong fake_server,
+                                                   jstring entity_id,
+                                                   jstring title,
+                                                   jstring url,
+                                                   jstring parent_id) {
+  fake_server::FakeServer* fake_server_ptr =
+      reinterpret_cast<fake_server::FakeServer*>(fake_server);
+  scoped_ptr<fake_server::FakeServerEntity> bookmark =
+      CreateBookmarkEntity(env, title, url, parent_id);
+  sync_pb::SyncEntity proto;
+  bookmark->SerializeAsProto(&proto);
+  fake_server_ptr->ModifyEntitySpecifics(
+      base::android::ConvertJavaStringToUTF8(env, entity_id),
+      proto.specifics());
+}
 
+scoped_ptr<fake_server::FakeServerEntity>
+FakeServerHelperAndroid::CreateBookmarkEntity(JNIEnv* env,
+                                              jstring title,
+                                              jstring url,
+                                              jstring parent_id) {
   std::string url_as_string = base::android::ConvertJavaStringToUTF8(env, url);
   GURL gurl = GURL(url_as_string);
   if (!gurl.is_valid()) {
@@ -157,7 +183,7 @@ void FakeServerHelperAndroid::InjectBookmarkEntity(
           base::android::ConvertJavaStringToUTF8(env, title));
   bookmark_builder.SetParentId(
           base::android::ConvertJavaStringToUTF8(env, parent_id));
-  fake_server_ptr->InjectEntity(bookmark_builder.BuildBookmark(gurl));
+  return bookmark_builder.BuildBookmark(gurl);
 }
 
 base::android::ScopedJavaLocalRef<jstring>
diff --git a/sync/test/fake_server/android/fake_server_helper_android.h b/sync/test/fake_server/android/fake_server_helper_android.h
index 839c187..5e8d363 100644
--- a/sync/test/fake_server/android/fake_server_helper_android.h
+++ b/sync/test/fake_server/android/fake_server_helper_android.h
@@ -63,6 +63,15 @@ class FakeServerHelperAndroid {
                             jstring url,
                             jstring parent_id);
 
+  // Modify the BookmarkEntity with |entity_id| on |fake_server|.
+  void ModifyBookmarkEntity(JNIEnv* env,
+                            jobject obj,
+                            jlong fake_server,
+                            jstring entity_id,
+                            jstring title,
+                            jstring url,
+                            jstring parent_id);
+
   // Returns the bookmark bar folder ID.
   base::android::ScopedJavaLocalRef<jstring> GetBookmarkBarFolderId(
       JNIEnv* env,
@@ -78,6 +87,13 @@ class FakeServerHelperAndroid {
 
  private:
   virtual ~FakeServerHelperAndroid();
+
+  // Creates a bookmark entity.
+  scoped_ptr<fake_server::FakeServerEntity> CreateBookmarkEntity(
+      JNIEnv* env,
+      jstring title,
+      jstring url,
+      jstring parent_id);
 };
 
 #endif  // SYNC_TEST_FAKE_SERVER_ANDROID_FAKE_SERVER_HELPER_ANDROID
-- 
cgit v1.1