--- a/mobile/android/base/java/org/mozilla/gecko/db/BrowserContract.java
+++ b/mobile/android/base/java/org/mozilla/gecko/db/BrowserContract.java
@@ -481,18 +481,18 @@ public class BrowserContract {
@RobocopTarget
public static final class SuggestedSites implements CommonColumns, URLColumns {
private SuggestedSites() {}
public static final Uri CONTENT_URI = Uri.withAppendedPath(AUTHORITY_URI, "suggestedsites");
}
@RobocopTarget
- public static final class UrlAnnotations implements CommonColumns, DateSyncColumns {
- private UrlAnnotations() {}
+ public static final class URLAnnotations implements CommonColumns, DateSyncColumns {
+ private URLAnnotations() {}
public static final String TABLE_NAME = "urlannotations";
public static final Uri CONTENT_URI = Uri.withAppendedPath(AUTHORITY_URI, TABLE_NAME);
public static final String URL = "url";
public static final String KEY = "key";
public static final String VALUE = "value";
public static final String SYNC_STATUS = "sync_status";
--- a/mobile/android/base/java/org/mozilla/gecko/db/BrowserDB.java
+++ b/mobile/android/base/java/org/mozilla/gecko/db/BrowserDB.java
@@ -39,17 +39,18 @@ public interface BrowserDB {
public static enum FilterFlags {
EXCLUDE_PINNED_SITES
}
public abstract Searches getSearches();
public abstract TabsAccessor getTabsAccessor();
public abstract URLMetadata getURLMetadata();
public abstract ReadingListAccessor getReadingListAccessor();
- @RobocopTarget UrlAnnotations getUrlAnnotations();
+ @RobocopTarget
+ URLAnnotations getURLAnnotations();
/**
* Add default bookmarks to the database.
* Takes an offset; returns a new offset.
*/
public abstract int addDefaultBookmarks(Context context, ContentResolver cr, int offset);
/**
--- a/mobile/android/base/java/org/mozilla/gecko/db/BrowserDatabaseHelper.java
+++ b/mobile/android/base/java/org/mozilla/gecko/db/BrowserDatabaseHelper.java
@@ -13,17 +13,17 @@ import org.mozilla.gecko.GeckoProfile;
import org.mozilla.gecko.R;
import org.mozilla.gecko.db.BrowserContract.Bookmarks;
import org.mozilla.gecko.db.BrowserContract.Combined;
import org.mozilla.gecko.db.BrowserContract.Favicons;
import org.mozilla.gecko.db.BrowserContract.History;
import org.mozilla.gecko.db.BrowserContract.ReadingListItems;
import org.mozilla.gecko.db.BrowserContract.SearchHistory;
import org.mozilla.gecko.db.BrowserContract.Thumbnails;
-import org.mozilla.gecko.db.BrowserContract.UrlAnnotations;
+import org.mozilla.gecko.db.BrowserContract.URLAnnotations;
import org.mozilla.gecko.util.FileUtils;
import static org.mozilla.gecko.db.DBUtils.qualifyColumn;
import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;
import android.database.DatabaseUtils;
@@ -354,17 +354,17 @@ public final class BrowserDatabaseHelper
createOrUpdateSpecialFolder(db, Bookmarks.PLACES_FOLDER_GUID,
R.string.bookmarks_folder_places, 0);
createOrUpdateAllSpecialFolders(db);
createSearchHistoryTable(db);
createReadingListTable(db, TABLE_READING_LIST);
didCreateCurrentReadingListTable = true; // Mostly correct, in the absence of transactions.
createReadingListIndices(db, TABLE_READING_LIST);
- createUrlAnnotationsTable(db);
+ createURLAnnotationsTable(db);
}
/**
* Copies the tabs and clients tables out of the given tabs.db file and into the destinationDB.
*
* @param tabsDBFile Path to existing tabs.db.
* @param destinationDB The destination database.
*/
@@ -452,31 +452,31 @@ public final class BrowserDatabaseHelper
private void createReadingListIndices(final SQLiteDatabase db, final String tableName) {
// No need to create an index on GUID; it's a UNIQUE column.
db.execSQL("CREATE INDEX reading_list_url ON " + tableName + "("
+ ReadingListItems.URL + ")");
db.execSQL("CREATE INDEX reading_list_content_status ON " + tableName + "("
+ ReadingListItems.CONTENT_STATUS + ")");
}
- private void createUrlAnnotationsTable(final SQLiteDatabase db) {
- debug("Creating " + UrlAnnotations.TABLE_NAME + " table");
+ private void createURLAnnotationsTable(final SQLiteDatabase db) {
+ debug("Creating " + URLAnnotations.TABLE_NAME + " table");
- db.execSQL("CREATE TABLE " + UrlAnnotations.TABLE_NAME + "(" +
- UrlAnnotations._ID + " INTEGER PRIMARY KEY AUTOINCREMENT, " +
- UrlAnnotations.URL + " TEXT NOT NULL, " +
- UrlAnnotations.KEY + " TEXT NOT NULL, " +
- UrlAnnotations.VALUE + " TEXT, " +
- UrlAnnotations.DATE_CREATED + " INTEGER NOT NULL, " +
- UrlAnnotations.DATE_MODIFIED + " INTEGER NOT NULL, " +
- UrlAnnotations.SYNC_STATUS + " TINYINT NOT NULL DEFAULT " + UrlAnnotations.SyncStatus.NEW.getDBValue() +
+ db.execSQL("CREATE TABLE " + URLAnnotations.TABLE_NAME + "(" +
+ URLAnnotations._ID + " INTEGER PRIMARY KEY AUTOINCREMENT, " +
+ URLAnnotations.URL + " TEXT NOT NULL, " +
+ URLAnnotations.KEY + " TEXT NOT NULL, " +
+ URLAnnotations.VALUE + " TEXT, " +
+ URLAnnotations.DATE_CREATED + " INTEGER NOT NULL, " +
+ URLAnnotations.DATE_MODIFIED + " INTEGER NOT NULL, " +
+ URLAnnotations.SYNC_STATUS + " TINYINT NOT NULL DEFAULT " + URLAnnotations.SyncStatus.NEW.getDBValue() +
" );");
db.execSQL("CREATE INDEX idx_url_annotations_url_key ON " +
- UrlAnnotations.TABLE_NAME + "(" + UrlAnnotations.URL + ", " + UrlAnnotations.KEY + ")");
+ URLAnnotations.TABLE_NAME + "(" + URLAnnotations.URL + ", " + URLAnnotations.KEY + ")");
}
private void createOrUpdateAllSpecialFolders(SQLiteDatabase db) {
createOrUpdateSpecialFolder(db, Bookmarks.MOBILE_FOLDER_GUID,
R.string.bookmarks_folder_mobile, 0);
createOrUpdateSpecialFolder(db, Bookmarks.TOOLBAR_FOLDER_GUID,
R.string.bookmarks_folder_toolbar, 1);
createOrUpdateSpecialFolder(db, Bookmarks.MENU_FOLDER_GUID,
@@ -1048,17 +1048,17 @@ public final class BrowserDatabaseHelper
debug("Dropping unnecessary indices");
db.execSQL("DROP INDEX IF EXISTS clients_guid_index");
db.execSQL("DROP INDEX IF EXISTS thumbnails_url_index");
db.execSQL("DROP INDEX IF EXISTS favicons_url_index");
}
private void upgradeDatabaseFrom27to28(final SQLiteDatabase db) {
debug("Adding url annotations table");
- createUrlAnnotationsTable(db);
+ createURLAnnotationsTable(db);
}
private void createV19CombinedView(SQLiteDatabase db) {
db.execSQL("DROP VIEW IF EXISTS " + VIEW_COMBINED);
db.execSQL("DROP VIEW IF EXISTS " + VIEW_COMBINED_WITH_FAVICONS);
createCombinedViewOn19(db);
}
--- a/mobile/android/base/java/org/mozilla/gecko/db/BrowserProvider.java
+++ b/mobile/android/base/java/org/mozilla/gecko/db/BrowserProvider.java
@@ -13,17 +13,17 @@ import java.util.Map;
import org.mozilla.gecko.db.BrowserContract.Bookmarks;
import org.mozilla.gecko.db.BrowserContract.Combined;
import org.mozilla.gecko.db.BrowserContract.FaviconColumns;
import org.mozilla.gecko.db.BrowserContract.Favicons;
import org.mozilla.gecko.db.BrowserContract.History;
import org.mozilla.gecko.db.BrowserContract.Schema;
import org.mozilla.gecko.db.BrowserContract.Tabs;
import org.mozilla.gecko.db.BrowserContract.Thumbnails;
-import org.mozilla.gecko.db.BrowserContract.UrlAnnotations;
+import org.mozilla.gecko.db.BrowserContract.URLAnnotations;
import org.mozilla.gecko.db.DBUtils.UpdateOperation;
import org.mozilla.gecko.sync.Utils;
import android.content.ContentProviderOperation;
import android.content.ContentProviderResult;
import android.content.ContentUris;
import android.content.ContentValues;
import android.content.OperationApplicationException;
@@ -56,17 +56,17 @@ public class BrowserProvider extends Sha
// Minimum number of thumbnails to keep around.
static final int DEFAULT_EXPIRY_THUMBNAIL_COUNT = 15;
static final String TABLE_BOOKMARKS = Bookmarks.TABLE_NAME;
static final String TABLE_HISTORY = History.TABLE_NAME;
static final String TABLE_FAVICONS = Favicons.TABLE_NAME;
static final String TABLE_THUMBNAILS = Thumbnails.TABLE_NAME;
static final String TABLE_TABS = Tabs.TABLE_NAME;
- static final String TABLE_URL_ANNOTATIONS = UrlAnnotations.TABLE_NAME;
+ static final String TABLE_URL_ANNOTATIONS = URLAnnotations.TABLE_NAME;
static final String VIEW_COMBINED = Combined.VIEW_NAME;
static final String VIEW_BOOKMARKS_WITH_FAVICONS = Bookmarks.VIEW_WITH_FAVICONS;
static final String VIEW_HISTORY_WITH_FAVICONS = History.VIEW_WITH_FAVICONS;
static final String VIEW_COMBINED_WITH_FAVICONS = Combined.VIEW_WITH_FAVICONS;
// Bookmark matches
static final int BOOKMARKS = 100;
@@ -194,23 +194,23 @@ public class BrowserProvider extends Sha
map.put(Thumbnails.URL, Thumbnails.URL);
map.put(Thumbnails.DATA, Thumbnails.DATA);
THUMBNAILS_PROJECTION_MAP = Collections.unmodifiableMap(map);
// Url annotations
URI_MATCHER.addURI(BrowserContract.AUTHORITY, TABLE_URL_ANNOTATIONS, URL_ANNOTATIONS);
map = new HashMap<>();
- map.put(UrlAnnotations._ID, UrlAnnotations._ID);
- map.put(UrlAnnotations.URL, UrlAnnotations.URL);
- map.put(UrlAnnotations.KEY, UrlAnnotations.KEY);
- map.put(UrlAnnotations.VALUE, UrlAnnotations.VALUE);
- map.put(UrlAnnotations.DATE_CREATED, UrlAnnotations.DATE_CREATED);
- map.put(UrlAnnotations.DATE_MODIFIED, UrlAnnotations.DATE_MODIFIED);
- map.put(UrlAnnotations.SYNC_STATUS, UrlAnnotations.SYNC_STATUS);
+ map.put(URLAnnotations._ID, URLAnnotations._ID);
+ map.put(URLAnnotations.URL, URLAnnotations.URL);
+ map.put(URLAnnotations.KEY, URLAnnotations.KEY);
+ map.put(URLAnnotations.VALUE, URLAnnotations.VALUE);
+ map.put(URLAnnotations.DATE_CREATED, URLAnnotations.DATE_CREATED);
+ map.put(URLAnnotations.DATE_MODIFIED, URLAnnotations.DATE_MODIFIED);
+ map.put(URLAnnotations.SYNC_STATUS, URLAnnotations.SYNC_STATUS);
URL_ANNOTATIONS_PROJECTION_MAP = Collections.unmodifiableMap(map);
// Combined bookmarks and history
URI_MATCHER.addURI(BrowserContract.AUTHORITY, "combined", COMBINED);
map = new HashMap<String, String>();
map.put(Combined._ID, Combined._ID);
map.put(Combined.BOOKMARK_ID, Combined.BOOKMARK_ID);
@@ -1215,17 +1215,17 @@ public class BrowserProvider extends Sha
DBUtils.stripEmptyByteArray(values, Thumbnails.DATA);
final SQLiteDatabase db = getWritableDatabase(uri);
beginWrite(db);
return db.insertOrThrow(TABLE_THUMBNAILS, null, values);
}
private long insertUrlAnnotation(final Uri uri, final ContentValues values) {
- final String url = values.getAsString(UrlAnnotations.URL);
+ final String url = values.getAsString(URLAnnotations.URL);
trace("Inserting url annotations for URL: " + url);
final SQLiteDatabase db = getWritableDatabase(uri);
beginWrite(db);
return db.insertOrThrow(TABLE_URL_ANNOTATIONS, null, values);
}
private int updateOrInsertThumbnail(Uri uri, ContentValues values, String selection,
--- a/mobile/android/base/java/org/mozilla/gecko/db/LocalBrowserDB.java
+++ b/mobile/android/base/java/org/mozilla/gecko/db/LocalBrowserDB.java
@@ -96,17 +96,17 @@ public class LocalBrowserDB implements B
private final Uri mFaviconsUriWithProfile;
private final Uri mThumbnailsUriWithProfile;
private final Uri mSearchHistoryUri;
private LocalSearches searches;
private LocalTabsAccessor tabsAccessor;
private LocalURLMetadata urlMetadata;
private LocalReadingListAccessor readingListAccessor;
- private LocalUrlAnnotations urlAnnotations;
+ private LocalURLAnnotations urlAnnotations;
private static final String[] DEFAULT_BOOKMARK_COLUMNS =
new String[] { Bookmarks._ID,
Bookmarks.GUID,
Bookmarks.URL,
Bookmarks.TITLE,
Bookmarks.TYPE,
Bookmarks.PARENT };
@@ -130,17 +130,17 @@ public class LocalBrowserDB implements B
.appendQueryParameter(BrowserContract.PARAM_INCREMENT_VISITS, "true")
.appendQueryParameter(BrowserContract.PARAM_INSERT_IF_NEEDED, "true")
.build();
searches = new LocalSearches(mProfile);
tabsAccessor = new LocalTabsAccessor(mProfile);
urlMetadata = new LocalURLMetadata(mProfile);
readingListAccessor = new LocalReadingListAccessor(mProfile);
- urlAnnotations = new LocalUrlAnnotations(mProfile);
+ urlAnnotations = new LocalURLAnnotations(mProfile);
}
@Override
public Searches getSearches() {
return searches;
}
@Override
@@ -155,17 +155,17 @@ public class LocalBrowserDB implements B
@Override
public ReadingListAccessor getReadingListAccessor() {
return readingListAccessor;
}
@RobocopTarget
@Override
- public UrlAnnotations getUrlAnnotations() {
+ public URLAnnotations getURLAnnotations() {
return urlAnnotations;
}
/**
* Not thread safe. A helper to allocate new IDs for arbitrary strings.
*/
private static class NameCounter {
private final HashMap<String, Integer> names = new HashMap<String, Integer>();
--- a/mobile/android/base/java/org/mozilla/gecko/db/LocalUrlAnnotations.java
+++ b/mobile/android/base/java/org/mozilla/gecko/db/LocalUrlAnnotations.java
@@ -4,28 +4,28 @@
package org.mozilla.gecko.db;
import android.content.ContentResolver;
import android.content.ContentValues;
import android.net.Uri;
import org.mozilla.gecko.annotation.RobocopTarget;
-public class LocalUrlAnnotations implements UrlAnnotations {
+public class LocalURLAnnotations implements URLAnnotations {
private Uri urlAnnotationsTableWithProfile;
- public LocalUrlAnnotations(final String profile) {
- urlAnnotationsTableWithProfile = DBUtils.appendProfile(profile, BrowserContract.UrlAnnotations.CONTENT_URI);
+ public LocalURLAnnotations(final String profile) {
+ urlAnnotationsTableWithProfile = DBUtils.appendProfile(profile, BrowserContract.URLAnnotations.CONTENT_URI);
}
@RobocopTarget
@Override
public void insertAnnotation(final ContentResolver cr, final String url, final String key, final String value) {
final long creationTime = System.currentTimeMillis();
final ContentValues values = new ContentValues(5);
- values.put(BrowserContract.UrlAnnotations.URL, url);
- values.put(BrowserContract.UrlAnnotations.KEY, key);
- values.put(BrowserContract.UrlAnnotations.VALUE, value);
- values.put(BrowserContract.UrlAnnotations.DATE_CREATED, creationTime);
- values.put(BrowserContract.UrlAnnotations.DATE_MODIFIED, creationTime);
+ values.put(BrowserContract.URLAnnotations.URL, url);
+ values.put(BrowserContract.URLAnnotations.KEY, key);
+ values.put(BrowserContract.URLAnnotations.VALUE, value);
+ values.put(BrowserContract.URLAnnotations.DATE_CREATED, creationTime);
+ values.put(BrowserContract.URLAnnotations.DATE_MODIFIED, creationTime);
cr.insert(urlAnnotationsTableWithProfile, values);
}
}
--- a/mobile/android/base/java/org/mozilla/gecko/db/StubBrowserDB.java
+++ b/mobile/android/base/java/org/mozilla/gecko/db/StubBrowserDB.java
@@ -145,31 +145,31 @@ class StubTabsAccessor implements TabsAc
}
public void getTabs(final Context context, final int limit, final OnQueryTabsCompleteListener listener) {
listener.onQueryTabsComplete(new ArrayList<RemoteClient>());
}
public synchronized void persistLocalTabs(final ContentResolver cr, final Iterable<Tab> tabs) { }
}
-class StubUrlAnnotations implements UrlAnnotations {
+class StubURLAnnotations implements URLAnnotations {
@Override
public void insertAnnotation(ContentResolver cr, String url, String key, String value) {}
}
/*
* This base implementation just stubs all methods. For the
* real implementations, see LocalBrowserDB.java.
*/
public class StubBrowserDB implements BrowserDB {
private final StubSearches searches = new StubSearches();
private final StubTabsAccessor tabsAccessor = new StubTabsAccessor();
private final StubURLMetadata urlMetadata = new StubURLMetadata();
private final StubReadingListAccessor readingListAccessor = new StubReadingListAccessor();
- private final StubUrlAnnotations urlAnnotations = new StubUrlAnnotations();
+ private final StubURLAnnotations urlAnnotations = new StubURLAnnotations();
@Override
public Searches getSearches() {
return searches;
}
@Override
public TabsAccessor getTabsAccessor() {
@@ -182,17 +182,17 @@ public class StubBrowserDB implements Br
}
@Override
public ReadingListAccessor getReadingListAccessor() {
return readingListAccessor;
}
@Override
- public UrlAnnotations getUrlAnnotations() {
+ public URLAnnotations getURLAnnotations() {
return urlAnnotations;
}
protected static final Integer FAVICON_ID_NOT_FOUND = Integer.MIN_VALUE;
public StubBrowserDB(String profile) {
}
--- a/mobile/android/base/java/org/mozilla/gecko/db/UrlAnnotations.java
+++ b/mobile/android/base/java/org/mozilla/gecko/db/UrlAnnotations.java
@@ -2,11 +2,11 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.gecko.db;
import android.content.ContentResolver;
import org.mozilla.gecko.annotation.RobocopTarget;
-public interface UrlAnnotations {
+public interface URLAnnotations {
@RobocopTarget void insertAnnotation(ContentResolver cr, String url, String key, String value);
}
--- a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testBrowserProvider.java
+++ b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/testBrowserProvider.java
@@ -2,19 +2,18 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.gecko.tests;
import java.util.ArrayList;
import java.util.Random;
-import org.mozilla.gecko.background.db.CursorDumper;
import org.mozilla.gecko.db.BrowserContract;
-import org.mozilla.gecko.db.BrowserContract.UrlAnnotations.SyncStatus;
+import org.mozilla.gecko.db.BrowserContract.URLAnnotations.SyncStatus;
import android.content.ContentProviderOperation;
import android.content.ContentProviderResult;
import android.content.ContentUris;
import android.content.ContentValues;
import android.content.OperationApplicationException;
import android.database.Cursor;
import android.net.Uri;
@@ -186,21 +185,21 @@ public class testBrowserProvider extends
thumbnailEntry.put(BrowserContract.Thumbnails.DATA, data.getBytes("UTF8"));
return thumbnailEntry;
}
private ContentValues createUrlAnnotationEntry(final String url, final String key, final String value,
final long dateCreated) {
final ContentValues values = new ContentValues();
- values.put(BrowserContract.UrlAnnotations.URL, url);
- values.put(BrowserContract.UrlAnnotations.KEY, key);
- values.put(BrowserContract.UrlAnnotations.VALUE, value);
- values.put(BrowserContract.UrlAnnotations.DATE_CREATED, dateCreated);
- values.put(BrowserContract.UrlAnnotations.DATE_MODIFIED, dateCreated);
+ values.put(BrowserContract.URLAnnotations.URL, url);
+ values.put(BrowserContract.URLAnnotations.KEY, key);
+ values.put(BrowserContract.URLAnnotations.VALUE, value);
+ values.put(BrowserContract.URLAnnotations.DATE_CREATED, dateCreated);
+ values.put(BrowserContract.URLAnnotations.DATE_MODIFIED, dateCreated);
return values;
}
private ContentValues createOneHistoryEntry() throws Exception {
return createHistoryEntry("Example", "http://example.com", 10, System.currentTimeMillis());
}
private Cursor getHistoryEntryById(long id) throws Exception {
@@ -232,18 +231,18 @@ public class testBrowserProvider extends
private Cursor getThumbnailByUrl(String url) throws Exception {
return mProvider.query(BrowserContract.Thumbnails.CONTENT_URI, null,
BrowserContract.Thumbnails.URL + " = ?",
new String[] { url },
null);
}
private Cursor getUrlAnnotationByUrl(final String url) throws Exception {
- return mProvider.query(BrowserContract.UrlAnnotations.CONTENT_URI, null,
- BrowserContract.UrlAnnotations.URL + " = ?",
+ return mProvider.query(BrowserContract.URLAnnotations.CONTENT_URI, null,
+ BrowserContract.URLAnnotations.URL + " = ?",
new String[] { url },
null);
}
@Override
public void setUp() throws Exception {
super.setUp(sBrowserProviderCallable, BrowserContract.AUTHORITY, "browser.db");
@@ -263,17 +262,17 @@ public class testBrowserProvider extends
mTests.add(new TestDeleteHistoryFavicons());
mTests.add(new TestUpdateHistory());
mTests.add(new TestUpdateHistoryFavicons());
mTests.add(new TestUpdateOrInsertHistory());
mTests.add(new TestInsertHistoryThumbnails());
mTests.add(new TestUpdateHistoryThumbnails());
mTests.add(new TestDeleteHistoryThumbnails());
- mTests.add(new TestInsertUrlAnnotations());
+ mTests.add(new TestInsertURLAnnotations());
mTests.add(new TestBatchOperations());
mTests.add(new TestCombinedView());
mTests.add(new TestCombinedViewDisplay());
mTests.add(new TestCombinedViewWithDeletedBookmark());
mTests.add(new TestExpireHistory());
@@ -1426,71 +1425,71 @@ public class testBrowserProvider extends
c.close();
c = getThumbnailByUrl(pageUrl);
mAsserter.is(c.moveToFirst(), false, "Thumbnail is deleted with last reference to it");
c.close();
}
}
- private class TestInsertUrlAnnotations extends TestCase {
+ private class TestInsertURLAnnotations extends TestCase {
@Override
public void test() throws Exception {
testInsertionViaContentProvider();
- testInsertionViaUrlAnnotations();
+ testInsertionViaURLAnnotations();
}
private void testInsertionViaContentProvider() throws Exception {
final String url = "http://mozilla.org";
final String key = "todo";
final String value = "v";
final long dateCreated = System.currentTimeMillis();
- mProvider.insert(BrowserContract.UrlAnnotations.CONTENT_URI, createUrlAnnotationEntry(url, key, value, dateCreated));
+ mProvider.insert(BrowserContract.URLAnnotations.CONTENT_URI, createUrlAnnotationEntry(url, key, value, dateCreated));
final Cursor c = getUrlAnnotationByUrl(url);
try {
mAsserter.is(c.moveToFirst(), true, "Inserted url annotation found");
assertKeyValueSync(c, key, value);
- mAsserter.is(c.getLong(c.getColumnIndex(BrowserContract.UrlAnnotations.DATE_CREATED)), dateCreated,
+ mAsserter.is(c.getLong(c.getColumnIndex(BrowserContract.URLAnnotations.DATE_CREATED)), dateCreated,
"Inserted url annotation has correct date created");
- mAsserter.is(c.getLong(c.getColumnIndex(BrowserContract.UrlAnnotations.DATE_MODIFIED)), dateCreated,
+ mAsserter.is(c.getLong(c.getColumnIndex(BrowserContract.URLAnnotations.DATE_MODIFIED)), dateCreated,
"Inserted url annotation has correct date modified");
} finally {
c.close();
}
}
- private void testInsertionViaUrlAnnotations() throws Exception {
+ private void testInsertionViaURLAnnotations() throws Exception {
final String url = "http://hello.org";
final String key = "toTheUniverse";
final String value = "42a";
final long timeBeforeCreation = System.currentTimeMillis();
- getTestProfile().getDB().getUrlAnnotations().insertAnnotation(mResolver, url, key, value);
+ getTestProfile().getDB().getURLAnnotations().insertAnnotation(mResolver, url, key, value);
final Cursor c = getUrlAnnotationByUrl(url);
try {
mAsserter.is(c.moveToFirst(), true, "Inserted url annotation found");
assertKeyValueSync(c, key, value);
- mAsserter.is(true, c.getLong(c.getColumnIndex(BrowserContract.UrlAnnotations.DATE_CREATED)) >= timeBeforeCreation,
+ mAsserter.is(true, c.getLong(c.getColumnIndex(BrowserContract.URLAnnotations.DATE_CREATED)) >= timeBeforeCreation,
"Inserted url annotation has date created greater than or equal to time saved before insertion");
- mAsserter.is(true, c.getLong(c.getColumnIndex(BrowserContract.UrlAnnotations.DATE_MODIFIED)) >= timeBeforeCreation,
+ mAsserter.is(true, c.getLong(c.getColumnIndex(BrowserContract.URLAnnotations.DATE_MODIFIED)) >= timeBeforeCreation,
"Inserted url annotation has correct date modified greater than or equal to time saved before insertion");
} finally {
c.close();
}
}
private void assertKeyValueSync(final Cursor c, final String key, final String value) {
- mAsserter.is(c.getString(c.getColumnIndex(BrowserContract.UrlAnnotations.KEY)), key,
+ mAsserter.is(c.getString(c.getColumnIndex(BrowserContract.URLAnnotations.KEY)), key,
"Inserted url annotation has correct key");
- mAsserter.is(c.getString(c.getColumnIndex(BrowserContract.UrlAnnotations.VALUE)), value,
+ mAsserter.is(c.getString(c.getColumnIndex(BrowserContract.URLAnnotations.VALUE)), value,
"Inserted url annotation has correct value");
- mAsserter.is(c.getInt(c.getColumnIndex(BrowserContract.UrlAnnotations.SYNC_STATUS)), SyncStatus.NEW.getDBValue(),
+ mAsserter.is(c.getInt(c.getColumnIndex(BrowserContract.URLAnnotations.SYNC_STATUS)), SyncStatus.NEW.getDBValue(),
"Inserted url annotation has default sync status");
}
}
private class TestCombinedView extends TestCase {
@Override
public void test() throws Exception {
final String TITLE_1 = "Test Page 1";