summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKorrawit Pruegsanusak <detective.conan.1412@gmail.com>2013-03-10 15:39:30 +0700
committerFridrich Strba <fridrich@documentfoundation.org>2013-03-14 21:00:09 +0000
commit148c5451bae2d4edb9981baad66f78d2857ee038 (patch)
tree8e098107d0dbddf2c3515e1689e76dd5269afa1f
parentccc8a44a21fbfb4e2b4cb659f4c515aeac795006 (diff)
resurrect svl/qa/unit/svl.cxx
Change-Id: I44659688794436dd97ca5f72cfa969db889d1bc1 Reviewed-on: https://gerrit.libreoffice.org/2642 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
-rw-r--r--svl/CppunitTest_svl_qa_cppunit.mk62
-rw-r--r--svl/Module_svl.mk2
-rw-r--r--svl/qa/unit/svl.cxx20
3 files changed, 80 insertions, 4 deletions
diff --git a/svl/CppunitTest_svl_qa_cppunit.mk b/svl/CppunitTest_svl_qa_cppunit.mk
new file mode 100644
index 000000000000..827d918fefd7
--- /dev/null
+++ b/svl/CppunitTest_svl_qa_cppunit.mk
@@ -0,0 +1,62 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This file incorporates work covered by the following license notice:
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to you under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.apache.org/licenses/LICENSE-2.0 .
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,svl_qa_cppunit))
+
+$(eval $(call gb_CppunitTest_use_api,svl_qa_cppunit, \
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,svl_qa_cppunit, \
+ boost_headers \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,svl_qa_cppunit, \
+ svl/qa/unit/svl \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,svl_qa_cppunit, \
+ comphelper \
+ cppu \
+ cppuhelper \
+ cppunit \
+ i18nisolang1 \
+ sal \
+ sot \
+ svl \
+ tl \
+ unoidl \
+ unotest \
+ utl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,svl_qa_cppunit,\
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_components,svl_qa_cppunit,\
+ i18npool/util/i18npool \
+ configmgr/source/configmgr \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,svl_qa_cppunit))
+$(eval $(call gb_CppunitTest_use_configuration,svl_qa_cppunit))
+
+# vim: set noet sw=4:
diff --git a/svl/Module_svl.mk b/svl/Module_svl.mk
index d12fa3ab8feb..a3a9203760e2 100644
--- a/svl/Module_svl.mk
+++ b/svl/Module_svl.mk
@@ -29,7 +29,9 @@ $(eval $(call gb_Module_add_targets,svl,\
$(eval $(call gb_Module_add_check_targets,svl,\
CppunitTest_svl_lngmisc \
+ CppunitTest_svl_qa_cppunit \
))
+
#TODO: CppunitTest_svl_urihelper depends on ucb, can only be added once svl is
# in tail build
#FIXME: fails on MSVC
diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index 8ca0473c1ac6..805992ee6212 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -150,8 +150,12 @@ void Test::testNumberFormat()
const char* pFraction[] = {
"# \?/\?",
"# \?\?/\?\?",
+#if 0
+// TODO: Followings aren't in range of NF_FRACTION_START and NF_FRACTION_END
+// see enum NfIndexTableOffset in svl/inc/svl/zforlist.hxx
"# \?/4",
"# \?\?/100",
+#endif
0
};
@@ -167,6 +171,7 @@ void Test::testNumberFormat()
};
#endif
+#if 0 // TODO: This currently fails
const char* pDate[] = {
"MM/DD/YY",
"MM/DD/YYYY",
@@ -191,23 +196,26 @@ void Test::testNumberFormat()
"WW",
0
};
+#endif
const char* pTime[] = {
+ "HH:MM",
+ "HH:MM:SS",
"HH:MM AM/PM",
"HH:MM:SS AM/PM",
"[HH]:MM:SS",
"MM:SS.00",
"[HH]:MM:SS.00",
- "HH:MM:SS AM/PM",
- "HH:MM:SS AM/PM",
0
};
+#if 0 // TODO: This currently fails
const char* pDateTime[] = {
"MM/DD/YY HH:MM AM/PM",
"MM/DD/YY HH:MM AM/PM",
0
};
+#endif
const char* pBoolean[] = {
"BOOLEAN",
@@ -228,18 +236,22 @@ void Test::testNumberFormat()
{ NF_NUMBER_START, NF_NUMBER_END, 6, pNumber },
{ NF_SCIENTIFIC_START, NF_SCIENTIFIC_END, 2, pScientific },
{ NF_PERCENT_START, NF_PERCENT_END, 2, pPercent },
- { NF_FRACTION_START, NF_FRACTION_END, 4, pFraction },
+ { NF_FRACTION_START, NF_FRACTION_END, 2, pFraction },
#if 0 // TODO: Find out why on some systems the last two currency format codes differ.
{ NF_CURRENCY_START, NF_CURRENCY_END, 6, pCurrency },
#endif
+#if 0 // TODO: This currently fails
{ NF_DATE_START, NF_DATE_END, 21, pDate },
+#endif
{ NF_TIME_START, NF_TIME_END, 7, pTime },
+#if 0 // TODO: This currently fails
{ NF_DATETIME_START, NF_DATETIME_END, 2, pDateTime },
+#endif
{ NF_BOOLEAN, NF_BOOLEAN, 1, pBoolean },
{ NF_TEXT, NF_TEXT, 1, pText }
};
- SvNumberFormatter aFormatter(eLang);
+ SvNumberFormatter aFormatter(m_xContext, eLang);
for (size_t i = 0; i < SAL_N_ELEMENTS(aTests); ++i)
{