unittest: fix unneeded includes as per cppclean

Especially because there is conditional inclusion from a header
pull/8185/head
Philippe Antoine 4 years ago committed by Victor Julien
parent 662f0ce503
commit 1f066cbbe8

@ -62,6 +62,7 @@ void RegisterModbusParsers(void)
#include "detect-engine.h"
#include "detect-parse.h"
#include "detect-engine-build.h"
#include "detect-engine-alert.h"
#include "flow-util.h"

@ -1781,6 +1781,7 @@ void SMTPParserCleanup(void)
/***************************************Unittests******************************/
#ifdef UNITTESTS
#include "detect-engine-alert.h"
static void SMTPTestInitConfig(void)
{

@ -520,6 +520,7 @@ int DecodeICMPV6(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p,
}
#ifdef UNITTESTS
#include "packet.h"
#include "util-unittest-helper.h"
static int ICMPV6CalculateValidChecksumtest01(void)

@ -650,6 +650,7 @@ int DecodeIPV6(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p, const uint8_t *
#ifdef UNITTESTS
#include "util-unittest-helper.h"
#include "packet.h"
/**
* \test fragment decoding

@ -75,6 +75,7 @@ int DecodeRaw(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p,
#ifdef UNITTESTS
#include "util-unittest-helper.h"
#include "packet.h"
/** DecodeRawtest01
* \brief Valid Raw packet

@ -271,6 +271,7 @@ int DecodeTCP(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p,
#ifdef UNITTESTS
#include "util-unittest-helper.h"
#include "packet.h"
static int TCPCalculateValidChecksumtest01(void)
{

@ -135,6 +135,7 @@ int DecodeIEEE8021ah(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p,
#ifdef UNITTESTS
#include "util-unittest-helper.h"
#include "packet.h"
/** \todo Must GRE+VLAN and Multi-Vlan packets to
* create more tests

@ -84,6 +84,7 @@ int DecodeVNTag(ThreadVars *tv, DecodeThreadVars *dtv, Packet *p, const uint8_t
#ifdef UNITTESTS
#include "util-unittest-helper.h"
#include "packet.h"
/**
* \test DecodeVNTagTest01 test if vntag header is too small.

@ -1088,6 +1088,8 @@ void DefragDestroy(void)
#ifdef UNITTESTS
#include "util-unittest-helper.h"
#include "packet.h"
#define IP_MF 0x2000
/**

@ -431,6 +431,7 @@ int DetectAppLayerEventPrepare(DetectEngineCtx *de_ctx, Signature *s)
#include "stream-tcp-private.h"
#include "stream-tcp-reassemble.h"
#include "stream-tcp.h"
#include "detect-engine-alert.h"
#define APP_LAYER_EVENT_TEST_MAP_EVENT1 0
#define APP_LAYER_EVENT_TEST_MAP_EVENT2 1

@ -422,6 +422,7 @@ SigMatch *DetectByteMathRetrieveSMVar(const char *arg, const Signature *s)
/*************************************Unittests********************************/
#ifdef UNITTESTS
#include "detect-engine-alert.h"
#include "app-layer-parser.h"

@ -740,6 +740,8 @@ void DetectContentPatternPrettyPrint(const DetectContentData *cd, char *str, siz
}
#ifdef UNITTESTS /* UNITTESTS */
#include "detect-engine-alert.h"
#include "packet.h"
static bool TestLastContent(const Signature *s, uint16_t o, uint16_t d)
{

@ -899,6 +899,9 @@ static void DetectICMPV6CsumFree(DetectEngineCtx *de_ctx, void *ptr)
#ifdef UNITTESTS
#include "util-unittest-helper.h"
#include "detect-engine.h"
#include "detect-engine-alert.h"
#include "packet.h"
#define mystr(s) #s
#define TEST1(kwstr) {\

@ -181,6 +181,7 @@ static int DetectDceStubDataSetup(DetectEngineCtx *de_ctx, Signature *s, const c
/************************************Unittests*********************************/
#ifdef UNITTESTS
#include "detect-engine-alert.h"
static int DetectDceStubDataTestParse01(void)
{

@ -273,8 +273,11 @@ static void DetectDetectionFilterFree(DetectEngineCtx *de_ctx, void *df_ptr)
#include "detect-engine.h"
#include "detect-engine-mpm.h"
#include "detect-engine-threshold.h"
#include "detect-engine-alert.h"
#include "util-time.h"
#include "util-hashlist.h"
#include "action-globals.h"
#include "packet.h"
/**
* \test DetectDetectionFilterTestParse01 is a test for a valid detection_filter options

@ -262,6 +262,7 @@ static int DetectDnsQuerySetup(DetectEngineCtx *de_ctx, Signature *s, const char
#ifdef UNITTESTS
#include "detect-isdataat.h"
#include "detect-engine-alert.h"
/** \test simple google.com query matching */
static int DetectDnsQueryTest01(void)

@ -375,6 +375,9 @@ void SigParseApplyDsizeToContent(Signature *s)
#ifdef UNITTESTS
#include "util-unittest-helper.h"
#include "detect-engine.h"
#include "detect-engine-alert.h"
#include "packet.h"
/**
* \test this is a test for a valid dsize value 1

@ -57,6 +57,7 @@ static int g_dce_stub_data_buffer_id = 0;
/**************************************Unittests*******************************/
#ifdef UNITTESTS
#include "detect-engine-alert.h"
/**
* \test Test the working of byte_test endianness.

@ -373,6 +373,7 @@ uint8_t DetectEngineInspectStream(DetectEngineCtx *de_ctx, DetectEngineThreadCtx
}
#ifdef UNITTESTS
#include "detect-engine-alert.h"
/** \test Not the first but the second occurence of "abc" should be used
* for the 2nd match */

@ -1498,6 +1498,8 @@ void DetectPortHashFree(DetectEngineCtx *de_ctx)
/*---------------------- Unittests -------------------------*/
#ifdef UNITTESTS
#include "packet.h"
/**
* \brief Do a sorted insert, where the top of the list should be the biggest
* port range.

@ -295,6 +295,7 @@ void DetectEngineStateResetTxs(Flow *f)
/*********Unittests*********/
#ifdef UNITTESTS
#include "detect-engine-alert.h"
static int DeStateTest01(void)
{

@ -365,6 +365,7 @@ static int DetectFastPatternSetup(DetectEngineCtx *de_ctx, Signature *s, const c
/*----------------------------------Unittests---------------------------------*/
#ifdef UNITTESTS
#include "detect-engine-alert.h"
static int DetectFastPatternStickySingle(const char *sticky, const int list)
{
DetectEngineCtx *de_ctx = DetectEngineCtxInit();

@ -483,6 +483,7 @@ static bool PrefilterFlowIsPrefilterable(const Signature *s)
}
#ifdef UNITTESTS
#include "detect-engine-alert.h"
/**
* \test DetectFlowTestParse01 is a test to make sure that we return "something"

@ -428,6 +428,7 @@ void DetectFlowintFree(DetectEngineCtx *de_ctx, void *tmp)
}
#ifdef UNITTESTS
#include "detect-engine-alert.h"
/**
* \brief This is a helper funtion used for debugging purposes
*/

@ -386,6 +386,7 @@ static bool PrefilterFragBitsIsPrefilterable(const Signature *s)
#ifdef UNITTESTS
#include "util-unittest-helper.h"
#include "packet.h"
/**
* \test FragBitsTestParse01 is a test for a valid fragbits value

@ -328,6 +328,8 @@ static bool PrefilterFragOffsetIsPrefilterable(const Signature *s)
#ifdef UNITTESTS
#include "util-unittest-helper.h"
#include "detect-engine.h"
#include "detect-engine-alert.h"
/**
* \test DetectFragOffsetParseTest01 is a test for setting a valid fragoffset value

@ -241,6 +241,7 @@ int DetectFtpbounceSetup(DetectEngineCtx *de_ctx, Signature *s, const char *ftpb
}
#ifdef UNITTESTS
#include "detect-engine-alert.h"
/**
* \test DetectFtpbounceTestSetup01 is a test for the Setup ftpbounce

@ -389,6 +389,7 @@ static int PrefilterMpmHttpRequestBodyRegister(DetectEngineCtx *de_ctx, SigGroup
}
#ifdef UNITTESTS
#include "detect-engine-alert.h"
#include "tests/detect-http-client-body.c"
#endif /* UNITTESTS */

@ -30,6 +30,7 @@
#include "detect-parse.h"
#include "detect-engine-prefilter-common.h"
#include "detect-engine-build.h"
#include "detect-engine-alert.h"
#include "detect-icmp-id.h"

@ -327,6 +327,9 @@ static bool PrefilterIcmpSeqIsPrefilterable(const Signature *s)
}
#ifdef UNITTESTS
#include "detect-engine.h"
#include "detect-engine-mpm.h"
#include "detect-engine-alert.h"
/**
* \test DetectIcmpSeqParseTest01 is a test for setting a valid icmp_seq value

@ -198,6 +198,7 @@ static bool PrefilterICodeIsPrefilterable(const Signature *s)
#ifdef UNITTESTS
#include "detect-engine.h"
#include "detect-engine-mpm.h"
#include "detect-engine-alert.h"
/**
* \test DetectICodeParseTest01 is a test for setting a valid icode value

@ -455,6 +455,7 @@ static void DetectIPProtoFree(DetectEngineCtx *de_ctx, void *ptr)
/* UNITTESTS */
#ifdef UNITTESTS
#include "detect-engine-alert.h"
/**
* \test DetectIPProtoTestParse01 is a test for an invalid proto number

@ -255,6 +255,9 @@ void DetectIPRepFree (DetectEngineCtx *de_ctx, void *ptr)
}
#ifdef UNITTESTS
#include "packet.h"
#include "action-globals.h"
static FILE *DetectIPRepGenerateCategoriesDummy(void)
{
FILE *fd = NULL;

@ -108,6 +108,7 @@ error:
}
#ifdef UNITTESTS
#include "detect-engine-alert.h"
/**
* \test DetectL3protoTestSig01 is a test for checking the working of ttl keyword

@ -1163,6 +1163,8 @@ static void DetectLuaFree(DetectEngineCtx *de_ctx, void *ptr)
}
#ifdef UNITTESTS
#include "detect-engine-alert.h"
/** \test http buffer */
static int LuaMatchTest01(void)
{

@ -2619,6 +2619,9 @@ void DetectSetupParseRegexes(const char *parse_str, DetectParseRegex *detect_par
*/
#ifdef UNITTESTS
#include "detect-engine-alert.h"
#include "packet.h"
static int SigParseTest01 (void)
{
int result = 1;

@ -962,6 +962,7 @@ static void DetectPcreFree(DetectEngineCtx *de_ctx, void *ptr)
}
#ifdef UNITTESTS /* UNITTESTS */
#include "detect-engine-alert.h"
static int g_file_data_buffer_id = 0;
static int g_http_header_buffer_id = 0;
static int g_dce_stub_data_buffer_id = 0;

@ -249,6 +249,7 @@ void DetectQuicCyuHashRegister(void)
#include "util-unittest.h"
#include "util-unittest-helper.h"
#include "flow-util.h"
#include "detect-engine-alert.h"
/**
* \test DetectQuicCyuHashTest01 is a test for a valid quic packet, matching

@ -205,6 +205,7 @@ void DetectQuicCyuStringRegister(void)
#include "util-unittest.h"
#include "util-unittest-helper.h"
#include "flow-util.h"
#include "detect-engine-alert.h"
/**
* \test DetectQuicCyuStringTest01 is a test for a valid quic packet, matching

@ -236,6 +236,8 @@ void DetectReplaceFreeInternal(DetectReplaceList *replist)
}
#ifdef UNITTESTS /* UNITTESTS */
#include "detect-engine-alert.h"
#include "packet.h"
/**
* \test Test packet Matches

@ -306,6 +306,7 @@ void DetectRpcFree(DetectEngineCtx *de_ctx, void *ptr)
}
#ifdef UNITTESTS
#include "detect-engine-alert.h"
/**
* \test DetectRpcTestParse01 is a test to make sure that we return "something"
* when given valid rpc opt

@ -115,6 +115,7 @@ error:
}
#ifdef UNITTESTS
#include "detect-engine-alert.h"
/* NOTE: No parameters, so no parse tests */

@ -272,6 +272,7 @@ void DetectSshVersionFree(DetectEngineCtx *de_ctx, void *ptr)
}
#ifdef UNITTESTS /* UNITTESTS */
#include "detect-engine-alert.h"
/**
* \test DetectSshVersionTestParse01 is a test to make sure that we parse

@ -261,6 +261,7 @@ static void DetectSshSoftwareVersionFree(DetectEngineCtx *de_ctx, void *ptr)
}
#ifdef UNITTESTS /* UNITTESTS */
#include "detect-engine-alert.h"
/**
* \test DetectSshSoftwareVersionTestParse01 is a test to make sure that we parse

@ -208,6 +208,7 @@ static bool PrefilterTcpAckIsPrefilterable(const Signature *s)
}
#ifdef UNITTESTS
#include "detect-engine-alert.h"
/**
* \internal
* \brief This test tests sameip success and failure.

@ -147,5 +147,6 @@ static InspectionBuffer *GetData(DetectEngineThreadCtx *det_ctx,
}
#ifdef UNITTESTS
#include "detect-engine-alert.h"
#include "tests/detect-template-buffer.c"
#endif

@ -126,6 +126,7 @@ static uint8_t DetectEngineInspectTemplateRustBuffer(DetectEngineCtx *de_ctx,
#include "detect-parse.h"
#include "flow-util.h"
#include "stream-tcp.h"
#include "detect-engine-alert.h"
static int DetectTemplateRustBufferTest(void)
{

@ -340,9 +340,11 @@ error:
#ifdef UNITTESTS
#include "detect-engine.h"
#include "detect-engine-mpm.h"
#include "detect-engine-alert.h"
#include "util-time.h"
#include "util-hashlist.h"
#include "packet.h"
#include "action-globals.h"
/**
* \test ThresholdTestParse01 is a test for a valid threshold options
*

@ -226,5 +226,6 @@ static void DetectTlsFingerprintSetupCallback(const DetectEngineCtx *de_ctx,
}
#ifdef UNITTESTS
#include "detect-engine-alert.h"
#include "tests/detect-tls-cert-fingerprint.c"
#endif

@ -238,6 +238,7 @@ bool DetectUrilenValidateContent(const Signature *s, int list, const char **sige
#include "detect-engine.h"
#include "detect-engine-mpm.h"
#include "app-layer-parser.h"
#include "detect-engine-alert.h"
/** \test Test the Urilen keyword setup */
static int DetectUrilenParseTest01(void)

@ -28,6 +28,7 @@
#ifdef UNITTESTS
#include "detect-parse.h"
#include "detect-engine.h"
#include "detect-engine-alert.h"
#include "detect-engine-address.h"
#include "detect-engine-proto.h"
#include "detect-engine-port.h"

@ -22,6 +22,7 @@
*/
#include "suricata-common.h"
#include "suricata.h"
#include "stream-tcp-private.h"
#include "stream-tcp-cache.h"

@ -43,6 +43,7 @@
#include "../app-layer-protos.h"
#include "../detect-isdataat.h"
#include "../detect-engine-build.h"
#include "../detect-engine-alert.h"
/***********************************Unittests**********************************/

@ -42,6 +42,7 @@
#include "../detect-http-header.h"
#include "../detect-http-header-common.h"
#include "../detect-engine-build.h"
#include "../detect-engine-alert.h"
#include "../detect-isdataat.h"

@ -43,6 +43,7 @@
#include "app-layer-htp.h"
#include "app-layer-protos.h"
#include "detect-engine-build.h"
#include "detect-engine-alert.h"
/**
* \test Test that the http_host content matches against a http request

@ -43,6 +43,7 @@
#include "../app-layer-protos.h"
#include "../detect-isdataat.h"
#include "../detect-engine-build.h"
#include "../detect-engine-alert.h"
/**
* \test Test that the http_method content matches against a http request

@ -40,6 +40,7 @@
#include "../detect-isdataat.h"
#include "../detect-pcre.h"
#include "../detect-engine-build.h"
#include "../detect-engine-alert.h"
#include "../stream-tcp.h"
#include "../app-layer.h"

@ -29,6 +29,7 @@
#include "../flow.h"
#include "../detect.h"
#include "../detect-engine-build.h"
#include "../detect-engine-alert.h"
/**
* \test Test parser accepting valid rules and rejecting invalid rules

@ -39,6 +39,7 @@
#include "../app-layer-htp.h"
#include "../app-layer-protos.h"
#include "../detect-engine-build.h"
#include "../detect-engine-alert.h"
static int DetectEngineHttpStatCodeTest01(void)
{

@ -39,6 +39,7 @@
#include "../app-layer-htp.h"
#include "../app-layer-protos.h"
#include "../detect-engine-build.h"
#include "../detect-engine-alert.h"
static int DetectEngineHttpStatMsgTest01(void)
{

@ -33,6 +33,7 @@
#include "../detect-isdataat.h"
#include "../detect-engine-build.h"
#include "../detect-engine-alert.h"
/** \test Test a simple uricontent option */
static int UriTestSig01(void)

@ -42,6 +42,7 @@
#include "app-layer-htp.h"
#include "app-layer-protos.h"
#include "detect-engine-build.h"
#include "detect-engine-alert.h"
static int DetectEngineHttpUATest(
const uint8_t *buf, const uint32_t buf_len, const char *sig, const bool expect)

@ -23,6 +23,7 @@
#include "flow-util.h"
#include "stream-tcp.h"
#include "detect-engine-build.h"
#include "detect-engine-alert.h"
static int DetectSNMPCommunityTest(void)
{

@ -24,6 +24,7 @@
#include "detect-engine-build.h"
#include "app-layer-parser.h"
#include "detect-engine-alert.h"
/**
* \test Test that a signature containing a tls_cert_issuer is correctly parsed

@ -23,6 +23,7 @@
*/
#include "detect-engine-build.h"
#include "detect-engine-alert.h"
#include "app-layer-parser.h"
/**

@ -23,6 +23,7 @@
*/
#include "detect-engine-build.h"
#include "detect-engine-alert.h"
#include "app-layer-parser.h"
/**

@ -23,6 +23,7 @@
*/
#include "detect-engine-build.h"
#include "detect-engine-alert.h"
#include "app-layer-parser.h"
/**

@ -23,6 +23,7 @@
*/
#include "detect-engine-build.h"
#include "detect-engine-alert.h"
#include "app-layer-parser.h"
/**

@ -18,6 +18,9 @@
#include "../util-unittest.h"
#include "../util-unittest-helper.h"
#include "detect-engine.h"
#include "detect-engine-alert.h"
#include "detect-engine-build.h"
/**
* \test DetectTtlParseTest01 is a test for setting up an valid ttl value.

@ -27,6 +27,7 @@
#include "tm-modules.h"
#include "tmqh-packetpool.h"
#include "util-conf.h"
#include "packet.h"
#include <fuzz_pcap.h>

@ -29,6 +29,7 @@
#include "tmqh-packetpool.h"
#include "util-file.h"
#include "util-conf.h"
#include "packet.h"
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);

@ -28,6 +28,7 @@
#include "tm-modules.h"
#include "tmqh-packetpool.h"
#include "util-conf.h"
#include "packet.h"
#include <fuzz_pcap.h>

@ -1405,6 +1405,7 @@ void SCACBSPrintInfo(MpmCtx *mpm_ctx)
/*************************************Unittests********************************/
#ifdef UNITTESTS
#include "detect-engine-alert.h"
static int SCACBSTest01(void)
{

@ -1480,6 +1480,7 @@ void MpmACTileRegister(void)
/*************************************Unittests********************************/
#ifdef UNITTESTS
#include "detect-engine-alert.h"
static int SCACTileTest01(void)
{

@ -1251,6 +1251,7 @@ void MpmACRegister(void)
/*************************************Unittests********************************/
#ifdef UNITTESTS
#include "detect-engine-alert.h"
static int SCACTest01(void)
{

@ -1094,6 +1094,7 @@ void MpmHSGlobalCleanup(void)
/*************************************Unittests********************************/
#ifdef UNITTESTS
#include "detect-engine-alert.h"
static int SCHSTest01(void)
{

@ -1117,6 +1117,9 @@ int SCThresholdConfParseFile(DetectEngineCtx *de_ctx, FILE *fp)
}
#ifdef UNITTESTS
#include "detect-engine-alert.h"
#include "packet.h"
#include "action-globals.h"
/**
* \brief Creates a dummy threshold file, with all valid options, for testing purposes.

@ -35,6 +35,7 @@
#include "detect.h"
#include "detect-parse.h"
#include "detect-engine.h"
#include "detect-engine-alert.h"
#include "detect-engine-sigorder.h"
#include "detect-engine-build.h"

@ -27,13 +27,8 @@
#if defined(UNITTESTS)
#include "packet.h"
#include "flow.h"
#include "stream-tcp.h"
#include "detect.h"
#include "detect-engine.h"
#include "detect-engine-alert.h"
#include "detect-engine-build.h"
#elif defined(FUZZ)
#include "packet.h"
#include "flow.h"
#endif

Loading…
Cancel
Save