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

Rigorous address validation broke a unit test.

Browse Source
This commit is contained in:
akwizgran
2014-04-04 23:59:55 +01:00
parent 1923dba345
commit cc9e1ec300
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
briar-tests/src/org/briarproject/plugins/tcp/LanTcpPluginTest.java
View File

@@ -105,9 +105,13 @@ public class LanTcpPluginTest extends BriarTestCase {
Executor executor = Executors.newCachedThreadPool(); Executor executor = Executors.newCachedThreadPool();
DuplexPlugin plugin = new LanTcpPlugin(executor, callback, 0, 0, 0); DuplexPlugin plugin = new LanTcpPlugin(executor, callback, 0, 0, 0);
plugin.start(); plugin.start();
// Listen on a local port // The plugin should have bound a socket and stored the port number
assertTrue(callback.propertiesLatch.await(5, SECONDS));
String addr = callback.local.get("address");
assertNotNull(addr);
// Listen on the same interface as the plugin
final ServerSocket ss = new ServerSocket(); final ServerSocket ss = new ServerSocket();
ss.bind(new InetSocketAddress("127.0.0.1", 0), 10); ss.bind(new InetSocketAddress(addr, 0), 10);
int port = ss.getLocalPort(); int port = ss.getLocalPort();
final CountDownLatch latch = new CountDownLatch(1); final CountDownLatch latch = new CountDownLatch(1);
final AtomicBoolean error = new AtomicBoolean(false); final AtomicBoolean error = new AtomicBoolean(false);
@@ -124,7 +128,7 @@ public class LanTcpPluginTest extends BriarTestCase {
}.start(); }.start();
// Tell the plugin about the port // Tell the plugin about the port
TransportProperties p = new TransportProperties(); TransportProperties p = new TransportProperties();
p.put("address", "127.0.0.1"); p.put("address", addr);
p.put("port", String.valueOf(port)); p.put("port", String.valueOf(port));
callback.remote.put(contactId, p); callback.remote.put(contactId, p);
// Connect to the port // Connect to the port