fix unit test

Author: Nevermore1994

config.json

@@ -1,5 +1,5 @@
 {
-    "platform": "iOS",
+    "platform": "PC",
     "build_type": "Debug",
     "disable_http": false,
     "disable_test": false

demo/iOS/demo/demo.xcworkspace/xcuserdata/pingtan.xcuserdatad/UserInterfaceState.xcuserstate

@@ -22,7 +22,7 @@ template<typename T>
 class RingBufferImpl: public NonCopyable {
 public:
     [[nodiscard]] uint32_t capacity() const noexcept {
-        return capacity;
+        return capacity_;
     }
 
 protected:

src/base/RingBuffer.hpp

@@ -6,23 +6,18 @@
 #include <condition_variable>
 #include <vector>
 #include <thread>
-#include <type_traits>
 #include <queue>
 #include <functional>
 #include <mutex>
-#include <algorithm>
-#include <memory>
-#include <future>
 #include <expected>
+#include <future>
 #include "Log.hpp"
 #include "NonCopyable.h"
 
 namespace slark {
 
 struct ThreadPoolConfig {
     uint32_t threadCount = 4;
-    uint32_t maxQueueSize = 10000;
-    std::chrono::milliseconds timeout{100};
 };
 
 class ThreadPool: public NonCopyable {
@@ -45,16 +40,21 @@ class ThreadPool: public NonCopyable {
     template<class F, typename... Args>
     auto submit(F&& f, Args&&... args) -> std::expected<std::future<std::invoke_result_t<F, Args...>>, bool>;
 
+    size_t getTaskCount() const noexcept {
+        std::lock_guard<std::mutex> lock(mutex_);
+        return tasks_.size();
+    }
+    
     void waitForAll() noexcept {
         std::unique_lock<std::mutex> lock(mutex_);
-        notFull_.wait(lock, [this] {
+        allTasksDone_.wait(lock, [this] {
             return tasks_.empty() && activeThreads_ == 0;
         });
     }
-
-    size_t getTaskCount() const noexcept {
+    
+    void clear() noexcept {
         std::lock_guard<std::mutex> lock(mutex_);
-        return tasks_.size();
+        tasks_.clear();
     }
 
     size_t getThreadCount() const noexcept {
@@ -70,11 +70,11 @@ class ThreadPool: public NonCopyable {
     void workThread();
 
     std::vector<std::thread> workers_;
-    std::queue<std::function<void()>> tasks_;
+    std::deque<std::function<void()>> tasks_;
 
     mutable std::mutex mutex_;
     std::condition_variable notEmpty_;
-    std::condition_variable notFull_;
+    std::condition_variable allTasksDone_;
 
     std::atomic<bool> shutdown_{false};
     std::atomic<size_t> activeThreads_{0};
@@ -106,8 +106,7 @@ inline void ThreadPool::workThread() {
             }
 
             task = std::move(tasks_.front());
-            tasks_.pop();
-            notFull_.notify_one();
+            tasks_.pop_front();
         }
 
         ++activeThreads_;
@@ -117,6 +116,7 @@ inline void ThreadPool::workThread() {
             LogE("error in executing task");
         }
         --activeThreads_;
+        allTasksDone_.notify_all();
     }
 }
 
@@ -133,23 +133,15 @@ auto ThreadPool::submit(F&& f, Args&&... args)
     std::future<ReturnType> future = task->get_future();
     {
         std::unique_lock<std::mutex> lock(mutex_);
-
-        if (!notFull_.wait_for(lock, config_.timeout, [this] {
-            return tasks_.size() < config_.maxQueueSize || shutdown_;
-        })) {
-            LogE("The task queue is full");
-            return std::unexpected(false);
-        }
-
         if (shutdown_) {
             LogE("The thread pool is exiting");
             return std::unexpected(false);
         }
-        tasks_.emplace([task]() { (*task)(); });
+        tasks_.emplace_back([task]() { (*task)(); });
     }
 
     notEmpty_.notify_one();
     return future;
 }
 
-}
+}

src/base/ThreadPool.hpp

@@ -46,7 +46,7 @@ IEGLContextRefPtr GLContextManager::createShareContextWithId(const std::string&
 }
 
 #if !SLARK_IOS && !SLARK_ANDROID
-IEGLContextPtr createGLContext() {
+IEGLContextRefPtr createGLContext() noexcept {
     return nullptr;
 }
 #endif

src/core/public/GLContextManager.cpp

@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.20)
 
-add_subdirectory(base_test)
+add_subdirectory(base)
 if(NOT DISABLE_HTTP)
-    add_subdirectory(http_test)
+    add_subdirectory(http)
 endif ()
 
 get_property(LIBRARY_TYPE GLOBAL PROPERTY "LIBRARY_TYPE" )

test/CMakeLists.txt

@@ -4,7 +4,6 @@
 // Copyright (c) 2024 Nevermore All rights reserved.
 //
 
-#include <algorithm>
 #include <gtest/gtest.h>
 #include <string_view>
 #include "Buffer.hpp"

test/base/BufferTest.cpp

@@ -18,7 +18,7 @@ TEST(ClockTest, InitialState) {
 
 TEST(ClockTest, SetTime) {
     Clock clock;
-    clock.setTime(milliseconds(5000));
+    clock.setTime(Time::TimePoint::fromMilliSeconds(5000ms));
     clock.start();
     std::this_thread::sleep_for(milliseconds(2000));
     EXPECT_GE(clock.time().toMilliSeconds(), milliseconds(7000));
@@ -27,7 +27,7 @@ TEST(ClockTest, SetTime) {
 
 TEST(ClockTest, StartPauseReset) {
     Clock clock;
-    clock.setTime(milliseconds(5000));
+    clock.setTime(Time::TimePoint::fromMilliSeconds(5000ms));
     clock.start();
     std::this_thread::sleep_for(milliseconds(2000));//7000
     EXPECT_GE(clock.time().toMilliSeconds(), milliseconds(6500));

test/base/ClockTest.cpp

@@ -79,7 +79,7 @@ TEST(Data, append) {
     ASSERT_EQ(data.length, str.length());
 
     Data data1("hello");
-    data1 += {" world!"};
+    data1.append(" world!");
     auto data2 = data1 + Data{"xxxxx"};
     ASSERT_EQ(data1.view().view(), std::string_view("hello world!"));
     ASSERT_EQ(data2.view().view(), std::string_view("hello world!xxxxx"));

test/base/DataTest.cpp

@@ -8,7 +8,6 @@
 #include <utility>
 #include "IReader.h"
 #include "Writer.hpp"
-#include "FileUtil.h"
 #include "Reader.h"
 
 using namespace slark;
@@ -32,7 +31,7 @@ TEST(Writer, getPath) {
 
 TEST(Reader, getPath) {
     Reader reader;
-    auto task = std::make_unique<ReaderTask>([](DataPacket, IOState) {
+    auto task = std::make_unique<ReaderTask>([](IReader*, DataPacket, IOState) {
 
     });
     task->path = "test1.txt";
@@ -57,7 +56,7 @@ TEST(Reader, open) {
     writer.reset();
 
     Reader reader;
-    auto task = std::make_unique<ReaderTask>([&str](DataPacket data, IOState state) {
+    auto task = std::make_unique<ReaderTask>([&str](IReader*, DataPacket data, IOState state) {
         std::cout << data.data->view().view() << std::endl;
         ASSERT_EQ(data.offset, 0);
         ASSERT_EQ(state, IOState::EndOfFile);