From aec43d6de7a5118d9bc60c08cdd6c4868e32ff75 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Thu, 6 Dec 2012 13:36:10 +0000
Subject: [PATCH] Enabled logging in non-JUnit modem tests.
---
briar-core/src/net/sf/briar/plugins/modem/ModemPlugin.java | 2 ++
.../src/net/sf/briar/plugins/modem/ModemClientTest.java | 4 ++++
.../src/net/sf/briar/plugins/modem/ModemServerTest.java | 4 ++++
3 files changed, 10 insertions(+)
diff --git a/briar-core/src/net/sf/briar/plugins/modem/ModemPlugin.java b/briar-core/src/net/sf/briar/plugins/modem/ModemPlugin.java
index 3e675ccf15..caa6fb2d15 100644
--- a/briar-core/src/net/sf/briar/plugins/modem/ModemPlugin.java
+++ b/briar-core/src/net/sf/briar/plugins/modem/ModemPlugin.java
@@ -68,6 +68,8 @@ class ModemPlugin implements DuplexPlugin, Modem.Callback {
public boolean start() {
for(String portName : SerialPortList.getPortNames()) {
+ if(LOG.isLoggable(INFO))
+ LOG.info("Trying to initialise modem on " + portName);
modem = modemFactory.createModem(this, portName);
try {
modem.init();
diff --git a/briar-tests/src/net/sf/briar/plugins/modem/ModemClientTest.java b/briar-tests/src/net/sf/briar/plugins/modem/ModemClientTest.java
index d4daf1f8ba..2d3bd77840 100644
--- a/briar-tests/src/net/sf/briar/plugins/modem/ModemClientTest.java
+++ b/briar-tests/src/net/sf/briar/plugins/modem/ModemClientTest.java
@@ -1,10 +1,13 @@
package net.sf.briar.plugins.modem;
+import static java.util.logging.Level.INFO;
+
import java.util.Collections;
import java.util.Map;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import java.util.logging.Logger;
import net.sf.briar.api.ContactId;
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.exit(1);
}
+ Logger.getLogger("net.sf.briar").setLevel(INFO);
ExecutorService executor = Executors.newCachedThreadPool();
try {
new ModemClientTest(executor, args[0]).run();
diff --git a/briar-tests/src/net/sf/briar/plugins/modem/ModemServerTest.java b/briar-tests/src/net/sf/briar/plugins/modem/ModemServerTest.java
index ca572de126..437e9deea5 100644
--- a/briar-tests/src/net/sf/briar/plugins/modem/ModemServerTest.java
+++ b/briar-tests/src/net/sf/briar/plugins/modem/ModemServerTest.java
@@ -1,9 +1,12 @@
package net.sf.briar.plugins.modem;
+import static java.util.logging.Level.INFO;
+
import java.util.Collections;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import java.util.logging.Logger;
import net.sf.briar.api.TransportConfig;
import net.sf.briar.api.TransportProperties;
@@ -23,6 +26,7 @@ public class ModemServerTest extends DuplexServerTest {
}
public static void main(String[] args) throws Exception {
+ Logger.getLogger("net.sf.briar").setLevel(INFO);
ExecutorService executor = Executors.newCachedThreadPool();
try {
new ModemServerTest(executor).run();
--
GitLab