diff options
author | Ruslan Abdikeev <aruslan@google.com> | 2012-05-18 12:44:44 -0700 |
---|---|---|
committer | Ruslan Abdikeev <aruslan@google.com> | 2012-05-18 13:03:20 -0700 |
commit | 96d0a80af45923767baf449fc8c735c2f71d64ae (patch) | |
tree | c0599853682ce578034746b130b9924b502af6e8 | |
parent | 60c131771453fcb65e03ae77f8a378bfa48e6498 (diff) | |
download | android_packages_providers_PartnerBookmarksProvider-stable/cm-12.0-YNG1I.tar.gz android_packages_providers_PartnerBookmarksProvider-stable/cm-12.0-YNG1I.tar.bz2 android_packages_providers_PartnerBookmarksProvider-stable/cm-12.0-YNG1I.zip |
Fixes for the PartnerBookmarksProvider test.HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001cm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eacm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56cm-10.2.1cm-10.2.0cm-10.2-M1cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2cm-10.1-M1staging/cm-14.1-cafrebasestaging/cm-14.0staging/cm-12.1staging/cm-12.0-cafstable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kstable/cm-13.0-ZNH0Estable/cm-12.1-YOG7Dstable/cm-12.1-YOG4Pstable/cm-12.1-YOG3Cstable/cm-12.0-YNG4Nstable/cm-12.0-YNG3Cstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1Istable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0stable/cm-10.2shipping/cm-11.0jellybean-stablejellybeancm-14.1_prerebasecm-14.1cm-14.0cm-13.0cm-12.1cm-12.0cm-11.0cm-10.2cm-10.1
Cherry-pick: I79b89d12a99840da8849f056f6e14be4133f02f1
Two resource leaks removed; provider cursor iteration fixed.
Change-Id: I19e29d4db96fbdd33b4b630a042b6551ece0b277
-rw-r--r-- | tests/src/com/android/providers/partnerbookmarks/PartnerBookmarksProviderTest.java | 74 |
1 files changed, 35 insertions, 39 deletions
diff --git a/tests/src/com/android/providers/partnerbookmarks/PartnerBookmarksProviderTest.java b/tests/src/com/android/providers/partnerbookmarks/PartnerBookmarksProviderTest.java index 9014d14..57f61e4 100644 --- a/tests/src/com/android/providers/partnerbookmarks/PartnerBookmarksProviderTest.java +++ b/tests/src/com/android/providers/partnerbookmarks/PartnerBookmarksProviderTest.java @@ -18,61 +18,57 @@ package com.android.providers.partnerbookmarks; import android.content.ContentProviderClient; import android.database.Cursor; -import android.test.InstrumentationTestCase; -import android.test.mock.MockContext; -import android.test.suitebuilder.annotation.MediumTest; +import android.test.AndroidTestCase; import android.test.suitebuilder.annotation.SmallTest; -import android.text.TextUtils; import android.util.Log; -import java.util.Arrays; - import junit.framework.TestCase; -public class PartnerBookmarksProviderTest extends InstrumentationTestCase { +public class PartnerBookmarksProviderTest extends AndroidTestCase { private static final String TAG = "PartnerBookmarksProviderTest"; private static final long FIXED_ID_PARTNER_BOOKMARKS_ROOT = PartnerBookmarksContract.Bookmarks.BOOKMARK_PARENT_ROOT_ID + 1; private static final long NO_FOLDER_FILTER = -1; - @Override - public void setUp() { - } - - @Override - public void tearDown() { - } - private int countBookmarksInFolder(long folderFilter) throws android.os.RemoteException { ContentProviderClient providerClient = - getInstrumentation().getTargetContext(). - getContentResolver().acquireContentProviderClient( - PartnerBookmarksContract.Bookmarks.CONTENT_URI); + getContext().getContentResolver().acquireContentProviderClient( + PartnerBookmarksContract.Bookmarks.CONTENT_URI); assertNotNull( "Failed to acquire " + PartnerBookmarksContract.Bookmarks.CONTENT_URI, providerClient); - Cursor cursor = providerClient.query(PartnerBookmarksContract.Bookmarks.CONTENT_URI, - null, null, null, null); - assertNotNull("Failed to query for bookmarks", cursor); - int bookmarksCount = 0; - while (!cursor.isLast() && !cursor.isAfterLast()) { - cursor.moveToNext(); - long id = cursor.getLong( - cursor.getColumnIndexOrThrow(PartnerBookmarksContract.Bookmarks.ID)); - long parent = cursor.getLong( - cursor.getColumnIndexOrThrow(PartnerBookmarksContract.Bookmarks.PARENT)); - if (folderFilter != NO_FOLDER_FILTER && folderFilter != parent) - continue; - boolean isFolder = cursor.getInt( - cursor.getColumnIndexOrThrow(PartnerBookmarksContract.Bookmarks.TYPE)) - == PartnerBookmarksContract.Bookmarks.BOOKMARK_TYPE_FOLDER; - String url = cursor.getString( - cursor.getColumnIndexOrThrow(PartnerBookmarksContract.Bookmarks.URL)); - String title = cursor.getString( - cursor.getColumnIndexOrThrow(PartnerBookmarksContract.Bookmarks.TITLE)); - bookmarksCount++; + Cursor cursor = null; + try { + cursor = providerClient.query(PartnerBookmarksContract.Bookmarks.CONTENT_URI, + null, null, null, null); + assertNotNull("Failed to query for bookmarks", cursor); + int bookmarksCount = 0; + while (cursor.moveToNext()) { + long id = cursor.getLong( + cursor.getColumnIndexOrThrow(PartnerBookmarksContract.Bookmarks.ID)); + long parent = cursor.getLong( + cursor.getColumnIndexOrThrow(PartnerBookmarksContract.Bookmarks.PARENT)); + boolean isFolder = cursor.getInt( + cursor.getColumnIndexOrThrow(PartnerBookmarksContract.Bookmarks.TYPE)) + == PartnerBookmarksContract.Bookmarks.BOOKMARK_TYPE_FOLDER; + String url = cursor.getString( + cursor.getColumnIndexOrThrow(PartnerBookmarksContract.Bookmarks.URL)); + String title = cursor.getString( + cursor.getColumnIndexOrThrow(PartnerBookmarksContract.Bookmarks.TITLE)); + assertFalse("bookmark id must be non-zero", id == 0); + assertFalse("url should not be empty if not a folder", !isFolder && url.isEmpty()); + assertFalse("title should never be empty", title.isEmpty()); + if (folderFilter == NO_FOLDER_FILTER || folderFilter == parent) { + bookmarksCount++; + } + } + return bookmarksCount; + } finally { + if (cursor != null) { + cursor.close(); + } + providerClient.release(); } - return bookmarksCount; } @SmallTest |