diff --git a/trunk/src/utest/srs_utest_kernel.cpp b/trunk/src/utest/srs_utest_kernel.cpp index ae27d5858..f246bd99d 100644 --- a/trunk/src/utest/srs_utest_kernel.cpp +++ b/trunk/src/utest/srs_utest_kernel.cpp @@ -2632,26 +2632,26 @@ VOID TEST(KernelUtility, StringSplitUtils) { if (true) { vector ss = srs_string_split("ossrs", "r"); - EXPECT_EQ(2, ss.size()); + EXPECT_EQ(2, (int)ss.size()); EXPECT_STREQ("oss", ss.at(0).c_str()); EXPECT_STREQ("s", ss.at(1).c_str()); } if (true) { vector ss = srs_string_split("ossrs", ""); - EXPECT_EQ(1, ss.size()); + EXPECT_EQ(1, (int)ss.size()); EXPECT_STREQ("ossrs", ss.at(0).c_str()); } if (true) { vector ss = srs_string_split("ossrs", "live"); - EXPECT_EQ(1, ss.size()); + EXPECT_EQ(1, (int)ss.size()); EXPECT_STREQ("ossrs", ss.at(0).c_str()); } if (true) { vector ss = srs_string_split("srs,live,rtc", ","); - EXPECT_EQ(3, ss.size()); + EXPECT_EQ(3, (int)ss.size()); EXPECT_STREQ("srs", ss.at(0).c_str()); EXPECT_STREQ("live", ss.at(1).c_str()); EXPECT_STREQ("rtc", ss.at(2).c_str()); @@ -2659,7 +2659,7 @@ VOID TEST(KernelUtility, StringSplitUtils) if (true) { vector ss = srs_string_split("srs,,rtc", ","); - EXPECT_EQ(3, ss.size()); + EXPECT_EQ(3, (int)ss.size()); EXPECT_STREQ("srs", ss.at(0).c_str()); EXPECT_STREQ("", ss.at(1).c_str()); EXPECT_STREQ("rtc", ss.at(2).c_str()); @@ -2667,7 +2667,7 @@ VOID TEST(KernelUtility, StringSplitUtils) if (true) { vector ss = srs_string_split("srs,,,rtc", ","); - EXPECT_EQ(4, ss.size()); + EXPECT_EQ(4, (int)ss.size()); EXPECT_STREQ("srs", ss.at(0).c_str()); EXPECT_STREQ("", ss.at(1).c_str()); EXPECT_STREQ("", ss.at(2).c_str()); @@ -2676,7 +2676,7 @@ VOID TEST(KernelUtility, StringSplitUtils) if (true) { vector ss = srs_string_split("srs,live,", ","); - EXPECT_EQ(3, ss.size()); + EXPECT_EQ(3, (int)ss.size()); EXPECT_STREQ("srs", ss.at(0).c_str()); EXPECT_STREQ("live", ss.at(1).c_str()); EXPECT_STREQ("", ss.at(2).c_str()); @@ -2684,7 +2684,7 @@ VOID TEST(KernelUtility, StringSplitUtils) if (true) { vector ss = srs_string_split(",live,rtc", ","); - EXPECT_EQ(3, ss.size()); + EXPECT_EQ(3, (int)ss.size()); EXPECT_STREQ("", ss.at(0).c_str()); EXPECT_STREQ("live", ss.at(1).c_str()); EXPECT_STREQ("rtc", ss.at(2).c_str()); @@ -2698,7 +2698,7 @@ VOID TEST(KernelUtility, StringSplitUtils) if (true) { vector ss = srs_string_split("/xxx/yyy", "/"); - EXPECT_EQ(3, ss.size()); + EXPECT_EQ(3, (int)ss.size()); EXPECT_STREQ("", ss.at(0).c_str()); EXPECT_STREQ("xxx", ss.at(1).c_str()); EXPECT_STREQ("yyy", ss.at(2).c_str()); diff --git a/trunk/src/utest/srs_utest_mp4.cpp b/trunk/src/utest/srs_utest_mp4.cpp index bf32ccb67..a2537416b 100644 --- a/trunk/src/utest/srs_utest_mp4.cpp +++ b/trunk/src/utest/srs_utest_mp4.cpp @@ -464,7 +464,7 @@ VOID TEST(KernelMp4Test, UUIDBoxEncode) SrsMp4Box box; box.type = SrsMp4BoxTypeFREE; box.usertype.resize(8); - ASSERT_EQ(8, box.nb_bytes()); + ASSERT_EQ(8, (int)box.nb_bytes()); HELPER_ASSERT_SUCCESS(box.encode(&b)); } @@ -475,7 +475,7 @@ VOID TEST(KernelMp4Test, UUIDBoxEncode) SrsMp4Box box; box.type = SrsMp4BoxTypeUUID; box.usertype.resize(16); - ASSERT_EQ(24, box.nb_bytes()); + ASSERT_EQ(24, (int)box.nb_bytes()); HELPER_ASSERT_SUCCESS(box.encode(&b)); } } @@ -596,7 +596,7 @@ VOID TEST(KernelMp4Test, TFHDBox) if (true) { SrsMp4TrackFragmentHeaderBox box; box.track_id = 100; - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -631,7 +631,7 @@ VOID TEST(KernelMp4Test, TFHDBox) box.default_sample_duration = 12; box.default_sample_size = 13; box.default_sample_flags = 14; - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -667,7 +667,7 @@ VOID TEST(KernelMp4Test, TFDTBox) if (true) { SrsMp4TrackFragmentDecodeTimeBox box; box.base_media_decode_time = 100; - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -694,7 +694,7 @@ VOID TEST(KernelMp4Test, TFDTBox) SrsMp4TrackFragmentDecodeTimeBox box; box.version = 1; box.base_media_decode_time = 100; - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -724,7 +724,7 @@ VOID TEST(KernelMp4Test, TRUNBox) if (true) { SrsMp4TrackFragmentRunBox box; - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -754,7 +754,7 @@ VOID TEST(KernelMp4Test, TRUNBox) entry->sample_duration = 1000; box.entries.push_back(entry); - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -788,7 +788,7 @@ VOID TEST(KernelMp4Test, FreeBox) if (true) { SrsMp4FreeSpaceBox box(SrsMp4BoxTypeFREE); box.data.resize(4); - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -818,7 +818,7 @@ VOID TEST(KernelMp4Test, MOOVBox) if (true) { SrsMp4MovieBox box; - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -891,7 +891,7 @@ VOID TEST(KernelMp4Test, TREXBox) SrsMp4TrackExtendsBox box; box.track_ID = 1; box.default_sample_description_index = 2; box.default_sample_size = 3; box.default_sample_duration = 4; box.default_sample_flags = 5; - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -933,7 +933,7 @@ VOID TEST(KernelMp4Test, TKHDBox) if (true) { SrsMp4TrackHeaderBox box; box.track_ID = 1; - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -960,7 +960,7 @@ VOID TEST(KernelMp4Test, TKHDBox) SrsMp4TrackHeaderBox box; box.version = 1; box.track_ID = 1; - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -990,7 +990,7 @@ VOID TEST(KernelMp4Test, ELSTBox) if (true) { SrsMp4EditListBox box; - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1018,7 +1018,7 @@ VOID TEST(KernelMp4Test, ELSTBox) SrsMp4ElstEntry entry; box.entries.push_back(entry); } - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1054,7 +1054,7 @@ VOID TEST(KernelMp4Test, MDHDBox) if (true) { SrsMp4MediaHeaderBox box; - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1081,7 +1081,7 @@ VOID TEST(KernelMp4Test, MDHDBox) box.set_language0('C'); box.set_language1('N'); box.set_language2('E'); - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1136,7 +1136,7 @@ VOID TEST(KernelMp4Test, HDLRBox) if (true) { SrsMp4HandlerReferenceBox box; box.handler_type = SrsMp4HandlerTypeSOUN; - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1162,7 +1162,7 @@ VOID TEST(KernelMp4Test, HDLRBox) if (true) { SrsMp4HandlerReferenceBox box; box.handler_type = SrsMp4HandlerTypeVIDE; - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1189,7 +1189,7 @@ VOID TEST(KernelMp4Test, HDLRBox) SrsMp4HandlerReferenceBox box; box.handler_type = SrsMp4HandlerTypeVIDE; box.name = "srs"; - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1247,7 +1247,7 @@ VOID TEST(KernelMp4Test, URLBox) if (true) { SrsMp4DataEntryUrlBox box; - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1271,7 +1271,7 @@ VOID TEST(KernelMp4Test, URLBox) if (true) { SrsMp4DataEntryUrnBox box; - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1304,7 +1304,7 @@ VOID TEST(KernelMp4Test, URLBox) SrsMp4DataReferenceBox box; SrsMp4DataEntryUrnBox* urn = new SrsMp4DataEntryUrnBox(); box.append(urn); - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1341,7 +1341,7 @@ VOID TEST(KernelMp4Test, SampleDescBox) if (true) { SrsMp4VisualSampleEntry box; box.data_reference_index = 1; - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1365,7 +1365,7 @@ VOID TEST(KernelMp4Test, SampleDescBox) if (true) { SrsMp4AvccBox box; - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1390,7 +1390,7 @@ VOID TEST(KernelMp4Test, SampleDescBox) if (true) { SrsMp4AudioSampleEntry box; box.data_reference_index = 1; - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1420,7 +1420,7 @@ VOID TEST(KernelMp4Test, SpecificInfoBox) if (true) { SrsMp4DecoderSpecificInfo box; box.asc.resize(2); - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1444,7 +1444,7 @@ VOID TEST(KernelMp4Test, SpecificInfoBox) if (true) { SrsMp4DecoderConfigDescriptor box; - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1468,7 +1468,7 @@ VOID TEST(KernelMp4Test, SpecificInfoBox) if (true) { SrsMp4ES_Descriptor box; - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1498,7 +1498,7 @@ VOID TEST(KernelMp4Test, STSDBox) if (true) { SrsMp4SampleDescriptionBox box; box.entries.push_back(new SrsMp4SampleEntry()); - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1523,7 +1523,7 @@ VOID TEST(KernelMp4Test, STSDBox) if (true) { SrsMp4DecodingTime2SampleBox box; box.entries.push_back(SrsMp4SttsEntry()); - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1548,7 +1548,7 @@ VOID TEST(KernelMp4Test, STSDBox) if (true) { SrsMp4CompositionTime2SampleBox box; box.entries.push_back(SrsMp4CttsEntry()); - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1572,7 +1572,7 @@ VOID TEST(KernelMp4Test, STSDBox) if (true) { SrsMp4SyncSampleBox box; - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1596,7 +1596,7 @@ VOID TEST(KernelMp4Test, STSDBox) if (true) { SrsMp4Sample2ChunkBox box; - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1620,7 +1620,7 @@ VOID TEST(KernelMp4Test, STSDBox) if (true) { SrsMp4ChunkOffsetBox box; - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1644,7 +1644,7 @@ VOID TEST(KernelMp4Test, STSDBox) if (true) { SrsMp4ChunkLargeOffsetBox box; - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1668,7 +1668,7 @@ VOID TEST(KernelMp4Test, STSDBox) if (true) { SrsMp4SampleSizeBox box; - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1693,7 +1693,7 @@ VOID TEST(KernelMp4Test, STSDBox) if (true) { SrsMp4UserDataBox box; box.data.resize(2); - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1717,7 +1717,7 @@ VOID TEST(KernelMp4Test, STSDBox) if (true) { SrsMp4SegmentIndexBox box; - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1741,7 +1741,7 @@ VOID TEST(KernelMp4Test, STSDBox) if (true) { SrsMp4MovieHeaderBox box; - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1772,7 +1772,7 @@ VOID TEST(KernelMp4Test, STSDBox) if (true) { SrsMp4CompositionTime2SampleBox box; - EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; diff --git a/trunk/src/utest/srs_utest_rtc.cpp b/trunk/src/utest/srs_utest_rtc.cpp index 9c676d84b..962fca807 100644 --- a/trunk/src/utest/srs_utest_rtc.cpp +++ b/trunk/src/utest/srs_utest_rtc.cpp @@ -192,7 +192,7 @@ VOID TEST(KernelRTCTest, ConnectionManagerTest) if (true) { SrsResourceManager manager("mgr"); HELPER_EXPECT_SUCCESS(manager.start()); - EXPECT_EQ(0, manager.size()); EXPECT_TRUE(manager.empty()); + EXPECT_EQ(0, (int)manager.size()); EXPECT_TRUE(manager.empty()); MockResourceUnsubscribe* conn0 = new MockResourceUnsubscribe(&manager); conn0->unsubscribe_in_disposing = true; @@ -208,7 +208,7 @@ VOID TEST(KernelRTCTest, ConnectionManagerTest) // which should not cause the conn1 lost event. manager.remove(conn0); srs_usleep(0); - ASSERT_EQ(2, manager.size()); + ASSERT_EQ(2, (int)manager.size()); EXPECT_EQ(1, conn1->nn_before_dispose); EXPECT_EQ(1, conn1->nn_disposing); // Should get event. @@ -221,7 +221,7 @@ VOID TEST(KernelRTCTest, ConnectionManagerTest) if (true) { SrsResourceManager manager("mgr"); HELPER_EXPECT_SUCCESS(manager.start()); - EXPECT_EQ(0, manager.size()); EXPECT_TRUE(manager.empty()); + EXPECT_EQ(0, (int)manager.size()); EXPECT_TRUE(manager.empty()); MockResourceUnsubscribe* conn0 = new MockResourceUnsubscribe(&manager); conn0->unsubscribe_in_before_dispose = true; @@ -237,7 +237,7 @@ VOID TEST(KernelRTCTest, ConnectionManagerTest) // which should not cause the conn1 lost event. manager.remove(conn0); srs_usleep(0); - ASSERT_EQ(2, manager.size()); + ASSERT_EQ(2, (int)manager.size()); EXPECT_EQ(1, conn1->nn_before_dispose); // Should get event. EXPECT_EQ(1, conn1->nn_disposing); @@ -250,7 +250,7 @@ VOID TEST(KernelRTCTest, ConnectionManagerTest) if (true) { SrsResourceManager manager("mgr"); HELPER_EXPECT_SUCCESS(manager.start()); - EXPECT_EQ(0, manager.size()); EXPECT_TRUE(manager.empty()); + EXPECT_EQ(0, (int)manager.size()); EXPECT_TRUE(manager.empty()); MockResourceUnsubscribe* resource = new MockResourceUnsubscribe(&manager); resource->unsubscribe_in_before_dispose = true; @@ -261,7 +261,7 @@ VOID TEST(KernelRTCTest, ConnectionManagerTest) manager.remove(resource); srs_usleep(0); - ASSERT_EQ(0, manager.size()); + ASSERT_EQ(0, (int)manager.size()); EXPECT_EQ(1, result.nn_before_dispose); EXPECT_EQ(0, result.nn_disposing); // No disposing event, because we unsubscribe in before-dispose. @@ -271,7 +271,7 @@ VOID TEST(KernelRTCTest, ConnectionManagerTest) if (true) { SrsResourceManager manager("mgr"); HELPER_EXPECT_SUCCESS(manager.start()); - EXPECT_EQ(0, manager.size()); EXPECT_TRUE(manager.empty()); + EXPECT_EQ(0, (int)manager.size()); EXPECT_TRUE(manager.empty()); MockResourceUnsubscribe* resource = new MockResourceUnsubscribe(&manager); manager.add(resource); @@ -281,7 +281,7 @@ VOID TEST(KernelRTCTest, ConnectionManagerTest) manager.remove(resource); srs_usleep(0); - ASSERT_EQ(0, manager.size()); + ASSERT_EQ(0, (int)manager.size()); EXPECT_EQ(1, result.nn_before_dispose); EXPECT_EQ(1, result.nn_disposing); @@ -291,102 +291,102 @@ VOID TEST(KernelRTCTest, ConnectionManagerTest) if (true) { SrsResourceManager manager("mgr"); HELPER_EXPECT_SUCCESS(manager.start()); - EXPECT_EQ(0, manager.size()); EXPECT_TRUE(manager.empty()); + EXPECT_EQ(0, (int)manager.size()); EXPECT_TRUE(manager.empty()); MockResourceSelf* resource = new MockResourceSelf(&manager); resource->remove_in_disposing = true; manager.add(resource); - EXPECT_EQ(1, manager.size()); + EXPECT_EQ(1, (int)manager.size()); manager.remove(resource); srs_usleep(0); - ASSERT_EQ(0, manager.size()); + ASSERT_EQ(0, (int)manager.size()); } // When hooks before-dispose, remove itself again. if (true) { SrsResourceManager manager("mgr"); HELPER_EXPECT_SUCCESS(manager.start()); - EXPECT_EQ(0, manager.size()); EXPECT_TRUE(manager.empty()); + EXPECT_EQ(0, (int)manager.size()); EXPECT_TRUE(manager.empty()); MockResourceSelf* resource = new MockResourceSelf(&manager); resource->remove_in_before_dispose = true; manager.add(resource); - EXPECT_EQ(1, manager.size()); + EXPECT_EQ(1, (int)manager.size()); manager.remove(resource); srs_usleep(0); - ASSERT_EQ(0, manager.size()); + ASSERT_EQ(0, (int)manager.size()); } // Cover all normal scenarios. if (true) { SrsResourceManager manager("mgr", true); HELPER_EXPECT_SUCCESS(manager.start()); - EXPECT_EQ(0, manager.size()); EXPECT_TRUE(manager.empty()); + EXPECT_EQ(0, (int)manager.size()); EXPECT_TRUE(manager.empty()); // Resource without id or name. manager.add_with_id("100", new MockSrsConnection()); manager.add_with_id("101", new MockSrsConnection()); manager.add_with_name("srs", new MockSrsConnection()); manager.add_with_name("av", new MockSrsConnection()); - ASSERT_EQ(4, manager.size()); + ASSERT_EQ(4, (int)manager.size()); manager.remove(manager.at(3)); manager.remove(manager.at(2)); manager.remove(manager.at(1)); manager.remove(manager.at(0)); srs_usleep(0); - ASSERT_EQ(0, manager.size()); + ASSERT_EQ(0, (int)manager.size()); } // Callback: Remove worker when its master is disposing. if (true) { SrsResourceManager manager("mgr"); HELPER_EXPECT_SUCCESS(manager.start()); - EXPECT_EQ(0, manager.size()); EXPECT_TRUE(manager.empty()); + EXPECT_EQ(0, (int)manager.size()); EXPECT_TRUE(manager.empty()); MockResourceHookOwner* master = new MockResourceHookOwner(&manager); manager.add(master); - EXPECT_EQ(1, manager.size()); + EXPECT_EQ(1, (int)manager.size()); MockResourceHookOwner* worker = new MockResourceHookOwner(&manager); worker->owner_ = master; // When disposing master, worker will hook the event and remove itself. manager.add(worker); - EXPECT_EQ(2, manager.size()); + EXPECT_EQ(2, (int)manager.size()); manager.remove(master); srs_usleep(0); // Trigger the disposing. // Both master and worker should be disposed. - EXPECT_EQ(0, manager.size()); EXPECT_TRUE(manager.empty()); + EXPECT_EQ(0, (int)manager.size()); EXPECT_TRUE(manager.empty()); } // Normal scenario, free object by manager. if (true) { SrsResourceManager manager("mgr"); HELPER_EXPECT_SUCCESS(manager.start()); - EXPECT_EQ(0, manager.size()); EXPECT_TRUE(manager.empty()); + EXPECT_EQ(0, (int)manager.size()); EXPECT_TRUE(manager.empty()); MockSrsConnection* conn = new MockSrsConnection(); manager.add(conn); - EXPECT_EQ(1, manager.size()); EXPECT_FALSE(manager.empty()); + EXPECT_EQ(1, (int)manager.size()); EXPECT_FALSE(manager.empty()); manager.remove(conn); srs_usleep(0); // Switch context for manager to dispose connections. - EXPECT_EQ(0, manager.size()); EXPECT_TRUE(manager.empty()); + EXPECT_EQ(0, (int)manager.size()); EXPECT_TRUE(manager.empty()); } // Resource with id or name. if (true) { SrsResourceManager manager("mgr"); HELPER_EXPECT_SUCCESS(manager.start()); - EXPECT_EQ(0, manager.size()); EXPECT_TRUE(manager.empty()); + EXPECT_EQ(0, (int)manager.size()); EXPECT_TRUE(manager.empty()); // Resource without id or name. MockSrsConnection* conn = new MockSrsConnection(); manager.add(conn); - ASSERT_EQ(1, manager.size()); + ASSERT_EQ(1, (int)manager.size()); EXPECT_TRUE(manager.at(0)); EXPECT_TRUE(!manager.at(1)); EXPECT_TRUE(!manager.find_by_id("100")); @@ -394,34 +394,34 @@ VOID TEST(KernelRTCTest, ConnectionManagerTest) manager.remove(conn); srs_usleep(0); - ASSERT_EQ(0, manager.size()); + ASSERT_EQ(0, (int)manager.size()); // Resource with id. if (true) { MockSrsConnection* id = new MockSrsConnection(); manager.add_with_id("100", id); - EXPECT_EQ(1, manager.size()); + EXPECT_EQ(1, (int)manager.size()); EXPECT_TRUE(manager.find_by_id("100")); EXPECT_TRUE(!manager.find_by_id("101")); EXPECT_TRUE(!manager.find_by_name("100")); manager.remove(id); srs_usleep(0); - ASSERT_EQ(0, manager.size()); + ASSERT_EQ(0, (int)manager.size()); } // Resource with name. if (true) { MockSrsConnection* name = new MockSrsConnection(); manager.add_with_name("srs", name); - EXPECT_EQ(1, manager.size()); + EXPECT_EQ(1, (int)manager.size()); EXPECT_TRUE(manager.find_by_name("srs")); EXPECT_TRUE(!manager.find_by_name("srs0")); EXPECT_TRUE(!manager.find_by_id("srs")); manager.remove(name); srs_usleep(0); - ASSERT_EQ(0, manager.size()); + ASSERT_EQ(0, (int)manager.size()); } // Resource with id and name. @@ -431,7 +431,7 @@ VOID TEST(KernelRTCTest, ConnectionManagerTest) manager.add_with_id("200", id_name); manager.add_with_name("srs", id_name); manager.add_with_name("av", id_name); - EXPECT_EQ(1, manager.size()); + EXPECT_EQ(1, (int)manager.size()); EXPECT_TRUE(manager.find_by_name("srs")); EXPECT_TRUE(manager.find_by_name("av")); EXPECT_TRUE(manager.find_by_id("100")); @@ -441,7 +441,7 @@ VOID TEST(KernelRTCTest, ConnectionManagerTest) manager.remove(id_name); srs_usleep(0); - ASSERT_EQ(0, manager.size()); + ASSERT_EQ(0, (int)manager.size()); } // Resource with same id or name. @@ -456,11 +456,11 @@ VOID TEST(KernelRTCTest, ConnectionManagerTest) manager.remove(conn0); srs_usleep(0); - ASSERT_EQ(1, manager.size()); + ASSERT_EQ(1, (int)manager.size()); manager.remove(conn1); srs_usleep(0); - ASSERT_EQ(0, manager.size()); + ASSERT_EQ(0, (int)manager.size()); } } @@ -468,31 +468,31 @@ VOID TEST(KernelRTCTest, ConnectionManagerTest) if (true) { SrsResourceManager manager("mgr"); HELPER_EXPECT_SUCCESS(manager.start()); - EXPECT_EQ(0, manager.size()); EXPECT_TRUE(manager.empty()); + EXPECT_EQ(0, (int)manager.size()); EXPECT_TRUE(manager.empty()); if (true) { // First connection, which will switch context when deleting. MockSrsConnection* conn = new MockSrsConnection(); conn->do_switch = true; manager.add(conn); - EXPECT_EQ(1, manager.size()); EXPECT_EQ(0, manager.zombies_.size()); + EXPECT_EQ(1, (int)manager.size()); EXPECT_EQ(0, manager.zombies_.size()); manager.remove(conn); // Remove conn to zombies. - EXPECT_EQ(1, manager.size()); EXPECT_EQ(1, manager.zombies_.size()); + EXPECT_EQ(1, (int)manager.size()); EXPECT_EQ(1, manager.zombies_.size()); srs_usleep(0); // Switch to manager coroutine to try to free zombies. - EXPECT_EQ(0, manager.size()); EXPECT_EQ(0, manager.zombies_.size()); + EXPECT_EQ(0, (int)manager.size()); EXPECT_EQ(0, manager.zombies_.size()); } if (true) { // Now the previous conn switch back to here, and lost the signal. MockSrsConnection* conn = new MockSrsConnection(); manager.add(conn); - EXPECT_EQ(1, manager.size()); EXPECT_EQ(0, manager.zombies_.size()); + EXPECT_EQ(1, (int)manager.size()); EXPECT_EQ(0, manager.zombies_.size()); manager.remove(conn); // Remove conn to zombies, signal is lost. - EXPECT_EQ(1, manager.size()); EXPECT_EQ(1, manager.zombies_.size()); + EXPECT_EQ(1, (int)manager.size()); EXPECT_EQ(1, manager.zombies_.size()); srs_usleep(0); // Switch to manager, but no signal is triggered before, so conn will be freed by loop. - EXPECT_EQ(0, manager.size()); EXPECT_EQ(0, manager.zombies_.size()); + EXPECT_EQ(0, (int)manager.size()); EXPECT_EQ(0, manager.zombies_.size()); } } }