EasySetup API test added

diff --git a/network-manager/nmlib/IoT/CMakeLists.txt b/network-manager/nmlib/IoT/CMakeLists.txt
index 83a4d01..74db985 100644 (file)
--- a/network-manager/nmlib/IoT/CMakeLists.txt
+++ b/network-manager/nmlib/IoT/CMakeLists.txt
@@ -16,6 +16,7 @@ target_link_libraries(${PROJECT_NAME}
 
     # Easy-setup sdk lib
     #ESMediatorRich
+    ESEnrolleeSDK
     
     # main iotivity libs
     oc octbstack oc_logger connectivity_abstraction

diff --git a/network-manager/nmlib/IoT/inc/IOT_Enrollee.h b/network-manager/nmlib/IoT/inc/IOT_Enrollee.h
index ac4cd3c..cbbd9f4 100644 (file)
--- a/network-manager/nmlib/IoT/inc/IOT_Enrollee.h
+++ b/network-manager/nmlib/IoT/inc/IOT_Enrollee.h
@@ -1,6 +1,7 @@
 #ifndef __IOT_ENROLLEE_H__
 #define __IOT_ENROLLEE_H__
 
+#include <iostream>
 #include <memory>
 #include <string>
 
@@ -26,6 +27,15 @@ public:
 
     IOT_Enrollee& operator=(const IOT_Enrollee& _obj);
 
+    std::string host() const { return m_host; }
+    std::string auth_provider() const { return m_auth_provider; }
+    std::string auth_code() const { return m_auth_code; }
+
+    std::string uid() const { return m_uid; }
+    std::string access_token() const { return m_access_token; }
+
+    friend std::ostream& operator<<(std::ostream& _os, const IOT_Enrollee& _obj);
+
 private:
     std::string m_host;
     std::string m_auth_provider;

diff --git a/network-manager/nmlib/IoT/src/IOT_Enrollee.cpp b/network-manager/nmlib/IoT/src/IOT_Enrollee.cpp
index c384eb5..98b18b7 100644 (file)
--- a/network-manager/nmlib/IoT/src/IOT_Enrollee.cpp
+++ b/network-manager/nmlib/IoT/src/IOT_Enrollee.cpp
@@ -88,3 +88,11 @@ IOT_Enrollee& IOT_Enrollee::operator=(const IOT_Enrollee& _obj)
     }
     return *this;
 }
+
+/*******************************************************/
+/*******************************************************/
+/*friend*/ std::ostream& operator<<(std::ostream& _os, const IOT_Enrollee& _obj)
+{
+    _os << "host : " << _obj.m_host << " auth_provider : " << _obj.m_auth_provider << " auth_code : " << _obj.m_auth_code << " uid : " << _obj.m_uid << " access_token : " << _obj.m_access_token;
+    return _os;
+}

diff --git a/network-manager/test/CMakeLists.txt b/network-manager/test/CMakeLists.txt
index 247c047..61e6515 100644 (file)
--- a/network-manager/test/CMakeLists.txt
+++ b/network-manager/test/CMakeLists.txt
@@ -10,7 +10,7 @@ include_directories (
 
 FILE(GLOB SRCS *.cpp)
 
-add_executable (${PROJECT_NAME} ${SRCS})
+add_executable (${PROJECT_NAME} ${SRCS} ${NETWORK_MANAGER_LIB}/IoT/src/IOT_DeviceFinder.cpp ${NETWORK_MANAGER_LIB}/IoT/src/IOT_EasySetup.c)
 
 target_link_libraries(${PROJECT_NAME}
     ${GTEST_LIB}

diff --git a/network-manager/test/test_IoT.cpp b/network-manager/test/test_IoT.cpp
index 9993585..3693628 100644 (file)
--- a/network-manager/test/test_IoT.cpp
+++ b/network-manager/test/test_IoT.cpp
@@ -5,7 +5,10 @@
 
 #include "OCPlatform.h"
 #include "OCApi.h"
+
 #include "IOT_DeviceFinder.h"
+#include "IOT_EasySetup.h"
+#include "IOT_Enrollee.h"
 
 using namespace std;
 
@@ -25,6 +28,43 @@ TEST(test_IoT, IOT_DeviceFinder)
     ASSERT_TRUE(res);
 }
 
+#if 0
+TEST(test_IoT, IOT_EasySetup)
+{
+    IOT_EasySetup_Info info;
+    bool res;
+    if((res = IOT_EasySetup(&info)))
+    {
+        std::cout << "host : " << info.cloud_info.host << std::endl;
+        std::cout << "auth_provider : " << info.cloud_info.auth_provider << std::endl;
+        std::cout << "auth_code : " << info.cloud_info.auth_code << std::endl;
+    }
+    ASSERT_TRUE(res);
+}
+#endif
+
+FILE* server_fopen(const char *path, const char *mode)
+{
+    (void) path;
+    return fopen("oic_svr_db_server.dat", mode);
+}
+TEST(test_IoT, IOT_Enrollee)
+{
+    try
+    {
+        OCPersistentStorage ps{ server_fopen, fread, fwrite, fclose, unlink };
+        OC::PlatformConfig cfg = {OC::ServiceType::InProc, OC::ModeType::Both, "0.0.0.0", 0, OC::QualityOfService::LowQos, &ps};
+        IOT_Enrollee enrollee = IOT_Enrollee::Create(cfg, CT_ADAPTER_TCP);
+        std::cout << enrollee << std::endl;
+        ASSERT_TRUE(true);
+    }
+    catch(const std::exception& _e)
+    {
+        std::cout << "err : " << _e.what() << std::endl;
+        ASSERT_TRUE(false);
+    }
+}
+
 TEST(test_IoT, configureTest)
 {
     OC::PlatformConfig config { OC::ServiceType::InProc, OC::ModeType::Both, "0.0.0.0", 0, OC::QualityOfService::HighQos };