Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 05:09:53 +01:00
Code Issues Projects Releases Wiki Activity

Unit tests for DatabaseComponent.

Browse Source
This commit is contained in:
akwizgran
2011-07-26 18:25:14 +01:00
parent 8ba5b46d59
commit 1e60be4b75
3 changed files with 46 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/net/sf/briar/db/ReadWriteLockDatabaseComponent.java
View File

@@ -683,7 +683,7 @@ class ReadWriteLockDatabaseComponent<Txn> extends DatabaseComponentImpl<Txn> {
request = new BitSet(offered.size()); request = new BitSet(offered.size());
Iterator<MessageId> it = offered.iterator(); Iterator<MessageId> it = offered.iterator();
for(int i = 0; it.hasNext(); i++) { for(int i = 0; it.hasNext(); i++) {
// If the message is not in the database or if // If the message is not in the database, or if
// it is not visible to the contact, request it // it is not visible to the contact, request it
MessageId m = it.next(); MessageId m = it.next();
if(!db.setStatusSeenIfVisible(txn, c, m)) if(!db.setStatusSeenIfVisible(txn, c, m))

2
components/net/sf/briar/db/SynchronizedDatabaseComponent.java
View File

@@ -504,7 +504,7 @@ class SynchronizedDatabaseComponent<Txn> extends DatabaseComponentImpl<Txn> {
request = new BitSet(offered.size()); request = new BitSet(offered.size());
Iterator<MessageId> it = offered.iterator(); Iterator<MessageId> it = offered.iterator();
for(int i = 0; it.hasNext(); i++) { for(int i = 0; it.hasNext(); i++) {
// If the message is not in the database or if // If the message is not in the database, or if
// it is not visible to the contact, request it // it is not visible to the contact, request it
MessageId m = it.next(); MessageId m = it.next();
if(!db.setStatusSeenIfVisible(txn, c, m)) if(!db.setStatusSeenIfVisible(txn, c, m))

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

@@ -1,6 +1,7 @@
package net.sf.briar.db; package net.sf.briar.db;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.BitSet;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Map; import java.util.Map;
@@ -21,9 +22,11 @@ import net.sf.briar.api.protocol.Group;
import net.sf.briar.api.protocol.GroupId; import net.sf.briar.api.protocol.GroupId;
import net.sf.briar.api.protocol.Message; import net.sf.briar.api.protocol.Message;
import net.sf.briar.api.protocol.MessageId; import net.sf.briar.api.protocol.MessageId;
import net.sf.briar.api.protocol.Offer;
import net.sf.briar.api.protocol.writers.AckWriter; import net.sf.briar.api.protocol.writers.AckWriter;
import net.sf.briar.api.protocol.writers.BatchWriter; import net.sf.briar.api.protocol.writers.BatchWriter;
import net.sf.briar.api.protocol.writers.OfferWriter; import net.sf.briar.api.protocol.writers.OfferWriter;
import net.sf.briar.api.protocol.writers.RequestWriter;
import net.sf.briar.api.protocol.writers.SubscriptionWriter; import net.sf.briar.api.protocol.writers.SubscriptionWriter;
import net.sf.briar.api.protocol.writers.TransportWriter; import net.sf.briar.api.protocol.writers.TransportWriter;
@@ -890,4 +893,45 @@ public abstract class DatabaseComponentTest extends TestCase {
context.assertIsSatisfied(); context.assertIsSatisfied();
} }
@Test
public void testReceiveOffer() throws Exception {
final MessageId messageId1 = new MessageId(TestUtils.getRandomId());
final MessageId messageId2 = new MessageId(TestUtils.getRandomId());
final Collection<MessageId> offered = new ArrayList<MessageId>();
offered.add(messageId);
offered.add(messageId1);
offered.add(messageId2);
final BitSet expectedRequest = new BitSet(3);
expectedRequest.set(0);
expectedRequest.set(2);
Mockery context = new Mockery();
@SuppressWarnings("unchecked")
final Database<Object> database = context.mock(Database.class);
final DatabaseCleaner cleaner = context.mock(DatabaseCleaner.class);
final Offer offer = context.mock(Offer.class);
final RequestWriter requestWriter = context.mock(RequestWriter.class);
context.checking(new Expectations() {{
allowing(database).startTransaction();
will(returnValue(txn));
allowing(database).commitTransaction(txn);
allowing(database).containsContact(txn, contactId);
will(returnValue(true));
// Get the offered messages
oneOf(offer).getMessages();
will(returnValue(offered));
oneOf(database).setStatusSeenIfVisible(txn, contactId, messageId);
will(returnValue(false)); // Not visible - request # 0
oneOf(database).setStatusSeenIfVisible(txn, contactId, messageId1);
will(returnValue(true)); // Visible - do not request # 1
oneOf(database).setStatusSeenIfVisible(txn, contactId, messageId2);
will(returnValue(false)); // Not visible - request # 2
oneOf(requestWriter).writeBitmap(expectedRequest);
}});
DatabaseComponent db = createDatabaseComponent(database, cleaner);
db.receiveOffer(contactId, offer, requestWriter);
context.assertIsSatisfied();
}
} }