From 31a441e814b091273cb1f23eb10536bbe24f4ef7 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 10 Jan 2021 01:26:17 +0100
Subject: [PATCH] Use separate test cases for wxWebRequest auth tests

This allows to easily run both auth tests at once without all the other
tests and it's not like we reuse much (or actually anything) by having
them as sections in the same test case anyhow.

This commit is best viewed ignoring whitespace-only changes.
---
 tests/net/webrequest.cpp | 108 +++++++++++++++++++++------------------
 1 file changed, 59 insertions(+), 49 deletions(-)

diff --git a/tests/net/webrequest.cpp b/tests/net/webrequest.cpp
index 7356789d46..a64597464b 100644
--- a/tests/net/webrequest.cpp
+++ b/tests/net/webrequest.cpp
@@ -192,63 +192,73 @@ TEST_CASE_METHOD(RequestFixture, "WebRequest", "[net][webrequest]")
         request.SetMethod("PUT");
         Run();
     }
+}
 
-    SECTION("Server auth BASIC")
+TEST_CASE_METHOD(RequestFixture,
+                 "WebRequest::Auth::Basic",
+                 "[net][webrequest][auth]")
+{
+    if ( !InitBaseURL() )
+        return;
+
+    if ( UsingNSURLSession() )
     {
-        if ( UsingNSURLSession() )
-        {
-            WARN("NSURLSession backend doesn't support authentication, skipping.");
-            return;
-        }
-
-        Create("/basic-auth/wxtest/wxwidgets");
-        Run(wxWebRequest::State_Unauthorized, 401);
-        REQUIRE( request.GetAuthChallenge().IsOk() );
-
-        SECTION("Good password")
-        {
-            UseCredentials("wxtest", "wxwidgets");
-            loop.Run();
-            CHECK( request.GetResponse().GetStatus() == 200 );
-            CHECK( request.GetState() == wxWebRequest::State_Completed );
-        }
-
-        SECTION("Bad password")
-        {
-            UseCredentials("wxtest", "foobar");
-            loop.Run();
-            CHECK( request.GetResponse().GetStatus() == 401 );
-            CHECK( request.GetState() == wxWebRequest::State_Unauthorized );
-        }
+        WARN("NSURLSession backend doesn't support authentication, skipping.");
+        return;
     }
 
-    SECTION("Server auth DIGEST")
+    Create("/basic-auth/wxtest/wxwidgets");
+    Run(wxWebRequest::State_Unauthorized, 401);
+    REQUIRE( request.GetAuthChallenge().IsOk() );
+
+    SECTION("Good password")
     {
-        if ( UsingNSURLSession() )
-        {
-            WARN("NSURLSession backend doesn't support authentication, skipping.");
-            return;
-        }
+        UseCredentials("wxtest", "wxwidgets");
+        loop.Run();
+        CHECK( request.GetResponse().GetStatus() == 200 );
+        CHECK( request.GetState() == wxWebRequest::State_Completed );
+    }
 
-        Create("/digest-auth/auth/wxtest/wxwidgets");
-        Run(wxWebRequest::State_Unauthorized, 401);
-        REQUIRE( request.GetAuthChallenge().IsOk() );
+    SECTION("Bad password")
+    {
+        UseCredentials("wxtest", "foobar");
+        loop.Run();
+        CHECK( request.GetResponse().GetStatus() == 401 );
+        CHECK( request.GetState() == wxWebRequest::State_Unauthorized );
+    }
+}
 
-        SECTION("Good password")
-        {
-            UseCredentials("wxtest", "wxwidgets");
-            loop.Run();
-            CHECK( request.GetResponse().GetStatus() == 200 );
-            CHECK( request.GetState() == wxWebRequest::State_Completed );
-        }
+TEST_CASE_METHOD(RequestFixture,
+                 "WebRequest::Auth::Digest",
+                 "[net][webrequest][auth]")
+{
+    if ( !InitBaseURL() )
+        return;
 
-        SECTION("Bad password")
-        {
-            UseCredentials("foo", "bar");
-            loop.Run();
-            CHECK( request.GetResponse().GetStatus() == 401 );
-            CHECK( request.GetState() == wxWebRequest::State_Unauthorized );
-        }
+    if ( UsingNSURLSession() )
+    {
+        WARN("NSURLSession backend doesn't support authentication, skipping.");
+        return;
+    }
+
+    Create("/digest-auth/auth/wxtest/wxwidgets");
+    Run(wxWebRequest::State_Unauthorized, 401);
+    REQUIRE( request.GetAuthChallenge().IsOk() );
+
+    SECTION("Good password")
+    {
+        UseCredentials("wxtest", "wxwidgets");
+        loop.Run();
+        CHECK( request.GetResponse().GetStatus() == 200 );
+        CHECK( request.GetState() == wxWebRequest::State_Completed );
+    }
+
+    SECTION("Bad password")
+    {
+        UseCredentials("foo", "bar");
+        loop.Run();
+        CHECK( request.GetResponse().GetStatus() == 401 );
+        CHECK( request.GetState() == wxWebRequest::State_Unauthorized );
     }
 }