diff --git a/includes/RhythmGameUtilities/Parsers.hpp b/includes/RhythmGameUtilities/Parsers.hpp index 8f00da3..535c7ab 100644 --- a/includes/RhythmGameUtilities/Parsers.hpp +++ b/includes/RhythmGameUtilities/Parsers.hpp @@ -100,7 +100,7 @@ std::vector ParseSectionsFromChart(const char *contents) } std::map -ParseTimeSignaturesFromChartSection(std::vector sections) +ParseTimeSignaturesFromChartSections(std::vector sections) { auto timeSignatures = std::map(); @@ -123,7 +123,7 @@ ParseTimeSignaturesFromChartSection(std::vector sections) return timeSignatures; } -std::map ParseBpmFromChartSection(std::vector sections) +std::map ParseBpmFromChartSections(std::vector sections) { auto bpm = std::map(); @@ -145,8 +145,9 @@ std::map ParseBpmFromChartSection(std::vector sections) return bpm; } -std::vector ParseNotesFromChartSection(std::vector sections, - Difficulty difficulty) +std::vector +ParseNotesFromChartSections(std::vector sections, + Difficulty difficulty) { auto notes = std::vector(); @@ -170,7 +171,7 @@ std::vector ParseNotesFromChartSection(std::vector sections, } std::map -ParseLyricsFromChartSection(std::vector sections) +ParseLyricsFromChartSections(std::vector sections) { auto lyrics = std::map(); diff --git a/tests/RhythmGameUtilities/Parsers.cpp b/tests/RhythmGameUtilities/Parsers.cpp index 212c56f..ab854fc 100644 --- a/tests/RhythmGameUtilities/Parsers.cpp +++ b/tests/RhythmGameUtilities/Parsers.cpp @@ -104,44 +104,44 @@ void testParseValuesFromChartSections() std::cout << "."; } -void testParseTimeSignaturesFromChartSection() +void testParseTimeSignaturesFromChartSections() { auto sections = ParseSectionsFromChart(contents); - auto lines = ParseTimeSignaturesFromChartSection(sections); + auto lines = ParseTimeSignaturesFromChartSections(sections); assert(lines.size() == 4); std::cout << "."; } -void testParseBpmFromChartSection() +void testParseBpmFromChartSections() { auto sections = ParseSectionsFromChart(contents); - auto lines = ParseBpmFromChartSection(sections); + auto lines = ParseBpmFromChartSections(sections); assert(lines.size() == 7); std::cout << "."; } -void testParseNotesFromChartSection() +void testParseNotesFromChartSections() { auto sections = ParseSectionsFromChart(contents); - auto lines = ParseNotesFromChartSection(sections, Difficulty::Expert); + auto lines = ParseNotesFromChartSections(sections, Difficulty::Expert); assert(lines.size() == 8); std::cout << "."; } -void testParseLyricsFromChartSection() +void testParseLyricsFromChartSections() { auto sections = ParseSectionsFromChart(contents); - auto lines = ParseLyricsFromChartSection(sections); + auto lines = ParseLyricsFromChartSections(sections); assert(lines.size() == 12); @@ -153,10 +153,10 @@ int main() testParseSectionsFromChart(); testParseValuesFromChartSections(); - testParseTimeSignaturesFromChartSection(); - testParseBpmFromChartSection(); - testParseNotesFromChartSection(); - testParseLyricsFromChartSection(); + testParseTimeSignaturesFromChartSections(); + testParseBpmFromChartSections(); + testParseNotesFromChartSections(); + testParseLyricsFromChartSections(); return 0; }