1 files changed, 3 insertions, 85 deletions

diff --git a/test/http_decoder_gtest.h b/test/http_decoder_gtest.h
index 8e83a70..4bdd840 100644
--- a/test/http_decoder_gtest.h
+++ b/test/http_decoder_gtest.h
@@ -1,7 +1,8 @@
 #pragma once
 
 #include "http_decoder.h"
-#include "session.h"
+#include "stellar/session.h"
+#include "stellar/session_mq.h"
 #include "md5.h"
 #include <stdint.h>
 #include <stdlib.h>
@@ -42,87 +43,4 @@
 #define GTEST_HTTP_TRANS_SEQ_NAME "__X_HTTP_TRANSACTION_SEQ"
 #define GTEST_HTTP_TUPLE4_NAME "__X_HTTP_TUPLE4"
 #define GTEST_HTTP_PAYLOAD_NAME "__X_HTTP_PAYLOAD"
-#define GTEST_HTTP_PAYLOAD_MD5_NAME "__X_HTTP_PAYLOAD_MD5"
-
-struct fake_exdata_manage
-{
-    char *name;
-    int name_len;
-    void *arg;
-    void (*free_func)(struct session *sess, int idx, void *ex_ptr, void *arg);
-};
-
-struct fake_packet
-{
-    int dir;
-    size_t raw_pkt_data_len;
-    const char *raw_pkt_data; // referred to packet Ethernet MAC header
-    const char *l4_header;    // referred to TCP, UDP header
-    size_t payload_data_len;
-    const char *payload_data; // referred to L7 data, such as HTTP, DNS, etc.
-    size_t payload_submit_offset;
-};
-
-enum data_source_type_t
-{
-    __DATA_SOURCE_NULL = 0,
-    DATA_SOURCE_PCAP,
-    DATA_SOURCE_JSON,
-    __DATA_SOURCE_MAX
-};
-
-struct data_src_json_para_t
-{
-    cJSON *json_root;
-    cJSON *current_object;
-    int json_array_size;
-    int current_json_array_idx;
-    char key_value_buf[JSON_KEY_VALUE_STRING_MAX_LEN];
-};
-
-struct fake_stellar
-{
-    struct fake_exdata_manage fake_exdata_mgr[EX_DATA_MAX_SIZE];
-    int tcp_mss;
-    void *http_decoder_ctx;
-    void *http_http_plug_ctx;
-    int (*http_decoder_entry)(struct session *sess, int events,
-                              const struct packet *pkt, void *cb_arg);
-    cJSON *http_plug_test_result_root;
-    enum data_source_type_t data_source_type;
-    const char *benchmark_json_file_name;
-    const char *data_source_file_name;
-    cJSON *load_benchmark_json_root;
-    pcap_t *pcap_ins;
-
-    struct data_src_json_para_t data_src_json_para;
-};
-
-struct fake_session
-{
-    enum session_type type;
-    struct fake_stellar *fst;
-    struct fake_packet *fpkt;
-    int events;
-    int tcp_mss;
-    enum session_addr_type addr_type;
-    struct session_addr *addr;
-    char *readable_addr_cstr;
-    void *plug_exdata_array[EX_DATA_MAX_SIZE];
-};
-
-typedef void *(*HTTP_DECODER_INIT_FUN_T)(struct stellar *st);
-typedef int (*HTTP_DECODER_ENTRY_FUN_T)(struct session *sess, int events, const struct packet *pkt, void *cb_arg);
-typedef int (*HTTP_DECODER_PLUG_ENTRY_FUN_T)(struct session *sess, int topic_id, const void *data, void *cb_arg);
-extern struct fake_stellar *hdgt_create(void);
-extern int hdgt_init_once(struct fake_stellar *fst, int argc, char **argv, 
-                  HTTP_DECODER_INIT_FUN_T hd_init_fun, HTTP_DECODER_ENTRY_FUN_T hd_entry_fun,
-                  HTTP_DECODER_INIT_FUN_T hd_plug_init_fun, HTTP_DECODER_PLUG_ENTRY_FUN_T hd_plug_entry_fun);
-extern int hdgt_data_source_init_by_json_text(struct fake_stellar *fst, const char *json_cont);
-int hdgt_under_test_module_init(struct fake_stellar *fst, HTTP_DECODER_INIT_FUN_T init_fun, HTTP_DECODER_ENTRY_FUN_T entry_fun);
-int hdgt_test_plug_init(struct fake_stellar *fst, HTTP_DECODER_INIT_FUN_T init_fun, HTTP_DECODER_PLUG_ENTRY_FUN_T entry_fun);
-extern void hdgt_main_loop(struct fake_stellar *fst);
-extern void hdgt_destroy(struct fake_stellar *fst);
-extern int hdgt_compare_result(struct fake_stellar *fst);
-extern void hdgt_set_data_source_type(fake_stellar *fst, enum data_source_type_t type);
-extern "C" void http_decoder_plug_set_entry_fuc(HTTP_DECODER_PLUG_ENTRY_FUN_T entry_fun);
\ No newline at end of file
+#define GTEST_HTTP_PAYLOAD_MD5_NAME "__X_HTTP_PAYLOAD_MD5"
\ No newline at end of file