@@ -180,16 +180,16 @@ class SimpleHttpServer : public Thread
180180class WebInputStreamTests : public ::testing::Test
181181{
182182protected:
183- void SetUp () override
183+ static void SetUpTestSuite ()
184184 {
185185 server = std::make_unique<SimpleHttpServer>();
186- ASSERT_TRUE (server->start ()) << " Failed to start test HTTP server" ;
186+ ASSERT_TRUE (server != nullptr && server ->start ()) << " Failed to start test HTTP server" ;
187187
188188 while (! server->isThreadRunning ())
189189 Thread::sleep (10 );
190190 }
191191
192- void TearDown () override
192+ static void TearDownTestSuite ()
193193 {
194194 server.reset ();
195195 }
@@ -199,9 +199,11 @@ class WebInputStreamTests : public ::testing::Test
199199 return yup_isRunningUnderDebugger () ? -1 : 5000 ;
200200 }
201201
202- std::unique_ptr<SimpleHttpServer> server;
202+ static std::unique_ptr<SimpleHttpServer> server;
203203};
204204
205+ std::unique_ptr<SimpleHttpServer> WebInputStreamTests::server;
206+
205207TEST_F (WebInputStreamTests, CanReadHtmlContent)
206208{
207209 URL url (server->getBaseUrl ());
@@ -385,10 +387,6 @@ TEST_F (WebInputStreamTests, MultipleReadsWork)
385387 String content2 (buffer2, bytesRead2);
386388 EXPECT_NE (content1, content2);
387389 }
388- else
389- {
390- FAIL ();
391- }
392390}
393391
394392TEST_F (WebInputStreamTests, LargeContentHandling)
@@ -404,7 +402,7 @@ TEST_F (WebInputStreamTests, LargeContentHandling)
404402 EXPECT_TRUE (content.contains (" This is line 999" ));
405403}
406404
407- TEST_F (WebInputStreamTests, DISABLED_SlowResponseHandling )
405+ TEST_F (WebInputStreamTests, SlowResponseHandling )
408406{
409407 URL url (server->getBaseUrl () + " /slow" );
410408
0 commit comments