Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 19:29:06 +01:00
Code Issues Projects Releases Wiki Activity

Added DatabaseComponent.setSeen() for handling requests.

Browse Source 
Also moved IO out of the lock in receiveOffer().
This commit is contained in:
akwizgran
2011-09-23 16:06:14 +01:00
parent ba1c61810d
commit b470afb4ef
3 changed files with 73 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
test/net/sf/briar/db/DatabaseComponentTest.java
View File

@@ -586,11 +586,11 @@ public abstract class DatabaseComponentTest extends TestCase {
final TransportUpdate transportsUpdate = context.mock(TransportUpdate.class);
context.checking(new Expectations() {{
// Check whether the contact is still in the DB (which it's not)
exactly(17).of(database).startTransaction();
exactly(18).of(database).startTransaction();
will(returnValue(txn));
exactly(17).of(database).containsContact(txn, contactId);
exactly(18).of(database).containsContact(txn, contactId);
will(returnValue(false));
exactly(17).of(database).commitTransaction(txn);
exactly(18).of(database).commitTransaction(txn);
}});
DatabaseComponent db = createDatabaseComponent(database, cleaner);
@@ -680,6 +680,11 @@ public abstract class DatabaseComponentTest extends TestCase {
fail();
} catch(NoSuchContactException expected) {}
try {
db.setSeen(contactId, Collections.singleton(messageId));
fail();
} catch(NoSuchContactException expected) {}
context.assertIsSatisfied();
}
@@ -1488,4 +1493,26 @@ public abstract class DatabaseComponentTest extends TestCase {
context.assertIsSatisfied();
}
@Test
public void testSetSeen() throws Exception {
Mockery context = new Mockery();
@SuppressWarnings("unchecked")
final Database<Object> database = context.mock(Database.class);
final DatabaseCleaner cleaner = context.mock(DatabaseCleaner.class);
context.checking(new Expectations() {{
allowing(database).startTransaction();
will(returnValue(txn));
allowing(database).commitTransaction(txn);
allowing(database).containsContact(txn, contactId);
will(returnValue(true));
// setSeen(contactId, Collections.singleton(messageId))
oneOf(database).setStatus(txn, contactId, messageId, Status.SEEN);
}});
DatabaseComponent db = createDatabaseComponent(database, cleaner);
db.setSeen(contactId, Collections.singleton(messageId));
context.assertIsSatisfied();
}
}