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

Minor code cleanups.

Browse Source
This commit is contained in:
akwizgran
2011-11-16 18:15:32 +00:00
parent 01dd658200
commit 4da7a685cd
14 changed files with 41 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/net/sf/briar/plugins/socket/SimpleSocketPluginTest.java
View File

@@ -103,7 +103,7 @@ public class SimpleSocketPluginTest extends TestCase {
private TransportConfig config = new TransportConfig();
private TransportProperties local = new TransportProperties();
private Map<ContactId, TransportProperties> remote =
private final Map<ContactId, TransportProperties> remote =
new HashMap<ContactId, TransportProperties>();
private int incomingConnections = 0;

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

@@ -127,9 +127,9 @@ public class ConstantsTest extends TestCase {
assertTrue(b.writeMessage(message.getSerialised()));
b.finish();
// Check the size of the serialised batch
assertTrue(out.size() > UniqueId.LENGTH + MAX_GROUP_NAME_LENGTH +
MAX_PUBLIC_KEY_LENGTH + MAX_AUTHOR_NAME_LENGTH +
MAX_PUBLIC_KEY_LENGTH + MAX_BODY_LENGTH);
assertTrue(out.size() > UniqueId.LENGTH + MAX_GROUP_NAME_LENGTH
+ MAX_PUBLIC_KEY_LENGTH + MAX_AUTHOR_NAME_LENGTH
+ MAX_PUBLIC_KEY_LENGTH + MAX_BODY_LENGTH);
assertTrue(out.size() <= MAX_PACKET_LENGTH);
}
@@ -222,8 +222,9 @@ public class ConstantsTest extends TestCase {
new TransportUpdateWriterImpl(out, writerFactory);
t.writeTransports(transports, Long.MAX_VALUE);
// Check the size of the serialised update
assertTrue(out.size() > MAX_TRANSPORTS * (UniqueId.LENGTH + 4 +
(MAX_PROPERTIES_PER_TRANSPORT * MAX_PROPERTY_LENGTH * 2)) + 8);
assertTrue(out.size() > MAX_TRANSPORTS * (UniqueId.LENGTH + 4
+ (MAX_PROPERTIES_PER_TRANSPORT * MAX_PROPERTY_LENGTH * 2))
+ 8);
assertTrue(out.size() <= MAX_PACKET_LENGTH);
}

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

@@ -65,8 +65,8 @@ public class ReaderImplTest extends TestCase {
@Test
public void testReadInt64() throws Exception {
setContents("FA0000000000000000" + "FAFFFFFFFFFFFFFFFF" +
"FA7FFFFFFFFFFFFFFF" + "FA8000000000000000");
setContents("FA0000000000000000" + "FAFFFFFFFFFFFFFFFF"
+ "FA7FFFFFFFFFFFFFFF" + "FA8000000000000000");
assertEquals(0L, r.readInt64());
assertEquals(-1L, r.readInt64());
assertEquals(Long.MAX_VALUE, r.readInt64());
@@ -76,8 +76,8 @@ public class ReaderImplTest extends TestCase {
@Test
public void testReadIntAny() throws Exception {
setContents("00" + "7F" + "FD80" + "FDFF" + "FC0080" + "FC7FFF" +
"FB00008000" + "FB7FFFFFFF" + "FA0000000080000000");
setContents("00" + "7F" + "FD80" + "FDFF" + "FC0080" + "FC7FFF"
+ "FB00008000" + "FB7FFFFFFF" + "FA0000000080000000");
assertEquals(0L, r.readIntAny());
assertEquals(127L, r.readIntAny());
assertEquals(-128L, r.readIntAny());
@@ -94,8 +94,8 @@ public class ReaderImplTest extends TestCase {
public void testReadFloat32() throws Exception {
// http://babbage.cs.qc.edu/IEEE-754/Decimal.html
// http://steve.hollasch.net/cgindex/coding/ieeefloat.html
setContents("F900000000" + "F93F800000" + "F940000000" + "F9BF800000" +
"F980000000" + "F9FF800000" + "F97F800000" + "F97FC00000");
setContents("F900000000" + "F93F800000" + "F940000000" + "F9BF800000"
+ "F980000000" + "F9FF800000" + "F97F800000" + "F97FC00000");
assertEquals(0F, r.readFloat32());
assertEquals(1F, r.readFloat32());
assertEquals(2F, r.readFloat32());
@@ -109,10 +109,10 @@ public class ReaderImplTest extends TestCase {
@Test
public void testReadFloat64() throws Exception {
setContents("F80000000000000000" + "F83FF0000000000000" +
"F84000000000000000" + "F8BFF0000000000000" +
"F88000000000000000" + "F8FFF0000000000000" +
"F87FF0000000000000" + "F87FF8000000000000");
setContents("F80000000000000000" + "F83FF0000000000000"
+ "F84000000000000000" + "F8BFF0000000000000"
+ "F88000000000000000" + "F8FFF0000000000000"
+ "F87FF0000000000000" + "F87FF8000000000000");
assertEquals(0.0, r.readFloat64());
assertEquals(1.0, r.readFloat64());
assertEquals(2.0, r.readFloat64());
@@ -251,8 +251,8 @@ public class ReaderImplTest extends TestCase {
@Test
public void testMapKeysMustBeUnique() throws Exception {
setContents("B" + "2" + "83666F6F" + "01" + "83626172" + "02" +
"B" + "2" + "83666F6F" + "01" + "83666F6F" + "02");
setContents("B" + "2" + "83666F6F" + "01" + "83626172" + "02"
+ "B" + "2" + "83666F6F" + "01" + "83666F6F" + "02");
// The first map has unique keys
Map<String, Byte> m = r.readMap(String.class, Byte.class);
assertNotNull(m);
@@ -353,8 +353,8 @@ public class ReaderImplTest extends TestCase {
@Test
@SuppressWarnings("unchecked")
public void testReadNestedMapsAndLists() throws Exception {
setContents("B" + "1" + "B" + "1" + "83666F6F" + "7B" +
"A" + "1" + "01");
setContents("B" + "1" + "B" + "1" + "83666F6F" + "7B"
+ "A" + "1" + "01");
Map<Object, Object> m = r.readMap(Object.class, Object.class);
assertNotNull(m);
assertEquals(1, m.size());