celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bpe...@apache.org
Subject celix git commit: CELIX-325: add explicit NULL return and re-enable bundle_test
Date Mon, 14 Dec 2015 17:36:03 GMT
Repository: celix
Updated Branches:
  refs/heads/develop 20b89946d -> 8f5867851


CELIX-325: add explicit NULL return and re-enable bundle_test


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

Branch: refs/heads/develop
Commit: 8f58678510d528cd74c4e500a3b376c3df430470
Parents: 20b8994
Author: Bjoern Petri <bpetri@apache.org>
Authored: Mon Dec 14 18:34:21 2015 +0100
Committer: Bjoern Petri <bpetri@apache.org>
Committed: Mon Dec 14 18:34:21 2015 +0100

----------------------------------------------------------------------
 framework/CMakeLists.txt               | 4 ++--
 framework/private/test/bundle_test.cpp | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/8f586785/framework/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt
index b0e0d26..8d71524 100644
--- a/framework/CMakeLists.txt
+++ b/framework/CMakeLists.txt
@@ -347,7 +347,7 @@ if (FRAMEWORK)
         add_test(NAME bundle_cache_test COMMAND bundle_cache_test)
         add_test(NAME bundle_context_test COMMAND bundle_context_test)
         add_test(NAME bundle_revision_test  COMMAND bundle_revision_test)
-#        add_test(NAME bundle_test COMMAND bundle_test)
+        add_test(NAME bundle_test COMMAND bundle_test)
         add_test(NAME capability_test COMMAND capability_test)
         add_test(NAME celix_errorcodes_test COMMAND celix_errorcodes_test)
         add_test(NAME filter_test COMMAND filter_test)
@@ -371,7 +371,7 @@ if (FRAMEWORK)
         SETUP_TARGET_FOR_COVERAGE(bundle_cache_test bundle_cache_test ${CMAKE_BINARY_DIR}/coverage/bundle_cache_test/bundle_cache_test)
         SETUP_TARGET_FOR_COVERAGE(bundle_context_test bundle_context_test ${CMAKE_BINARY_DIR}/coverage/bundle_context_test/bundle_context_test)
         SETUP_TARGET_FOR_COVERAGE(bundle_revision_test bundle_revision_test ${CMAKE_BINARY_DIR}/coverage/bundle_revision_test/bundle_revision_test)
-#        SETUP_TARGET_FOR_COVERAGE(bundle_test bundle_test ${CMAKE_BINARY_DIR}/coverage/bundle_test/bundle_test)
+        SETUP_TARGET_FOR_COVERAGE(bundle_test bundle_test ${CMAKE_BINARY_DIR}/coverage/bundle_test/bundle_test)
         SETUP_TARGET_FOR_COVERAGE(capability_test capability_test ${CMAKE_BINARY_DIR}/coverage/capability_test/capability_test)
         SETUP_TARGET_FOR_COVERAGE(celix_errorcodes_test celix_errorcodes_test ${CMAKE_BINARY_DIR}/coverage/celix_errorcodes_test/celix_errorcodes_test)
         SETUP_TARGET_FOR_COVERAGE(filter_test filter_test ${CMAKE_BINARY_DIR}/coverage/filter_test/filter_test)

http://git-wip-us.apache.org/repos/asf/celix/blob/8f586785/framework/private/test/bundle_test.cpp
----------------------------------------------------------------------
diff --git a/framework/private/test/bundle_test.cpp b/framework/private/test/bundle_test.cpp
index 17b719e..af23dbc 100644
--- a/framework/private/test/bundle_test.cpp
+++ b/framework/private/test/bundle_test.cpp
@@ -663,7 +663,8 @@ TEST(bundle, revise) {
 	mock().expectOneCall("module_create")
 			.withParameter("headerMap", actual_manifest)
 			.withParameter("moduleId", actual_module_id)
-			.withParameter("bundle", bundle);
+			.withParameter("bundle", bundle)
+			.andReturnValue((void*)NULL);
 
 	//module create returns NULL during test
 	mock().expectOneCall("resolver_addModule")


Mime
View raw message