Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 12:49:55 +01:00
Code Issues Projects Releases Wiki Activity

Test and bugfix for getMessageHeaders().

Browse Source
This commit is contained in:
akwizgran
2011-10-26 14:52:18 +01:00
parent 2628823db7
commit d2bac9a4f8
2 changed files with 69 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/net/sf/briar/db/JdbcDatabase.java
View File

@@ -1113,7 +1113,8 @@ abstract class JdbcDatabase implements Database<Connection> {
Collection<MessageHeader> headers = new ArrayList<MessageHeader>(); Collection<MessageHeader> headers = new ArrayList<MessageHeader>();
while(rs.next()) { while(rs.next()) {
MessageId id = new MessageId(rs.getBytes(1)); MessageId id = new MessageId(rs.getBytes(1));
MessageId parent = new MessageId(rs.getBytes(2)); byte[] p = rs.getBytes(2);
MessageId parent = p == null ? null : new MessageId(p);
AuthorId author = new AuthorId(rs.getBytes(3)); AuthorId author = new AuthorId(rs.getBytes(3));
String subject = rs.getString(4); String subject = rs.getString(4);
long timestamp = rs.getLong(5); long timestamp = rs.getLong(5);

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

@@ -33,6 +33,7 @@ import net.sf.briar.api.protocol.Group;
import net.sf.briar.api.protocol.GroupFactory; import net.sf.briar.api.protocol.GroupFactory;
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.MessageHeader;
import net.sf.briar.api.protocol.MessageHeaderFactory; import net.sf.briar.api.protocol.MessageHeaderFactory;
import net.sf.briar.api.protocol.MessageId; import net.sf.briar.api.protocol.MessageId;
import net.sf.briar.api.transport.ConnectionWindow; import net.sf.briar.api.transport.ConnectionWindow;
@@ -1650,6 +1651,72 @@ public class H2DatabaseTest extends TestCase {
db.close(); db.close();
} }
@Test
public void testGetMessageHeaders() throws Exception {
Database<Connection> db = open(false);
Connection txn = db.startTransaction();
// Subscribe to a group
db.addSubscription(txn, group);
// Store a couple of messages
db.addGroupMessage(txn, message);
MessageId messageId1 = new MessageId(TestUtils.getRandomId());
MessageId parentId = new MessageId(TestUtils.getRandomId());
long timestamp1 = System.currentTimeMillis();
Message message1 = new TestMessage(messageId1, parentId, groupId,
authorId, subject, timestamp1, raw);
db.addGroupMessage(txn, message1);
// Retrieve the message headers
Collection<MessageHeader> headers = db.getMessageHeaders(txn, groupId);
Iterator<MessageHeader> it = headers.iterator();
boolean messageFound = false, message1Found = false;
// First header (order is undefined)
assertTrue(it.hasNext());
MessageHeader header = it.next();
if(messageId.equals(header.getId())) {
assertHeadersAreEqual(message, header);
messageFound = true;
} else if(messageId1.equals(header.getId())) {
assertHeadersAreEqual(message1, header);
message1Found = true;
} else {
fail();
}
// Second header
assertTrue(it.hasNext());
header = it.next();
if(messageId.equals(header.getId())) {
assertHeadersAreEqual(message, header);
messageFound = true;
} else if(messageId1.equals(header.getId())) {
assertHeadersAreEqual(message1, header);
message1Found = true;
} else {
fail();
}
// No more headers
assertFalse(it.hasNext());
assertTrue(messageFound);
assertTrue(message1Found);
db.commitTransaction(txn);
db.close();
}
private void assertHeadersAreEqual(MessageHeader h1, MessageHeader h2) {
assertEquals(h1.getId(), h2.getId());
if(h1.getParent() == null) assertNull(h2.getParent());
else assertEquals(h1.getParent(), h2.getParent());
if(h1.getGroup() == null) assertNull(h2.getGroup());
else assertEquals(h1.getGroup(), h2.getGroup());
if(h1.getAuthor() == null) assertNull(h2.getAuthor());
else assertEquals(h1.getAuthor(), h2.getAuthor());
assertEquals(h1.getSubject(), h2.getSubject());
assertEquals(h1.getTimestamp(), h2.getTimestamp());
}
@Test @Test
public void testExceptionHandling() throws Exception { public void testExceptionHandling() throws Exception {
Database<Connection> db = open(false); Database<Connection> db = open(false);