diff --git a/test/fuzztest/httpcapi_fuzzer/http_capi_fuzzer.cpp b/test/fuzztest/httpcapi_fuzzer/http_capi_fuzzer.cpp index f5f7357b3ed9bc492da1f5d2be34244d7481418a..4e2be272ac0dea02cc60cb1d4fb09a78443116c0 100644 --- a/test/fuzztest/httpcapi_fuzzer/http_capi_fuzzer.cpp +++ b/test/fuzztest/httpcapi_fuzzer/http_capi_fuzzer.cpp @@ -147,7 +147,7 @@ void GetHeaderEntriesTest(const uint8_t *data, size_t size) OH_Http_DestroyHeaders(&headers); } -void Http_SampleResponseCallback(Http_Response *response, uint32_t errCode) { +void HttpSampleResponseCallback(Http_Response *response, uint32_t errCode) { if (response == nullptr) { return; } @@ -166,13 +166,13 @@ void HttpSampleOnDataReceiveCallback(const char *data, size_t length) return; } -void Http_SampleOnUploadProgressCallback(uint64_t totalSize, uint64_t transferredSize) { +void HttpSampleOnUploadProgressCallback(uint64_t totalSize, uint64_t transferredSize) { } -void Http_SampleOnDownloadProgressCallback(uint64_t totalSize, uint64_t transferredSize) { +void HttpSampleOnDownloadProgressCallback(uint64_t totalSize, uint64_t transferredSize) { } -void Http_SampleOnHeaderReceiveCallback(Http_Headers *headers) { +void HttpSampleOnHeaderReceiveCallback(Http_Headers *headers) { if (headers != nullptr) { Http_HeaderEntry *entries = OH_Http_GetHeaderEntries(headers); Http_HeaderValue *headerValue; @@ -189,9 +189,9 @@ void Http_SampleOnHeaderReceiveCallback(Http_Headers *headers) { } } -void Http_SampleOnEndCallback() { } +void HttpSampleOnEndCallback() { } -void Http_SampleOnCancelCallback() { } +void HttpSampleOnCancelCallback() { } void HttpRequestTest(const uint8_t *data, size_t size) { @@ -227,12 +227,12 @@ void HttpRequestTest(const uint8_t *data, size_t size) request->options->headers = headers; Http_EventsHandler eventsHandler; eventsHandler.onDataReceive = HttpSampleOnDataReceiveCallback; - eventsHandler.onCanceled = Http_SampleOnCancelCallback; - eventsHandler.onDataEnd = Http_SampleOnEndCallback; - eventsHandler.onDownloadProgress = Http_SampleOnDownloadProgressCallback; - eventsHandler.onUploadProgress = Http_SampleOnUploadProgressCallback; - eventsHandler.onHeadersReceive = Http_SampleOnHeaderReceiveCallback; - ret = OH_Http_Request(request, Http_SampleResponseCallback, eventsHandler); + eventsHandler.onCanceled = HttpSampleOnCancelCallback; + eventsHandler.onDataEnd = HttpSampleOnEndCallback; + eventsHandler.onDownloadProgress = HttpSampleOnDownloadProgressCallback; + eventsHandler.onUploadProgress = HttpSampleOnUploadProgressCallback; + eventsHandler.onHeadersReceive = HttpSampleOnHeaderReceiveCallback; + ret = OH_Http_Request(request, HttpSampleResponseCallback, eventsHandler); if (ret != 0) { OH_Http_DestroyHeaders(&headers); free(request->options); diff --git a/test/unittest/net_http/NetHttpTest.cpp b/test/unittest/net_http/NetHttpTest.cpp index 91a89bf8082db35bfd9f24e64b90ec9fcc4049fa..5450034ac6a1b4624f3b2976cbc77bd0bde4b735 100644 --- a/test/unittest/net_http/NetHttpTest.cpp +++ b/test/unittest/net_http/NetHttpTest.cpp @@ -46,14 +46,14 @@ namespace { using namespace std; using namespace testing::ext; -static void myCallbackFunction() +static void MyCallbackFunction() { - NETSTACK_LOGI("myCallbackFunction function called!"); + NETSTACK_LOGI("MyCallbackFunction function called!"); } -static void testResponseCallback(struct Http_Response *response, uint32_t errCode) +static void TestResponseCallback(struct Http_Response *response, uint32_t errCode) { - NETSTACK_LOGI("testResponseCallback function called!"); + NETSTACK_LOGI("TestResponseCallback function called!"); } static void TestDataReceiveCallback(const char *data, size_t length) @@ -100,7 +100,7 @@ HWTEST_F(NetHttpTest, ToLowerCase001, TestSize.Level1) } HWTEST_F(NetHttpTest, SetHeaderValue001, TestSize.Level1) -{ +{ uint32_t ret = OH_Http_SetHeaderValue(nullptr, "key", "test"); EXPECT_EQ(ret, OH_HTTP_PARAMETER_ERROR); @@ -115,7 +115,7 @@ HWTEST_F(NetHttpTest, SetHeaderValue001, TestSize.Level1) } HWTEST_F(NetHttpTest, SetHeaderValue002, TestSize.Level1) -{ +{ Http_Headers *header = OH_Http_CreateHeaders(); EXPECT_TRUE(header != nullptr); OH_Http_SetHeaderValue(header, "key1", "test1"); @@ -126,7 +126,7 @@ HWTEST_F(NetHttpTest, SetHeaderValue002, TestSize.Level1) } HWTEST_F(NetHttpTest, SetHeaderValue003, TestSize.Level1) -{ +{ Http_Headers *header = OH_Http_CreateHeaders(); EXPECT_TRUE(header != nullptr); OH_Http_SetHeaderValue(header, "key1", "test1"); @@ -137,7 +137,7 @@ HWTEST_F(NetHttpTest, SetHeaderValue003, TestSize.Level1) } HWTEST_F(NetHttpTest, SetHeaderValue004, TestSize.Level1) -{ +{ Http_Headers *header = OH_Http_CreateHeaders(); EXPECT_TRUE(header != nullptr); OH_Http_SetHeaderValue(header, "key1", "test1"); @@ -148,7 +148,7 @@ HWTEST_F(NetHttpTest, SetHeaderValue004, TestSize.Level1) } HWTEST_F(NetHttpTest, SetHeaderValue005, TestSize.Level1) -{ +{ Http_Headers *header = OH_Http_CreateHeaders(); EXPECT_TRUE(header != nullptr); @@ -160,7 +160,7 @@ HWTEST_F(NetHttpTest, SetHeaderValue005, TestSize.Level1) } HWTEST_F(NetHttpTest, GetHeaderValue001, TestSize.Level1) -{ +{ Http_Headers *header = OH_Http_CreateHeaders(); EXPECT_TRUE(header != nullptr); header->fields = nullptr; @@ -170,7 +170,7 @@ HWTEST_F(NetHttpTest, GetHeaderValue001, TestSize.Level1) } HWTEST_F(NetHttpTest, GetHeaderValue002, TestSize.Level1) -{ +{ Http_HeaderValue *value = OH_Http_GetHeaderValue(nullptr, "key"); EXPECT_EQ(value, nullptr); @@ -182,7 +182,7 @@ HWTEST_F(NetHttpTest, GetHeaderValue002, TestSize.Level1) } HWTEST_F(NetHttpTest, GetHeaderValue003, TestSize.Level1) -{ +{ Http_Headers *header = OH_Http_CreateHeaders(); EXPECT_TRUE(header != nullptr); OH_Http_SetHeaderValue(header, "key1", "test1"); @@ -192,7 +192,7 @@ HWTEST_F(NetHttpTest, GetHeaderValue003, TestSize.Level1) } HWTEST_F(NetHttpTest, GetHeaderEntries001, TestSize.Level1) -{ +{ EXPECT_EQ(OH_Http_GetHeaderEntries(nullptr), nullptr); Http_Headers *header = OH_Http_CreateHeaders(); @@ -203,7 +203,7 @@ HWTEST_F(NetHttpTest, GetHeaderEntries001, TestSize.Level1) } HWTEST_F(NetHttpTest, GetHeaderEntries002, TestSize.Level1) -{ +{ Http_Headers *header = OH_Http_CreateHeaders(); EXPECT_TRUE(header != nullptr); header->fields->capacity = MAX_MAP_CAPACITY + 1; @@ -212,7 +212,7 @@ HWTEST_F(NetHttpTest, GetHeaderEntries002, TestSize.Level1) } HWTEST_F(NetHttpTest, GetHeaderEntries003, TestSize.Level1) -{ +{ Http_Headers *header = OH_Http_CreateHeaders(); EXPECT_TRUE(header != nullptr); OH_Http_SetHeaderValue(header, "a", "test1"); @@ -226,7 +226,7 @@ HWTEST_F(NetHttpTest, GetHeaderEntries003, TestSize.Level1) } HWTEST_F(NetHttpTest, CreateRequest001, TestSize.Level1) -{ +{ EXPECT_EQ(OH_Http_CreateRequest(nullptr), nullptr); const char *url = "https://www.baidu.com"; @@ -234,10 +234,10 @@ HWTEST_F(NetHttpTest, CreateRequest001, TestSize.Level1) } HWTEST_F(NetHttpTest, SetOption001, TestSize.Level1) -{ +{ Http_Request *request = OH_Http_CreateRequest("https://www.baidu.com"); request->options = (Http_RequestOptions *)calloc(1, sizeof(Http_RequestOptions)); - Http_ResponseCallback callback = testResponseCallback; + Http_ResponseCallback callback = TestResponseCallback; Http_EventsHandler handler; request->options->method = "GET"; @@ -251,7 +251,7 @@ HWTEST_F(NetHttpTest, SetOption002, TestSize.Level1) { Http_Request *request = OH_Http_CreateRequest("https://www.baidu.com"); request->options = (Http_RequestOptions *)calloc(1, sizeof(Http_RequestOptions)); - Http_ResponseCallback callback = testResponseCallback; + Http_ResponseCallback callback = TestResponseCallback; Http_EventsHandler handler; request->options->priority = -1; @@ -288,7 +288,7 @@ HWTEST_F(NetHttpTest, SetOption002, TestSize.Level1) HWTEST_F(NetHttpTest, SetOption003, TestSize.Level1) { Http_Request *request = OH_Http_CreateRequest("https://www.baidu.com"); - Http_ResponseCallback callback = testResponseCallback; + Http_ResponseCallback callback = TestResponseCallback; Http_EventsHandler handler; request->options = (Http_RequestOptions *)calloc(1, sizeof(Http_RequestOptions)); @@ -340,7 +340,7 @@ HWTEST_F(NetHttpTest, SetOtherOption001, TestSize.Level1) { Http_Request *request = OH_Http_CreateRequest("https://www.baidu.com"); request->options = (Http_RequestOptions *)calloc(1, sizeof(Http_RequestOptions)); - Http_ResponseCallback callback = testResponseCallback; + Http_ResponseCallback callback = TestResponseCallback; Http_EventsHandler handler; int ret = OH_Http_Request(request, callback, handler); EXPECT_EQ(ret, 0); @@ -391,8 +391,8 @@ HWTEST_F(NetHttpTest, SetOtherOption001, TestSize.Level1) } HWTEST_F(NetHttpTest, HttpRequest001, TestSize.Level1) -{ - Http_ResponseCallback callback = testResponseCallback; +{ + Http_ResponseCallback callback = TestResponseCallback; Http_Request *request = OH_Http_CreateRequest("https://www.baidu.com"); Http_EventsHandler handler; EXPECT_EQ(OH_Http_Request(nullptr, callback, handler), HTTP_OUT_OF_MEMORY); @@ -401,8 +401,8 @@ HWTEST_F(NetHttpTest, HttpRequest001, TestSize.Level1) } HWTEST_F(NetHttpTest, HttpRequest002, TestSize.Level1) -{ - Http_ResponseCallback callback = testResponseCallback; +{ + Http_ResponseCallback callback = TestResponseCallback; Http_Request *req = OH_Http_CreateRequest("https://www.baidu.com"); req->options = (Http_RequestOptions *)calloc(1, sizeof(Http_RequestOptions)); req->options->httpProtocol = Http_HttpProtocol::OH_HTTP1_1; @@ -412,14 +412,14 @@ HWTEST_F(NetHttpTest, HttpRequest002, TestSize.Level1) } HWTEST_F(NetHttpTest, HttpDestroy001, TestSize.Level1) -{ +{ OH_Http_Destroy(nullptr); Http_Request *req = OH_Http_CreateRequest("https://www.baidu.com"); EXPECT_TRUE(req != nullptr); OH_Http_Destroy(&req); - Http_ResponseCallback callback = testResponseCallback; + Http_ResponseCallback callback = TestResponseCallback; Http_EventsHandler handler; req = OH_Http_CreateRequest("https://www.baidu.com"); EXPECT_TRUE(req != nullptr); @@ -438,7 +438,7 @@ HWTEST_F(NetHttpTest, RequestOnSuccess001, TestSize.Level1) Http_Request *req = OH_Http_CreateRequest("https://www.baidu.com"); EXPECT_TRUE(req != nullptr); - Http_ResponseCallback callback = testResponseCallback; + Http_ResponseCallback callback = TestResponseCallback; Http_EventsHandler handler; OH_Http_Request(req, callback, handler); OH_Http_Destroy(&req); @@ -449,9 +449,9 @@ HWTEST_F(NetHttpTest, RequestOnSuccess002, TestSize.Level1) Http_Request *request = OH_Http_CreateRequest("https://www.baidu.com"); EXPECT_TRUE(request != nullptr); - Http_ResponseCallback callback = testResponseCallback; + Http_ResponseCallback callback = TestResponseCallback; Http_EventsHandler handler; - Http_OnVoidCallback onDataEndCallback = myCallbackFunction; + Http_OnVoidCallback onDataEndCallback = MyCallbackFunction; handler.onDataEnd = onDataEndCallback; OH_Http_Request(request, callback, handler); OH_Http_Destroy(&request); @@ -462,7 +462,7 @@ HWTEST_F(NetHttpTest, RequestOnCancel001, TestSize.Level1) Http_Request *request = OH_Http_CreateRequest("https://www.baidu.com"); EXPECT_TRUE(request != nullptr); - Http_ResponseCallback callback = testResponseCallback; + Http_ResponseCallback callback = TestResponseCallback; Http_EventsHandler handler; OH_Http_Request(request, callback, handler); OH_Http_Destroy(&request); @@ -473,9 +473,9 @@ HWTEST_F(NetHttpTest, RequestOnCancel002, TestSize.Level1) Http_Request *request = OH_Http_CreateRequest("https://www.baidu.com"); EXPECT_TRUE(request != nullptr); - Http_ResponseCallback callback = testResponseCallback; + Http_ResponseCallback callback = TestResponseCallback; Http_EventsHandler handler; - Http_OnVoidCallback onDataEndCallback = myCallbackFunction; + Http_OnVoidCallback onDataEndCallback = MyCallbackFunction; handler.onCanceled = onDataEndCallback; OH_Http_Request(request, callback, handler); OH_Http_Destroy(&request); @@ -486,9 +486,9 @@ HWTEST_F(NetHttpTest, RequestOnFail001, TestSize.Level1) Http_Request *request = OH_Http_CreateRequest("https://www.baidu.com"); EXPECT_TRUE(request != nullptr); - Http_ResponseCallback callback = testResponseCallback; + Http_ResponseCallback callback = TestResponseCallback; Http_EventsHandler handler; - Http_OnVoidCallback onDataEndCallback = myCallbackFunction; + Http_OnVoidCallback onDataEndCallback = MyCallbackFunction; handler.onDataEnd = onDataEndCallback; OH_Http_Request(request, callback, handler); OH_Http_Destroy(&request); @@ -499,10 +499,10 @@ HWTEST_F(NetHttpTest, RequestOnDataReceive001, TestSize.Level1) Http_Request *request = OH_Http_CreateRequest("https://www.baidu.com"); EXPECT_TRUE(request != nullptr); - Http_ResponseCallback callback = testResponseCallback; + Http_ResponseCallback callback = TestResponseCallback; Http_EventsHandler handler; Http_OnDataReceiveCallback onDataReceiveCallback = TestDataReceiveCallback; - handler.onDataReceive = onDataReceiveCallback; + handler.onDataReceive = onDataReceiveCallback; OH_Http_Request(request, callback, handler); OH_Http_Destroy(&request); } @@ -512,10 +512,10 @@ HWTEST_F(NetHttpTest, RequestOnHeadersReceive001, TestSize.Level1) Http_Request *request = OH_Http_CreateRequest("https://www.baidu.com"); Http_EventsHandler handler; - Http_ResponseCallback callback = testResponseCallback; + Http_ResponseCallback callback = TestResponseCallback; Http_OnHeaderReceiveCallback onHeaderReceiveCallback = testHeaderReceiveCallback; handler.onHeadersReceive = onHeaderReceiveCallback; - OH_Http_Request(request, callback, handler); + OH_Http_Request(request, callback, handler); OH_Http_Destroy(&request); } } \ No newline at end of file diff --git a/test/unittest/net_http/NetStackHashMapTest.cpp b/test/unittest/net_http/NetStackHashMapTest.cpp index 0c7cf6da5a2a53f9765e3920835c657aec9862ca..f293f4304e587745580211a9df29a052634be6a7 100644 --- a/test/unittest/net_http/NetStackHashMapTest.cpp +++ b/test/unittest/net_http/NetStackHashMapTest.cpp @@ -259,8 +259,8 @@ HWTEST_F(NetstackHashMapTest, NetstackDestroyMapWithValueTest002, TestSize.Level Netstack_DestroyMapWithValue(map, SimpleDestoryStub); } - HWTEST_F(NetstackHashMapTest, NetstackCreateMapIteratorTest001, TestSize.Level1) - { +HWTEST_F(NetstackHashMapTest, NetstackCreateMapIteratorTest001, TestSize.Level1) +{ Netstack_HashMap *map = CreateMap(); map->capacity = MAX_MAP_CAPACITY + 1; Netstack_MapIterator *iterator = Netstack_CreateMapIterator(map);