Bug 899605 - Update testBrowserProvider for Jellybean; r=lucasr
authorGeoff Brown <gbrown@mozilla.com>
Thu, 29 Aug 2013 16:44:24 -0600
changeset 145018 c456e82b5e0765a4877b35be767a474303784bd4
parent 145017 8e94b0e0d4fe9b9db111cc1f80d8e5b0ca1bc3f7
child 145019 dfdb69b6dfd36d996137bc8e92ced7276d90caa6
push id33127
push usergbrown@mozilla.com
push dateThu, 29 Aug 2013 22:44:36 +0000
treeherdermozilla-inbound@dfdb69b6dfd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslucasr
bugs899605
milestone26.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 899605 - Update testBrowserProvider for Jellybean; r=lucasr
mobile/android/base/tests/testBrowserProvider.java.in
--- a/mobile/android/base/tests/testBrowserProvider.java.in
+++ b/mobile/android/base/tests/testBrowserProvider.java.in
@@ -644,17 +644,18 @@ public class testBrowserProvider extends
             id = insertWithNullCol(mBookmarksPositionCol);
             mAsserter.is(new Long(id), new Long(-1),
                          "Should not be able to insert bookmark with null position");
 
             id = insertWithNullCol(mBookmarksTypeCol);
             mAsserter.is(new Long(id), new Long(-1),
                          "Should not be able to insert bookmark with null type");
 
-            if (Build.VERSION.SDK_INT >= 8) {
+            if (Build.VERSION.SDK_INT >= 8 &&
+                Build.VERSION.SDK_INT < 16) {
                 b = createOneBookmark();
                 b.put(mBookmarksParentCol, -1);
                 id = -1;
 
                 try {
                     id = ContentUris.parseId(mProvider.insert(mBookmarksUri, b));
                 } catch (Exception e) {}
 
@@ -740,17 +741,18 @@ public class testBrowserProvider extends
             deleted = mProvider.delete(ContentUris.withAppendedId(mBookmarksUri, id), null, null);
             mAsserter.is((deleted == 1), true,
                          "Inserted bookmark was deleted using URI with id");
 
             c = getBookmarkById(id);
             mAsserter.is(c.moveToFirst(), false,
                          "Inserted bookmark can't be found after deletion using URI with ID");
 
-            if (Build.VERSION.SDK_INT >= 8) {
+            if (Build.VERSION.SDK_INT >= 8 &&
+                Build.VERSION.SDK_INT < 16) {
                 ContentValues b = createBookmark("Folder", null, mMobileFolderId,
                         mBookmarksTypeFolder, 0, "folderTags", "folderDescription", "folderKeyword");
 
                 long parentId = ContentUris.parseId(mProvider.insert(mBookmarksUri, b));
                 c = getBookmarkById(parentId);
                 mAsserter.is(c.moveToFirst(), true, "Inserted bookmarks folder found");
 
                 b = createBookmark("Example", "http://example.com", parentId,