fix details in util-test

Author: DavidingPlus

test/util-test.cpp

@@ -1,44 +1,45 @@
 #include <gtest/gtest.h>
 
 #include "util.h"
+#include "defs.h"
 
 
-TEST(nvmixCalcInodeBlocksTest, Test1)
+TEST(UtilTest, NvmixCalcInodeBlocksTest1)
 {
     EXPECT_EQ(nvmixCalcInodeBlocks(0), 0);
 }
 
-TEST(nvmixCalcInodeBlocksTest, Test2)
+TEST(UtilTest, NvmixCalcInodeBlocksTest2)
 {
-    EXPECT_EQ(nvmixCalcInodeBlocks(1), 8); // 1字节需要1个块 -> 4096/512=8
+    EXPECT_EQ(nvmixCalcInodeBlocks(1), 8);
 }
 
-TEST(nvmixCalcInodeBlocksTest, Test3)
+TEST(UtilTest, NvmixCalcInodeBlocksTest3)
 {
-    EXPECT_EQ(nvmixCalcInodeBlocks(4095), 8);
+    EXPECT_EQ(nvmixCalcInodeBlocks(NVMIX_BLOCK_SIZE - 1), 8);
 }
 
-TEST(nvmixCalcInodeBlocksTest, Test4)
+TEST(UtilTest, NvmixCalcInodeBlocksTest4)
 {
-    EXPECT_EQ(nvmixCalcInodeBlocks(4096), 8);
+    EXPECT_EQ(nvmixCalcInodeBlocks(NVMIX_BLOCK_SIZE), 8);
 }
 
-TEST(nvmixCalcInodeBlocksTest, Test5)
+TEST(UtilTest, NvmixCalcInodeBlocksTest5)
 {
-    EXPECT_EQ(nvmixCalcInodeBlocks(4097), 16); // 需要2个块 -> 2*8=16
+    EXPECT_EQ(nvmixCalcInodeBlocks(NVMIX_BLOCK_SIZE + 1), 16);
 }
 
-TEST(nvmixCalcInodeBlocksTest, Test6)
+TEST(UtilTest, NvmixCalcInodeBlocksTest6)
 {
-    EXPECT_EQ(nvmixCalcInodeBlocks(3 * 4096), 24); // 3块 -> 3*8=24
+    EXPECT_EQ(nvmixCalcInodeBlocks(3 * NVMIX_BLOCK_SIZE), 24);
 }
 
-TEST(nvmixCalcInodeBlocksTest, Test7)
+TEST(UtilTest, NvmixCalcInodeBlocksTest7)
 {
-    EXPECT_EQ(nvmixCalcInodeBlocks(3 * 4096 - 1), 24);
+    EXPECT_EQ(nvmixCalcInodeBlocks(3 * NVMIX_BLOCK_SIZE - 1), 24);
 }
 
-TEST(nvmixCalcInodeBlocksTest, Test8)
+TEST(UtilTest, NvmixCalcInodeBlocksTest8)
 {
-    EXPECT_EQ(nvmixCalcInodeBlocks(100 * 4096), 800); // 100块 -> 100*8=800
+    EXPECT_EQ(nvmixCalcInodeBlocks(100 * NVMIX_BLOCK_SIZE), 800);
 }