diff --git a/CHANGELOGS.md b/CHANGELOGS.md
index a0c7ed62c523aadc350c5c7904cd482d12e0f5fc..e714be7df0f86cb130ab40430a2d752cb40d4e15 100644
--- a/CHANGELOGS.md
+++ b/CHANGELOGS.md
@@ -20,3 +20,4 @@ Please mark all change in change log and use the ticket from JIRA.
 - MS-215 - Add Milvus cluster CI/CD groovy file 
 - MS-277 - Update CUDA Version to V10.1
 - MS-336 - Scheduler interface
+- MS-344 - Add TaskTable Test
diff --git a/cpp/unittest/scheduler/normal_test.cpp b/cpp/unittest/scheduler/normal_test.cpp
index 7318efc9df3249dad6f14ef2acfc88b36bc83244..1f13549b7723262daca8e7b6190372534758cc2d 100644
--- a/cpp/unittest/scheduler/normal_test.cpp
+++ b/cpp/unittest/scheduler/normal_test.cpp
@@ -6,7 +6,7 @@
 
 using namespace zilliz::milvus::engine;
 
-int main() {
+TEST(normal_test, DISABLED_test1) {
 
     // ResourceMgr only compose resources, provide unified event
     auto res_mgr = std::make_shared<ResourceMgr>();
diff --git a/cpp/unittest/scheduler/tasktable_test.cpp b/cpp/unittest/scheduler/tasktable_test.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..7a9178c314a4b6f28368a3379587874246b33e74
--- /dev/null
+++ b/cpp/unittest/scheduler/tasktable_test.cpp
@@ -0,0 +1,127 @@
+#include "scheduler/TaskTable.h"
+#include <gtest/gtest.h>
+
+
+using namespace zilliz::milvus::engine;
+
+class TaskTableItemTest : public ::testing::Test {
+protected:
+    void
+    SetUp() override {
+        item1_.id = 0;
+        item1_.state = TaskTableItemState::MOVED;
+        item1_.priority = 10;
+    }
+
+    TaskTableItem default_;
+    TaskTableItem item1_;
+};
+
+TEST_F(TaskTableItemTest, construct) {
+    ASSERT_EQ(default_.id, 0);
+    ASSERT_EQ(default_.state, TaskTableItemState::INVALID);
+    ASSERT_EQ(default_.priority, 0);
+}
+
+TEST_F(TaskTableItemTest, copy) {
+    TaskTableItem another(item1_);
+    ASSERT_EQ(another.id, item1_.id);
+    ASSERT_EQ(another.state, item1_.state);
+    ASSERT_EQ(another.priority, item1_.priority);
+}
+
+TEST_F(TaskTableItemTest, destruct) {
+    auto p_item = new TaskTableItem();
+    delete p_item;
+}
+
+
+/************ TaskTableBaseTest ************/
+
+class TaskTableBaseTest : public ::testing::Test {
+protected:
+    void
+    SetUp() override {
+        invalid_task_ = nullptr;
+        task1_ = std::make_shared<Task>("1");
+        task2_ = std::make_shared<Task>("2");
+
+        empty_table_ = TaskTable();
+    }
+
+    TaskPtr invalid_task_;
+    TaskPtr task1_;
+    TaskPtr task2_;
+    TaskTable empty_table_;
+};
+
+
+TEST_F(TaskTableBaseTest, put_task) {
+    empty_table_.Put(task1_);
+    ASSERT_EQ(empty_table_.Get(0).task, task1_);
+}
+
+TEST_F(TaskTableBaseTest, put_invalid_test) {
+    empty_table_.Put(invalid_task_);
+    ASSERT_EQ(empty_table_.Get(0).task, invalid_task_);
+}
+
+TEST_F(TaskTableBaseTest, put_batch) {
+    std::vector<TaskPtr> tasks{task1_, task2_};
+    empty_table_.Put(tasks);
+    ASSERT_EQ(empty_table_.Get(0).task, task1_);
+    ASSERT_EQ(empty_table_.Get(1).task, task2_);
+}
+
+TEST_F(TaskTableBaseTest, put_empty_batch) {
+    std::vector<TaskPtr> tasks{};
+    empty_table_.Put(tasks);
+}
+
+/************ TaskTableAdvanceTest ************/
+
+class TaskTableAdvanceTest : public ::testing::Test {
+protected:
+    void
+    SetUp() override {
+        for (uint64_t i = 0; i < 8; ++i) {
+            auto task = std::make_shared<Task>(std::to_string(i));
+            table1_.Put(task);
+        }
+
+        table1_.Get(0).state = TaskTableItemState::INVALID;
+        table1_.Get(1).state = TaskTableItemState::START;
+        table1_.Get(2).state = TaskTableItemState::LOADING;
+        table1_.Get(3).state = TaskTableItemState::LOADED;
+        table1_.Get(4).state = TaskTableItemState::EXECUTING;
+        table1_.Get(5).state = TaskTableItemState::EXECUTED;
+        table1_.Get(6).state = TaskTableItemState::MOVING;
+        table1_.Get(7).state = TaskTableItemState::MOVED;
+    }
+
+    TaskTable table1_;
+};
+
+TEST_F(TaskTableAdvanceTest, load) {
+    table1_.Load(1);
+    table1_.Loaded(2);
+
+    ASSERT_EQ(table1_.Get(1).state, TaskTableItemState::LOADING);
+    ASSERT_EQ(table1_.Get(2).state, TaskTableItemState::LOADED);
+}
+
+TEST_F(TaskTableAdvanceTest, execute) {
+    table1_.Execute(3);
+    table1_.Executed(4);
+
+    ASSERT_EQ(table1_.Get(3).state, TaskTableItemState::EXECUTING);
+    ASSERT_EQ(table1_.Get(4).state, TaskTableItemState::EXECUTED);
+}
+
+TEST_F(TaskTableAdvanceTest, move) {
+    table1_.Move(3);
+    table1_.Moved(6);
+
+    ASSERT_EQ(table1_.Get(3).state, TaskTableItemState::MOVING);
+    ASSERT_EQ(table1_.Get(6).state, TaskTableItemState::MOVED);
+}