Added method for deleting metadata.

This commit is contained in:
akwizgran
2016-02-10 13:58:46 +00:00
parent 00275e260f
commit a91d500263
6 changed files with 71 additions and 3 deletions

View File

@@ -543,11 +543,11 @@ public class DatabaseComponentImplTest extends BriarTestCase {
final EventBus eventBus = context.mock(EventBus.class);
context.checking(new Expectations() {{
// Check whether the message is in the DB (which it's not)
exactly(6).of(database).startTransaction();
exactly(8).of(database).startTransaction();
will(returnValue(txn));
exactly(6).of(database).containsMessage(txn, messageId);
exactly(8).of(database).containsMessage(txn, messageId);
will(returnValue(false));
exactly(6).of(database).abortTransaction(txn);
exactly(8).of(database).abortTransaction(txn);
// This is needed for getMessageStatus() to proceed
exactly(1).of(database).containsContact(txn, contactId);
will(returnValue(true));
@@ -555,6 +555,20 @@ public class DatabaseComponentImplTest extends BriarTestCase {
DatabaseComponent db = createDatabaseComponent(database, eventBus,
shutdown);
try {
db.deleteMessage(messageId);
fail();
} catch (NoSuchMessageException expected) {
// Expected
}
try {
db.deleteMessageMetadata(messageId);
fail();
} catch (NoSuchMessageException expected) {
// Expected
}
try {
db.getRawMessage(messageId);
fail();

View File

@@ -939,6 +939,17 @@ public class H2DatabaseTest extends BriarTestCase {
assertTrue(retrieved.containsKey("baz"));
assertArrayEquals(metadata.get("baz"), retrieved.get("baz"));
// Delete the metadata
db.deleteMessageMetadata(txn, messageId);
// Retrieve the metadata again
retrieved = db.getMessageMetadata(txn, messageId);
assertTrue(retrieved.isEmpty());
// Retrieve the metadata for the group again
all = db.getMessageMetadata(txn, groupId);
assertTrue(all.isEmpty());
db.commitTransaction(txn);
db.close();
}