Formatting

2025-12-08 23:49:48 +01:00
parent 109ff90401
commit 93af866185
179 changed files with 1187 additions and 1269 deletions
--- a/tests/src/collectionbackend_test.cpp
+++ b/tests/src/collectionbackend_test.cpp
@@ -441,7 +441,7 @@ class UpdateSongsBySongID : public CollectionBackendTest {

 TEST_F(UpdateSongsBySongID, UpdateSongsBySongID) {

-    const QStringList song_ids = QStringList() << u"song1"_s
+  const QStringList song_ids = QStringList()   << u"song1"_s
                                               << u"song2"_s
                                               << u"song3"_s
                                               << u"song4"_s
--- a/tests/src/collectionmodel_test.cpp
+++ b/tests/src/collectionmodel_test.cpp
@@ -203,8 +203,8 @@ TEST_F(CollectionModelTest, UnknownAlbums) {
 TEST_F(CollectionModelTest, VariousArtistSongs) {

  SongList songs;
-  for (int i=0 ; i < 4 ; ++i) {
-    QString n = QString::number(i+1);
+  for (int i = 0 ; i < 4 ; ++i) {
+    QString n = QString::number(i + 1);
    Song song;
    song.Init(u"Title "_s + n, u"Artist "_s + n, u"Album"_s, 0);
    song.set_mtime(0);
@@ -218,7 +218,7 @@ TEST_F(CollectionModelTest, VariousArtistSongs) {
  songs[2].set_compilation_on(true);
  songs[3].set_compilation_detected(true); songs[3].set_artist(u"Various Artists"_s);

-  for (int i=0 ; i < 4 ; ++i)
+  for (int i = 0 ; i < 4 ; ++i)
    AddSong(songs[i]);

  QModelIndex artist_index = model_->index(0, 0, QModelIndex());
--- a/tests/src/concurrentrun_test.cpp
+++ b/tests/src/concurrentrun_test.cpp
@@ -87,19 +87,19 @@ TEST(ConcurrentRunTest, ConcurrentRun3StartAndWait) {

 }

-void aFunction(int* n);
-void aFunction(int* n) {
+void aFunction(int *n);
+void aFunction(int *n) {
  *n = 1337;
 }

-void bFunction(int* n, int *m);
-void bFunction(int* n, int *m) {
+void bFunction(int *n, int *m);
+void bFunction(int *n, int *m) {
  aFunction(n);
  *m = 1338;
 }

-void cFunction(int* n, int *m, int *o);
-void cFunction(int* n, int *m, int *o) {
+void cFunction(int *n, int *m, int *o);
+void cFunction(int *n, int *m, int *o) {
  bFunction(n, m);
  *o = 1339;
 }
@@ -154,7 +154,7 @@ TEST(ConcurrentRunTest, ConcurrentRunVoidFunction3Start) {

 class A {
 public:
-  void f(int* i) {
+  void f(int *i) {
    *i = *i + 1;
  }
 };
--- a/tests/src/main.cpp
+++ b/tests/src/main.cpp
@@ -30,7 +30,7 @@
 #include "metatypes_env.h"
 #include "resources_env.h"

-int main(int argc, char** argv) {
+int main(int argc, char **argv) {

  testing::InitGoogleMock(&argc, argv);

--- a/tests/src/mergedproxymodel_test.cpp
+++ b/tests/src/mergedproxymodel_test.cpp
@@ -60,8 +60,8 @@ TEST_F(MergedProxyModelTest, Flat) {

 TEST_F(MergedProxyModelTest, Tree) {

-  QStandardItem* one = new QStandardItem(u"one"_s);
-  QStandardItem* two = new QStandardItem(u"two"_s);
+  QStandardItem *one = new QStandardItem(u"one"_s);
+  QStandardItem *two = new QStandardItem(u"two"_s);
  source_.appendRow(one);
  one->appendRow(two);

--- a/tests/src/mock_networkaccessmanager.cpp
+++ b/tests/src/mock_networkaccessmanager.cpp
@@ -41,13 +41,13 @@ using ::testing::Return;

 class RequestForUrlMatcher : public MatcherInterface<const QNetworkRequest&> {
 public:
-  RequestForUrlMatcher(const QString& contains, const QMap<QString, QString> &expected_params)
+  RequestForUrlMatcher(const QString &contains, const QMap<QString, QString> &expected_params)
      : contains_(contains), expected_params_(expected_params) {}

  ~RequestForUrlMatcher() override = default;

-  virtual bool Matches(const QNetworkRequest& req) const {
-    const QUrl& url = req.url();
+  virtual bool Matches(const QNetworkRequest &req) const {
+    const QUrl &url = req.url();

    if (!url.toString().contains(contains_)) {
      return false;
@@ -62,12 +62,12 @@ class RequestForUrlMatcher : public MatcherInterface<const QNetworkRequest&> {
    return true;
  }

-  bool MatchAndExplain(const QNetworkRequest& req, MatchResultListener* listener) const override {
+  bool MatchAndExplain(const QNetworkRequest &req, MatchResultListener *listener) const override {
    *listener << "which is " << req.url().toString().toUtf8().constData();
    return Matches(req);
  }

-  void DescribeTo(::std::ostream* os) const override {
+  void DescribeTo(::std::ostream *os) const override {
    *os << "matches url";
  }

@@ -83,12 +83,12 @@ inline Matcher<const QNetworkRequest&> RequestForUrl(const QString &contains, co
  return MakeMatcher(new RequestForUrlMatcher(contains, params));
 }

-MockNetworkReply* MockNetworkAccessManager::ExpectGet(const QString &contains, const QMap<QString, QString> &expected_params, int status, const QByteArray &data) {
+MockNetworkReply *MockNetworkAccessManager::ExpectGet(const QString &contains, const QMap<QString, QString> &expected_params, int status, const QByteArray &data) {

-  MockNetworkReply* reply = new MockNetworkReply(data);
+  MockNetworkReply *reply = new MockNetworkReply(data);
  reply->setAttribute(QNetworkRequest::HttpStatusCodeAttribute, status);

-  EXPECT_CALL(*this, createRequest(GetOperation, RequestForUrl(contains, expected_params), nullptr)). WillOnce(Return(reply));
+  EXPECT_CALL(*this, createRequest(GetOperation, RequestForUrl(contains, expected_params), nullptr)).WillOnce(Return(reply));

  return reply;

--- a/tests/src/mock_networkaccessmanager.h
+++ b/tests/src/mock_networkaccessmanager.h
@@ -53,8 +53,8 @@ class MockNetworkReply : public QNetworkReply {

 protected:
  MOCK_METHOD0(abort, void());  // clazy:exclude=returning-void-expression,function-args-by-value
-  qint64 readData(char* data, qint64) override;
-  qint64 writeData(const char* data, qint64) override;
+  qint64 readData(char *data, qint64) override;
+  qint64 writeData(const char *data, qint64) override;

  QByteArray data_;
  qint64 pos_;
@@ -68,7 +68,7 @@ class MockNetworkAccessManager : public QNetworkAccessManager {
      const QString& contains,  // A string that should be present in the URL.
      const QMap<QString, QString>& params,  // Required URL parameters.
      int status,  // Returned HTTP status code.
-      const QByteArray& ret_data);  // Returned data.
+      const QByteArray &ret_data);  // Returned data.
 protected:
  MOCK_METHOD3(createRequest, QNetworkReply*(Operation, const QNetworkRequest&, QIODevice*));  // clazy:exclude=function-args-by-value
 };
--- a/tests/src/organizeformat_test.cpp
+++ b/tests/src/organizeformat_test.cpp
@@ -35,7 +35,7 @@ using namespace Qt::Literals::StringLiterals;
 // clazy:excludeall=returning-void-expression

 class OrganizeFormatTest : public ::testing::Test {
-protected:
+ protected:
  OrganizeFormat format_;
  Song song_;
 };
--- a/tests/src/playlist_test.cpp
+++ b/tests/src/playlist_test.cpp
@@ -44,8 +44,8 @@ namespace {
 class PlaylistTest : public ::testing::Test {
 protected:
  PlaylistTest()
-    : playlist_(nullptr, nullptr, nullptr, nullptr, nullptr, 1),
-      sequence_(nullptr, new DummySettingsProvider) {}
+      : playlist_(nullptr, nullptr, nullptr, nullptr, nullptr, 1),
+        sequence_(nullptr, new DummySettingsProvider) {}

  void SetUp() override {
    playlist_.set_sequence(&sequence_);
@@ -439,7 +439,7 @@ TEST_F(PlaylistTest, ShuffleThenNext) {
  // Add 100 items
  PlaylistItemPtrList items;
  items.reserve(100);
-  for (int i=0 ; i<100 ; ++i)
+  for (int i = 0 ; i < 100 ; ++i)
    items << MakeMockItemP(u"Item "_s + QString::number(i));
  playlist_.InsertItems(items);

@@ -448,7 +448,7 @@ TEST_F(PlaylistTest, ShuffleThenNext) {
  // Shuffle until the current index is not at the end
  Q_FOREVER {
    playlist_.Shuffle();
-    if (playlist_.current_row() != items.count()-1)
+    if (playlist_.current_row() != items.count() - 1)
      break;
  }

@@ -456,21 +456,21 @@ TEST_F(PlaylistTest, ShuffleThenNext) {
  EXPECT_EQ(u"Item 0"_s, playlist_.current_item()->EffectiveMetadata().title());
  EXPECT_EQ(u"Item 0"_s, playlist_.data(playlist_.index(index, static_cast<int>(Playlist::Column::Title))));
  EXPECT_EQ(index, playlist_.last_played_row());
-  //EXPECT_EQ(index + 1, playlist_.next_row());
+  // EXPECT_EQ(index + 1, playlist_.next_row());

  // Shuffle until the current index *is* at the end
-  //forever {
-    //playlist_.Shuffle();
-    //if (playlist_.current_row() == items.count()-1)
-      //break;
-  //}
+  // forever {
+  // playlist_.Shuffle();
+  // if (playlist_.current_row() == items.count()-1)
+  // break;
+  // }

  index = playlist_.current_row();
  EXPECT_EQ(u"Item 0"_s, playlist_.current_item()->EffectiveMetadata().title());
  EXPECT_EQ(u"Item 0"_s, playlist_.data(playlist_.index(index, static_cast<int>(Playlist::Column::Title))));
  EXPECT_EQ(index, playlist_.last_played_row());
-  //EXPECT_EQ(-1, playlist_.next_row());
-  //EXPECT_EQ(index-1, playlist_.previous_row());
+  // EXPECT_EQ(-1, playlist_.next_row());
+  // EXPECT_EQ(index-1, playlist_.previous_row());

 }

--- a/tests/src/songplaylistitem_test.cpp
+++ b/tests/src/songplaylistitem_test.cpp
@@ -70,8 +70,7 @@ INSTANTIATE_TEST_SUITE_P(RealFiles, SongPlaylistItemTest, testing::Values(  // c
    "normalfile.flac",
    "file with spaces.flac",
    "file with # hash.flac",
-    "file with ? question.flac"
-));
+    "file with ? question.flac"));

 TEST_P(SongPlaylistItemTest, Url) {
  QUrl expected;
@@ -82,5 +81,4 @@ TEST_P(SongPlaylistItemTest, Url) {
 }


-}  //namespace
-
+}  // namespace
--- a/tests/src/tagreader_test.cpp
+++ b/tests/src/tagreader_test.cpp
@@ -232,7 +232,7 @@ TEST_F(TagReaderTest, TestFLACAudioFileTagging) {
    EXPECT_EQ(12, song.track());
    EXPECT_EQ(1234, song.disc());
    EXPECT_EQ(2019, song.year());
-    //EXPECT_EQ(2019, song.originalyear());
+    // EXPECT_EQ(2019, song.originalyear());
  }

  { // Write new tags
@@ -281,7 +281,7 @@ TEST_F(TagReaderTest, TestFLACAudioFileTagging) {
    EXPECT_EQ(21, song.track());
    EXPECT_EQ(4321, song.disc());
    EXPECT_EQ(9102, song.year());
-    //EXPECT_EQ(9102, song.originalyear());
+    // EXPECT_EQ(9102, song.originalyear());
  }

  { // Write original tags
@@ -330,7 +330,7 @@ TEST_F(TagReaderTest, TestFLACAudioFileTagging) {
    EXPECT_EQ(12, song.track());
    EXPECT_EQ(1234, song.disc());
    EXPECT_EQ(2019, song.year());
-    //EXPECT_EQ(2019, song.originalyear());
+    // EXPECT_EQ(2019, song.originalyear());
  }

  { // Compare checksums
@@ -344,7 +344,7 @@ TEST_F(TagReaderTest, TestFLACAudioFileTagging) {
  { // Compare checksums
    QString sha256sum = SHA256SUM(r.fileName());
    EXPECT_FALSE(sha256sum.isEmpty());
-    //EXPECT_EQ(sha256sum, sha256sum_notags);
+    // EXPECT_EQ(sha256sum, sha256sum_notags);
  }

 }
@@ -421,7 +421,7 @@ TEST_F(TagReaderTest, TestWavPackAudioFileTagging) {
    EXPECT_EQ(12, song.track());
    EXPECT_EQ(1234, song.disc());
    EXPECT_EQ(2019, song.year());
-    //EXPECT_EQ(2019, song.originalyear());
+    // EXPECT_EQ(2019, song.originalyear());
  }

  { // Write new tags
@@ -458,7 +458,7 @@ TEST_F(TagReaderTest, TestWavPackAudioFileTagging) {
    EXPECT_EQ(21, song.track());
    EXPECT_EQ(4321, song.disc());
    EXPECT_EQ(9102, song.year());
-    //EXPECT_EQ(9102, song.originalyear());
+    // EXPECT_EQ(9102, song.originalyear());
  }

  { // Write original tags
@@ -495,7 +495,7 @@ TEST_F(TagReaderTest, TestWavPackAudioFileTagging) {
    EXPECT_EQ(12, song.track());
    EXPECT_EQ(1234, song.disc());
    EXPECT_EQ(2019, song.year());
-    //EXPECT_EQ(2019, song.originalyear());
+    // EXPECT_EQ(2019, song.originalyear());
  }

  { // Compare checksums
@@ -509,7 +509,7 @@ TEST_F(TagReaderTest, TestWavPackAudioFileTagging) {
  { // Compare checksums
    QString sha256sum = SHA256SUM(r.fileName());
    EXPECT_FALSE(sha256sum.isEmpty());
-    //EXPECT_EQ(sha256sum, sha256sum_notags);
+    // EXPECT_EQ(sha256sum, sha256sum_notags);
  }

 }
@@ -586,7 +586,7 @@ TEST_F(TagReaderTest, TestOggFLACAudioFileTagging) {
    EXPECT_EQ(12, song.track());
    EXPECT_EQ(1234, song.disc());
    EXPECT_EQ(2019, song.year());
-    //EXPECT_EQ(2019, song.originalyear());
+    // EXPECT_EQ(2019, song.originalyear());
  }

  { // Write new tags
@@ -623,7 +623,7 @@ TEST_F(TagReaderTest, TestOggFLACAudioFileTagging) {
    EXPECT_EQ(21, song.track());
    EXPECT_EQ(4321, song.disc());
    EXPECT_EQ(9102, song.year());
-    //EXPECT_EQ(9102, song.originalyear());
+    // EXPECT_EQ(9102, song.originalyear());
  }

  { // Write original tags
@@ -660,7 +660,7 @@ TEST_F(TagReaderTest, TestOggFLACAudioFileTagging) {
    EXPECT_EQ(12, song.track());
    EXPECT_EQ(1234, song.disc());
    EXPECT_EQ(2019, song.year());
-    //EXPECT_EQ(2019, song.originalyear());
+    // EXPECT_EQ(2019, song.originalyear());
  }

  { // Compare checksums
@@ -674,7 +674,7 @@ TEST_F(TagReaderTest, TestOggFLACAudioFileTagging) {
  { // Compare checksums
    QString sha256sum = SHA256SUM(r.fileName());
    EXPECT_FALSE(sha256sum.isEmpty());
-    //EXPECT_EQ(sha256sum, sha256sum_notags);
+    // EXPECT_EQ(sha256sum, sha256sum_notags);
  }

 }
@@ -751,7 +751,7 @@ TEST_F(TagReaderTest, TestOggVorbisAudioFileTagging) {
    EXPECT_EQ(12, song.track());
    EXPECT_EQ(1234, song.disc());
    EXPECT_EQ(2019, song.year());
-    //EXPECT_EQ(2019, song.originalyear());
+    // EXPECT_EQ(2019, song.originalyear());
  }

  { // Write new tags
@@ -787,7 +787,7 @@ TEST_F(TagReaderTest, TestOggVorbisAudioFileTagging) {
    EXPECT_EQ(21, song.track());
    EXPECT_EQ(4321, song.disc());
    EXPECT_EQ(9102, song.year());
-    //EXPECT_EQ(9102, song.originalyear());
+    // EXPECT_EQ(9102, song.originalyear());
  }

  { // Write original tags
@@ -824,7 +824,7 @@ TEST_F(TagReaderTest, TestOggVorbisAudioFileTagging) {
    EXPECT_EQ(12, song.track());
    EXPECT_EQ(1234, song.disc());
    EXPECT_EQ(2019, song.year());
-    //EXPECT_EQ(2019, song.originalyear());
+    // EXPECT_EQ(2019, song.originalyear());
  }

  { // Compare checksums
@@ -838,7 +838,7 @@ TEST_F(TagReaderTest, TestOggVorbisAudioFileTagging) {
  {  // Compare checksums
    QString sha256sum = SHA256SUM(r.fileName());
    EXPECT_FALSE(sha256sum.isEmpty());
-    //EXPECT_EQ(sha256sum, sha256sum_notags);
+    // EXPECT_EQ(sha256sum, sha256sum_notags);
  }

 }
@@ -915,7 +915,7 @@ TEST_F(TagReaderTest, TestOggOpusAudioFileTagging) {
    EXPECT_EQ(12, song.track());
    EXPECT_EQ(1234, song.disc());
    EXPECT_EQ(2019, song.year());
-    //EXPECT_EQ(2019, song.originalyear());
+    // EXPECT_EQ(2019, song.originalyear());
  }

  { // Write new tags
@@ -952,7 +952,7 @@ TEST_F(TagReaderTest, TestOggOpusAudioFileTagging) {
    EXPECT_EQ(21, song.track());
    EXPECT_EQ(4321, song.disc());
    EXPECT_EQ(9102, song.year());
-    //EXPECT_EQ(9102, song.originalyear());
+    // EXPECT_EQ(9102, song.originalyear());
  }

  { // Write original tags
@@ -989,7 +989,7 @@ TEST_F(TagReaderTest, TestOggOpusAudioFileTagging) {
    EXPECT_EQ(12, song.track());
    EXPECT_EQ(1234, song.disc());
    EXPECT_EQ(2019, song.year());
-    //EXPECT_EQ(2019, song.originalyear());
+    // EXPECT_EQ(2019, song.originalyear());
  }

  { // Compare checksums
@@ -1003,7 +1003,7 @@ TEST_F(TagReaderTest, TestOggOpusAudioFileTagging) {
  { // Compare checksums
    QString sha256sum = SHA256SUM(r.fileName());
    EXPECT_FALSE(sha256sum.isEmpty());
-    //EXPECT_EQ(sha256sum, sha256sum_notags);
+    // EXPECT_EQ(sha256sum, sha256sum_notags);
  }

 }
@@ -1080,7 +1080,7 @@ TEST_F(TagReaderTest, TestOggSpeexAudioFileTagging) {
    EXPECT_EQ(12, song.track());
    EXPECT_EQ(1234, song.disc());
    EXPECT_EQ(2019, song.year());
-    //EXPECT_EQ(2019, song.originalyear());
+    // EXPECT_EQ(2019, song.originalyear());
  }

  { // Write new tags
@@ -1117,7 +1117,7 @@ TEST_F(TagReaderTest, TestOggSpeexAudioFileTagging) {
    EXPECT_EQ(21, song.track());
    EXPECT_EQ(4321, song.disc());
    EXPECT_EQ(9102, song.year());
-    //EXPECT_EQ(9102, song.originalyear());
+    // EXPECT_EQ(9102, song.originalyear());
  }

  { // Write original tags
@@ -1154,7 +1154,7 @@ TEST_F(TagReaderTest, TestOggSpeexAudioFileTagging) {
    EXPECT_EQ(12, song.track());
    EXPECT_EQ(1234, song.disc());
    EXPECT_EQ(2019, song.year());
-    //EXPECT_EQ(2019, song.originalyear());
+    // EXPECT_EQ(2019, song.originalyear());
  }

  { // Compare checksums
@@ -1168,7 +1168,7 @@ TEST_F(TagReaderTest, TestOggSpeexAudioFileTagging) {
  {  // Compare checksums
    QString sha256sum = SHA256SUM(r.fileName());
    EXPECT_FALSE(sha256sum.isEmpty());
-    //EXPECT_EQ(sha256sum, sha256sum_notags);
+    // EXPECT_EQ(sha256sum, sha256sum_notags);
  }

 }
@@ -1235,17 +1235,17 @@ TEST_F(TagReaderTest, TestAIFFAudioFileTagging) {
    EXPECT_EQ(u"strawberry title"_s, song.title());
    EXPECT_EQ(u"strawberry artist"_s, song.artist());
    EXPECT_EQ(u"strawberry album"_s, song.album());
-    //EXPECT_EQ(u"strawberry album artist"_s, song.albumartist());
-    //EXPECT_EQ(u"strawberry composer"_s, song.composer());
-    //EXPECT_EQ(u"strawberry performer"_s, song.performer());
-    //EXPECT_EQ(u"strawberry grouping"_s, song.grouping());
+    // EXPECT_EQ(u"strawberry album artist"_s, song.albumartist());
+    // EXPECT_EQ(u"strawberry composer"_s, song.composer());
+    // EXPECT_EQ(u"strawberry performer"_s, song.performer());
+    // EXPECT_EQ(u"strawberry grouping"_s, song.grouping());
    EXPECT_EQ(u"strawberry genre"_s, song.genre());
    EXPECT_EQ(u"strawberry comment"_s, song.comment());
-    //EXPECT_EQ(u"strawberry lyrics"_s, song.lyrics());
+    // EXPECT_EQ(u"strawberry lyrics"_s, song.lyrics());
    EXPECT_EQ(12, song.track());
-    //EXPECT_EQ(1234, song.disc());
+    // EXPECT_EQ(1234, song.disc());
    EXPECT_EQ(2019, song.year());
-    //EXPECT_EQ(2019, song.originalyear());
+    // EXPECT_EQ(2019, song.originalyear());
  }

  { // Write new tags
@@ -1272,17 +1272,17 @@ TEST_F(TagReaderTest, TestAIFFAudioFileTagging) {
    EXPECT_EQ(u"new title"_s, song.title());
    EXPECT_EQ(u"new artist"_s, song.artist());
    EXPECT_EQ(u"new album"_s, song.album());
-    //EXPECT_EQ(u"new album artist"_s, song.albumartist());
-    //EXPECT_EQ(u"new composer"_s, song.composer());
-    //EXPECT_EQ(u"new performer"_s, song.performer());
-    //EXPECT_EQ(u"new grouping"_s, song.grouping());
+    // EXPECT_EQ(u"new album artist"_s, song.albumartist());
+    // EXPECT_EQ(u"new composer"_s, song.composer());
+    // EXPECT_EQ(u"new performer"_s, song.performer());
+    // EXPECT_EQ(u"new grouping"_s, song.grouping());
    EXPECT_EQ(u"new genre"_s, song.genre());
    EXPECT_EQ(u"new comment"_s, song.comment());
-    //EXPECT_EQ(u"new lyrics"_s, song.lyrics());
+    // EXPECT_EQ(u"new lyrics"_s, song.lyrics());
    EXPECT_EQ(21, song.track());
-    //EXPECT_EQ(4321, song.disc());
+    // EXPECT_EQ(4321, song.disc());
    EXPECT_EQ(9102, song.year());
-    //EXPECT_EQ(9102, song.originalyear());
+    // EXPECT_EQ(9102, song.originalyear());
  }

  {  // Write original tags
@@ -1309,17 +1309,17 @@ TEST_F(TagReaderTest, TestAIFFAudioFileTagging) {
    EXPECT_EQ(u"strawberry title"_s, song.title());
    EXPECT_EQ(u"strawberry artist"_s, song.artist());
    EXPECT_EQ(u"strawberry album"_s, song.album());
-    //EXPECT_EQ(u"strawberry album artist"_s, song.albumartist());
-    //EXPECT_EQ(u"strawberry composer"_s, song.composer());
-    //EXPECT_EQ(u"strawberry performer"_s, song.performer());
-    //EXPECT_EQ(u"strawberry grouping"_s, song.grouping());
+    // EXPECT_EQ(u"strawberry album artist"_s, song.albumartist());
+    // EXPECT_EQ(u"strawberry composer"_s, song.composer());
+    // EXPECT_EQ(u"strawberry performer"_s, song.performer());
+    // EXPECT_EQ(u"strawberry grouping"_s, song.grouping());
    EXPECT_EQ(u"strawberry genre"_s, song.genre());
    EXPECT_EQ(u"strawberry comment"_s, song.comment());
-    //EXPECT_EQ(u"strawberry lyrics"_s, song.lyrics());
+    // EXPECT_EQ(u"strawberry lyrics"_s, song.lyrics());
    EXPECT_EQ(12, song.track());
-    //EXPECT_EQ(1234, song.disc());
+    // EXPECT_EQ(1234, song.disc());
    EXPECT_EQ(2019, song.year());
-    //EXPECT_EQ(2019, song.originalyear());
+    // EXPECT_EQ(2019, song.originalyear());
  }

  {  // Compare checksums
@@ -1402,8 +1402,8 @@ TEST_F(TagReaderTest, TestASFAudioFileTagging) {
    EXPECT_EQ(u"strawberry album"_s, song.album());
    EXPECT_EQ(u"strawberry album artist"_s, song.albumartist());
    EXPECT_EQ(u"strawberry composer"_s, song.composer());
-    //EXPECT_EQ(u"strawberry performer"_s, song.performer());
-    //EXPECT_EQ(u"strawberry grouping"_s, song.grouping());
+    // EXPECT_EQ(u"strawberry performer"_s, song.performer());
+    // EXPECT_EQ(u"strawberry grouping"_s, song.grouping());
    EXPECT_EQ(u"strawberry genre"_s, song.genre());
    EXPECT_EQ(u"strawberry comment"_s, song.comment());
    EXPECT_EQ(u"strawberry lyrics"_s, song.lyrics());
@@ -1440,8 +1440,8 @@ TEST_F(TagReaderTest, TestASFAudioFileTagging) {
    EXPECT_EQ(u"new album"_s, song.album());
    EXPECT_EQ(u"new album artist"_s, song.albumartist());
    EXPECT_EQ(u"new composer"_s, song.composer());
-    //EXPECT_EQ(u"new performer"_s, song.performer());
-    //EXPECT_EQ(u"new grouping"_s, song.grouping());
+    // EXPECT_EQ(u"new performer"_s, song.performer());
+    // EXPECT_EQ(u"new grouping"_s, song.grouping());
    EXPECT_EQ(u"new genre"_s, song.genre());
    EXPECT_EQ(u"new comment"_s, song.comment());
    EXPECT_EQ(u"new lyrics"_s, song.lyrics());
@@ -1477,8 +1477,8 @@ TEST_F(TagReaderTest, TestASFAudioFileTagging) {
    EXPECT_EQ(u"strawberry album"_s, song.album());
    EXPECT_EQ(u"strawberry album artist"_s, song.albumartist());
    EXPECT_EQ(u"strawberry composer"_s, song.composer());
-    //EXPECT_EQ(u"strawberry performer"_s, song.performer());
-    //EXPECT_EQ(u"strawberry grouping"_s, song.grouping());
+    // EXPECT_EQ(u"strawberry performer"_s, song.performer());
+    // EXPECT_EQ(u"strawberry grouping"_s, song.grouping());
    EXPECT_EQ(u"strawberry genre"_s, song.genre());
    EXPECT_EQ(u"strawberry comment"_s, song.comment());
    EXPECT_EQ(u"strawberry lyrics"_s, song.lyrics());
@@ -1491,7 +1491,7 @@ TEST_F(TagReaderTest, TestASFAudioFileTagging) {
  { // Compare checksums
    QString sha256sum = SHA256SUM(r.fileName());
    EXPECT_FALSE(sha256sum.isEmpty());
-    //EXPECT_EQ(sha256sum_tags, sha256sum);
+    // EXPECT_EQ(sha256sum_tags, sha256sum);
  }

  WriteSongToFile(orig_song, r.fileName());
@@ -1499,7 +1499,7 @@ TEST_F(TagReaderTest, TestASFAudioFileTagging) {
  { // Compare checksums
    QString sha256sum = SHA256SUM(r.fileName());
    EXPECT_FALSE(sha256sum.isEmpty());
-    //EXPECT_EQ(sha256sum, sha256sum_notags);
+    // EXPECT_EQ(sha256sum, sha256sum_notags);
  }

 }
@@ -1586,7 +1586,7 @@ TEST_F(TagReaderTest, TestMP3AudioFileTagging) {
    EXPECT_EQ(12, song.track());
    EXPECT_EQ(1234, song.disc());
    EXPECT_EQ(2019, song.year());
-    //EXPECT_EQ(2019, song.originalyear());
+    // EXPECT_EQ(2019, song.originalyear());
  }

  { // Write new tags
@@ -1633,7 +1633,7 @@ TEST_F(TagReaderTest, TestMP3AudioFileTagging) {
    EXPECT_EQ(u"new lyrics"_s, song.lyrics());
    EXPECT_EQ(21, song.track());
    EXPECT_EQ(9102, song.year());
-    //EXPECT_EQ(9102, song.originalyear());
+    // EXPECT_EQ(9102, song.originalyear());
  }

  { // Write original tags
@@ -1680,7 +1680,7 @@ TEST_F(TagReaderTest, TestMP3AudioFileTagging) {
    EXPECT_EQ(12, song.track());
    EXPECT_EQ(1234, song.disc());
    EXPECT_EQ(2019, song.year());
-    //EXPECT_EQ(2019, song.originalyear());
+    // EXPECT_EQ(2019, song.originalyear());
  }

  { // Compare checksums
@@ -1694,7 +1694,7 @@ TEST_F(TagReaderTest, TestMP3AudioFileTagging) {
  { // Compare checksums
    QString sha256sum = SHA256SUM(r.fileName());
    EXPECT_FALSE(sha256sum.isEmpty());
-    //EXPECT_EQ(sha256sum, sha256sum_notags);
+    // EXPECT_EQ(sha256sum, sha256sum_notags);
  }

 }
@@ -1763,7 +1763,7 @@ TEST_F(TagReaderTest, TestM4AAudioFileTagging) {
    EXPECT_EQ(u"strawberry album"_s, song.album());
    EXPECT_EQ(u"strawberry album artist"_s, song.albumartist());
    EXPECT_EQ(u"strawberry composer"_s, song.composer());
-    //EXPECT_EQ(u"strawberry performer"_s, song.performer());
+    // EXPECT_EQ(u"strawberry performer"_s, song.performer());
    EXPECT_EQ(u"strawberry grouping"_s, song.grouping());
    EXPECT_EQ(u"strawberry genre"_s, song.genre());
    EXPECT_EQ(u"strawberry comment"_s, song.comment());
@@ -1771,7 +1771,7 @@ TEST_F(TagReaderTest, TestM4AAudioFileTagging) {
    EXPECT_EQ(12, song.track());
    EXPECT_EQ(1234, song.disc());
    EXPECT_EQ(2019, song.year());
-    //EXPECT_EQ(2019, song.originalyear());
+    // EXPECT_EQ(2019, song.originalyear());
  }

  { // Write new tags
@@ -1800,7 +1800,7 @@ TEST_F(TagReaderTest, TestM4AAudioFileTagging) {
    EXPECT_EQ(u"new album"_s, song.album());
    EXPECT_EQ(u"new album artist"_s, song.albumartist());
    EXPECT_EQ(u"new composer"_s, song.composer());
-    //EXPECT_EQ(u"new performer"_s, song.performer());
+    // EXPECT_EQ(u"new performer"_s, song.performer());
    EXPECT_EQ(u"new grouping"_s, song.grouping());
    EXPECT_EQ(u"new genre"_s, song.genre());
    EXPECT_EQ(u"new comment"_s, song.comment());
@@ -1808,7 +1808,7 @@ TEST_F(TagReaderTest, TestM4AAudioFileTagging) {
    EXPECT_EQ(21, song.track());
    EXPECT_EQ(4321, song.disc());
    EXPECT_EQ(9102, song.year());
-    //EXPECT_EQ(9102, song.originalyear());
+    // EXPECT_EQ(9102, song.originalyear());
  }

  { // Write original tags
@@ -1837,7 +1837,7 @@ TEST_F(TagReaderTest, TestM4AAudioFileTagging) {
    EXPECT_EQ(u"strawberry album"_s, song.album());
    EXPECT_EQ(u"strawberry album artist"_s, song.albumartist());
    EXPECT_EQ(u"strawberry composer"_s, song.composer());
-    //EXPECT_EQ(u"strawberry performer"_s, song.performer());
+    // EXPECT_EQ(u"strawberry performer"_s, song.performer());
    EXPECT_EQ(u"strawberry grouping"_s, song.grouping());
    EXPECT_EQ(u"strawberry genre"_s, song.genre());
    EXPECT_EQ(u"strawberry comment"_s, song.comment());
@@ -1845,13 +1845,13 @@ TEST_F(TagReaderTest, TestM4AAudioFileTagging) {
    EXPECT_EQ(12, song.track());
    EXPECT_EQ(1234, song.disc());
    EXPECT_EQ(2019, song.year());
-    //EXPECT_EQ(2019, song.originalyear());
+    // EXPECT_EQ(2019, song.originalyear());
  }

  { // Compare checksums
    QString sha256sum = SHA256SUM(r.fileName());
    EXPECT_FALSE(sha256sum.isEmpty());
-    //EXPECT_EQ(sha256sum_tags, sha256sum);
+    // EXPECT_EQ(sha256sum_tags, sha256sum);
  }

  WriteSongToFile(orig_song, r.fileName());
@@ -1859,7 +1859,7 @@ TEST_F(TagReaderTest, TestM4AAudioFileTagging) {
  { // Compare checksums
    QString sha256sum = SHA256SUM(r.fileName());
    EXPECT_FALSE(sha256sum.isEmpty());
-    //EXPECT_EQ(sha256sum, sha256sum_notags);
+    // EXPECT_EQ(sha256sum, sha256sum_notags);
  }

 }
--- a/tests/src/test_utils.cpp
+++ b/tests/src/test_utils.cpp
@@ -35,17 +35,17 @@ std::ostream &operator<<(std::ostream &stream, const QString &str) {
  return stream;
 }

-std::ostream &operator <<(std::ostream &stream, const QUrl &url) {
+std::ostream &operator<<(std::ostream &stream, const QUrl &url) {
  stream << url.toString().toStdString();
  return stream;
 }

-std::ostream &operator <<(std::ostream &stream, const QNetworkRequest &req) {
+std::ostream &operator<<(std::ostream &stream, const QNetworkRequest &req) {
  stream << req.url().toString().toStdString();
  return stream;
 }

-std::ostream &operator <<(std::ostream &stream, const QVariant &var) {
+std::ostream &operator<<(std::ostream &stream, const QVariant &var) {
  stream << var.toString().toStdString();
  return stream;
 }
@@ -78,8 +78,8 @@ TemporaryResource::TemporaryResource(const QString &filename, QObject *parent) :
 }

 TestQObject::TestQObject(QObject *parent)
-  : QObject(parent),
-    invoked_(0) {
+    : QObject(parent),
+      invoked_(0) {
 }

 void TestQObject::Emit() {
--- a/tests/src/test_utils.h
+++ b/tests/src/test_utils.h
@@ -32,24 +32,24 @@ class QString;
 class QUrl;
 class QVariant;

-std::ostream& operator <<(std::ostream& stream, const QString& str);
-std::ostream& operator <<(std::ostream& stream, const QVariant& var);
-std::ostream& operator <<(std::ostream& stream, const QUrl& url);
-std::ostream& operator <<(std::ostream& stream, const QNetworkRequest& req);
+std::ostream &operator<<(std::ostream &stream, const QString &str);
+std::ostream &operator<<(std::ostream &stream, const QVariant &var);
+std::ostream &operator<<(std::ostream &stream, const QUrl &url);
+std::ostream &operator<<(std::ostream &stream, const QNetworkRequest &req);

-template <typename T>
-std::ostream& operator <<(std::ostream& stream, const QList<T>& list) {
+template<typename T>
+std::ostream &operator<<(std::ostream &stream, const QList<T> &list) {
  stream << "QList(";
-  for (const T& item : list) {
+  for (const T &item : list) {
    stream << item << ",";
  }
  stream << ")";
  return stream;
 }

-void PrintTo(const ::QString& str, std::ostream& os);
-void PrintTo(const ::QVariant& var, std::ostream& os);
-void PrintTo(const ::QUrl& url, std::ostream& os);
+void PrintTo(const ::QString &str, std::ostream &os);
+void PrintTo(const ::QVariant &var, std::ostream &os);
+void PrintTo(const ::QUrl &url, std::ostream &os);

 #define EXPOSE_SIGNAL0(n) \
    void Emit##n() { emit n(); }