From e61391028ea4d0617ab3c718b667afa5842f12ac Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sat, 3 Oct 2020 20:10:42 +0800
Subject: [PATCH] RTC: Refine utest for DTLS

---
 trunk/src/utest/srs_utest_rtc.cpp | 56 +++++++++++++++----------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/trunk/src/utest/srs_utest_rtc.cpp b/trunk/src/utest/srs_utest_rtc.cpp
index cb8d5d441..55b803e26 100644
--- a/trunk/src/utest/srs_utest_rtc.cpp
+++ b/trunk/src/utest/srs_utest_rtc.cpp
@@ -843,28 +843,6 @@ public:
     }
 };
 
-struct DTLSServerFlowCase
-{
-    int id;
-
-    string ClientVersion;
-    string ServerVersion;
-
-    bool ClientDone;
-    bool ServerDone;
-
-    bool ClientError;
-    bool ServerError;
-};
-
-std::ostream& operator<< (std::ostream& stream, const DTLSServerFlowCase& c)
-{
-    stream << "Case #" << c.id
-        << ", client(" << c.ClientVersion << ",done=" << c.ClientDone << ",err=" << c.ClientError << ")"
-        << ", server(" << c.ServerVersion << ",done=" << c.ServerDone << ",err=" << c.ServerError << ")";
-    return stream;
-}
-
 VOID TEST(KernelRTCTest, DTLSARQLimitTest)
 {
     srs_error_t err = srs_success;
@@ -1181,11 +1159,33 @@ VOID TEST(KernelRTCTest, DTLSServerARQTest)
     }
 }
 
+struct DTLSFlowCase
+{
+    int id;
+
+    string ClientVersion;
+    string ServerVersion;
+
+    bool ClientDone;
+    bool ServerDone;
+
+    bool ClientError;
+    bool ServerError;
+};
+
+std::ostream& operator<< (std::ostream& stream, const DTLSFlowCase& c)
+{
+    stream << "Case #" << c.id
+        << ", client(" << c.ClientVersion << ",done=" << c.ClientDone << ",err=" << c.ClientError << ")"
+        << ", server(" << c.ServerVersion << ",done=" << c.ServerDone << ",err=" << c.ServerError << ")";
+    return stream;
+}
+
 VOID TEST(KernelRTCTest, DTLSClientFlowTest)
 {
     srs_error_t err = srs_success;
 
-    DTLSServerFlowCase cases[] = {
+    DTLSFlowCase cases[] = {
         // OK, Client, Server: DTLS v1.0
         {0, "dtls1.0", "dtls1.0", true, true, false, false},
         // OK, Client, Server: DTLS v1.2
@@ -1204,8 +1204,8 @@ VOID TEST(KernelRTCTest, DTLSClientFlowTest)
         {7, "dtls1.2", "dtls1.0", false, false, true, false},
     };
 
-    for (int i = 0; i < (int)(sizeof(cases) / sizeof(DTLSServerFlowCase)); i++) {
-        DTLSServerFlowCase c = cases[i];
+    for (int i = 0; i < (int)(sizeof(cases) / sizeof(DTLSFlowCase)); i++) {
+        DTLSFlowCase c = cases[i];
 
         MockDtlsCallback cio; SrsDtls client(&cio);
         MockDtlsCallback sio; MockDtls server(&sio);
@@ -1229,7 +1229,7 @@ VOID TEST(KernelRTCTest, DTLSServerFlowTest)
 {
     srs_error_t err = srs_success;
 
-    DTLSServerFlowCase cases[] = {
+    DTLSFlowCase cases[] = {
         // OK, Client, Server: DTLS v1.0
         {0, "dtls1.0", "dtls1.0", true, true, false, false},
         // OK, Client, Server: DTLS v1.2
@@ -1248,8 +1248,8 @@ VOID TEST(KernelRTCTest, DTLSServerFlowTest)
         {7, "dtls1.2", "dtls1.0", false, false, true, false},
     };
 
-    for (int i = 0; i < (int)(sizeof(cases) / sizeof(DTLSServerFlowCase)); i++) {
-        DTLSServerFlowCase c = cases[i];
+    for (int i = 0; i < (int)(sizeof(cases) / sizeof(DTLSFlowCase)); i++) {
+        DTLSFlowCase c = cases[i];
 
         MockDtlsCallback cio; MockDtls client(&cio);
         MockDtlsCallback sio; SrsDtls server(&sio);