Return-Path: X-Original-To: apmail-celix-commits-archive@www.apache.org Delivered-To: apmail-celix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6127B18A81 for ; Mon, 14 Dec 2015 17:36:03 +0000 (UTC) Received: (qmail 93245 invoked by uid 500); 14 Dec 2015 17:36:03 -0000 Delivered-To: apmail-celix-commits-archive@celix.apache.org Received: (qmail 93218 invoked by uid 500); 14 Dec 2015 17:36:03 -0000 Mailing-List: contact commits-help@celix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@celix.apache.org Delivered-To: mailing list commits@celix.apache.org Received: (qmail 93209 invoked by uid 99); 14 Dec 2015 17:36:03 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Dec 2015 17:36:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 102B6E04BE; Mon, 14 Dec 2015 17:36:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bpetri@apache.org To: commits@celix.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: celix git commit: CELIX-325: add explicit NULL return and re-enable bundle_test Date: Mon, 14 Dec 2015 17:36:03 +0000 (UTC) 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 Authored: Mon Dec 14 18:34:21 2015 +0100 Committer: Bjoern Petri 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")