Ticket #13688: 0002-BDateFormatTest-Add-tests-for-day-and-month-names-fo.patch

src/tests/kits/locale/DateFormatTest.cpp

@@ -217 +217 @@
 
     CPPUNIT_ASSERT_EQUAL(BString("December"), buffer);
     CPPUNIT_ASSERT_EQUAL(B_OK, result);
+
+    buffer.Truncate(0);
+    result = format.GetMonthName(1, buffer, B_LONG_DATE_FORMAT);
+
+    CPPUNIT_ASSERT_EQUAL(BString("Jan"), buffer);
+    CPPUNIT_ASSERT_EQUAL(B_OK, result);
+
+    buffer.Truncate(0);
+    result = format.GetMonthName(12, buffer, B_LONG_DATE_FORMAT);
+
+    CPPUNIT_ASSERT_EQUAL(BString("Dec"), buffer);
+    CPPUNIT_ASSERT_EQUAL(B_OK, result);
+
+    buffer.Truncate(0);
+    result = format.GetMonthName(1, buffer, B_SHORT_DATE_FORMAT);
+
+    CPPUNIT_ASSERT_EQUAL(BString("J"), buffer);
+    CPPUNIT_ASSERT_EQUAL(B_OK, result);
+
+    buffer.Truncate(0);
+    result = format.GetMonthName(12, buffer, B_SHORT_DATE_FORMAT);
+
+    CPPUNIT_ASSERT_EQUAL(BString("D"), buffer);
+    CPPUNIT_ASSERT_EQUAL(B_OK, result);
+
 }
 
 
+void
+DateFormatTest::TestDayNames()
+{
+    BLanguage language("en");
+    BFormattingConventions formatting("en_US");
+    BDateFormat format(language, formatting);
+
+    BString buffer;
+    status_t result = format.GetDayName(1, buffer);
+
+    CPPUNIT_ASSERT_EQUAL(BString("Sunday"), buffer);
+    CPPUNIT_ASSERT_EQUAL(B_OK, result);
+
+    buffer.Truncate(0);
+    result = format.GetDayName(2, buffer);
+
+    CPPUNIT_ASSERT_EQUAL(BString("Monday"), buffer);
+    CPPUNIT_ASSERT_EQUAL(B_OK, result);
+
+    buffer.Truncate(0);
+    result = format.GetDayName(1, buffer, B_LONG_DATE_FORMAT);
+
+    CPPUNIT_ASSERT_EQUAL(BString("Sun"), buffer);
+    CPPUNIT_ASSERT_EQUAL(B_OK, result);
+
+    buffer.Truncate(0);
+    result = format.GetDayName(2, buffer, B_LONG_DATE_FORMAT);
+
+    CPPUNIT_ASSERT_EQUAL(BString("Mon"), buffer);
+    CPPUNIT_ASSERT_EQUAL(B_OK, result);
+
+    buffer.Truncate(0);
+    result = format.GetDayName(1, buffer, B_MEDIUM_DATE_FORMAT);
+
+    CPPUNIT_ASSERT_EQUAL(BString("Su"), buffer);
+    CPPUNIT_ASSERT_EQUAL(B_OK, result);
+
+    buffer.Truncate(0);
+    result = format.GetDayName(2, buffer, B_MEDIUM_DATE_FORMAT);
+
+    CPPUNIT_ASSERT_EQUAL(BString("Mo"), buffer);
+    CPPUNIT_ASSERT_EQUAL(B_OK, result);
+
+    buffer.Truncate(0);
+    result = format.GetDayName(1, buffer, B_SHORT_DATE_FORMAT);
+
+    CPPUNIT_ASSERT_EQUAL(BString("S"), buffer);
+    CPPUNIT_ASSERT_EQUAL(B_OK, result);
+
+    buffer.Truncate(0);
+    result = format.GetDayName(2, buffer, B_SHORT_DATE_FORMAT);
+
+    CPPUNIT_ASSERT_EQUAL(BString("M"), buffer);
+    CPPUNIT_ASSERT_EQUAL(B_OK, result);
+}
+
+
+
 std::ostream& operator<<(std::ostream& stream, const BDate& date)
 {
     stream << date.Year();
@@ -320 +403 @@
     suite.addTest(new CppUnit::TestCaller<DateFormatTest>(
         "DateFormatTest::TestMonthNames", &DateFormatTest::TestMonthNames));
     suite.addTest(new CppUnit::TestCaller<DateFormatTest>(
+        "DateFormatTest::TestDayNames", &DateFormatTest::TestDayNames));
+    suite.addTest(new CppUnit::TestCaller<DateFormatTest>(
         "DateFormatTest::TestParseDate", &DateFormatTest::TestParseDate));
     suite.addTest(new CppUnit::TestCaller<DateFormatTest>(
         "DateFormatTest::TestParseTime", &DateFormatTest::TestParseTime));

src/tests/kits/locale/DateFormatTest.h

@@ -19 +19 @@
             void    TestFormat();
             void    TestFormatDate();
             void    TestMonthNames();
+            void    TestDayNames();
             void    TestParseDate();
             void    TestParseTime();