diff -r 000000000000 -r 6474c204b198 mobile/android/tests/background/junit3/src/db/TestClientsDatabaseAccessor.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mobile/android/tests/background/junit3/src/db/TestClientsDatabaseAccessor.java	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,128 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+package org.mozilla.gecko.background.db;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.mozilla.gecko.background.testhelpers.CommandHelpers;
+import org.mozilla.gecko.sync.CommandProcessor.Command;
+import org.mozilla.gecko.sync.Utils;
+import org.mozilla.gecko.sync.repositories.NullCursorException;
+import org.mozilla.gecko.sync.repositories.android.ClientsDatabaseAccessor;
+import org.mozilla.gecko.sync.repositories.domain.ClientRecord;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.test.AndroidTestCase;
+
+public class TestClientsDatabaseAccessor extends AndroidTestCase {
+
+  public class StubbedClientsDatabaseAccessor extends ClientsDatabaseAccessor {
+    public StubbedClientsDatabaseAccessor(Context mContext) {
+      super(mContext);
+    }
+  }
+
+  StubbedClientsDatabaseAccessor db;
+
+  public void setUp() {
+    db = new StubbedClientsDatabaseAccessor(mContext);
+    db.wipeDB();
+  }
+
+  public void tearDown() {
+    db.close();
+  }
+
+  public void testStoreArrayListAndFetch() throws NullCursorException {
+    ArrayList<ClientRecord> list = new ArrayList<ClientRecord>();
+    ClientRecord record1 = new ClientRecord(Utils.generateGuid());
+    ClientRecord record2 = new ClientRecord(Utils.generateGuid());
+    ClientRecord record3 = new ClientRecord(Utils.generateGuid());
+
+    list.add(record1);
+    list.add(record2);
+    db.store(list);
+
+    ClientRecord r1 = db.fetchClient(record1.guid);
+    ClientRecord r2 = db.fetchClient(record2.guid);
+    ClientRecord r3 = db.fetchClient(record3.guid);
+
+    assertNotNull(r1);
+    assertNotNull(r2);
+    assertNull(r3);
+    assertTrue(record1.equals(r1));
+    assertTrue(record2.equals(r2));
+    assertFalse(record3.equals(r3));
+  }
+
+  public void testStoreAndFetchCommandsForClient() {
+    String accountGUID1 = Utils.generateGuid();
+    String accountGUID2 = Utils.generateGuid();
+
+    Command command1 = CommandHelpers.getCommand1();
+    Command command2 = CommandHelpers.getCommand2();
+    Command command3 = CommandHelpers.getCommand3();
+
+    Cursor cur = null;
+    try {
+      db.store(accountGUID1, command1);
+      db.store(accountGUID1, command2);
+      db.store(accountGUID2, command3);
+
+      List<Command> commands = db.fetchCommandsForClient(accountGUID1);
+      assertEquals(2, commands.size());
+      assertEquals(1, commands.get(0).args.size());
+      assertEquals(1, commands.get(1).args.size());
+    } catch (NullCursorException e) {
+      fail("Should not have NullCursorException");
+    } finally {
+      if (cur != null) {
+        cur.close();
+      }
+    }
+  }
+
+  public void testNumClients() {
+    final int COUNT = 5;
+    ArrayList<ClientRecord> list = new ArrayList<ClientRecord>();
+    for (int i = 0; i < 5; i++) {
+      list.add(new ClientRecord());
+    }
+    db.store(list);
+    assertEquals(COUNT, db.clientsCount());
+  }
+
+  public void testFetchAll() throws NullCursorException {
+    ArrayList<ClientRecord> list = new ArrayList<ClientRecord>();
+    ClientRecord record1 = new ClientRecord(Utils.generateGuid());
+    ClientRecord record2 = new ClientRecord(Utils.generateGuid());
+
+    list.add(record1);
+    list.add(record2);
+
+    boolean thrown = false;
+    try {
+      Map<String, ClientRecord> records =  db.fetchAllClients();
+
+      assertNotNull(records);
+      assertEquals(0, records.size());
+
+      db.store(list);
+      records = db.fetchAllClients();
+      assertNotNull(records);
+      assertEquals(2, records.size());
+      assertTrue(record1.equals(records.get(record1.guid)));
+      assertTrue(record2.equals(records.get(record2.guid)));
+
+      // put() should throw an exception since records is immutable.
+      records.put(null, null);
+    } catch (UnsupportedOperationException e) {
+      thrown = true;
+    }
+    assertTrue(thrown);
+  }
+}