[Libreoffice-commits] .: sc/qa

[Kohei Yoshida]

 sc/qa/unit/makefile.mk |    3 ++-
 sc/qa/unit/ucalc.cxx   |    2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit e36ee18534b50d58207b8930e6c37fdea26f8555
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Wed Jan 19 15:31:39 2011 -0500

    CollatorWrapper is now working during the unit test.

diff --git a/sc/qa/unit/makefile.mk b/sc/qa/unit/makefile.mk
index 09a32cb..f74d80e 100644
--- a/sc/qa/unit/makefile.mk
+++ b/sc/qa/unit/makefile.mk
@@ -101,7 +101,8 @@ $(MISC)/$(TARGET)/udkapi.rdb .ERRREMOVE : $(SOLARBINDIR)$/udkapi.rdb
 $(MISC)/$(TARGET)/services.rdb .ERRREMOVE : $(MISC)/$(TARGET)/udkapi.rdb makefile.mk
     $(MKDIRHIER) $(@:d)
     $(REGCOMP) -register -br $(MISC)/$(TARGET)/udkapi.rdb -r $@ -wop \
-        -c $(DLLPRE)fwk$(DLLPOSTFIX)$(DLLPOST)
+        -c $(DLLPRE)fwk$(DLLPOSTFIX)$(DLLPOST) \
+        -c i18npool.uno$(DLLPOST)
 
 #Tweak things so that we use the .res files in the solver
 STAR_RESOURCEPATH:=$(PWD)/$(BIN)$(PATH_SEPERATOR)$(SOLARBINDIR)
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 1beec19..c0dbcb9 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -162,13 +162,11 @@ Test::~Test()
 
 void Test::testCollator()
 {
-#if 0 // This currently fails, and because of this the data pilot test fails too.
     OUString s1(RTL_CONSTASCII_USTRINGPARAM("A"));
     OUString s2(RTL_CONSTASCII_USTRINGPARAM("B"));
     CollatorWrapper* p = ScGlobal::GetCollator();
     sal_Int32 nRes = p->compareString(s1, s2);
     CPPUNIT_ASSERT_MESSAGE("these strings are supposed to be different!", nRes != 0);
-#endif
 }
 
 void Test::testSUM()