Merge pull request #779 from apache/feature/685-remove-bundle-revision

Feature/685 remove bundle revision

Author: PengZheng

libs/error_injector/CMakeLists.txt

@@ -37,6 +37,7 @@ add_subdirectory(sys_shm)
 add_subdirectory(socket)
 add_subdirectory(pthread)
 add_subdirectory(unistd)
+add_subdirectory(dirent)
 
 celix_subproject(ERROR_INJECTOR_MDNSRESPONDER "Option to enable building the mdnsresponder error injector" OFF)
 if (ERROR_INJECTOR_MDNSRESPONDER)

libs/error_injector/dirent/CMakeLists.txt

@@ -0,0 +1,25 @@
+# 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.
+
+add_library(dirent_ei STATIC src/dirent_ei.cc)
+
+target_include_directories(dirent_ei PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include)
+target_link_libraries(dirent_ei PUBLIC Celix::error_injector)
+target_link_options(dirent_ei INTERFACE
+        LINKER:--wrap,opendir
+        )
+add_library(Celix::dirent_ei ALIAS dirent_ei)

libs/error_injector/dirent/include/dirent_ei.h

@@ -0,0 +1,34 @@
+/*
+ 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.
+ */
+
+#ifndef CELIX_DIRENT_EI_H
+#define CELIX_DIRENT_EI_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "celix_error_injector.h"
+#include <dirent.h>
+
+CELIX_EI_DECLARE(opendir, DIR*);
+
+#ifdef __cplusplus
+}
+#endif
+#endif //CELIX_DIRENT_EI_H

libs/error_injector/dirent/src/dirent_ei.cc

@@ -0,0 +1,34 @@
+/*
+ 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 <errno.h>
+#include "dirent_ei.h"
+
+extern "C" {
+
+DIR* __real_opendir(const char* __name);
+CELIX_EI_DEFINE(opendir, DIR*)
+DIR* __wrap_opendir(const char* __name) {
+    errno = EMFILE;
+    CELIX_EI_IMPL(opendir);
+    errno = 0;
+    return __real_opendir(__name);
+}
+
+}

libs/framework/CMakeLists.txt

@@ -23,8 +23,8 @@ if (FRAMEWORK)
         find_package(CURL REQUIRED)
     endif ()
     set(FRAMEWORK_SRC
-            src/bundle.c src/bundle_archive.c src/celix_bundle_cache.c
-            src/bundle_context.c src/bundle_revision.c
+            src/bundle.c src/celix_bundle_archive.c src/celix_bundle_cache.c
+            src/bundle_context.c
             src/framework.c
             src/module.c
             src/service_reference.c src/service_registration.c

libs/framework/gtest/CMakeLists.txt

@@ -173,6 +173,7 @@ if (EI_TESTS)
             Celix::hmap_ei
             Celix::stdio_ei
             Celix::string_ei
+            Celix::dirent_ei
             GTest::gtest GTest::gtest_main
     )
 

libs/framework/gtest/src/BundleArchiveTestSuite.cc

@@ -24,10 +24,9 @@
 #include "celix_file_utils.h"
 #include "celix_framework_utils.h"
 #include "framework.h"
-#include "bundle_archive.h"
 
 //including private headers, which should only be used for testing
-#include "bundle_archive_private.h"
+#include "celix_bundle_archive.h"
 #include "celix_bundle_private.h"
 
 class CxxBundleArchiveTestSuite : public ::testing::Test {

libs/framework/gtest/src/BundleArchiveWithErrorInjectionTestSuite.cc

@@ -32,8 +32,7 @@
 #include "celix/FrameworkFactory.h"
 
 #include "asprintf_ei.h"
-#include "bundle_archive_private.h"
-#include "bundle_revision_private.h"
+#include "celix_bundle_archive.h"
 #include "framework_private.h"
 #include "malloc_ei.h"
 #include "celix_bundle_manifest.h"
@@ -113,19 +112,6 @@ TEST_F(BundleArchiveWithErrorInjectionTestSuite, BundleArchiveCreatedFailedTest)
     // Given a mocked malloc which returns NULL from a call from manifest_create
     celix_ei_expect_calloc((void*)celix_bundleManifest_create, 0, nullptr);
     installBundleAndExpectFailure();
-
-    teardownErrorInjectors();
-    // Given a mocked calloc which returns NULL from a call from bundleRevision_create
-    celix_ei_expect_calloc((void*)celix_bundleRevision_create, 0, nullptr);
-    installBundleAndExpectFailure();
-
-    teardownErrorInjectors();
-    // Given a mocked celix_utils_strdup which returns NULL from a call from bundleRevision_create
-    celix_ei_expect_celix_utils_strdup((void*)celix_bundleRevision_create, 0, nullptr);
-    installBundleAndExpectFailure();
-
-    celix_ei_expect_celix_utils_strdup((void*)celix_bundleRevision_create, 0, nullptr, 2);
-    installBundleAndExpectFailure();
 }
 
 TEST_F(BundleArchiveWithErrorInjectionTestSuite, BundleArchiveCreateCacheDirectoryFailedTest) {
@@ -142,13 +128,13 @@ TEST_F(BundleArchiveWithErrorInjectionTestSuite, BundleArchiveCreateCacheDirecto
     installBundleAndExpectFailure();
 
     teardownErrorInjectors();
-    // Given a mocked celix_utils_strdup which returns NULL from a (indirect) call from bundleArchive_create
-    celix_ei_expect_celix_utils_strdup((void*)celix_bundleArchive_create, 1, nullptr);
+    // Given a mocked celix_utils_strdup which returns NULL from a call from bundleArchive_create
+    celix_ei_expect_celix_utils_strdup((void*)celix_bundleArchive_create, 0, nullptr);
     installBundleAndExpectFailure();
 
     teardownErrorInjectors();
-    // Given a mocked celix_utils_strdup which returns NULL from a second (indirect) call from bundleArchive_create
-    celix_ei_expect_celix_utils_strdup((void*)celix_bundleArchive_create, 1, nullptr, 2);
+    // Given a mocked celix_utils_strdup which returns NULL from a second call from bundleArchive_create
+    celix_ei_expect_celix_utils_strdup((void*)celix_bundleArchive_create, 0, nullptr, 2);
     installBundleAndExpectFailure();
 }
 
@@ -189,7 +175,7 @@ class CelixBundleArchiveErrorInjectionTestSuite : public ::testing::Test {
 TEST_F(CelixBundleArchiveErrorInjectionTestSuite, ArchiveCreateErrorTest) {
     celix_bundle_cache_t* cache = nullptr;
     createCache(&cache);
-    bundle_archive_t* archive = nullptr;
+    celix_bundle_archive_t* archive = nullptr;
 
     // archive directory creation failures not covered by other tests
     celix_ei_expect_celix_utils_getLastModified((void*)celix_bundleArchive_create, 2, CELIX_FILE_IO_EXCEPTION);
@@ -241,22 +227,6 @@ TEST_F(CelixBundleArchiveErrorInjectionTestSuite, ArchiveCreateErrorTest) {
     EXPECT_FALSE(celix_utils_directoryExists(TEST_ARCHIVE_ROOT));
     teardownErrorInjectors();
 
-    // revision creation failure
-    celix_ei_expect_calloc((void*)celix_bundleRevision_create, 0, nullptr);
-    EXPECT_EQ(CELIX_ENOMEM,
-              celix_bundleArchive_create(&fw, TEST_ARCHIVE_ROOT, 1, SIMPLE_TEST_BUNDLE1_LOCATION, &archive));
-    EXPECT_EQ(nullptr, archive);
-    EXPECT_FALSE(celix_utils_directoryExists(TEST_ARCHIVE_ROOT));
-    teardownErrorInjectors();
-
-    // bundle state persistence failure
-    celix_ei_expect_celix_properties_create((void*)celix_bundleArchive_create, 1, nullptr);
-    EXPECT_EQ(CELIX_ENOMEM,
-              celix_bundleArchive_create(&fw, TEST_ARCHIVE_ROOT, 1, SIMPLE_TEST_BUNDLE1_LOCATION, &archive));
-    EXPECT_EQ(nullptr, archive);
-    EXPECT_FALSE(celix_utils_directoryExists(TEST_ARCHIVE_ROOT));
-    teardownErrorInjectors();
-
     EXPECT_EQ(CELIX_SUCCESS, celix_bundleCache_destroy(cache));
 }
 

libs/framework/gtest/src/CelixBundleCacheErrorInjectionTestSuite.cc

@@ -32,12 +32,12 @@
 #include "celix_properties_ei.h"
 
 #include "asprintf_ei.h"
-#include "bundle_archive_private.h"
-#include "bundle_revision_private.h"
+#include "celix_bundle_archive.h"
 #include "framework_private.h"
 #include "malloc_ei.h"
 #include "celix_bundle_manifest.h"
 #include "unistd_ei.h"
+#include "dirent_ei.h"
 
 class CelixBundleCacheErrorInjectionTestSuite : public ::testing::Test {
   public:
@@ -56,15 +56,18 @@ class CelixBundleCacheErrorInjectionTestSuite : public ::testing::Test {
         celix_ei_expect_celix_stringHashMap_create(nullptr, 0, nullptr);
         celix_ei_expect_malloc(nullptr, 0, nullptr);
         celix_ei_expect_calloc(nullptr, 0, nullptr);
+        celix_ei_expect_opendir(nullptr, 0, nullptr);
         celix_ei_expect_celix_properties_load(nullptr, 0, CELIX_SUCCESS);
         celix_frameworkLogger_destroy(fw.logger);
         celix_properties_destroy(fw.configurationMap);
     }
+
     void createCache(celix_bundle_cache_t** cache) {
         celix_properties_setBool(fw.configurationMap, CELIX_FRAMEWORK_CACHE_USE_TMP_DIR, true);
         EXPECT_EQ(CELIX_SUCCESS, celix_bundleCache_create(&fw, &fw.cache));
         *cache = fw.cache;
     }
+
     struct celix_framework fw {};
 };
 
@@ -104,13 +107,19 @@ TEST_F(CelixBundleCacheErrorInjectionTestSuite, CacheDeleteErrorTest) {
 
 TEST_F(CelixBundleCacheErrorInjectionTestSuite, ArchiveCreateErrorTest) {
     celix_bundle_cache_t* cache = nullptr;
+    long bndId;
     createCache(&cache);
 
-    bundle_archive_t* archive = nullptr;
+    //note needs to be the first ei test, to ensure that the lookup bundle id map is not yet loaded.
+    celix_ei_expect_opendir((void*)celix_bundleCache_findBundleIdForLocation, 1, nullptr);
+    EXPECT_EQ(celix_bundleCache_findBundleIdForLocation(cache, SIMPLE_TEST_BUNDLE1_LOCATION, &bndId),
+              CELIX_FILE_IO_EXCEPTION);
+
+    celix_bundle_archive_t* archive = nullptr;
     celix_ei_expect_celix_utils_writeOrCreateString((void*)celix_bundleCache_createArchive, 0, nullptr);
     EXPECT_EQ(CELIX_ENOMEM, celix_bundleCache_createArchive(cache, 1, SIMPLE_TEST_BUNDLE1_LOCATION, &archive));
     EXPECT_EQ(nullptr, archive);
-    long bndId;
+
     auto status = celix_bundleCache_findBundleIdForLocation(cache, SIMPLE_TEST_BUNDLE1_LOCATION, &bndId);
     EXPECT_EQ(CELIX_SUCCESS, status);
     EXPECT_EQ(-1, bndId);
@@ -131,7 +140,7 @@ TEST_F(CelixBundleCacheErrorInjectionTestSuite, SystemArchiveCreateErrorTest) {
     celix_bundle_cache_t* cache = nullptr;
     createCache(&cache);
 
-    bundle_archive_t* archive = nullptr;
+    celix_bundle_archive_t* archive = nullptr;
     celix_ei_expect_calloc((void*)celix_bundleArchive_create, 0, nullptr);
     EXPECT_EQ(CELIX_ENOMEM, celix_bundleCache_createSystemArchive(&fw, &archive));
     EXPECT_EQ(nullptr, archive);
@@ -148,10 +157,6 @@ TEST_F(CelixBundleCacheErrorInjectionTestSuite, SystemArchiveCreateErrorTest) {
     EXPECT_EQ(CELIX_ENOMEM, celix_bundleCache_createSystemArchive(&fw, &archive));
     EXPECT_EQ(nullptr, archive);
 
-    celix_ei_expect_calloc((void*)celix_bundleRevision_create, 0, nullptr);
-    EXPECT_EQ(CELIX_ENOMEM, celix_bundleCache_createSystemArchive(&fw, &archive));
-    EXPECT_EQ(nullptr, archive);
-
     EXPECT_EQ(CELIX_SUCCESS, celix_bundleCache_destroy(cache));
 }
 

libs/framework/gtest/src/CelixBundleCacheTestSuite.cc

@@ -17,7 +17,7 @@
   under the License.
  */
 
-#include "bundle_archive_private.h"
+#include "celix_bundle_archive.h"
 #include "celix_bundle_cache.h"
 #include "celix_constants.h"
 #include "celix_file_utils.h"
@@ -48,12 +48,11 @@ class CelixBundleCacheTestSuite : public ::testing::Test {
 };
 
 TEST_F(CelixBundleCacheTestSuite, ArchiveCreateDestroyTest) {
-    bundle_archive_t* archive = nullptr;
+    celix_bundle_archive_t* archive = nullptr;
     EXPECT_EQ(CELIX_SUCCESS, celix_bundleCache_createArchive(fw.cache, 1, SIMPLE_TEST_BUNDLE1_LOCATION, &archive));
     EXPECT_NE(nullptr, archive);
     auto location = celix_bundleArchive_getLocation(archive);
     EXPECT_STREQ(SIMPLE_TEST_BUNDLE1_LOCATION, location);
-    free(location);
     long bndId;
     auto status = celix_bundleCache_findBundleIdForLocation(fw.cache, SIMPLE_TEST_BUNDLE1_LOCATION, &bndId);
     EXPECT_EQ(CELIX_SUCCESS, status);
@@ -71,7 +70,7 @@ TEST_F(CelixBundleCacheTestSuite, ArchiveCreateDestroyTest) {
 }
 
 TEST_F(CelixBundleCacheTestSuite, NonPermanentDestroyTest) {
-    bundle_archive_t* archive = nullptr;
+    celix_bundle_archive_t* archive = nullptr;
     EXPECT_EQ(CELIX_SUCCESS, celix_bundleCache_createArchive(fw.cache, 1, SIMPLE_TEST_BUNDLE1_LOCATION, &archive));
     EXPECT_NE(nullptr, archive);
     std::string loc = celix_bundleArchive_getPersistentStoreRoot(archive);
@@ -86,13 +85,11 @@ TEST_F(CelixBundleCacheTestSuite, NonPermanentDestroyTest) {
 }
 
 TEST_F(CelixBundleCacheTestSuite, SystemArchiveCreateDestroyTest) {
-    bundle_archive_t* archive = nullptr;
-    const char* archiveRoot = nullptr;
+    celix_bundle_archive_t* archive = nullptr;
     EXPECT_EQ(CELIX_SUCCESS, celix_bundleCache_createSystemArchive(&fw, &archive));
     EXPECT_NE(nullptr, archive);
     EXPECT_EQ(0, celix_bundleArchive_getId(archive));
-    EXPECT_EQ(CELIX_SUCCESS, bundleArchive_getArchiveRoot(archive, &archiveRoot));
-    EXPECT_EQ(nullptr, archiveRoot);
+    EXPECT_EQ(nullptr, celix_bundleArchive_getArchiveRoot(archive));
     EXPECT_EQ(nullptr, celix_bundleArchive_getLocation(archive));
     celix_bundleArchive_invalidate(archive);
     celix_bundleCache_destroyArchive(fw.cache, archive);