[Offline pages] Expose offline pages URL related methods in java code.

chrome/android/javatests/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridgeTest.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 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;
 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge.DeletePageCallback;
 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge.OfflinePageModelObserver;
 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge.SavePageCallback;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.chrome.test.util.TestHttpServerClient;
 import org.chromium.components.bookmarks.BookmarkId;
@@ skipping 44 matching lines @@
             }
         });
         assertTrue(semaphore.tryAcquire(TIMEOUT_MS, TimeUnit.MILLISECONDS));
     }
 
     @Override
     public void startMainActivity() throws InterruptedException {
         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);
         List<OfflinePageItem> allPages = getAllPages();
         OfflinePageItem offlinePage = allPages.get(0);
         assertEquals("Offline pages count incorrect.", 1, allPages.size());
         assertEquals("Offline page item url incorrect.", TEST_PAGE, offlinePage.getUrl());
         assertEquals("Offline page item bookmark ID incorrect.", BOOKMARK_ID,
                 offlinePage.getBookmarkId());
         assertTrue("Offline page item offline file url doesn't start properly.",
                 offlinePage.getOfflineUrl().startsWith("file:///"));
         assertTrue("Offline page item offline file doesn't have the right name.",
                 offlinePage.getOfflineUrl().endsWith(".mhtml"));
         assertTrue("Offline page item offline file doesn't have the right name.",
                 offlinePage.getOfflineUrl().contains("About"));
 
         // We don't care about the exact file size of the mhtml file:
         // - exact file size is not something that the end user sees or cares about
         // - exact file size can vary based on external factors (i.e. see crbug.com/518758)
         // - verification of contents of the resulting mhtml file should be covered by mhtml
         //   serialization tests (i.e. save_page_browsertest.cc)
         // - we want to avoid overtesting and artificially requiring specific formatting and/or
         //   implementation choices in the mhtml serialization code
         // OTOH, it still seems useful to assert that the file is not empty and that its size is in
         // the right ballpark.
         long size = offlinePage.getFileSize();
         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);
         OfflinePageItem offlinePage = mOfflinePageBridge.getPageByBookmarkId(BOOKMARK_ID);
         assertNotNull("Offline page should be available, but it is not.", offlinePage);
         assertEquals("Offline page access count should be 0.", 0, offlinePage.getAccessCount());
 
         markPageAccessed(BOOKMARK_ID, 1);
     }
 
-    @MediumTest
+    @SmallTest
     public void testGetPageByBookmarkId() throws Exception {
         loadUrl(TEST_PAGE);
         savePage(SavePageResult.SUCCESS, TEST_PAGE);
         OfflinePageItem offlinePage = mOfflinePageBridge.getPageByBookmarkId(BOOKMARK_ID);
         assertEquals("Offline page item url incorrect.", TEST_PAGE, offlinePage.getUrl());
         assertEquals("Offline page item bookmark ID incorrect.", BOOKMARK_ID,
                 offlinePage.getBookmarkId());
         assertTrue("Offline page item offline file url doesn't start properly.",
                 offlinePage.getOfflineUrl().startsWith("file:///"));
         assertTrue("Offline page item offline file doesn't have the right name.",
                 offlinePage.getOfflineUrl().endsWith(".mhtml"));
         assertTrue("Offline page item offline file doesn't have the right name.",
                 offlinePage.getOfflineUrl().contains("About"));
 
         assertNull("Offline page is not supposed to exist",
                 mOfflinePageBridge.getPageByBookmarkId(new BookmarkId(-42, BookmarkType.NORMAL)));
     }
 
-    @MediumTest
+    @SmallTest
     public void testDeleteOfflinePage() throws Exception {
         deletePage(BOOKMARK_ID, DeletePageResult.NOT_FOUND);
         loadUrl(TEST_PAGE);
         savePage(SavePageResult.SUCCESS, TEST_PAGE);
         assertNotNull("Offline page should be available, but it is not.",
                 mOfflinePageBridge.getPageByBookmarkId(BOOKMARK_ID));
         deletePage(BOOKMARK_ID, DeletePageResult.SUCCESS);
         assertNull("Offline page should be gone, but it is available.",
                 mOfflinePageBridge.getPageByBookmarkId(BOOKMARK_ID));
     }
 
+    @SmallTest
+    public void testGetOfflineUrlForOnlineUrl() 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.getOfflineUrlForOnlineUrl(offlinePage.getUrl()));
+    }
+
+    @SmallTest
+    public void testIsOfflniePageUrl() throws Exception {

[newt (away), 2016/01/05 22:40:41]

s/Offlnie/Offline/

[fgorski, 2016/01/07 17:12:49]

Done.

+        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()));
+        assertFalse("Online URL of an offline page should not be an offline page URL",
+                mOfflinePageBridge.isOfflinePageUrl(offlinePage.getUrl()));
+    }
+
     private void savePage(final int expectedResult, final String expectedUrl)
             throws InterruptedException {
         final Semaphore semaphore = new Semaphore(0);
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 assertNotNull("Tab is null", getActivity().getActivityTab());
                 assertEquals("URL does not match requested.", TEST_PAGE,
                         getActivity().getActivityTab().getUrl());
                 assertNotNull("WebContents is null",
@@ skipping 63 matching lines @@
                     result.add(item);
                 }
 
                 semaphore.release();
             }
         });
         assertTrue(semaphore.tryAcquire(TIMEOUT_MS, TimeUnit.MILLISECONDS));
         return result;
     }
 }