From 172b8050769b1262f52431d8ec0285f9f0e6d007 Mon Sep 17 00:00:00 2001 From: wxyu Date: Mon, 9 Sep 2019 09:54:30 +0800 Subject: [PATCH 1/2] MS-519 Add event_test in scheduler Former-commit-id: cf8b0b8119de8eb6a8b9969e45322115680f7eba --- cpp/CHANGELOG.md | 1 + cpp/unittest/scheduler/event_test.cpp | 58 +++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 cpp/unittest/scheduler/event_test.cpp diff --git a/cpp/CHANGELOG.md b/cpp/CHANGELOG.md index 094a30e9cb..623cfb3d8c 100644 --- a/cpp/CHANGELOG.md +++ b/cpp/CHANGELOG.md @@ -101,6 +101,7 @@ Please mark all change in change log and use the ticket from JIRA. - MS-511 - Update resource_test in scheduler - MS-517 - Update resource_mgr_test in scheduler - MS-518 - Add schedinst_test in scheduler +- MS-519 - Add event_test in scheduler ## New Feature - MS-343 - Implement ResourceMgr diff --git a/cpp/unittest/scheduler/event_test.cpp b/cpp/unittest/scheduler/event_test.cpp new file mode 100644 index 0000000000..7de820c83b --- /dev/null +++ b/cpp/unittest/scheduler/event_test.cpp @@ -0,0 +1,58 @@ +/******************************************************************************* + * Copyright 上海赜睿信息科技有限公司(Zilliz) - All Rights Reserved + * Unauthorized copying of this file, via any medium is strictly prohibited. + * Proprietary and confidential. + ******************************************************************************/ + + +#include +#include "scheduler/resource/Resource.h" +#include "scheduler/event/Event.h" +#include "scheduler/event/StartUpEvent.h" + + +namespace zilliz { +namespace milvus { +namespace engine { + +TEST(EventTest, start_up_event) { + ResourceWPtr res(ResourcePtr(nullptr)); + auto event = std::make_shared(res); + ASSERT_FALSE(event->Dump().empty()); + std::stringstream ss; + ss << event; + ASSERT_FALSE(ss.str().empty()); +} + +TEST(EventTest, load_completed_event) { + ResourceWPtr res(ResourcePtr(nullptr)); + auto event = std::make_shared(res, nullptr); + ASSERT_FALSE(event->Dump().empty()); + std::stringstream ss; + ss << event; + ASSERT_FALSE(ss.str().empty()); +} + +TEST(EventTest, finish_task_event) { + ResourceWPtr res(ResourcePtr(nullptr)); + auto event = std::make_shared(res, nullptr); + ASSERT_FALSE(event->Dump().empty()); + std::stringstream ss; + ss << event; + ASSERT_FALSE(ss.str().empty()); +} + + +TEST(EventTest, tasktable_updated_event) { + ResourceWPtr res(ResourcePtr(nullptr)); + auto event = std::make_shared(res); + ASSERT_FALSE(event->Dump().empty()); + std::stringstream ss; + ss << event; + ASSERT_FALSE(ss.str().empty()); +} + +} +} +} + From d430ae67b9a567399831b5c285d37e1b223d3e9b Mon Sep 17 00:00:00 2001 From: wxyu Date: Mon, 9 Sep 2019 10:03:01 +0800 Subject: [PATCH 2/2] MS-520 Update resource_test in scheduler Former-commit-id: ef511cdbf9ec9dbbde44dc143b5c8a0d8e41b4e4 --- cpp/CHANGELOG.md | 1 + cpp/unittest/scheduler/resource_test.cpp | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/cpp/CHANGELOG.md b/cpp/CHANGELOG.md index 623cfb3d8c..425538826a 100644 --- a/cpp/CHANGELOG.md +++ b/cpp/CHANGELOG.md @@ -102,6 +102,7 @@ Please mark all change in change log and use the ticket from JIRA. - MS-517 - Update resource_mgr_test in scheduler - MS-518 - Add schedinst_test in scheduler - MS-519 - Add event_test in scheduler +- MS-520 - Update resource_test in scheduler ## New Feature - MS-343 - Implement ResourceMgr diff --git a/cpp/unittest/scheduler/resource_test.cpp b/cpp/unittest/scheduler/resource_test.cpp index e6696b7a11..88774df5e7 100644 --- a/cpp/unittest/scheduler/resource_test.cpp +++ b/cpp/unittest/scheduler/resource_test.cpp @@ -81,6 +81,16 @@ TEST_F(ResourceBaseTest, has_executor) { ASSERT_FALSE(both_disable_->HasExecutor()); } +TEST_F(ResourceBaseTest, dump) { + ASSERT_FALSE(only_loader_->Dump().empty()); + ASSERT_FALSE(only_executor_->Dump().empty()); + ASSERT_FALSE(both_enable_->Dump().empty()); + ASSERT_FALSE(both_disable_->Dump().empty()); + std::stringstream ss; + ss << only_loader_ << only_executor_ << both_enable_ << both_disable_; + ASSERT_FALSE(ss.str().empty()); +} + /************ ResourceAdvanceTest ************/ class ResourceAdvanceTest : public testing::Test {