- Modify inherit class : "Test" class -> "TestWithMock" class
- Support 4.6, 4.7, 4.8 gcc compiler
Change-Id: Ie4de09086ba737033f17f5d87bf1a809019351b6
Signed-off-by: doil.kwon <doil.kwon@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1878
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
################################################ ######################
SConscript('unittests/SConscript')
SConscript('src/resourceCache/unittests/SConscript')
################################################ ######################
SConscript('unittests/SConscript')
SConscript('src/resourceCache/unittests/SConscript')
-#SConscript('src/resourceBroker/unittest/SConscript')
+SConscript('src/resourceBroker/unittest/SConscript')
DeviceAssociation * instance;
DevicePresencePtr device;
PrimitiveResource::Ptr pResource;
DeviceAssociation * instance;
DevicePresencePtr device;
PrimitiveResource::Ptr pResource;
instance->addDevice(device);
}
instance->addDevice(device);
}
instance = DeviceAssociation::getInstance();
device = (DevicePresencePtr)new DevicePresence();
pResource = PrimitiveResource::Ptr(mocks.Mock< PrimitiveResource >(), [](PrimitiveResource*){});
}
instance = DeviceAssociation::getInstance();
device = (DevicePresencePtr)new DevicePresence();
pResource = PrimitiveResource::Ptr(mocks.Mock< PrimitiveResource >(), [](PrimitiveResource*){});
}
- void TearDown() override
+ TestWithMock::TearDown();
device.reset();
pResource.reset();
device.reset();
pResource.reset();
DevicePresence * instance;
PrimitiveResource::Ptr pResource;
BrokerCB cb;
DevicePresence * instance;
PrimitiveResource::Ptr pResource;
BrokerCB cb;
instance = (DevicePresence*)new DevicePresence();
pResource = PrimitiveResource::Ptr(mocks.Mock< PrimitiveResource >(), [](PrimitiveResource*){});
cb = ([](BROKER_STATE)->OCStackResult{return OC_STACK_OK;});
id = 0;
}
instance = (DevicePresence*)new DevicePresence();
pResource = PrimitiveResource::Ptr(mocks.Mock< PrimitiveResource >(), [](PrimitiveResource*){});
cb = ([](BROKER_STATE)->OCStackResult{return OC_STACK_OK;});
id = 0;
}
- void TearDown() override
+ TestWithMock::TearDown();
pResource.reset();
id = 0;
cb = nullptr;
pResource.reset();
id = 0;
cb = nullptr;
ResourceBroker * brokerInstance;
PrimitiveResource::Ptr pResource;
BrokerCB cb;
ResourceBroker * brokerInstance;
PrimitiveResource::Ptr pResource;
BrokerCB cb;
brokerInstance = ResourceBroker::getInstance();
pResource = PrimitiveResource::Ptr(mocks.Mock< PrimitiveResource >(), [](PrimitiveResource*){});
cb = ([](BROKER_STATE)->OCStackResult{return OC_STACK_OK;});
id = 0;
}
brokerInstance = ResourceBroker::getInstance();
pResource = PrimitiveResource::Ptr(mocks.Mock< PrimitiveResource >(), [](PrimitiveResource*){});
cb = ([](BROKER_STATE)->OCStackResult{return OC_STACK_OK;});
id = 0;
}
- void TearDown() override
+ TestWithMock::TearDown();
pResource.reset();
id = 0;
cb = nullptr;
pResource.reset();
id = 0;
cb = nullptr;
typedef std::function<void(const HeaderOptions&, const ResponseStatement&, int)> GetCallback;
typedef std::function<void(const HeaderOptions&, const ResponseStatement&, int)> GetCallback;
ResourcePresence * instance;
PrimitiveResource::Ptr pResource;
BrokerCB cb;
ResourcePresence * instance;
PrimitiveResource::Ptr pResource;
BrokerCB cb;
+ TestWithMock::SetUp();
+
instance = (ResourcePresence*)new ResourcePresence();
pResource = PrimitiveResource::Ptr(mocks.Mock< PrimitiveResource >(), [](PrimitiveResource*){});
cb = ([](BROKER_STATE)->OCStackResult{return OC_STACK_OK;});
id = 0;
}
instance = (ResourcePresence*)new ResourcePresence();
pResource = PrimitiveResource::Ptr(mocks.Mock< PrimitiveResource >(), [](PrimitiveResource*){});
cb = ([](BROKER_STATE)->OCStackResult{return OC_STACK_OK;});
id = 0;
}
- void TearDown() override
+ TestWithMock::TearDown();
pResource.reset();
id = 0;
cb = nullptr;
pResource.reset();
id = 0;
cb = nullptr;