From b16923f79fbcb223e5a355bba4d529a72474ab61 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Tue, 7 Oct 2014 13:07:06 +0200
Subject: [PATCH] Add tests for BDateTimeFormat with custom formats.

---
 src/tests/kits/locale/DateFormatTest.cpp | 17 +++++++++++++++++
 src/tests/kits/locale/DateFormatTest.h   |  1 +
 2 files changed, 18 insertions(+)

diff --git a/src/tests/kits/locale/DateFormatTest.cpp b/src/tests/kits/locale/DateFormatTest.cpp
index d7e00afd33..f95c9056f0 100644
--- a/src/tests/kits/locale/DateFormatTest.cpp
+++ b/src/tests/kits/locale/DateFormatTest.cpp
@@ -25,6 +25,21 @@ DateFormatTest::~DateFormatTest()
 }
 
 
+void
+DateFormatTest::TestCustomFormat()
+{
+	int32 fields = B_DATE_ELEMENT_HOUR | B_DATE_ELEMENT_MINUTE;
+	BDateTimeFormat format;
+	BString buffer;
+	format.SetDateTimeFormat(B_SHORT_DATE_FORMAT, B_SHORT_TIME_FORMAT, fields);
+	status_t result = format.Format(buffer, 12345, B_SHORT_DATE_FORMAT,
+		B_SHORT_TIME_FORMAT);
+
+	CPPUNIT_ASSERT_EQUAL(B_OK, result);
+	CPPUNIT_ASSERT_EQUAL(BString("04:25"), buffer);
+}
+
+
 void
 DateFormatTest::TestFormat()
 {
@@ -113,6 +128,8 @@ DateFormatTest::AddTests(BTestSuite& parent)
 {
 	CppUnit::TestSuite& suite = *new CppUnit::TestSuite("DateFormatTest");
 
+	suite.addTest(new CppUnit::TestCaller<DateFormatTest>(
+		"DateFormatTest::TestCustomFormat", &DateFormatTest::TestCustomFormat));
 	suite.addTest(new CppUnit::TestCaller<DateFormatTest>(
 		"DateFormatTest::TestFormat", &DateFormatTest::TestFormat));
 	suite.addTest(new CppUnit::TestCaller<DateFormatTest>(
diff --git a/src/tests/kits/locale/DateFormatTest.h b/src/tests/kits/locale/DateFormatTest.h
index d3a34c3310..a5d9172af1 100644
--- a/src/tests/kits/locale/DateFormatTest.h
+++ b/src/tests/kits/locale/DateFormatTest.h
@@ -15,6 +15,7 @@ public:
 					DateFormatTest();
 	virtual			~DateFormatTest();
 
+			void	TestCustomFormat();
 			void	TestFormat();
 			void	TestFormatDate();