test: reopen dnodeTest

source/dnode/mnode/impl/test/dnode/CMakeLists.txt

@@ -5,7 +5,7 @@ target_link_libraries(
     PUBLIC sut
 )
 
-#add_test(
-#    NAME mnode_test_dnode
-#    COMMAND mnode_test_dnode
-#)
+add_test(
+    NAME mdnodeTest
+    COMMAND mdnodeTest
+)

source/dnode/mnode/impl/test/dnode/mdnode.cpp

@@ -51,27 +51,8 @@ TestServer MndTestDnode::server4;
 TestServer MndTestDnode::server5;
 
 TEST_F(MndTestDnode, 01_ShowDnode) {
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_DNODE, "");
-  CHECK_META("show dnodes", 7);
-
-  CHECK_SCHEMA(0, TSDB_DATA_TYPE_SMALLINT, 2, "id");
-  CHECK_SCHEMA(1, TSDB_DATA_TYPE_BINARY, TSDB_EP_LEN + VARSTR_HEADER_SIZE, "endpoint");
-  CHECK_SCHEMA(2, TSDB_DATA_TYPE_SMALLINT, 2, "vnodes");
-  CHECK_SCHEMA(3, TSDB_DATA_TYPE_SMALLINT, 2, "support_vnodes");
-  CHECK_SCHEMA(4, TSDB_DATA_TYPE_BINARY, 10 + VARSTR_HEADER_SIZE, "status");
-  CHECK_SCHEMA(5, TSDB_DATA_TYPE_TIMESTAMP, 8, "create_time");
-  CHECK_SCHEMA(6, TSDB_DATA_TYPE_BINARY, 24 + VARSTR_HEADER_SIZE, "offline_reason");
-
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_DNODE, "dnodes", "");
   EXPECT_EQ(test.GetShowRows(), 1);
-
-  CheckInt16(1);
-  CheckBinary("localhost:9023", TSDB_EP_LEN);
-  CheckInt16(0);
-  CheckInt16(16);
-  CheckBinary("ready", 10);
-  CheckTimestamp();
-  CheckBinary("", 24);
 }
 
 TEST_F(MndTestDnode, 02_ConfigDnode) {
@@ -162,25 +143,8 @@ TEST_F(MndTestDnode, 03_Create_Dnode) {
 
   taosMsleep(1300);
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_DNODE, "");
-  CHECK_META("show dnodes", 7);
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_DNODE, "dnodes", "");
   EXPECT_EQ(test.GetShowRows(), 2);
-
-  CheckInt16(1);
-  CheckInt16(2);
-  CheckBinary("localhost:9023", TSDB_EP_LEN);
-  CheckBinary("localhost:9024", TSDB_EP_LEN);
-  CheckInt16(0);
-  CheckInt16(0);
-  CheckInt16(16);
-  CheckInt16(16);
-  CheckBinary("ready", 10);
-  CheckBinary("ready", 10);
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckBinary("", 24);
-  CheckBinary("", 24);
 }
 
 TEST_F(MndTestDnode, 04_Drop_Dnode) {
@@ -236,19 +200,9 @@ TEST_F(MndTestDnode, 04_Drop_Dnode) {
     ASSERT_EQ(pRsp->code, TSDB_CODE_MND_DNODE_NOT_EXIST);
   }
 
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_DNODE, "");
-  CHECK_META("show dnodes", 7);
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_DNODE, "dnodes", "");
   EXPECT_EQ(test.GetShowRows(), 1);
 
-  CheckInt16(1);
-  CheckBinary("localhost:9023", TSDB_EP_LEN);
-  CheckInt16(0);
-  CheckInt16(16);
-  CheckBinary("ready", 10);
-  CheckTimestamp();
-  CheckBinary("", 24);
-
   taosMsleep(2000);
   server2.Stop();
   server2.DoStart();
@@ -298,40 +252,9 @@ TEST_F(MndTestDnode, 05_Create_Drop_Restart_Dnode) {
   }
 
   taosMsleep(1300);
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_DNODE, "");
-  CHECK_META("show dnodes", 7);
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_DNODE, "dnodes", "");
   EXPECT_EQ(test.GetShowRows(), 4);
 
-  CheckInt16(1);
-  CheckInt16(3);
-  CheckInt16(4);
-  CheckInt16(5);
-  CheckBinary("localhost:9023", TSDB_EP_LEN);
-  CheckBinary("localhost:9025", TSDB_EP_LEN);
-  CheckBinary("localhost:9026", TSDB_EP_LEN);
-  CheckBinary("localhost:9027", TSDB_EP_LEN);
-  CheckInt16(0);
-  CheckInt16(0);
-  CheckInt16(0);
-  CheckInt16(0);
-  CheckInt16(16);
-  CheckInt16(16);
-  CheckInt16(16);
-  CheckInt16(16);
-  CheckBinary("ready", 10);
-  CheckBinary("ready", 10);
-  CheckBinary("ready", 10);
-  CheckBinary("ready", 10);
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckBinary("", 24);
-  CheckBinary("", 24);
-  CheckBinary("", 24);
-  CheckBinary("", 24);
-
   // restart
   uInfo("stop all server");
   test.Restart();
@@ -341,37 +264,6 @@ TEST_F(MndTestDnode, 05_Create_Drop_Restart_Dnode) {
   server5.Restart();
 
   taosMsleep(1300);
-  test.SendShowMetaReq(TSDB_MGMT_TABLE_DNODE, "");
-  CHECK_META("show dnodes", 7);
-  test.SendShowRetrieveReq();
+  test.SendShowReq(TSDB_MGMT_TABLE_DNODE, "dnodes", "");
   EXPECT_EQ(test.GetShowRows(), 4);
-
-  CheckInt16(1);
-  CheckInt16(3);
-  CheckInt16(4);
-  CheckInt16(5);
-  CheckBinary("localhost:9023", TSDB_EP_LEN);
-  CheckBinary("localhost:9025", TSDB_EP_LEN);
-  CheckBinary("localhost:9026", TSDB_EP_LEN);
-  CheckBinary("localhost:9027", TSDB_EP_LEN);
-  CheckInt16(0);
-  CheckInt16(0);
-  CheckInt16(0);
-  CheckInt16(0);
-  CheckInt16(16);
-  CheckInt16(16);
-  CheckInt16(16);
-  CheckInt16(16);
-  CheckBinary("ready", 10);
-  CheckBinary("ready", 10);
-  CheckBinary("ready", 10);
-  CheckBinary("ready", 10);
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckTimestamp();
-  CheckBinary("", 24);
-  CheckBinary("", 24);
-  CheckBinary("", 24);
-  CheckBinary("", 24);
 }