Skip to content

Commit b44e2bc

Browse files
daschuerdaschuer
authored
Merge pull request mixxxdj#15722 from ronso0/soundsource-nonlatin-char-test
SoundSource test: add non-latin chars to test file names
2 parents e3d8df7 + c1afde6 commit b44e2bc

26 files changed

Lines changed: 105 additions & 127 deletions

‎src/test/autodjprocessor_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ using ::testing::Return;
2525
namespace {
2626
const int kDefaultTransitionTime = 10;
2727
const mixxx::audio::ChannelCount kChannelCount = mixxx::kEngineChannelOutputCount;
28-
const QString kTrackLocationTest = QStringLiteral("id3-test-data/cover-test-png.mp3");
28+
const QString kTrackLocationTest = QStringLiteral("id3-test-data/cover-test-øé~ł€˚-png.mp3");
2929
const QString kAppGroup = QStringLiteral("[App]");
3030
} // namespace
3131

‎src/test/coverartcache_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class CoverArtCacheTest : public LibraryTest, public CoverArtCache {
5555

5656
const QString kCoverFileTest = QStringLiteral("cover_test.jpg");
5757
const QString kCoverLocationTest = QStringLiteral("id3-test-data/") + kCoverFileTest;
58-
const QString kTrackLocationTest = QStringLiteral("id3-test-data/cover-test-png.mp3");
58+
const QString kTrackLocationTest = QStringLiteral("id3-test-data/cover-test-øé~ł€˚-png.mp3");
5959

6060
// We need 3 separate test cases:
6161
// 1) loadCoverFromMetadata()

‎src/test/coverartutils_test.cpp‎

Lines changed: 13 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -36,68 +36,54 @@ TEST_F(CoverArtUtilTest, extractEmbeddedCover) {
3636
QImage referenceJPGImage = QImage(getTestDir().filePath(kReferenceJPGLocationTest));
3737

3838
if (SoundSourceProxy::isFileSuffixSupported(QStringLiteral("aiff"))) {
39-
extractEmbeddedCover(getTestDir().filePath(QStringLiteral("id3-test-data/cover-test.aiff")),
40-
referencePNGImage);
39+
extractEmbeddedCover(getTestFile(QStringLiteral(".aiff")), referencePNGImage);
4140
}
4241

4342
if (SoundSourceProxy::isFileSuffixSupported(QStringLiteral("flac"))) {
44-
extractEmbeddedCover(getTestDir().filePath(QStringLiteral("id3-test-data/cover-test.flac")),
45-
referencePNGImage);
43+
extractEmbeddedCover(getTestFile(QStringLiteral(".flac")), referencePNGImage);
4644
}
4745

4846
if (SoundSourceProxy::isFileSuffixSupported(QStringLiteral("m4a"))) {
49-
extractEmbeddedCover(
50-
getTestDir().filePath(QStringLiteral(
51-
"id3-test-data/cover-test-itunes-12.3.0-aac.m4a")),
47+
extractEmbeddedCover(getTestFile(QStringLiteral("-itunes-12.3.0-aac.m4a")),
5248
referencePNGImage);
53-
extractEmbeddedCover(
54-
getTestDir().filePath(QStringLiteral(
55-
"id3-test-data/cover-test-itunes-12.7.0-aac.m4a")),
49+
extractEmbeddedCover(getTestFile(QStringLiteral("-itunes-12.7.0-aac.m4a")),
5650
referencePNGImage);
57-
extractEmbeddedCover(
58-
getTestDir().filePath(QStringLiteral(
59-
"id3-test-data/cover-test-itunes-12.7.0-alac.m4a")),
51+
extractEmbeddedCover(getTestFile(QStringLiteral("-itunes-12.7.0-alac.m4a")),
6052
referencePNGImage);
6153
}
6254

6355
if (SoundSourceProxy::isFileSuffixSupported(QStringLiteral("m4v"))) {
64-
extractEmbeddedCover(getTestDir().filePath(QStringLiteral(
65-
"id3-test-data/cover-test.m4v")),
56+
extractEmbeddedCover(getTestFile(QStringLiteral(".m4v")),
6657
referencePNGImage);
6758
}
6859

6960
if (SoundSourceProxy::isFileSuffixSupported(QStringLiteral("mp3"))) {
7061
// PNG
71-
extractEmbeddedCover(getTestDir().filePath(QStringLiteral(
72-
"id3-test-data/cover-test-png.mp3")),
62+
extractEmbeddedCover(getTestFile(QStringLiteral("-png.mp3")),
7363
referencePNGImage);
7464
// JPEG
75-
extractEmbeddedCover(getTestDir().filePath(QStringLiteral(
76-
"id3-test-data/cover-test-jpg.mp3")),
65+
extractEmbeddedCover(getTestFile(QStringLiteral("-jpg.mp3")),
7766
referenceJPGImage);
7867
}
7968

8069
if (SoundSourceProxy::isFileSuffixSupported(QStringLiteral("ogg"))) {
81-
extractEmbeddedCover(getTestDir().filePath(QStringLiteral(
82-
"id3-test-data/cover-test.ogg")),
70+
extractEmbeddedCover(getTestFile(QStringLiteral(".ogg")),
8371
referencePNGImage);
8472
}
8573

8674
if (SoundSourceProxy::isFileSuffixSupported(QStringLiteral("opus"))) {
8775
// opus
88-
extractEmbeddedCover(getTestDir().filePath(QStringLiteral("id3-test-data/cover-test.opus")),
76+
extractEmbeddedCover(getTestFile(QStringLiteral(".opus")),
8977
referencePNGImage);
9078
}
9179

9280
if (SoundSourceProxy::isFileSuffixSupported(QStringLiteral("wav"))) {
93-
extractEmbeddedCover(getTestDir().filePath(QStringLiteral(
94-
"id3-test-data/cover-test.wav")),
81+
extractEmbeddedCover(getTestFile(QStringLiteral(".wav")),
9582
referencePNGImage);
9683
}
9784

9885
if (SoundSourceProxy::isFileSuffixSupported(QStringLiteral("wv"))) {
99-
extractEmbeddedCover(getTestDir().filePath(QStringLiteral(
100-
"id3-test-data/cover-test.wv")),
86+
extractEmbeddedCover(getTestFile(QStringLiteral(".wv")),
10187
referencePNGImage);
10288
}
10389
}
@@ -108,8 +94,7 @@ TEST_F(CoverArtUtilTest, searchImage) {
10894
ASSERT_TRUE(tempTrackDir.isValid());
10995
QString trackdir = QString(tempTrackDir.path());
11096

111-
const QString kTrackLocationTest(getTestDir().filePath(
112-
QStringLiteral("id3-test-data/cover-test-png.mp3")));
97+
const QString kTrackLocationTest(getTestFile(QStringLiteral("-png.mp3")));
11398

11499
TrackPointer pTrack(Track::newTemporary(kTrackLocationTest));
115100
QList<QFileInfo> covers;

‎src/test/globaltrackcache_test.cpp‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99

1010
namespace {
1111

12-
const QString kTestFile = QStringLiteral("id3-test-data/cover-test.flac");
13-
const QString kTestFile2 = QStringLiteral("id3-test-data/cover-test.ogg");
14-
1512
class TrackTitleThread: public QThread {
1613
public:
1714
explicit TrackTitleThread()
@@ -95,7 +92,8 @@ TEST_F(GlobalTrackCacheTest, resolveByFileInfo) {
9592

9693
TrackPointer pTrack;
9794
{ // resolver scope
98-
auto testFileAccess = mixxx::FileAccess(mixxx::FileInfo(getTestDir().filePath(kTestFile)));
95+
auto testFileAccess = mixxx::FileAccess(
96+
mixxx::FileInfo(getTestFile(QStringLiteral(".flac"))));
9997
auto resolver = GlobalTrackCacheResolver(testFileAccess);
10098
pTrack = resolver.getTrack();
10199
EXPECT_TRUE(static_cast<bool>(pTrack));
@@ -147,7 +145,7 @@ TEST_F(GlobalTrackCacheTest, concurrentDelete) {
147145
TrackTitleThread workerThread;
148146
workerThread.start();
149147

150-
const auto testFile = mixxx::FileInfo(getTestDir().filePath(kTestFile));
148+
const auto testFile = mixxx::FileInfo(getTestFile(QStringLiteral(".flac")));
151149

152150
// #9097: A decent number of iterations is needed to reliably
153151
// reveal potential race conditions while evicting tracks from
@@ -217,12 +215,12 @@ TEST_F(GlobalTrackCacheTest, evictWhileMoving) {
217215
ASSERT_TRUE(GlobalTrackCacheLocker().isEmpty());
218216

219217
TrackPointer track1 = GlobalTrackCacheResolver(
220-
mixxx::FileAccess(mixxx::FileInfo(getTestDir().filePath(kTestFile))))
218+
mixxx::FileAccess(mixxx::FileInfo(getTestFile(QStringLiteral(".flac")))))
221219
.getTrack();
222220
EXPECT_TRUE(static_cast<bool>(track1));
223221

224222
TrackPointer track2 = GlobalTrackCacheResolver(
225-
mixxx::FileAccess(mixxx::FileInfo(getTestDir().filePath(kTestFile2))))
223+
mixxx::FileAccess(mixxx::FileInfo(getTestFile(QStringLiteral(".ogg")))))
226224
.getTrack();
227225
EXPECT_TRUE(static_cast<bool>(track2));
228226

src/test/id3-test-data/cover-test-alac.caf renamed to src/test/id3-test-data/cover-test-øé~ł€˚-alac.caf

File renamed without changes.

src/test/id3-test-data/cover-test-ffmpeg-aac.m4a renamed to src/test/id3-test-data/cover-test-øé~ł€˚-ffmpeg-aac.m4a

File renamed without changes.

src/test/id3-test-data/cover-test-itunes-12.3.0-aac.m4a renamed to src/test/id3-test-data/cover-test-øé~ł€˚-itunes-12.3.0-aac.m4a

File renamed without changes.

src/test/id3-test-data/cover-test-itunes-12.7.0-aac.m4a renamed to src/test/id3-test-data/cover-test-øé~ł€˚-itunes-12.7.0-aac.m4a

File renamed without changes.

src/test/id3-test-data/cover-test-itunes-12.7.0-alac.m4a renamed to src/test/id3-test-data/cover-test-øé~ł€˚-itunes-12.7.0-alac.m4a

File renamed without changes.

src/test/id3-test-data/cover-test-jpg.mp3 renamed to src/test/id3-test-data/cover-test-øé~ł€˚-jpg.mp3

File renamed without changes.

0 commit comments

Comments
 (0)