Modified: celix/trunk/framework/private/test/bundle_test.cpp URL: http://svn.apache.org/viewvc/celix/trunk/framework/private/test/bundle_test.cpp?rev=1618476&r1=1618475&r2=1618476&view=diff ============================================================================== --- celix/trunk/framework/private/test/bundle_test.cpp (original) +++ celix/trunk/framework/private/test/bundle_test.cpp Sun Aug 17 14:45:28 2014 @@ -43,18 +43,12 @@ int main(int argc, char** argv) { } TEST_GROUP(bundle) { - apr_pool_t *pool; - void setup(void) { - apr_initialize(); - apr_pool_create(&pool, NULL); - - logger = (framework_logger_pt) apr_palloc(pool, sizeof(*logger)); + logger = (framework_logger_pt) malloc(sizeof(*logger)); logger->logFunction = frameworkLogger_log; } void teardown() { - apr_pool_destroy(pool); mock().checkExpectations(); mock().clear(); } @@ -63,9 +57,8 @@ TEST_GROUP(bundle) { TEST(bundle, create) { bundle_archive_pt archive = (bundle_archive_pt) 0x10; mock().expectOneCall("bundleArchive_createSystemBundleArchive") - .withParameter("pool", pool) .withParameter("logger", logger) - .andOutputParameter("bundle_archive", archive) + .withOutputParameterReturning("bundle_archive", &archive, sizeof(archive)) .andReturnValue(CELIX_SUCCESS); module_pt module = (module_pt) 0x20; @@ -100,21 +93,21 @@ TEST(bundle, createFromArchive) { bundle_revision_pt revision = (bundle_revision_pt) 0x21; manifest_pt manifest = (manifest_pt) 0x30; - mock().expectOneCall("bundleArchive_getCurrentRevision") .withParameter("archive", archive) - .andOutputParameter("revision", revision) + .withOutputParameterReturning("revision", &revision, sizeof(revision)) .andReturnValue(CELIX_SUCCESS); mock().expectOneCall("bundleRevision_getManifest") .withParameter("revision", revision) - .andOutputParameter("manifest", manifest) + .withOutputParameterReturning("manifest", &manifest, sizeof(manifest)) .andReturnValue(CELIX_SUCCESS); // CPPUTest has no build in support for longs, which breaks this test. + long id = 1; mock().expectOneCall("bundleArchive_getId") .withParameter("archive", archive) - .andOutputParameter("id", 1) + .withOutputParameterReturning("id", &id, sizeof(id)) .andReturnValue(CELIX_SUCCESS); module_pt module = (module_pt) 0x40; @@ -133,7 +126,7 @@ TEST(bundle, createFromArchive) { char symbolicName[] = "name"; mock().expectOneCall("module_getSymbolicName") .withParameter("module", module) - .andOutputParameter("symbolicName", symbolicName) + .withOutputParameterReturning("symbolicName", &symbolicName, sizeof(symbolicName)) .andReturnValue(CELIX_SUCCESS); array_list_pt bundles = NULL; @@ -165,7 +158,7 @@ TEST(bundle, createFromArchive) { } TEST(bundle, getArchive) { - bundle_pt bundle = (bundle_pt) apr_palloc(pool, sizeof(*bundle)); + bundle_pt bundle = (bundle_pt) malloc(sizeof(*bundle)); bundle_archive_pt archive = (bundle_archive_pt) 0x10; bundle->archive = archive; @@ -180,7 +173,7 @@ TEST(bundle, getArchive) { } TEST(bundle, getCurrentModule) { - bundle_pt bundle = (bundle_pt) apr_palloc(pool, sizeof(*bundle)); + bundle_pt bundle = (bundle_pt) malloc(sizeof(*bundle)); module_pt module1 = (module_pt) 0x11; module_pt module2 = (module_pt) 0x12; module_pt module3 = (module_pt) 0x13; @@ -202,7 +195,7 @@ TEST(bundle, getCurrentModule) { } TEST(bundle, getModules) { - bundle_pt bundle = (bundle_pt) apr_palloc(pool, sizeof(*bundle)); + bundle_pt bundle = (bundle_pt) malloc(sizeof(*bundle)); array_list_pt modules = (array_list_pt) 0x10; bundle->modules = modules; @@ -211,7 +204,7 @@ TEST(bundle, getModules) { } TEST(bundle, getHandle) { - bundle_pt bundle = (bundle_pt) apr_palloc(pool, sizeof(*bundle)); + bundle_pt bundle = (bundle_pt) malloc(sizeof(*bundle)); void *expected = (void *) 0x10; bundle->handle = expected; @@ -220,7 +213,7 @@ TEST(bundle, getHandle) { } TEST(bundle, setHandle) { - bundle_pt bundle = (bundle_pt) apr_palloc(pool, sizeof(*bundle)); + bundle_pt bundle = (bundle_pt) malloc(sizeof(*bundle)); void *expected = (void *) 0x10; bundle_setHandle(bundle, expected); @@ -228,7 +221,7 @@ TEST(bundle, setHandle) { } TEST(bundle, getActivator) { - bundle_pt bundle = (bundle_pt) apr_palloc(pool, sizeof(*bundle)); + bundle_pt bundle = (bundle_pt) malloc(sizeof(*bundle)); activator_pt expected = (activator_pt) 0x10; bundle->activator = expected; @@ -237,7 +230,7 @@ TEST(bundle, getActivator) { } TEST(bundle, setActivator) { - bundle_pt bundle = (bundle_pt) apr_palloc(pool, sizeof(*bundle)); + bundle_pt bundle = (bundle_pt) malloc(sizeof(*bundle)); activator_pt expected = (activator_pt) 0x10; celix_status_t status = bundle_setActivator(bundle, expected); @@ -246,7 +239,7 @@ TEST(bundle, setActivator) { } TEST(bundle, getContext) { - bundle_pt bundle = (bundle_pt) apr_palloc(pool, sizeof(*bundle)); + bundle_pt bundle = (bundle_pt) malloc(sizeof(*bundle)); bundle_context_pt expected = (bundle_context_pt) 0x10; bundle->context = expected; @@ -257,7 +250,7 @@ TEST(bundle, getContext) { } TEST(bundle, setContext) { - bundle_pt bundle = (bundle_pt) apr_palloc(pool, sizeof(*bundle)); + bundle_pt bundle = (bundle_pt) malloc(sizeof(*bundle)); bundle_context_pt expected = (bundle_context_pt) 0x10; celix_status_t status = bundle_setContext(bundle, expected); @@ -266,7 +259,7 @@ TEST(bundle, setContext) { } TEST(bundle, getEntry) { - bundle_pt bundle = (bundle_pt) apr_palloc(pool, sizeof(*bundle)); + bundle_pt bundle = (bundle_pt) malloc(sizeof(*bundle)); framework_pt framework = (framework_pt) 0x10; bundle->framework = framework; @@ -276,7 +269,7 @@ TEST(bundle, getEntry) { .withParameter("framework", framework) .withParameter("bundle", bundle) .withParameter("name", name) - .andOutputParameter("entry", expected) + .withOutputParameterReturning("entry", &expected, sizeof(expected)) .andReturnValue(CELIX_SUCCESS); char *actual = NULL; @@ -286,7 +279,7 @@ TEST(bundle, getEntry) { } TEST(bundle, getState) { - bundle_pt bundle = (bundle_pt) apr_palloc(pool, sizeof(*bundle)); + bundle_pt bundle = (bundle_pt) malloc(sizeof(*bundle)); bundle->state = OSGI_FRAMEWORK_BUNDLE_ACTIVE; bundle_state_e actual = OSGI_FRAMEWORK_BUNDLE_UNKNOWN; @@ -296,7 +289,7 @@ TEST(bundle, getState) { } TEST(bundle, setState) { - bundle_pt bundle = (bundle_pt) apr_palloc(pool, sizeof(*bundle)); + bundle_pt bundle = (bundle_pt) malloc(sizeof(*bundle)); bundle->state = OSGI_FRAMEWORK_BUNDLE_UNKNOWN; celix_status_t status = bundle_setState(bundle, OSGI_FRAMEWORK_BUNDLE_INSTALLED); @@ -305,7 +298,7 @@ TEST(bundle, setState) { } TEST(bundle, start) { - bundle_pt bundle = (bundle_pt) apr_palloc(pool, sizeof(*bundle)); + bundle_pt bundle = (bundle_pt) malloc(sizeof(*bundle)); framework_pt framework = (framework_pt) 0x10; bundle_archive_pt archive = (bundle_archive_pt) 0x20; bundle->framework = framework; @@ -313,9 +306,10 @@ TEST(bundle, start) { int options = 42; + long id = 1; mock().expectOneCall("bundleArchive_getId") .withParameter("archive", archive) - .andOutputParameter("id", 1) + .withOutputParameterReturning("id", &id, sizeof(id)) .andReturnValue(CELIX_SUCCESS); mock().expectOneCall("fw_startBundle") @@ -329,15 +323,16 @@ TEST(bundle, start) { } TEST(bundle, update) { - bundle_pt bundle = (bundle_pt) apr_palloc(pool, sizeof(*bundle)); + bundle_pt bundle = (bundle_pt) malloc(sizeof(*bundle)); framework_pt framework = (framework_pt) 0x10; bundle_archive_pt archive = (bundle_archive_pt) 0x20; bundle->framework = framework; bundle->archive = archive; + long id = 1; mock().expectOneCall("bundleArchive_getId") .withParameter("archive", archive) - .andOutputParameter("id", 1) + .withOutputParameterReturning("id", &id, sizeof(id)) .andReturnValue(CELIX_SUCCESS); char input[] = "input"; @@ -352,15 +347,16 @@ TEST(bundle, update) { } TEST(bundle, stop) { - bundle_pt bundle = (bundle_pt) apr_palloc(pool, sizeof(*bundle)); + bundle_pt bundle = (bundle_pt) malloc(sizeof(*bundle)); framework_pt framework = (framework_pt) 0x10; bundle_archive_pt archive = (bundle_archive_pt) 0x20; bundle->framework = framework; bundle->archive = archive; + long id = 1; mock().expectOneCall("bundleArchive_getId") .withParameter("archive", archive) - .andOutputParameter("id", 1) + .withOutputParameterReturning("id", &id, sizeof(id)) .andReturnValue(CELIX_SUCCESS); int options = 1; @@ -374,36 +370,37 @@ TEST(bundle, stop) { LONGS_EQUAL(CELIX_SUCCESS, status); } -TEST(bundle, uninstall) { - bundle_pt bundle = (bundle_pt) apr_palloc(pool, sizeof(*bundle)); - framework_pt framework = (framework_pt) 0x10; - bundle_archive_pt archive = (bundle_archive_pt) 0x20; - bundle->framework = framework; - bundle->archive = archive; - - mock().expectOneCall("bundleArchive_getId") - .withParameter("archive", archive) - .andOutputParameter("id", 1) - .andReturnValue(CELIX_SUCCESS); - - mock().expectOneCall("fw_uninstallBundle") - .withParameter("framework", framework) - .withParameter("bundle", bundle) - .andReturnValue(CELIX_SUCCESS); - - celix_status_t status = bundle_uninstall(bundle); - LONGS_EQUAL(CELIX_SUCCESS, status); -} +//TEST(bundle, uninstall) { +// bundle_pt bundle = (bundle_pt) malloc(sizeof(*bundle)); +// framework_pt framework = (framework_pt) 0x10; +// bundle_archive_pt archive = (bundle_archive_pt) 0x20; +// bundle->framework = framework; +// bundle->archive = archive; +// +// long id = 0; +// mock().expectOneCall("bundleArchive_getId") +// .withParameter("archive", archive) +// .withOutputParameterReturning("id", &id, sizeof(id)) +// .andReturnValue(CELIX_SUCCESS); +// +// mock().expectOneCall("fw_uninstallBundle") +// .withParameter("framework", framework) +// .withParameter("bundle", bundle) +// .andReturnValue(CELIX_SUCCESS); +// +// celix_status_t status = bundle_uninstall(bundle); +// LONGS_EQUAL(CELIX_SUCCESS, status); +//} TEST(bundle, setPersistentStateInactive) { - bundle_pt bundle = (bundle_pt) apr_palloc(pool, sizeof(*bundle)); + bundle_pt bundle = (bundle_pt) malloc(sizeof(*bundle)); bundle_archive_pt archive = (bundle_archive_pt) 0x10; bundle->archive = archive; - + long id = 1; mock().expectOneCall("bundleArchive_getId") .withParameter("archive", archive) - .andOutputParameter("id", 0) + .withOutputParameterReturning("id", &id, sizeof(id)) .andReturnValue(CELIX_SUCCESS); mock().expectOneCall("bundleArchive_setPersistentState") @@ -416,14 +413,14 @@ TEST(bundle, setPersistentStateInactive) } TEST(bundle, setPersistentStateUninstalled) { - bundle_pt bundle = (bundle_pt) apr_palloc(pool, sizeof(*bundle)); + bundle_pt bundle = (bundle_pt) malloc(sizeof(*bundle)); bundle_archive_pt archive = (bundle_archive_pt) 0x10; bundle->archive = archive; - + long id = 1; mock().expectOneCall("bundleArchive_getId") .withParameter("archive", archive) - .andOutputParameter("id", 0) + .withOutputParameterReturning("id", &id, sizeof(id)) .andReturnValue(CELIX_SUCCESS); mock().expectOneCall("bundleArchive_setPersistentState") @@ -436,7 +433,7 @@ TEST(bundle, setPersistentStateUninstall } TEST(bundle, revise) { - bundle_pt bundle = (bundle_pt) apr_palloc(pool, sizeof(*bundle)); + bundle_pt bundle = (bundle_pt) malloc(sizeof(*bundle)); char location[] = "location"; char inputFile[] = "inputFile"; @@ -444,7 +441,7 @@ TEST(bundle, revise) { } TEST(bundle, isLockable) { - bundle_pt bundle = (bundle_pt) apr_palloc(pool, sizeof(*bundle)); + bundle_pt bundle = (bundle_pt) malloc(sizeof(*bundle)); celixThreadMutex_create(&bundle->lock, NULL); bool lockable = false;
Modified: celix/trunk/framework/private/test/capability_test.cpp URL: http://svn.apache.org/viewvc/celix/trunk/framework/private/test/capability_test.cpp?rev=1618476&r1=1618475&r2=1618476&view=diff ============================================================================== --- celix/trunk/framework/private/test/capability_test.cpp (original) +++ celix/trunk/framework/private/test/capability_test.cpp Sun Aug 17 14:45:28 2014 @@ -44,18 +44,12 @@ int main(int argc, char** argv) { } TEST_GROUP(capability) { - apr_pool_t *pool; - void setup(void) { - apr_initialize(); - apr_pool_create(&pool, NULL); - - logger = (framework_logger_pt) apr_palloc(pool, sizeof(*logger)); + logger = (framework_logger_pt) malloc(sizeof(*logger)); logger->logFunction = frameworkLogger_log; } void teardown() { - apr_pool_destroy(pool); mock().checkExpectations(); mock().clear(); } @@ -74,24 +68,24 @@ TEST(capability, create) { version_pt emptyVersion = (version_pt) 0x10; mock().expectOneCall("version_createEmptyVersion") - .withParameter("pool", pool) - .andOutputParameter("version", emptyVersion) + .withOutputParameterReturning("version", &emptyVersion, sizeof(emptyVersion)) .andReturnValue(CELIX_SUCCESS); + char *value1 = (char *) "target"; mock().expectOneCall("attribute_getValue") .withParameter("attribute", serviceAttribute) - .andOutputParameter("value", (char *) "target") + .withOutputParameterReturning("value", &value1, sizeof(value1)) .andReturnValue(CELIX_SUCCESS); + char *value2 = (char *) "1.0.0"; mock().expectOneCall("attribute_getValue") .withParameter("attribute", versionAttribute) - .andOutputParameter("value", (char *) "1.0.0") + .withOutputParameterReturning("value", &value2, sizeof(value2)) .andReturnValue(CELIX_SUCCESS); mock().expectOneCall("version_createVersionFromString") - .withParameter("pool", pool) .withParameter("versionStr", (char *) "1.0.0") - .andOutputParameter("version", emptyVersion) + .withOutputParameterReturning("version", &emptyVersion, sizeof(emptyVersion)) .andReturnValue(CELIX_SUCCESS); capability_pt capability = NULL; @@ -99,7 +93,7 @@ TEST(capability, create) { } TEST(capability, getServiceName) { - capability_pt capability = (capability_pt) apr_palloc(pool, sizeof(*capability)); + capability_pt capability = (capability_pt) malloc(sizeof(*capability)); char serviceName[] = "service"; capability->serviceName = serviceName; @@ -109,7 +103,7 @@ TEST(capability, getServiceName) { } TEST(capability, getVersion) { - capability_pt capability = (capability_pt) apr_palloc(pool, sizeof(*capability)); + capability_pt capability = (capability_pt) malloc(sizeof(*capability)); version_pt version = (version_pt) 0x10; capability->version = version; @@ -119,7 +113,7 @@ TEST(capability, getVersion) { } TEST(capability, getModule) { - capability_pt capability = (capability_pt) apr_palloc(pool, sizeof(*capability)); + capability_pt capability = (capability_pt) malloc(sizeof(*capability)); module_pt module = (module_pt) 0x10; capability->module = module; Modified: celix/trunk/framework/private/test/filter_test.cpp URL: http://svn.apache.org/viewvc/celix/trunk/framework/private/test/filter_test.cpp?rev=1618476&r1=1618475&r2=1618476&view=diff ============================================================================== --- celix/trunk/framework/private/test/filter_test.cpp (original) +++ celix/trunk/framework/private/test/filter_test.cpp Sun Aug 17 14:45:28 2014 @@ -25,7 +25,6 @@ */ #include <stdlib.h> #include <stdio.h> -#include <apr_general.h> #include "CppUTest/TestHarness.h" #include "CppUTest/TestHarness_c.h" @@ -41,15 +40,10 @@ int main(int argc, char** argv) { } TEST_GROUP(filter) { - apr_pool_t *pool; - void setup(void) { - apr_initialize(); - apr_pool_create(&pool, NULL); } void teardown() { - apr_pool_destroy(pool); mock().checkExpectations(); mock().clear(); } Modified: celix/trunk/framework/private/test/framework_test.cpp URL: http://svn.apache.org/viewvc/celix/trunk/framework/private/test/framework_test.cpp?rev=1618476&r1=1618475&r2=1618476&view=diff ============================================================================== --- celix/trunk/framework/private/test/framework_test.cpp (original) +++ celix/trunk/framework/private/test/framework_test.cpp Sun Aug 17 14:45:28 2014 @@ -40,15 +40,10 @@ int main(int argc, char** argv) { } TEST_GROUP(framework) { - apr_pool_t *pool; - void setup(void) { - apr_initialize(); - apr_pool_create(&pool, NULL); } void teardown() { - apr_pool_destroy(pool); mock().checkExpectations(); mock().clear(); } Modified: celix/trunk/framework/private/test/manifest_parser_test.cpp URL: http://svn.apache.org/viewvc/celix/trunk/framework/private/test/manifest_parser_test.cpp?rev=1618476&r1=1618475&r2=1618476&view=diff ============================================================================== --- celix/trunk/framework/private/test/manifest_parser_test.cpp (original) +++ celix/trunk/framework/private/test/manifest_parser_test.cpp Sun Aug 17 14:45:28 2014 @@ -43,18 +43,12 @@ int main(int argc, char** argv) { } TEST_GROUP(manifest_parser) { - apr_pool_t *pool; - void setup(void) { - apr_initialize(); - apr_pool_create(&pool, NULL); - - logger = (framework_logger_pt) apr_palloc(pool, sizeof(*logger)); + logger = (framework_logger_pt) malloc(sizeof(*logger)); logger->logFunction = frameworkLogger_log; } void teardown() { - apr_pool_destroy(pool); mock().checkExpectations(); mock().clear(); } Modified: celix/trunk/framework/private/test/manifest_test.cpp URL: http://svn.apache.org/viewvc/celix/trunk/framework/private/test/manifest_test.cpp?rev=1618476&r1=1618475&r2=1618476&view=diff ============================================================================== --- celix/trunk/framework/private/test/manifest_test.cpp (original) +++ celix/trunk/framework/private/test/manifest_test.cpp Sun Aug 17 14:45:28 2014 @@ -26,8 +26,6 @@ #include <stdlib.h> #include <stdio.h> -#include <apr_general.h> - #include "CppUTest/TestHarness.h" #include "CppUTest/TestHarness_c.h" #include "CppUTest/CommandLineTestRunner.h" @@ -46,18 +44,12 @@ int main(int argc, char** argv) { } TEST_GROUP(manifest) { - apr_pool_t *pool; - void setup(void) { - apr_initialize(); - apr_pool_create(&pool, NULL); - - logger = (framework_logger_pt) apr_palloc(pool, sizeof(*logger)); + logger = (framework_logger_pt) malloc(sizeof(*logger)); logger->logFunction = frameworkLogger_log; } void teardown() { - apr_pool_destroy(pool); mock().checkExpectations(); mock().clear(); } @@ -102,6 +94,7 @@ TEST(manifest, createFromFile) { .withParameter("properties", properties); manifest_createFromFile(manifestFile, &manifest); + manifest_destroy(manifest); } TEST(manifest, createFromFileWithSections) { @@ -184,5 +177,7 @@ TEST(manifest, createFromFileWithSection actual = (properties_pt) hashMap_get(map, (void *) "b"); POINTERS_EQUAL(properties3, actual); + + manifest_destroy(manifest); } Modified: celix/trunk/framework/private/test/module_test.cpp URL: http://svn.apache.org/viewvc/celix/trunk/framework/private/test/module_test.cpp?rev=1618476&r1=1618475&r2=1618476&view=diff ============================================================================== --- celix/trunk/framework/private/test/module_test.cpp (original) +++ celix/trunk/framework/private/test/module_test.cpp Sun Aug 17 14:45:28 2014 @@ -40,15 +40,10 @@ int main(int argc, char** argv) { } TEST_GROUP(module) { - apr_pool_t *pool; - void setup(void) { - apr_initialize(); - apr_pool_create(&pool, NULL); } void teardown() { - apr_pool_destroy(pool); mock().checkExpectations(); mock().clear(); } Modified: celix/trunk/framework/private/test/properties_test.cpp URL: http://svn.apache.org/viewvc/celix/trunk/framework/private/test/properties_test.cpp?rev=1618476&r1=1618475&r2=1618476&view=diff ============================================================================== --- celix/trunk/framework/private/test/properties_test.cpp (original) +++ celix/trunk/framework/private/test/properties_test.cpp Sun Aug 17 14:45:28 2014 @@ -32,7 +32,6 @@ #include "CppUTestExt/MockSupport.h" extern "C" { -#include <apr_general.h> #include "properties.h" } @@ -41,15 +40,11 @@ int main(int argc, char** argv) { } TEST_GROUP(properties) { - apr_pool_t *pool; void setup(void) { - apr_initialize(); - apr_pool_create(&pool, NULL); } void teardown() { - apr_pool_destroy(pool); mock().checkExpectations(); mock().clear(); } Modified: celix/trunk/framework/private/test/requirement_test.cpp URL: http://svn.apache.org/viewvc/celix/trunk/framework/private/test/requirement_test.cpp?rev=1618476&r1=1618475&r2=1618476&view=diff ============================================================================== --- celix/trunk/framework/private/test/requirement_test.cpp (original) +++ celix/trunk/framework/private/test/requirement_test.cpp Sun Aug 17 14:45:28 2014 @@ -45,18 +45,12 @@ int main(int argc, char** argv) { } TEST_GROUP(requirement) { - apr_pool_t *pool; - void setup(void) { - apr_initialize(); - apr_pool_create(&pool, NULL); - - logger = (framework_logger_pt) apr_palloc(pool, sizeof(*logger)); + logger = (framework_logger_pt) malloc(sizeof(*logger)); logger->logFunction = frameworkLogger_log; } void teardown() { - apr_pool_destroy(pool); mock().checkExpectations(); mock().clear(); } @@ -74,25 +68,22 @@ TEST(requirement, create) { version_range_pt infiniteRange = (version_range_pt) 0x10; version_range_pt parsedRange = (version_range_pt) 0x11; + char *value1 = (char *) "target"; mock().expectOneCall("attribute_getValue") .withParameter("attribute", serviceAttribute) - .andOutputParameter("value", (char *) "target") + .withOutputParameterReturning("value", &value1, sizeof(value1)) .andReturnValue(CELIX_SUCCESS); - mock().expectOneCall("versionRange_createInfiniteVersionRange") - .withParameter("pool", pool) - .andOutputParameter("range", infiniteRange) + .withOutputParameterReturning("range", &infiniteRange, sizeof(infiniteRange)) .andReturnValue(CELIX_SUCCESS); - + char *value2 = (char *) "1.0.0"; mock().expectOneCall("attribute_getValue") .withParameter("attribute", versionAttribute) - .andOutputParameter("value", (char *) "1.0.0") + .withOutputParameterReturning("value", &value2, sizeof(value2)) .andReturnValue(CELIX_SUCCESS); - mock().expectOneCall("versionRange_parse") - .withParameter("pool", pool) .withParameter("rangeStr", (char *) "1.0.0") - .andOutputParameter("range", parsedRange) + .withOutputParameterReturning("range", &parsedRange, sizeof(parsedRange)) .andReturnValue(CELIX_SUCCESS); requirement_pt requirement = NULL; @@ -100,7 +91,7 @@ TEST(requirement, create) { } TEST(requirement, getVersionRange) { - requirement_pt requirement = (requirement_pt) apr_palloc(pool, sizeof(*requirement)); + requirement_pt requirement = (requirement_pt) malloc(sizeof(*requirement)); version_range_pt versionRange = (version_range_pt) 0x10; requirement->versionRange = versionRange; @@ -110,7 +101,7 @@ TEST(requirement, getVersionRange) { } TEST(requirement, getTargetName) { - requirement_pt requirement = (requirement_pt) apr_palloc(pool, sizeof(*requirement)); + requirement_pt requirement = (requirement_pt) malloc(sizeof(*requirement)); char targetName[] = "target"; requirement->targetName = targetName; @@ -120,7 +111,7 @@ TEST(requirement, getTargetName) { } TEST(requirement, isSatisfied) { - requirement_pt requirement = (requirement_pt) apr_palloc(pool, sizeof(*requirement)); + requirement_pt requirement = (requirement_pt) malloc(sizeof(*requirement)); version_range_pt versionRange = (version_range_pt) 0x10; requirement->versionRange = versionRange; @@ -129,13 +120,14 @@ TEST(requirement, isSatisfied) { mock().expectOneCall("capability_getVersion") .withParameter("capability", capability) - .andOutputParameter("version", version); + .withOutputParameterReturning("version", &version, sizeof(version)); + bool inRange1 = true; mock().expectOneCall("versionRange_isInRange") .withParameter("versionRange", versionRange) .withParameter("version", version) - .andOutputParameter("inRange", true); + .withOutputParameterReturning("inRange", &inRange1, sizeof(inRange1)); - bool inRange = false; - requirement_isSatisfied(requirement, capability, &inRange); - CHECK(inRange); + bool inRange2 = false; + requirement_isSatisfied(requirement, capability, &inRange2); + CHECK(inRange2); } Modified: celix/trunk/framework/private/test/resolver_test.cpp URL: http://svn.apache.org/viewvc/celix/trunk/framework/private/test/resolver_test.cpp?rev=1618476&r1=1618475&r2=1618476&view=diff ============================================================================== --- celix/trunk/framework/private/test/resolver_test.cpp (original) +++ celix/trunk/framework/private/test/resolver_test.cpp Sun Aug 17 14:45:28 2014 @@ -40,15 +40,10 @@ int main(int argc, char** argv) { } TEST_GROUP(resolver) { - apr_pool_t *pool; - void setup(void) { - apr_initialize(); - apr_pool_create(&pool, NULL); } void teardown() { - apr_pool_destroy(pool); mock().checkExpectations(); mock().clear(); } Modified: celix/trunk/framework/private/test/service_reference_test.cpp URL: http://svn.apache.org/viewvc/celix/trunk/framework/private/test/service_reference_test.cpp?rev=1618476&r1=1618475&r2=1618476&view=diff ============================================================================== --- celix/trunk/framework/private/test/service_reference_test.cpp (original) +++ celix/trunk/framework/private/test/service_reference_test.cpp Sun Aug 17 14:45:28 2014 @@ -43,18 +43,12 @@ int main(int argc, char** argv) { } TEST_GROUP(service_reference) { - apr_pool_t *pool; - void setup(void) { - apr_initialize(); - apr_pool_create(&pool, NULL); - - logger = (framework_logger_pt) apr_palloc(pool, sizeof(*logger)); + logger = (framework_logger_pt) malloc(sizeof(*logger)); logger->logFunction = frameworkLogger_log; } void teardown() { - apr_pool_destroy(pool); mock().checkExpectations(); mock().clear(); } @@ -72,7 +66,7 @@ TEST(service_reference, create) { } TEST(service_reference, getBundle) { - service_reference_pt reference = (service_reference_pt) apr_palloc(pool, sizeof(*reference)); + service_reference_pt reference = (service_reference_pt) malloc(sizeof(*reference)); bundle_pt bundle = (bundle_pt) 0x10; reference->bundle = bundle; @@ -83,7 +77,7 @@ TEST(service_reference, getBundle) { } TEST(service_reference, getServiceRegistration) { - service_reference_pt reference = (service_reference_pt) apr_palloc(pool, sizeof(*reference)); + service_reference_pt reference = (service_reference_pt) malloc(sizeof(*reference)); service_registration_pt registration = (service_registration_pt) 0x10; reference->registration = registration; @@ -94,7 +88,7 @@ TEST(service_reference, getServiceRegist } TEST(service_reference, invalidate) { - service_reference_pt reference = (service_reference_pt) apr_palloc(pool, sizeof(*reference)); + service_reference_pt reference = (service_reference_pt) malloc(sizeof(*reference)); service_registration_pt registration = (service_registration_pt) 0x10; reference->registration = registration; @@ -104,7 +98,7 @@ TEST(service_reference, invalidate) { } TEST(service_reference, getUsingBundle) { - service_reference_pt reference = (service_reference_pt) apr_palloc(pool, sizeof(*reference)); + service_reference_pt reference = (service_reference_pt) malloc(sizeof(*reference)); service_registration_pt registration = (service_registration_pt) 0x10; reference->registration = registration; @@ -117,10 +111,9 @@ TEST(service_reference, getUsingBundle) mock().expectOneCall("serviceRegistration_getRegistry") .withParameter("registration", registration) - .andOutputParameter("registry", registry); + .withOutputParameterReturning("registry", ®istry, sizeof(registry)); mock().expectOneCall("serviceRegistry_getUsingBundles") .withParameter("registry", registry) - .withParameter("pool", pool) .withParameter("reference", reference) .andReturnValue(bundles); @@ -132,13 +125,13 @@ TEST(service_reference, getUsingBundle) } TEST(service_reference, equals) { - service_reference_pt reference = (service_reference_pt) apr_palloc(pool, sizeof(*reference)); + service_reference_pt reference = (service_reference_pt) malloc(sizeof(*reference)); service_registration_pt registration = (service_registration_pt) 0x10; reference->registration = registration; bundle_pt bundle = (bundle_pt) 0x20; reference->bundle = bundle; - service_reference_pt toCompare = (service_reference_pt) apr_palloc(pool, sizeof(*reference)); + service_reference_pt toCompare = (service_reference_pt) malloc(sizeof(*reference)); registration = (service_registration_pt) 0x10; toCompare->registration = registration; bundle = (bundle_pt) 0x30; @@ -149,7 +142,7 @@ TEST(service_reference, equals) { LONGS_EQUAL(CELIX_SUCCESS, status) LONGS_EQUAL(true, equal); - toCompare = (service_reference_pt) apr_palloc(pool, sizeof(*reference)); + toCompare = (service_reference_pt) malloc(sizeof(*reference)); registration = (service_registration_pt) 0x11; toCompare->registration = registration; bundle = (bundle_pt) 0x30; @@ -162,13 +155,13 @@ TEST(service_reference, equals) { } TEST(service_reference, equals2) { - service_reference_pt reference = (service_reference_pt) apr_palloc(pool, sizeof(*reference)); + service_reference_pt reference = (service_reference_pt) malloc(sizeof(*reference)); service_registration_pt registration = (service_registration_pt) 0x10; reference->registration = registration; bundle_pt bundle = (bundle_pt) 0x20; reference->bundle = bundle; - service_reference_pt toCompare = (service_reference_pt) apr_palloc(pool, sizeof(*reference)); + service_reference_pt toCompare = (service_reference_pt) malloc(sizeof(*reference)); registration = (service_registration_pt) 0x10; toCompare->registration = registration; bundle = (bundle_pt) 0x30; @@ -177,7 +170,7 @@ TEST(service_reference, equals2) { bool equal = serviceReference_equals2(reference, toCompare); LONGS_EQUAL(true, equal); - toCompare = (service_reference_pt) apr_palloc(pool, sizeof(*reference)); + toCompare = (service_reference_pt) malloc(sizeof(*reference)); registration = (service_registration_pt) 0x11; toCompare->registration = registration; bundle = (bundle_pt) 0x30; @@ -188,7 +181,7 @@ TEST(service_reference, equals2) { } TEST(service_reference, hashCode) { - service_reference_pt reference = (service_reference_pt) apr_palloc(pool, sizeof(*reference)); + service_reference_pt reference = (service_reference_pt) malloc(sizeof(*reference)); service_registration_pt registration = (service_registration_pt) 0x10; reference->registration = registration; bundle_pt bundle = (bundle_pt) 0x20; Modified: celix/trunk/framework/private/test/service_registration_test.cpp URL: http://svn.apache.org/viewvc/celix/trunk/framework/private/test/service_registration_test.cpp?rev=1618476&r1=1618475&r2=1618476&view=diff ============================================================================== --- celix/trunk/framework/private/test/service_registration_test.cpp (original) +++ celix/trunk/framework/private/test/service_registration_test.cpp Sun Aug 17 14:45:28 2014 @@ -43,18 +43,12 @@ int main(int argc, char** argv) { } TEST_GROUP(service_registration) { - apr_pool_t *pool; - void setup(void) { - apr_initialize(); - apr_pool_create(&pool, NULL); - - logger = (framework_logger_pt) apr_palloc(pool, sizeof(*logger)); + logger = (framework_logger_pt) malloc(sizeof(*logger)); logger->logFunction = frameworkLogger_log; } void teardown() { - apr_pool_destroy(pool); mock().checkExpectations(); mock().clear(); } @@ -139,7 +133,7 @@ TEST(service_registration, createService } TEST(service_registration, isValidTrue) { - service_registration_pt registration = (service_registration_pt) apr_palloc(pool, sizeof(*registration)); + service_registration_pt registration = (service_registration_pt) malloc(sizeof(*registration)); void *service = (void *) 0x30; registration->svcObj = service; @@ -149,7 +143,7 @@ TEST(service_registration, isValidTrue) } TEST(service_registration, isValidFalse) { - service_registration_pt registration = (service_registration_pt) apr_palloc(pool, sizeof(*registration)); + service_registration_pt registration = (service_registration_pt) malloc(sizeof(*registration)); registration->svcObj = NULL; bool valid = serviceRegistration_isValid(registration); @@ -158,7 +152,7 @@ TEST(service_registration, isValidFalse) } TEST(service_registration, invalidate) { - service_registration_pt registration = (service_registration_pt) apr_palloc(pool, sizeof(*registration)); + service_registration_pt registration = (service_registration_pt) malloc(sizeof(*registration)); celixThreadMutex_create(®istration->mutex, NULL); void *service = (void *) 0x30; registration->svcObj = service; @@ -171,7 +165,7 @@ TEST(service_registration, invalidate) { TEST(service_registration, unregisterValid) { service_registry_pt registry = (service_registry_pt) 0x10; bundle_pt bundle = (bundle_pt) 0x20; - service_registration_pt registration = (service_registration_pt) apr_palloc(pool, sizeof(*registration)); + service_registration_pt registration = (service_registration_pt) malloc(sizeof(*registration)); registration->registry = registry; registration->bundle = bundle; celixThreadMutex_create(®istration->mutex, NULL); @@ -192,7 +186,7 @@ TEST(service_registration, unregisterVal TEST(service_registration, unregisterInvalid) { service_registry_pt registry = (service_registry_pt) 0x10; bundle_pt bundle = (bundle_pt) 0x20; - service_registration_pt registration = (service_registration_pt) apr_palloc(pool, sizeof(*registration)); + service_registration_pt registration = (service_registration_pt) malloc(sizeof(*registration)); registration->registry = registry; registration->bundle = bundle; celixThreadMutex_create(®istration->mutex, NULL); @@ -203,7 +197,7 @@ TEST(service_registration, unregisterInv } TEST(service_registration, getService) { - service_registration_pt registration = (service_registration_pt) apr_palloc(pool, sizeof(*registration)); + service_registration_pt registration = (service_registration_pt) malloc(sizeof(*registration)); bundle_pt bundle = (bundle_pt) 0x10; registration->bundle = bundle; void *service = (void *) 0x20; @@ -222,10 +216,10 @@ celix_status_t serviceRegistrationTest_g } TEST(service_registration, getServiceFromFactory) { - service_registration_pt registration = (service_registration_pt) apr_palloc(pool, sizeof(*registration)); + service_registration_pt registration = (service_registration_pt) malloc(sizeof(*registration)); bundle_pt bundle = (bundle_pt) 0x10; registration->bundle = bundle; - service_factory_pt factory = (service_factory_pt) apr_palloc(pool, sizeof(*factory)); + service_factory_pt factory = (service_factory_pt) malloc(sizeof(*factory)); factory->getService = serviceRegistrationTest_getService; registration->svcObj = factory; registration->serviceFactory = factory; @@ -238,7 +232,7 @@ TEST(service_registration, getServiceFro } TEST(service_registration, getProperties) { - service_registration_pt registration = (service_registration_pt) apr_palloc(pool, sizeof(*registration)); + service_registration_pt registration = (service_registration_pt) malloc(sizeof(*registration)); properties_pt properties = (properties_pt) 0x10; registration->properties = properties; @@ -249,7 +243,7 @@ TEST(service_registration, getProperties } TEST(service_registration, getPropertiesIllegalArgument) { - service_registration_pt registration = (service_registration_pt) apr_palloc(pool, sizeof(*registration)); + service_registration_pt registration = (service_registration_pt) malloc(sizeof(*registration)); registration->properties = NULL; properties_pt actual = (properties_pt) 0x01; @@ -258,7 +252,7 @@ TEST(service_registration, getProperties } TEST(service_registration, getRegistry) { - service_registration_pt registration = (service_registration_pt) apr_palloc(pool, sizeof(*registration)); + service_registration_pt registration = (service_registration_pt) malloc(sizeof(*registration)); service_registry_pt registry = (service_registry_pt) 0x10; registration->registry = registry; @@ -269,7 +263,7 @@ TEST(service_registration, getRegistry) } TEST(service_registration, getRegistryIllegalArgument) { - service_registration_pt registration = (service_registration_pt) apr_palloc(pool, sizeof(*registration)); + service_registration_pt registration = (service_registration_pt) malloc(sizeof(*registration)); registration->registry = NULL; service_registry_pt actual = (service_registry_pt) 0x01; @@ -278,7 +272,7 @@ TEST(service_registration, getRegistryIl } TEST(service_registration, getServiceReferences) { - service_registration_pt registration = (service_registration_pt) apr_palloc(pool, sizeof(*registration)); + service_registration_pt registration = (service_registration_pt) malloc(sizeof(*registration)); array_list_pt references = (array_list_pt) 0x10; registration->references = references; @@ -289,7 +283,7 @@ TEST(service_registration, getServiceRef } TEST(service_registration, getServiceReferencesIllegalArgument) { - service_registration_pt registration = (service_registration_pt) apr_palloc(pool, sizeof(*registration)); + service_registration_pt registration = (service_registration_pt) malloc(sizeof(*registration)); registration->registry = NULL; array_list_pt actual = (array_list_pt) 0x01; @@ -298,7 +292,7 @@ TEST(service_registration, getServiceRef } TEST(service_registration, getServiceName) { - service_registration_pt registration = (service_registration_pt) apr_palloc(pool, sizeof(*registration)); + service_registration_pt registration = (service_registration_pt) malloc(sizeof(*registration)); std::string serviceName = "service"; registration->className = (char *) serviceName.c_str(); @@ -309,7 +303,7 @@ TEST(service_registration, getServiceNam } TEST(service_registration, getServiceNameIllegalArgument) { - service_registration_pt registration = (service_registration_pt) apr_palloc(pool, sizeof(*registration)); + service_registration_pt registration = (service_registration_pt) malloc(sizeof(*registration)); registration->className = NULL; char *actual = (char *) 0x01; @@ -318,7 +312,7 @@ TEST(service_registration, getServiceNam } TEST(service_registration, getBundle) { - service_registration_pt registration = (service_registration_pt) apr_palloc(pool, sizeof(*registration)); + service_registration_pt registration = (service_registration_pt) malloc(sizeof(*registration)); bundle_pt bundle = (bundle_pt) 0x10; registration->bundle = bundle; @@ -329,7 +323,7 @@ TEST(service_registration, getBundle) { } TEST(service_registration, getBundleIllegalArgument) { - service_registration_pt registration = (service_registration_pt) apr_palloc(pool, sizeof(*registration)); + service_registration_pt registration = (service_registration_pt) malloc(sizeof(*registration)); registration->bundle = NULL; bundle_pt actual = (bundle_pt) 0x01; Modified: celix/trunk/framework/private/test/service_registry_test.cpp URL: http://svn.apache.org/viewvc/celix/trunk/framework/private/test/service_registry_test.cpp?rev=1618476&r1=1618475&r2=1618476&view=diff ============================================================================== --- celix/trunk/framework/private/test/service_registry_test.cpp (original) +++ celix/trunk/framework/private/test/service_registry_test.cpp Sun Aug 17 14:45:28 2014 @@ -43,18 +43,12 @@ int main(int argc, char** argv) { } TEST_GROUP(service_registry) { - apr_pool_t *pool; - void setup(void) { - apr_initialize(); - apr_pool_create(&pool, NULL); - - logger = (framework_logger_pt) apr_palloc(pool, sizeof(*logger)); + logger = (framework_logger_pt) malloc(sizeof(*logger)); logger->logFunction = frameworkLogger_log; } void teardown() { - apr_pool_destroy(pool); mock().checkExpectations(); mock().clear(); } @@ -82,7 +76,7 @@ TEST(service_registry, create) { } TEST(service_registry, getRegisteredServices) { - service_registry_pt registry = (service_registry_pt) apr_palloc(pool, sizeof(*registry)); + service_registry_pt registry = (service_registry_pt) malloc(sizeof(*registry)); registry->serviceRegistrations = hashMap_create(NULL, NULL, NULL, NULL); array_list_pt registrations = NULL; @@ -104,30 +98,20 @@ TEST(service_registry, getRegisteredServ mock() .expectOneCall("serviceRegistration_getBundle") .withParameter("registration", reg) - .andOutputParameter("bundle", bundle) + .withOutputParameterReturning("bundle", &bundle, sizeof(bundle)) .andReturnValue(CELIX_SUCCESS) .ignoreOtherParameters(); mock() .expectOneCall("serviceReference_create") .withParameter("bundle", bundle) .withParameter("registration", reg) - .andOutputParameter("reference", ref) + .withOutputParameterReturning("reference", &ref, sizeof(ref)) .andReturnValue(CELIX_SUCCESS) .ignoreOtherParameters(); mock() .expectOneCall("serviceRegistration_getServiceReferences") .withParameter("registration", reg) - .andOutputParameter("references", refs) - .andReturnValue(CELIX_SUCCESS); - mock() - .expectOneCall("serviceReference_getServiceRegistration") - .withParameter("reference", ref) - .andOutputParameter("registration", reg) - .andReturnValue(CELIX_SUCCESS); - mock() - .expectOneCall("serviceRegistration_getServiceReferences") - .withParameter("registration", reg) - .andOutputParameter("references", refs) + .withOutputParameterReturning("references", &refs, sizeof(refs)) .andReturnValue(CELIX_SUCCESS); array_list_pt services = NULL; @@ -137,14 +121,14 @@ TEST(service_registry, getRegisteredServ } TEST(service_registry, getServicesInUse) { - service_registry_pt registry = (service_registry_pt) apr_palloc(pool, sizeof(*registry)); + service_registry_pt registry = (service_registry_pt) malloc(sizeof(*registry)); registry->inUseMap = hashMap_create(NULL, NULL, NULL, NULL); array_list_pt usages = NULL; arrayList_create(&usages); bundle_pt bundle = (bundle_pt) 0x10; service_reference_pt ref = (service_reference_pt) 0x20; - usage_count_pt usage = (usage_count_pt) apr_palloc(pool, sizeof(*usage)); + usage_count_pt usage = (usage_count_pt) malloc(sizeof(*usage)); usage->reference = ref; arrayList_add(usages, usage); hashMap_put(registry->inUseMap, bundle, usages); @@ -156,13 +140,14 @@ TEST(service_registry, getServicesInUse) } TEST(service_registry, registerServiceNoProps) { - service_registry_pt registry = (service_registry_pt) apr_palloc(pool, sizeof(*registry)); + service_registry_pt registry = (service_registry_pt) malloc(sizeof(*registry)); registry->inUseMap = hashMap_create(NULL, NULL, NULL, NULL); celixThreadMutexAttr_create(®istry->mutexAttr); celixThreadMutexAttr_settype(®istry->mutexAttr, CELIX_THREAD_MUTEX_RECURSIVE); celixThreadMutex_create(®istry->mutex, ®istry->mutexAttr); registry->currentServiceId = 1l; registry->serviceRegistrations = hashMap_create(NULL, NULL, NULL, NULL); + registry->serviceChanged = NULL; bundle_pt bundle = (bundle_pt) 0x10; std::string serviceName = "service"; @@ -170,13 +155,7 @@ TEST(service_registry, registerServiceNo service_registration_pt reg = (service_registration_pt) 0x30; mock() - .expectOneCall("bundle_getMemoryPool") - .withParameter("bundle", bundle) - .andOutputParameter("pool", pool) - .andReturnValue(CELIX_SUCCESS); - mock() .expectOneCall("serviceRegistration_create") - .withParameter("pool", pool) .withParameter("registry", registry) .withParameter("bundle", bundle) .withParameter("serviceName", (char *) serviceName.c_str()) @@ -191,13 +170,14 @@ TEST(service_registry, registerServiceNo } TEST(service_registry, registerServiceFactoryNoProps) { - service_registry_pt registry = (service_registry_pt) apr_palloc(pool, sizeof(*registry)); + service_registry_pt registry = (service_registry_pt) malloc(sizeof(*registry)); registry->inUseMap = hashMap_create(NULL, NULL, NULL, NULL); celixThreadMutexAttr_create(®istry->mutexAttr); celixThreadMutexAttr_settype(®istry->mutexAttr, CELIX_THREAD_MUTEX_RECURSIVE); celixThreadMutex_create(®istry->mutex, ®istry->mutexAttr); registry->currentServiceId = 1l; registry->serviceRegistrations = hashMap_create(NULL, NULL, NULL, NULL); + registry->serviceChanged = NULL; bundle_pt bundle = (bundle_pt) 0x10; std::string serviceName = "service"; @@ -205,13 +185,7 @@ TEST(service_registry, registerServiceFa service_registration_pt reg = (service_registration_pt) 0x30; mock() - .expectOneCall("bundle_getMemoryPool") - .withParameter("bundle", bundle) - .andOutputParameter("pool", pool) - .andReturnValue(CELIX_SUCCESS); - mock() .expectOneCall("serviceRegistration_createServiceFactory") - .withParameter("pool", pool) .withParameter("registry", registry) .withParameter("bundle", bundle) .withParameter("serviceName", (char *) serviceName.c_str()) @@ -226,13 +200,14 @@ TEST(service_registry, registerServiceFa } TEST(service_registry, unregisterService) { - service_registry_pt registry = (service_registry_pt) apr_palloc(pool, sizeof(*registry)); + service_registry_pt registry = (service_registry_pt) malloc(sizeof(*registry)); registry->inUseMap = hashMap_create(NULL, NULL, NULL, NULL); celixThreadMutexAttr_create(®istry->mutexAttr); celixThreadMutexAttr_settype(®istry->mutexAttr, CELIX_THREAD_MUTEX_RECURSIVE); celixThreadMutex_create(®istry->mutex, ®istry->mutexAttr); registry->currentServiceId = 1l; registry->serviceRegistrations = hashMap_create(NULL, NULL, NULL, NULL); + registry->serviceChanged = NULL; bundle_pt bundle = (bundle_pt) 0x10; service_registration_pt registration = (service_registration_pt) 0x20; @@ -255,7 +230,7 @@ TEST(service_registry, unregisterService mock() .expectOneCall("serviceRegistration_getProperties") .withParameter("registration", registration) - .andOutputParameter("properties", properties) + .withOutputParameterReturning("properties", &properties, sizeof(properties)) .andReturnValue(CELIX_SUCCESS); mock() .expectOneCall("properties_get") @@ -265,11 +240,7 @@ TEST(service_registry, unregisterService mock() .expectOneCall("serviceRegistration_getServiceReferences") .withParameter("registration", registration) - .andOutputParameter("references", references) - .andReturnValue(CELIX_SUCCESS); - mock() - .expectOneCall("serviceReference_invalidate") - .withParameter("reference", reference) + .withOutputParameterReturning("references", &references, sizeof(references)) .andReturnValue(CELIX_SUCCESS); mock() .expectOneCall("serviceRegistration_invalidate") @@ -280,7 +251,7 @@ TEST(service_registry, unregisterService } TEST(service_registry, unregisterServices) { - service_registry_pt registry = (service_registry_pt) apr_palloc(pool, sizeof(*registry)); + service_registry_pt registry = (service_registry_pt) malloc(sizeof(*registry)); registry->inUseMap = hashMap_create(NULL, NULL, NULL, NULL); celixThreadMutexAttr_create(®istry->mutexAttr); celixThreadMutexAttr_settype(®istry->mutexAttr, CELIX_THREAD_MUTEX_RECURSIVE); @@ -309,7 +280,7 @@ TEST(service_registry, unregisterService } TEST(service_registry, getServiceReferences) { - service_registry_pt registry = (service_registry_pt) apr_palloc(pool, sizeof(*registry)); + service_registry_pt registry = (service_registry_pt) malloc(sizeof(*registry)); registry->inUseMap = hashMap_create(NULL, NULL, NULL, NULL); celixThreadMutexAttr_create(®istry->mutexAttr); celixThreadMutexAttr_settype(®istry->mutexAttr, CELIX_THREAD_MUTEX_RECURSIVE); @@ -334,12 +305,13 @@ TEST(service_registry, getServiceReferen mock() .expectOneCall("serviceRegistration_getProperties") .withParameter("registration", registration) - .andOutputParameter("properties", properties) + .withOutputParameterReturning("properties", &properties, sizeof(properties)) .andReturnValue(CELIX_SUCCESS); + char *serviceName = (char *) "test"; mock() .expectOneCall("serviceRegistration_getServiceName") .withParameter("registration", registration) - .andOutputParameter("serviceName", "test") + .withOutputParameterReturning("serviceName", &serviceName, sizeof(serviceName)) .andReturnValue(CELIX_SUCCESS); mock() .expectOneCall("serviceRegistration_isValid") @@ -348,30 +320,20 @@ TEST(service_registry, getServiceReferen mock() .expectOneCall("serviceRegistration_getBundle") .withParameter("registration", registration) - .andOutputParameter("bundle", bundle) + .withOutputParameterReturning("bundle", &bundle, sizeof(bundle)) .andReturnValue(CELIX_SUCCESS) .ignoreOtherParameters(); mock() .expectOneCall("serviceReference_create") .withParameter("bundle", bundle) .withParameter("registration", registration) - .andOutputParameter("reference", reference) + .withOutputParameterReturning("reference", &reference, sizeof(reference)) .andReturnValue(CELIX_SUCCESS) .ignoreOtherParameters(); mock() .expectOneCall("serviceRegistration_getServiceReferences") .withParameter("registration", registration) - .andOutputParameter("references", references) - .andReturnValue(CELIX_SUCCESS); - mock() - .expectOneCall("serviceReference_getServiceRegistration") - .withParameter("reference", reference) - .andOutputParameter("registration", registration) - .andReturnValue(CELIX_SUCCESS); - mock() - .expectOneCall("serviceRegistration_getServiceReferences") - .withParameter("registration", registration) - .andOutputParameter("references", references) + .withOutputParameterReturning("references", &references, sizeof(references)) .andReturnValue(CELIX_SUCCESS); array_list_pt actual = NULL; @@ -381,7 +343,7 @@ TEST(service_registry, getServiceReferen } TEST(service_registry, getService) { - service_registry_pt registry = (service_registry_pt) apr_palloc(pool, sizeof(*registry)); + service_registry_pt registry = (service_registry_pt) malloc(sizeof(*registry)); registry->inUseMap = hashMap_create(NULL, NULL, NULL, NULL); celixThreadMutexAttr_create(®istry->mutexAttr); celixThreadMutexAttr_settype(®istry->mutexAttr, CELIX_THREAD_MUTEX_RECURSIVE); @@ -410,7 +372,7 @@ TEST(service_registry, getService) { mock() .expectOneCall("serviceReference_getServiceRegistration") .withParameter("reference", reference) - .andOutputParameter("registration", registration) + .withOutputParameterReturning("registration", ®istration, sizeof(registration)) .andReturnValue(CELIX_SUCCESS); mock() .expectOneCall("serviceRegistration_isValid") @@ -419,13 +381,13 @@ TEST(service_registry, getService) { mock() .expectOneCall("bundle_getCurrentModule") .withParameter("bundle", bundle) - .andOutputParameter("module", module) + .withOutputParameterReturning("module", &module, sizeof(module)) .andReturnValue(CELIX_SUCCESS); mock() .expectOneCall("serviceRegistration_getService") .withParameter("registration", registration) .withParameter("bundle", bundle) - .andOutputParameter("service", service) + .withOutputParameterReturning("service", &service, sizeof(service)) .andReturnValue(true); mock() .expectOneCall("serviceRegistration_isValid") @@ -438,7 +400,7 @@ TEST(service_registry, getService) { } TEST(service_registry, ungetService) { - service_registry_pt registry = (service_registry_pt) apr_palloc(pool, sizeof(*registry)); + service_registry_pt registry = (service_registry_pt) malloc(sizeof(*registry)); registry->inUseMap = hashMap_create(NULL, NULL, NULL, NULL); celixThreadMutexAttr_create(®istry->mutexAttr); celixThreadMutexAttr_settype(®istry->mutexAttr, CELIX_THREAD_MUTEX_RECURSIVE); @@ -470,12 +432,16 @@ TEST(service_registry, ungetService) { mock() .expectOneCall("serviceReference_getServiceRegistration") .withParameter("reference", reference) - .andOutputParameter("registration", registration) + .withOutputParameterReturning("registration", ®istration, sizeof(registration)) .andReturnValue(CELIX_SUCCESS); mock() .expectOneCall("serviceRegistration_isValid") .withParameter("registration", registration) .andReturnValue(true); + mock() + .expectOneCall("serviceReference_destroy") + .withParameter("reference", reference) + .andReturnValue(CELIX_SUCCESS); bool result = false; serviceRegistry_ungetService(registry, bundle, reference, &result); @@ -483,7 +449,7 @@ TEST(service_registry, ungetService) { } TEST(service_registry, ungetServivces) { - service_registry_pt registry = (service_registry_pt) apr_palloc(pool, sizeof(*registry)); + service_registry_pt registry = (service_registry_pt) malloc(sizeof(*registry)); registry->inUseMap = hashMap_create(NULL, NULL, NULL, NULL); celixThreadMutexAttr_create(®istry->mutexAttr); celixThreadMutexAttr_settype(®istry->mutexAttr, CELIX_THREAD_MUTEX_RECURSIVE); @@ -514,20 +480,15 @@ TEST(service_registry, ungetServivces) { hashMap_put(registry->inUseMap, bundle, usages); mock() - .expectOneCall("bundle_getMemoryPool") - .withParameter("bundle", bundle) - .andOutputParameter("pool", pool) - .andReturnValue(CELIX_SUCCESS); - mock() .expectOneCall("serviceReference_getServiceRegistration") .withParameter("reference", reference) - .andOutputParameter("registration", registration) + .withOutputParameterReturning("registration", ®istration, sizeof(registration)) .andReturnValue(CELIX_SUCCESS); // mock() // .expectOneCall("serviceReference_equals") // .withParameter("reference", reference) // .withParameter("compareTo", reference) -// .andOutputParameter("equal", true) +// .withOutputParameterReturning("equal", true) // .andReturnValue(CELIX_SUCCESS); mock() .expectOneCall("serviceRegistration_isValid") @@ -536,14 +497,18 @@ TEST(service_registry, ungetServivces) { mock() .expectOneCall("serviceReference_getServiceRegistration") .withParameter("reference", reference) - .andOutputParameter("registration", registration) + .withOutputParameterReturning("registration", ®istration, sizeof(registration)) .andReturnValue(CELIX_SUCCESS); + mock() + .expectOneCall("serviceReference_destroy") + .withParameter("reference", reference) + .andReturnValue(CELIX_SUCCESS); serviceRegistry_ungetServices(registry, bundle); } TEST(service_registry, getUsingBundles) { - service_registry_pt registry = (service_registry_pt) apr_palloc(pool, sizeof(*registry)); + service_registry_pt registry = (service_registry_pt) malloc(sizeof(*registry)); registry->inUseMap = hashMap_create(NULL, NULL, NULL, NULL); celixThreadMutexAttr_create(®istry->mutexAttr); celixThreadMutexAttr_settype(®istry->mutexAttr, CELIX_THREAD_MUTEX_RECURSIVE); @@ -578,7 +543,7 @@ TEST(service_registry, getUsingBundles) } TEST(service_registry, createServiceReference) { - service_registry_pt registry = (service_registry_pt) apr_palloc(pool, sizeof(*registry)); + service_registry_pt registry = (service_registry_pt) malloc(sizeof(*registry)); registry->inUseMap = hashMap_create(NULL, NULL, NULL, NULL); celixThreadMutexAttr_create(®istry->mutexAttr); celixThreadMutexAttr_settype(®istry->mutexAttr, CELIX_THREAD_MUTEX_RECURSIVE); @@ -602,30 +567,20 @@ TEST(service_registry, createServiceRefe mock() .expectOneCall("serviceRegistration_getBundle") .withParameter("registration", registration) - .andOutputParameter("bundle", bundle) + .withOutputParameterReturning("bundle", &bundle, sizeof(bundle)) .andReturnValue(CELIX_SUCCESS) .ignoreOtherParameters(); mock() .expectOneCall("serviceReference_create") .withParameter("bundle", bundle) .withParameter("registration", registration) - .andOutputParameter("reference", reference) + .withOutputParameterReturning("reference", &reference, sizeof(reference)) .andReturnValue(CELIX_SUCCESS) .ignoreOtherParameters(); mock() .expectOneCall("serviceRegistration_getServiceReferences") .withParameter("registration", registration) - .andOutputParameter("references", references) - .andReturnValue(CELIX_SUCCESS); - mock() - .expectOneCall("serviceReference_getServiceRegistration") - .withParameter("reference", reference) - .andOutputParameter("registration", registration) - .andReturnValue(CELIX_SUCCESS); - mock() - .expectOneCall("serviceRegistration_getServiceReferences") - .withParameter("registration", registration) - .andOutputParameter("references", references) + .withOutputParameterReturning("references", &references, sizeof(references)) .andReturnValue(CELIX_SUCCESS); service_reference_pt actual = NULL; @@ -634,7 +589,7 @@ TEST(service_registry, createServiceRefe } TEST(service_registry, getListenerHooks) { - service_registry_pt registry = (service_registry_pt) apr_palloc(pool, sizeof(*registry)); + service_registry_pt registry = (service_registry_pt) malloc(sizeof(*registry)); registry->listenerHooks = NULL; arrayList_create(®istry->listenerHooks); @@ -650,30 +605,20 @@ TEST(service_registry, getListenerHooks) mock() .expectOneCall("serviceRegistration_getBundle") .withParameter("registration", registration) - .andOutputParameter("bundle", bundle) + .withOutputParameterReturning("bundle", &bundle, sizeof(bundle)) .andReturnValue(CELIX_SUCCESS) .ignoreOtherParameters(); mock() .expectOneCall("serviceReference_create") .withParameter("bundle", bundle) .withParameter("registration", registration) - .andOutputParameter("reference", reference) + .withOutputParameterReturning("reference", &reference, sizeof(reference)) .andReturnValue(CELIX_SUCCESS) .ignoreOtherParameters(); mock() .expectOneCall("serviceRegistration_getServiceReferences") .withParameter("registration", registration) - .andOutputParameter("references", references) - .andReturnValue(CELIX_SUCCESS); - mock() - .expectOneCall("serviceReference_getServiceRegistration") - .withParameter("reference", reference) - .andOutputParameter("registration", registration) - .andReturnValue(CELIX_SUCCESS); - mock() - .expectOneCall("serviceRegistration_getServiceReferences") - .withParameter("registration", registration) - .andOutputParameter("references", references) + .withOutputParameterReturning("references", &references, sizeof(registration)) .andReturnValue(CELIX_SUCCESS); array_list_pt hooks = NULL; @@ -683,7 +628,7 @@ TEST(service_registry, getListenerHooks) } TEST(service_registry, servicePropertiesModified) { - service_registry_pt registry = (service_registry_pt) apr_palloc(pool, sizeof(*registry)); + service_registry_pt registry = (service_registry_pt) malloc(sizeof(*registry)); service_registration_pt registration = (service_registration_pt) 0x10; properties_pt properties = (properties_pt) 0x20; Modified: celix/trunk/framework/private/test/service_tracker_customizer_test.cpp URL: http://svn.apache.org/viewvc/celix/trunk/framework/private/test/service_tracker_customizer_test.cpp?rev=1618476&r1=1618475&r2=1618476&view=diff ============================================================================== --- celix/trunk/framework/private/test/service_tracker_customizer_test.cpp (original) +++ celix/trunk/framework/private/test/service_tracker_customizer_test.cpp Sun Aug 17 14:45:28 2014 @@ -46,18 +46,12 @@ int main(int argc, char** argv) { } TEST_GROUP(service_tracker_customizer) { - apr_pool_t *pool; - void setup(void) { - apr_initialize(); - apr_pool_create(&pool, NULL); - - logger = (framework_logger_pt) apr_palloc(pool, sizeof(*logger)); + logger = (framework_logger_pt) malloc(sizeof(*logger)); logger->logFunction = frameworkLogger_log; } void teardown() { - apr_pool_destroy(pool); // mock().checkExpectations(); // mock().clear(); } @@ -110,7 +104,7 @@ TEST(service_tracker_customizer, createI } TEST(service_tracker_customizer, getHandle) { - service_tracker_customizer_pt customizer = (service_tracker_customizer_pt) apr_palloc(pool, sizeof(*customizer)); + service_tracker_customizer_pt customizer = (service_tracker_customizer_pt) malloc(sizeof(*customizer)); void *handle = (void *) 0x10; customizer->handle = handle; @@ -121,7 +115,7 @@ TEST(service_tracker_customizer, getHand } TEST(service_tracker_customizer, getAddingFunction) { - service_tracker_customizer_pt customizer = (service_tracker_customizer_pt) apr_palloc(pool, sizeof(*customizer)); + service_tracker_customizer_pt customizer = (service_tracker_customizer_pt) malloc(sizeof(*customizer)); adding_callback_pt adding = (adding_callback_pt) 0x11; customizer->addingService = adding; @@ -132,7 +126,7 @@ TEST(service_tracker_customizer, getAddi } TEST(service_tracker_customizer, getAddedFunction) { - service_tracker_customizer_pt customizer = (service_tracker_customizer_pt) apr_palloc(pool, sizeof(*customizer)); + service_tracker_customizer_pt customizer = (service_tracker_customizer_pt) malloc(sizeof(*customizer)); added_callback_pt added = (added_callback_pt) 0x11; customizer->addedService = added; @@ -143,7 +137,7 @@ TEST(service_tracker_customizer, getAdde } TEST(service_tracker_customizer, getModifiedFunction) { - service_tracker_customizer_pt customizer = (service_tracker_customizer_pt) apr_palloc(pool, sizeof(*customizer)); + service_tracker_customizer_pt customizer = (service_tracker_customizer_pt) malloc(sizeof(*customizer)); modified_callback_pt modified = (modified_callback_pt) 0x11; customizer->modifiedService = modified; @@ -154,7 +148,7 @@ TEST(service_tracker_customizer, getModi } TEST(service_tracker_customizer, getRemovedFunction) { - service_tracker_customizer_pt customizer = (service_tracker_customizer_pt) apr_palloc(pool, sizeof(*customizer)); + service_tracker_customizer_pt customizer = (service_tracker_customizer_pt) malloc(sizeof(*customizer)); removed_callback_pt removed = (removed_callback_pt) 0x11; customizer->removedService = removed; Modified: celix/trunk/framework/private/test/service_tracker_test.cpp URL: http://svn.apache.org/viewvc/celix/trunk/framework/private/test/service_tracker_test.cpp?rev=1618476&r1=1618475&r2=1618476&view=diff ============================================================================== --- celix/trunk/framework/private/test/service_tracker_test.cpp (original) +++ celix/trunk/framework/private/test/service_tracker_test.cpp Sun Aug 17 14:45:28 2014 @@ -45,18 +45,12 @@ int main(int argc, char** argv) { } TEST_GROUP(service_tracker) { - apr_pool_t *pool; - void setup(void) { - apr_initialize(); - apr_pool_create(&pool, NULL); - - logger = (framework_logger_pt) apr_palloc(pool, sizeof(*logger)); + logger = (framework_logger_pt) malloc(sizeof(*logger)); logger->logFunction = frameworkLogger_log; } void teardown() { - apr_pool_destroy(pool); mock().checkExpectations(); mock().clear(); } @@ -106,12 +100,14 @@ TEST(service_tracker, destroy) { .withParameter("context", ctx) .withParameter("listener", listener) .andReturnValue(CELIX_SUCCESS); + + status = serviceTracker_destroy(tracker); } TEST(service_tracker, open) { // Without initial services and no customizer // new tracker - service_tracker_pt tracker = (service_tracker_pt) apr_palloc(pool, sizeof(*tracker)); + service_tracker_pt tracker = (service_tracker_pt) malloc(sizeof(*tracker)); bundle_context_pt ctx = (bundle_context_pt) 0x10; tracker->context = ctx; std::string filter = "(objectClass=service)"; @@ -130,7 +126,7 @@ TEST(service_tracker, open) { .withParameter("context", ctx) .withParameter("serviceName", (char *) NULL) .withParameter("filter", "(objectClass=service)") - .andOutputParameter("service_references", refs) + .withOutputParameterReturning("service_references", &refs, sizeof(refs)) .andReturnValue(CELIX_SUCCESS); mock() .expectOneCall("bundleContext_addServiceListener") @@ -148,7 +144,7 @@ TEST(service_tracker, open) { TEST(service_tracker, open_withRefs) { // With one initial service // new tracker - service_tracker_pt tracker = (service_tracker_pt) apr_palloc(pool, sizeof(*tracker)); + service_tracker_pt tracker = (service_tracker_pt) malloc(sizeof(*tracker)); tracker->customizer = NULL; bundle_context_pt ctx = (bundle_context_pt) 0x10; tracker->context = ctx; @@ -172,7 +168,7 @@ TEST(service_tracker, open_withRefs) { array_list_pt refs = NULL; arrayList_create(&refs); - service_reference_pt ref = (service_reference_pt) apr_palloc(pool, sizeof(*ref)); + service_reference_pt ref = (service_reference_pt) malloc(sizeof(*ref)); arrayList_add(refs, ref); void *src = (void *) 0x345; @@ -182,7 +178,7 @@ TEST(service_tracker, open_withRefs) { .withParameter("context", ctx) .withParameter("serviceName", (char *) NULL) .withParameter("filter", "(objectClass=service)") - .andOutputParameter("service_references", refs) + .withOutputParameterReturning("service_references", &refs, sizeof(refs)) .andReturnValue(CELIX_SUCCESS); mock() .expectOneCall("bundleContext_addServiceListener") @@ -194,7 +190,7 @@ TEST(service_tracker, open_withRefs) { .expectOneCall("bundleContext_getService") .withParameter("context", ctx) .withParameter("reference", ref) - .andOutputParameter("service_instance", src) + .withOutputParameterReturning("service_instance", &src, sizeof(src)) .andReturnValue(CELIX_SUCCESS); serviceTracker_open(tracker); CHECK(tracker->listener != NULL); @@ -206,7 +202,7 @@ TEST(service_tracker, open_withRefs) { TEST(service_tracker, open_withRefsAndTracked) { // With one initial service // new tracker - service_tracker_pt tracker = (service_tracker_pt) apr_palloc(pool, sizeof(*tracker)); + service_tracker_pt tracker = (service_tracker_pt) malloc(sizeof(*tracker)); tracker->customizer = NULL; bundle_context_pt ctx = (bundle_context_pt) 0x10; tracker->context = ctx; @@ -234,7 +230,7 @@ TEST(service_tracker, open_withRefsAndTr .withParameter("context", ctx) .withParameter("serviceName", (char *) NULL) .withParameter("filter", "(objectClass=service)") - .andOutputParameter("service_references", refs) + .withOutputParameterReturning("service_references", &refs, sizeof(refs)) .andReturnValue(CELIX_SUCCESS); mock() .expectOneCall("bundleContext_addServiceListener") @@ -242,10 +238,11 @@ TEST(service_tracker, open_withRefsAndTr .withParameter("filter", "(objectClass=service)") .ignoreOtherParameters() .andReturnValue(CELIX_SUCCESS); + bool equal = true; mock() .expectOneCall("serviceReference_equals") .withParameter("reference", ref) - .andOutputParameter("equal", true) + .withOutputParameterReturning("equal", &equal, sizeof(equal)) .ignoreOtherParameters() .andReturnValue(CELIX_SUCCESS); serviceTracker_open(tracker); @@ -257,7 +254,7 @@ TEST(service_tracker, open_withRefsAndTr TEST(service_tracker, close) { // new tracker - service_tracker_pt tracker = (service_tracker_pt) apr_palloc(pool, sizeof(*tracker)); + service_tracker_pt tracker = (service_tracker_pt) malloc(sizeof(*tracker)); tracker->customizer = NULL; bundle_context_pt ctx = (bundle_context_pt) 0x345; tracker->context = ctx; @@ -280,17 +277,19 @@ TEST(service_tracker, close) { .withParameter("context", ctx) .withParameter("listener", listener) .andReturnValue(CELIX_SUCCESS); + bool equal = true; mock() .expectOneCall("serviceReference_equals") .withParameter("reference", ref) .withParameter("compareTo", ref) - .andOutputParameter("equal", true) + .withOutputParameterReturning("equal", &equal, sizeof(equal)) .andReturnValue(CELIX_SUCCESS); + bool result = true; mock() .expectOneCall("bundleContext_ungetService") .withParameter("context", ctx) .withParameter("reference", ref) - .andOutputParameter("result", true) + .withOutputParameterReturning("result", &result, sizeof(result)) .andReturnValue(CELIX_SUCCESS); serviceTracker_close(tracker); @@ -298,7 +297,7 @@ TEST(service_tracker, close) { TEST(service_tracker, getServiceReference) { // new tracker - service_tracker_pt tracker = (service_tracker_pt) apr_palloc(pool, sizeof(*tracker)); + service_tracker_pt tracker = (service_tracker_pt) malloc(sizeof(*tracker)); // new tracker->tracked array_list_pt tracked = NULL; arrayList_create(&tracked); @@ -321,7 +320,7 @@ TEST(service_tracker, getServiceReferenc TEST(service_tracker, getServiceReferenceNull) { // new tracker - service_tracker_pt tracker = (service_tracker_pt) apr_palloc(pool, sizeof(*tracker)); + service_tracker_pt tracker = (service_tracker_pt) malloc(sizeof(*tracker)); // new tracker->tracked array_list_pt tracked = NULL; arrayList_create(&tracked); @@ -333,7 +332,7 @@ TEST(service_tracker, getServiceReferenc TEST(service_tracker, getServiceReferences) { // new tracker - service_tracker_pt tracker = (service_tracker_pt) apr_palloc(pool, sizeof(*tracker)); + service_tracker_pt tracker = (service_tracker_pt) malloc(sizeof(*tracker)); // new tracker->tracked array_list_pt tracked = NULL; arrayList_create(&tracked); @@ -358,7 +357,7 @@ TEST(service_tracker, getServiceReferenc TEST(service_tracker, getService) { // new tracker - service_tracker_pt tracker = (service_tracker_pt) apr_palloc(pool, sizeof(*tracker)); + service_tracker_pt tracker = (service_tracker_pt) malloc(sizeof(*tracker)); // new tracker->tracked array_list_pt tracked = NULL; arrayList_create(&tracked); @@ -381,7 +380,7 @@ TEST(service_tracker, getService) { TEST(service_tracker, getServiceNull) { // new tracker - service_tracker_pt tracker = (service_tracker_pt) apr_palloc(pool, sizeof(*tracker)); + service_tracker_pt tracker = (service_tracker_pt) malloc(sizeof(*tracker)); // new tracker->tracked array_list_pt tracked = NULL; arrayList_create(&tracked); @@ -393,7 +392,7 @@ TEST(service_tracker, getServiceNull) { TEST(service_tracker, getServices) { // new tracker - service_tracker_pt tracker = (service_tracker_pt) apr_palloc(pool, sizeof(*tracker)); + service_tracker_pt tracker = (service_tracker_pt) malloc(sizeof(*tracker)); // new tracker->tracked array_list_pt tracked = NULL; arrayList_create(&tracked); @@ -418,7 +417,7 @@ TEST(service_tracker, getServices) { TEST(service_tracker, getServiceByReference) { // new tracker - service_tracker_pt tracker = (service_tracker_pt) apr_palloc(pool, sizeof(*tracker)); + service_tracker_pt tracker = (service_tracker_pt) malloc(sizeof(*tracker)); // new tracker->tracked array_list_pt tracked = NULL; arrayList_create(&tracked); @@ -430,10 +429,11 @@ TEST(service_tracker, getServiceByRefere entry->reference = ref; arrayList_add(tracked, entry); + bool equal = true; mock() .expectOneCall("serviceReference_equals") .withParameter("reference", ref) - .andOutputParameter("equal", true) + .withOutputParameterReturning("equal", &equal, sizeof(equal)) .ignoreOtherParameters() .andReturnValue(4) .withCallOrder(1); @@ -443,7 +443,7 @@ TEST(service_tracker, getServiceByRefere TEST(service_tracker, getServiceByReferenceNull) { // new tracker - service_tracker_pt tracker = (service_tracker_pt) apr_palloc(pool, sizeof(*tracker)); + service_tracker_pt tracker = (service_tracker_pt) malloc(sizeof(*tracker)); // new tracker->tracked array_list_pt tracked = NULL; arrayList_create(&tracked); @@ -455,10 +455,11 @@ TEST(service_tracker, getServiceByRefere entry->reference = ref; arrayList_add(tracked, entry); + bool equal = false; mock() .expectOneCall("serviceReference_equals") .withParameter("reference", ref) - .andOutputParameter("equal", false) + .withOutputParameterReturning("equal", &equal, sizeof(equal)) .ignoreOtherParameters() .andReturnValue(CELIX_SUCCESS) .withCallOrder(1); @@ -469,11 +470,11 @@ TEST(service_tracker, getServiceByRefere TEST(service_tracker, serviceChangedRegistered) { // With one initial service // new tracker - service_tracker_pt tracker = (service_tracker_pt) apr_palloc(pool, sizeof(*tracker)); + service_tracker_pt tracker = (service_tracker_pt) malloc(sizeof(*tracker)); tracker->customizer = NULL; bundle_context_pt ctx = (bundle_context_pt) 0x10; tracker->context = ctx; - service_listener_pt listener = (service_listener_pt) apr_palloc(pool, sizeof(*listener)); + service_listener_pt listener = (service_listener_pt) malloc(sizeof(*listener)); tracker->listener = listener; listener->handle = tracker; array_list_pt tracked = NULL; @@ -481,17 +482,17 @@ TEST(service_tracker, serviceChangedRegi tracker->tracked = tracked; service_reference_pt ref = (service_reference_pt) 0x51; - void *src = (void *) 0x345; - service_event_pt event = (service_event_pt) apr_palloc(pool, sizeof(*event)); + service_event_pt event = (service_event_pt) malloc(sizeof(*event)); event->type = OSGI_FRAMEWORK_SERVICE_EVENT_REGISTERED; event->reference = ref; + void *src = (void *) 0x345; mock() .expectOneCall("bundleContext_getService") .withParameter("context", ctx) .withParameter("reference", ref) - .andOutputParameter("service_instance", src) + .withOutputParameterReturning("service_instance", &src, sizeof(src)) .andReturnValue(CELIX_SUCCESS); serviceTracker_serviceChanged(listener, event); } @@ -499,11 +500,11 @@ TEST(service_tracker, serviceChangedRegi TEST(service_tracker, serviceChangedModified) { // With one initial service // new tracker - service_tracker_pt tracker = (service_tracker_pt) apr_palloc(pool, sizeof(*tracker)); + service_tracker_pt tracker = (service_tracker_pt) malloc(sizeof(*tracker)); tracker->customizer = NULL; bundle_context_pt ctx = (bundle_context_pt) 0x10; tracker->context = ctx; - service_listener_pt listener = (service_listener_pt) apr_palloc(pool, sizeof(*listener)); + service_listener_pt listener = (service_listener_pt) malloc(sizeof(*listener)); tracker->listener = listener; listener->handle = tracker; @@ -518,14 +519,15 @@ TEST(service_tracker, serviceChangedModi entry->reference = ref; arrayList_add(tracked, entry); - service_event_pt event = (service_event_pt) apr_palloc(pool, sizeof(*event)); + service_event_pt event = (service_event_pt) malloc(sizeof(*event)); event->type = OSGI_FRAMEWORK_SERVICE_EVENT_MODIFIED; event->reference = ref; + bool equal = true; mock() .expectOneCall("serviceReference_equals") .withParameter("reference", ref) - .andOutputParameter("equal", true) + .withOutputParameterReturning("equal", &equal, sizeof(equal)) .ignoreOtherParameters() .andReturnValue(CELIX_SUCCESS); serviceTracker_serviceChanged(listener, event); @@ -534,11 +536,11 @@ TEST(service_tracker, serviceChangedModi TEST(service_tracker, serviceChangedUnregistering) { // With one initial service // new tracker - service_tracker_pt tracker = (service_tracker_pt) apr_palloc(pool, sizeof(*tracker)); + service_tracker_pt tracker = (service_tracker_pt) malloc(sizeof(*tracker)); tracker->customizer = NULL; bundle_context_pt ctx = (bundle_context_pt) 0x10; tracker->context = ctx; - service_listener_pt listener = (service_listener_pt) apr_palloc(pool, sizeof(*listener)); + service_listener_pt listener = (service_listener_pt) malloc(sizeof(*listener)); tracker->listener = listener; listener->handle = tracker; @@ -553,21 +555,23 @@ TEST(service_tracker, serviceChangedUnre entry->reference = ref; arrayList_add(tracked, entry); - service_event_pt event = (service_event_pt) apr_palloc(pool, sizeof(*event)); + service_event_pt event = (service_event_pt) malloc(sizeof(*event)); event->type = OSGI_FRAMEWORK_SERVICE_EVENT_UNREGISTERING; event->reference = ref; + bool equal = true; mock() .expectOneCall("serviceReference_equals") .withParameter("reference", ref) .withParameter("compareTo", ref) - .andOutputParameter("equal", true) + .withOutputParameterReturning("equal", &equal, sizeof(equal)) .andReturnValue(CELIX_SUCCESS); + bool result = true; mock() .expectOneCall("bundleContext_ungetService") .withParameter("context", ctx) .withParameter("reference", ref) - .andOutputParameter("result", true) + .withOutputParameterReturning("result", &result, sizeof(result)) .andReturnValue(CELIX_SUCCESS); serviceTracker_serviceChanged(listener, event); } @@ -575,10 +579,10 @@ TEST(service_tracker, serviceChangedUnre TEST(service_tracker, serviceChangedModifiedEndmatch) { // With one initial service // new tracker - service_tracker_pt tracker = (service_tracker_pt) apr_palloc(pool, sizeof(*tracker)); + service_tracker_pt tracker = (service_tracker_pt) malloc(sizeof(*tracker)); bundle_context_pt ctx = (bundle_context_pt) 0x10; tracker->context = ctx; - service_listener_pt listener = (service_listener_pt) apr_palloc(pool, sizeof(*listener)); + service_listener_pt listener = (service_listener_pt) malloc(sizeof(*listener)); tracker->listener = listener; listener->handle = tracker; @@ -593,7 +597,7 @@ TEST(service_tracker, serviceChangedModi entry->reference = ref; arrayList_add(tracked, entry); - service_event_pt event = (service_event_pt) apr_palloc(pool, sizeof(*event)); + service_event_pt event = (service_event_pt) malloc(sizeof(*event)); event->type = OSGI_FRAMEWORK_SERVICE_EVENT_MODIFIED_ENDMATCH; event->reference = ref; @@ -614,10 +618,10 @@ extern "C" { TEST(service_tracker, serviceChangedRegisteredCustomizer) { // With one initial service // new tracker - service_tracker_pt tracker = (service_tracker_pt) apr_palloc(pool, sizeof(*tracker)); + service_tracker_pt tracker = (service_tracker_pt) malloc(sizeof(*tracker)); bundle_context_pt ctx = (bundle_context_pt) 0x10; tracker->context = ctx; - service_listener_pt listener = (service_listener_pt) apr_palloc(pool, sizeof(*listener)); + service_listener_pt listener = (service_listener_pt) malloc(sizeof(*listener)); tracker->listener = listener; listener->handle = tracker; array_list_pt tracked = NULL; @@ -629,31 +633,32 @@ TEST(service_tracker, serviceChangedRegi service_reference_pt ref = (service_reference_pt) 0x51; void *src = (void *) 0x345; - void * handle = (void*) 0x60; - - service_event_pt event = (service_event_pt) apr_palloc(pool, sizeof(*event)); + service_event_pt event = (service_event_pt) malloc(sizeof(*event)); event->type = OSGI_FRAMEWORK_SERVICE_EVENT_REGISTERED; event->reference = ref; + void * handle = (void*) 0x60; mock() .expectOneCall("serviceTrackerCustomizer_getHandle") .withParameter("customizer", customizer) - .andOutputParameter("handle", handle) + .withOutputParameterReturning("handle", &handle, sizeof(handle)) .andReturnValue(CELIX_SUCCESS); + void *function = (void *) serviceDependency_addingService; mock() .expectOneCall("serviceTrackerCustomizer_getAddingFunction") .withParameter("customizer", customizer) - .andOutputParameter("function", (void *) serviceDependency_addingService) + .withOutputParameterReturning("function", &function, sizeof(function)) .andReturnValue(CELIX_SUCCESS); mock() .expectOneCall("serviceTrackerCustomizer_getHandle") .withParameter("customizer", customizer) - .andOutputParameter("handle", handle) + .withOutputParameterReturning("handle", &handle, sizeof(handle)) .andReturnValue(CELIX_SUCCESS); + void *function2 = (void *) serviceDependency_addedService; mock() .expectOneCall("serviceTrackerCustomizer_getAddedFunction") .withParameter("customizer", customizer) - .andOutputParameter("function", (void *) serviceDependency_addedService) + .withOutputParameterReturning("function", &function2, sizeof(function)) .andReturnValue(CELIX_SUCCESS); serviceTracker_serviceChanged(listener, event); } @@ -668,10 +673,10 @@ extern "C" { TEST(service_tracker, serviceChangedModifiedCustomizer) { // With one initial service // new tracker - service_tracker_pt tracker = (service_tracker_pt) apr_palloc(pool, sizeof(*tracker)); + service_tracker_pt tracker = (service_tracker_pt) malloc(sizeof(*tracker)); bundle_context_pt ctx = (bundle_context_pt) 0x10; tracker->context = ctx; - service_listener_pt listener = (service_listener_pt) apr_palloc(pool, sizeof(*listener)); + service_listener_pt listener = (service_listener_pt) malloc(sizeof(*listener)); tracker->listener = listener; listener->handle = tracker; service_tracker_customizer_pt customizer = (service_tracker_customizer_pt) 0x20; @@ -688,27 +693,28 @@ TEST(service_tracker, serviceChangedModi entry->reference = ref; arrayList_add(tracked, entry); - service_event_pt event = (service_event_pt) apr_palloc(pool, sizeof(*event)); + service_event_pt event = (service_event_pt) malloc(sizeof(*event)); event->type = OSGI_FRAMEWORK_SERVICE_EVENT_MODIFIED; event->reference = ref; - void * handle = (void*) 0x60; - + bool equal = true; mock() .expectOneCall("serviceReference_equals") .withParameter("reference", ref) - .andOutputParameter("equal", true) + .withOutputParameterReturning("equal", &equal, sizeof(equal)) .ignoreOtherParameters() .andReturnValue(CELIX_SUCCESS); + void * handle = (void*) 0x60; mock() .expectOneCall("serviceTrackerCustomizer_getHandle") .withParameter("customizer", customizer) - .andOutputParameter("handle", handle) + .withOutputParameterReturning("handle", &handle, sizeof(handle)) .andReturnValue(CELIX_SUCCESS); + void *function = (void *) serviceDependency_modifiedService; mock() .expectOneCall("serviceTrackerCustomizer_getModifiedFunction") .withParameter("customizer", customizer) - .andOutputParameter("function", (void *) serviceDependency_modifiedService) + .withOutputParameterReturning("function", &function, sizeof(function)) .andReturnValue(CELIX_SUCCESS); serviceTracker_serviceChanged(listener, event); } @@ -722,10 +728,10 @@ extern "C" { TEST(service_tracker, serviceChangedUnregisteringCustomizer) { // With one initial service // new tracker - service_tracker_pt tracker = (service_tracker_pt) apr_palloc(pool, sizeof(*tracker)); + service_tracker_pt tracker = (service_tracker_pt) malloc(sizeof(*tracker)); bundle_context_pt ctx = (bundle_context_pt) 0x10; tracker->context = ctx; - service_listener_pt listener = (service_listener_pt) apr_palloc(pool, sizeof(*listener)); + service_listener_pt listener = (service_listener_pt) malloc(sizeof(*listener)); tracker->listener = listener; listener->handle = tracker; service_tracker_customizer_pt customizer = (service_tracker_customizer_pt) 0x20; @@ -742,27 +748,28 @@ TEST(service_tracker, serviceChangedUnre entry->reference = ref; arrayList_add(tracked, entry); - service_event_pt event = (service_event_pt) apr_palloc(pool, sizeof(*event)); + service_event_pt event = (service_event_pt) malloc(sizeof(*event)); event->type = OSGI_FRAMEWORK_SERVICE_EVENT_UNREGISTERING; event->reference = ref; - void * handle = (void*) 0x60; - + bool equal = true; mock() .expectOneCall("serviceReference_equals") .withParameter("reference", ref) .withParameter("compareTo", ref) - .andOutputParameter("equal", true) + .withOutputParameterReturning("equal", &equal, sizeof(equal)) .andReturnValue(CELIX_SUCCESS); + void * handle = (void*) 0x60; mock() .expectOneCall("serviceTrackerCustomizer_getHandle") .withParameter("customizer", customizer) - .andOutputParameter("handle", handle) + .withOutputParameterReturning("handle", &handle, sizeof(handle)) .andReturnValue(CELIX_SUCCESS); + void *function = (void*) serviceDependency_removedService; mock() .expectOneCall("serviceTrackerCustomizer_getRemovedFunction") .withParameter("customizer", customizer) - .andOutputParameter("function", (void *) serviceDependency_removedService) + .withOutputParameterReturning("function", &function , sizeof(function)) .andReturnValue(CELIX_SUCCESS); serviceTracker_serviceChanged(listener, event); } @@ -770,10 +777,10 @@ TEST(service_tracker, serviceChangedUnre TEST(service_tracker, serviceChangedUnregisteringCustomizerNoFunc) { // With one initial service // new tracker - service_tracker_pt tracker = (service_tracker_pt) apr_palloc(pool, sizeof(*tracker)); + service_tracker_pt tracker = (service_tracker_pt) malloc(sizeof(*tracker)); bundle_context_pt ctx = (bundle_context_pt) 0x10; tracker->context = ctx; - service_listener_pt listener = (service_listener_pt) apr_palloc(pool, sizeof(*listener)); + service_listener_pt listener = (service_listener_pt) malloc(sizeof(*listener)); tracker->listener = listener; listener->handle = tracker; service_tracker_customizer_pt customizer = (service_tracker_customizer_pt) 0x20; @@ -790,33 +797,35 @@ TEST(service_tracker, serviceChangedUnre entry->reference = ref; arrayList_add(tracked, entry); - service_event_pt event = (service_event_pt) apr_palloc(pool, sizeof(*event)); + service_event_pt event = (service_event_pt) malloc(sizeof(*event)); event->type = OSGI_FRAMEWORK_SERVICE_EVENT_UNREGISTERING; event->reference = ref; - void * handle = (void*) 0x60; - + bool equals = true; mock() .expectOneCall("serviceReference_equals") .withParameter("reference", ref) .withParameter("compareTo", ref) - .andOutputParameter("equal", true) + .withOutputParameterReturning("equal", &equals, sizeof(equals)) .andReturnValue(CELIX_SUCCESS); + void * handle = (void*) 0x60; mock() .expectOneCall("serviceTrackerCustomizer_getHandle") .withParameter("customizer", customizer) - .andOutputParameter("handle", handle) + .withOutputParameterReturning("handle", &handle, sizeof(handle)) .andReturnValue(CELIX_SUCCESS); + void *function = NULL; mock() .expectOneCall("serviceTrackerCustomizer_getRemovedFunction") .withParameter("customizer", customizer) - .andOutputParameter("function", (void *) NULL) + .withOutputParameterReturning("function", &function, sizeof(function)) .andReturnValue(CELIX_SUCCESS); + bool result = true; mock() .expectOneCall("bundleContext_ungetService") .withParameter("context", ctx) .withParameter("reference", ref) - .andOutputParameter("result", true) + .withOutputParameterReturning("result", &result, sizeof(result)) .andReturnValue(CELIX_SUCCESS); serviceTracker_serviceChanged(listener, event); }
