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

Replaced clearSubscriptions() and addSubscription() with setSubscriptions().

Browse Source
This commit is contained in:
akwizgran
2011-07-14 09:52:05 +01:00
parent a121dcdda8
commit d4382fd232
6 changed files with 50 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -548,10 +548,9 @@ public abstract class DatabaseComponentTest extends TestCase {
will(returnValue(acks));
oneOf(database).removeAckedBatch(txn, contactId, batchId);
// Subscriptions
oneOf(database).clearSubscriptions(txn, contactId);
oneOf(header).getSubscriptions();
will(returnValue(subs));
oneOf(database).addSubscription(txn, contactId, groupId);
oneOf(database).setSubscriptions(txn, contactId, subs);
// Transports
oneOf(header).getTransports();
will(returnValue(transports));

14
test/net/sf/briar/db/H2DatabaseTest.java
View File

@@ -211,7 +211,7 @@ public class H2DatabaseTest extends TestCase {
Connection txn = db.startTransaction();
assertEquals(contactId, db.addContact(txn, null));
db.addSubscription(txn, groupId);
db.addSubscription(txn, contactId, groupId);
db.setSubscriptions(txn, contactId, Collections.singleton(groupId));
db.addMessage(txn, message);
db.setStatus(txn, contactId, messageId, Status.NEW);
db.commitTransaction(txn);
@@ -253,7 +253,7 @@ public class H2DatabaseTest extends TestCase {
Connection txn = db.startTransaction();
assertEquals(contactId, db.addContact(txn, null));
db.addSubscription(txn, groupId);
db.addSubscription(txn, contactId, groupId);
db.setSubscriptions(txn, contactId, Collections.singleton(groupId));
db.addMessage(txn, message);
db.setSendability(txn, messageId, 1);
db.commitTransaction(txn);
@@ -315,7 +315,7 @@ public class H2DatabaseTest extends TestCase {
// The contact subscribing should make the message sendable
txn = db.startTransaction();
db.addSubscription(txn, contactId, groupId);
db.setSubscriptions(txn, contactId, Collections.singleton(groupId));
it = db.getSendableMessages(txn, contactId, ONE_MEGABYTE).iterator();
assertTrue(it.hasNext());
assertEquals(messageId, it.next());
@@ -323,7 +323,7 @@ public class H2DatabaseTest extends TestCase {
// The contact unsubscribing should make the message unsendable
txn = db.startTransaction();
db.clearSubscriptions(txn, contactId);
db.setSubscriptions(txn, contactId, Collections.<GroupId>emptySet());
it = db.getSendableMessages(txn, contactId, ONE_MEGABYTE).iterator();
assertFalse(it.hasNext());
db.commitTransaction(txn);
@@ -342,7 +342,7 @@ public class H2DatabaseTest extends TestCase {
Connection txn = db.startTransaction();
assertEquals(contactId, db.addContact(txn, null));
db.addSubscription(txn, groupId);
db.addSubscription(txn, contactId, groupId);
db.setSubscriptions(txn, contactId, Collections.singleton(groupId));
db.addMessage(txn, message);
db.setSendability(txn, messageId, 1);
db.setStatus(txn, contactId, messageId, Status.NEW);
@@ -408,7 +408,7 @@ public class H2DatabaseTest extends TestCase {
Connection txn = db.startTransaction();
assertEquals(contactId, db.addContact(txn, null));
db.addSubscription(txn, groupId);
db.addSubscription(txn, contactId, groupId);
db.setSubscriptions(txn, contactId, Collections.singleton(groupId));
db.addMessage(txn, message);
db.setSendability(txn, messageId, 1);
db.setStatus(txn, contactId, messageId, Status.NEW);
@@ -451,7 +451,7 @@ public class H2DatabaseTest extends TestCase {
Connection txn = db.startTransaction();
assertEquals(contactId, db.addContact(txn, null));
db.addSubscription(txn, groupId);
db.addSubscription(txn, contactId, groupId);
db.setSubscriptions(txn, contactId, Collections.singleton(groupId));
db.addMessage(txn, message);
db.setSendability(txn, messageId, 1);
db.setStatus(txn, contactId, messageId, Status.NEW);