Google Git
Sign in
webrtc/src/fb50fe58df^!/.
commit
fb50fe58df4081b00628792203ab5291dd8d139c
[log]
author
Philipp Hancke <philipp.hancke@googlemail.com>
Wed Apr 08 16:31:08 2026
committer
WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com>
Fri Apr 10 06:04:14 2026
tree
3c859c6041a5b85319e9138636e0cc883e52efa0
parent
ada44ae73fe09696e40f3b0296bcc2b3036ba393 [diff]
Modernize test style

using assignment directly for smart pointers and a simpler WaitUntil
to wait until a data channel opens

Bug: None
Change-Id: I90d591210729bafb139b9bef12b887dbd7b21a71
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/462240
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Commit-Queue: Philipp Hancke <philipp.hancke@googlemail.com>
Cr-Commit-Position: refs/heads/main@{#47376}

diff --git a/pc/peer_connection_end_to_end_unittest.cc b/pc/peer_connection_end_to_end_unittest.cc
index cf2aa60..4843ef9 100644
--- a/pc/peer_connection_end_to_end_unittest.cc
+++ b/pc/peer_connection_end_to_end_unittest.cc

@@ -440,10 +440,10 @@
             MockAudioDecoderFactory::CreateEmptyFactory());
 
   DataChannelInit init;
-  scoped_refptr<DataChannelInterface> caller_dc(
-      caller_->CreateDataChannel("data", init));
-  scoped_refptr<DataChannelInterface> callee_dc(
-      callee_->CreateDataChannel("data", init));
+  scoped_refptr<DataChannelInterface> caller_dc =
+      caller_->CreateDataChannel("data", init);
+  scoped_refptr<DataChannelInterface> callee_dc =
+      callee_->CreateDataChannel("data", init);
 
   Negotiate();
   WaitForConnection();
@@ -469,8 +469,8 @@
   DataChannelInit init;
 
   // This DataChannel is for creating the data content in the negotiation.
-  scoped_refptr<DataChannelInterface> dummy(
-      caller_->CreateDataChannel("data", init));
+  scoped_refptr<DataChannelInterface> dummy =
+      caller_->CreateDataChannel("data", init);
   Negotiate();
   WaitForConnection();
 
@@ -478,10 +478,10 @@
   WaitForDataChannelsToOpen(dummy.get(), callee_signaled_data_channels_, 0);
 
   // Create new DataChannels after the negotiation and verify their states.
-  scoped_refptr<DataChannelInterface> caller_dc(
-      caller_->CreateDataChannel("hello", init));
-  scoped_refptr<DataChannelInterface> callee_dc(
-      callee_->CreateDataChannel("hello", init));
+  scoped_refptr<DataChannelInterface> caller_dc =
+      caller_->CreateDataChannel("hello", init);
+  scoped_refptr<DataChannelInterface> callee_dc =
+      callee_->CreateDataChannel("hello", init);
 
   WaitForDataChannelsToOpen(caller_dc.get(), callee_signaled_data_channels_, 1);
   WaitForDataChannelsToOpen(callee_dc.get(), caller_signaled_data_channels_, 0);
@@ -503,8 +503,8 @@
   DataChannelInit init;
 
   // This DataChannel is for creating the data content in the negotiation.
-  scoped_refptr<DataChannelInterface> dummy(
-      caller_->CreateDataChannel("data", init));
+  scoped_refptr<DataChannelInterface> dummy =
+      caller_->CreateDataChannel("data", init);
   Negotiate();
   WaitForConnection();
 
@@ -512,10 +512,10 @@
   WaitForDataChannelsToOpen(dummy.get(), callee_signaled_data_channels_, 0);
 
   // Create new DataChannels after the negotiation and verify their states.
-  scoped_refptr<DataChannelInterface> caller_dc(
-      caller_->CreateDataChannel("hello", init));
-  scoped_refptr<DataChannelInterface> callee_dc(
-      callee_->CreateDataChannel("hello", init));
+  scoped_refptr<DataChannelInterface> caller_dc =
+      caller_->CreateDataChannel("hello", init);
+  scoped_refptr<DataChannelInterface> callee_dc =
+      callee_->CreateDataChannel("hello", init);
 
   WaitForDataChannelsToOpen(caller_dc.get(), callee_signaled_data_channels_, 1);
   WaitForDataChannelsToOpen(callee_dc.get(), caller_signaled_data_channels_, 0);
@@ -535,43 +535,34 @@
             MockAudioDecoderFactory::CreateEmptyFactory());
 
   DataChannelInit init;
-  scoped_refptr<DataChannelInterface> caller_dc_1(
-      caller_->CreateDataChannel("data", init));
-  scoped_refptr<DataChannelInterface> callee_dc_1(
-      callee_->CreateDataChannel("data", init));
+  scoped_refptr<DataChannelInterface> caller_dc_1 =
+      caller_->CreateDataChannel("data", init);
+  scoped_refptr<DataChannelInterface> callee_dc_1 =
+      callee_->CreateDataChannel("data", init);
 
   MockDataChannelObserver caller_dc_1_observer(caller_dc_1.get());
   MockDataChannelObserver callee_dc_1_observer(callee_dc_1.get());
 
   Negotiate();
   WaitForConnection();
-
-  EXPECT_THAT(
-      WaitUntil([&] { return caller_dc_1_observer.IsOpen(); }, IsTrue()),
-      IsRtcOk());
-  EXPECT_THAT(
-      WaitUntil([&] { return callee_dc_1_observer.IsOpen(); }, IsTrue()),
-      IsRtcOk());
+  EXPECT_TRUE(WaitUntil([&] { return caller_dc_1_observer.IsOpen(); }));
+  EXPECT_TRUE(WaitUntil([&] { return callee_dc_1_observer.IsOpen(); }));
 
   EXPECT_NE(-1, caller_dc_1->id());
   EXPECT_NE(-1, callee_dc_1->id());
   EXPECT_EQ(1, caller_dc_1->id() % 2);
   EXPECT_EQ(0, callee_dc_1->id() % 2);
 
-  scoped_refptr<DataChannelInterface> caller_dc_2(
-      caller_->CreateDataChannel("data", init));
-  scoped_refptr<DataChannelInterface> callee_dc_2(
-      callee_->CreateDataChannel("data", init));
+  scoped_refptr<DataChannelInterface> caller_dc_2 =
+      caller_->CreateDataChannel("data", init);
+  scoped_refptr<DataChannelInterface> callee_dc_2 =
+      callee_->CreateDataChannel("data", init);
 
   MockDataChannelObserver caller_dc_2_observer(caller_dc_2.get());
   MockDataChannelObserver callee_dc_2_observer(callee_dc_2.get());
 
-  EXPECT_THAT(
-      WaitUntil([&] { return caller_dc_2_observer.IsOpen(); }, IsTrue()),
-      IsRtcOk());
-  EXPECT_THAT(
-      WaitUntil([&] { return callee_dc_2_observer.IsOpen(); }, IsTrue()),
-      IsRtcOk());
+  EXPECT_TRUE(WaitUntil([&] { return caller_dc_2_observer.IsOpen(); }));
+  EXPECT_TRUE(WaitUntil([&] { return callee_dc_2_observer.IsOpen(); }));
 
   EXPECT_NE(-1, caller_dc_2->id());
   EXPECT_NE(-1, callee_dc_2->id());
@@ -588,10 +579,10 @@
 
   DataChannelInit init;
 
-  scoped_refptr<DataChannelInterface> caller_dc_1(
-      caller_->CreateDataChannel("data", init));
-  scoped_refptr<DataChannelInterface> caller_dc_2(
-      caller_->CreateDataChannel("data", init));
+  scoped_refptr<DataChannelInterface> caller_dc_1 =
+      caller_->CreateDataChannel("data", init);
+  scoped_refptr<DataChannelInterface> caller_dc_2 =
+      caller_->CreateDataChannel("data", init);
 
   Negotiate();
   WaitForConnection();
@@ -635,8 +626,8 @@
             MockAudioDecoderFactory::CreateEmptyFactory());
 
   DataChannelInit init;
-  scoped_refptr<DataChannelInterface> caller_dc(
-      caller_->CreateDataChannel("data", init));
+  scoped_refptr<DataChannelInterface> caller_dc =
+      caller_->CreateDataChannel("data", init);
 
   Negotiate();
   WaitForConnection();
@@ -673,8 +664,8 @@
             MockAudioDecoderFactory::CreateEmptyFactory());
 
   DataChannelInit init;
-  scoped_refptr<DataChannelInterface> caller_dc(
-      caller_->CreateDataChannel("data", init));
+  scoped_refptr<DataChannelInterface> caller_dc =
+      caller_->CreateDataChannel("data", init);
 
   Negotiate();
   WaitForConnection();
@@ -705,8 +696,8 @@
   // Add datachannels that will be assigned 0, 2 and 4 or 1, 3 and 5
   // depending on DTLS role.
   for (int i = 0; i <= kReducedMaxSctpStreams / 2; i++) {
-    scoped_refptr<DataChannelInterface> caller_dc(
-        caller_->CreateDataChannel("data", init));
+    scoped_refptr<DataChannelInterface> caller_dc =
+        caller_->CreateDataChannel("data", init);
     channels.push_back(std::move(caller_dc));
   }
   Negotiate();
@@ -740,8 +731,8 @@
             MockAudioDecoderFactory::CreateEmptyFactory());
 
   DataChannelInit init;
-  scoped_refptr<DataChannelInterface> caller_dc(
-      caller_->CreateDataChannel("caller", init));
+  scoped_refptr<DataChannelInterface> caller_dc =
+      caller_->CreateDataChannel("caller", init);
   MockDataChannelObserver caller_dc_observer(caller_dc.get());
 
   Negotiate();
@@ -749,17 +740,16 @@
 
   EXPECT_TRUE(WaitUntil([&] { return caller_dc_observer.IsOpen(); }));
 
-  // Attempting to send a message larger than our announced max-message-size
-  // should fail.
+  // Attempting to send a message larger than our announced
+  // max-message-size should fail.
   DataBuffer buffer(CopyOnWriteBuffer(kSctpSendBufferSize + 64),
                     /*binary=*/true);
   EXPECT_FALSE(caller_dc->Send(buffer));
 
-  scoped_refptr<DataChannelInterface> callee_dc(
-      callee_->CreateDataChannel("callee", init));
+  scoped_refptr<DataChannelInterface> callee_dc =
+      callee_->CreateDataChannel("callee", init);
   MockDataChannelObserver callee_dc_observer(callee_dc.get());
-  EXPECT_THAT(WaitUntil([&] { return caller_dc_observer.IsOpen(); }, IsTrue()),
-              IsRtcOk());
+  EXPECT_TRUE(WaitUntil([&] { return caller_dc_observer.IsOpen(); }));
   EXPECT_FALSE(callee_dc->Send(buffer));
 }