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

Unified Diff: sync/test/fake_server/android/fake_server_helper_android.cc

Issue 862113005: 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, 11 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 side-by-side diff with in-line comments
Download patch
Index: sync/test/fake_server/android/fake_server_helper_android.cc
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 725ba639cefdf8151c311e2e472f8891569a43e5..c258afbe64d7e3da45e5c862e195182df1d311f1 100644
--- a/sync/test/fake_server/android/fake_server_helper_android.cc
+++ b/sync/test/fake_server/android/fake_server_helper_android.cc
@@ -6,11 +6,17 @@
#include <jni.h>
+#include "base/android/jni_string.h"
#include "base/basictypes.h"
+#include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
#include "jni/FakeServerHelper_jni.h"
+#include "sync/internal_api/public/base/model_type.h"
#include "sync/internal_api/public/network_resources.h"
#include "sync/test/fake_server/fake_server.h"
#include "sync/test/fake_server/fake_server_network_resources.h"
+#include "sync/test/fake_server/fake_server_verifier.h"
+#include "testing/gtest/include/gtest/gtest.h"
FakeServerHelperAndroid::FakeServerHelperAndroid(JNIEnv* env, jobject obj) {
}
@@ -46,6 +52,30 @@ void FakeServerHelperAndroid::DeleteFakeServer(JNIEnv* env,
delete fake_server_ptr;
}
+jboolean FakeServerHelperAndroid::VerifyEntityCountByTypeAndName(
+ JNIEnv* env,
+ jobject obj,
+ jlong fake_server,
+ jlong count,
+ jstring model_type_string,
+ jstring name) {
+ syncer::ModelType model_type;
+ if (!NotificationTypeToRealModelType(base::android::ConvertJavaStringToUTF8(
+ env, model_type_string), &model_type)) {
+ LOG(WARNING) << "Invalid ModelType string.";
+ return false;
+ }
+ fake_server::FakeServer* fake_server_ptr =
+ reinterpret_cast<fake_server::FakeServer*>(fake_server);
+ fake_server::FakeServerVerifier fake_server_verifier(fake_server_ptr);
+ testing::AssertionResult result =
+ fake_server_verifier.VerifyEntityCountByTypeAndName(
+ count, model_type, base::android::ConvertJavaStringToUTF8(env, name));
+
+ 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
+ return result;
+}
+
// static
bool FakeServerHelperAndroid::Register(JNIEnv* env) {
return RegisterNativesImpl(env);

Powered by Google App Engine
This is Rietveld 408576698