Adjustments in stubs and skeletons for callback in callback; using different ports...

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

diff --git a/iotjava/iotrmi/Java/basics/TestClassAdvanced_Stub.java b/iotjava/iotrmi/Java/basics/TestClassAdvanced_Stub.java
index 84f8c6e79911a7da9e86ba80d34f2c5120e90c5f..6fc89b581274172c57de4cbbf8b28ff6cf2417e1 100644 (file)
--- a/iotjava/iotrmi/Java/basics/TestClassAdvanced_Stub.java
+++ b/iotjava/iotrmi/Java/basics/TestClassAdvanced_Stub.java
@@ -15,13 +15,14 @@ public class TestClassAdvanced_Stub {
                //String address = "localhost";
                //String address = "192.168.2.191";     // RPi2
                //String skeletonAddress = "128.195.136.170";   // dc-9.calit2.uci.edu
-               //String callbackAddress = "128.195.204.132";   // dw-2.eecs.uci.edu (this machine)
-               String skeletonAddress = "192.168.2.108";       // RPi1
-               String callbackAddress = "192.168.2.191";       // RPi2
+               String skeletonAddress = "128.195.204.132";
+               String callbackAddress = "128.195.204.132";     // dw-2.eecs.uci.edu (this machine)
+               //String skeletonAddress = "192.168.2.108";     // RPi1
+               //String callbackAddress = "192.168.2.191";     // RPi2
                int rev = 0;
 
                TestClassComplete_Stub tcstub = new TestClassComplete_Stub(port, skeletonAddress, callbackAddress, rev, ports);
-               System.out.println("==== ENUM ====");
+               /*System.out.println("==== ENUM ====");
                Enum en = Enum.APPLE;
                Enum res = tcstub.handleEnum(en);
                System.out.println("Enum member: " + res);
@@ -63,7 +64,7 @@ public class TestClassAdvanced_Stub {
                        System.out.println("Year: " + st.year);
                }
                List<Struct> stList = new ArrayList(Arrays.asList(arrStr));
-/*             List<Struct> stRetList = tcstub.handleStructList(stList);
+               List<Struct> stRetList = tcstub.handleStructList(stList);
                for(Struct st : stRetList) {
                        System.out.println("Name: " + st.name);
                        System.out.println("Value: " + st.value);
@@ -78,16 +79,16 @@ public class TestClassAdvanced_Stub {
                Enum[] resArr3 = tcstub.handleEnumStruct(enArr, stList, 'c');
                System.out.println("Enum members: " + Arrays.toString(resArr3));*/
 
-/*             System.out.println("==== CALLBACKS ====");
+               System.out.println("==== CALLBACKS ====");
                CallBackInterface cbSingle = new CallBack(2354);
                tcstub.registerCallback(cbSingle);
                System.out.println("Return value from callback: " + tcstub.callBack());
-               CallBackInterface cb1 = new CallBack(23);
+               /*CallBackInterface cb1 = new CallBack(23);
                CallBackInterface cb2 = new CallBack(33);
                CallBackInterface cb3 = new CallBack(43);
                CallBackInterface[] cb = { cb1, cb2, cb3 };
                tcstub.registerCallbackArray(cb);
-               System.out.println("Return value from callback: " + tcstub.callBack());*/
+               System.out.println("Return value from callback: " + tcstub.callBack());
                List<CallBackInterface> cblist = new ArrayList<CallBackInterface>();
                CallBackInterface cb4 = new CallBack(53); cblist.add(cb4);
                CallBackInterface cb5 = new CallBack(63); cblist.add(cb5);
@@ -95,7 +96,7 @@ public class TestClassAdvanced_Stub {
 //             tcstub.registerCallbackList(cblist);
 //             System.out.println("Return value from callback: " + tcstub.callBack());
 
-/*             tcstub.registerCallbackComplex(23, cblist, 0.1234);
+               tcstub.registerCallbackComplex(23, cblist, 0.1234);
                System.out.println("Return value from callback: " + tcstub.callBack());
                Enum[] resArr4 = tcstub.handleAll(enArr, stList, 'c', cblist);
                System.out.println("Enum members: " + Arrays.toString(resArr4));
@@ -114,12 +115,12 @@ public class TestClassAdvanced_Stub {
                        System.out.println("Name: " + st.name);
                        System.out.println("Value: " + st.value);
                        System.out.println("Year: " + st.year);
-               }*/
+               }
                List<Struct> stRetList3 = tcstub.handleStructThree(stList, stList, stList);
                for(Struct st : stRetList3) {
                        System.out.println("Name: " + st.name);
                        System.out.println("Value: " + st.value);
                        System.out.println("Year: " + st.year);
-               }
+               }*/
        }
 }