oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

test: use GTest instead of cppunit

Browse Source
This commit is contained in:
Max Kellermann
2018-10-16 19:01:13 +02:00
parent eefc0f5d80
commit 01b6e1cbf2
39 changed files with 1027 additions and 1644 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
test/TestAudioFormat.cxx
View File

@@ -18,45 +18,14 @@
*/
#include "config.h"
#include "TestAudioFormat.hxx"
#include "AudioFormat.hxx"
#include "AudioParser.hxx"
#include "util/StringBuffer.hxx"
#include <cppunit/TestAssert.h>
#include <gtest/gtest.h>
#include <string.h>
namespace CppUnit {
template<>
struct assertion_traits<const char *>
{
static bool equal(const char *x, const char *y)
{
return strcmp(x, y) == 0;
}
static std::string toString(const char *x)
{
return std::string("\"") + x + "\"";
}
};
template<>
struct assertion_traits<AudioFormat>
{
static bool equal(AudioFormat x, AudioFormat y)
{
return x == y;
}
static std::string toString(AudioFormat x)
{
return ToString(x).c_str();
}
};
}
struct AudioFormatStringTest {
AudioFormat af;
const char *s;
@@ -78,24 +47,19 @@ static constexpr AudioFormatStringTest af_mask_tests[] = {
{ AudioFormat::Undefined(), "*:*:*" },
};
void
AudioFormatTest::TestToString()
TEST(AudioFormatTest, ToString)
{
for (const auto &i : af_string_tests)
CPPUNIT_ASSERT_EQUAL(i.s, ToString(i.af).c_str());
EXPECT_STREQ(i.s, ToString(i.af).c_str());
}
void
AudioFormatTest::TestParse()
TEST(AudioFormatTest, Parse)
{
for (const auto &i : af_string_tests) {
CPPUNIT_ASSERT_EQUAL(i.af,
ParseAudioFormat(i.s, false));
CPPUNIT_ASSERT_EQUAL(i.af,
ParseAudioFormat(i.s, true));
EXPECT_EQ(i.af, ParseAudioFormat(i.s, false));
EXPECT_EQ(i.af, ParseAudioFormat(i.s, true));
}
for (const auto &i : af_mask_tests)
CPPUNIT_ASSERT_EQUAL(i.af,
ParseAudioFormat(i.s, true));
EXPECT_EQ(i.af, ParseAudioFormat(i.s, true));
}