Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-04-21 07:24:34 +02:00
Code Issues Projects Releases Wiki Activity

Each request packet should contain the unique ID of the offer to which

Browse Source 
it responds.
This commit is contained in:
akwizgran
2011-08-13 17:46:19 +02:00
parent e1b9ee247c
commit c2b0f0ab5a
34 changed files with 204 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/net/sf/briar/db/DatabaseCleanerImplTest.java
+2 -6
View File
@@ -12,7 +12,7 @@ import org.junit.Test;
public class DatabaseCleanerImplTest extends TestCase {
@Test
public void testStoppingCleanerWakesItUp() throws DbException {
public void testStoppingCleanerWakesItUp() throws Exception {
final CountDownLatch latch = new CountDownLatch(1);
Callback callback = new Callback() {
@@ -31,11 +31,7 @@ public class DatabaseCleanerImplTest extends TestCase {
long start = System.currentTimeMillis();
// Start the cleaner and check that shouldCheckFreeSpace() is called
cleaner.startCleaning();
try {
assertTrue(latch.await(5, TimeUnit.SECONDS));
} catch(InterruptedException e) {
fail();
}
assertTrue(latch.await(5, TimeUnit.SECONDS));
// Stop the cleaner (it should be waiting between sweeps)
cleaner.stopCleaning();
long end = System.currentTimeMillis();
test/net/sf/briar/db/DatabaseComponentTest.java
+7 -2
View File
@@ -12,10 +12,10 @@ import net.sf.briar.api.ContactId;
import net.sf.briar.api.Rating;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DatabaseListener;
import net.sf.briar.api.db.DatabaseListener.Event;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.NoSuchContactException;
import net.sf.briar.api.db.Status;
import net.sf.briar.api.db.DatabaseListener.Event;
import net.sf.briar.api.protocol.Ack;
import net.sf.briar.api.protocol.AuthorId;
import net.sf.briar.api.protocol.Batch;
@@ -25,6 +25,7 @@ import net.sf.briar.api.protocol.GroupId;
import net.sf.briar.api.protocol.Message;
import net.sf.briar.api.protocol.MessageId;
import net.sf.briar.api.protocol.Offer;
import net.sf.briar.api.protocol.OfferId;
import net.sf.briar.api.protocol.SubscriptionUpdate;
import net.sf.briar.api.protocol.TransportUpdate;
import net.sf.briar.api.protocol.writers.AckWriter;
@@ -49,6 +50,7 @@ public abstract class DatabaseComponentTest extends TestCase {
protected final ContactId contactId;
protected final GroupId groupId;
protected final MessageId messageId, parentId;
protected final OfferId offerId;
private final long timestamp;
private final int size;
private final byte[] raw;
@@ -65,6 +67,7 @@ public abstract class DatabaseComponentTest extends TestCase {
groupId = new GroupId(TestUtils.getRandomId());
messageId = new MessageId(TestUtils.getRandomId());
parentId = new MessageId(TestUtils.getRandomId());
offerId = new OfferId(TestUtils.getRandomId());
timestamp = System.currentTimeMillis();
size = 1234;
raw = new byte[size];
@@ -1031,7 +1034,9 @@ public abstract class DatabaseComponentTest extends TestCase {
will(returnValue(true)); // Visible - do not request message # 1
oneOf(database).setStatusSeenIfVisible(txn, contactId, messageId2);
will(returnValue(false)); // Not visible - request message # 2
oneOf(requestWriter).writeBitmap(expectedRequest, 3);
oneOf(offer).getId();
will(returnValue(offerId));
oneOf(requestWriter).writeRequest(offerId, expectedRequest, 3);
}});
DatabaseComponent db = createDatabaseComponent(database, cleaner);