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

Minor changes to serialisation library (mostly renaming).

Browse Source
This commit is contained in:
akwizgran
2012-05-09 13:17:04 +02:00
parent 78e18fb373
commit 46ed0cc4b1
21 changed files with 161 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/net/sf/briar/protocol/AckReaderTest.java
View File

@@ -49,7 +49,7 @@ public class AckReaderTest extends BriarTestCase {
byte[] b = createAck(true);
ByteArrayInputStream in = new ByteArrayInputStream(b);
Reader reader = readerFactory.createReader(in);
reader.addObjectReader(Types.ACK, ackReader);
reader.addStructReader(Types.ACK, ackReader);
try {
reader.readStruct(Types.ACK, Ack.class);
@@ -72,7 +72,7 @@ public class AckReaderTest extends BriarTestCase {
byte[] b = createAck(false);
ByteArrayInputStream in = new ByteArrayInputStream(b);
Reader reader = readerFactory.createReader(in);
reader.addObjectReader(Types.ACK, ackReader);
reader.addStructReader(Types.ACK, ackReader);
assertEquals(ack, reader.readStruct(Types.ACK, Ack.class));
context.assertIsSatisfied();
@@ -86,7 +86,7 @@ public class AckReaderTest extends BriarTestCase {
byte[] b = createEmptyAck();
ByteArrayInputStream in = new ByteArrayInputStream(b);
Reader reader = readerFactory.createReader(in);
reader.addObjectReader(Types.ACK, ackReader);
reader.addStructReader(Types.ACK, ackReader);
try {
reader.readStruct(Types.ACK, Ack.class);

14
test/net/sf/briar/protocol/BatchReaderTest.java
View File

@@ -10,7 +10,7 @@ import net.sf.briar.api.FormatException;
import net.sf.briar.api.protocol.ProtocolConstants;
import net.sf.briar.api.protocol.Types;
import net.sf.briar.api.protocol.UnverifiedBatch;
import net.sf.briar.api.serial.ObjectReader;
import net.sf.briar.api.serial.StructReader;
import net.sf.briar.api.serial.Reader;
import net.sf.briar.api.serial.ReaderFactory;
import net.sf.briar.api.serial.Writer;
@@ -30,7 +30,7 @@ public class BatchReaderTest extends BriarTestCase {
private final WriterFactory writerFactory;
private final Mockery context;
private final UnverifiedMessage message;
private final ObjectReader<UnverifiedMessage> messageReader;
private final StructReader<UnverifiedMessage> messageReader;
public BatchReaderTest() throws Exception {
super();
@@ -51,7 +51,7 @@ public class BatchReaderTest extends BriarTestCase {
byte[] b = createBatch(ProtocolConstants.MAX_PACKET_LENGTH + 1);
ByteArrayInputStream in = new ByteArrayInputStream(b);
Reader reader = readerFactory.createReader(in);
reader.addObjectReader(Types.BATCH, batchReader);
reader.addStructReader(Types.BATCH, batchReader);
try {
reader.readStruct(Types.BATCH, UnverifiedBatch.class);
@@ -75,7 +75,7 @@ public class BatchReaderTest extends BriarTestCase {
byte[] b = createBatch(ProtocolConstants.MAX_PACKET_LENGTH);
ByteArrayInputStream in = new ByteArrayInputStream(b);
Reader reader = readerFactory.createReader(in);
reader.addObjectReader(Types.BATCH, batchReader);
reader.addStructReader(Types.BATCH, batchReader);
assertEquals(batch, reader.readStruct(Types.BATCH,
UnverifiedBatch.class));
@@ -91,7 +91,7 @@ public class BatchReaderTest extends BriarTestCase {
byte[] b = createEmptyBatch();
ByteArrayInputStream in = new ByteArrayInputStream(b);
Reader reader = readerFactory.createReader(in);
reader.addObjectReader(Types.BATCH, batchReader);
reader.addStructReader(Types.BATCH, batchReader);
try {
reader.readStruct(Types.BATCH, UnverifiedBatch.class);
@@ -123,9 +123,9 @@ public class BatchReaderTest extends BriarTestCase {
return out.toByteArray();
}
private class TestMessageReader implements ObjectReader<UnverifiedMessage> {
private class TestMessageReader implements StructReader<UnverifiedMessage> {
public UnverifiedMessage readObject(Reader r) throws IOException {
public UnverifiedMessage readStruct(Reader r) throws IOException {
r.readStructId(Types.MESSAGE);
r.readBytes();
return message;

6
test/net/sf/briar/protocol/OfferReaderTest.java
View File

@@ -49,7 +49,7 @@ public class OfferReaderTest extends BriarTestCase {
byte[] b = createOffer(true);
ByteArrayInputStream in = new ByteArrayInputStream(b);
Reader reader = readerFactory.createReader(in);
reader.addObjectReader(Types.OFFER, offerReader);
reader.addStructReader(Types.OFFER, offerReader);
try {
reader.readStruct(Types.OFFER, Offer.class);
@@ -72,7 +72,7 @@ public class OfferReaderTest extends BriarTestCase {
byte[] b = createOffer(false);
ByteArrayInputStream in = new ByteArrayInputStream(b);
Reader reader = readerFactory.createReader(in);
reader.addObjectReader(Types.OFFER, offerReader);
reader.addStructReader(Types.OFFER, offerReader);
assertEquals(offer, reader.readStruct(Types.OFFER, Offer.class));
context.assertIsSatisfied();
@@ -86,7 +86,7 @@ public class OfferReaderTest extends BriarTestCase {
byte[] b = createEmptyOffer();
ByteArrayInputStream in = new ByteArrayInputStream(b);
Reader reader = readerFactory.createReader(in);
reader.addObjectReader(Types.OFFER, offerReader);
reader.addStructReader(Types.OFFER, offerReader);
try {
reader.readStruct(Types.OFFER, Offer.class);

6
test/net/sf/briar/protocol/RequestReaderTest.java
View File

@@ -49,7 +49,7 @@ public class RequestReaderTest extends BriarTestCase {
byte[] b = createRequest(true);
ByteArrayInputStream in = new ByteArrayInputStream(b);
Reader reader = readerFactory.createReader(in);
reader.addObjectReader(Types.REQUEST, requestReader);
reader.addStructReader(Types.REQUEST, requestReader);
try {
reader.readStruct(Types.REQUEST, Request.class);
@@ -72,7 +72,7 @@ public class RequestReaderTest extends BriarTestCase {
byte[] b = createRequest(false);
ByteArrayInputStream in = new ByteArrayInputStream(b);
Reader reader = readerFactory.createReader(in);
reader.addObjectReader(Types.REQUEST, requestReader);
reader.addStructReader(Types.REQUEST, requestReader);
assertEquals(request, reader.readStruct(Types.REQUEST,
Request.class));
@@ -102,7 +102,7 @@ public class RequestReaderTest extends BriarTestCase {
ByteArrayInputStream in = new ByteArrayInputStream(b);
Reader reader = readerFactory.createReader(in);
RequestReader requestReader = new RequestReader(packetFactory);
reader.addObjectReader(Types.REQUEST, requestReader);
reader.addStructReader(Types.REQUEST, requestReader);
Request r = reader.readStruct(Types.REQUEST, Request.class);
BitSet decoded = r.getBitmap();
// Check that the decoded BitSet matches the original - we can't

56
test/net/sf/briar/serial/ReaderImplTest.java
View File

@@ -14,7 +14,7 @@ import net.sf.briar.BriarTestCase;
import net.sf.briar.api.Bytes;
import net.sf.briar.api.FormatException;
import net.sf.briar.api.serial.Consumer;
import net.sf.briar.api.serial.ObjectReader;
import net.sf.briar.api.serial.StructReader;
import net.sf.briar.api.serial.Reader;
import net.sf.briar.util.StringUtils;
@@ -373,15 +373,15 @@ public class ReaderImplTest extends BriarTestCase {
@Test
public void testReadStruct() throws Exception {
setContents("C0" + "83666F6F" + "F1" + "FF" + "83666F6F");
// Add object readers for two structs
r.addObjectReader(0, new ObjectReader<Foo>() {
public Foo readObject(Reader r) throws IOException {
// Add readers for two structs
r.addStructReader(0, new StructReader<Foo>() {
public Foo readStruct(Reader r) throws IOException {
r.readStructId(0);
return new Foo(r.readString());
}
});
r.addObjectReader(255, new ObjectReader<Bar>() {
public Bar readObject(Reader r) throws IOException {
r.addStructReader(255, new StructReader<Bar>() {
public Bar readStruct(Reader r) throws IOException {
r.readStructId(255);
return new Bar(r.readString());
}
@@ -396,15 +396,15 @@ public class ReaderImplTest extends BriarTestCase {
@Test
public void testReadStructWithConsumer() throws Exception {
setContents("C0" + "83666F6F" + "F1" + "FF" + "83666F6F");
// Add object readers for two structs
r.addObjectReader(0, new ObjectReader<Foo>() {
public Foo readObject(Reader r) throws IOException {
// Add readers for two structs
r.addStructReader(0, new StructReader<Foo>() {
public Foo readStruct(Reader r) throws IOException {
r.readStructId(0);
return new Foo(r.readString());
}
});
r.addObjectReader(255, new ObjectReader<Bar>() {
public Bar readObject(Reader r) throws IOException {
r.addStructReader(255, new StructReader<Bar>() {
public Bar readStruct(Reader r) throws IOException {
r.readStructId(255);
return new Bar(r.readString());
}
@@ -435,7 +435,7 @@ public class ReaderImplTest extends BriarTestCase {
public void testUnknownStructIdThrowsFormatException() throws Exception {
setContents("C0" + "83666F6F");
assertTrue(r.hasStruct(0));
// No object reader has been added for struct ID 0
// No reader has been added for struct ID 0
try {
r.readStruct(0, Foo.class);
fail();
@@ -445,15 +445,15 @@ public class ReaderImplTest extends BriarTestCase {
@Test
public void testWrongClassThrowsFormatException() throws Exception {
setContents("C0" + "83666F6F");
// Add an object reader for struct ID 0, class Foo
r.addObjectReader(0, new ObjectReader<Foo>() {
public Foo readObject(Reader r) throws IOException {
// Add a reader for struct ID 0, class Foo
r.addStructReader(0, new StructReader<Foo>() {
public Foo readStruct(Reader r) throws IOException {
r.readStructId(0);
return new Foo(r.readString());
}
});
assertTrue(r.hasStruct(0));
// Trying to read the object as class Bar should throw a FormatException
// Trying to read the struct as class Bar should throw a FormatException
try {
r.readStruct(0, Bar.class);
fail();
@@ -461,38 +461,38 @@ public class ReaderImplTest extends BriarTestCase {
}
@Test
public void testReadListUsingObjectReader() throws Exception {
public void testReadListUsingStructReader() throws Exception {
setContents("A" + "1" + "C0" + "83666F6F");
// Add an object reader for a struct
r.addObjectReader(0, new ObjectReader<Foo>() {
public Foo readObject(Reader r) throws IOException {
// Add a reader for a struct
r.addStructReader(0, new StructReader<Foo>() {
public Foo readStruct(Reader r) throws IOException {
r.readStructId(0);
return new Foo(r.readString());
}
});
// Check that the object reader is used for lists
// Check that the reader is used for lists
List<Foo> l = r.readList(Foo.class);
assertEquals(1, l.size());
assertEquals("foo", l.get(0).s);
}
@Test
public void testReadMapUsingObjectReader() throws Exception {
public void testReadMapUsingStructReader() throws Exception {
setContents("B" + "1" + "C0" + "83666F6F" + "C1" + "83626172");
// Add object readers for two structs
r.addObjectReader(0, new ObjectReader<Foo>() {
public Foo readObject(Reader r) throws IOException {
// Add readers for two structs
r.addStructReader(0, new StructReader<Foo>() {
public Foo readStruct(Reader r) throws IOException {
r.readStructId(0);
return new Foo(r.readString());
}
});
r.addObjectReader(1, new ObjectReader<Bar>() {
public Bar readObject(Reader r) throws IOException {
r.addStructReader(1, new StructReader<Bar>() {
public Bar readStruct(Reader r) throws IOException {
r.readStructId(1);
return new Bar(r.readString());
}
});
// Check that the object readers are used for maps
// Check that the readers are used for maps
Map<Foo, Bar> m = r.readMap(Foo.class, Bar.class);
assertEquals(1, m.size());
Entry<Foo, Bar> e = m.entrySet().iterator().next();