Refactored namespaces
This commit is contained in:
emeric
@@ -24,7 +24,7 @@
|
||||
#include "TestTagReader.hpp"
|
||||
#include "Parser.hpp"
|
||||
|
||||
namespace MetaData
|
||||
namespace lms::metadata
|
||||
{
|
||||
TEST(Parser, generalTest)
|
||||
{
|
||||
@@ -88,15 +88,15 @@ namespace MetaData
|
||||
|
||||
std::unique_ptr<Track> track{ parser.parse(testTags) };
|
||||
|
||||
EXPECT_EQ(track->acoustID, UUID::fromString("e987a441-e134-4960-8019-274eddacc418"));
|
||||
EXPECT_EQ(track->acoustID, core::UUID::fromString("e987a441-e134-4960-8019-274eddacc418"));
|
||||
EXPECT_EQ(track->artistDisplayName, "MyArtist1 & MyArtist2");
|
||||
ASSERT_EQ(track->artists.size(), 2);
|
||||
EXPECT_EQ(track->artists[0].name, "MyArtist1");
|
||||
EXPECT_EQ(track->artists[0].sortName, "MyArtist1SortName");
|
||||
EXPECT_EQ(track->artists[0].mbid, UUID::fromString("9d2e0c8c-8c5e-4372-a061-590955eaeaae"));
|
||||
EXPECT_EQ(track->artists[0].mbid, core::UUID::fromString("9d2e0c8c-8c5e-4372-a061-590955eaeaae"));
|
||||
EXPECT_EQ(track->artists[1].name, "MyArtist2");
|
||||
EXPECT_EQ(track->artists[1].sortName, "MyArtist2SortName");
|
||||
EXPECT_EQ(track->artists[1].mbid, UUID::fromString("5e2cf87f-c8d7-4504-8a86-954dc0840229"));
|
||||
EXPECT_EQ(track->artists[1].mbid, core::UUID::fromString("5e2cf87f-c8d7-4504-8a86-954dc0840229"));
|
||||
EXPECT_EQ(track->bitrate, TestTagReader::trackBitrate);
|
||||
ASSERT_EQ(track->composerArtists.size(), 2);
|
||||
EXPECT_EQ(track->composerArtists[0].name, "MyComposer1");
|
||||
@@ -130,7 +130,7 @@ namespace MetaData
|
||||
EXPECT_EQ(track->lyricistArtists[0].name, "MyLyricist1");
|
||||
EXPECT_EQ(track->lyricistArtists[1].name, "MyLyricist2");
|
||||
ASSERT_TRUE(track->mbid.has_value());
|
||||
EXPECT_EQ(track->mbid.value(), UUID::fromString("0afb190a-6735-46df-a16d-199f48206e4a"));
|
||||
EXPECT_EQ(track->mbid.value(), core::UUID::fromString("0afb190a-6735-46df-a16d-199f48206e4a"));
|
||||
ASSERT_EQ(track->mixerArtists.size(), 2);
|
||||
EXPECT_EQ(track->mixerArtists[0].name, "MyMixer1");
|
||||
EXPECT_EQ(track->mixerArtists[1].name, "MyMixer2");
|
||||
@@ -156,7 +156,7 @@ namespace MetaData
|
||||
EXPECT_EQ(track->producerArtists[0].name, "MyProducer1");
|
||||
EXPECT_EQ(track->producerArtists[1].name, "MyProducer2");
|
||||
ASSERT_TRUE(track->recordingMBID.has_value());
|
||||
EXPECT_EQ(track->recordingMBID.value(), UUID::fromString("bd3fc666-89de-4ac8-93f6-2dbf028ad8d5"));
|
||||
EXPECT_EQ(track->recordingMBID.value(), core::UUID::fromString("bd3fc666-89de-4ac8-93f6-2dbf028ad8d5"));
|
||||
ASSERT_TRUE(track->replayGain.has_value());
|
||||
EXPECT_FLOAT_EQ(track->replayGain.value(), -0.33);
|
||||
ASSERT_EQ(track->remixerArtists.size(), 2);
|
||||
@@ -189,13 +189,13 @@ namespace MetaData
|
||||
ASSERT_EQ(track->medium->release->artists.size(), 2);
|
||||
EXPECT_EQ(track->medium->release->artists[0].name, "MyAlbumArtist1");
|
||||
EXPECT_EQ(track->medium->release->artists[0].sortName, "MyAlbumArtist1SortName");
|
||||
EXPECT_EQ(track->medium->release->artists[0].mbid, UUID::fromString("6fbf097c-1487-43e8-874b-50dd074398a7"));
|
||||
EXPECT_EQ(track->medium->release->artists[0].mbid, core::UUID::fromString("6fbf097c-1487-43e8-874b-50dd074398a7"));
|
||||
EXPECT_EQ(track->medium->release->artists[1].name, "MyAlbumArtist2");
|
||||
EXPECT_EQ(track->medium->release->artists[1].sortName, "MyAlbumArtist2SortName");
|
||||
EXPECT_EQ(track->medium->release->artists[1].mbid, UUID::fromString("5ed3d6b3-2aed-4a03-828c-3c4d4f7406e1"));
|
||||
EXPECT_EQ(track->medium->release->artists[1].mbid, core::UUID::fromString("5ed3d6b3-2aed-4a03-828c-3c4d4f7406e1"));
|
||||
ASSERT_TRUE(track->medium->release->mbid.has_value());
|
||||
EXPECT_EQ(track->medium->release->mbid.value(), UUID::fromString("3fa39992-b786-4585-a70e-85d5cc15ef69"));
|
||||
EXPECT_EQ(track->medium->release->groupMBID.value(), UUID::fromString("5b1a5a44-8420-4426-9b86-d25dc8d04838"));
|
||||
EXPECT_EQ(track->medium->release->mbid.value(), core::UUID::fromString("3fa39992-b786-4585-a70e-85d5cc15ef69"));
|
||||
EXPECT_EQ(track->medium->release->groupMBID.value(), core::UUID::fromString("5b1a5a44-8420-4426-9b86-d25dc8d04838"));
|
||||
EXPECT_EQ(track->medium->release->mediumCount, 3);
|
||||
EXPECT_EQ(track->medium->release->name, "MyAlbum");
|
||||
EXPECT_EQ(track->medium->release->sortName, "MyAlbumSortName");
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
#include "Parser.hpp"
|
||||
|
||||
namespace MetaData
|
||||
namespace lms::metadata
|
||||
{
|
||||
class TestTagReader : public ITagReader
|
||||
{
|
||||
|
||||
+118
-121
@@ -22,137 +22,134 @@
|
||||
|
||||
#include "Utils.hpp"
|
||||
|
||||
TEST(MetaData, parseDate)
|
||||
namespace lms::metadata::utils::tests
|
||||
{
|
||||
using namespace MetaData::Utils;
|
||||
|
||||
struct TestCase
|
||||
TEST(MetaData, parseDate)
|
||||
{
|
||||
std::string str;
|
||||
Wt::WDate result;
|
||||
} testCases[]
|
||||
{
|
||||
{ "1995-05-09", Wt::WDate {1995, 5, 9} },
|
||||
{ "1995-01-01", Wt::WDate {1995, 1, 1} },
|
||||
{ "1900-01-01", Wt::WDate {1900, 1, 1} },
|
||||
{ "1899-01-01", Wt::WDate {1899, 1, 1} },
|
||||
{ "1899-12-31", Wt::WDate {1899, 12, 31} },
|
||||
{ "1899-11-30", Wt::WDate {1899, 11, 30} },
|
||||
{ "1500-11-30", Wt::WDate {1500, 11, 30} },
|
||||
{ "1000-11-30", Wt::WDate {1000, 11, 30} },
|
||||
{ "1899-11-31", Wt::WDate {} }, // invalid day
|
||||
{ "1899-11-00", Wt::WDate {} }, // invalid day
|
||||
{ "1899-13-01", Wt::WDate {} }, // invalid month
|
||||
{ "1899-00-01", Wt::WDate {} }, // invalid month
|
||||
{ "1899-11", Wt::WDate {} }, // missing day
|
||||
{ "1899", Wt::WDate {} }, // missing month and days
|
||||
{ "1600", Wt::WDate {} }, // missing month and days
|
||||
{ "1995/05/09", Wt::WDate {1995, 5, 9} },
|
||||
{ "1995/01/01", Wt::WDate {1995, 1, 1} },
|
||||
{ "1900/01/01", Wt::WDate {1900, 1, 1} },
|
||||
{ "1899/01/01", Wt::WDate {1899, 1, 1} },
|
||||
{ "1899/12/31", Wt::WDate {1899, 12, 31} },
|
||||
{ "1899/11/30", Wt::WDate {1899, 11, 30} },
|
||||
{ "1500/11/30", Wt::WDate {1500, 11, 30} },
|
||||
{ "1000/11/30", Wt::WDate {1000, 11, 30} },
|
||||
{ "1899/11/31", Wt::WDate {} }, // invalid day
|
||||
{ "1899/11/00", Wt::WDate {} }, // invalid day
|
||||
{ "1899/13/01", Wt::WDate {} }, // invalid month
|
||||
{ "1899/00/01", Wt::WDate {} }, // invalid month
|
||||
{ "1899/11", Wt::WDate {} }, // missing day
|
||||
{ "1899", Wt::WDate {} }, // missing month and days
|
||||
{ "1600", Wt::WDate {} }, // missing month and days
|
||||
{ "1995/05-09", Wt::WDate {} }, // invalid mixup separators
|
||||
{ "1995-05/09", Wt::WDate {} }, // invalid mixup separators
|
||||
};
|
||||
struct TestCase
|
||||
{
|
||||
std::string str;
|
||||
Wt::WDate result;
|
||||
} testCases[]
|
||||
{
|
||||
{ "1995-05-09", Wt::WDate {1995, 5, 9} },
|
||||
{ "1995-01-01", Wt::WDate {1995, 1, 1} },
|
||||
{ "1900-01-01", Wt::WDate {1900, 1, 1} },
|
||||
{ "1899-01-01", Wt::WDate {1899, 1, 1} },
|
||||
{ "1899-12-31", Wt::WDate {1899, 12, 31} },
|
||||
{ "1899-11-30", Wt::WDate {1899, 11, 30} },
|
||||
{ "1500-11-30", Wt::WDate {1500, 11, 30} },
|
||||
{ "1000-11-30", Wt::WDate {1000, 11, 30} },
|
||||
{ "1899-11-31", Wt::WDate {} }, // invalid day
|
||||
{ "1899-11-00", Wt::WDate {} }, // invalid day
|
||||
{ "1899-13-01", Wt::WDate {} }, // invalid month
|
||||
{ "1899-00-01", Wt::WDate {} }, // invalid month
|
||||
{ "1899-11", Wt::WDate {} }, // missing day
|
||||
{ "1899", Wt::WDate {} }, // missing month and days
|
||||
{ "1600", Wt::WDate {} }, // missing month and days
|
||||
{ "1995/05/09", Wt::WDate {1995, 5, 9} },
|
||||
{ "1995/01/01", Wt::WDate {1995, 1, 1} },
|
||||
{ "1900/01/01", Wt::WDate {1900, 1, 1} },
|
||||
{ "1899/01/01", Wt::WDate {1899, 1, 1} },
|
||||
{ "1899/12/31", Wt::WDate {1899, 12, 31} },
|
||||
{ "1899/11/30", Wt::WDate {1899, 11, 30} },
|
||||
{ "1500/11/30", Wt::WDate {1500, 11, 30} },
|
||||
{ "1000/11/30", Wt::WDate {1000, 11, 30} },
|
||||
{ "1899/11/31", Wt::WDate {} }, // invalid day
|
||||
{ "1899/11/00", Wt::WDate {} }, // invalid day
|
||||
{ "1899/13/01", Wt::WDate {} }, // invalid month
|
||||
{ "1899/00/01", Wt::WDate {} }, // invalid month
|
||||
{ "1899/11", Wt::WDate {} }, // missing day
|
||||
{ "1899", Wt::WDate {} }, // missing month and days
|
||||
{ "1600", Wt::WDate {} }, // missing month and days
|
||||
{ "1995/05-09", Wt::WDate {} }, // invalid mixup separators
|
||||
{ "1995-05/09", Wt::WDate {} }, // invalid mixup separators
|
||||
};
|
||||
|
||||
for (const TestCase& testCase : testCases)
|
||||
{
|
||||
const Wt::WDate parsed{ parseDate(testCase.str) };
|
||||
for (const TestCase& testCase : testCases)
|
||||
{
|
||||
const Wt::WDate parsed{ parseDate(testCase.str) };
|
||||
|
||||
EXPECT_EQ(parsed.year(), testCase.result.year()) << " str was '" << testCase.str << "'";
|
||||
EXPECT_EQ(parsed.month(), testCase.result.month()) << " str was '" << testCase.str << "'";
|
||||
EXPECT_EQ(parsed.day(), testCase.result.day()) << " str was '" << testCase.str << "'";
|
||||
EXPECT_EQ(parsed.year(), testCase.result.year()) << " str was '" << testCase.str << "'";
|
||||
EXPECT_EQ(parsed.month(), testCase.result.month()) << " str was '" << testCase.str << "'";
|
||||
EXPECT_EQ(parsed.day(), testCase.result.day()) << " str was '" << testCase.str << "'";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
TEST(MetaData, parseYear)
|
||||
{
|
||||
using namespace MetaData::Utils;
|
||||
TEST(MetaData, parseYear)
|
||||
{
|
||||
struct TestCase
|
||||
{
|
||||
std::string str;
|
||||
std::optional<int> result;
|
||||
} testCases[]
|
||||
{
|
||||
{ "1995-05-09", 1995 },
|
||||
{ "1995", 1995 },
|
||||
{ "-0", 0 },
|
||||
{ "0", 0 },
|
||||
{ "00", 0 },
|
||||
{ "05", 5 },
|
||||
{ "050", 50 },
|
||||
{ "00005", 0 },
|
||||
{ "-50", -50 },
|
||||
{ "-", std::nullopt },
|
||||
{ "", std::nullopt },
|
||||
{ "a", std::nullopt },
|
||||
{ "1a", 1 },
|
||||
{ "12a", 12 },
|
||||
{ "123a", 123 },
|
||||
{ "1234a", 1234 },
|
||||
{ "19951123", 1995 },
|
||||
{ "199511", 1995 },
|
||||
};
|
||||
|
||||
struct TestCase
|
||||
{
|
||||
std::string str;
|
||||
std::optional<int> result;
|
||||
} testCases[]
|
||||
{
|
||||
{ "1995-05-09", 1995 },
|
||||
{ "1995", 1995 },
|
||||
{ "-0", 0 },
|
||||
{ "0", 0 },
|
||||
{ "00", 0 },
|
||||
{ "05", 5 },
|
||||
{ "050", 50 },
|
||||
{ "00005", 0 },
|
||||
{ "-50", -50 },
|
||||
{ "-", std::nullopt },
|
||||
{ "", std::nullopt },
|
||||
{ "a", std::nullopt },
|
||||
{ "1a", 1 },
|
||||
{ "12a", 12 },
|
||||
{ "123a", 123 },
|
||||
{ "1234a", 1234 },
|
||||
{ "19951123", 1995 },
|
||||
{ "199511", 1995 },
|
||||
};
|
||||
|
||||
for (const TestCase& testCase : testCases)
|
||||
{
|
||||
const std::optional<int> parsed{ parseYear(testCase.str) };
|
||||
EXPECT_EQ(parsed, testCase.result) << " str was '" << testCase.str << "'";
|
||||
for (const TestCase& testCase : testCases)
|
||||
{
|
||||
const std::optional<int> parsed{ parseYear(testCase.str) };
|
||||
EXPECT_EQ(parsed, testCase.result) << " str was '" << testCase.str << "'";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
TEST(MetaData, extractPerformerAndRole)
|
||||
{
|
||||
using namespace MetaData::Utils;
|
||||
|
||||
struct TestCase
|
||||
TEST(MetaData, extractPerformerAndRole)
|
||||
{
|
||||
std::string str;
|
||||
std::string expectedArtistName;
|
||||
std::string expectedRole;
|
||||
} testCases[]
|
||||
{
|
||||
{ "", "", "" },
|
||||
{ "(myrole)", "", "myrole" },
|
||||
{ "(my role)", "", "my role" },
|
||||
{ " ( my role ) ", "", "my role" },
|
||||
{ " (()) ", "", "()" },
|
||||
{ ")", ")", "" },
|
||||
{ "(", "(", "" },
|
||||
{ "artist name (my role)", "artist name", "my role" },
|
||||
{ "artist name ()", "artist name", "" },
|
||||
{ "artist name ( )", "artist name", "" },
|
||||
{ "artist (subname) name", "artist (subname) name", "" },
|
||||
{ " artist name ( my role )", "artist name", "my role" },
|
||||
{ "artist name (artist subname) (my role)", "artist name (artist subname)", "my role" },
|
||||
{ "artist name", "artist name", "" },
|
||||
{ " artist name ", "artist name", "" },
|
||||
{ "artist name (", "artist name (", "" },
|
||||
{ "artist name )", "artist name )", "" },
|
||||
{ "artist name (()", "artist name (", "" },
|
||||
{ "artist name (())", "artist name", "()" },
|
||||
{ "artist name ( () )", "artist name", "()" },
|
||||
{ "artist name (drums (drum set))", "artist name", "drums (drum set)" },
|
||||
{ "artist name ( drums (drum set) )", "artist name", "drums (drum set)" },
|
||||
};
|
||||
struct TestCase
|
||||
{
|
||||
std::string str;
|
||||
std::string expectedArtistName;
|
||||
std::string expectedRole;
|
||||
} testCases[]
|
||||
{
|
||||
{ "", "", "" },
|
||||
{ "(myrole)", "", "myrole" },
|
||||
{ "(my role)", "", "my role" },
|
||||
{ " ( my role ) ", "", "my role" },
|
||||
{ " (()) ", "", "()" },
|
||||
{ ")", ")", "" },
|
||||
{ "(", "(", "" },
|
||||
{ "artist name (my role)", "artist name", "my role" },
|
||||
{ "artist name ()", "artist name", "" },
|
||||
{ "artist name ( )", "artist name", "" },
|
||||
{ "artist (subname) name", "artist (subname) name", "" },
|
||||
{ " artist name ( my role )", "artist name", "my role" },
|
||||
{ "artist name (artist subname) (my role)", "artist name (artist subname)", "my role" },
|
||||
{ "artist name", "artist name", "" },
|
||||
{ " artist name ", "artist name", "" },
|
||||
{ "artist name (", "artist name (", "" },
|
||||
{ "artist name )", "artist name )", "" },
|
||||
{ "artist name (()", "artist name (", "" },
|
||||
{ "artist name (())", "artist name", "()" },
|
||||
{ "artist name ( () )", "artist name", "()" },
|
||||
{ "artist name (drums (drum set))", "artist name", "drums (drum set)" },
|
||||
{ "artist name ( drums (drum set) )", "artist name", "drums (drum set)" },
|
||||
};
|
||||
|
||||
for (const TestCase& testCase : testCases)
|
||||
{
|
||||
PerformerArtist performer{ extractPerformerAndRole(testCase.str) };
|
||||
for (const TestCase& testCase : testCases)
|
||||
{
|
||||
PerformerArtist performer{ extractPerformerAndRole(testCase.str) };
|
||||
|
||||
EXPECT_EQ(performer.artist.name, testCase.expectedArtistName) << " str was '" << testCase.str << "'";
|
||||
EXPECT_EQ(performer.role, testCase.expectedRole) << " str was '" << testCase.str << "'";
|
||||
EXPECT_EQ(performer.artist.name, testCase.expectedArtistName) << " str was '" << testCase.str << "'";
|
||||
EXPECT_EQ(performer.role, testCase.expectedRole) << " str was '" << testCase.str << "'";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user