--- a/spec/core_storagemanager_spec.lua	Wed Oct 10 21:56:47 2018 +0200
+++ b/spec/core_storagemanager_spec.lua	Wed Oct 10 22:00:37 2018 +0100
@@ -1,6 +1,8 @@
 local server = require "net.server_select";
 package.loaded["net.server"] = server;
 
+local st = require "util.stanza";
+
 local function mock_prosody()
 	_G.prosody = {
 		core_post_stanza = function () end;
@@ -56,30 +58,69 @@
 			sm.initialize_host(test_host);
 			assert(mm.load(test_host, "storage_"..backend_config.storage));
 
-			-- These tests rely on being executed in order, disable any order
-			-- randomization for this block
-			randomize(false);
+			describe("key-value stores", function ()
+				-- These tests rely on being executed in order, disable any order
+				-- randomization for this block
+				randomize(false);
+
+				local store;
+				it("may be opened", function ()
+					store = assert(sm.open(test_host, "test"));
+				end);
+
+				local simple_data = { foo = "bar" };
 
-			local store;
-			it("may open a store", function ()
-				store = assert(sm.open(test_host, "test"));
+				it("may set data for a user", function ()
+					assert(store:set("user9999", simple_data));
+				end);
+
+				it("may get data for a user", function ()
+					assert.same(simple_data, assert(store:get("user9999")));
+				end);
+
+				it("may remove data for a user", function ()
+					assert(store:set("user9999", nil));
+					local ret, err = store:get("user9999");
+					assert.is_nil(ret);
+					assert.is_nil(err);
+				end);
 			end);
 
-			local simple_data = { foo = "bar" };
+			describe("archive stores", function ()
+				randomize(false);
+
+				local archive;
+				it("can be opened", function ()
+					archive = assert(sm.open(test_host, "test-archive", "archive"));
+				end);
 
-			it("may set data for a user", function ()
-				assert(store:set("user9999", simple_data));
-			end);
+				local test_stanza = st.stanza("test", { xmlns = "urn:example:foo" })
+					:tag("foo"):up()
+					:tag("foo"):up();
+				local test_time = 1539204123;
+				it("can be added to", function ()
+					local ok = archive:append("user", nil, test_stanza, 1539204123, "contact@example.com");
+					assert.truthy(ok);
+				end);
 
-			it("may get data for a user", function ()
-				assert.same(simple_data, assert(store:get("user9999")));
-			end);
-
-			it("may remove data for a user", function ()
-				assert(store:set("user9999", nil));
-				local ret, err = store:get("user9999");
-				assert.is_nil(ret);
-				assert.is_nil(err);
+				it("can be queried", function ()
+					local data, err = archive:find("user", {
+						with = "contact@example.com";
+					});
+					assert.truthy(data);
+					for id, item, when in data do
+						assert.truthy(id);
+						assert(st.is_stanza(item));
+						assert.equal("test", item.name);
+						assert.equal("urn:example:foo", item.attr.xmlns);
+						assert.equal(2, #item.tags);
+						assert.equal(test_time, when);
+					end
+				end);
+				it("can be purged", function ()
+					local ok, err = archive:delete("user");
+					assert.truthy(ok);
+				end);
 			end);
 		end);
 	end