--no-edit

Author: stephen-derosa

client-sdk-rust

@@ -114,7 +114,7 @@ void DataTrackStream::onFfiEvent(const FfiEvent& event) {
     pushFrame(std::move(frame));
   } else if (dts.has_eos()) {
     std::optional<SubscribeDataTrackError> error;
-    const auto &eos = dts.eos();
+    const auto& eos = dts.eos();
     if (eos.has_error()) {
       error = SubscribeDataTrackError::fromProto(eos.error());
     }

src/data_track_stream.cpp

@@ -17,12 +17,12 @@
 #include <gtest/gtest.h>
 #include <livekit/data_track_stream.h>
 
-#include "data_track.pb.h"
-#include "ffi.pb.h"
-
 #include <memory>
 #include <optional>
 
+#include "data_track.pb.h"
+#include "ffi.pb.h"
+
 namespace livekit {
 
 class DataTrackStreamTest : public ::testing::Test {
@@ -31,19 +31,16 @@ class DataTrackStreamTest : public ::testing::Test {
     return std::unique_ptr<DataTrackStream>(new DataTrackStream());
   }
 
-  static void pushEvent(DataTrackStream &stream, const proto::FfiEvent &event) {
-    stream.onFfiEvent(event);
-  }
+  static void pushEvent(DataTrackStream& stream, const proto::FfiEvent& event) { stream.onFfiEvent(event); }
 
-  static proto::FfiEvent makeEosEvent(
-      std::optional<proto::SubscribeDataTrackErrorCode> code = std::nullopt,
-      const std::string &message = {}) {
+  static proto::FfiEvent makeEosEvent(std::optional<proto::SubscribeDataTrackErrorCode> code = std::nullopt,
+                                      const std::string& message = {}) {
     proto::FfiEvent event;
-    auto *stream_event = event.mutable_data_track_stream_event();
+    auto* stream_event = event.mutable_data_track_stream_event();
     stream_event->set_stream_handle(0);
-    auto *eos = stream_event->mutable_eos();
+    auto* eos = stream_event->mutable_eos();
     if (code.has_value()) {
-      auto *error = eos->mutable_error();
+      auto* error = eos->mutable_error();
       error->set_code(code.value());
       error->set_message(message);
     }
@@ -56,9 +53,8 @@ class DataTrackStreamTest : public ::testing::Test {
     return event;
   }
 
-  static void expectTerminalError(const DataTrackStream &stream,
-                                  SubscribeDataTrackErrorCode expected_code,
-                                  const std::string &expected_message) {
+  static void expectTerminalError(const DataTrackStream& stream, SubscribeDataTrackErrorCode expected_code,
+                                  const std::string& expected_message) {
     const auto error = stream.terminalError();
     ASSERT_TRUE(error.has_value());
     EXPECT_EQ(error->code, expected_code);
@@ -77,9 +73,8 @@ TEST_F(DataTrackStreamTest, TerminalErrorEmptyForNormalEos) {
 
 TEST_F(DataTrackStreamTest, TerminalErrorStoredForSubscribeFailureEos) {
   auto stream = makeStream();
-  pushEvent(*stream,
-            makeEosEvent(proto::SUBSCRIBE_DATA_TRACK_ERROR_CODE_UNPUBLISHED,
-                         "track unpublished before subscription completed"));
+  pushEvent(*stream, makeEosEvent(proto::SUBSCRIBE_DATA_TRACK_ERROR_CODE_UNPUBLISHED,
+                                  "track unpublished before subscription completed"));
 
   DataTrackFrame frame;
   EXPECT_FALSE(stream->read(frame));
@@ -95,8 +90,7 @@ TEST_F(DataTrackStreamTest, CloseBeforeEosSuppressesLaterTerminalError) {
   stream->close();
 
   pushEvent(*stream,
-            makeEosEvent(proto::SUBSCRIBE_DATA_TRACK_ERROR_CODE_DISCONNECTED,
-                         "disconnected after local close"));
+            makeEosEvent(proto::SUBSCRIBE_DATA_TRACK_ERROR_CODE_DISCONNECTED, "disconnected after local close"));
 
   DataTrackFrame frame;
   EXPECT_FALSE(stream->read(frame));
@@ -105,37 +99,27 @@ TEST_F(DataTrackStreamTest, CloseBeforeEosSuppressesLaterTerminalError) {
 
 TEST_F(DataTrackStreamTest, CloseAfterEosPreservesTerminalError) {
   auto stream = makeStream();
-  pushEvent(*stream,
-            makeEosEvent(proto::SUBSCRIBE_DATA_TRACK_ERROR_CODE_TIMEOUT,
-                         "subscription timed out"));
+  pushEvent(*stream, makeEosEvent(proto::SUBSCRIBE_DATA_TRACK_ERROR_CODE_TIMEOUT, "subscription timed out"));
 
   stream->close();
 
   DataTrackFrame frame;
   EXPECT_FALSE(stream->read(frame));
-  expectTerminalError(*stream, SubscribeDataTrackErrorCode::TIMEOUT,
-                      "subscription timed out");
+  expectTerminalError(*stream, SubscribeDataTrackErrorCode::TIMEOUT, "subscription timed out");
 }
 
 TEST_F(DataTrackStreamTest, DuplicateEosKeepsFirstTerminalError) {
   auto stream = makeStream();
-  pushEvent(*stream,
-            makeEosEvent(proto::SUBSCRIBE_DATA_TRACK_ERROR_CODE_UNPUBLISHED,
-                         "first terminal error"));
-  pushEvent(*stream,
-            makeEosEvent(proto::SUBSCRIBE_DATA_TRACK_ERROR_CODE_TIMEOUT,
-                         "second terminal error"));
+  pushEvent(*stream, makeEosEvent(proto::SUBSCRIBE_DATA_TRACK_ERROR_CODE_UNPUBLISHED, "first terminal error"));
+  pushEvent(*stream, makeEosEvent(proto::SUBSCRIBE_DATA_TRACK_ERROR_CODE_TIMEOUT, "second terminal error"));
 
-  expectTerminalError(*stream, SubscribeDataTrackErrorCode::UNPUBLISHED,
-                      "first terminal error");
+  expectTerminalError(*stream, SubscribeDataTrackErrorCode::UNPUBLISHED, "first terminal error");
 }
 
 TEST_F(DataTrackStreamTest, DuplicateEosDoesNotReplaceNormalEndWithError) {
   auto stream = makeStream();
   pushEvent(*stream, makeEosEvent());
-  pushEvent(*stream,
-            makeEosEvent(proto::SUBSCRIBE_DATA_TRACK_ERROR_CODE_INTERNAL,
-                         "late terminal error"));
+  pushEvent(*stream, makeEosEvent(proto::SUBSCRIBE_DATA_TRACK_ERROR_CODE_INTERNAL, "late terminal error"));
 
   DataTrackFrame frame;
   EXPECT_FALSE(stream->read(frame));
@@ -144,16 +128,11 @@ TEST_F(DataTrackStreamTest, DuplicateEosDoesNotReplaceNormalEndWithError) {
 
 TEST_F(DataTrackStreamTest, EventsAfterCloseDoNotReplaceExistingTerminalError) {
   auto stream = makeStream();
-  pushEvent(*stream,
-            makeEosEvent(proto::SUBSCRIBE_DATA_TRACK_ERROR_CODE_PROTOCOL_ERROR,
-                         "protocol error"));
+  pushEvent(*stream, makeEosEvent(proto::SUBSCRIBE_DATA_TRACK_ERROR_CODE_PROTOCOL_ERROR, "protocol error"));
   stream->close();
-  pushEvent(*stream,
-            makeEosEvent(proto::SUBSCRIBE_DATA_TRACK_ERROR_CODE_INTERNAL,
-                         "late error after close"));
+  pushEvent(*stream, makeEosEvent(proto::SUBSCRIBE_DATA_TRACK_ERROR_CODE_INTERNAL, "late error after close"));
 
-  expectTerminalError(*stream, SubscribeDataTrackErrorCode::PROTOCOL_ERROR,
-                      "protocol error");
+  expectTerminalError(*stream, SubscribeDataTrackErrorCode::PROTOCOL_ERROR, "protocol error");
 }
 
 TEST_F(DataTrackStreamTest, NonDataTrackEventsAreIgnored) {
@@ -163,11 +142,9 @@ TEST_F(DataTrackStreamTest, NonDataTrackEventsAreIgnored) {
   EXPECT_FALSE(stream->terminalError().has_value());
 
   pushEvent(*stream,
-            makeEosEvent(proto::SUBSCRIBE_DATA_TRACK_ERROR_CODE_TIMEOUT,
-                         "still accepts later data track eos"));
+            makeEosEvent(proto::SUBSCRIBE_DATA_TRACK_ERROR_CODE_TIMEOUT, "still accepts later data track eos"));
 
-  expectTerminalError(*stream, SubscribeDataTrackErrorCode::TIMEOUT,
-                      "still accepts later data track eos");
+  expectTerminalError(*stream, SubscribeDataTrackErrorCode::TIMEOUT, "still accepts later data track eos");
 }
 
 } // namespace livekit