Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use CHECK() when REQUIRE() is not needed in wxWebRequest tests

Browse Source 
Continue performing the other checks unless we really can't do it.
This commit is contained in:
Vadim Zeitlin
2021-01-15 15:42:12 +01:00
parent 1e8fe318ed
commit af160f3d3e
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/net/webrequest.cpp
View File

@@ -73,7 +73,7 @@ public:
if ( request.GetStorage() == wxWebRequest::Storage_File ) if ( request.GetStorage() == wxWebRequest::Storage_File )
{ {
wxFileName fn(evt.GetDataFile()); wxFileName fn(evt.GetDataFile());
REQUIRE( fn.GetSize() == expectedFileSize ); CHECK( fn.GetSize() == expectedFileSize );
} }
wxFALLTHROUGH; wxFALLTHROUGH;
case wxWebRequest::State_Failed: case wxWebRequest::State_Failed:
@@ -114,7 +114,7 @@ public:
RunLoopWithTimeout(); RunLoopWithTimeout();
REQUIRE( request.GetState() == requiredState ); REQUIRE( request.GetState() == requiredState );
if (requiredStatus) if (requiredStatus)
REQUIRE( request.GetResponse().GetStatus() == requiredStatus ); CHECK( request.GetResponse().GetStatus() == requiredStatus );
} }
// Precondition: we must have an auth challenge. // Precondition: we must have an auth challenge.
@@ -139,9 +139,9 @@ TEST_CASE_METHOD(RequestFixture,
Create("/bytes/65536"); Create("/bytes/65536");
Run(); Run();
REQUIRE( request.GetResponse().GetContentLength() == 65536 ); CHECK( request.GetResponse().GetContentLength() == 65536 );
REQUIRE( request.GetBytesExpectedToReceive() == 65536 ); CHECK( request.GetBytesExpectedToReceive() == 65536 );
REQUIRE( request.GetBytesReceived() == 65536 ); CHECK( request.GetBytesReceived() == 65536 );
} }
TEST_CASE_METHOD(RequestFixture, TEST_CASE_METHOD(RequestFixture,
@@ -152,7 +152,7 @@ TEST_CASE_METHOD(RequestFixture,
Create("/base64/VGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIHRoZSBsYXp5IGRvZw=="); Create("/base64/VGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIHRoZSBsYXp5IGRvZw==");
Run(); Run();
REQUIRE( request.GetResponse().AsString() == "The quick brown fox jumps over the lazy dog" ); CHECK( request.GetResponse().AsString() == "The quick brown fox jumps over the lazy dog" );
} }
TEST_CASE_METHOD(RequestFixture, TEST_CASE_METHOD(RequestFixture,
@@ -165,7 +165,7 @@ TEST_CASE_METHOD(RequestFixture,
Create(wxString::Format("/bytes/%lld", expectedFileSize)); Create(wxString::Format("/bytes/%lld", expectedFileSize));
request.SetStorage(wxWebRequest::Storage_File); request.SetStorage(wxWebRequest::Storage_File);
Run(); Run();
REQUIRE( request.GetBytesReceived() == expectedFileSize ); CHECK( request.GetBytesReceived() == expectedFileSize );
} }
TEST_CASE_METHOD(RequestFixture, TEST_CASE_METHOD(RequestFixture,
@@ -178,8 +178,8 @@ TEST_CASE_METHOD(RequestFixture,
Create(wxString::Format("/bytes/%d", processingSize)); Create(wxString::Format("/bytes/%d", processingSize));
request.SetStorage(wxWebRequest::Storage_None); request.SetStorage(wxWebRequest::Storage_None);
Run(); Run();
REQUIRE( request.GetBytesReceived() == processingSize ); CHECK( request.GetBytesReceived() == processingSize );
REQUIRE( dataSize == processingSize ); CHECK( dataSize == processingSize );
} }
TEST_CASE_METHOD(RequestFixture, TEST_CASE_METHOD(RequestFixture,
@@ -364,9 +364,9 @@ TEST_CASE("WebRequestUtils", "[net][webrequest]")
wxString header = "multipart/mixed; boundary=\"MIME_boundary_01234567\""; wxString header = "multipart/mixed; boundary=\"MIME_boundary_01234567\"";
value = wxPrivate::SplitParameters(header, params); value = wxPrivate::SplitParameters(header, params);
REQUIRE( value == "multipart/mixed" ); CHECK( value == "multipart/mixed" );
REQUIRE( params.size() == 1 ); CHECK( params.size() == 1 );
REQUIRE( params["boundary"] == "MIME_boundary_01234567" ); CHECK( params["boundary"] == "MIME_boundary_01234567" );
} }
#endif // wxUSE_WEBREQUEST #endif // wxUSE_WEBREQUEST