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

Enabled logging in non-JUnit modem tests.

Browse Source
This commit is contained in:
akwizgran
2012-12-06 13:36:10 +00:00
parent 51a4f2fd62
commit aec43d6de7
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-core/src/net/sf/briar/plugins/modem/ModemPlugin.java
View File

@@ -68,6 +68,8 @@ class ModemPlugin implements DuplexPlugin, Modem.Callback {
public boolean start() { public boolean start() {
for(String portName : SerialPortList.getPortNames()) { for(String portName : SerialPortList.getPortNames()) {
if(LOG.isLoggable(INFO))
LOG.info("Trying to initialise modem on " + portName);
modem = modemFactory.createModem(this, portName); modem = modemFactory.createModem(this, portName);
try { try {
modem.init(); modem.init();

4
briar-tests/src/net/sf/briar/plugins/modem/ModemClientTest.java
View File

@@ -1,10 +1,13 @@
package net.sf.briar.plugins.modem; package net.sf.briar.plugins.modem;
import static java.util.logging.Level.INFO;
import java.util.Collections; import java.util.Collections;
import java.util.Map; import java.util.Map;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.logging.Logger;
import net.sf.briar.api.ContactId; import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportConfig; import net.sf.briar.api.TransportConfig;
@@ -33,6 +36,7 @@ public class ModemClientTest extends DuplexClientTest {
System.err.println("Please specify the server's phone number"); System.err.println("Please specify the server's phone number");
System.exit(1); System.exit(1);
} }
Logger.getLogger("net.sf.briar").setLevel(INFO);
ExecutorService executor = Executors.newCachedThreadPool(); ExecutorService executor = Executors.newCachedThreadPool();
try { try {
new ModemClientTest(executor, args[0]).run(); new ModemClientTest(executor, args[0]).run();

4
briar-tests/src/net/sf/briar/plugins/modem/ModemServerTest.java
View File

@@ -1,9 +1,12 @@
package net.sf.briar.plugins.modem; package net.sf.briar.plugins.modem;
import static java.util.logging.Level.INFO;
import java.util.Collections; import java.util.Collections;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.logging.Logger;
import net.sf.briar.api.TransportConfig; import net.sf.briar.api.TransportConfig;
import net.sf.briar.api.TransportProperties; import net.sf.briar.api.TransportProperties;
@@ -23,6 +26,7 @@ public class ModemServerTest extends DuplexServerTest {
} }
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
Logger.getLogger("net.sf.briar").setLevel(INFO);
ExecutorService executor = Executors.newCachedThreadPool(); ExecutorService executor = Executors.newCachedThreadPool();
try { try {
new ModemServerTest(executor).run(); new ModemServerTest(executor).run();