dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: Port to QStringLiteral operator

Browse Source
This commit is contained in:
Jonas Kvinge
2024-10-20 23:19:38 +02:00
parent a9ea686577
commit 60f4a57425
9 changed files with 304 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
tests/src/collectionbackend_test.cpp
View File

@@ -56,7 +56,7 @@ class CollectionBackendTest : public ::testing::Test {
// Returns a valid song with all the required fields set
Song ret;
ret.set_directory_id(directory_id);
ret.set_url(QUrl::fromLocalFile(QStringLiteral("foo.flac")));
ret.set_url(QUrl::fromLocalFile(u"foo.flac"_s));
ret.set_mtime(1);
ret.set_ctime(1);
ret.set_filesize(1);
@@ -82,12 +82,12 @@ TEST_F(CollectionBackendTest, AddDirectory) {
QSignalSpy spy(&*backend_, &CollectionBackend::DirectoryAdded);
backend_->AddDirectory(QStringLiteral("/tmp"));
backend_->AddDirectory(u"/tmp"_s);
// Check the signal was emitted correctly
ASSERT_EQ(1, spy.count());
CollectionDirectory dir = spy[0][0].value<CollectionDirectory>();
EXPECT_EQ(QStringLiteral("/tmp"), dir.path);
EXPECT_EQ(u"/tmp"_s, dir.path);
EXPECT_EQ(1, dir.id);
EXPECT_EQ(0, spy[0][1].value<CollectionSubdirectoryList>().size());
@@ -98,7 +98,7 @@ TEST_F(CollectionBackendTest, RemoveDirectory) {
// Add a directory
CollectionDirectory dir;
dir.id = 1;
dir.path = QStringLiteral("/tmp");
dir.path = u"/tmp"_s;
backend_->AddDirectory(dir.path);
QSignalSpy spy(&*backend_, &CollectionBackend::DirectoryDeleted);
@@ -109,7 +109,7 @@ TEST_F(CollectionBackendTest, RemoveDirectory) {
// Check the signal was emitted correctly
ASSERT_EQ(1, spy.count());
dir = spy[0][0].value<CollectionDirectory>();
EXPECT_EQ(QStringLiteral("/tmp"), dir.path);
EXPECT_EQ(u"/tmp"_s, dir.path);
EXPECT_EQ(1, dir.id);
}
@@ -123,14 +123,14 @@ class SingleSong : public CollectionBackendTest {
CollectionBackendTest::SetUp();
// Add a directory - this will get ID 1
backend_->AddDirectory(QStringLiteral("/tmp"));
backend_->AddDirectory(u"/tmp"_s);
// Make a song in that directory
song_ = MakeDummySong(1);
song_.set_title(QStringLiteral("Title"));
song_.set_artist(QStringLiteral("Artist"));
song_.set_album(QStringLiteral("Album"));
song_.set_url(QUrl::fromLocalFile(QStringLiteral("foo.flac")));
song_.set_title(u"Title"_s);
song_.set_artist(u"Artist"_s);
song_.set_album(u"Album"_s);
song_.set_url(QUrl::fromLocalFile(u"foo.flac"_s));
}
void AddDummySong() {
@@ -166,7 +166,7 @@ TEST_F(SingleSong, GetSongWithNoAlbum) {
EXPECT_EQ(1, backend_->GetAllArtists().size());
CollectionBackend::AlbumList albums = backend_->GetAllAlbums();
EXPECT_EQ(1, albums.size());
EXPECT_EQ(QStringLiteral("Artist"), albums[0].album_artist);
EXPECT_EQ(u"Artist"_s, albums[0].album_artist);
EXPECT_EQ(""_L1, albums[0].album);
}
@@ -199,7 +199,7 @@ TEST_F(SingleSong, GetAlbumsByArtist) {
AddDummySong();
if (HasFatalFailure()) return;
CollectionBackend::AlbumList albums = backend_->GetAlbumsByArtist(QStringLiteral("Artist"));
CollectionBackend::AlbumList albums = backend_->GetAlbumsByArtist(u"Artist"_s);
ASSERT_EQ(1, albums.size());
EXPECT_EQ(song_.album(), albums[0].album);
EXPECT_EQ(song_.artist(), albums[0].album_artist);
@@ -211,7 +211,7 @@ TEST_F(SingleSong, GetAlbumArt) {
AddDummySong();
if (HasFatalFailure()) return;
CollectionBackend::Album album = backend_->GetAlbumArt(QStringLiteral("Artist"), QStringLiteral("Album"));
CollectionBackend::Album album = backend_->GetAlbumArt(u"Artist"_s, u"Album"_s);
EXPECT_EQ(song_.album(), album.album);
EXPECT_EQ(song_.effective_albumartist(), album.album_artist);
@@ -222,7 +222,7 @@ TEST_F(SingleSong, GetSongs) {
AddDummySong();
if (HasFatalFailure()) return;
SongList songs = backend_->GetAlbumSongs(QStringLiteral("Artist"), QStringLiteral("Album"));
SongList songs = backend_->GetAlbumSongs(u"Artist"_s, u"Album"_s);
ASSERT_EQ(1, songs.size());
EXPECT_EQ(song_.album(), songs[0].album());
EXPECT_EQ(song_.artist(), songs[0].artist());
@@ -265,7 +265,7 @@ TEST_F(SingleSong, UpdateSong) {
Song new_song(song_);
new_song.set_id(1);
new_song.set_title(QStringLiteral("A different title"));
new_song.set_title(u"A different title"_s);
QSignalSpy added_spy(&*backend_, &CollectionBackend::SongsAdded);
QSignalSpy changed_spy(&*backend_, &CollectionBackend::SongsChanged);
@@ -279,7 +279,7 @@ TEST_F(SingleSong, UpdateSong) {
SongList songs_changed = *(reinterpret_cast<SongList*>(changed_spy[0][0].data()));
ASSERT_EQ(1, songs_changed.size());
EXPECT_EQ(QStringLiteral("A different title"), songs_changed[0].title());
EXPECT_EQ(u"A different title"_s, songs_changed[0].title());
EXPECT_EQ(1, songs_changed[0].id());
}
@@ -300,7 +300,7 @@ TEST_F(SingleSong, DeleteSongs) {
SongList songs_deleted = *(reinterpret_cast<SongList*>(deleted_spy[0][0].data()));
ASSERT_EQ(1, songs_deleted.size());
EXPECT_EQ(QStringLiteral("Title"), songs_deleted[0].title());
EXPECT_EQ(u"Title"_s, songs_deleted[0].title());
EXPECT_EQ(1, songs_deleted[0].id());
// Check we can't retrieve that song any more
@@ -333,7 +333,7 @@ TEST_F(SingleSong, MarkSongsUnavailable) {
SongList songs_deleted = *(reinterpret_cast<SongList*>(deleted_spy[0][0].data()));
ASSERT_EQ(1, songs_deleted.size());
EXPECT_EQ(QStringLiteral("Title"), songs_deleted[0].title());
EXPECT_EQ(u"Title"_s, songs_deleted[0].title());
EXPECT_EQ(1, songs_deleted[0].id());
// Check the song is marked as deleted.
@@ -354,16 +354,16 @@ class TestUrls : public CollectionBackendTest {
protected:
void SetUp() override {
CollectionBackendTest::SetUp();
backend_->AddDirectory(QStringLiteral("/mnt/music"));
backend_->AddDirectory(u"/mnt/music"_s);
}
};
TEST_F(TestUrls, TestUrls) {
QStringList strings = QStringList() << QStringLiteral("file:///mnt/music/01 - Pink Floyd - Echoes.flac")
<< QStringLiteral("file:///mnt/music/02 - Björn Afzelius - Det räcker nu.flac")
<< QStringLiteral("file:///mnt/music/03 - Vazelina Bilopphøggers - Bomull i øra.flac")
<< QStringLiteral("file:///mnt/music/Test !#$%&'()-@^_`{}~..flac");
QStringList strings = QStringList() << u"file:///mnt/music/01 - Pink Floyd - Echoes.flac"_s
<< u"file:///mnt/music/02 - Björn Afzelius - Det räcker nu.flac"_s
<< u"file:///mnt/music/03 - Vazelina Bilopphøggers - Bomull i øra.flac"_s
<< u"file:///mnt/music/Test !#$%&'()-@^_`{}~..flac"_s;
const QList<QUrl> urls = QUrl::fromStringList(strings);
SongList songs;
@@ -375,9 +375,9 @@ TEST_F(TestUrls, TestUrls) {
Song song(Song::Source::Collection);
song.set_directory_id(1);
song.set_title(QStringLiteral("Test Title"));
song.set_album(QStringLiteral("Test Album"));
song.set_artist(QStringLiteral("Test Artist"));
song.set_title(u"Test Title"_s);
song.set_album(u"Test Album"_s);
song.set_artist(u"Test Artist"_s);
song.set_url(url);
song.set_length_nanosec(kNsecPerSec);
song.set_mtime(1);
@@ -419,7 +419,7 @@ TEST_F(TestUrls, TestUrls) {
QSqlQuery q(db);
q.prepare(QStringLiteral("SELECT url FROM %1 WHERE url = :url").arg(QLatin1String(SCollection::kSongsTable)));
q.bindValue(QStringLiteral(":url"), url.toString(QUrl::FullyEncoded));
q.bindValue(u":url"_s, url.toString(QUrl::FullyEncoded));
EXPECT_TRUE(q.exec());
while (q.next()) {
@@ -435,18 +435,18 @@ class UpdateSongsBySongID : public CollectionBackendTest {
protected:
void SetUp() override {
CollectionBackendTest::SetUp();
backend_->AddDirectory(QStringLiteral("/mnt/music"));
backend_->AddDirectory(u"/mnt/music"_s);
}
};
TEST_F(UpdateSongsBySongID, UpdateSongsBySongID) {
const QStringList song_ids = QStringList() << QStringLiteral("song1")
<< QStringLiteral("song2")
<< QStringLiteral("song3")
<< QStringLiteral("song4")
<< QStringLiteral("song5")
<< QStringLiteral("song6");
const QStringList song_ids = QStringList() << u"song1"_s
<< u"song2"_s
<< u"song3"_s
<< u"song4"_s
<< u"song5"_s
<< u"song6"_s;
{ // Add songs
SongMap songs;
@@ -454,15 +454,15 @@ TEST_F(UpdateSongsBySongID, UpdateSongsBySongID) {
for (const QString &song_id : song_ids) {
QUrl url;
url.setScheme(QStringLiteral("file"));
url.setPath(QStringLiteral("/music/") + song_id);
url.setScheme(u"file"_s);
url.setPath(u"/music/"_s + song_id);
Song song(Song::Source::Collection);
song.set_song_id(song_id);
song.set_directory_id(1);
song.set_title(QStringLiteral("Test Title ") + song_id);
song.set_album(QStringLiteral("Test Album"));
song.set_artist(QStringLiteral("Test Artist"));
song.set_title(u"Test Title "_s + song_id);
song.set_album(u"Test Album"_s);
song.set_artist(u"Test Artist"_s);
song.set_url(url);
song.set_length_nanosec(kNsecPerSec);
song.set_mtime(1);
@@ -517,23 +517,23 @@ TEST_F(UpdateSongsBySongID, UpdateSongsBySongID) {
SongMap songs;
const QStringList song_ids2 = QStringList() << QStringLiteral("song1")
<< QStringLiteral("song4")
<< QStringLiteral("song5")
<< QStringLiteral("song6");
const QStringList song_ids2 = QStringList() << u"song1"_s
<< u"song4"_s
<< u"song5"_s
<< u"song6"_s;
for (const QString &song_id : song_ids2) {
QUrl url;
url.setScheme(QStringLiteral("file"));
url.setPath(QStringLiteral("/music/") + song_id);
url.setScheme(u"file"_s);
url.setPath(u"/music/"_s + song_id);
Song song(Song::Source::Collection);
song.set_song_id(song_id);
song.set_directory_id(1);
song.set_title(QStringLiteral("Test Title ") + song_id);
song.set_album(QStringLiteral("Test Album"));
song.set_artist(QStringLiteral("Test Artist"));
song.set_title(u"Test Title "_s + song_id);
song.set_album(u"Test Album"_s);
song.set_artist(u"Test Artist"_s);
song.set_url(url);
song.set_length_nanosec(kNsecPerSec);
song.set_mtime(1);
@@ -551,8 +551,8 @@ TEST_F(UpdateSongsBySongID, UpdateSongsBySongID) {
ASSERT_EQ(1, spy2.count());
SongList deleted_songs = spy2[0][0].value<SongList>();
EXPECT_EQ(deleted_songs.count(), 2);
EXPECT_EQ(deleted_songs[0].song_id(), QStringLiteral("song2"));
EXPECT_EQ(deleted_songs[1].song_id(), QStringLiteral("song3"));
EXPECT_EQ(deleted_songs[0].song_id(), u"song2"_s);
EXPECT_EQ(deleted_songs[1].song_id(), u"song3"_s);
}
@@ -563,23 +563,23 @@ TEST_F(UpdateSongsBySongID, UpdateSongsBySongID) {
SongMap songs;
const QStringList song_ids2 = QStringList() << QStringLiteral("song1")
<< QStringLiteral("song4")
<< QStringLiteral("song5")
<< QStringLiteral("song6");
const QStringList song_ids2 = QStringList() << u"song1"_s
<< u"song4"_s
<< u"song5"_s
<< u"song6"_s;
for (const QString &song_id : song_ids2) {
QUrl url;
url.setScheme(QStringLiteral("file"));
url.setPath(QStringLiteral("/music/") + song_id);
url.setScheme(u"file"_s);
url.setPath(u"/music/"_s + song_id);
Song song(Song::Source::Collection);
song.set_song_id(song_id);
song.set_directory_id(1);
song.set_title(QStringLiteral("Test Title ") + song_id);
song.set_album(QStringLiteral("Test Album"));
song.set_artist(QStringLiteral("Test Artist"));
song.set_title(u"Test Title "_s + song_id);
song.set_album(u"Test Album"_s);
song.set_artist(u"Test Artist"_s);
song.set_url(url);
song.set_length_nanosec(kNsecPerSec);
song.set_mtime(1);
@@ -591,8 +591,8 @@ TEST_F(UpdateSongsBySongID, UpdateSongsBySongID) {
}
songs[QStringLiteral("song1")].set_artist(QStringLiteral("New artist"));
songs[QStringLiteral("song6")].set_artist(QStringLiteral("New artist"));
songs[u"song1"_s].set_artist(u"New artist"_s);
songs[u"song6"_s].set_artist(u"New artist"_s);
backend_->UpdateSongsBySongID(songs);
@@ -602,8 +602,8 @@ TEST_F(UpdateSongsBySongID, UpdateSongsBySongID) {
SongList changed_songs = spy3[0][0].value<SongList>();
EXPECT_EQ(changed_songs.count(), 2);
EXPECT_EQ(changed_songs[0].song_id(), QStringLiteral("song1"));
EXPECT_EQ(changed_songs[1].song_id(), QStringLiteral("song6"));
EXPECT_EQ(changed_songs[0].song_id(), u"song1"_s);
EXPECT_EQ(changed_songs[1].song_id(), u"song6"_s);
}