test: Avoid 'medias' terminology

test/samples/Tester.cpp

@@ -537,23 +537,23 @@ void Tests::checkSubscriptions( const rapidjson::Value& expectedSubscriptions,
     }
 }
 
-void Tests::checkMedias(const rapidjson::Value& expectedMedias)
+void Tests::checkMedias(const rapidjson::Value& expectedMediaList)
 {
-    ASSERT_TRUE( expectedMedias.IsArray() );
-    auto medias = m_ml->audioFiles( nullptr )->all();
+    ASSERT_TRUE( expectedMediaList.IsArray() );
+    auto media_list = m_ml->audioFiles( nullptr )->all();
     auto videos = m_ml->videoFiles( nullptr )->all();
-    medias.insert( begin( medias ), begin( videos ), end( videos ) );
-    for ( auto i = 0u; i < expectedMedias.Size(); ++i )
+    media_list.insert( begin( media_list ), begin( videos ), end( videos ) );
+    for ( auto i = 0u; i < expectedMediaList.Size(); ++i )
     {
-        const auto& expectedMedia = expectedMedias[i];
+        const auto& expectedMedia = expectedMediaList[i];
         ASSERT_TRUE( expectedMedia.HasMember( "title" ) );
         const auto expectedTitle = expectedMedia["title"].GetString();
-        auto it = std::find_if( begin( medias ), end( medias ), [expectedTitle](const MediaPtr& m) {
+        auto it = std::find_if( begin( media_list ), end( media_list ), [expectedTitle](const MediaPtr& m) {
             return strcasecmp( expectedTitle, m->title().c_str() ) == 0;
         });
-        ASSERT_TRUE( end( medias ) != it );
+        ASSERT_TRUE( end( media_list ) != it );
         const auto media = *it;
-        medias.erase( it );
+        media_list.erase( it );
         if ( expectedMedia.HasMember( "nbVideoTracks" ) || expectedMedia.HasMember( "videoTracks" ) )
         {
             auto videoTracks = media->videoTracks()->all();

test/unittest/MovieTests.cpp

@@ -101,18 +101,18 @@ static void SortByAlpha( Tests* T )
     auto m3 = T->ml->createMovie( *media3 );
 
     QueryParameters params { SortingCriteria::Alpha, false };
-    auto medias = T->ml->movies( &params )->all();
-    ASSERT_EQ( 3u, medias.size() );
-    ASSERT_EQ( m->id(), medias[0]->id() );
-    ASSERT_EQ( m3->id(), medias[1]->id() );
-    ASSERT_EQ( m2->id(), medias[2]->id() );
+    auto all_media = T->ml->movies( &params )->all();
+    ASSERT_EQ( 3u, all_media.size() );
+    ASSERT_EQ( m->id(), all_media[0]->id() );
+    ASSERT_EQ( m3->id(), all_media[1]->id() );
+    ASSERT_EQ( m2->id(), all_media[2]->id() );
 
     params.desc = true;
-    medias = T->ml->movies( &params )->all();
-    ASSERT_EQ( 3u, medias.size() );
-    ASSERT_EQ( m2->id(), medias[0]->id() );
-    ASSERT_EQ( m3->id(), medias[1]->id() );
-    ASSERT_EQ( m->id(), medias[2]->id() );
+    all_media = T->ml->movies( &params )->all();
+    ASSERT_EQ( 3u, all_media.size() );
+    ASSERT_EQ( m2->id(), all_media[0]->id() );
+    ASSERT_EQ( m3->id(), all_media[1]->id() );
+    ASSERT_EQ( m->id(), all_media[2]->id() );
 }
 
 static void SetShortSummary( Tests* T )