resource-encapsulation: Fix typo on Destroyed word

Bug: https://jira.iotivity.org/browse/IOT-2267
Change-Id: I4f582fb992a0829de0549fd164c283726650c363
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/20853
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
(cherry picked from commit 5f97a0d81aa2b495a4ce122ad193ec22955c8569)
Reviewed-on: https://gerrit.iotivity.org/gerrit/20973

diff --git a/service/resource-encapsulation/android/service/src/main/jni/JniRcsRemoteResourceObject.cpp b/service/resource-encapsulation/android/service/src/main/jni/JniRcsRemoteResourceObject.cpp
index fd84e22..7640bec 100644 (file)
--- a/service/resource-encapsulation/android/service/src/main/jni/JniRcsRemoteResourceObject.cpp
+++ b/service/resource-encapsulation/android/service/src/main/jni/JniRcsRemoteResourceObject.cpp
@@ -58,7 +58,7 @@ namespace
     jobject g_obj_ResourceState_Requested;
     jobject g_obj_ResourceState_Alive;
     jobject g_obj_ResourceState_LostSignal;
-    jobject g_obj_ResourceState_Destoryed;
+    jobject g_obj_ResourceState_Destroyed;
 
     jobject g_obj_CacheState_None;
     jobject g_obj_CacheState_Unready;
@@ -92,7 +92,7 @@ namespace
             case ResourceState::REQUESTED: return g_obj_ResourceState_Requested;
             case ResourceState::ALIVE: return g_obj_ResourceState_Alive;
             case ResourceState::LOST_SIGNAL: return g_obj_ResourceState_LostSignal;
-            case ResourceState::DESTROYED: return g_obj_ResourceState_Destoryed;
+            case ResourceState::DESTROYED: return g_obj_ResourceState_Destroyed;
         }
 
         throwRCSException(env, "Failed to convert ResourceState");
@@ -208,7 +208,7 @@ void initRCSRemoteResourceObject(JNIEnvWrapper* env)
     g_obj_ResourceState_LostSignal = env->NewGlobalRef(env->GetStaticObjectField(clsResourceState,
             "LOST_SIGNAL", AS_SIG(CLS_NAME_RESOURCE_STATE)));
 
-    g_obj_ResourceState_Destoryed = env->NewGlobalRef(env->GetStaticObjectField(clsResourceState,
+    g_obj_ResourceState_Destroyed = env->NewGlobalRef(env->GetStaticObjectField(clsResourceState,
             "DESTROYED", AS_SIG(CLS_NAME_RESOURCE_STATE)));
 
     auto clsCacheState = env->FindClass(CLS_NAME_CACHE_STATE);
@@ -237,7 +237,7 @@ void clearRCSRemoteResourceObject(JNIEnvWrapper* env)
     env->DeleteGlobalRef(g_obj_ResourceState_Requested);
     env->DeleteGlobalRef(g_obj_ResourceState_Alive);
     env->DeleteGlobalRef(g_obj_ResourceState_LostSignal);
-    env->DeleteGlobalRef(g_obj_ResourceState_Destoryed);
+    env->DeleteGlobalRef(g_obj_ResourceState_Destroyed);
 
     env->DeleteGlobalRef(g_obj_CacheState_None);
     env->DeleteGlobalRef(g_obj_CacheState_Unready);

diff --git a/service/resource-encapsulation/src/common/primitiveResource/unittests/PresenceSubscriberTest.cpp b/service/resource-encapsulation/src/common/primitiveResource/unittests/PresenceSubscriberTest.cpp
index 5d12ad6..5be112a 100644 (file)
--- a/service/resource-encapsulation/src/common/primitiveResource/unittests/PresenceSubscriberTest.cpp
+++ b/service/resource-encapsulation/src/common/primitiveResource/unittests/PresenceSubscriberTest.cpp
@@ -157,7 +157,7 @@ TEST_F(PresenceSubscriberTest, IsSubscribingOfMovedSubscriberWithAssignmentRetur
     ASSERT_FALSE(subscriber.isSubscribing());
 }
 
-TEST_F(PresenceSubscriberTest, UnsubscribeWillBeCalledWhenSubscriberIsDestoryed)
+TEST_F(PresenceSubscriberTest, UnsubscribeWillBeCalledWhenSubscriberIsDestroyed)
 {
     mocks.ExpectCallFunc(OC::OCPlatform::unsubscribePresence).Return(OC_STACK_OK);