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

[iot2.git] / iotjava / iotrmi / C++ / basics / TestClass.hpp

diff --git a/iotjava/iotrmi/C++/basics/TestClass.hpp b/iotjava/iotrmi/C++/basics/TestClass.hpp
index 1892ca068b8c464cfe3b4dadd3bb4de1fdb2bdd2..58a6d2a176cb8fa303090689d06cb4fba227fccc 100644 (file)
--- a/iotjava/iotrmi/C++/basics/TestClass.hpp
+++ b/iotjava/iotrmi/C++/basics/TestClass.hpp
@@ -50,6 +50,8 @@ class TestClass : public TestClassInterface {
 
                // Struct
                Struct                          handleStruct(Struct str);
+               vector<Struct>          handleStructArray(vector<Struct> vecStr);
+               vector<Struct>          handleStructList(vector<Struct> vecStr);
 
                int                                     getA();
                void                            setA(int _int);
@@ -310,7 +312,7 @@ Struct TestClass::handleStruct(Struct str) {
 }
 
 
-/*vector<Struct> TestClass::handleStruct(vector<Struct> vecStr) {
+vector<Struct> TestClass::handleStructArray(vector<Struct> vecStr) {
 
        for (Struct str : vecStr) {
 
@@ -325,7 +327,25 @@ Struct TestClass::handleStruct(Struct str) {
        vecStr.push_back(test);
 
        return vecStr;
-}*/
+}
+
+
+vector<Struct> TestClass::handleStructList(vector<Struct> vecStr) {
+
+       for (Struct str : vecStr) {
+
+               cout << "Name: " << str.name << endl;
+               cout << "Value: " << str.value << endl;
+               cout << "Year: " << str.year << endl;
+       }
+       Struct test;
+       test.name = "Trimananda";
+       test.value = 1.33;
+       test.year = 2016;
+       vecStr.push_back(test);
+
+       return vecStr;
+}
 
 
 string TestClass::sumArray(vector<string> newA) {