Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1747)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/provider/ProviderSearchesUriTest.java

Issue 2876273004: Convert Provider tests to JUnit4 (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/provider/ProviderBookmarksUriTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/provider/ProviderTestBase.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/javatests/src/org/chromium/chrome/browser/provider/ProviderSearchesUriTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/provider/ProviderSearchesUriTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/provider/ProviderSearchesUriTest.java
index a69fbd82a55ede0696ac2074681ccb090848f1c8..47daa43b460ca55b2e957e155bc94436d0cdac42 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/provider/ProviderSearchesUriTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/provider/ProviderSearchesUriTest.java
@@ -9,38 +9,55 @@ import android.database.Cursor;
import android.net.Uri;
import android.support.test.filters.MediumTest;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.Feature;
import org.chromium.base.test.util.RetryOnFailure;
+import org.chromium.chrome.browser.ChromeSwitches;
+import org.chromium.chrome.test.ChromeActivityTestRule;
+import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import java.util.Date;
/**
* Tests the use of the Searches URI as part of the Android provider public API.
*/
-public class ProviderSearchesUriTest extends ProviderTestBase {
+@RunWith(ChromeJUnit4ClassRunner.class)
+@CommandLineFlags.Add({
+ ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE,
+ ChromeActivityTestRule.DISABLE_NETWORK_PREDICTION_FLAG,
+})
+public class ProviderSearchesUriTest {
+ @Rule
+ public ProviderTestRule mProviderTestRule = new ProviderTestRule();
private Uri mSearchesUri;
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- mSearchesUri = ChromeBrowserProvider.getSearchesApiUri(getActivity());
- getContentResolver().delete(mSearchesUri, null, null);
+ @Before
+ public void setUp() throws Exception {
+ mSearchesUri = ChromeBrowserProvider.getSearchesApiUri(mProviderTestRule.getActivity());
+ mProviderTestRule.getContentResolver().delete(mSearchesUri, null, null);
}
- @Override
- protected void tearDown() throws Exception {
- getContentResolver().delete(mSearchesUri, null, null);
- super.tearDown();
+ @After
+ public void tearDown() throws Exception {
+ mProviderTestRule.getContentResolver().delete(mSearchesUri, null, null);
}
private Uri addSearchTerm(String searchTerm, long searchTime) {
ContentValues values = new ContentValues();
values.put(SearchColumns.SEARCH, searchTerm);
values.put(SearchColumns.DATE, searchTime);
- return getContentResolver().insert(mSearchesUri, values);
+ return mProviderTestRule.getContentResolver().insert(mSearchesUri, values);
}
+ @Test
@MediumTest
@Feature({"Android-ContentProvider"})
@RetryOnFailure
@@ -48,21 +65,23 @@ public class ProviderSearchesUriTest extends ProviderTestBase {
long searchTime = System.currentTimeMillis();
String searchTerm = "chrome";
Uri uri = addSearchTerm(searchTerm, searchTime);
- assertNotNull(uri);
+ Assert.assertNotNull(uri);
String[] selectionArgs = { searchTerm, String.valueOf(searchTime) };
- Cursor cursor = getContentResolver().query(uri, null, SearchColumns.SEARCH + "=? AND "
- + SearchColumns.DATE + " = ? ", selectionArgs, null);
- assertNotNull(cursor);
- assertEquals(1, cursor.getCount());
- assertTrue(cursor.moveToNext());
+ Cursor cursor = mProviderTestRule.getContentResolver().query(uri, null,
+ SearchColumns.SEARCH + "=? AND " + SearchColumns.DATE + " = ? ", selectionArgs,
+ null);
+ Assert.assertNotNull(cursor);
+ Assert.assertEquals(1, cursor.getCount());
+ Assert.assertTrue(cursor.moveToNext());
int index = cursor.getColumnIndex(SearchColumns.SEARCH);
- assertTrue(-1 != index);
- assertEquals(searchTerm, cursor.getString(index));
+ Assert.assertTrue(-1 != index);
+ Assert.assertEquals(searchTerm, cursor.getString(index));
index = cursor.getColumnIndex(SearchColumns.DATE);
- assertTrue(-1 != index);
- assertEquals(searchTime, cursor.getLong(index));
+ Assert.assertTrue(-1 != index);
+ Assert.assertEquals(searchTime, cursor.getLong(index));
}
+ @Test
@MediumTest
@Feature({"Android-ContentProvider"})
public void testUpdateSearchTerm() {
@@ -72,26 +91,27 @@ public class ProviderSearchesUriTest extends ProviderTestBase {
ContentValues values = new ContentValues();
values.put(SearchColumns.SEARCH, searchTerm[1]);
values.put(SearchColumns.DATE, searchTime[1]);
- getContentResolver().update(uri, values, null, null);
+ mProviderTestRule.getContentResolver().update(uri, values, null, null);
String[] selectionArgs = { searchTerm[0] };
- Cursor cursor = getContentResolver().query(mSearchesUri, null, SearchColumns.SEARCH + "=?",
- selectionArgs, null);
- assertNotNull(cursor);
- assertEquals(0, cursor.getCount());
+ Cursor cursor = mProviderTestRule.getContentResolver().query(
+ mSearchesUri, null, SearchColumns.SEARCH + "=?", selectionArgs, null);
+ Assert.assertNotNull(cursor);
+ Assert.assertEquals(0, cursor.getCount());
String[] selectionArgs1 = { searchTerm[1] };
- cursor = getContentResolver().query(mSearchesUri, null, SearchColumns.SEARCH + "=?",
- selectionArgs1, null);
- assertNotNull(cursor);
- assertEquals(1, cursor.getCount());
- assertTrue(cursor.moveToNext());
+ cursor = mProviderTestRule.getContentResolver().query(
+ mSearchesUri, null, SearchColumns.SEARCH + "=?", selectionArgs1, null);
+ Assert.assertNotNull(cursor);
+ Assert.assertEquals(1, cursor.getCount());
+ Assert.assertTrue(cursor.moveToNext());
int index = cursor.getColumnIndex(SearchColumns.SEARCH);
- assertTrue(-1 != index);
- assertEquals(searchTerm[1], cursor.getString(index));
+ Assert.assertTrue(-1 != index);
+ Assert.assertEquals(searchTerm[1], cursor.getString(index));
index = cursor.getColumnIndex(SearchColumns.DATE);
- assertTrue(-1 != index);
- assertEquals(searchTime[1], cursor.getLong(index));
+ Assert.assertTrue(-1 != index);
+ Assert.assertEquals(searchTime[1], cursor.getLong(index));
}
+ @Test
@MediumTest
@Feature({"Android-ContentProvider"})
@RetryOnFailure
@@ -102,31 +122,32 @@ public class ProviderSearchesUriTest extends ProviderTestBase {
for (int i = 0; i < uri.length; i++) {
uri[i] = addSearchTerm(searchTerm[i], searchTime[i]);
}
- getContentResolver().delete(uri[0], null, null);
+ mProviderTestRule.getContentResolver().delete(uri[0], null, null);
String[] selectionArgs = { searchTerm[0] };
- Cursor cursor = getContentResolver().query(mSearchesUri, null, SearchColumns.SEARCH + "=?",
- selectionArgs, null);
- assertNotNull(cursor);
- assertEquals(0, cursor.getCount());
+ Cursor cursor = mProviderTestRule.getContentResolver().query(
+ mSearchesUri, null, SearchColumns.SEARCH + "=?", selectionArgs, null);
+ Assert.assertNotNull(cursor);
+ Assert.assertEquals(0, cursor.getCount());
String[] selectionArgs1 = { searchTerm[1] };
- cursor = getContentResolver().query(mSearchesUri, null, SearchColumns.SEARCH + "=?",
- selectionArgs1, null);
- assertNotNull(cursor);
- assertEquals(1, cursor.getCount());
- assertTrue(cursor.moveToNext());
+ cursor = mProviderTestRule.getContentResolver().query(
+ mSearchesUri, null, SearchColumns.SEARCH + "=?", selectionArgs1, null);
+ Assert.assertNotNull(cursor);
+ Assert.assertEquals(1, cursor.getCount());
+ Assert.assertTrue(cursor.moveToNext());
int index = cursor.getColumnIndex(SearchColumns.SEARCH);
- assertTrue(-1 != index);
- assertEquals(searchTerm[1], cursor.getString(index));
+ Assert.assertTrue(-1 != index);
+ Assert.assertEquals(searchTerm[1], cursor.getString(index));
index = cursor.getColumnIndex(SearchColumns.DATE);
- assertTrue(-1 != index);
- assertEquals(searchTime[1], cursor.getLong(index));
- getContentResolver().delete(uri[1], null, null);
- cursor = getContentResolver().query(uri[1], null, null, null, null);
- assertNotNull(cursor);
- assertEquals(0, cursor.getCount());
+ Assert.assertTrue(-1 != index);
+ Assert.assertEquals(searchTime[1], cursor.getLong(index));
+ mProviderTestRule.getContentResolver().delete(uri[1], null, null);
+ cursor = mProviderTestRule.getContentResolver().query(uri[1], null, null, null, null);
+ Assert.assertNotNull(cursor);
+ Assert.assertEquals(0, cursor.getCount());
}
// Copied from CTS test with minor adaptations.
+ @Test
@MediumTest
@Feature({"Android-ContentProvider"})
@RetryOnFailure
@@ -141,15 +162,15 @@ public class ProviderSearchesUriTest extends ProviderTestBase {
value.put(SearchColumns.SEARCH, insertSearch);
value.put(SearchColumns.DATE, createDate);
- Uri insertUri = getContentResolver().insert(mSearchesUri, value);
- Cursor cursor = getContentResolver().query(mSearchesUri,
+ Uri insertUri = mProviderTestRule.getContentResolver().insert(mSearchesUri, value);
+ Cursor cursor = mProviderTestRule.getContentResolver().query(mSearchesUri,
ChromeBrowserProvider.SEARCHES_PROJECTION, SearchColumns.SEARCH + " = ?",
- new String[] { insertSearch }, null);
- assertTrue(cursor.moveToNext());
- assertEquals(insertSearch,
+ new String[] {insertSearch}, null);
+ Assert.assertTrue(cursor.moveToNext());
+ Assert.assertEquals(insertSearch,
cursor.getString(ChromeBrowserProvider.SEARCHES_PROJECTION_SEARCH_INDEX));
- assertEquals(createDate,
- cursor.getLong(ChromeBrowserProvider.SEARCHES_PROJECTION_DATE_INDEX));
+ Assert.assertEquals(
+ createDate, cursor.getLong(ChromeBrowserProvider.SEARCHES_PROJECTION_DATE_INDEX));
int id = cursor.getInt(idIndex);
cursor.close();
@@ -159,23 +180,23 @@ public class ProviderSearchesUriTest extends ProviderTestBase {
value.put(SearchColumns.SEARCH, updateSearch);
value.put(SearchColumns.DATE, updateDate);
- getContentResolver().update(mSearchesUri, value,
- SearchColumns.ID + " = " + id, null);
- cursor = getContentResolver().query(mSearchesUri,
- ChromeBrowserProvider.SEARCHES_PROJECTION,
- SearchColumns.ID + " = " + id, null, null);
- assertTrue(cursor.moveToNext());
- assertEquals(updateSearch,
+ mProviderTestRule.getContentResolver().update(
+ mSearchesUri, value, SearchColumns.ID + " = " + id, null);
+ cursor = mProviderTestRule.getContentResolver().query(mSearchesUri,
+ ChromeBrowserProvider.SEARCHES_PROJECTION, SearchColumns.ID + " = " + id, null,
+ null);
+ Assert.assertTrue(cursor.moveToNext());
+ Assert.assertEquals(updateSearch,
cursor.getString(ChromeBrowserProvider.SEARCHES_PROJECTION_SEARCH_INDEX));
- assertEquals(updateDate,
- cursor.getLong(ChromeBrowserProvider.SEARCHES_PROJECTION_DATE_INDEX));
- assertEquals(id, cursor.getInt(idIndex));
+ Assert.assertEquals(
+ updateDate, cursor.getLong(ChromeBrowserProvider.SEARCHES_PROJECTION_DATE_INDEX));
+ Assert.assertEquals(id, cursor.getInt(idIndex));
// Test: delete
- getContentResolver().delete(insertUri, null, null);
- cursor = getContentResolver().query(mSearchesUri,
- ChromeBrowserProvider.SEARCHES_PROJECTION,
- SearchColumns.ID + " = " + id, null, null);
- assertEquals(0, cursor.getCount());
+ mProviderTestRule.getContentResolver().delete(insertUri, null, null);
+ cursor = mProviderTestRule.getContentResolver().query(mSearchesUri,
+ ChromeBrowserProvider.SEARCHES_PROJECTION, SearchColumns.ID + " = " + id, null,
+ null);
+ Assert.assertEquals(0, cursor.getCount());
}
}
« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/provider/ProviderBookmarksUriTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/provider/ProviderTestBase.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698