summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
author刘文坛 <[email protected]>2023-10-11 06:53:03 +0000
committer刘文坛 <[email protected]>2023-10-11 06:53:03 +0000
commite49427974fa9b1945cc93449dfe92531b1523b50 (patch)
tree8d2a7cff64a983d45759cc67aabba31596ea59ee /test
parent461d43c6b76d3cd25705ed3ff054019f5e6404a6 (diff)
[BUGFIX]fix illegal clause indexv4.0.47
Diffstat (limited to 'test')
-rw-r--r--test/maat_framework_gtest.cpp16
-rw-r--r--test/maat_json.json10
-rw-r--r--test/table_info.conf3
3 files changed, 14 insertions, 15 deletions
diff --git a/test/maat_framework_gtest.cpp b/test/maat_framework_gtest.cpp
index 738b922..e2fd6b1 100644
--- a/test/maat_framework_gtest.cpp
+++ b/test/maat_framework_gtest.cpp
@@ -6039,15 +6039,15 @@ TEST_F(MaatCmdTest, UpdateIPPlugin) {
struct maat *maat_inst = MaatCmdTest::_shared_maat_inst;
int *ex_data_counter = MaatCmdTest::_ex_data_counter;
const char *table_line_add[TEST_CMD_LINE_NUM] = {
- "101\t4\t192.168.30.99\t192.168.30.101\tSomething-like-json\t1\trange",
- "102\t4\t192.168.30.90\t192.168.30.128\tBigger-range-should-in-the-back\t1\trange",
- "103\t6\t2001:db8:1234::\t2001:db8:1235::\tBigger-range-should-in-the-back\t1\trange",
- "104\t6\t2001:db8:1234::1\t2001:db8:1234::5210\tSomething-like-json\t1\trange"};
+ "101\t4\t192.168.30.99\t192.168.30.101\tSomething-like-json\t1",
+ "102\t4\t192.168.30.90\t192.168.30.128\tBigger-range-should-in-the-back\t1",
+ "103\t6\t2001:db8:1234::\t2001:db8:1235::\tBigger-range-should-in-the-back\t1",
+ "104\t6\t2001:db8:1234::1\t2001:db8:1234::5210\tSomething-like-json\t1"};
const char *table_line_del[TEST_CMD_LINE_NUM] = {
- "101\t4\t192.168.30.99\t192.168.30.101\tSomething-like-json\t0\trange",
- "102\t4\t192.168.30.90\t192.168.30.128\tBigger-range-should-in-the-back\t0\trange",
- "103\t6\t2001:db8:1234::\t2001:db8:1235::\tBigger-range-should-in-the-back\t0\trange",
- "104\t6\t2001:db8:1234::1\t2001:db8:1234::5210\tSomething-like-json\t0\trange"};
+ "101\t4\t192.168.30.99\t192.168.30.101\tSomething-like-json\t0",
+ "102\t4\t192.168.30.90\t192.168.30.128\tBigger-range-should-in-the-back\t0",
+ "103\t6\t2001:db8:1234::\t2001:db8:1235::\tBigger-range-should-in-the-back\t0",
+ "104\t6\t2001:db8:1234::1\t2001:db8:1234::5210\tSomething-like-json\t0"};
int table_id = maat_get_table_id(maat_inst, table_name);
ASSERT_GT(table_id, 0);
diff --git a/test/maat_json.json b/test/maat_json.json
index ff793f7..0e7601a 100644
--- a/test/maat_json.json
+++ b/test/maat_json.json
@@ -3022,11 +3022,11 @@
{
"table_name": "TEST_IP_PLUGIN_WITH_EXDATA",
"table_content": [
- "101\t4\t192.168.30.99\t192.168.30.101\tSomething-like-json\t1\trange",
- "102\t4\t192.168.30.90\t192.168.30.128\tBigger-range-should-in-the-back\t1\trange",
- "103\t6\t2001:db8:1234::\t2001:db8:1235::\tBigger-range-should-in-the-back\t1\trange",
- "104\t6\t2001:db8:1234::1\t2001:db8:1234::5210\tSomething-like-json\t1\trange",
- "105\t6\t2620:100:3000::\t2620:0100:30ff:ffff:ffff:ffff:ffff:ffff\tBugreport-liumengyan-20210517\t1\trange"
+ "101\t4\t192.168.30.99\t192.168.30.101\tSomething-like-json\t1",
+ "102\t4\t192.168.30.90\t192.168.30.128\tBigger-range-should-in-the-back\t1",
+ "103\t6\t2001:db8:1234::\t2001:db8:1235::\tBigger-range-should-in-the-back\t1",
+ "104\t6\t2001:db8:1234::1\t2001:db8:1234::5210\tSomething-like-json\t1",
+ "105\t6\t2620:100:3000::\t2620:0100:30ff:ffff:ffff:ffff:ffff:ffff\tBugreport-liumengyan-20210517\t1"
]
},
{
diff --git a/test/table_info.conf b/test/table_info.conf
index 2265e23..2845d09 100644
--- a/test/table_info.conf
+++ b/test/table_info.conf
@@ -306,8 +306,7 @@
"item_id":1,
"ip_type":2,
"start_ip":3,
- "end_ip":4,
- "addr_format":7
+ "end_ip":4
}
},
{