Skip to content

Commit

Permalink
Merge branch 'master' into feature/devcontainer
Browse files Browse the repository at this point in the history
# Conflicts:
#	libs/framework/gtest/src/CelixLauncherTestSuite.cc
#	libs/framework/src/celix_launcher.c
  • Loading branch information
PengZheng committed Jun 24, 2024
2 parents 00dc17a + 758aa79 commit 2206733
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 3 deletions.
6 changes: 5 additions & 1 deletion libs/framework/gtest/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ add_celix_bundle(cmp_test_bundle SOURCES src/CmpTestBundleActivator.cc VERSION 1
add_celix_bundle(cond_test_bundle SOURCES src/CondTestBundleActivator.cc VERSION 1.0.0)
add_subdirectory(subdir) #simple_test_bundle4, simple_test_bundle5 and sublib
add_celix_bundle(celix_err_test_bundle SOURCES src/activator_with_celix_err.c VERSION 1.0.0)
add_celix_bundle(immediate_stop_bundle SOURCES src/activator_stop.c VERSION 1.0.0)

add_celix_bundle(unresolvable_bundle SOURCES src/nop_activator.c VERSION 1.0.0)
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
Expand Down Expand Up @@ -82,7 +83,7 @@ add_celix_bundle_dependencies(test_framework
simple_test_bundle2 simple_test_bundle3 simple_test_bundle4
simple_test_bundle5 bundle_with_exception bundle_with_bad_export
unresolvable_bundle simple_cxx_bundle simple_cxx_dep_man_bundle cmp_test_bundle
celix_err_test_bundle dup_symbolic_name_bundle)
celix_err_test_bundle dup_symbolic_name_bundle immediate_stop_bundle)
target_include_directories(test_framework PRIVATE ../src)
celix_deprecated_utils_headers(test_framework)

Expand All @@ -94,6 +95,7 @@ celix_get_bundle_file(simple_test_bundle4 SIMPLE_TEST_BUNDLE4)
celix_get_bundle_file(simple_test_bundle5 SIMPLE_TEST_BUNDLE5)
celix_get_bundle_filename(simple_test_bundle4 SIMPLE_TEST_BUNDLE4_FILENAME)
celix_get_bundle_filename(simple_test_bundle5 SIMPLE_TEST_BUNDLE5_FILENAME)
celix_get_bundle_file(immediate_stop_bundle IMMEDIATE_STOP_BUNDLE)

celix_get_bundle_filename(bundle_with_exception BUNDLE_WITH_EXCEPTION)
celix_get_bundle_file(bundle_with_bad_export BUNDLE_WITH_BAD_EXPORT)
Expand Down Expand Up @@ -128,7 +130,9 @@ target_compile_definitions(test_framework PRIVATE
CMP_TEST_BUNDLE_LOC="${CMP_TEST_BUNDLE_LOC}"
COND_TEST_BUNDLE_LOC="${COND_TEST_BUNDLE_LOC}"
INSTALL_AND_START_BUNDLES_CONFIG_PROPERTIES_FILE="${CMAKE_CURRENT_BINARY_DIR}/install_and_start_bundles.properties"
IMMEDIATE_STOP_BUNDLE_LOCATION="${IMMEDIATE_STOP_BUNDLE}"
)

if (ENABLE_TESTING_ON_CI)
target_compile_definitions(test_framework PRIVATE TESTING_ON_CI=1)
endif ()
Expand Down
13 changes: 13 additions & 0 deletions libs/framework/gtest/src/CelixLauncherTestSuite.cc
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,19 @@ TEST_F(CelixLauncherTestSuite, LaunchWithInvalidConfigPropertiesTest) {
EXPECT_EQ(status, std::future_status::ready);
}

TEST_F(CelixLauncherTestSuite, LaunchWithInvalidConfigProperties2Test) {

//When launching the framework with a properties set with a negative shutdown period
auto* props = celix_properties_create();
ASSERT_TRUE(props != nullptr);
celix_properties_set(props, CELIX_AUTO_START_0, IMMEDIATE_STOP_BUNDLE_LOCATION);
celix_properties_setDouble(props, CELIX_LAUNCHER_SHUTDOWN_PERIOD_IN_SECONDS, -1.0);
auto future = launchInThread({"programName"}, props, 0);
//Then launch will exit
auto status = future.wait_for(std::chrono::milliseconds{LAUNCH_WAIT_TIMEOUT});
EXPECT_EQ(status, std::future_status::ready);
}


TEST_F(CelixLauncherTestSuite, StopLauncherWithSignalTest) {
auto* props = celix_properties_create();
Expand Down
36 changes: 36 additions & 0 deletions libs/framework/gtest/src/activator_stop.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

#include "celix_bundle_activator.h"
#include "celix_framework.h"

typedef struct bundle_activator {
//empty
} bundle_activator_t;

static celix_status_t act_start(bundle_activator_t *act CELIX_UNUSED, celix_bundle_context_t *ctx CELIX_UNUSED) {
celix_framework_stopBundleAsync(celix_bundleContext_getFramework(ctx), CELIX_FRAMEWORK_BUNDLE_ID); // to make container quit immediately
return CELIX_SUCCESS;
}

static celix_status_t act_stop(bundle_activator_t *act CELIX_UNUSED, celix_bundle_context_t *ctx CELIX_UNUSED) {
return CELIX_SUCCESS;
}

CELIX_GEN_BUNDLE_ACTIVATOR(bundle_activator_t, act_start, act_stop);
3 changes: 1 addition & 2 deletions libs/framework/src/celix_launcher.c
Original file line number Diff line number Diff line change
Expand Up @@ -185,15 +185,14 @@ int celix_launcher_launchAndWait(int argc, char* argv[], const char* embeddedCon
if (status != CELIX_SUCCESS) {
celix_bundleContext_log(celix_framework_getFrameworkContext(framework), CELIX_LOG_LEVEL_WARNING,
"Failed to schedule celix_shutdown_check");
status = CELIX_SUCCESS;
}
celix_framework_waitForStop(framework);
celix_launcher_resetLauncher();
#ifndef CELIX_NO_CURLINIT
// Cleanup Curl
curl_global_cleanup();
#endif
return status == CELIX_SUCCESS ? CELIX_LAUNCHER_OK_EXIT_CODE : CELIX_LAUNCHER_ERROR_EXIT_CODE;
return CELIX_LAUNCHER_OK_EXIT_CODE;
}

static celix_status_t celix_launcher_parseOptions(int argc, char* argv[], celix_launcher_options_t* opts) {
Expand Down

0 comments on commit 2206733

Please sign in to comment.