jnr-unixsocket: Switched to newer jnr-unixsocket version containing some essential patches; Fixed a few issues with unit tests; Fixed handling of TransportFactory/AbstractTransport

Author: hypfvieh

dbus-java/pom.xml

@@ -111,7 +111,7 @@
          <dependency>
             <groupId>com.github.jnr</groupId>
             <artifactId>jnr-unixsocket</artifactId>
-            <version>0.22-SNAPSHOT</version>
+            <version>0.22</version>
         </dependency>
 
 		<dependency>

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

@@ -149,7 +149,6 @@ protected AbstractConnection(String address) throws DBusException {
         try {
             busAddress = new BusAddress(address);
             transport = TransportFactory.createTransport(busAddress, AbstractConnection.TIMEOUT);
-            transport.start();
             connected = true;
         } catch (IOException | DBusException ioe) {
             logger.debug("Error creating transport", ioe);

dbus-java/src/main/java/org/freedesktop/dbus/connections/transports/AbstractTransport.java

@@ -36,19 +36,21 @@ public abstract class AbstractTransport implements Closeable {
     }
 
     public void writeMessage(Message _msg) throws IOException {
-        if (!outputWriter.isClosed()) {
+        if (outputWriter != null && !outputWriter.isClosed()) {
             outputWriter.writeMessage(_msg);
+        } else {
+            throw new IOException("OutputWriter already closed or null");
         }
     }
 
     public Message readMessage() throws IOException, DBusException {
-        if (!inputReader.isClosed()) {
+        if (inputReader != null && !inputReader.isClosed()) {
             return inputReader.readMessage();
         }
-        return null;
+        throw new IOException("InputReader already closed or null");
     }
 
-    public void start() throws IOException {
+    void start() throws IOException {
         connect();
     }
 

dbus-java/src/main/java/org/freedesktop/dbus/connections/transports/TransportFactory.java

@@ -31,13 +31,18 @@ private TransportFactory() {
     public static AbstractTransport createTransport(BusAddress _address, int _timeout) throws IOException {
         LoggerFactory.getLogger(TransportFactory.class).debug("Connecting to {}", _address);
 
+        AbstractTransport transport;
+        
         if (_address.getBusType() == AddressBusTypes.UNIX) {
-            return new UnixSocketTransport(_address, _timeout);
+            transport = new UnixSocketTransport(_address, _timeout);
             // } else if (_address.getBusType() == AddressBusTypes.TCP) {
             // return new TcpTransport(_address, _timeout);
         } else {
             throw new IOException("Unknown address type " + _address.getType());
         }
+        
+        transport.start();
+        return transport;
     }
 
     public static AbstractTransport createTransport(BusAddress _address) throws IOException {

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

@@ -1,6 +1,5 @@
 package org.freedesktop.dbus.test;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
@@ -30,6 +29,7 @@ public class TestCross {
     @BeforeEach
     public void before() {
         serverThread = new ServerThread();
+        serverThread.setName("Server Thread");
         serverThread.start();
     }
 
@@ -40,17 +40,14 @@ public void after() {
         }
     }
 
-
-
     @Test
     public void testCross() throws InterruptedException {
         while (!serverReady) {
             Thread.sleep(500L);
         }
 
-        try {
+        try (DBusConnection conn = DBusConnection.getConnection(DBusBusType.SESSION)){
             /* init */
-            DBusConnection conn = DBusConnection.getConnection(DBusBusType.SESSION);
             CrossTestClient client = new CrossTestClient(conn);
             conn.exportObject("/TestClient", client);
             conn.addSigHandler(Binding.SampleSignals.Triggered.class, client);
@@ -73,13 +70,12 @@ public void testCross() throws InterruptedException {
                     System.out.println(s.getKey() + " failed: " + msg);
                 }
             }
-
-            conn.disconnect();
-        } catch (DBusException exDbe) {
+            
+        } catch (DBusException | IOException exDbe) {
             exDbe.printStackTrace();
-        }
+            fail("Exception while processing DBus");
+        } 
 
-        assertTrue(serverThread.getCts().getNotdone().isEmpty()); // all tests should have been run
     }
 
 
@@ -105,20 +101,14 @@ public void run() {
                     System.out.println(s + " ok");
                 }
                 for (String s : cts.getNotdone()) {
-                    System.out.println(s + " untested");
+                    System.out.println("---> " + s + " untested");
                 }
                 conn.disconnect();
-                assertFalse(cts.getNotdone().isEmpty(), "All tests should have been run");
+                assertTrue(cts.getNotdone().isEmpty(), "All tests should have been run, following failed: " + String.join(", ", cts.getNotdone()));
             } catch (DBusException | IOException exDe) {
                 exDe.printStackTrace();
                 fail("Exception while server running");
             }
         }
-
-        CrossTestServer getCts() {
-            return cts;
-        }
-
-
     }
 }

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

@@ -11,10 +11,10 @@
     <logger name="com" level="INFO" />
     <logger name="org" level="INFO" />
     <logger name="cx.ath.matthew" level="INFO" />
-    <logger name="org.freedesktop.dbus.connections" level="TRACE" />
+    <logger name="org.freedesktop.dbus.connections" level="INFO" />
     <logger name="org.freedesktop.dbus.errors" level="INFO" />
-    <logger name="org.freedesktop.dbus.messages" level="TRACE" />
-    <logger name="org.freedesktop.dbus.MessageWriter" level="TRACE" />
+    <logger name="org.freedesktop.dbus.messages" level="INFO" />
+    <logger name="org.freedesktop.dbus.MessageWriter" level="INFO" />
 
     <logger name="org.freedesktop.dbus.bin" level="INFO" />