Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 20:29:52 +01:00
Code Issues Projects Releases Wiki Activity

Fixed the frame reordering window.

Browse Source
This commit is contained in:
akwizgran
2012-01-20 11:26:10 +00:00
parent 92b67d9881
commit 5a4505cb71
5 changed files with 106 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
test/net/sf/briar/transport/FrameWindowImplTest.java
View File

@@ -1,8 +1,7 @@
package net.sf.briar.transport;
import net.sf.briar.BriarTestCase;
import static net.sf.briar.api.transport.TransportConstants.FRAME_WINDOW_SIZE;
import static net.sf.briar.util.ByteUtils.MAX_32_BIT_UNSIGNED;
import net.sf.briar.BriarTestCase;
import org.junit.Test;
@@ -13,77 +12,71 @@ public class FrameWindowImplTest extends BriarTestCase {
FrameWindow w = new FrameWindowImpl();
for(int i = 0; i < 100; i++) {
assertTrue(w.contains(i));
w.remove(i);
assertTrue(w.remove(i));
assertFalse(w.contains(i));
}
for(int i = 100; i < 100 + FRAME_WINDOW_SIZE; i++) {
assertTrue(w.contains(i));
assertFalse(w.isTooHigh(i));
}
assertFalse(w.contains(100 + FRAME_WINDOW_SIZE));
assertTrue(w.isTooHigh(100 + FRAME_WINDOW_SIZE));
}
@Test
public void testWindowJumping() {
FrameWindow w = new FrameWindowImpl();
for(int i = 0; i < 100; i += 13) {
// Base of the window is 0
for(int i = 0; i < FRAME_WINDOW_SIZE; i++) assertTrue(w.contains(i));
assertFalse(w.contains(FRAME_WINDOW_SIZE));
assertFalse(w.isTooHigh(FRAME_WINDOW_SIZE - 1));
assertTrue(w.isTooHigh(FRAME_WINDOW_SIZE));
// Remove all numbers except 0 and 5
for(int i = 1; i < 5; i++) assertTrue(w.remove(i));
for(int i = 6; i < FRAME_WINDOW_SIZE; i++) assertTrue(w.remove(i));
// Base of the window should still be 0
assertTrue(w.contains(0));
for(int i = 1; i < 5; i++) assertFalse(w.contains(i));
assertTrue(w.contains(5));
for(int i = 6; i < FRAME_WINDOW_SIZE; i++) assertFalse(w.contains(i));
assertFalse(w.contains(FRAME_WINDOW_SIZE));
assertFalse(w.isTooHigh(FRAME_WINDOW_SIZE - 1));
assertTrue(w.isTooHigh(FRAME_WINDOW_SIZE));
// Remove 0
assertTrue(w.remove(0));
// Base of the window should now be 5
for(int i = 0; i < 5; i++) assertFalse(w.contains(i));
assertTrue(w.contains(5));
for(int i = 6; i < FRAME_WINDOW_SIZE; i++) assertFalse(w.contains(i));
for(int i = FRAME_WINDOW_SIZE; i < FRAME_WINDOW_SIZE + 5; i++) {
assertTrue(w.contains(i));
w.remove(i);
}
assertFalse(w.contains(FRAME_WINDOW_SIZE + 5));
assertFalse(w.isTooHigh(FRAME_WINDOW_SIZE + 4));
assertTrue(w.isTooHigh(FRAME_WINDOW_SIZE + 5));
// Remove all numbers except 5
for(int i = FRAME_WINDOW_SIZE; i < FRAME_WINDOW_SIZE + 5; i++) {
assertTrue(w.remove(i));
}
// Base of the window should still be 5
assertTrue(w.contains(5));
for(int i = 6; i < FRAME_WINDOW_SIZE + 5; i++) {
assertFalse(w.contains(i));
}
}
@Test
public void testWindowUpperLimit() {
FrameWindow w = new FrameWindowImpl();
// Centre is 0, highest value in window is 15
for(int i = 0; i < 16; i++) assertTrue(w.contains(i));
assertFalse(w.remove(16));
assertTrue(w.remove(15));
assertFalse(w.remove(15));
// Centre is 16, highest value in window is 31
for(int i = 0; i < 32; i++) assertEquals(i != 15, w.contains(i));
assertFalse(w.remove(32));
assertTrue(w.remove(31));
// Values greater than 2^32 - 1 should never be allowed
assertTrue(w.advance(MAX_32_BIT_UNSIGNED - 1));
assertTrue(w.remove(MAX_32_BIT_UNSIGNED - 1));
assertTrue(w.remove(MAX_32_BIT_UNSIGNED));
try {
w.remove(MAX_32_BIT_UNSIGNED + 1);
fail();
} catch(IllegalArgumentException expected) {}
}
@Test
public void testAdvance() {
FrameWindow w = new FrameWindowImpl();
long centre = 0;
for(int i = 0; i < 10; i++) {
long bottom = Math.max(0, centre - FRAME_WINDOW_SIZE / 2);
long top = Math.min(MAX_32_BIT_UNSIGNED,
centre + FRAME_WINDOW_SIZE / 2 - 1);
if(bottom > 0) assertFalse(w.contains(bottom - 1));
for(long j = bottom; j <= top; j++) assertTrue(w.contains(j));
if(top < MAX_32_BIT_UNSIGNED) assertFalse(w.contains(top + 1));
centre += 12345;
assertTrue(w.advance(centre));
assertFalse(w.contains(FRAME_WINDOW_SIZE + 5));
assertFalse(w.isTooHigh(FRAME_WINDOW_SIZE + 4));
assertTrue(w.isTooHigh(FRAME_WINDOW_SIZE + 5));
// Remove 5
assertTrue(w.remove(5));
// Base of the window should now be FRAME_WINDOW_SIZE + 5
for(int i = 0; i < FRAME_WINDOW_SIZE + 5; i++) {
assertFalse(w.contains(i));
}
}
@Test
public void testWindowLowerLimit() {
FrameWindow w = new FrameWindowImpl();
// Centre is 0, negative values should never be allowed
try {
w.remove(-1);
fail();
} catch(IllegalArgumentException expected) {}
// Slide the window twice
assertTrue(w.remove(15));
assertTrue(w.remove(16));
// Centre is 17, lowest value in window is 1
assertFalse(w.remove(0));
assertTrue(w.remove(1));
// Slide the window
assertTrue(w.remove(25));
// Centre is 26, lowest value in window is 10
assertFalse(w.remove(9));
assertTrue(w.remove(10));
for(int i = FRAME_WINDOW_SIZE + 5; i < FRAME_WINDOW_SIZE * 2 + 5; i++) {
assertTrue(w.contains(i));
}
assertFalse(w.contains(FRAME_WINDOW_SIZE * 2 + 5));
assertFalse(w.isTooHigh(FRAME_WINDOW_SIZE * 2 + 4));
assertTrue(w.isTooHigh(FRAME_WINDOW_SIZE * 2 + 5));
}
}