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

Separated MessageHeader interface from Message interface.

Browse Source
This commit is contained in:
akwizgran
2011-10-21 18:42:27 +01:00
parent f2d80825bc
commit ef61eaa804
9 changed files with 69 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/net/sf/briar/ProtocolIntegrationTest.java
View File

@@ -142,10 +142,10 @@ public class ProtocolIntegrationTest extends TestCase {
a.finish();
BatchWriter b = protocolWriterFactory.createBatchWriter(out1);
assertTrue(b.writeMessage(message.getBytes()));
assertTrue(b.writeMessage(message1.getBytes()));
assertTrue(b.writeMessage(message2.getBytes()));
assertTrue(b.writeMessage(message3.getBytes()));
assertTrue(b.writeMessage(message.getSerialisedBytes()));
assertTrue(b.writeMessage(message1.getSerialisedBytes()));
assertTrue(b.writeMessage(message2.getSerialisedBytes()));
assertTrue(b.writeMessage(message3.getSerialisedBytes()));
b.finish();
OfferWriter o = protocolWriterFactory.createOfferWriter(out1);
@@ -255,6 +255,6 @@ public class ProtocolIntegrationTest extends TestCase {
assertEquals(m1.getGroup(), m2.getGroup());
assertEquals(m1.getAuthor(), m2.getAuthor());
assertEquals(m1.getTimestamp(), m2.getTimestamp());
assertArrayEquals(m1.getBytes(), m2.getBytes());
assertArrayEquals(m1.getSerialisedBytes(), m2.getSerialisedBytes());
}
}

11
test/net/sf/briar/db/TestMessage.java
View File

@@ -1,5 +1,8 @@
package net.sf.briar.db;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import net.sf.briar.api.protocol.AuthorId;
import net.sf.briar.api.protocol.GroupId;
import net.sf.briar.api.protocol.Message;
@@ -49,14 +52,18 @@ class TestMessage implements Message {
return timestamp;
}
public int getSize() {
public int getLength() {
return raw.length;
}
public byte[] getBytes() {
public byte[] getSerialisedBytes() {
return raw;
}
public InputStream getSerialisedStream() {
return new ByteArrayInputStream(raw);
}
@Override
public boolean equals(Object o) {
return o instanceof Message && id.equals(((Message)o).getId());

2
test/net/sf/briar/protocol/ProtocolReadWriteTest.java
View File

@@ -87,7 +87,7 @@ public class ProtocolReadWriteTest extends TestCase {
a.finish();
BatchWriter b = writerFactory.createBatchWriter(out);
b.writeMessage(message.getBytes());
b.writeMessage(message.getSerialisedBytes());
b.finish();
OfferWriter o = writerFactory.createOfferWriter(out);

2
test/net/sf/briar/protocol/writers/ConstantsTest.java
View File

@@ -113,7 +113,7 @@ public class ConstantsTest extends TestCase {
ProtocolConstants.MAX_PACKET_LENGTH);
BatchWriter b = new BatchWriterImpl(out, serial, writerFactory,
crypto.getMessageDigest());
assertTrue(b.writeMessage(message.getBytes()));
assertTrue(b.writeMessage(message.getSerialisedBytes()));
b.finish();
// Check the size of the serialised batch
assertTrue(out.size() > UniqueId.LENGTH + Group.MAX_NAME_LENGTH +