From 2d88b1bd33885843db67f600a4beb8d33e3caa19 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Wed, 22 Oct 2014 14:30:19 +0200
Subject: [PATCH] convert mediaDescriptions test to cppunit.

---
 ...escriptions.cpp => FormatDescriptions.cpp} | 56 ++++++++++++++-----
 src/tests/kits/media/FormatDescriptions.h     | 26 +++++++++
 src/tests/kits/media/Jamfile                  |  5 +-
 src/tests/kits/media/MediaKitTestAddon.cpp    |  2 +
 4 files changed, 70 insertions(+), 19 deletions(-)
 rename src/tests/kits/media/{mediaDescriptions.cpp => FormatDescriptions.cpp} (50%)
 create mode 100644 src/tests/kits/media/FormatDescriptions.h

diff --git a/src/tests/kits/media/mediaDescriptions.cpp b/src/tests/kits/media/FormatDescriptions.cpp
similarity index 50%
rename from src/tests/kits/media/mediaDescriptions.cpp
rename to src/tests/kits/media/FormatDescriptions.cpp
index fc3df8c5d4..58d5db3c99 100644
--- a/src/tests/kits/media/mediaDescriptions.cpp
+++ b/src/tests/kits/media/FormatDescriptions.cpp
@@ -4,22 +4,36 @@
 */
 
 
+#include "FormatDescriptions.h"
+
 #include <MediaFormats.h>
-#include <stdio.h>
+
+#include <cppunit/TestCaller.h>
+#include <cppunit/TestSuite.h>
 
 
-int 
-main(int argc, char **argv)
+FormatDescriptionsTest::FormatDescriptionsTest()
+{
+}
+
+
+FormatDescriptionsTest::~FormatDescriptionsTest()
+{
+}
+
+
+void
+FormatDescriptionsTest::TestCompare()
 {
 	media_format_description a;
 	a.family = B_AVI_FORMAT_FAMILY;
 	a.u.avi.codec = 'DIVX';
 
 	media_format_description b;
-	printf("avi/divx == empty? %s\n", a == b ? "yes" : "no");
+	CPPUNIT_ASSERT(a != b);
 
 	b.family = a.family;
-	printf("avi/divx == same family, no codec? %s\n", a == b ? "yes" : "no");
+	CPPUNIT_ASSERT(a != b);
 
 	a.family = B_QUICKTIME_FORMAT_FAMILY;
 	a.u.quicktime.vendor = 5;
@@ -28,17 +42,17 @@ main(int argc, char **argv)
 	b.family = B_QUICKTIME_FORMAT_FAMILY;
 	b.u.quicktime.vendor = 6;
 	b.u.quicktime.codec = 5;
-	printf("qt(5,5) < qt(6, 5)? %s\n", a < b ? "yes" : "no");
+	CPPUNIT_ASSERT(a < b);
 
 	b.u.quicktime.vendor = 4;
-	printf("qt(5,5) < qt(4, 5)? %s\n", a < b ? "yes" : "no");
+	CPPUNIT_ASSERT(a > b);
 
 	b.u.quicktime.vendor = 5;
 	b.u.quicktime.codec = 6;
-	printf("qt(5,5) < qt(5, 6)? %s\n", a < b ? "yes" : "no");
+	CPPUNIT_ASSERT(a < b);
 
 	b.u.quicktime.codec = 4;
-	printf("qt(5,5) < qt(5, 4)? %s\n", a < b ? "yes" : "no");
+	CPPUNIT_ASSERT(a > b);
 
 	a.family = B_MISC_FORMAT_FAMILY;
 	a.u.misc.file_format = 5;
@@ -47,17 +61,29 @@ main(int argc, char **argv)
 	b.family = B_MISC_FORMAT_FAMILY;
 	b.u.misc.file_format = 6;
 	b.u.misc.codec = 5;
-	printf("misc(5,5) < misc(6, 5)? %s\n", a < b ? "yes" : "no");
+	CPPUNIT_ASSERT(a < b);
 
 	b.u.misc.file_format = 4;
-	printf("misc(5,5) < qt(4, 5)? %s\n", a < b ? "yes" : "no");
+	CPPUNIT_ASSERT(a > b);
+
 
 	b.u.misc.file_format = 5;
 	b.u.misc.codec = 6;
-	printf("misc(5,5) < misc(5, 6)? %s\n", a < b ? "yes" : "no");
+	CPPUNIT_ASSERT(a < b);
 
 	b.u.misc.codec = 4;
-	printf("misc(5,5) < misc(5, 4)? %s\n", a < b ? "yes" : "no");
-
-	return 0;
+	CPPUNIT_ASSERT(a > b);
+}
+
+
+/*static*/ void
+FormatDescriptionsTest::AddTests(BTestSuite& parent)
+{
+	CppUnit::TestSuite& suite = *new CppUnit::TestSuite("FormatDescriptionsTest");
+
+	suite.addTest(new CppUnit::TestCaller<FormatDescriptionsTest>(
+		"FormatDescriptionsTest::TestCompare",
+		&FormatDescriptionsTest::TestCompare));
+
+	parent.addTest("FormatDescriptionsTest", &suite);
 }
diff --git a/src/tests/kits/media/FormatDescriptions.h b/src/tests/kits/media/FormatDescriptions.h
new file mode 100644
index 0000000000..062652499c
--- /dev/null
+++ b/src/tests/kits/media/FormatDescriptions.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2014 Haiku, Inc.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef FORMAT_DESCRIPTIONS_TEST_H
+#define FORMAT_DESCRIPTIONS_TEST_H
+
+
+#include <TestCase.h>
+#include <TestSuite.h>
+
+
+class FormatDescriptionsTest: public BTestCase {
+public:
+					FormatDescriptionsTest();
+	virtual			~FormatDescriptionsTest();
+
+			void	TestCompare();
+
+	static	void	AddTests(BTestSuite& suite);
+};
+
+
+#endif
+
+
diff --git a/src/tests/kits/media/Jamfile b/src/tests/kits/media/Jamfile
index 1274554b30..d7ed90698e 100644
--- a/src/tests/kits/media/Jamfile
+++ b/src/tests/kits/media/Jamfile
@@ -7,15 +7,12 @@ SimpleTest mediaFormats :
 	mediaFormats.cpp
 	: media ;
 
-SimpleTest mediaDescriptions :
-	mediaDescriptions.cpp
-	: media ;
-
 UnitTestLib libmediatest.so :
 	MediaKitTestAddon.cpp
 
 	AreaTest.cpp
 	BufferTest.cpp
+	FormatDescriptions.cpp
 	SizeofTest.cpp
 
 	: be media [ TargetLibstdc++ ] [ TargetLibsupc++ ]
diff --git a/src/tests/kits/media/MediaKitTestAddon.cpp b/src/tests/kits/media/MediaKitTestAddon.cpp
index 0295f2fefb..9950de5f8c 100644
--- a/src/tests/kits/media/MediaKitTestAddon.cpp
+++ b/src/tests/kits/media/MediaKitTestAddon.cpp
@@ -9,6 +9,7 @@
 
 #include "AreaTest.h"
 #include "BufferTest.h"
+#include "FormatDescriptions.h"
 #include "SizeofTest.h"
 
 
@@ -19,6 +20,7 @@ getTestSuite()
 
 	AreaTest::AddTests(*suite);
 	BufferTest::AddTests(*suite);
+	FormatDescriptionsTest::AddTests(*suite);
 	SizeofTest::AddTests(*suite);
 
 	return suite;