for (unsigned int i = 0; i < bundles.size(); i++)
{
- BundleInfoInternal *bundleInfo = new BundleInfoInternal();
+ shared_ptr<BundleInfoInternal> bundleInfo(new BundleInfoInternal);
bundleInfo->setPath(bundles[i][BUNDLE_PATH]);
bundleInfo->setVersion(bundles[i][BUNDLE_VERSION]);
bundleInfo->setID(bundles[i][BUNDLE_ID]);
{
string activatorName = bundles[i][BUNDLE_ACTIVATOR];
std::replace(activatorName.begin(), activatorName.end(), '.', '/');
- ((BundleInfoInternal *) bundleInfo)->setActivatorName(activatorName);
- ((BundleInfoInternal *) bundleInfo)->setLibraryPath(
- bundles[i][BUNDLE_LIBRARY_PATH]);
+ bundleInfo->setActivatorName(activatorName);
+ bundleInfo->setLibraryPath(bundles[i][BUNDLE_LIBRARY_PATH]);
}
OIC_LOG_V(INFO, CONTAINER_TAG, "Init Bundle:(%s)",
{
OIC_LOG(INFO, CONTAINER_TAG, "Stopping resource container.");
- for (std::map< std::string, BundleInfoInternal * >::iterator it = m_bundles.begin();
+ for (std::map< std::string, shared_ptr<BundleInfoInternal> >::iterator it = m_bundles.begin();
it != m_bundles.end(); ++it)
{
- BundleInfoInternal *bundleInfo = it->second;
- deactivateBundle(bundleInfo);
- unregisterBundle(bundleInfo);
+ deactivateBundle(it->second);
+ unregisterBundle(it->second);
}
if (!m_mapServers.empty())
delete m_config;
}
- void ResourceContainerImpl::activateBundle(RCSBundleInfo *bundleInfo)
+ void ResourceContainerImpl::activateBundle(shared_ptr<RCSBundleInfo> bundleInfo)
{
activationLock.lock();
- BundleInfoInternal *bundleInfoInternal = (BundleInfoInternal *) bundleInfo;
+
+ shared_ptr<BundleInfoInternal> bundleInfoInternal =
+ std::static_pointer_cast<BundleInfoInternal>(bundleInfo);
if (bundleInfoInternal->isLoaded())
{
activationLock.unlock();
}
- void ResourceContainerImpl::deactivateBundle(RCSBundleInfo *bundleInfo)
+ void ResourceContainerImpl::deactivateBundle(shared_ptr<RCSBundleInfo> bundleInfo)
{
- if (((BundleInfoInternal *) bundleInfo)->isActivated())
+ shared_ptr<BundleInfoInternal> bundleInfoInternal =
+ std::static_pointer_cast<BundleInfoInternal>(bundleInfo);
+ if (bundleInfoInternal->isActivated())
{
- deactivateBundle(bundleInfo->getID());
+ deactivateBundle(bundleInfoInternal->getID());
}
}
}
// loads the bundle
- void ResourceContainerImpl::registerBundle(RCSBundleInfo *bundleInfo)
+ void ResourceContainerImpl::registerBundle(shared_ptr<RCSBundleInfo> bundleInfo)
{
OIC_LOG_V(INFO, CONTAINER_TAG, "Registering bundle: (%s)",
std::string(bundleInfo->getPath()).c_str());
+ shared_ptr<BundleInfoInternal> bundleInfoInternal =
+ std::static_pointer_cast<BundleInfoInternal>(bundleInfo);
if (has_suffix(bundleInfo->getPath(), ".jar"))
{
#if(JAVA_SUPPORT)
- ((BundleInfoInternal *) bundleInfo)->setJavaBundle(true);
- ((BundleInfoInternal *) bundleInfo)->setSoBundle(false);
+ bundleInfoInternal->setJavaBundle(true);
+ bundleInfoInternal->setSoBundle(false);
registerJavaBundle(bundleInfo);
#else
// android .jar library
- ((BundleInfoInternal *) bundleInfo)->setSoBundle(false);
- ((BundleInfoInternal *) bundleInfo)->setJavaBundle(false);
+ bundleInfoInternal->setSoBundle(false);
+ bundleInfoInternal->setJavaBundle(false);
registerExtBundle(bundleInfo);
#endif
}
else if(has_suffix(bundleInfo->getPath(), ".so"))
{
- ((BundleInfoInternal *) bundleInfo)->setSoBundle(true);
- ((BundleInfoInternal *) bundleInfo)->setJavaBundle(false);
+ bundleInfoInternal->setSoBundle(true);
+ bundleInfoInternal->setJavaBundle(false);
registerSoBundle(bundleInfo);
}
// other cases might be for example .apk for android, which are loaded in the wrapper
else{
- ((BundleInfoInternal *) bundleInfo)->setSoBundle(false);
- ((BundleInfoInternal *) bundleInfo)->setJavaBundle(false);
+ bundleInfoInternal->setSoBundle(false);
+ bundleInfoInternal->setJavaBundle(false);
registerExtBundle(bundleInfo);
}
}
- void ResourceContainerImpl::unregisterBundle(RCSBundleInfo *bundleInfo)
+ void ResourceContainerImpl::unregisterBundle(shared_ptr<RCSBundleInfo> bundleInfo)
{
- BundleInfoInternal *bundleInfoInternal = (BundleInfoInternal *) bundleInfo;
+ shared_ptr<BundleInfoInternal> bundleInfoInternal =
+ std::static_pointer_cast<BundleInfoInternal>(bundleInfo);
if (bundleInfoInternal->isLoaded() && !bundleInfoInternal->isActivated())
{
if (bundleInfoInternal->getSoBundle())
}
else
{
- delete m_bundles[id];
m_bundles.erase(id);
}
}
else
{
- BundleInfoInternal *bundleInfo = new BundleInfoInternal();
+ shared_ptr<BundleInfoInternal> bundleInfo = std::make_shared<BundleInfoInternal>();
bundleInfo->setID(bundleId);
bundleInfo->setPath(bundlePath);
bundleInfo->setActivatorName(activator);
{
string activatorName = activator; // modify activator for Java bundle
std::replace(activatorName.begin(), activatorName.end(), '.', '/');
- ((BundleInfoInternal *) bundleInfo)->setActivatorName(activatorName);
- ((BundleInfoInternal *)bundleInfo)->setLibraryPath(params[BUNDLE_LIBRARY_PATH]);
+ bundleInfo->setActivatorName(activatorName);
+ bundleInfo->setLibraryPath(params[BUNDLE_LIBRARY_PATH]);
}
OIC_LOG_V(INFO, CONTAINER_TAG, "Add Bundle: (%s)",
OIC_LOG_V(INFO, CONTAINER_TAG, "removeBundle %s",bundleId.c_str());
if (m_bundles.find(bundleId) != m_bundles.end())
{
- BundleInfoInternal *bundleInfo = m_bundles[bundleId];
+ shared_ptr<BundleInfoInternal> bundleInfo = m_bundles[bundleId];
if (bundleInfo->isActivated())
deactivateBundle(bundleInfo);
OIC_LOG_V(INFO, CONTAINER_TAG,
"list bundles (%d)", m_bundles.size());
std::list<std::unique_ptr<RCSBundleInfo> > ret;
- for (std::map< std::string, BundleInfoInternal * >::iterator it = m_bundles.begin();
+ for (std::map< std::string, shared_ptr<BundleInfoInternal> >::iterator it = m_bundles.begin();
it != m_bundles.end(); ++it)
{
{
std::unique_ptr<BundleInfoInternal> bundleInfo(new BundleInfoInternal);
- (bundleInfo)->setBundleInfo(it->second);
+ bundleInfo->setBundleInfo(it->second);
ret.push_back(std::move(bundleInfo));
}
}
void ResourceContainerImpl::removeResourceConfig(const std::string &bundleId,
const std::string &resourceUri)
{
- OIC_LOG_V(INFO, CONTAINER_TAG, "removeResourceConfig %s, %s",bundleId.c_str(), resourceUri.c_str());
+ OIC_LOG_V(INFO, CONTAINER_TAG, "removeResourceConfig %s, %s",bundleId.c_str(),
+ resourceUri.c_str());
if (m_bundles.find(bundleId) != m_bundles.end())
{
if (m_bundles[bundleId]->getSoBundle())
}
- void ResourceContainerImpl::registerSoBundle(RCSBundleInfo *bundleInfo)
+ void ResourceContainerImpl::registerSoBundle(shared_ptr<RCSBundleInfo> bundleInfo)
{
OIC_LOG_V(DEBUG, CONTAINER_TAG, "Register SO bundle");
const char *error;
deactivator_t *bundleDeactivator = NULL;
resourceCreator_t *resourceCreator = NULL;
resourceDestroyer_t *resourceDestroyer = NULL;
- BundleInfoInternal *bundleInfoInternal = (BundleInfoInternal *) bundleInfo;
+ shared_ptr<BundleInfoInternal> bundleInfoInternal =
+ std::static_pointer_cast<BundleInfoInternal>(bundleInfo);
+
void *bundleHandle = NULL;
bundleHandle = dlopen(bundleInfo->getPath().c_str(), RTLD_LAZY);
if ((error = dlerror()) != NULL)
if (bundleHandle != NULL)
{
- OIC_LOG_V(DEBUG, CONTAINER_TAG, "Activator name %s", bundleInfoInternal->getActivatorName().c_str());
+ OIC_LOG_V(DEBUG, CONTAINER_TAG, "Activator name %s",
+ bundleInfoInternal->getActivatorName().c_str());
bundleActivator =
(activator_t *) dlsym(bundleHandle,
("" + bundleInfoInternal->getActivatorName()
OIC_LOG_V(ERROR, CONTAINER_TAG, "Error while loading .so bundle: (%s)", error);
}
else{
- OIC_LOG_V(DEBUG, CONTAINER_TAG, "Looked up %s", ("" + bundleInfoInternal->getActivatorName()
+ OIC_LOG_V(DEBUG, CONTAINER_TAG, "Looked up %s", ("" +
+ bundleInfoInternal->getActivatorName()
+ "_externalActivateBundle").c_str());
}
bundleDeactivator =
OIC_LOG_V(ERROR, CONTAINER_TAG, "Error while loading .so bundle: (%s)", error);
}
else{
- OIC_LOG_V(DEBUG, CONTAINER_TAG, "Looked up %s", ("" + bundleInfoInternal->getActivatorName()
+ OIC_LOG_V(DEBUG, CONTAINER_TAG, "Looked up %s", ("" +
+ bundleInfoInternal->getActivatorName()
+ "_externalDeactivateBundle").c_str());
}
resourceCreator =
OIC_LOG_V(ERROR, CONTAINER_TAG, "Error while loading .so bundle: (%s)", error);
}
else{
- OIC_LOG_V(DEBUG, CONTAINER_TAG, "Looked up %s", ("" + bundleInfoInternal->getActivatorName()
+ OIC_LOG_V(DEBUG, CONTAINER_TAG, "Looked up %s", ("" +
+ bundleInfoInternal->getActivatorName()
+ "_externalCreateResource").c_str());
}
resourceDestroyer =
OIC_LOG_V(ERROR, CONTAINER_TAG, "Error while loading .so bundle: (%s)", error);
}
else{
- OIC_LOG_V(DEBUG, CONTAINER_TAG, "Looked up %s", ("" + bundleInfoInternal->getActivatorName()
+ OIC_LOG_V(DEBUG, CONTAINER_TAG, "Looked up %s", ("" +
+ bundleInfoInternal->getActivatorName()
+ "_externalDestroyResource").c_str());
}
}
else
{
- ((BundleInfoInternal *) bundleInfo)->setBundleActivator(bundleActivator);
- ((BundleInfoInternal *) bundleInfo)->setBundleDeactivator(bundleDeactivator);
- ((BundleInfoInternal *) bundleInfo)->setResourceCreator(resourceCreator);
- ((BundleInfoInternal *) bundleInfo)->setResourceDestroyer(resourceDestroyer);
- ((BundleInfoInternal *) bundleInfo)->setLoaded(true);
- ((BundleInfoInternal *) bundleInfo)->setBundleHandle(bundleHandle);
-
- m_bundles[bundleInfo->getID()] = ((BundleInfoInternal *) bundleInfo);
+ bundleInfoInternal->setBundleActivator(bundleActivator);
+ bundleInfoInternal->setBundleDeactivator(bundleDeactivator);
+ bundleInfoInternal->setResourceCreator(resourceCreator);
+ bundleInfoInternal->setResourceDestroyer(resourceDestroyer);
+ bundleInfoInternal->setLoaded(true);
+ bundleInfoInternal->setBundleHandle(bundleHandle);
+
+ m_bundles[bundleInfo->getID()] = bundleInfoInternal;
}
}
else
OIC_LOG_V(DEBUG, CONTAINER_TAG, "Register SO bundle finished");
}
- void ResourceContainerImpl::registerExtBundle(RCSBundleInfo *bundleInfo){
+ void ResourceContainerImpl::registerExtBundle(shared_ptr<RCSBundleInfo> bundleInfo){
OIC_LOG_V(INFO, CONTAINER_TAG, "Registering ext bundle (%s)",
std::string(bundleInfo->getID()).c_str());
OIC_LOG_V(INFO, CONTAINER_TAG, "Activator name (%s)",
std::string(bundleInfo->getActivatorName()).c_str());
- m_bundles[bundleInfo->getID()] = ((BundleInfoInternal *)bundleInfo);
+ shared_ptr<BundleInfoInternal> bundleInfoInternal =
+ std::static_pointer_cast<BundleInfoInternal>(bundleInfo);
+
+ m_bundles[bundleInfo->getID()] = bundleInfoInternal;
// in this case at least the resource configuration needs to be loaded
// in order to mark potential input resources for soft sensors
std::vector< resourceInfo > temp;
OIC_LOG(ERROR, CONTAINER_TAG, "Activation unsuccessful.");
}
- BundleInfoInternal *bundleInfoInternal = (BundleInfoInternal *) m_bundles[bundleId];
+ shared_ptr<BundleInfoInternal> bundleInfoInternal = m_bundles[bundleId];
bundleInfoInternal->setActivated(true);
}
return m_bundleVM[bundleId];
}
- void ResourceContainerImpl::registerJavaBundle(RCSBundleInfo *bundleInfo)
+ void ResourceContainerImpl::registerJavaBundle(shared_ptr<RCSBundleInfo> bundleInfo)
{
OIC_LOG_V(INFO, CONTAINER_TAG, "Registering Java bundle (%s)",
std::string(bundleInfo->getID()).c_str());
JavaVMInitArgs vm_args;
JavaVMOption options[3];
- BundleInfoInternal *bundleInfoInternal = (BundleInfoInternal *) bundleInfo;
+ shared_ptr<BundleInfoInternal> bundleInfoInternal =
+ std::static_pointer_cast<BundleInfoInternal>(bundleInfo);
+
if (FILE *file = fopen(bundleInfo->getPath().c_str(), "r"))
{
bundleInfoInternal->setLoaded(true);
- m_bundles[bundleInfo->getID()] = ((BundleInfoInternal *)bundleInfo);
+ m_bundles[bundleInfo->getID()] = bundleInfoInternal;
OIC_LOG(INFO, CONTAINER_TAG, "Bundle registered");
OIC_LOG(INFO, CONTAINER_TAG, "Activating java bundle");
JavaVM *vm = getJavaVM(bundleId);
- BundleInfoInternal *bundleInfoInternal = (BundleInfoInternal *) m_bundles[bundleId];
+ bundleInfoInternal = m_bundles[bundleId];
JNIEnv *env;
int envStat = vm->GetEnv((void **) &env, JNI_VERSION_1_4);
OIC_LOG(INFO, CONTAINER_TAG, "Deactivating java bundle");
JavaVM *vm = getJavaVM(bundleId);
- BundleInfoInternal *bundleInfoInternal = (BundleInfoInternal *) m_bundles[bundleId];
+ shared_ptr<BundleInfoInternal>bundleInfoInternal = m_bundles[bundleId];
JNIEnv *env;
int envStat = vm->GetEnv((void **) &env, JNI_VERSION_1_4);
m_bundleVM[id]->DestroyJavaVM();
- delete m_bundles[id];
m_bundles.erase(id);
}
#endif
EXPECT_GT(m_pResourceContainer->listBundles().size(), (unsigned int) 0);
unique_ptr<RCSBundleInfo> first = std::move(*m_pResourceContainer->listBundles().begin());
- unique_ptr<BundleInfoInternal> firstInternal(static_cast<BundleInfoInternal*>(first.release()));
+ unique_ptr<BundleInfoInternal> firstInternal((BundleInfoInternal*)first.release());
EXPECT_TRUE( firstInternal->isLoaded() );
EXPECT_NE(nullptr,
firstInternal->getBundleHandle());
EXPECT_GT(m_pResourceContainer->listBundles().size(), (unsigned int) 0);
unique_ptr<RCSBundleInfo> first = std::move(*m_pResourceContainer->listBundles().begin());
- unique_ptr<BundleInfoInternal> firstInternal(static_cast<BundleInfoInternal*>(first.release()));
+ unique_ptr<BundleInfoInternal> firstInternal((BundleInfoInternal*)first.release());
EXPECT_TRUE(firstInternal->isActivated());
EXPECT_NE(nullptr,firstInternal->getBundleActivator());
m_pResourceContainer->stopBundle("oic.bundle.test");
unique_ptr<RCSBundleInfo> first = std::move(*m_pResourceContainer->listBundles().begin());
- unique_ptr<BundleInfoInternal> firstInternal(static_cast<BundleInfoInternal*>(first.release()));
+ unique_ptr<BundleInfoInternal> firstInternal((BundleInfoInternal*)first.release());
EXPECT_FALSE(firstInternal->isActivated());
m_pResourceContainer->stopContainer();
m_pResourceContainer->stopBundle("oic.bundle.test");
m_pResourceContainer->startBundle("oic.bundle.test");
unique_ptr<RCSBundleInfo> first = std::move(*m_pResourceContainer->listBundles().begin());
- unique_ptr<BundleInfoInternal> firstInternal(static_cast<BundleInfoInternal*>(first.release()));
+ unique_ptr<BundleInfoInternal> firstInternal((BundleInfoInternal*)first.release());
EXPECT_TRUE(firstInternal->isActivated());
m_pResourceContainer->stopContainer();
EXPECT_EQ(bundles.size() + 1, m_pResourceContainer->listBundles().size());
unique_ptr<RCSBundleInfo> first = std::move(*m_pResourceContainer->listBundles().begin());
- unique_ptr<BundleInfoInternal> firstInternal(static_cast<BundleInfoInternal*>(first.release()));
+ unique_ptr<BundleInfoInternal> firstInternal((BundleInfoInternal*)first.release());
EXPECT_TRUE(firstInternal->isLoaded());
}
public:
ResourceContainerImpl *m_pResourceContainer;
- BundleInfoInternal *m_pBundleInfo;
+ shared_ptr<BundleInfoInternal> m_pBundleInfo;
protected:
void SetUp()
{
TestWithMock::SetUp();
m_pResourceContainer = ResourceContainerImpl::getImplInstance();
- m_pBundleInfo = new BundleInfoInternal();
+ m_pBundleInfo = std::make_shared<BundleInfoInternal>();
}
void TearDown()
{
- delete m_pBundleInfo;
+ m_pBundleInfo.reset();
}
};
-TEST_F(ResourceContainerImplTest, SoBundleLoadedWhenRegisteredWithRegisterBundleAPI)
-{
- m_pBundleInfo->setPath("libTestBundle.so");
- m_pBundleInfo->setActivatorName("test");
- m_pBundleInfo->setVersion("1.0");
- m_pBundleInfo->setLibraryPath(".");
- m_pBundleInfo->setID("oic.bundle.test");
-
- m_pResourceContainer->registerBundle(m_pBundleInfo);
-
- EXPECT_NE(nullptr, ((BundleInfoInternal *)m_pBundleInfo)->getBundleHandle());
-}
-
-#if (JAVA_SUPPORT_TEST)
-TEST_F(ResourceContainerImplTest, JavaBundleLoadedWhenRegisteredWithRegisterBundleAPIWrongPath)
-{
- m_pBundleInfo->setPath("wrong_path.jar");
- m_pBundleInfo->setActivatorName("org/iotivity/bundle/hue/HueBundleActivator");
- m_pBundleInfo->setLibraryPath("../.");
- m_pBundleInfo->setVersion("1.0");
- m_pBundleInfo->setID("oic.bundle.java.test");
-
- m_pResourceContainer->registerBundle(m_pBundleInfo);
- EXPECT_FALSE(((BundleInfoInternal *)m_pBundleInfo)->isLoaded());
-}
-
-TEST_F(ResourceContainerImplTest, JavaBundleTest)
-{
- m_pBundleInfo->setPath("TestBundleJava/hue-0.1-jar-with-dependencies.jar");
- m_pBundleInfo->setActivatorName("org/iotivity/bundle/hue/HueBundleActivator");
- m_pBundleInfo->setLibraryPath("../.");
- m_pBundleInfo->setVersion("1.0");
- m_pBundleInfo->setID("oic.bundle.java.test");
-
- m_pResourceContainer->registerBundle(m_pBundleInfo);
- EXPECT_TRUE(((BundleInfoInternal *)m_pBundleInfo)->isLoaded());
-
- m_pResourceContainer->activateBundle(m_pBundleInfo);
- EXPECT_TRUE(((BundleInfoInternal *) m_pBundleInfo)->isActivated());
-
- m_pResourceContainer->deactivateBundle(m_pBundleInfo);
- EXPECT_FALSE(((BundleInfoInternal *) m_pBundleInfo)->isActivated());
-}
-#endif
-
-TEST_F(ResourceContainerImplTest, BundleNotRegisteredIfBundlePathIsInvalid)
-{
- m_pBundleInfo->setPath("");
- m_pBundleInfo->setVersion("1.0");
- m_pBundleInfo->setLibraryPath("../.");
- m_pBundleInfo->setID("oic.bundle.test");
-
- m_pResourceContainer->registerBundle(m_pBundleInfo);
-
- EXPECT_EQ(nullptr, ((BundleInfoInternal *)m_pBundleInfo)->getBundleHandle());
-
-}
-
-TEST_F(ResourceContainerImplTest, SoBundleActivatedWithValidBundleInfo)
-{
- m_pBundleInfo->setPath("libTestBundle.so");
- m_pBundleInfo->setVersion("1.0");
- m_pBundleInfo->setActivatorName("test");
- m_pBundleInfo->setLibraryPath("../.");
- m_pBundleInfo->setID("oic.bundle.test");
-
- m_pResourceContainer->registerBundle(m_pBundleInfo);
- m_pResourceContainer->activateBundle(m_pBundleInfo);
-
- EXPECT_NE(nullptr, ((BundleInfoInternal *)m_pBundleInfo)->getBundleActivator());
-}
-
-TEST_F(ResourceContainerImplTest, BundleNotActivatedWhenNotRegistered)
-{
- m_pBundleInfo->setPath("libTestBundle.so");
- m_pBundleInfo->setActivatorName("test");
- m_pBundleInfo->setVersion("1.0");
- m_pBundleInfo->setLibraryPath("../.");
- m_pBundleInfo->setID("oic.bundle.test");
-
- m_pResourceContainer->activateBundle(m_pBundleInfo);
-
- EXPECT_EQ(nullptr, ((BundleInfoInternal *)m_pBundleInfo)->getBundleActivator());
-}
-
-TEST_F(ResourceContainerImplTest, SoBundleActivatedWithBundleID)
-{
- m_pBundleInfo->setPath("libTestBundle.so");
- m_pBundleInfo->setVersion("1.0");
- m_pBundleInfo->setLibraryPath("../.");
- m_pBundleInfo->setActivatorName("test");
- m_pBundleInfo->setID("oic.bundle.test");
-
- m_pResourceContainer->registerBundle(m_pBundleInfo);
- m_pResourceContainer->activateBundle(m_pBundleInfo->getID());
-
- EXPECT_NE(nullptr, ((BundleInfoInternal *)m_pBundleInfo)->getBundleActivator());
- EXPECT_TRUE(((BundleInfoInternal *)m_pBundleInfo)->isActivated());
-}
-
-TEST_F(ResourceContainerImplTest, BundleDeactivatedWithBundleInfo)
-{
- m_pBundleInfo->setPath("libTestBundle.so");
- m_pBundleInfo->setVersion("1.0");
- m_pBundleInfo->setLibraryPath("../.");
- m_pBundleInfo->setActivatorName("test");
- m_pBundleInfo->setID("oic.bundle.test");
-
- m_pResourceContainer->registerBundle(m_pBundleInfo);
- m_pResourceContainer->activateBundle(m_pBundleInfo);
- m_pResourceContainer->deactivateBundle(m_pBundleInfo);
-
- EXPECT_NE(nullptr, ((BundleInfoInternal *)m_pBundleInfo)->getBundleDeactivator());
- EXPECT_FALSE(((BundleInfoInternal *)m_pBundleInfo)->isActivated());
-}
-
-TEST_F(ResourceContainerImplTest, BundleDeactivatedWithBundleInfoJava)
-{
- m_pBundleInfo->setPath("TestBundle/hue-0.1-jar-with-dependencies.jar");
- m_pBundleInfo->setActivatorName("org/iotivity/bundle/hue/HueBundleActivator");
- m_pBundleInfo->setLibraryPath("../.");
- m_pBundleInfo->setVersion("1.0");
- m_pBundleInfo->setID("oic.bundle.java.test");
-
- m_pResourceContainer->registerBundle(m_pBundleInfo);
- m_pResourceContainer->activateBundle(m_pBundleInfo);
- m_pResourceContainer->deactivateBundle(m_pBundleInfo);
- EXPECT_FALSE(((BundleInfoInternal *) m_pBundleInfo)->isActivated());
-}
-
-TEST_F(ResourceContainerImplTest, SoBundleDeactivatedWithBundleID)
-{
- m_pBundleInfo->setPath("libTestBundle.so");
- m_pBundleInfo->setVersion("1.0");
- m_pBundleInfo->setLibraryPath("../.");
- m_pBundleInfo->setActivatorName("test");
- m_pBundleInfo->setID("oic.bundle.test");
-
- m_pResourceContainer->registerBundle(m_pBundleInfo);
- m_pResourceContainer->activateBundle(m_pBundleInfo);
-
- m_pResourceContainer->deactivateBundle(m_pBundleInfo->getID());
-
- EXPECT_FALSE(((BundleInfoInternal *)m_pBundleInfo)->isActivated());
-}
-
/* Test for Configuration */
TEST(ConfigurationTest, ConfigFileLoadedWithValidPath)