Tested on RPi, both RPi1 and RPi2; works fine and fast

[iot2.git] / iotjava / iotrmi / C++ / basics / TestClassAdvanced_Stub.cpp

diff --git a/iotjava/iotrmi/C++/basics/TestClassAdvanced_Stub.cpp b/iotjava/iotrmi/C++/basics/TestClassAdvanced_Stub.cpp
index 66872c10e757f20937389a056f8713b1608bdcfe..2b8069f35481968e9a5dea1097392786458d12ec 100644 (file)
--- a/iotjava/iotrmi/C++/basics/TestClassAdvanced_Stub.cpp
+++ b/iotjava/iotrmi/C++/basics/TestClassAdvanced_Stub.cpp
@@ -10,26 +10,30 @@ int main(int argc, char *argv[])
 
        int port = 5010;
        const char* address = "localhost";
-       //const char* address = "128.195.136.170";      // dc-9.calit2.uci.edu
+       //const char* address = "192.168.2.191";        // RPi2
+       //const char* skeletonAddress = "128.195.136.170";      // dc-9.calit2.uci.edu
+       //const char* callbackAddress = "128.195.204.132";      // dw-2.eecs.uci.edu (this machine)
+       const char* skeletonAddress = "192.168.2.108";  // RPi1
+       const char* callbackAddress = "192.168.2.191";  // RPi2
        int rev = 0;
        bool bResult = false;
        vector<int> ports;
        ports.push_back(12345);
 
-       TestClassComplete *tcStub = new TestClassComplete_Stub(port, address, rev, &bResult, ports);
+       TestClassComplete *tcStub = new TestClassComplete_Stub(port, skeletonAddress, callbackAddress, rev, &bResult, ports);
        cout << "==== ENUM ====" << endl;
-/*     Enum en;
+       Enum en;
        en = APPLE;
        Enum res = tcStub->handleEnum(en);
        cout << "Return value: " << res << endl;
        Enum resComp = tcStub->handleEnumComplex(en, 23, 'c');
-       cout << "Return value: " << resComp << endl;*/
+       cout << "Return value: " << resComp << endl;
        vector<Enum> vecEn;
        vecEn.push_back(APPLE);
        vecEn.push_back(ORANGE);
        vecEn.push_back(APPLE);
        vecEn.push_back(GRAPE);
-/*     vector<Enum> vecRes = tcStub->handleEnumArray(vecEn);
+       vector<Enum> vecRes = tcStub->handleEnumArray(vecEn);
        for (Enum en : vecRes) {
                cout << "Enum value: " << en << endl;
        }
@@ -40,7 +44,7 @@ int main(int argc, char *argv[])
        vector<Enum> vecRes3 = tcStub->handleEnumComplex2(vecEn, 23, 'c');
        for (Enum en : vecRes3) {
                cout << "Enum value: " << en << endl;
-       }*/
+       }
 
 
        cout << "==== STRUCT ====" << endl;