Bug 1292359 - Treat visit type consistently as a Long while syncing r=nalexander
MozReview-Commit-ID: ESn4t3lznNl
--- a/mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/android/VisitsHelper.java
+++ b/mobile/android/services/src/main/java/org/mozilla/gecko/sync/repositories/android/VisitsHelper.java
@@ -73,17 +73,17 @@ public class VisitsHelper {
return visits;
}
final int dateVisitedCol = cursor.getColumnIndexOrThrow(Visits.DATE_VISITED);
final int visitTypeCol = cursor.getColumnIndexOrThrow(Visits.VISIT_TYPE);
while (!cursor.isAfterLast()) {
insertTupleIntoVisitsUnchecked(visits,
- cursor.getInt(visitTypeCol),
+ cursor.getLong(visitTypeCol),
cursor.getLong(dateVisitedCol)
);
cursor.moveToNext();
}
} finally {
cursor.close();
}
@@ -109,17 +109,17 @@ public class VisitsHelper {
cv.put(Visits.IS_LOCAL, isLocal ? Visits.VISIT_IS_LOCAL : Visits.VISIT_IS_REMOTE);
cv.put(Visits.VISIT_TYPE, (Long) visit.get(SYNC_TYPE_KEY));
cv.put(Visits.DATE_VISITED, (Long) visit.get(SYNC_DATE_KEY));
return cv;
}
@SuppressWarnings("unchecked")
- private static void insertTupleIntoVisitsUnchecked(JSONArray visits, Integer type, Long date) {
+ private static void insertTupleIntoVisitsUnchecked(@NonNull final JSONArray visits, @NonNull Long type, @NonNull Long date) {
final JSONObject visit = new JSONObject();
visit.put(SYNC_TYPE_KEY, type);
visit.put(SYNC_DATE_KEY, date);
visits.add(visit);
}
private static Uri visitsUriWithLimit(int limit) {
return BrowserContractHelpers.VISITS_CONTENT_URI
--- a/mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/repositories/android/VisitsHelperTest.java
+++ b/mobile/android/tests/background/junit4/src/org/mozilla/gecko/sync/repositories/android/VisitsHelperTest.java
@@ -80,19 +80,19 @@ public class VisitsHelperTest {
}
// test that limit worked, that sorting is correct, and that both date and type are present
JSONArray recentVisits = VisitsHelper.getRecentHistoryVisitsForGUID(visitsClient, "testGUID", 10);
Assert.assertEquals(10, recentVisits.size());
for (int i = 0; i < recentVisits.size(); i++) {
JSONObject v = (JSONObject) recentVisits.get(i);
Long date = (Long) v.get("date");
- Integer type = (Integer) v.get("type");
+ Long type = (Long) v.get("type");
Assert.assertEquals(Long.valueOf(baseDate - i * 100), date);
- Assert.assertEquals(Integer.valueOf(1), type);
+ Assert.assertEquals(Long.valueOf(1), type);
}
} finally {
provider.shutdown();
}
}
@Test
public void testGetVisitContentValues() throws Exception {