| Index: chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java
|
| index 357a47d142508d468444c135b059784868f18f03..e04dac1baca24ca1845b8dc115ca2c1f227deca3 100644
|
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java
|
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java
|
| @@ -4,7 +4,7 @@
|
|
|
| package org.chromium.chrome.browser.offlinepages;
|
|
|
| -import android.test.suitebuilder.annotation.MediumTest;
|
| +import android.test.suitebuilder.annotation.SmallTest;
|
|
|
| import org.chromium.base.ThreadUtils;
|
| import org.chromium.chrome.browser.ChromeActivity;
|
| @@ -69,13 +69,13 @@ public class OfflinePageBridgeTest extends ChromeActivityTestCaseBase<ChromeActi
|
| startMainActivityOnBlankPage();
|
| }
|
|
|
| - @MediumTest
|
| + @SmallTest
|
| public void testLoadOfflinePagesWhenEmpty() throws Exception {
|
| List<OfflinePageItem> offlinePages = getAllPages();
|
| assertEquals("Offline pages count incorrect.", 0, offlinePages.size());
|
| }
|
|
|
| - @MediumTest
|
| + @SmallTest
|
| public void testAddOfflinePageAndLoad() throws Exception {
|
| loadUrl(TEST_PAGE);
|
| savePage(SavePageResult.SUCCESS, TEST_PAGE);
|
| @@ -105,7 +105,7 @@ public class OfflinePageBridgeTest extends ChromeActivityTestCaseBase<ChromeActi
|
| assertTrue("Offline page item size is incorrect: " + size, 600 < size && size < 800);
|
| }
|
|
|
| - @MediumTest
|
| + @SmallTest
|
| public void testMarkPageAccessed() throws Exception {
|
| loadUrl(TEST_PAGE);
|
| savePage(SavePageResult.SUCCESS, TEST_PAGE);
|
| @@ -116,7 +116,7 @@ public class OfflinePageBridgeTest extends ChromeActivityTestCaseBase<ChromeActi
|
| markPageAccessed(BOOKMARK_ID, 1);
|
| }
|
|
|
| - @MediumTest
|
| + @SmallTest
|
| public void testGetPageByBookmarkId() throws Exception {
|
| loadUrl(TEST_PAGE);
|
| savePage(SavePageResult.SUCCESS, TEST_PAGE);
|
| @@ -135,7 +135,7 @@ public class OfflinePageBridgeTest extends ChromeActivityTestCaseBase<ChromeActi
|
| mOfflinePageBridge.getPageByBookmarkId(new BookmarkId(-42, BookmarkType.NORMAL)));
|
| }
|
|
|
| - @MediumTest
|
| + @SmallTest
|
| public void testDeleteOfflinePage() throws Exception {
|
| deletePage(BOOKMARK_ID, DeletePageResult.NOT_FOUND);
|
| loadUrl(TEST_PAGE);
|
| @@ -147,6 +147,25 @@ public class OfflinePageBridgeTest extends ChromeActivityTestCaseBase<ChromeActi
|
| mOfflinePageBridge.getPageByBookmarkId(BOOKMARK_ID));
|
| }
|
|
|
| + @SmallTest
|
| + public void testGetOfflineUrlByOnlineUrl() throws Exception {
|
| + loadUrl(TEST_PAGE);
|
| + savePage(SavePageResult.SUCCESS, TEST_PAGE);
|
| + OfflinePageItem offlinePage = mOfflinePageBridge.getPageByBookmarkId(BOOKMARK_ID);
|
| + assertEquals("We should get the same offline URL, when querying using online URL",
|
| + offlinePage.getOfflineUrl(),
|
| + mOfflinePageBridge.getOfflineUrlByOnlineUrl(offlinePage.getUrl()));
|
| + }
|
| +
|
| + @SmallTest
|
| + public void testIsOfflniePageUrl() throws Exception {
|
| + loadUrl(TEST_PAGE);
|
| + savePage(SavePageResult.SUCCESS, TEST_PAGE);
|
| + OfflinePageItem offlinePage = mOfflinePageBridge.getPageByBookmarkId(BOOKMARK_ID);
|
| + assertTrue("Offline URL of an offline page should clearly be an offline page URL",
|
| + mOfflinePageBridge.isOfflinePageUrl(offlinePage.getOfflineUrl()));
|
| + }
|
| +
|
| private void savePage(final int expectedResult, final String expectedUrl)
|
| throws InterruptedException {
|
| final Semaphore semaphore = new Semaphore(0);
|
|
|