Add test for List of structs and added copyright to new classes

Author: chris-melman

dbus-java/src/main/java/org/freedesktop/dbus/messages/EmptyCollectionHelper.java

@@ -1,6 +1,6 @@
 /*
    D-Bus Java Implementation
-   Copyright (c) 2019 Technolution
+   Copyright (c) 2019 Technolution BV
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of either the GNU Lesser General Public License Version 2 or the

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

@@ -23,6 +23,7 @@
 import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -68,9 +69,11 @@
 import org.freedesktop.dbus.test.helper.signals.handler.PathSignalHandler;
 import org.freedesktop.dbus.test.helper.signals.handler.RenamedSignalHandler;
 import org.freedesktop.dbus.test.helper.signals.handler.SignalHandler;
+import org.freedesktop.dbus.test.helper.structs.IntStruct;
 import org.freedesktop.dbus.test.helper.structs.SampleStruct;
 import org.freedesktop.dbus.test.helper.structs.SampleStruct2;
 import org.freedesktop.dbus.test.helper.structs.SampleStruct3;
+import org.freedesktop.dbus.test.helper.structs.SampleStruct4;
 import org.freedesktop.dbus.test.helper.structs.SampleTuple;
 import org.freedesktop.dbus.types.UInt16;
 import org.freedesktop.dbus.types.UInt32;
@@ -379,6 +382,25 @@ public void testStruct() throws DBusException {
         }
     }
 
+    @Test
+    public void testListOfStruct() throws DBusException {
+        SampleRemoteInterface tri = (SampleRemoteInterface) clientconn.getPeerRemoteObject("foo.bar.Test", TEST_OBJECT_PATH);
+
+        IntStruct elem1 = new IntStruct(3, 7);
+		IntStruct elem2 = new IntStruct(9, 14);
+		List<IntStruct> list = Arrays.asList(elem1, elem2);
+        SampleStruct4 param = new SampleStruct4(list);
+        int[][] out = tri.testListstruct(param);
+        if (out.length != 2) {
+            fail("teststructstruct returned the wrong thing: " + Arrays.deepToString(out));
+        }
+        assertEquals(elem1.getValue1(), out[0][0]);
+        assertEquals(elem1.getValue2(), out[0][1]);
+        assertEquals(elem2.getValue1(), out[1][0]);
+        assertEquals(elem2.getValue2(), out[1][1]);
+
+    }
+    
     public void testFrob() throws DBusException {
         SampleRemoteInterface tri = (SampleRemoteInterface) clientconn.getPeerRemoteObject("foo.bar.Test", TEST_OBJECT_PATH);
         System.out.println("frobnicating");

dbus-java/src/test/java/org/freedesktop/dbus/test/helper/P2pTestServer.java

@@ -22,7 +22,9 @@
 import org.freedesktop.dbus.DBusPath;
 import org.freedesktop.dbus.connections.impl.DirectConnection;
 import org.freedesktop.dbus.test.helper.interfaces.SampleRemoteInterface;
+import org.freedesktop.dbus.test.helper.structs.IntStruct;
 import org.freedesktop.dbus.test.helper.structs.SampleStruct3;
+import org.freedesktop.dbus.test.helper.structs.SampleStruct4;
 import org.freedesktop.dbus.types.UInt16;
 
 public class P2pTestServer implements SampleRemoteInterface {
@@ -38,6 +40,18 @@ public int[][] teststructstruct(SampleStruct3 in) {
         }
         return out;
     }
+    
+    @Override
+	public int[][] testListstruct(SampleStruct4 in) {
+		List<IntStruct> list = in.getInnerListOfLists();
+		int size = list.size();
+		int[][] retVal = new int [size][];
+		for(int i = 0; i < size; i++) {
+			IntStruct elem = list.get(i);
+			retVal[i] = new int [] { elem.getValue1(), elem.getValue2()}; 
+		}
+		return retVal;
+	}
 
     @Override
     public String getNameAndThrow() {

dbus-java/src/test/java/org/freedesktop/dbus/test/helper/SampleClass.java

@@ -22,8 +22,10 @@
 import org.freedesktop.dbus.test.helper.interfaces.SampleNewInterface;
 import org.freedesktop.dbus.test.helper.interfaces.SampleRemoteInterface;
 import org.freedesktop.dbus.test.helper.interfaces.SampleRemoteInterface2;
+import org.freedesktop.dbus.test.helper.structs.IntStruct;
 import org.freedesktop.dbus.test.helper.structs.SampleStruct;
 import org.freedesktop.dbus.test.helper.structs.SampleStruct3;
+import org.freedesktop.dbus.test.helper.structs.SampleStruct4;
 import org.freedesktop.dbus.test.helper.structs.SampleTuple;
 import org.freedesktop.dbus.types.UInt16;
 import org.freedesktop.dbus.types.UInt32;
@@ -53,6 +55,18 @@ public int[][] teststructstruct(SampleStruct3 in) {
         }
         return out;
     }
+    
+    @Override
+	public int[][] testListstruct(SampleStruct4 in) {
+		List<IntStruct> list = in.getInnerListOfLists();
+		int size = list.size();
+		int[][] retVal = new int [size][];
+		for(int i = 0; i < size; i++) {
+			IntStruct elem = list.get(i);
+			retVal[i] = new int [] { elem.getValue1(), elem.getValue2()}; 
+		}
+		return retVal;
+	}
 
     @Override
     public float testfloat(float[] f) {

dbus-java/src/test/java/org/freedesktop/dbus/test/helper/interfaces/SampleRemoteInterface.java

@@ -22,6 +22,7 @@
 import org.freedesktop.dbus.interfaces.DBusInterface;
 import org.freedesktop.dbus.test.helper.SampleException;
 import org.freedesktop.dbus.test.helper.structs.SampleStruct3;
+import org.freedesktop.dbus.test.helper.structs.SampleStruct4;
 import org.freedesktop.dbus.types.UInt16;
 
 /**
@@ -70,4 +71,7 @@ public interface SampleRemoteInterface extends DBusInterface {
     List<DBusPath> pathlistrv(List<DBusPath> a);
 
     Map<DBusPath, DBusPath> pathmaprv(Map<DBusPath, DBusPath> a);
+
+    @IntrospectionDescription("Some function to test collections")
+	int[][] testListstruct(SampleStruct4 in);
 }

dbus-java/src/test/java/org/freedesktop/dbus/test/helper/structs/IntStruct.java

@@ -0,0 +1,37 @@
+/*
+   D-Bus Java Implementation
+   Copyright (c) 2019 Technolution BV 
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of either the GNU Lesser General Public License Version 2 or the
+   Academic Free Licence Version 2.1.
+
+   Full licence texts are included in the LICENSE file with this program.
+*/
+
+package org.freedesktop.dbus.test.helper.structs;
+
+import org.freedesktop.dbus.Struct;
+import org.freedesktop.dbus.annotations.Position;
+public final class IntStruct extends Struct {
+    
+	@Position(0)
+    private final int  value1;
+    
+    @Position(1)
+    private final int  value2;
+
+	public IntStruct(int value1, int value2) {
+		this.value1 = value1;
+		this.value2 = value2;
+	}
+
+	public int getValue1() {
+		return value1;
+	}
+
+	public int getValue2() {
+		return value2;
+	}
+    
+}

dbus-java/src/test/java/org/freedesktop/dbus/test/helper/structs/SampleStruct4.java

@@ -0,0 +1,32 @@
+/*
+   D-Bus Java Implementation
+   Copyright (c) 2019 Technolution BV 
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of either the GNU Lesser General Public License Version 2 or the
+   Academic Free Licence Version 2.1.
+
+   Full licence texts are included in the LICENSE file with this program.
+*/
+
+package org.freedesktop.dbus.test.helper.structs;
+
+import java.util.List;
+
+import org.freedesktop.dbus.Struct;
+import org.freedesktop.dbus.annotations.Position;
+
+
+public final class SampleStruct4 extends Struct {
+    @Position(0)
+    private final List<IntStruct> innerListOfLists;
+
+	public SampleStruct4(List<IntStruct> innerListOfLists) {
+		this.innerListOfLists = innerListOfLists;
+	}
+
+	public List<IntStruct> getInnerListOfLists() {
+		return innerListOfLists;
+	}
+
+}