diff -r 000000000000 -r 6474c204b198 mobile/android/tests/background/junit3/src/common/TestBrowserContractHelpers.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mobile/android/tests/background/junit3/src/common/TestBrowserContractHelpers.java	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,28 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+package org.mozilla.gecko.background.common;
+
+import org.mozilla.gecko.background.helpers.AndroidSyncTestCase;
+import org.mozilla.gecko.sync.repositories.android.BrowserContractHelpers;
+
+public class TestBrowserContractHelpers extends AndroidSyncTestCase {
+  public void testBookmarkCodes() {
+    final String[] strings = {
+      // Observe omissions: "microsummary", "item".
+      "folder", "bookmark", "separator", "livemark", "query"
+    };
+    for (int i = 0; i < strings.length; ++i) {
+      assertEquals(strings[i], BrowserContractHelpers.typeStringForCode(i));
+      assertEquals(i, BrowserContractHelpers.typeCodeForString(strings[i]));
+    }
+    assertEquals(null, BrowserContractHelpers.typeStringForCode(-1));
+    assertEquals(null, BrowserContractHelpers.typeStringForCode(100));
+
+    assertEquals(-1, BrowserContractHelpers.typeCodeForString(null));
+    assertEquals(-1, BrowserContractHelpers.typeCodeForString("folder "));
+    assertEquals(-1, BrowserContractHelpers.typeCodeForString("FOLDER"));
+    assertEquals(-1, BrowserContractHelpers.typeCodeForString(""));
+    assertEquals(-1, BrowserContractHelpers.typeCodeForString("nope"));
+  }
+}