From d7f449e9bc4dc2d89a15cfd99dbe3e3c031c2bbd Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Mon, 29 Sep 2014 17:50:29 +0200
Subject: [PATCH] Convert language tests to cppunit.

---
 src/tests/kits/locale/Jamfile                |  3 +-
 src/tests/kits/locale/LanguageTest.cpp       | 46 ++++++++++++++++++++
 src/tests/kits/locale/LanguageTest.h         | 24 ++++++++++
 src/tests/kits/locale/LocaleKitTestAddon.cpp |  2 +
 src/tests/kits/locale/localeTest.cpp         | 38 ----------------
 5 files changed, 73 insertions(+), 40 deletions(-)
 create mode 100644 src/tests/kits/locale/LanguageTest.cpp
 create mode 100644 src/tests/kits/locale/LanguageTest.h
 delete mode 100644 src/tests/kits/locale/localeTest.cpp

diff --git a/src/tests/kits/locale/Jamfile b/src/tests/kits/locale/Jamfile
index caa88e56c7..8caf5c05d5 100644
--- a/src/tests/kits/locale/Jamfile
+++ b/src/tests/kits/locale/Jamfile
@@ -13,7 +13,6 @@ Depends LocaleKitTests
 	catalogTestAddOn
 	collatorSpeed
 	collatorTest
-	localeTest
 	ICUTest
 #	libNumberFormatTests.so
 	localekittest.so
@@ -32,7 +31,6 @@ LocaleTest catalogTest.cpp ;
 LocaleTest collatorSpeed.cpp ;
 LocaleTest collatorTest.cpp ;
 LocaleTest genericNumberFormatTest.cpp ;
-LocaleTest localeTest.cpp ;
 LocaleTest formatTest.cpp ;
 
 Includes [ FGristFiles ICUTest.cpp ] : [ BuildFeatureAttribute icu : headers ] ;
@@ -52,6 +50,7 @@ UnitTestLib localekittest.so :
 	LocaleKitTestAddon.cpp
 
 	CollatorTest.cpp
+	LanguageTest.cpp
 	UnicodeCharTest.cpp
 
 	: be [ TargetLibstdc++ ]
diff --git a/src/tests/kits/locale/LanguageTest.cpp b/src/tests/kits/locale/LanguageTest.cpp
new file mode 100644
index 0000000000..48cabe15a1
--- /dev/null
+++ b/src/tests/kits/locale/LanguageTest.cpp
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2014 Haiku, Inc.
+ * Distributed under the terms of the MIT License.
+ */
+
+
+#include "LanguageTest.h"
+
+#include "Language.h"
+
+#include <cppunit/TestCaller.h>
+#include <cppunit/TestSuite.h>
+
+
+LanguageTest::LanguageTest()
+{
+}
+
+
+LanguageTest::~LanguageTest()
+{
+}
+
+
+void
+LanguageTest::TestLanguage()
+{
+	BLanguage language("fr_FR");
+	BString name;
+	language.GetName(name);
+	CPPUNIT_ASSERT_EQUAL(BString("français (France)"), name);
+	CPPUNIT_ASSERT_EQUAL(BString("fr"), language.Code());
+	CPPUNIT_ASSERT(language.Direction() == B_LEFT_TO_RIGHT);
+}
+
+
+/*static*/ void
+LanguageTest::AddTests(BTestSuite& parent)
+{
+	CppUnit::TestSuite& suite = *new CppUnit::TestSuite("LanguageTest");
+
+	suite.addTest(new CppUnit::TestCaller<LanguageTest>(
+		"LanguageTest::TestLanguage", &LanguageTest::TestLanguage));
+
+	parent.addTest("LanguageTest", &suite);
+}
diff --git a/src/tests/kits/locale/LanguageTest.h b/src/tests/kits/locale/LanguageTest.h
new file mode 100644
index 0000000000..5cdf40839d
--- /dev/null
+++ b/src/tests/kits/locale/LanguageTest.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014 Haiku, Inc.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef LANGUAGE_TEST_H
+#define LANGUAGE_TEST_H
+
+
+#include <TestCase.h>
+#include <TestSuite.h>
+
+
+class LanguageTest: public BTestCase {
+public:
+					LanguageTest();
+	virtual			~LanguageTest();
+
+			void	TestLanguage();
+
+	static	void	AddTests(BTestSuite& suite);
+};
+
+
+#endif
diff --git a/src/tests/kits/locale/LocaleKitTestAddon.cpp b/src/tests/kits/locale/LocaleKitTestAddon.cpp
index 33811e288a..0877206a2d 100644
--- a/src/tests/kits/locale/LocaleKitTestAddon.cpp
+++ b/src/tests/kits/locale/LocaleKitTestAddon.cpp
@@ -8,6 +8,7 @@
 #include <TestSuiteAddon.h>
 
 #include "CollatorTest.h"
+#include "LanguageTest.h"
 #include "UnicodeCharTest.h"
 
 
@@ -17,6 +18,7 @@ getTestSuite()
 	BTestSuite* suite = new BTestSuite("LocaleKit");
 
 	CollatorTest::AddTests(*suite);
+	LanguageTest::AddTests(*suite);
 	UnicodeCharTest::AddTests(*suite);
 
 	return suite;
diff --git a/src/tests/kits/locale/localeTest.cpp b/src/tests/kits/locale/localeTest.cpp
deleted file mode 100644
index 43600273fa..0000000000
--- a/src/tests/kits/locale/localeTest.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-
-#include <Collator.h>
-#include <Language.h>
-#include <Locale.h>
-#include <LocaleRoster.h>
-#include <String.h>
-#include <UnicodeChar.h>
-
-#include <stdio.h>
-
-
-int
-main()
-{
-	// Tests the BLanguage class
-
-	BLanguage language;
-	BLocaleRoster::Default()->GetDefaultLocale()->GetLanguage(&language);
-	BString name;
-	language.GetName(name);
-	printf("Language name = \"%s\", code = \"%s\"\n", name.String(),
-		language.Code());
-	printf("\tdirection = %s\n",
-		language.Direction() == B_LEFT_TO_RIGHT ? "left-to-right" :
-		language.Direction() == B_RIGHT_TO_LEFT ? "right-to-left" :
-		"top-to-bottom");
-
-	//for (int32 i = 0; i < 200; i++) {
-	//	const char *string = language.GetString(i);
-	//	if (string != NULL)
-	//		printf("%ld: %s\n", i, string);
-	//}
-
-	printf("First month = %s (%s)\n",
-		language.GetString(B_MON_1),
-		language.GetString(B_AB_MON_1));
-}
-