celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject celix git commit: CELIX-77: Fix test for change in service_factory
Date Tue, 12 Jan 2016 19:28:08 GMT
Repository: celix
Updated Branches:
  refs/heads/develop 49ddf5743 -> 1131b821d


CELIX-77: Fix test for change in service_factory


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/1131b821
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/1131b821
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/1131b821

Branch: refs/heads/develop
Commit: 1131b821dbc4239f3b2f9352ed1e77f290b894b2
Parents: 49ddf57
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Tue Jan 12 20:28:40 2016 +0100
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Tue Jan 12 20:28:40 2016 +0100

----------------------------------------------------------------------
 framework/private/test/service_registration_test.cpp | 8 ++++----
 framework/private/test/service_registry_test.cpp     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/1131b821/framework/private/test/service_registration_test.cpp
----------------------------------------------------------------------
diff --git a/framework/private/test/service_registration_test.cpp b/framework/private/test/service_registration_test.cpp
index 57aedf1..b388de3 100644
--- a/framework/private/test/service_registration_test.cpp
+++ b/framework/private/test/service_registration_test.cpp
@@ -280,11 +280,11 @@ TEST(service_registration, getServiceFromFactory) {
 	void *service = (void *) 0x30;
 	service_factory_pt factory = (service_factory_pt) malloc(sizeof(*factory));
 	factory->getService = serviceRegistrationTest_getService;
-	factory->factory = (void*) 0x40;
+	factory->handle = (void*) 0x40;
 	service_registration_pt registration = serviceRegistration_createServiceFactory(callback,
bundle, name, 0, factory, NULL);
 
 	mock().expectOneCall("serviceRegistrationTest_getService")
-			.withParameter("factory", factory->factory)
+			.withParameter("factory", factory->handle)
 			.withParameter("bundle", bundle)
 			.withParameter("registration", registration)
 			.withOutputParameterReturning("service", &service, sizeof(service));
@@ -306,12 +306,12 @@ TEST(service_registration, ungetServiceFromFactory) {
 	void *service = (void *) 0x30;
 	service_factory_pt factory = (service_factory_pt) malloc(sizeof(*factory));
 	factory->ungetService = serviceRegistrationTest_ungetService;
-	factory->factory = (void*) 0x40;
+	factory->handle = (void*) 0x40;
 	service_registration_pt registration = serviceRegistration_createServiceFactory(callback,
bundle, name, 0, factory, NULL);
 
 
 	mock().expectOneCall("serviceRegistrationTest_ungetService")
-			.withParameter("factory", factory->factory)
+			.withParameter("factory", factory->handle)
 			.withParameter("bundle", bundle)
 			.withParameter("registration", registration)
 			.withOutputParameterReturning("service", &service, sizeof(service));

http://git-wip-us.apache.org/repos/asf/celix/blob/1131b821/framework/private/test/service_registry_test.cpp
----------------------------------------------------------------------
diff --git a/framework/private/test/service_registry_test.cpp b/framework/private/test/service_registry_test.cpp
index 8a81bbe..7db6476 100644
--- a/framework/private/test/service_registry_test.cpp
+++ b/framework/private/test/service_registry_test.cpp
@@ -222,7 +222,7 @@ TEST(service_registry, registerServiceFactoryNoProps) {
 	bundle_pt bundle = (bundle_pt) 0x10;
 	char * serviceName = my_strdup("service");
 	service_factory_pt factory = (service_factory_pt) malloc(sizeof(*factory));
-	factory->factory = (void*) 0x20;
+	factory->handle = (void*) 0x20;
 	service_registration_pt reg = (service_registration_pt) 0x40;
 
 	mock()


Mime
View raw message