Testing struct for array and list (Java and C++); fixing bugs

[iot2.git] / iotjava / iotrmi / Java / basics / TestClass.java

diff --git a/iotjava/iotrmi/Java/basics/TestClass.java b/iotjava/iotrmi/Java/basics/TestClass.java
index 616606d573adc6dc4764ec53cd22496e15060fbd..a5c0c1136741b7388af085066173cca6acb61ef7 100644 (file)
--- a/iotjava/iotrmi/Java/basics/TestClass.java
+++ b/iotjava/iotrmi/Java/basics/TestClass.java
@@ -10,7 +10,7 @@ public class TestClass implements TestClassInterface {
        private int intA;
        private float floatB;
        private String stringC;
-       private List<CallBackInterface> cblist;
+       private List<CallBackInterfaceWithCallBack> cblist;
 
        /**
         * Constructors
@@ -32,16 +32,17 @@ public class TestClass implements TestClassInterface {
 
 
        // Callback
-       public void registerCallback(CallBackInterface _cb) {
+       //public void registerCallback(CallBackInterface _cb) {
+       public void registerCallback(CallBackInterfaceWithCallBack _cb) {
 
-               cblist.add(cb);
+               cblist.add(_cb);
                System.out.println("Registering callback object!");
        }
 
 
-       /*public void registerCallback(CallBackInterface[] _cb) {
+       /*public void registerCallback(CallBackInterfaceWithCallBack[] _cb) {
 
-               for (CallBackInterface cb : _cb) {
+               for (CallBackInterfaceWithCallBack cb : _cb) {
                        cblist.add(cb);
                        System.out.println("Registering callback object!");
                }
@@ -51,7 +52,7 @@ public class TestClass implements TestClassInterface {
        public int callBack() {
 
                int sum = 0;
-               for (CallBackInterface cb : cblist) {
+               for (CallBackInterfaceWithCallBack cb : cblist) {
                        sum = sum + cb.printInt();
                }
                return sum;
@@ -212,6 +213,92 @@ public class TestClass implements TestClassInterface {
        }
 
 
+       // Enum
+       public Enum handleEnum(Enum en) {
+
+               System.out.println("Enum: " + en);
+                               
+               return en;
+       }
+
+
+       public Enum[] handleEnumArray(Enum[] en) {
+
+               for (Enum e : en) {
+                       System.out.println("Enum: " + e);
+               }
+               
+               return en;
+       }
+
+
+       public List<Enum> handleEnumList(List<Enum> en) {
+
+               for (Enum e : en) {
+                       System.out.println("Enum: " + e);
+               }
+               
+               return en;
+       }
+
+
+       // Struct
+       public Struct handleStruct(Struct str) {
+
+               System.out.println("Name: " + str.name);
+               System.out.println("Value: " + str.value);
+               System.out.println("Year: " + str.year);
+
+
+               Struct test = new Struct();
+               test.name = "Anonymous";
+               test.value = 1.33f;
+               test.year = 2016;
+
+               str = test;
+
+               return str;
+       }
+
+
+       public Struct[] handleStructArray(Struct str[]) {
+
+               for (Struct st : str) {
+                       System.out.println("Name: " + st.name);
+                       System.out.println("Value: " + st.value);
+                       System.out.println("Year: " + st.year);
+               }
+
+               Struct test = new Struct();
+               test.name = "Anonymous";
+               test.value = 1.33f;
+               test.year = 2016;
+
+               str[0] = test;
+
+               return str;
+       }
+
+
+       public List<Struct> handleStructList(List<Struct> str) {
+
+               for (Struct st : str) {
+                       System.out.println("Name: " + st.name);
+                       System.out.println("Value: " + st.value);
+                       System.out.println("Year: " + st.year);
+               }
+
+               Struct test = new Struct();
+               test.name = "Tests";
+               test.value = 1.34f;
+               test.year = 2017;
+
+               str.add(test);
+
+               return str;
+       }
+
+
        // Getters
        public String sumArray(String[] newA) {