From 5045b58e01635a181cee854a87fa0a38cefbcf26 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Mon, 29 Feb 2016 11:51:16 +0000
Subject: [PATCH] Explicitly check array lengths.
---
.../src/org/briarproject/data/BdfDictionaryTest.java | 8 ++++++--
briar-tests/src/org/briarproject/data/BdfListTest.java | 8 ++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/briar-tests/src/org/briarproject/data/BdfDictionaryTest.java b/briar-tests/src/org/briarproject/data/BdfDictionaryTest.java
index 99e42bcf23..0e2c9d8dfa 100644
--- a/briar-tests/src/org/briarproject/data/BdfDictionaryTest.java
+++ b/briar-tests/src/org/briarproject/data/BdfDictionaryTest.java
@@ -55,7 +55,11 @@ public class BdfDictionaryTest extends BriarTestCase {
BdfDictionary d = new BdfDictionary();
d.put("foo", new byte[123]);
d.put("bar", new Bytes(new byte[123]));
- assertArrayEquals(new byte[123], d.getRaw("foo"));
- assertArrayEquals(new byte[123], d.getRaw("bar"));
+ byte[] foo = d.getRaw("foo");
+ assertEquals(123, foo.length);
+ assertArrayEquals(new byte[123], foo);
+ byte[] bar = d.getRaw("bar");
+ assertEquals(123, bar.length);
+ assertArrayEquals(new byte[123], bar);
}
}
diff --git a/briar-tests/src/org/briarproject/data/BdfListTest.java b/briar-tests/src/org/briarproject/data/BdfListTest.java
index 4b0275faad..b1954e8164 100644
--- a/briar-tests/src/org/briarproject/data/BdfListTest.java
+++ b/briar-tests/src/org/briarproject/data/BdfListTest.java
@@ -55,7 +55,11 @@ public class BdfListTest extends BriarTestCase {
BdfList list = new BdfList();
list.add(new byte[123]);
list.add(new Bytes(new byte[123]));
- assertArrayEquals(new byte[123], list.getRaw(0));
- assertArrayEquals(new byte[123], list.getRaw(1));
+ byte[] first = list.getRaw(0);
+ assertEquals(123, first.length);
+ assertArrayEquals(new byte[123], first);
+ byte[] second = list.getRaw(1);
+ assertEquals(123, second.length);
+ assertArrayEquals(new byte[123], second);
}
}
--
GitLab