projects
/
iot2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f25abc5
)
Testing enum and callback combination
author
rtrimana
<rtrimana@uci.edu>
Thu, 8 Dec 2016 19:51:07 +0000
(11:51 -0800)
committer
rtrimana
<rtrimana@uci.edu>
Thu, 8 Dec 2016 19:51:07 +0000
(11:51 -0800)
config/iotpolicy/testclasspolicy_advanced.pol
patch
|
blob
|
history
iotjava/iotrmi/C++/basics/TestClass.hpp
patch
|
blob
|
history
iotjava/iotrmi/C++/basics/TestClassAdvanced_Stub.cpp
patch
|
blob
|
history
iotjava/iotrmi/Java/basics/TestClass.java
patch
|
blob
|
history
iotjava/iotrmi/Java/basics/TestClassAdvanced_Stub.java
patch
|
blob
|
history
diff --git
a/config/iotpolicy/testclasspolicy_advanced.pol
b/config/iotpolicy/testclasspolicy_advanced.pol
index aa269faacd5af5fb924c19c72ac818a88b43569a..9867b232fd0e7bfc3dabee6415e100238bc2c869 100644
(file)
--- a/
config/iotpolicy/testclasspolicy_advanced.pol
+++ b/
config/iotpolicy/testclasspolicy_advanced.pol
@@
-19,6
+19,7
@@
public interface TestClassInterface {
public void registerCallbackList(List<CallBackInterface> _cb);
public void registerCallbackComplex(int in, List<CallBackInterface> _cb, double db);
public int callBack();
public void registerCallbackList(List<CallBackInterface> _cb);
public void registerCallbackComplex(int in, List<CallBackInterface> _cb, double db);
public int callBack();
+ public Enum[] handleCallbackEnum(Enum en[], char c, List<CallBackInterface> _cb);
public Enum[] handleAll(Enum en[], List<Struct> str, char c, List<CallBackInterface> _cb);
public Enum[] handleAll(Enum en[], List<Struct> str, char c, List<CallBackInterface> _cb);
@@
-38,6
+39,7
@@
public interface TestClassInterface {
method = "handleStructComplex2(int in, char c, Struct str[])";
method = "handleEnumStruct(Enum en[], List<Struct> str, char c)";
method = "handleStructComplex2(int in, char c, Struct str[])";
method = "handleEnumStruct(Enum en[], List<Struct> str, char c)";
+ method = "handleCallbackEnum(Enum en[], char c, List<CallBackInterface> _cb)";
method = "handleAll(Enum en[], List<Struct> str, char c, List<CallBackInterface> _cb)";
}
method = "handleAll(Enum en[], List<Struct> str, char c, List<CallBackInterface> _cb)";
}
diff --git
a/iotjava/iotrmi/C++/basics/TestClass.hpp
b/iotjava/iotrmi/C++/basics/TestClass.hpp
index f33dbf28b97c95294af1ad4d9e8632d4ede57d85..a052c0d26654488f1bbac153a5bd0ea128f85a23 100644
(file)
--- a/
iotjava/iotrmi/C++/basics/TestClass.hpp
+++ b/
iotjava/iotrmi/C++/basics/TestClass.hpp
@@
-44,6
+44,7
@@
class TestClass : public TestClassInterface {
void registerCallbackList(vector<CallBackInterfaceWithCallBack*> _cb);
void registerCallbackComplex(int in, vector<CallBackInterfaceWithCallBack*> _cb, double db);
int callBack();
void registerCallbackList(vector<CallBackInterfaceWithCallBack*> _cb);
void registerCallbackComplex(int in, vector<CallBackInterfaceWithCallBack*> _cb, double db);
int callBack();
+ vector<Enum> handleCallbackEnum(vector<Enum> en, char c, vector<CallBackInterfaceWithCallBack*> _cb);
// Enum
Enum handleEnum(Enum en);
// Enum
Enum handleEnum(Enum en);
@@
-468,6
+469,19
@@
vector<Enum> TestClass::handleAll(vector<Enum> en, vector<Struct> str, char c, v
}
}
+vector<Enum> TestClass::handleCallbackEnum(vector<Enum> en, char c, vector<CallBackInterfaceWithCallBack*> _cb) {
+
+ for (CallBackInterfaceWithCallBack* cb : _cb) {
+ cbvec.push_back(cb);
+ cout << "Registering callback object in array!" << endl;
+ }
+
+ cout << "Char: " << c << endl;
+
+ return en;
+}
+
+
string TestClass::sumArray(vector<string> newA) {
string sum = "";
string TestClass::sumArray(vector<string> newA) {
string sum = "";
diff --git
a/iotjava/iotrmi/C++/basics/TestClassAdvanced_Stub.cpp
b/iotjava/iotrmi/C++/basics/TestClassAdvanced_Stub.cpp
index 02aa8bb0f1fd1d201ccb4fb779187f149f1296ad..8e2321050fb58780f363fd897e02651f0bd5cc47 100644
(file)
--- a/
iotjava/iotrmi/C++/basics/TestClassAdvanced_Stub.cpp
+++ b/
iotjava/iotrmi/C++/basics/TestClassAdvanced_Stub.cpp
@@
-109,10
+109,15
@@
int main(int argc, char *argv[])
// tcStub->registerCallbackList(cblist);
// cout << "Return value from callback: " << tcStub->callBack() << endl;
/* tcStub->registerCallbackComplex(23, cblist, 0.1234);
// tcStub->registerCallbackList(cblist);
// cout << "Return value from callback: " << tcStub->callBack() << endl;
/* tcStub->registerCallbackComplex(23, cblist, 0.1234);
- cout << "Return value from callback: " << tcStub->callBack() << endl;
*/
+ cout << "Return value from callback: " << tcStub->callBack() << endl;
vector<Enum> vecRes5 = tcStub->handleAll(vecEn, vecStr, 'c', cblist);
for (Enum en : vecRes5) {
cout << "Enum value: " << en << endl;
vector<Enum> vecRes5 = tcStub->handleAll(vecEn, vecStr, 'c', cblist);
for (Enum en : vecRes5) {
cout << "Enum value: " << en << endl;
+ }*/
+
+ vector<Enum> vecRes6 = tcStub->handleCallbackEnum(vecEn, 'c', cblist);
+ for (Enum en : vecRes6) {
+ cout << "Enum value: " << en << endl;
}
return 0;
}
return 0;
diff --git
a/iotjava/iotrmi/Java/basics/TestClass.java
b/iotjava/iotrmi/Java/basics/TestClass.java
index 51aed4ca505908fe0e7abec17890015221b113c4..411e7db16d9f6902ee259cb9662481d742761c87 100644
(file)
--- a/
iotjava/iotrmi/Java/basics/TestClass.java
+++ b/
iotjava/iotrmi/Java/basics/TestClass.java
@@
-413,6
+413,19
@@
public class TestClass implements TestClassInterface {
}
}
+ public Enum[] handleCallbackEnum(Enum en[], char c, List<CallBackInterfaceWithCallBack> _cb) {
+
+ for (CallBackInterfaceWithCallBack cb : _cb) {
+ cblist.add(cb);
+ System.out.println("Registering callback objects in list!");
+ }
+
+ System.out.println("Char: " + c);
+
+ return en;
+ }
+
+
// Getters
public String sumArray(String[] newA) {
// Getters
public String sumArray(String[] newA) {
diff --git
a/iotjava/iotrmi/Java/basics/TestClassAdvanced_Stub.java
b/iotjava/iotrmi/Java/basics/TestClassAdvanced_Stub.java
index b8b7e24eca90fd115f7b5515a5d3014bd5e4abbc..759d3a60156bf8c6151c5ece6035f10ec125fbd6 100644
(file)
--- a/
iotjava/iotrmi/Java/basics/TestClassAdvanced_Stub.java
+++ b/
iotjava/iotrmi/Java/basics/TestClassAdvanced_Stub.java
@@
-46,20
+46,20
@@
public class TestClassAdvanced_Stub {
Struct strRes2 = tcstub.handleStructComplex(23, 'c', str);
System.out.println("Name: " + strRes2.name);
System.out.println("Value: " + strRes2.value);
Struct strRes2 = tcstub.handleStructComplex(23, 'c', str);
System.out.println("Name: " + strRes2.name);
System.out.println("Value: " + strRes2.value);
- System.out.println("Year: " + strRes2.year);
*/
+ System.out.println("Year: " + strRes2.year);
Struct str2 = new Struct();
str2.name = "Trimananda";
str2.value = 0.124f;
str2.year = 2017;
Struct[] arrStr = { str, str2 };
Struct str2 = new Struct();
str2.name = "Trimananda";
str2.value = 0.124f;
str2.year = 2017;
Struct[] arrStr = { str, str2 };
-
/*
Struct[] arrRet = tcstub.handleStructArray(arrStr);
+
Struct[] arrRet = tcstub.handleStructArray(arrStr);
for(Struct st : arrRet) {
System.out.println("Name: " + st.name);
System.out.println("Value: " + st.value);
System.out.println("Year: " + st.year);
for(Struct st : arrRet) {
System.out.println("Name: " + st.name);
System.out.println("Value: " + st.value);
System.out.println("Year: " + st.year);
- }
*/
+ }
List<Struct> stList = new ArrayList(Arrays.asList(arrStr));
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);
for(Struct st : stRetList) {
System.out.println("Name: " + st.name);
System.out.println("Value: " + st.value);
@@
-92,8
+92,11
@@
public class TestClassAdvanced_Stub {
// System.out.println("Return value from callback: " + tcstub.callBack());
/* tcstub.registerCallbackComplex(23, cblist, 0.1234);
// System.out.println("Return value from callback: " + tcstub.callBack());
/* tcstub.registerCallbackComplex(23, cblist, 0.1234);
- System.out.println("Return value from callback: " + tcstub.callBack());
*/
+ System.out.println("Return value from callback: " + tcstub.callBack());
Enum[] resArr4 = tcstub.handleAll(enArr, stList, 'c', cblist);
Enum[] resArr4 = tcstub.handleAll(enArr, stList, 'c', cblist);
- System.out.println("Enum members: " + Arrays.toString(resArr4));
+ System.out.println("Enum members: " + Arrays.toString(resArr4));*/
+
+ Enum[] resArr5 = tcstub.handleCallbackEnum(enArr, 'c', cblist);
+ System.out.println("Enum members: " + Arrays.toString(resArr5));
}
}
}
}