X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fandroid%2Fsync_shell%2Fjavatests%2Fsrc%2Fchromium%2Fchrome%2Fbrowser%2Fsync%2FSyncTest.java;h=c7d254a1f0a19b8b36f66bf5a2c587dbf6f3def0;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=823403682ae3899ac295f6c7da8e6d1d491d6da0;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/chrome/android/sync_shell/javatests/src/chromium/chrome/browser/sync/SyncTest.java b/src/chrome/android/sync_shell/javatests/src/chromium/chrome/browser/sync/SyncTest.java index 8234036..c7d254a 100644 --- a/src/chrome/android/sync_shell/javatests/src/chromium/chrome/browser/sync/SyncTest.java +++ b/src/chrome/android/sync_shell/javatests/src/chromium/chrome/browser/sync/SyncTest.java @@ -9,6 +9,8 @@ import android.app.Activity; import android.test.suitebuilder.annotation.LargeTest; import android.util.Log; +import org.chromium.base.ActivityState; +import org.chromium.base.ApplicationStatus; import org.chromium.base.ThreadUtils; import org.chromium.base.test.util.Feature; import org.chromium.chrome.browser.identity.UniqueIdentificationGenerator; @@ -103,12 +105,28 @@ public class SyncTest extends ChromeShellTestBase { @LargeTest @Feature({"Sync"}) + public void testFlushDirectoryDoesntBreakSync() throws Throwable { + setupTestAccountAndSignInToSync(FOREIGN_SESSION_TEST_MACHINE_ID); + final Activity activity = getActivity(); + + runTestOnUiThread(new Runnable() { + @Override + public void run() { + ApplicationStatus.onStateChangeForTesting(activity, ActivityState.PAUSED); + } + }); + + // TODO(pvalenzuela): When available, check that sync is still functional. + } + + @LargeTest + @Feature({"Sync"}) public void testAboutSyncPageDisplaysCurrentSyncStatus() throws InterruptedException { setupTestAccountAndSignInToSync(FOREIGN_SESSION_TEST_MACHINE_ID); loadUrlWithSanitization("chrome://sync"); SyncTestUtil.AboutSyncInfoGetter aboutInfoGetter = - new SyncTestUtil.AboutSyncInfoGetter(getActivity()); + new SyncTestUtil.AboutSyncInfoGetter(getActivity()); try { runTestOnUiThread(aboutInfoGetter); } catch (Throwable t) { @@ -130,7 +148,7 @@ public class SyncTest extends ChromeShellTestBase { String innerHtml = ""; try { innerHtml = JavaScriptUtils.executeJavaScriptAndWaitForResult( - contentViewCore, "document.documentElement.innerHTML"); + contentViewCore.getWebContents(), "document.documentElement.innerHTML"); } catch (InterruptedException e) { Log.w(TAG, "Interrupted while polling about:sync page for sync status.", e); } catch (TimeoutException e) {