[Libreoffice-commits] core.git: test/source

[Caolán McNamara]

 test/source/bootstrapfixture.cxx       |    4 ++++
 test/source/sheet/xsheetannotation.cxx |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit e6e4474aae78cb5ab76a4d80642e32c02afd5133
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 11 17:03:58 2014 +0100

    set what system locale should resolve to for languagetag
    
    normally this happens in desktop/source/app/langselect.cxx for
    the fat app case
    
    Change-Id: I4772172aa6f071ac03d74e2abe7a9e197f0dc964

diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx
index dc7c7b0..c76995a 100644
--- a/test/source/bootstrapfixture.cxx
+++ b/test/source/bootstrapfixture.cxx
@@ -19,6 +19,7 @@
 #include <com/sun/star/ucb/XContentProvider.hpp>
 #include <com/sun/star/ucb/XUniversalContentBroker.hpp>
 
+#include <i18nlangtag/mslangid.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/resmgr.hxx>
 #include <vcl/graphicfilter.hxx>
@@ -64,6 +65,9 @@ void test_init_impl(bool bAssertOnDialog, bool bNeedUCB,
     aLocalOptions.SetLocaleConfigString( aLangISO );
     aLocalOptions.SetUILocaleConfigString( aLangISO );
 
+    MsLangId::setConfiguredSystemUILanguage(LANGUAGE_ENGLISH_US);
+    LanguageTag::setConfiguredSystemLanguage(LANGUAGE_ENGLISH_US);
+
     InitVCL();
     if (Application::IsHeadlessModeRequested())
         Application::EnableHeadlessMode(true);
diff --git a/test/source/sheet/xsheetannotation.cxx b/test/source/sheet/xsheetannotation.cxx
index 3a24c31..e59f94a 100644
--- a/test/source/sheet/xsheetannotation.cxx
+++ b/test/source/sheet/xsheetannotation.cxx
@@ -47,7 +47,7 @@ void XSheetAnnotation::testGetDate()
     uno::Reference< sheet::XSheetAnnotation > aSheetAnnotation (init(), UNO_QUERY_THROW);
     OUString aDate = aSheetAnnotation->getDate();
 
-    CPPUNIT_ASSERT_MESSAGE("Wrong date", aDate.equals("01/17/13"));
+    CPPUNIT_ASSERT_MESSAGE("Wrong date", aDate.equals("01/17/2013"));
 }
 void XSheetAnnotation::testGetIsVisible()
 {