jnr-unixsocket: Re-enabled some unit tests

Author: hypfvieh

dbus-java-utils/src/main/java/org/freedesktop/dbus/bin/Caller.java

@@ -20,7 +20,8 @@
 
 import org.freedesktop.dbus.Marshalling;
 import org.freedesktop.dbus.connections.BusAddress;
-import org.freedesktop.dbus.connections.Transport;
+import org.freedesktop.dbus.connections.transports.AbstractTransport;
+import org.freedesktop.dbus.connections.transports.TransportFactory;
 import org.freedesktop.dbus.errors.Error;
 import org.freedesktop.dbus.messages.Message;
 import org.freedesktop.dbus.messages.MethodCall;
@@ -34,7 +35,7 @@ private Caller() {
     public static void main(String[] args) {
         String addr = System.getenv("DBUS_SESSION_BUS_ADDRESS");
 
-        try (Transport conn = new Transport(new BusAddress(addr))) {
+        try (AbstractTransport conn = TransportFactory.createTransport(new BusAddress(addr))) {
             if (args.length < 4) {
                 System.out.println("Syntax: Caller <dest> <path> <interface> <method> [<sig> <args>]");
                 System.exit(1);

dbus-java/src/main/java/org/freedesktop/dbus/connections/AbstractConnection.java

@@ -153,7 +153,7 @@ protected AbstractConnection(String address) throws DBusException {
         } catch (IOException | DBusException ioe) {
             logger.debug("Error creating transport", ioe);
             disconnect();
-            throw new DBusException("Failed to connect to bus " + ioe.getMessage(), ioe);
+            throw new DBusException("Failed to connect to bus: " + ioe.getMessage(), ioe);
         }
         run = true;
 

dbus-java/src/test/java/org/freedesktop/dbus/test/TestDisconnectStuff.java

@@ -8,13 +8,11 @@
 import org.freedesktop.dbus.exceptions.NotConnected;
 import org.freedesktop.dbus.test.helper.SampleClass;
 import org.freedesktop.dbus.test.helper.interfaces.SampleRemoteInterface;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 public class TestDisconnectStuff {
 
     @Test
-    @Disabled("Fails when run in maven combined with all other tests, but runs as standalone")
     public void testStuffAfterDisconnect() throws DBusException, InterruptedException {
 
         DBusConnection serverConnection = DBusConnection.getConnection(DBusBusType.SESSION);

dbus-java/src/test/java/org/freedesktop/dbus/test/TestPeer2Peer.java

@@ -12,7 +12,6 @@
 import org.freedesktop.dbus.test.helper.P2pTestServer;
 import org.freedesktop.dbus.test.helper.SampleException;
 import org.freedesktop.dbus.test.helper.interfaces.SampleRemoteInterface;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 public class TestPeer2Peer {
@@ -22,7 +21,6 @@ public class TestPeer2Peer {
     private static final String CONNECTION_ADDRESS = DirectConnection.createDynamicSession();
 
     @Test
-    @Disabled
     public void testP2p() throws InterruptedException {
         P2pServer p2pServer = new P2pServer();
         p2pServer.start();

dbus-java/src/test/java/org/freedesktop/dbus/test/TestTwoPart.java

@@ -11,7 +11,6 @@
 import org.freedesktop.dbus.test.helper.interfaces.TwoPartObject;
 import org.freedesktop.dbus.test.helper.twopart.TwoPartTestClient.TwoPartTestObject;
 import org.freedesktop.dbus.test.helper.twopart.TwoPartTestServer;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 public class TestTwoPart {
@@ -20,13 +19,12 @@ public class TestTwoPart {
     private volatile boolean serverReady = false;
 
     @Test
-    @Disabled("sporadically fails due to timeout")
     public void testTwoPart() throws InterruptedException {
         TwoPartServer twoPartServer = new TwoPartServer();
         twoPartServer.start();
 
         while (!serverReady) {
-            Thread.sleep(500L);
+            Thread.sleep(1500L);
         }
 
         try {

dbus-java/src/test/resources/logback.xml

@@ -15,6 +15,7 @@
     <logger name="org.freedesktop.dbus.errors" level="INFO" />
     <logger name="org.freedesktop.dbus.messages" level="INFO" />
     <logger name="org.freedesktop.dbus.MessageWriter" level="INFO" />
+    <logger name="org.freedesktop.dbus.connections.SASL" level="INFO" />
 
     <logger name="org.freedesktop.dbus.bin" level="INFO" />