http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/cppcache/integration-test/ThinClientPutGetAll.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientPutGetAll.hpp b/src/cppcache/integration-test/ThinClientPutGetAll.hpp index e7a74f8..53c0a2a 100644 --- a/src/cppcache/integration-test/ThinClientPutGetAll.hpp +++ b/src/cppcache/integration-test/ThinClientPutGetAll.hpp @@ -60,7 +60,7 @@ const char* _regionNames[] = {"DistRegionAck"}; #include "LocatorHelper.hpp" void verifyGetAll(RegionPtr region, bool addToLocalCache, const char** _vals, - int startIndex, CacheablePtr callBack = NULLPTR) { + int startIndex, CacheablePtr callBack = nullptr) { CacheableKeyPtr keyPtr0 = CacheableKey::create(_keys[0]); CacheableKeyPtr keyPtr1 = CacheableKey::create(_keys[1]); CacheableKeyPtr keyPtr2 = CacheableKey::create("keyNotThere"); @@ -74,17 +74,17 @@ void verifyGetAll(RegionPtr region, bool addToLocalCache, const char** _vals, expected[_keys[0]] = _vals[startIndex + 0]; expected[_keys[1]] = _vals[startIndex + 1]; - HashMapOfCacheablePtr valuesMap(new HashMapOfCacheable()); + auto valuesMap = std::make_shared<HashMapOfCacheable>(); valuesMap->clear(); - region->getAll(keys1, valuesMap, NULLPTR, addToLocalCache, callBack); + region->getAll(keys1, valuesMap, nullptr, addToLocalCache, callBack); if (valuesMap->size() == keys1.size()) { char buf[2048]; for (HashMapOfCacheable::Iterator iter = valuesMap->begin(); iter != valuesMap->end(); iter++) { - CacheableKeyPtr key = dynCast<CacheableKeyPtr>(iter.first()); + auto key = std::dynamic_pointer_cast<CacheableKey>(iter.first()); const char* actualKey = key->toString()->asChar(); CacheablePtr mVal = iter.second(); - if (mVal != NULLPTR) { + if (mVal != nullptr) { const char* expectedVal = expected[actualKey].c_str(); const char* actualVal = mVal->toString()->asChar(); sprintf(buf, "value from map %s , expected value %s ", actualVal, @@ -115,7 +115,7 @@ void createPooledRegion(const char* name, bool ackMode, const char* locators, RegionPtr regPtr = getHelper()->createPooledRegion(name, ackMode, locators, poolname, cachingEnable, clientNotificationEnabled); - ASSERT(regPtr != NULLPTR, "Failed to create region."); + ASSERT(regPtr != nullptr, "Failed to create region."); LOG("Pooled Region created."); } @@ -131,9 +131,10 @@ END_TASK_DEFINITION DUNIT_TASK_DEFINITION(CLIENT1, StepOne_Pooled_Locator) { + // waitForDebugger(); // start 1st client with caching enable true and client notification true initClientWithPool(true, "__TEST_POOL1__", locatorsG, "ServerGroup1", - NULLPTR, 0, true); + nullptr, 0, true); createPooledRegion(_regionNames[0], USE_ACK, locatorsG, poolName, true, true); LOG("StepOne_Pooled_Locator complete."); @@ -144,7 +145,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, StepTwo_Pooled_Locator) { // start 1st client with caching enable true and client notification true initClientWithPool(true, "__TEST_POOL1__", locatorsG, "ServerGroup1", - NULLPTR, 0, true); + nullptr, 0, true); createPooledRegion(_regionNames[0], USE_ACK, locatorsG, poolName, true, true); LOG("StepTwo_Pooled_Locator complete."); @@ -207,7 +208,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, GetAllAfterLocalDestroyRegionOnClientTwo) // of region. RegionPtr reg0 = getHelper()->getRegion(_regionNames[0]); reg0->localDestroyRegion(); - reg0 = NULLPTR; + reg0 = nullptr; getHelper()->createPooledRegion(regionNames[0], USE_ACK, 0, "__TEST_POOL1__", true, true); reg0 = getHelper()->getRegion(_regionNames[0]); @@ -223,7 +224,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, GetAllAfterLocalDestroyRegionOnClientTwo_Pool) // of region. RegionPtr reg0 = getHelper()->getRegion(_regionNames[0]); reg0->localDestroyRegion(); - reg0 = NULLPTR; + reg0 = nullptr; createPooledRegion(_regionNames[0], USE_ACK, locatorsG, poolName, true, true); reg0 = getHelper()->getRegion(_regionNames[0]); @@ -294,16 +295,16 @@ DUNIT_TASK_DEFINITION(CLIENT1, putallAndGetallPdxWithCallBackArg) // ignore exception } - PdxTypes1Ptr p1(new PdxTypes1()); - PdxTypes2Ptr p2(new PdxTypes2()); - PdxTypes3Ptr p3(new PdxTypes3()); - PdxTypes4Ptr p4(new PdxTypes4()); - PdxTypes5Ptr p5(new PdxTypes5()); - PdxTypes6Ptr p6(new PdxTypes6()); - PdxTypes7Ptr p7(new PdxTypes7()); - PdxTypes8Ptr p8(new PdxTypes8()); - PdxTypes9Ptr p9(new PdxTypes9()); - PdxTypes10Ptr p10(new PdxTypes10()); + auto p1 = std::make_shared<PdxTypes1>(); + auto p2 = std::make_shared<PdxTypes2>(); + auto p3 = std::make_shared<PdxTypes3>(); + auto p4 = std::make_shared<PdxTypes4>(); + auto p5 = std::make_shared<PdxTypes5>(); + auto p6 = std::make_shared<PdxTypes6>(); + auto p7 = std::make_shared<PdxTypes7>(); + auto p8 = std::make_shared<PdxTypes8>(); + auto p9 = std::make_shared<PdxTypes9>(); + auto p10 = std::make_shared<PdxTypes10>(); // putAll from client 1 HashMapOfCacheable map0; @@ -348,51 +349,61 @@ DUNIT_TASK_DEFINITION(CLIENT1, putallAndGetallPdxWithCallBackArg) keys1.push_back(CacheableInt32::create(28)); keys1.push_back(CacheableInt32::create(29)); keys1.push_back(CacheableInt32::create(30)); - HashMapOfCacheablePtr valuesMap(new HashMapOfCacheable()); + auto valuesMap = std::make_shared<HashMapOfCacheable>(); valuesMap->clear(); - regPtr0->getAll(keys1, valuesMap, NULLPTR, true, + regPtr0->getAll(keys1, valuesMap, nullptr, true, CacheableInt32::create(1000)); LOG("GetallPdxWithCallBackArg on Pdx objects completed."); ASSERT(valuesMap->size() == keys1.size(), "getAll size did not match"); - PdxTypes10Ptr pRet10 = valuesMap->operator[](CacheableInt32::create(30)); + auto pRet10 = std::dynamic_pointer_cast<PdxTypes10>( + valuesMap->operator[](CacheableInt32::create(30))); ASSERT(p10->equals(pRet10) == true, "Objects of type PdxTypes10 should be equal"); - PdxTypes9Ptr pRet9 = valuesMap->operator[](CacheableInt32::create(29)); + auto pRet9 = std::dynamic_pointer_cast<PdxTypes9>( + valuesMap->operator[](CacheableInt32::create(29))); ASSERT(p9->equals(pRet9) == true, "Objects of type PdxTypes9 should be equal"); - PdxTypes8Ptr pRet8 = valuesMap->operator[](CacheableInt32::create(28)); + auto pRet8 = std::dynamic_pointer_cast<PdxTypes8>( + valuesMap->operator[](CacheableInt32::create(28))); ASSERT(p8->equals(pRet8) == true, "Objects of type PdxTypes8 should be equal"); - PdxTypes7Ptr pRet7 = valuesMap->operator[](CacheableInt32::create(27)); + auto pRet7 = std::dynamic_pointer_cast<PdxTypes7>( + valuesMap->operator[](CacheableInt32::create(27))); ASSERT(p7->equals(pRet7) == true, "Objects of type PdxTypes7 should be equal"); - PdxTypes6Ptr pRet6 = valuesMap->operator[](CacheableInt32::create(26)); + auto pRet6 = std::dynamic_pointer_cast<PdxTypes6>( + valuesMap->operator[](CacheableInt32::create(26))); ASSERT(p6->equals(pRet6) == true, "Objects of type PdxTypes6 should be equal"); - PdxTypes5Ptr pRet5 = valuesMap->operator[](CacheableInt32::create(25)); + auto pRet5 = std::dynamic_pointer_cast<PdxTypes5>( + valuesMap->operator[](CacheableInt32::create(25))); ASSERT(p5->equals(pRet5) == true, "Objects of type PdxTypes5 should be equal"); - PdxTypes4Ptr pRet4 = valuesMap->operator[](CacheableInt32::create(24)); + auto pRet4 = std::dynamic_pointer_cast<PdxTypes4>( + valuesMap->operator[](CacheableInt32::create(24))); ASSERT(p4->equals(pRet4) == true, "Objects of type PdxTypes4 should be equal"); - PdxTypes3Ptr pRet3 = valuesMap->operator[](CacheableInt32::create(23)); + auto pRet3 = std::dynamic_pointer_cast<PdxTypes3>( + valuesMap->operator[](CacheableInt32::create(23))); ASSERT(p3->equals(pRet3) == true, "Objects of type PdxTypes3 should be equal"); - PdxTypes2Ptr pRet2 = valuesMap->operator[](CacheableInt32::create(22)); + auto pRet2 = std::dynamic_pointer_cast<PdxTypes2>( + valuesMap->operator[](CacheableInt32::create(22))); ASSERT(p2->equals(pRet2) == true, "Objects of type PdxTypes2 should be equal"); - PdxTypes1Ptr pRet1 = valuesMap->operator[](CacheableInt32::create(21)); + auto pRet1 = std::dynamic_pointer_cast<PdxTypes1>( + valuesMap->operator[](CacheableInt32::create(21))); ASSERT(p1->equals(pRet1) == true, "Objects of type PdxTypes1 should be equal"); @@ -461,16 +472,16 @@ DUNIT_TASK_DEFINITION(CLIENT1, putallAndGetallPdx) // ignore exception } - PdxTypes1Ptr p1(new PdxTypes1()); - PdxTypes2Ptr p2(new PdxTypes2()); - PdxTypes3Ptr p3(new PdxTypes3()); - PdxTypes4Ptr p4(new PdxTypes4()); - PdxTypes5Ptr p5(new PdxTypes5()); - PdxTypes6Ptr p6(new PdxTypes6()); - PdxTypes7Ptr p7(new PdxTypes7()); - PdxTypes8Ptr p8(new PdxTypes8()); - PdxTypes9Ptr p9(new PdxTypes9()); - PdxTypes10Ptr p10(new PdxTypes10()); + auto p1 = std::make_shared<PdxTypes1>(); + auto p2 = std::make_shared<PdxTypes2>(); + auto p3 = std::make_shared<PdxTypes3>(); + auto p4 = std::make_shared<PdxTypes4>(); + auto p5 = std::make_shared<PdxTypes5>(); + auto p6 = std::make_shared<PdxTypes6>(); + auto p7 = std::make_shared<PdxTypes7>(); + auto p8 = std::make_shared<PdxTypes8>(); + auto p9 = std::make_shared<PdxTypes9>(); + auto p10 = std::make_shared<PdxTypes10>(); // putAll from client 1 HashMapOfCacheable map0; @@ -513,50 +524,60 @@ DUNIT_TASK_DEFINITION(CLIENT1, putallAndGetallPdx) keys1.push_back(CacheableInt32::create(28)); keys1.push_back(CacheableInt32::create(29)); keys1.push_back(CacheableInt32::create(30)); - HashMapOfCacheablePtr valuesMap(new HashMapOfCacheable()); + auto valuesMap = std::make_shared<HashMapOfCacheable>(); valuesMap->clear(); - regPtr0->getAll(keys1, valuesMap, NULLPTR, true); + regPtr0->getAll(keys1, valuesMap, nullptr, true); LOG("getAll on Pdx objects completed."); ASSERT(valuesMap->size() == keys1.size(), "getAll size did not match"); - PdxTypes10Ptr pRet10 = valuesMap->operator[](CacheableInt32::create(30)); + auto pRet10 = std::dynamic_pointer_cast<PdxTypes10>( + valuesMap->operator[](CacheableInt32::create(30))); ASSERT(p10->equals(pRet10) == true, "Objects of type PdxTypes10 should be equal"); - PdxTypes9Ptr pRet9 = valuesMap->operator[](CacheableInt32::create(29)); + auto pRet9 = std::dynamic_pointer_cast<PdxTypes9>( + valuesMap->operator[](CacheableInt32::create(29))); ASSERT(p9->equals(pRet9) == true, "Objects of type PdxTypes9 should be equal"); - PdxTypes8Ptr pRet8 = valuesMap->operator[](CacheableInt32::create(28)); + auto pRet8 = std::dynamic_pointer_cast<PdxTypes8>( + valuesMap->operator[](CacheableInt32::create(28))); ASSERT(p8->equals(pRet8) == true, "Objects of type PdxTypes8 should be equal"); - PdxTypes7Ptr pRet7 = valuesMap->operator[](CacheableInt32::create(27)); + auto pRet7 = std::dynamic_pointer_cast<PdxTypes7>( + valuesMap->operator[](CacheableInt32::create(27))); ASSERT(p7->equals(pRet7) == true, "Objects of type PdxTypes7 should be equal"); - PdxTypes6Ptr pRet6 = valuesMap->operator[](CacheableInt32::create(26)); + auto pRet6 = std::dynamic_pointer_cast<PdxTypes6>( + valuesMap->operator[](CacheableInt32::create(26))); ASSERT(p6->equals(pRet6) == true, "Objects of type PdxTypes6 should be equal"); - PdxTypes5Ptr pRet5 = valuesMap->operator[](CacheableInt32::create(25)); + auto pRet5 = std::dynamic_pointer_cast<PdxTypes5>( + valuesMap->operator[](CacheableInt32::create(25))); ASSERT(p5->equals(pRet5) == true, "Objects of type PdxTypes5 should be equal"); - PdxTypes4Ptr pRet4 = valuesMap->operator[](CacheableInt32::create(24)); + auto pRet4 = std::dynamic_pointer_cast<PdxTypes4>( + valuesMap->operator[](CacheableInt32::create(24))); ASSERT(p4->equals(pRet4) == true, "Objects of type PdxTypes4 should be equal"); - PdxTypes3Ptr pRet3 = valuesMap->operator[](CacheableInt32::create(23)); + auto pRet3 = std::dynamic_pointer_cast<PdxTypes3>( + valuesMap->operator[](CacheableInt32::create(23))); ASSERT(p3->equals(pRet3) == true, "Objects of type PdxTypes3 should be equal"); - PdxTypes2Ptr pRet2 = valuesMap->operator[](CacheableInt32::create(22)); + auto pRet2 = std::dynamic_pointer_cast<PdxTypes2>( + valuesMap->operator[](CacheableInt32::create(22))); ASSERT(p2->equals(pRet2) == true, "Objects of type PdxTypes2 should be equal"); - PdxTypes1Ptr pRet1 = valuesMap->operator[](CacheableInt32::create(21)); + auto pRet1 = std::dynamic_pointer_cast<PdxTypes1>( + valuesMap->operator[](CacheableInt32::create(21))); ASSERT(p1->equals(pRet1) == true, "Objects of type PdxTypes1 should be equal");
http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/cppcache/integration-test/ThinClientRIwithlocalRegionDestroy.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientRIwithlocalRegionDestroy.hpp b/src/cppcache/integration-test/ThinClientRIwithlocalRegionDestroy.hpp index 39d2da2..c7ca2fd 100644 --- a/src/cppcache/integration-test/ThinClientRIwithlocalRegionDestroy.hpp +++ b/src/cppcache/integration-test/ThinClientRIwithlocalRegionDestroy.hpp @@ -93,8 +93,8 @@ class SimpleCacheListener : public CacheListener { }; typedef SharedPtr<SimpleCacheListener> SimpleCacheListenerPtr; -SimpleCacheListenerPtr eventListener1 = NULLPTR; -SimpleCacheListenerPtr eventListener2 = NULLPTR; +SimpleCacheListenerPtr eventListener1 = nullptr; +SimpleCacheListenerPtr eventListener2 = nullptr; void initClient(const bool isthinClient) { if (cacheHelper == NULL) { @@ -124,7 +124,7 @@ void createPooledRegion(const char* name, bool ackMode, const char* locators, RegionPtr regPtr = getHelper()->createPooledRegion(name, ackMode, locators, poolname, cachingEnable, clientNotificationEnabled); - ASSERT(regPtr != NULLPTR, "Failed to create region."); + ASSERT(regPtr != nullptr, "Failed to create region."); LOG("Pooled Region created."); } @@ -159,12 +159,12 @@ DUNIT_TASK_DEFINITION(CLIENT1, StepOne_Pool_Locator) // Attache Listener RegionPtr regionPtr0 = getHelper()->getRegion(regionNames[0]); AttributesMutatorPtr attrMutatorPtr = regionPtr0->getAttributesMutator(); - eventListener1 = new SimpleCacheListener(); + eventListener1 = std::make_shared<SimpleCacheListener>(); attrMutatorPtr->setCacheListener(eventListener1); AttributesMutatorPtr subregAttrMutatorPtr = subregPtr1->getAttributesMutator(); - eventListener2 = new SimpleCacheListener(); + eventListener2 = std::make_shared<SimpleCacheListener>(); subregAttrMutatorPtr->setCacheListener(eventListener2); LOG("StepOne_Pool complete."); http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/cppcache/integration-test/ThinClientRegex.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientRegex.hpp b/src/cppcache/integration-test/ThinClientRegex.hpp index fe4debe..c7696d3 100644 --- a/src/cppcache/integration-test/ThinClientRegex.hpp +++ b/src/cppcache/integration-test/ThinClientRegex.hpp @@ -84,7 +84,7 @@ void _verifyEntry(const char* name, const char* key, const char* val, free(buf); RegionPtr regPtr = getHelper()->getRegion(name); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); CacheableKeyPtr keyPtr = createKey(key); @@ -133,10 +133,9 @@ void _verifyEntry(const char* name, const char* key, const char* val, } if (val != NULL) { - CacheableStringPtr checkPtr = - dynCast<CacheableStringPtr>(regPtr->get(keyPtr)); + auto checkPtr = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr)); - ASSERT(checkPtr != NULLPTR, "Value Ptr should not be null."); + ASSERT(checkPtr != nullptr, "Value Ptr should not be null."); char buf[1024]; sprintf(buf, "In verify loop, get returned %s for key %s", checkPtr->asChar(), key); @@ -204,7 +203,7 @@ void createPooledRegion(const char* name, bool ackMode, const char* locators, RegionPtr regPtr = getHelper()->createPooledRegion(name, ackMode, locators, poolname, cachingEnable, clientNotificationEnabled); - ASSERT(regPtr != NULLPTR, "Failed to create region."); + ASSERT(regPtr != nullptr, "Failed to create region."); LOG("Pooled Region created."); } void createEntry(const char* name, const char* key, const char* value = NULL) { @@ -220,7 +219,7 @@ void createEntry(const char* name, const char* key, const char* value = NULL) { CacheableStringPtr valPtr = CacheableString::create(value); RegionPtr regPtr = getHelper()->getRegion(name); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); ASSERT(!regPtr->containsKey(keyPtr), "Key should not have been found in region."); @@ -245,7 +244,7 @@ void updateEntry(const char* name, const char* key, const char* value) { CacheableStringPtr valPtr = CacheableString::create(value); RegionPtr regPtr = getHelper()->getRegion(name); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); ASSERT(regPtr->containsKey(keyPtr), "Key should have been found in region."); ASSERT(regPtr->containsValueForKey(keyPtr), @@ -271,17 +270,16 @@ void doNetsearch(const char* name, const char* key, const char* value) { RegionPtr regPtr = getHelper()->getRegion(name); fprintf(stdout, "netsearch region %s\n", regPtr->getName()); fflush(stdout); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); ASSERT(!regPtr->containsKey(keyPtr), "Key should not have been found in region."); ASSERT(!regPtr->containsValueForKey(keyPtr), "Value should not have been found in region."); - CacheableStringPtr checkPtr = - dynCast<CacheableStringPtr>(regPtr->get(keyPtr)); // force a netsearch + auto checkPtr = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr)); // force a netsearch - if (checkPtr != NULLPTR) { + if (checkPtr != nullptr) { LOG("checkPtr is not null"); char buf[1024]; sprintf(buf, "In net search, get returned %s for key %s", http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/cppcache/integration-test/ThinClientRegex2.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientRegex2.hpp b/src/cppcache/integration-test/ThinClientRegex2.hpp index 4d93d56..db199fa 100644 --- a/src/cppcache/integration-test/ThinClientRegex2.hpp +++ b/src/cppcache/integration-test/ThinClientRegex2.hpp @@ -85,7 +85,7 @@ void _verifyEntry(const char* name, const char* key, const char* val, free(buf); RegionPtr regPtr = getHelper()->getRegion(name); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); CacheableKeyPtr keyPtr = createKey(key); @@ -134,10 +134,9 @@ void _verifyEntry(const char* name, const char* key, const char* val, } if (val != NULL) { - CacheableStringPtr checkPtr = - dynCast<CacheableStringPtr>(regPtr->get(keyPtr)); + auto checkPtr = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr)); - ASSERT(checkPtr != NULLPTR, "Value Ptr should not be null."); + ASSERT(checkPtr != nullptr, "Value Ptr should not be null."); char buf[1024]; sprintf(buf, "In verify loop, get returned %s for key %s", checkPtr->asChar(), key); @@ -200,9 +199,9 @@ void createRegion(const char* name, bool ackMode, LOG("createRegion() entered."); fprintf(stdout, "Creating region -- %s ackMode is %d\n", name, ackMode); fflush(stdout); - RegionPtr regPtr = getHelper()->createRegion(name, ackMode, true, NULLPTR, + RegionPtr regPtr = getHelper()->createRegion(name, ackMode, true, nullptr, clientNotificationEnabled); - ASSERT(regPtr != NULLPTR, "Failed to create region."); + ASSERT(regPtr != nullptr, "Failed to create region."); LOG("Region created."); } void createPooledRegion(const char* name, bool ackMode, const char* locators, @@ -215,7 +214,7 @@ void createPooledRegion(const char* name, bool ackMode, const char* locators, RegionPtr regPtr = getHelper()->createPooledRegion(name, ackMode, locators, poolname, cachingEnable, clientNotificationEnabled); - ASSERT(regPtr != NULLPTR, "Failed to create region."); + ASSERT(regPtr != nullptr, "Failed to create region."); LOG("Pooled Region created."); } void createEntry(const char* name, const char* key, const char* value = NULL) { @@ -231,7 +230,7 @@ void createEntry(const char* name, const char* key, const char* value = NULL) { CacheableStringPtr valPtr = CacheableString::create(value); RegionPtr regPtr = getHelper()->getRegion(name); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); ASSERT(!regPtr->containsKey(keyPtr), "Key should not have been found in region."); @@ -256,7 +255,7 @@ void updateEntry(const char* name, const char* key, const char* value) { CacheableStringPtr valPtr = CacheableString::create(value); RegionPtr regPtr = getHelper()->getRegion(name); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); ASSERT(regPtr->containsKey(keyPtr), "Key should have been found in region."); ASSERT(regPtr->containsValueForKey(keyPtr), @@ -282,17 +281,16 @@ void doNetsearch(const char* name, const char* key, const char* value) { RegionPtr regPtr = getHelper()->getRegion(name); fprintf(stdout, "netsearch region %s\n", regPtr->getName()); fflush(stdout); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); ASSERT(!regPtr->containsKey(keyPtr), "Key should not have been found in region."); ASSERT(!regPtr->containsValueForKey(keyPtr), "Value should not have been found in region."); - CacheableStringPtr checkPtr = - dynCast<CacheableStringPtr>(regPtr->get(keyPtr)); // force a netsearch + auto checkPtr = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr)); // force a netsearch - if (checkPtr != NULLPTR) { + if (checkPtr != nullptr) { LOG("checkPtr is not null"); char buf[1024]; sprintf(buf, "In net search, get returned %s for key %s", http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/cppcache/integration-test/ThinClientRegex3.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientRegex3.hpp b/src/cppcache/integration-test/ThinClientRegex3.hpp index ed4b287..bae3756 100644 --- a/src/cppcache/integration-test/ThinClientRegex3.hpp +++ b/src/cppcache/integration-test/ThinClientRegex3.hpp @@ -85,7 +85,7 @@ void _verifyEntry(const char* name, const char* key, const char* val, free(buf); RegionPtr regPtr = getHelper()->getRegion(name); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); CacheableKeyPtr keyPtr = createKey(key); @@ -134,10 +134,10 @@ void _verifyEntry(const char* name, const char* key, const char* val, } if (val != NULL) { - CacheableStringPtr checkPtr = - dynCast<CacheableStringPtr>(regPtr->get(keyPtr)); + auto checkPtr = + std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr)); - ASSERT(checkPtr != NULLPTR, "Value Ptr should not be null."); + ASSERT(checkPtr != nullptr, "Value Ptr should not be null."); char buf[1024]; sprintf(buf, "In verify loop, get returned %s for key %s", checkPtr->asChar(), key); @@ -201,8 +201,8 @@ void createRegion(const char* name, bool ackMode, const char* endpoints, fprintf(stdout, "Creating region -- %s ackMode is %d\n", name, ackMode); fflush(stdout); RegionPtr regPtr = getHelper()->createRegion( - name, ackMode, true, NULLPTR, endpoints, clientNotificationEnabled); - ASSERT(regPtr != NULLPTR, "Failed to create region."); + name, ackMode, true, nullptr, endpoints, clientNotificationEnabled); + ASSERT(regPtr != nullptr, "Failed to create region."); LOG("Region created."); } void createPooledRegion(const char* name, bool ackMode, const char* locators, @@ -215,7 +215,7 @@ void createPooledRegion(const char* name, bool ackMode, const char* locators, RegionPtr regPtr = getHelper()->createPooledRegion(name, ackMode, locators, poolname, cachingEnable, clientNotificationEnabled); - ASSERT(regPtr != NULLPTR, "Failed to create region."); + ASSERT(regPtr != nullptr, "Failed to create region."); LOG("Pooled Region created."); } void createEntry(const char* name, const char* key, const char* value = NULL) { @@ -231,7 +231,7 @@ void createEntry(const char* name, const char* key, const char* value = NULL) { CacheableStringPtr valPtr = CacheableString::create(value); RegionPtr regPtr = getHelper()->getRegion(name); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); ASSERT(!regPtr->containsKey(keyPtr), "Key should not have been found in region."); @@ -256,7 +256,7 @@ void updateEntry(const char* name, const char* key, const char* value) { CacheableStringPtr valPtr = CacheableString::create(value); RegionPtr regPtr = getHelper()->getRegion(name); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); ASSERT(regPtr->containsKey(keyPtr), "Key should have been found in region."); ASSERT(regPtr->containsValueForKey(keyPtr), @@ -282,17 +282,17 @@ void doNetsearch(const char* name, const char* key, const char* value) { RegionPtr regPtr = getHelper()->getRegion(name); fprintf(stdout, "netsearch region %s\n", regPtr->getName()); fflush(stdout); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); ASSERT(!regPtr->containsKey(keyPtr), "Key should not have been found in region."); ASSERT(!regPtr->containsValueForKey(keyPtr), "Value should not have been found in region."); - CacheableStringPtr checkPtr = - dynCast<CacheableStringPtr>(regPtr->get(keyPtr)); // force a netsearch + auto checkPtr = std::dynamic_pointer_cast<CacheableString>( + regPtr->get(keyPtr)); // force a netsearch - if (checkPtr != NULLPTR) { + if (checkPtr != nullptr) { LOG("checkPtr is not null"); char buf[1024]; sprintf(buf, "In net search, get returned %s for key %s", http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/cppcache/integration-test/ThinClientRemoveAll.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientRemoveAll.hpp b/src/cppcache/integration-test/ThinClientRemoveAll.hpp index b112f2e..b86420f 100644 --- a/src/cppcache/integration-test/ThinClientRemoveAll.hpp +++ b/src/cppcache/integration-test/ThinClientRemoveAll.hpp @@ -89,8 +89,8 @@ void createRegion(const char* name, bool ackMode, const char* endpoints, fprintf(stdout, "Creating region -- %s ackMode is %d\n", name, ackMode); fflush(stdout); RegionPtr regPtr = getHelper()->createRegion( - name, ackMode, isCacheEnabled, NULLPTR, clientNotificationEnabled); - ASSERT(regPtr != NULLPTR, "Failed to create region."); + name, ackMode, isCacheEnabled, nullptr, clientNotificationEnabled); + ASSERT(regPtr != nullptr, "Failed to create region."); LOG("Region created."); } @@ -101,8 +101,8 @@ void createRegionLocal(const char* name, bool ackMode, const char* endpoints, fprintf(stdout, "Creating region -- %s ackMode is %d\n", name, ackMode); fflush(stdout); RegionPtr regPtr = getHelper()->createRegion( - name, ackMode, isCacheEnabled, NULLPTR, clientNotificationEnabled, true); - ASSERT(regPtr != NULLPTR, "Failed to create region."); + name, ackMode, isCacheEnabled, nullptr, clientNotificationEnabled, true); + ASSERT(regPtr != nullptr, "Failed to create region."); LOG("Region created."); } @@ -116,7 +116,7 @@ void createPooledRegion(const char* name, bool ackMode, const char* locators, RegionPtr regPtr = getHelper()->createPooledRegion(name, ackMode, locators, poolname, cachingEnable, clientNotificationEnabled); - ASSERT(regPtr != NULLPTR, "Failed to create region."); + ASSERT(regPtr != nullptr, "Failed to create region."); LOG("Pooled Region created."); } @@ -130,7 +130,7 @@ void createPooledRegionConcurrencyCheckDisabled( RegionPtr regPtr = getHelper()->createPooledRegionConcurrencyCheckDisabled( name, ackMode, locators, poolname, cachingEnable, clientNotificationEnabled, concurrencyCheckEnabled); - ASSERT(regPtr != NULLPTR, "Failed to create region."); + ASSERT(regPtr != nullptr, "Failed to create region."); LOG("Pooled Region created."); } @@ -209,7 +209,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, removeAllValidation) } try { - regPtr0->removeAll(removeallkeys, NULLPTR); + regPtr0->removeAll(removeallkeys, nullptr); FAIL("Did not get expected IllegalArgumentException exception"); } catch (IllegalArgumentException&) { LOG("Got expected IllegalArgumentException found exception"); @@ -233,7 +233,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, removeAllValidation) } try { - regPtr0->removeAll(removeallkeys, NULLPTR); + regPtr0->removeAll(removeallkeys, nullptr); } catch (EntryNotFoundException&) { FAIL("Got un expected entry not found exception"); } @@ -261,7 +261,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, removeAllValidationLocal) } try { - regPtr0->removeAll(removeallkeys, NULLPTR); + regPtr0->removeAll(removeallkeys, nullptr); FAIL("Did not get expected IllegalArgumentException exception"); } catch (IllegalArgumentException&) { LOG("Got expected IllegalArgumentException found exception"); @@ -285,7 +285,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, removeAllValidationLocal) } try { - regPtr0->removeAll(removeallkeys, NULLPTR); + regPtr0->removeAll(removeallkeys, nullptr); } catch (EntryNotFoundException&) { FAIL("Got un expected entry not found exception"); } @@ -349,10 +349,10 @@ DUNIT_TASK_DEFINITION(CLIENT1, removeAllSequence) regPtr0->removeAll(removeallkeys); LOG("removeAll complete"); - ASSERT(regPtr0->get(CacheableKey::create(1)) == NULLPTR, "Key 1 exists"); - ASSERT(regPtr0->get(CacheableKey::create(2)) == NULLPTR, "Key 2 exists"); - ASSERT(regPtr0->get(CacheableKey::create(3)) == NULLPTR, "Key 3 exists"); - ASSERT(regPtr0->get(CacheableKey::create(4)) == NULLPTR, "Key 4 exists"); + ASSERT(regPtr0->get(CacheableKey::create(1)) == nullptr, "Key 1 exists"); + ASSERT(regPtr0->get(CacheableKey::create(2)) == nullptr, "Key 2 exists"); + ASSERT(regPtr0->get(CacheableKey::create(3)) == nullptr, "Key 3 exists"); + ASSERT(regPtr0->get(CacheableKey::create(4)) == nullptr, "Key 4 exists"); entryMap.clear(); entryMap.insert(CacheableKey::create(5), CacheableInt32::create(5)); @@ -361,8 +361,8 @@ DUNIT_TASK_DEFINITION(CLIENT1, removeAllSequence) regPtr0->putAll(entryMap); LOG("putAll2 complete"); - ASSERT(regPtr0->get(CacheableKey::create(5)) != NULLPTR, "Key 5 missing"); - ASSERT(regPtr0->get(CacheableKey::create(6)) != NULLPTR, "Key 6 missing"); + ASSERT(regPtr0->get(CacheableKey::create(5)) != nullptr, "Key 5 missing"); + ASSERT(regPtr0->get(CacheableKey::create(6)) != nullptr, "Key 6 missing"); LOG("remove all complete."); } http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/cppcache/integration-test/ThinClientSSL.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientSSL.hpp b/src/cppcache/integration-test/ThinClientSSL.hpp index 0dc8cc4..3f933ad 100644 --- a/src/cppcache/integration-test/ThinClientSSL.hpp +++ b/src/cppcache/integration-test/ThinClientSSL.hpp @@ -90,7 +90,7 @@ void _verifyEntry(const char* name, const char* key, const char* val, free(buf); RegionPtr regPtr = getHelper()->getRegion(name); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); CacheableKeyPtr keyPtr = createKey(key); @@ -127,10 +127,10 @@ void _verifyEntry(const char* name, const char* key, const char* val, if (val != NULL) { LOG(" checkin val"); - CacheableStringPtr checkPtr = - dynCast<CacheableStringPtr>(regPtr->get(keyPtr)); + auto checkPtr = + std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr)); - ASSERT(checkPtr != NULLPTR, "Value Ptr should not be null."); + ASSERT(checkPtr != nullptr, "Value Ptr should not be null."); char buf[1024]; sprintf(buf, "In verify loop, get returned %s for key %s", checkPtr->asChar(), key); @@ -188,7 +188,7 @@ void createPooledRegion(const char* name, bool ackMode, const char* locators, RegionPtr regPtr = getHelper()->createPooledRegion(name, ackMode, locators, poolname, cachingEnable, clientNotificationEnabled); - ASSERT(regPtr != NULLPTR, "Failed to create region."); + ASSERT(regPtr != nullptr, "Failed to create region."); LOG("Pooled Region created."); } @@ -202,7 +202,7 @@ void createEntry(const char* name, const char* key, const char* value) { CacheableStringPtr valPtr = CacheableString::create(value); RegionPtr regPtr = getHelper()->getRegion(name); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); ASSERT(!regPtr->containsKey(keyPtr), "Key should not have been found in region."); @@ -227,7 +227,7 @@ void updateEntry(const char* name, const char* key, const char* value) { CacheableStringPtr valPtr = CacheableString::create(value); RegionPtr regPtr = getHelper()->getRegion(name); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); ASSERT(regPtr->containsKey(keyPtr), "Key should have been found in region."); ASSERT(regPtr->containsValueForKey(keyPtr), @@ -253,17 +253,17 @@ void doNetsearch(const char* name, const char* key, const char* value) { RegionPtr regPtr = getHelper()->getRegion(name); fprintf(stdout, "netsearch region %s\n", regPtr->getName()); fflush(stdout); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); ASSERT(regPtr->containsKey(keyPtr), "Key should have been found in region."); ASSERT(!regPtr->containsValueForKey(keyPtr), "Value should not have been found in region."); CacheablePtr theValue = regPtr->get(keyPtr); - CacheableStringPtr checkPtr = - dynCast<CacheableStringPtr>(theValue); // force a netsearch + auto checkPtr = std::dynamic_pointer_cast<CacheableString>( + theValue); // force a netsearch - if (checkPtr != NULLPTR) { + if (checkPtr != nullptr) { LOG("checkPtr is not null"); char buf[1024]; sprintf(buf, "In net search, get returned %s for key %s", @@ -284,7 +284,7 @@ void invalidateEntry(const char* name, const char* key) { CacheableKeyPtr keyPtr = CacheableKey::create(key); RegionPtr regPtr = getHelper()->getRegion(name); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); ASSERT(regPtr->containsKey(keyPtr), "Key should have been found in region."); ASSERT(regPtr->containsValueForKey(keyPtr), @@ -305,7 +305,7 @@ void destroyEntry(const char* name, const char* key) { CacheableKeyPtr keyPtr = CacheableKey::create(key); RegionPtr regPtr = getHelper()->getRegion(name); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); ASSERT(regPtr->containsKey(keyPtr), "Key should have been found in region."); @@ -354,9 +354,9 @@ DUNIT_TASK_DEFINITION(CLIENT1, CreateRegions1_PoolLocators) true); createPooledRegion(regionNames[1], NO_ACK, locatorsG, "__TESTPOOL1_", true); RegionPtr regPtr = getHelper()->getRegion(regionNames[0]); - regPtr->registerAllKeys(false, NULLPTR, false, false); + regPtr->registerAllKeys(false, nullptr, false, false); regPtr = getHelper()->getRegion(regionNames[1]); - regPtr->registerAllKeys(false, NULLPTR, false, false); + regPtr->registerAllKeys(false, nullptr, false, false); LOG("CreateRegions1_PoolLocators complete."); } END_TASK_DEFINITION @@ -367,9 +367,9 @@ DUNIT_TASK_DEFINITION(CLIENT2, CreateRegions2_PoolLocators) true); createPooledRegion(regionNames[1], NO_ACK, locatorsG, "__TESTPOOL1_", true); RegionPtr regPtr = getHelper()->getRegion(regionNames[0]); - regPtr->registerAllKeys(false, NULLPTR, false, false); + regPtr->registerAllKeys(false, nullptr, false, false); regPtr = getHelper()->getRegion(regionNames[1]); - regPtr->registerAllKeys(false, NULLPTR, false, false); + regPtr->registerAllKeys(false, nullptr, false, false); LOG("CreateRegions2_PoolLocators complete."); } END_TASK_DEFINITION http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/cppcache/integration-test/ThinClientSSLWithPassword.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientSSLWithPassword.hpp b/src/cppcache/integration-test/ThinClientSSLWithPassword.hpp index b4fef02..5a43fa9 100644 --- a/src/cppcache/integration-test/ThinClientSSLWithPassword.hpp +++ b/src/cppcache/integration-test/ThinClientSSLWithPassword.hpp @@ -92,7 +92,7 @@ void _verifyEntry(const char* name, const char* key, const char* val, free(buf); RegionPtr regPtr = getHelper()->getRegion(name); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); CacheableKeyPtr keyPtr = createKey(key); @@ -129,10 +129,9 @@ void _verifyEntry(const char* name, const char* key, const char* val, if (val != NULL) { LOG(" checkin val"); - CacheableStringPtr checkPtr = - dynCast<CacheableStringPtr>(regPtr->get(keyPtr)); + auto checkPtr = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr)); - ASSERT(checkPtr != NULLPTR, "Value Ptr should not be null."); + ASSERT(checkPtr != nullptr, "Value Ptr should not be null."); char buf[1024]; sprintf(buf, "In verify loop, get returned %s for key %s", checkPtr->asChar(), key); @@ -187,8 +186,8 @@ void createRegion(const char* name, bool ackMode, const char* endpoints, fflush(stdout); // ack, caching RegionPtr regPtr = getHelper()->createRegion( - name, ackMode, true, NULLPTR, endpoints, clientNotificationEnabled); - ASSERT(regPtr != NULLPTR, "Failed to create region."); + name, ackMode, true, nullptr, endpoints, clientNotificationEnabled); + ASSERT(regPtr != nullptr, "Failed to create region."); LOG("Region created."); } @@ -202,7 +201,7 @@ void createPooledRegion(const char* name, bool ackMode, const char* locators, RegionPtr regPtr = getHelper()->createPooledRegion(name, ackMode, locators, poolname, cachingEnable, clientNotificationEnabled); - ASSERT(regPtr != NULLPTR, "Failed to create region."); + ASSERT(regPtr != nullptr, "Failed to create region."); LOG("Pooled Region created."); } @@ -216,7 +215,7 @@ void createEntry(const char* name, const char* key, const char* value) { CacheableStringPtr valPtr = CacheableString::create(value); RegionPtr regPtr = getHelper()->getRegion(name); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); ASSERT(!regPtr->containsKey(keyPtr), "Key should not have been found in region."); @@ -241,7 +240,7 @@ void updateEntry(const char* name, const char* key, const char* value) { CacheableStringPtr valPtr = CacheableString::create(value); RegionPtr regPtr = getHelper()->getRegion(name); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); ASSERT(regPtr->containsKey(keyPtr), "Key should have been found in region."); ASSERT(regPtr->containsValueForKey(keyPtr), @@ -267,17 +266,16 @@ void doNetsearch(const char* name, const char* key, const char* value) { RegionPtr regPtr = getHelper()->getRegion(name); fprintf(stdout, "netsearch region %s\n", regPtr->getName()); fflush(stdout); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); ASSERT(regPtr->containsKey(keyPtr), "Key should have been found in region."); ASSERT(!regPtr->containsValueForKey(keyPtr), "Value should not have been found in region."); CacheablePtr theValue = regPtr->get(keyPtr); - CacheableStringPtr checkPtr = - dynCast<CacheableStringPtr>(theValue); // force a netsearch + auto checkPtr = std::dynamic_pointer_cast<CacheableString>(theValue); // force a netsearch - if (checkPtr != NULLPTR) { + if (checkPtr != nullptr) { LOG("checkPtr is not null"); char buf[1024]; sprintf(buf, "In net search, get returned %s for key %s", @@ -298,7 +296,7 @@ void invalidateEntry(const char* name, const char* key) { CacheableKeyPtr keyPtr = CacheableKey::create(key); RegionPtr regPtr = getHelper()->getRegion(name); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); ASSERT(regPtr->containsKey(keyPtr), "Key should have been found in region."); ASSERT(regPtr->containsValueForKey(keyPtr), @@ -319,7 +317,7 @@ void destroyEntry(const char* name, const char* key) { CacheableKeyPtr keyPtr = CacheableKey::create(key); RegionPtr regPtr = getHelper()->getRegion(name); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); ASSERT(regPtr->containsKey(keyPtr), "Key should have been found in region."); @@ -368,9 +366,9 @@ DUNIT_TASK_DEFINITION(CLIENT1, CreateRegions1_PoolLocators) true); createPooledRegion(regionNames[1], NO_ACK, locatorsG, "__TESTPOOL1_", true); RegionPtr regPtr = getHelper()->getRegion(regionNames[0]); - regPtr->registerAllKeys(false, NULLPTR, false, false); + regPtr->registerAllKeys(false, nullptr, false, false); regPtr = getHelper()->getRegion(regionNames[1]); - regPtr->registerAllKeys(false, NULLPTR, false, false); + regPtr->registerAllKeys(false, nullptr, false, false); LOG("CreateRegions1_PoolLocators complete."); } END_TASK_DEFINITION @@ -381,9 +379,9 @@ DUNIT_TASK_DEFINITION(CLIENT2, CreateRegions2_PoolLocators) true); createPooledRegion(regionNames[1], NO_ACK, locatorsG, "__TESTPOOL1_", true); RegionPtr regPtr = getHelper()->getRegion(regionNames[0]); - regPtr->registerAllKeys(false, NULLPTR, false, false); + regPtr->registerAllKeys(false, nullptr, false, false); regPtr = getHelper()->getRegion(regionNames[1]); - regPtr->registerAllKeys(false, NULLPTR, false, false); + regPtr->registerAllKeys(false, nullptr, false, false); LOG("CreateRegions2_PoolLocators complete."); } END_TASK_DEFINITION http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/cppcache/integration-test/ThinClientSecurity.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientSecurity.hpp b/src/cppcache/integration-test/ThinClientSecurity.hpp index c0e726c..14c069e 100644 --- a/src/cppcache/integration-test/ThinClientSecurity.hpp +++ b/src/cppcache/integration-test/ThinClientSecurity.hpp @@ -38,7 +38,7 @@ const char* locatorsG = CacheHelper::getLocatorHostPort(isLocator, isLocalServer, numberOfLocators); void setCacheListener(const char* regName, const CacheListenerPtr& listener) { - if (listener != NULLPTR) { + if (listener != nullptr) { RegionPtr reg = getHelper()->getRegion(regName); AttributesMutatorPtr attrMutator = reg->getAttributesMutator(); attrMutator->setCacheListener(listener); @@ -47,7 +47,7 @@ void setCacheListener(const char* regName, const CacheListenerPtr& listener) { void createRegionForSecurity(const char* name, bool ackMode, bool clientNotificationEnabled = false, - const CacheListenerPtr& listener = NULLPTR, + const CacheListenerPtr& listener = nullptr, bool caching = true, int connections = -1, bool isMultiuserMode = false, int subscriptionRedundancy = -1) { @@ -57,7 +57,7 @@ void createRegionForSecurity(const char* name, bool ackMode, char buff[128] = {'\0'}; const char* poolName = name; - if (PoolManager::find(name) != NULLPTR) { + if (PoolManager::find(name) != nullptr) { static unsigned int index = 0; sprintf(buff, "%s_%d", poolName, index++); poolName = buff; http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/cppcache/integration-test/ThinClientSecurityHelper.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientSecurityHelper.hpp b/src/cppcache/integration-test/ThinClientSecurityHelper.hpp index 20d732a..0fce0f3 100644 --- a/src/cppcache/integration-test/ThinClientSecurityHelper.hpp +++ b/src/cppcache/integration-test/ThinClientSecurityHelper.hpp @@ -65,7 +65,7 @@ void initCredentialGenerator() { } } - if (credentialGeneratorHandler == NULLPTR) { + if (credentialGeneratorHandler == nullptr) { FAIL("credentialGeneratorHandler is NULL"); } @@ -121,7 +121,7 @@ void initClientAuth(char UserType) { credentialGeneratorHandler->getAllowedCredentialsForOps(wr, config, NULL); printf("User is %s Pass is %s ", config->find("security-username")->asChar(), - (config->find("security-password") != NULLPTR + (config->find("security-password") != nullptr ? config->find("security-password")->asChar() : " not set")); break; @@ -129,7 +129,7 @@ void initClientAuth(char UserType) { credentialGeneratorHandler->getAllowedCredentialsForOps(rt, config, NULL); printf("User is %s Pass is %s ", config->find("security-username")->asChar(), - (config->find("security-password") != NULLPTR + (config->find("security-password") != nullptr ? config->find("security-password")->asChar() : " not set")); break; @@ -137,7 +137,7 @@ void initClientAuth(char UserType) { credentialGeneratorHandler->getAllowedCredentialsForOps(ad, config, NULL); printf("User is %s Pass is %s ", config->find("security-username")->asChar(), - (config->find("security-password") != NULLPTR + (config->find("security-password") != nullptr ? config->find("security-password")->asChar() : " not set")); default: @@ -199,7 +199,7 @@ class putThread : public ACE_Task_Base { char buf[20]; char valbuf[20]; if (m_regInt) { - m_reg->registerAllKeys(false, NULLPTR, true); + m_reg->registerAllKeys(false, nullptr, true); } if (m_waitTime != 0) { ACE_OS::sleep(m_waitTime); @@ -230,7 +230,7 @@ class putThread : public ACE_Task_Base { m_reg->registerKeys(keys0, false, true); } } else if (m_opcode == 6) { - m_reg->registerRegex("key-[1-3]", false, NULLPTR, true); + m_reg->registerRegex("key-[1-3]", false, nullptr, true); } else { try { if (m_isCallBack) { http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/cppcache/integration-test/ThinClientTXFailover.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientTXFailover.hpp b/src/cppcache/integration-test/ThinClientTXFailover.hpp index d30cdb0..e5a26fc 100644 --- a/src/cppcache/integration-test/ThinClientTXFailover.hpp +++ b/src/cppcache/integration-test/ThinClientTXFailover.hpp @@ -85,7 +85,7 @@ void _verifyEntry(const char* name, const char* key, const char* val, free(buf); RegionPtr regPtr = getHelper()->getRegion(name); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); CacheableKeyPtr keyPtr = createKey(key); @@ -119,10 +119,9 @@ void _verifyEntry(const char* name, const char* key, const char* val, } if (val != NULL) { - CacheableStringPtr checkPtr = - dynCast<CacheableStringPtr>(regPtr->get(keyPtr)); + auto checkPtr = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr)); - ASSERT(checkPtr != NULLPTR, "Value Ptr should not be null."); + ASSERT(checkPtr != nullptr, "Value Ptr should not be null."); char buf[1024]; sprintf(buf, "In verify loop, get returned %s for key %s", checkPtr->asChar(), key); @@ -156,8 +155,8 @@ void createRegion(const char* name, bool ackMode, const char* endpoints, fflush(stdout); // ack, caching RegionPtr regPtr = getHelper()->createRegion( - name, ackMode, true, NULLPTR, endpoints, clientNotificationEnabled); - ASSERT(regPtr != NULLPTR, "Failed to create region."); + name, ackMode, true, nullptr, endpoints, clientNotificationEnabled); + ASSERT(regPtr != nullptr, "Failed to create region."); LOG("Region created."); } void createPooledRegion(const char* name, bool ackMode, const char* locators, @@ -170,7 +169,7 @@ void createPooledRegion(const char* name, bool ackMode, const char* locators, RegionPtr regPtr = getHelper()->createPooledRegion(name, ackMode, locators, poolname, cachingEnable, clientNotificationEnabled); - ASSERT(regPtr != NULLPTR, "Failed to create region."); + ASSERT(regPtr != nullptr, "Failed to create region."); LOG("Pooled Region created."); } @@ -184,7 +183,7 @@ void createPooledRegionSticky(const char* name, bool ackMode, RegionPtr regPtr = getHelper()->createPooledRegionSticky( name, ackMode, locators, poolname, cachingEnable, clientNotificationEnabled); - ASSERT(regPtr != NULLPTR, "Failed to create region."); + ASSERT(regPtr != nullptr, "Failed to create region."); LOG("Pooled Region created."); } @@ -198,7 +197,7 @@ void createEntry(const char* name, const char* key, const char* value) { CacheableStringPtr valPtr = CacheableString::create(value); RegionPtr regPtr = getHelper()->getRegion(name); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); // ASSERT( !regPtr->containsKey( keyPtr ), "Key should not have been found in // region." ); @@ -223,7 +222,7 @@ void updateEntry(const char* name, const char* key, const char* value) { CacheableStringPtr valPtr = CacheableString::create(value); RegionPtr regPtr = getHelper()->getRegion(name); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); // ASSERT( regPtr->containsKeyOnServer( keyPtr ), "Key should have been found // in region." ); @@ -250,17 +249,16 @@ void doNetsearch(const char* name, const char* key, const char* value) { RegionPtr regPtr = getHelper()->getRegion(name); fprintf(stdout, "netsearch region %s\n", regPtr->getName()); fflush(stdout); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); // ASSERT( !regPtr->containsKey( keyPtr ), "Key should not have been found in // region." ); // ASSERT( !regPtr->containsValueForKey( keyPtr ), "Value should not have been // found in region." ); - CacheableStringPtr checkPtr = - dynCast<CacheableStringPtr>(regPtr->get(keyPtr)); // force a netsearch + auto checkPtr = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr)); // force a netsearch - if (checkPtr != NULLPTR) { + if (checkPtr != nullptr) { LOG("checkPtr is not null"); char buf[1024]; sprintf(buf, "In net search, get returned %s for key %s", http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/cppcache/integration-test/ThinClientTransactions.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientTransactions.hpp b/src/cppcache/integration-test/ThinClientTransactions.hpp index d8f4c46..8745977 100644 --- a/src/cppcache/integration-test/ThinClientTransactions.hpp +++ b/src/cppcache/integration-test/ThinClientTransactions.hpp @@ -104,7 +104,7 @@ void _verifyEntry(const char* name, const char* key, const char* val, free(buf); RegionPtr regPtr = getHelper()->getRegion(name); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); CacheableKeyPtr keyPtr = createKey(key); @@ -142,10 +142,10 @@ void _verifyEntry(const char* name, const char* key, const char* val, } if (val != NULL) { - CacheableStringPtr checkPtr = - dynCast<CacheableStringPtr>(regPtr->get(keyPtr)); + auto checkPtr = + std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr)); - ASSERT(checkPtr != NULLPTR, "Value Ptr should not be null."); + ASSERT(checkPtr != nullptr, "Value Ptr should not be null."); char buf[1024]; sprintf(buf, "In verify loop, get returned %s for key %s", checkPtr->asChar(), key); @@ -199,9 +199,9 @@ void createRegion(const char* name, bool ackMode, const char* endpoints, fprintf(stdout, "Creating region -- %s ackMode is %d\n", name, ackMode); fflush(stdout); RegionPtr regPtr = - getHelper()->createRegion(name, ackMode, cachingEnable, NULLPTR, + getHelper()->createRegion(name, ackMode, cachingEnable, nullptr, endpoints, clientNotificationEnabled); - ASSERT(regPtr != NULLPTR, "Failed to create region."); + ASSERT(regPtr != nullptr, "Failed to create region."); LOG("Region created."); } void createPooledRegion(const char* name, bool ackMode, const char* locators, @@ -214,7 +214,7 @@ void createPooledRegion(const char* name, bool ackMode, const char* locators, RegionPtr regPtr = getHelper()->createPooledRegion(name, ackMode, locators, poolname, cachingEnable, clientNotificationEnabled); - ASSERT(regPtr != NULLPTR, "Failed to create region."); + ASSERT(regPtr != nullptr, "Failed to create region."); LOG("Pooled Region created."); } @@ -228,7 +228,7 @@ void createPooledRegionSticky(const char* name, bool ackMode, RegionPtr regPtr = getHelper()->createPooledRegionSticky( name, ackMode, locators, poolname, cachingEnable, clientNotificationEnabled); - ASSERT(regPtr != NULLPTR, "Failed to create region."); + ASSERT(regPtr != nullptr, "Failed to create region."); LOG("Pooled Region created."); } @@ -242,7 +242,7 @@ void createEntry(const char* name, const char* key, const char* value) { CacheableStringPtr valPtr = CacheableString::create(value); RegionPtr regPtr = getHelper()->getRegion(name); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); ASSERT(!regPtr->containsKey(keyPtr), "Key should not have been found in region."); @@ -289,7 +289,7 @@ void updateEntry(const char* name, const char* key, const char* value) { CacheableStringPtr valPtr = CacheableString::create(value); RegionPtr regPtr = getHelper()->getRegion(name); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); ASSERT(regPtr->containsKey(keyPtr), "Key should have been found in region."); ASSERT(regPtr->containsValueForKey(keyPtr), @@ -314,12 +314,12 @@ void doGetAgain(const char* name, const char* key, const char* value) { RegionPtr regPtr = getHelper()->getRegion(name); fprintf(stdout, "get region name%s\n", regPtr->getName()); fflush(stdout); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); - CacheableStringPtr checkPtr = - dynCast<CacheableStringPtr>(regPtr->get(keyPtr)); // force a netsearch + auto checkPtr = std::dynamic_pointer_cast<CacheableString>( + regPtr->get(keyPtr)); // force a netsearch - if (checkPtr != NULLPTR) { + if (checkPtr != nullptr) { LOG("checkPtr is not null"); char buf[1024]; sprintf(buf, "In doGetAgain, get returned %s for key %s", @@ -346,7 +346,7 @@ void doNetsearch(const char* name, const char* key, const char* value) { RegionPtr regPtr = getHelper()->getRegion(name); fprintf(stdout, "netsearch region %s\n", regPtr->getName()); fflush(stdout); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); if (count == 0) { ASSERT(!regPtr->containsKey(keyPtr), @@ -355,10 +355,10 @@ void doNetsearch(const char* name, const char* key, const char* value) { "Value should not have been found in region."); count++; } - CacheableStringPtr checkPtr = - dynCast<CacheableStringPtr>(regPtr->get(keyPtr)); // force a netsearch + auto checkPtr = std::dynamic_pointer_cast<CacheableString>( + regPtr->get(keyPtr)); // force a netsearch - if (checkPtr != NULLPTR) { + if (checkPtr != nullptr) { LOG("checkPtr is not null"); char buf[1024]; sprintf(buf, "In net search, get returned %s for key %s", @@ -399,7 +399,7 @@ class SuspendTransactionThread : public ACE_Task_Base { public: SuspendTransactionThread(bool sleep, ACE_Auto_Event* txEvent) - : m_suspendedTransaction(NULLPTR), m_sleep(sleep), m_txEvent(txEvent) {} + : m_suspendedTransaction(nullptr), m_sleep(sleep), m_txEvent(txEvent) {} int svc(void) { char buf[1024]; @@ -457,7 +457,7 @@ class ResumeTransactionThread : public ACE_Task_Base { LOG(buf); RegionPtr regPtr0 = getHelper()->getRegion(regionNames[0]); - THREADERRORCHECK(regPtr0 != NULLPTR, + THREADERRORCHECK(regPtr0 != nullptr, "In ResumeTransactionThread - Region not found."); CacheableKeyPtr keyPtr4 = createKey(keys[4]); @@ -465,7 +465,7 @@ class ResumeTransactionThread : public ACE_Task_Base { CacheableKeyPtr keyPtr6 = createKey(keys[6]); RegionPtr regPtr1 = getHelper()->getRegion(regionNames[1]); - THREADERRORCHECK(regPtr1 != NULLPTR, + THREADERRORCHECK(regPtr1 != nullptr, "In ResumeTransactionThread - Region not found."); THREADERRORCHECK(!regPtr0->containsKeyOnServer(keyPtr4), @@ -590,9 +590,9 @@ DUNIT_TASK_DEFINITION(CLIENT1, SuspendResumeCommit) CacheTransactionManagerPtr txManager = getHelper()->getCache()->getCacheTransactionManager(); RegionPtr regPtr0 = getHelper()->getRegion(regionNames[0]); - ASSERT(regPtr0 != NULLPTR, "In SuspendResumeCommit - Region not found."); + ASSERT(regPtr0 != nullptr, "In SuspendResumeCommit - Region not found."); RegionPtr regPtr1 = getHelper()->getRegion(regionNames[1]); - ASSERT(regPtr1 != NULLPTR, "In SuspendResumeCommit - Region not found."); + ASSERT(regPtr1 != nullptr, "In SuspendResumeCommit - Region not found."); CacheableKeyPtr keyPtr4 = createKey(keys[4]); CacheableKeyPtr keyPtr5 = createKey(keys[5]); CacheableKeyPtr keyPtr6 = createKey(keys[6]); @@ -657,7 +657,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, SuspendResumeCommit) ASSERT(resumeExc, "SuspendResumeCommit: Transaction shouldnt have been resumed"); - ASSERT(txManager->suspend() == NULLPTR, + ASSERT(txManager->suspend() == nullptr, "SuspendResumeCommit: Transaction shouldnt have been suspended"); } END_TASK_DEFINITION @@ -670,7 +670,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, SuspendTimeOut) CacheableKeyPtr keyPtr5 = createKey(keys[5]); RegionPtr regPtr0 = getHelper()->getRegion(regionNames[0]); - ASSERT(regPtr0 != NULLPTR, "In SuspendTimeOut - Region not found."); + ASSERT(regPtr0 != nullptr, "In SuspendTimeOut - Region not found."); txManager->begin(); createEntry(regionNames[0], keys[4], vals[4]); @@ -712,9 +712,9 @@ DUNIT_TASK_DEFINITION(CLIENT1, SuspendResumeRollback) CacheableKeyPtr keyPtr6 = createKey(keys[6]); RegionPtr regPtr0 = getHelper()->getRegion(regionNames[0]); - ASSERT(regPtr0 != NULLPTR, "In SuspendResumeRollback - Region not found."); + ASSERT(regPtr0 != nullptr, "In SuspendResumeRollback - Region not found."); RegionPtr regPtr1 = getHelper()->getRegion(regionNames[1]); - ASSERT(regPtr1 != NULLPTR, "In SuspendResumeRollback - Region not found."); + ASSERT(regPtr1 != nullptr, "In SuspendResumeRollback - Region not found."); txManager->begin(); createEntry(regionNames[0], keys[4], vals[4]); @@ -1066,7 +1066,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, CreateClient1KeyThriceWithSticky) reg0->localInvalidate(createKey(keys[1])); reg1->localInvalidate(createKey(keys[3])); PoolPtr pool = PoolManager::find("__TESTPOOL1_"); - ASSERT(pool != NULLPTR, "Pool Should have been found"); + ASSERT(pool != nullptr, "Pool Should have been found"); doNetsearch(regionNames[0], keys[1], nvals[1]); doNetsearch(regionNames[1], keys[3], nvals[3]); pool->releaseThreadLocalConnection(); http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/cppcache/integration-test/ThinClientTransactionsXA.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientTransactionsXA.hpp b/src/cppcache/integration-test/ThinClientTransactionsXA.hpp index be0437b..6a3ba83 100644 --- a/src/cppcache/integration-test/ThinClientTransactionsXA.hpp +++ b/src/cppcache/integration-test/ThinClientTransactionsXA.hpp @@ -104,7 +104,7 @@ void _verifyEntry(const char* name, const char* key, const char* val, free(buf); RegionPtr regPtr = getHelper()->getRegion(name); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); CacheableKeyPtr keyPtr = createKey(key); @@ -142,10 +142,10 @@ void _verifyEntry(const char* name, const char* key, const char* val, } if (val != NULL) { - CacheableStringPtr checkPtr = - dynCast<CacheableStringPtr>(regPtr->get(keyPtr)); + auto checkPtr = + std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr)); - ASSERT(checkPtr != NULLPTR, "Value Ptr should not be null."); + ASSERT(checkPtr != nullptr, "Value Ptr should not be null."); char buf[1024]; sprintf(buf, "In verify loop, get returned %s for key %s", checkPtr->asChar(), key); @@ -199,9 +199,9 @@ void createRegion(const char* name, bool ackMode, const char* endpoints, fprintf(stdout, "Creating region -- %s ackMode is %d\n", name, ackMode); fflush(stdout); RegionPtr regPtr = - getHelper()->createRegion(name, ackMode, cachingEnable, NULLPTR, + getHelper()->createRegion(name, ackMode, cachingEnable, nullptr, endpoints, clientNotificationEnabled); - ASSERT(regPtr != NULLPTR, "Failed to create region."); + ASSERT(regPtr != nullptr, "Failed to create region."); LOG("Region created."); } void createPooledRegion(const char* name, bool ackMode, const char* locators, @@ -214,7 +214,7 @@ void createPooledRegion(const char* name, bool ackMode, const char* locators, RegionPtr regPtr = getHelper()->createPooledRegion(name, ackMode, locators, poolname, cachingEnable, clientNotificationEnabled); - ASSERT(regPtr != NULLPTR, "Failed to create region."); + ASSERT(regPtr != nullptr, "Failed to create region."); LOG("Pooled Region created."); } @@ -228,7 +228,7 @@ void createPooledRegionSticky(const char* name, bool ackMode, RegionPtr regPtr = getHelper()->createPooledRegionSticky( name, ackMode, locators, poolname, cachingEnable, clientNotificationEnabled); - ASSERT(regPtr != NULLPTR, "Failed to create region."); + ASSERT(regPtr != nullptr, "Failed to create region."); LOG("Pooled Region created."); } @@ -242,7 +242,7 @@ void createEntry(const char* name, const char* key, const char* value) { CacheableStringPtr valPtr = CacheableString::create(value); RegionPtr regPtr = getHelper()->getRegion(name); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); ASSERT(!regPtr->containsKey(keyPtr), "Key should not have been found in region."); @@ -289,7 +289,7 @@ void updateEntry(const char* name, const char* key, const char* value) { CacheableStringPtr valPtr = CacheableString::create(value); RegionPtr regPtr = getHelper()->getRegion(name); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); ASSERT(regPtr->containsKey(keyPtr), "Key should have been found in region."); ASSERT(regPtr->containsValueForKey(keyPtr), @@ -314,12 +314,12 @@ void doGetAgain(const char* name, const char* key, const char* value) { RegionPtr regPtr = getHelper()->getRegion(name); fprintf(stdout, "get region name%s\n", regPtr->getName()); fflush(stdout); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); - CacheableStringPtr checkPtr = - dynCast<CacheableStringPtr>(regPtr->get(keyPtr)); // force a netsearch + auto checkPtr = std::dynamic_pointer_cast<CacheableString>( + regPtr->get(keyPtr)); // force a netsearch - if (checkPtr != NULLPTR) { + if (checkPtr != nullptr) { LOG("checkPtr is not null"); char buf[1024]; sprintf(buf, "In doGetAgain, get returned %s for key %s", @@ -346,7 +346,7 @@ void doNetsearch(const char* name, const char* key, const char* value) { RegionPtr regPtr = getHelper()->getRegion(name); fprintf(stdout, "netsearch region %s\n", regPtr->getName()); fflush(stdout); - ASSERT(regPtr != NULLPTR, "Region not found."); + ASSERT(regPtr != nullptr, "Region not found."); if (count == 0) { ASSERT(!regPtr->containsKey(keyPtr), @@ -355,10 +355,10 @@ void doNetsearch(const char* name, const char* key, const char* value) { "Value should not have been found in region."); count++; } - CacheableStringPtr checkPtr = - dynCast<CacheableStringPtr>(regPtr->get(keyPtr)); // force a netsearch + auto checkPtr = std::dynamic_pointer_cast<CacheableString>( + regPtr->get(keyPtr)); // force a netsearch - if (checkPtr != NULLPTR) { + if (checkPtr != nullptr) { LOG("checkPtr is not null"); char buf[1024]; sprintf(buf, "In net search, get returned %s for key %s", @@ -399,15 +399,15 @@ class SuspendTransactionThread : public ACE_Task_Base { public: SuspendTransactionThread(bool sleep, ACE_Auto_Event* txEvent) - : m_suspendedTransaction(NULLPTR), m_sleep(sleep), m_txEvent(txEvent) {} + : m_suspendedTransaction(nullptr), m_sleep(sleep), m_txEvent(txEvent) {} int svc(void) { char buf[1024]; sprintf(buf, " In SuspendTransactionThread"); LOG(buf); - InternalCacheTransactionManager2PCPtr txManager = - static_cast<InternalCacheTransactionManager2PCPtr>( + auto txManager = + std::dynamic_pointer_cast<InternalCacheTransactionManager2PC>( getHelper()->getCache()->getCacheTransactionManager()); txManager->begin(); @@ -458,7 +458,7 @@ class ResumeTransactionThread : public ACE_Task_Base { LOG(buf); RegionPtr regPtr0 = getHelper()->getRegion(regionNames[0]); - THREADERRORCHECK(regPtr0 != NULLPTR, + THREADERRORCHECK(regPtr0 != nullptr, "In ResumeTransactionThread - Region not found."); CacheableKeyPtr keyPtr4 = createKey(keys[4]); @@ -466,7 +466,7 @@ class ResumeTransactionThread : public ACE_Task_Base { CacheableKeyPtr keyPtr6 = createKey(keys[6]); RegionPtr regPtr1 = getHelper()->getRegion(regionNames[1]); - THREADERRORCHECK(regPtr1 != NULLPTR, + THREADERRORCHECK(regPtr1 != nullptr, "In ResumeTransactionThread - Region not found."); THREADERRORCHECK(!regPtr0->containsKeyOnServer(keyPtr4), @@ -477,8 +477,8 @@ class ResumeTransactionThread : public ACE_Task_Base { "In ResumeTransactionThread - Key should not have been " "found in region."); - InternalCacheTransactionManager2PCPtr txManager = - static_cast<InternalCacheTransactionManager2PCPtr>( + auto txManager = + std::dynamic_pointer_cast<InternalCacheTransactionManager2PC>( getHelper()->getCache()->getCacheTransactionManager()); if (m_tryResumeWithSleep) { THREADERRORCHECK(!txManager->isSuspended(m_suspendedTransaction), @@ -591,13 +591,13 @@ END_TASK_DEFINITION DUNIT_TASK_DEFINITION(CLIENT1, SuspendResumeCommit) { - InternalCacheTransactionManager2PCPtr txManager = - static_cast<InternalCacheTransactionManager2PCPtr>( + auto txManager = + std::dynamic_pointer_cast<InternalCacheTransactionManager2PC>( getHelper()->getCache()->getCacheTransactionManager()); RegionPtr regPtr0 = getHelper()->getRegion(regionNames[0]); - ASSERT(regPtr0 != NULLPTR, "In SuspendResumeCommit - Region not found."); + ASSERT(regPtr0 != nullptr, "In SuspendResumeCommit - Region not found."); RegionPtr regPtr1 = getHelper()->getRegion(regionNames[1]); - ASSERT(regPtr1 != NULLPTR, "In SuspendResumeCommit - Region not found."); + ASSERT(regPtr1 != nullptr, "In SuspendResumeCommit - Region not found."); CacheableKeyPtr keyPtr4 = createKey(keys[4]); CacheableKeyPtr keyPtr5 = createKey(keys[5]); CacheableKeyPtr keyPtr6 = createKey(keys[6]); @@ -663,21 +663,21 @@ DUNIT_TASK_DEFINITION(CLIENT1, SuspendResumeCommit) ASSERT(resumeExc, "SuspendResumeCommit: Transaction shouldnt have been resumed"); - ASSERT(txManager->suspend() == NULLPTR, + ASSERT(txManager->suspend() == nullptr, "SuspendResumeCommit: Transaction shouldnt have been suspended"); } END_TASK_DEFINITION DUNIT_TASK_DEFINITION(CLIENT1, SuspendTimeOut) { - InternalCacheTransactionManager2PCPtr txManager = - static_cast<InternalCacheTransactionManager2PCPtr>( + auto txManager = + std::dynamic_pointer_cast<InternalCacheTransactionManager2PC>( getHelper()->getCache()->getCacheTransactionManager()); CacheableKeyPtr keyPtr4 = createKey(keys[4]); CacheableKeyPtr keyPtr5 = createKey(keys[5]); RegionPtr regPtr0 = getHelper()->getRegion(regionNames[0]); - ASSERT(regPtr0 != NULLPTR, "In SuspendTimeOut - Region not found."); + ASSERT(regPtr0 != nullptr, "In SuspendTimeOut - Region not found."); txManager->begin(); createEntry(regionNames[0], keys[4], vals[4]); @@ -713,17 +713,17 @@ END_TASK_DEFINITION DUNIT_TASK_DEFINITION(CLIENT1, SuspendResumeRollback) { - InternalCacheTransactionManager2PCPtr txManager = - static_cast<InternalCacheTransactionManager2PCPtr>( + auto txManager = + std::dynamic_pointer_cast<InternalCacheTransactionManager2PC>( getHelper()->getCache()->getCacheTransactionManager()); CacheableKeyPtr keyPtr4 = createKey(keys[4]); CacheableKeyPtr keyPtr5 = createKey(keys[5]); CacheableKeyPtr keyPtr6 = createKey(keys[6]); RegionPtr regPtr0 = getHelper()->getRegion(regionNames[0]); - ASSERT(regPtr0 != NULLPTR, "In SuspendResumeRollback - Region not found."); + ASSERT(regPtr0 != nullptr, "In SuspendResumeRollback - Region not found."); RegionPtr regPtr1 = getHelper()->getRegion(regionNames[1]); - ASSERT(regPtr1 != NULLPTR, "In SuspendResumeRollback - Region not found."); + ASSERT(regPtr1 != nullptr, "In SuspendResumeRollback - Region not found."); txManager->begin(); createEntry(regionNames[0], keys[4], vals[4]); @@ -959,8 +959,8 @@ END_TASK_DEFINITION DUNIT_TASK_DEFINITION(CLIENT1, StepThree) { - InternalCacheTransactionManager2PCPtr txManager = - static_cast<InternalCacheTransactionManager2PCPtr>( + auto txManager = + std::dynamic_pointer_cast<InternalCacheTransactionManager2PC>( getHelper()->getCache()->getCacheTransactionManager()); txManager->begin(); createEntry(regionNames[0], keys[0], vals[0]); @@ -975,8 +975,8 @@ DUNIT_TASK_DEFINITION(CLIENT2, StepFour) { doNetsearch(regionNames[0], keys[0], vals[0]); doNetsearch(regionNames[1], keys[2], vals[2]); - InternalCacheTransactionManager2PCPtr txManager = - static_cast<InternalCacheTransactionManager2PCPtr>( + auto txManager = + std::dynamic_pointer_cast<InternalCacheTransactionManager2PC>( getHelper()->getCache()->getCacheTransactionManager()); txManager->begin(); createEntry(regionNames[0], keys[1], vals[1]); @@ -1025,8 +1025,8 @@ DUNIT_TASK_DEFINITION(CLIENT2, StepSix) { doNetsearch(regionNames[0], keys[0], vals[0]); doNetsearch(regionNames[1], keys[2], vals[2]); - InternalCacheTransactionManager2PCPtr txManager = - static_cast<InternalCacheTransactionManager2PCPtr>( + auto txManager = + std::dynamic_pointer_cast<InternalCacheTransactionManager2PC>( getHelper()->getCache()->getCacheTransactionManager()); txManager->begin(); updateEntry(regionNames[0], keys[1], nvals[1]); @@ -1082,7 +1082,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, StepEight_Pool_Sticky) reg0->localInvalidate(createKey(keys[1])); reg1->localInvalidate(createKey(keys[3])); PoolPtr pool = PoolManager::find("__TESTPOOL1_"); - ASSERT(pool != NULLPTR, "Pool Should have been found"); + ASSERT(pool != nullptr, "Pool Should have been found"); doNetsearch(regionNames[0], keys[1], nvals[1]); doNetsearch(regionNames[1], keys[3], nvals[3]); pool->releaseThreadLocalConnection(); http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/cppcache/integration-test/ThinClientVersionedOps.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/ThinClientVersionedOps.hpp b/src/cppcache/integration-test/ThinClientVersionedOps.hpp index 2794022..565d9c4 100644 --- a/src/cppcache/integration-test/ThinClientVersionedOps.hpp +++ b/src/cppcache/integration-test/ThinClientVersionedOps.hpp @@ -134,7 +134,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, StartClient1) // initClientWithPool(true/*isthinClient*/, NULL/*poolName*/, // NULL/*locators*/,serverGroup1, NULL/*servers*/, - // NULLPTR/*PropertiesPtr&*/, + // nullptr/*PropertiesPtr&*/, // 0/*redundancy*/, true/*clientNotification*/, // -1/*subscriptionAckInterval*/, // 5/*connections*/, 60000/*loadConditioningInterval*/); @@ -166,7 +166,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, StartClient2) gfendpoints2 += tmp2; LOG( "Client-2 Init -4" ); initClientWithPool(true, NULL, NULL, serverGroup2, gfendpoints2.c_str(), - NULLPTR, 0, true, -1, 5, 60000); + nullptr, 0, true, -1, 5, 60000); LOG( "Client-2 Init -5" ); RegionPtr regPtr0 = createRegionAndAttachPool(regNames[0],USE_ACK, NULL); @@ -220,9 +220,9 @@ DUNIT_TASK_DEFINITION(CLIENT2, transactionPutOnClient2) // localGet - c2v11 = dynCast<CacheableStringPtr>(rptr->get(keyPtr1)); - c2v12 = dynCast<CacheableStringPtr>(rptr->get(keyPtr2)); - c2v13 = dynCast<CacheableStringPtr>(rptr->get(keyPtr3)); + c2v11 = std::dynamic_pointer_cast<CacheableString>(rptr->get(keyPtr1)); + c2v12 = std::dynamic_pointer_cast<CacheableString>(rptr->get(keyPtr2)); + c2v13 = std::dynamic_pointer_cast<CacheableString>(rptr->get(keyPtr3)); // localDestroy rptr->localDestroy(keyPtr1); @@ -230,9 +230,9 @@ DUNIT_TASK_DEFINITION(CLIENT2, transactionPutOnClient2) rptr->localDestroy(keyPtr3); // remoteGet - c2v11 = dynCast<CacheableStringPtr>(rptr->get(keyPtr1)); - s2v12 = dynCast<CacheableStringPtr>(rptr->get(keyPtr2)); - s2v13 = dynCast<CacheableStringPtr>(rptr->get(keyPtr3)); + c2v11 = std::dynamic_pointer_cast<CacheableString>(rptr->get(keyPtr1)); + s2v12 = std::dynamic_pointer_cast<CacheableString>(rptr->get(keyPtr2)); + s2v13 = std::dynamic_pointer_cast<CacheableString>(rptr->get(keyPtr3)); // Print remoteGet Values LOGINFO( @@ -251,11 +251,11 @@ DUNIT_TASK_DEFINITION(CLIENT2, transactionPutOnClient2) "Val3 = %s ", c2v13->asChar(), s2v13->asChar()); - ASSERT(*c2v11.ptr() == *c2v11.ptr(), + ASSERT(*c2v11.get() == *c2v11.get(), "transactionPutOnClient2:Values should be equal-1"); - ASSERT(*c2v12.ptr() == *c2v12.ptr(), + ASSERT(*c2v12.get() == *c2v12.get(), "transactionPutOnClient2:Values should be equal-2"); - ASSERT(*c2v13.ptr() == *c2v13.ptr(), + ASSERT(*c2v13.get() == *c2v13.get(), "transactionPutOnClient2:Values should be equal-3"); LOG("CLIENT-2 :: TASK: transactionPutOnClient2 completed successfully"); @@ -274,9 +274,9 @@ DUNIT_TASK_DEFINITION(CLIENT1, verifyGetonClient1) CacheableKeyPtr keyPtr3 = CacheableKey::create("key-3"); // localGet - c1v11 = dynCast<CacheableStringPtr>(rptr->get(keyPtr1)); - c1v12 = dynCast<CacheableStringPtr>(rptr->get(keyPtr2)); - c1v13 = dynCast<CacheableStringPtr>(rptr->get(keyPtr3)); + c1v11 = std::dynamic_pointer_cast<CacheableString>(rptr->get(keyPtr1)); + c1v12 = std::dynamic_pointer_cast<CacheableString>(rptr->get(keyPtr2)); + c1v13 = std::dynamic_pointer_cast<CacheableString>(rptr->get(keyPtr3)); // localDestroy rptr->localDestroy(keyPtr1); @@ -284,9 +284,9 @@ DUNIT_TASK_DEFINITION(CLIENT1, verifyGetonClient1) rptr->localDestroy(keyPtr3); // remoteGet - s1v11 = dynCast<CacheableStringPtr>(rptr->get(keyPtr1)); - s1v12 = dynCast<CacheableStringPtr>(rptr->get(keyPtr2)); - s1v13 = dynCast<CacheableStringPtr>(rptr->get(keyPtr3)); + s1v11 = std::dynamic_pointer_cast<CacheableString>(rptr->get(keyPtr1)); + s1v12 = std::dynamic_pointer_cast<CacheableString>(rptr->get(keyPtr2)); + s1v13 = std::dynamic_pointer_cast<CacheableString>(rptr->get(keyPtr3)); // Print remoteGet Values LOGINFO( @@ -302,11 +302,11 @@ DUNIT_TASK_DEFINITION(CLIENT1, verifyGetonClient1) "%s ", c1v13->asChar(), s1v13->asChar()); - ASSERT(*c1v11.ptr() == *s1v11.ptr(), + ASSERT(*c1v11.get() == *s1v11.get(), "verifyGetonClient1:Values should be equal-1"); - ASSERT(*c1v12.ptr() == *s1v12.ptr(), + ASSERT(*c1v12.get() == *s1v12.get(), "verifyGetonClient1:Values should be equal-2"); - ASSERT(*c1v13.ptr() == *s1v13.ptr(), + ASSERT(*c1v13.get() == *s1v13.get(), "verifyGetonClient1:Values should be equal-3"); LOG("CLIENT-2 :: TASK: verifyGetonClient1 completed successfully"); @@ -368,11 +368,11 @@ DUNIT_TASK_DEFINITION(CLIENT1, GetOnClient1) CacheableKeyPtr keyPtr4 = CacheableKey::create("key-4"); CacheableKeyPtr keyPtr5 = CacheableKey::create("key-5"); - c1v11 = dynCast<CacheableStringPtr>(regPtr->get(keyPtr1)); - c1v12 = dynCast<CacheableStringPtr>(regPtr->get(keyPtr2)); - c1v13 = dynCast<CacheableStringPtr>(regPtr->get(keyPtr3)); - c1v14 = dynCast<CacheableStringPtr>(regPtr->get(keyPtr4)); - c1v15 = dynCast<CacheableStringPtr>(regPtr->get(keyPtr5)); + c1v11 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr1)); + c1v12 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr2)); + c1v13 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr3)); + c1v14 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr4)); + c1v15 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr5)); // Print local Get Values LOGINFO("CLIENT-1 :: local GET operation -6 c1v11 = %s", c1v11->asChar()); @@ -392,11 +392,11 @@ DUNIT_TASK_DEFINITION(CLIENT1, GetOnClient1) LOG("CLIENT-1 :: localDestroy() operation....Done"); // remoteGet - s1v11 = dynCast<CacheableStringPtr>(regPtr->get(keyPtr1)); - s1v12 = dynCast<CacheableStringPtr>(regPtr->get(keyPtr2)); - s1v13 = dynCast<CacheableStringPtr>(regPtr->get(keyPtr3)); - s1v14 = dynCast<CacheableStringPtr>(regPtr->get(keyPtr4)); - s1v15 = dynCast<CacheableStringPtr>(regPtr->get(keyPtr5)); + s1v11 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr1)); + s1v12 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr2)); + s1v13 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr3)); + s1v14 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr4)); + s1v15 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr5)); // Print remoteGet Values LOGINFO("CLIENT-1 :: remoteGet operation -6 s1v11 = %s", s1v11->asChar()); @@ -405,15 +405,15 @@ DUNIT_TASK_DEFINITION(CLIENT1, GetOnClient1) LOGINFO("CLIENT-1 :: remoteGet operation -6 s1v14 = %s", s1v14->asChar()); LOGINFO("CLIENT-1 :: remoteGet operation -6 s1v15 = %s", s1v15->asChar()); - ASSERT(*c1v11.ptr() == *s1v11.ptr(), + ASSERT(*c1v11.get() == *s1v11.get(), "GetOnClient1:Values should be equal-1"); - ASSERT(*c1v12.ptr() == *s1v12.ptr(), + ASSERT(*c1v12.get() == *s1v12.get(), "GetOnClient1:Values should be equal-2"); - ASSERT(*c1v13.ptr() == *s1v13.ptr(), + ASSERT(*c1v13.get() == *s1v13.get(), "GetOnClient1:Values should be equal-3"); - ASSERT(*c1v14.ptr() == *s1v14.ptr(), + ASSERT(*c1v14.get() == *s1v14.get(), "GetOnClient1:Values should be equal-4"); - ASSERT(*c1v15.ptr() == *s1v15.ptr(), + ASSERT(*c1v15.get() == *s1v15.get(), "GetOnClient1:Values should be equal-5"); LOG("CLIENT-1 ::local GET operation....Done"); } @@ -433,11 +433,11 @@ DUNIT_TASK_DEFINITION(CLIENT2, GetOnClient2) CacheableKeyPtr keyPtr4 = CacheableKey::create("key-4"); CacheableKeyPtr keyPtr5 = CacheableKey::create("key-5"); - c2v11 = dynCast<CacheableStringPtr>(regPtr->get(keyPtr1)); - c2v12 = dynCast<CacheableStringPtr>(regPtr->get(keyPtr2)); - c2v13 = dynCast<CacheableStringPtr>(regPtr->get(keyPtr3)); - c2v14 = dynCast<CacheableStringPtr>(regPtr->get(keyPtr4)); - c2v15 = dynCast<CacheableStringPtr>(regPtr->get(keyPtr5)); + c2v11 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr1)); + c2v12 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr2)); + c2v13 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr3)); + c2v14 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr4)); + c2v15 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr5)); // Print localGets // Print local Get Values @@ -459,11 +459,11 @@ DUNIT_TASK_DEFINITION(CLIENT2, GetOnClient2) LOG("CLIENT-2 :: localDestroy() operation....Done"); // remoteGet - s2v11 = dynCast<CacheableStringPtr>(regPtr->get(keyPtr1)); - s2v12 = dynCast<CacheableStringPtr>(regPtr->get(keyPtr2)); - s2v13 = dynCast<CacheableStringPtr>(regPtr->get(keyPtr3)); - s2v14 = dynCast<CacheableStringPtr>(regPtr->get(keyPtr4)); - s2v15 = dynCast<CacheableStringPtr>(regPtr->get(keyPtr5)); + s2v11 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr1)); + s2v12 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr2)); + s2v13 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr3)); + s2v14 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr4)); + s2v15 = std::dynamic_pointer_cast<CacheableString>(regPtr->get(keyPtr5)); // Print remoteGet Values LOGINFO("CLIENT-2 :: remoteGet operation s2v11 = %s", s2v11->asChar()); @@ -472,15 +472,15 @@ DUNIT_TASK_DEFINITION(CLIENT2, GetOnClient2) LOGINFO("CLIENT-2 :: remoteGet operation s2v14 = %s", s2v14->asChar()); LOGINFO("CLIENT-2 :: remoteGet operation s2v15 = %s", s2v15->asChar()); - ASSERT(*c2v11.ptr() == *s2v11.ptr(), + ASSERT(*c2v11.get() == *s2v11.get(), "GetOnClient2:Values should be equal-1"); - ASSERT(*c2v12.ptr() == *s2v12.ptr(), + ASSERT(*c2v12.get() == *s2v12.get(), "GetOnClient2:Values should be equal-2"); - ASSERT(*c2v13.ptr() == *s2v13.ptr(), + ASSERT(*c2v13.get() == *s2v13.get(), "GetOnClient2:Values should be equal-3"); - ASSERT(*c2v14.ptr() == *s2v14.ptr(), + ASSERT(*c2v14.get() == *s2v14.get(), "GetOnClient2:Values should be equal-4"); - ASSERT(*c2v15.ptr() == *s2v15.ptr(), + ASSERT(*c2v15.get() == *s2v15.get(), "GetOnClient2:Values should be equal-5"); LOG("GetOnClient2 completed"); http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/cppcache/integration-test/fw_dunit.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/fw_dunit.cpp b/src/cppcache/integration-test/fw_dunit.cpp index 57673a0..fe9cc39 100644 --- a/src/cppcache/integration-test/fw_dunit.cpp +++ b/src/cppcache/integration-test/fw_dunit.cpp @@ -33,8 +33,6 @@ #include <ace/ACE.h> -// #include <geode/GeodeCppCache.hpp> - #include <typeinfo> #include <string> http://git-wip-us.apache.org/repos/asf/geode-native/blob/c0098121/src/cppcache/integration-test/fw_dunit.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/integration-test/fw_dunit.hpp b/src/cppcache/integration-test/fw_dunit.hpp index 096e124..624004f 100644 --- a/src/cppcache/integration-test/fw_dunit.hpp +++ b/src/cppcache/integration-test/fw_dunit.hpp @@ -121,12 +121,10 @@ END_TASK(validate) #define ASSERT(x, y) \ if (!(x)) { \ - raise(SIGABRT); \ throw dunit::TestException(y, __LINE__, __FILE__); \ } #define XASSERT(x) \ if (!(x)) { \ - raise(SIGABRT); \ throw dunit::TestException(#x, __LINE__, __FILE__); \ } #define FAIL(y) throw dunit::TestException(y, __LINE__, __FILE__)