You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2025/05/11 08:01:44 UTC

(openoffice) branch trunk updated (ef3bfc8d89 -> c04e01988b)

This is an automated email from the ASF dual-hosted git repository.

damjan pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git


    from ef3bfc8d89 Add logic for disabling entry in popup menu.
     new de76a5ada4 Begin moving i18n unit tests from main/qadevOOo to test/testuno/source/api. Delete these from the broken/unused main/framework/qa/complex/api_internal/api.lst.
     new 2f709283d1 Integrate the i18n unit tests with their new test framework, eliminate most method order dependencies, and other test fixes.
     new c7202f3b2c Add the test document for XBreakIteratorTest.
     new d01bf5ec1f Fix a deadlock in the DBAccess test when connecting to OpenOffice for each test instead of once for the whole class.
     new cc5c65fb5c Fix the XCharacterClassificationTest._getCharacterDirection() test by using 43 (the '+' sign) instead of 47 ('/') when testing for the DirectionProperty.EUROPEAN_NUMBER_SEPARATOR property.
     new 8619c5106e Fix a typo.
     new c4369f90e8 Fix spacing.
     new 24ef62ed28 Fix the test failures in XCharacterClassificationTest._getType(). Some of the hardcoded characters no longer had the type they were originally expected to have, probably due to changes in new Unicode versions. Replace them with other characters that have the expected types now.
     new 5c977050c2 Fix the test failure in XCharacterClassificationTest._getCharacterType(). The ')' doesn't have type PRINTABLE any longer, so use '*' instead which does have it.
     new 07b0567639 Fix the error and failure in the XCharacterClassificationTest._getScript() unit test. Don't check the surrogate pairs, which getScript() doesn't seem to identify correctly. Also verify the script is in range of our known script value range to avoid ArrayIndexOutOfBoundsException.
     new daf711bf72 Document that XcharacterClassification._toLower() has bug #87590.
     new 10a136b91c Fix the test failures in XBreakIteratorTest._isBeginWord() and _isEndWord(). It was failing because the word type differed: it used WordType.ANY_WORD when calling XBreakIterator.isBeginWord() and XBreakIterator.isEndWord(), but used WordType.ANYWORD_IGNOREWHITESPACES instead when determining word boundaries to test in nextWord().
     new da5c8a22e4 Test for October properly. Month 10 will fail both of these tests         else if (month > 6 && month < 10) { quarter = "Q3"; longQuarter = "3rd quarter"; }         else if (month > 10 && month < 13) {quarter = "Q4"; longQuarter = "4th quarter"; } as 10 is neither greater nor lesser than 10. Rewrite the comparison to include 10 properly, and clean it up.
     new ce881ba306 Document the changes.
     new c09e96c517 Make Java 1.7 the minimum version.
     new 66ceb4cf46 Delete the i18n mod in qadevOOo.
     new 6438e1d6ca Test the XChapterCollator too.
     new c04e01988b Delete the CSV files used in the old i18n tests.

The 18 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 main/framework/qa/complex/api_internal/api.lst     | 541 ++++++++++-----------
 .../src/main/java/mod/_i18n/BreakIterator.java     | 118 -----
 .../src/main/java/mod/_i18n/CalendarImpl.java      |  75 ---
 .../src/main/java/mod/_i18n/ChapterCollator.java   |  79 ---
 .../java/mod/_i18n/CharacterClassification.java    |  82 ----
 .../src/main/java/mod/_i18n/Collator.java          |  76 ---
 .../main/java/mod/_i18n/IndexEntrySupplier.java    |  81 ---
 .../src/main/java/mod/_i18n/LocaleData.java        |  80 ---
 .../java/mod/_i18n/NumberFormatCodeMapper.java     |  86 ----
 .../src/main/java/mod/_i18n/TextSearch.java        |  76 ---
 .../src/main/java/mod/_i18n/Transliteration.java   |  76 ---
 .../i18n/com.sun.star.i18n.BreakIterator.csv       |  23 -
 .../objdsc/i18n/com.sun.star.i18n.CalendarImpl.csv |  24 -
 .../i18n/com.sun.star.i18n.ChapterCollator.csv     |  10 -
 .../com.sun.star.i18n.CharacterClassification.csv  |  13 -
 .../objdsc/i18n/com.sun.star.i18n.Collator.csv     |  10 -
 .../i18n/com.sun.star.i18n.IndexEntrySupplier.csv  |  12 -
 .../objdsc/i18n/com.sun.star.i18n.LocaleData.csv   |  15 -
 .../com.sun.star.i18n.NumberFormatCodeMapper.csv   |   7 -
 .../i18n/com.sun.star.i18n.Transliteration.csv     |  19 -
 .../objdsc/i18n/com.sun.star.util.TextSearch.csv   |   3 -
 test/README.md                                     |   6 +-
 test/build.xml                                     |   6 +-
 .../testuno/data/api/i18n}/Iterator.sxw            | Bin
 .../source/api/i18n/XBreakIteratorTest.java        | 234 +++++----
 .../testuno/source/api/i18n/XCalendarTest.java     | 312 +++++-------
 .../api/i18n/XCharacterClassificationTest.java     | 164 ++++---
 .../testuno/source/api/i18n/XCollatorTest.java     | 127 +++--
 .../source/api/i18n/XExtendedCalendarTest.java     |  67 ++-
 .../api/i18n/XExtendedIndexEntrySupplierTest.java  | 130 +++--
 .../api/i18n/XExtendedTransliterationTest.java     |  49 +-
 .../source/api/i18n/XIndexEntrySupplierTest.java   |  64 ++-
 .../testuno/source/api/i18n/XLocaleDataTest.java   | 175 ++++---
 .../source/api/i18n/XNumberFormatCodeTest.java     |  62 ++-
 .../source/api/i18n/XTransliterationTest.java      | 141 ++++--
 test/testuno/source/fvt/uno/db/DBAccess.java       |  15 +-
 36 files changed, 1236 insertions(+), 1822 deletions(-)
 delete mode 100644 main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/BreakIterator.java
 delete mode 100644 main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/CalendarImpl.java
 delete mode 100644 main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/ChapterCollator.java
 delete mode 100644 main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/CharacterClassification.java
 delete mode 100644 main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/Collator.java
 delete mode 100644 main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/IndexEntrySupplier.java
 delete mode 100644 main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/LocaleData.java
 delete mode 100644 main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/NumberFormatCodeMapper.java
 delete mode 100644 main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/TextSearch.java
 delete mode 100644 main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/Transliteration.java
 delete mode 100644 main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.BreakIterator.csv
 delete mode 100644 main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.CalendarImpl.csv
 delete mode 100644 main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.ChapterCollator.csv
 delete mode 100644 main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.CharacterClassification.csv
 delete mode 100644 main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.Collator.csv
 delete mode 100644 main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.IndexEntrySupplier.csv
 delete mode 100644 main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.LocaleData.csv
 delete mode 100644 main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.NumberFormatCodeMapper.csv
 delete mode 100644 main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.Transliteration.csv
 delete mode 100644 main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.util.TextSearch.csv
 copy {main/qadevOOo/testdocs => test/testuno/data/api/i18n}/Iterator.sxw (100%)
 rename main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XBreakIterator.java => test/testuno/source/api/i18n/XBreakIteratorTest.java (75%)
 rename main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XCalendar.java => test/testuno/source/api/i18n/XCalendarTest.java (66%)
 rename main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XCharacterClassification.java => test/testuno/source/api/i18n/XCharacterClassificationTest.java (76%)
 rename main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XCollator.java => test/testuno/source/api/i18n/XCollatorTest.java (81%)
 rename main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XExtendedCalendar.java => test/testuno/source/api/i18n/XExtendedCalendarTest.java (71%)
 rename main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XExtendedIndexEntrySupplier.java => test/testuno/source/api/i18n/XExtendedIndexEntrySupplierTest.java (79%)
 rename main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XExtendedTransliteration.java => test/testuno/source/api/i18n/XExtendedTransliterationTest.java (67%)
 rename main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XIndexEntrySupplier.java => test/testuno/source/api/i18n/XIndexEntrySupplierTest.java (63%)
 rename main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XLocaleData.java => test/testuno/source/api/i18n/XLocaleDataTest.java (70%)
 rename main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XNumberFormatCode.java => test/testuno/source/api/i18n/XNumberFormatCodeTest.java (75%)
 rename main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XTransliteration.java => test/testuno/source/api/i18n/XTransliterationTest.java (77%)


(openoffice) 05/18: Fix the XCharacterClassificationTest._getCharacterDirection() test by using 43 (the '+' sign) instead of 47 ('/') when testing for the DirectionProperty.EUROPEAN_NUMBER_SEPARATOR property.

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

damjan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit cc5c65fb5cb49c605347d106eb461570cd8b6afc
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Thu May 8 04:52:44 2025 +0200

    Fix the XCharacterClassificationTest._getCharacterDirection() test
    by using 43 (the '+' sign) instead of 47 ('/') when testing for the
    DirectionProperty.EUROPEAN_NUMBER_SEPARATOR property.
    
    Patch by: me
---
 test/testuno/source/api/i18n/XCharacterClassificationTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/testuno/source/api/i18n/XCharacterClassificationTest.java b/test/testuno/source/api/i18n/XCharacterClassificationTest.java
index 507a6c53f8..ceeec10516 100644
--- a/test/testuno/source/api/i18n/XCharacterClassificationTest.java
+++ b/test/testuno/source/api/i18n/XCharacterClassificationTest.java
@@ -317,7 +317,7 @@ public class XCharacterClassificationTest {
     @Test
     public void _getCharacterDirection() {
         boolean res = true;
-        String toCheck = new String(new char[]{65,1470,48,47,35,1632,44,10,
+        String toCheck = new String(new char[]{65,1470,48,43,35,1632,44,10,
                                 9,12,33,8234,8237,1563,8235,8238,8236,768,1});
         for (short i=0;i<19;i++) {
             short get = oObj.getCharacterDirection(toCheck, i);


(openoffice) 06/18: Fix a typo.

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

damjan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 8619c5106e8d5c5ead580ebf3a432565ad8c9f92
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Thu May 8 04:56:42 2025 +0200

    Fix a typo.
    
    Patch by: me
---
 test/testuno/source/api/i18n/XCharacterClassificationTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/testuno/source/api/i18n/XCharacterClassificationTest.java b/test/testuno/source/api/i18n/XCharacterClassificationTest.java
index ceeec10516..ca5ef31fa7 100644
--- a/test/testuno/source/api/i18n/XCharacterClassificationTest.java
+++ b/test/testuno/source/api/i18n/XCharacterClassificationTest.java
@@ -269,7 +269,7 @@ public class XCharacterClassificationTest {
                 if (!res) {
                     System.out.println("FAILED for: language=" + languages[j] +
                         " ; country=" + countries[j]);
-                    System.out.println("Sysmbol :" + toCheck.toCharArray()[i]);
+                    System.out.println("Symbol :" + toCheck.toCharArray()[i]);
                     System.out.println("Gained: " + get);
                     System.out.println("Expected : " + expected[i]);
                 }


(openoffice) 17/18: Test the XChapterCollator too.

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

damjan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 6438e1d6cad35d2e5835e3a0fa6572aa9e55ca1b
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Fri May 9 21:12:18 2025 +0200

    Test the XChapterCollator too.
    
    Patch by: me
---
 test/testuno/source/api/i18n/XCollatorTest.java | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/test/testuno/source/api/i18n/XCollatorTest.java b/test/testuno/source/api/i18n/XCollatorTest.java
index 8e82411513..e083101094 100644
--- a/test/testuno/source/api/i18n/XCollatorTest.java
+++ b/test/testuno/source/api/i18n/XCollatorTest.java
@@ -24,6 +24,8 @@
 package api.i18n;
 
 import java.text.Collator;
+import java.util.Arrays;
+import java.util.Collection;
 
 import com.sun.star.i18n.CollatorOptions;
 import com.sun.star.i18n.XCollator;
@@ -35,6 +37,9 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
 import org.openoffice.test.uno.UnoApp;
 
 /**
@@ -52,9 +57,11 @@ import org.openoffice.test.uno.UnoApp;
 * Test is <b> NOT </b> multithread compliant. <p>
 * @see com.sun.star.i18n.XCollator
 */
+@RunWith(Parameterized.class)
 public class XCollatorTest {
     private static final UnoApp app = new UnoApp();
 
+    private String collatorServiceName;
     private XComponentContext xContext = null;
     private XCollator oObj = null;
     private String[] alg = null ;
@@ -74,11 +81,23 @@ public class XCollatorTest {
         app.close();
     }
 
+    @Parameters(name = "{0}")
+    public static Collection<Object[]> data() {
+        return Arrays.asList(new Object[][]{
+                {"com.sun.star.i18n.Collator"},
+                {"com.sun.star.i18n.ChapterCollator"}
+        });
+    }
+
+    public XCollatorTest(String collatorServiceName) {
+        this.collatorServiceName = collatorServiceName;
+    }
+
     @Before
     public void before() throws Exception, java.lang.Exception
     {
         xContext = app.getComponentContext();
-        final Object object = xContext.getServiceManager().createInstanceWithContext("com.sun.star.i18n.Collator", xContext);
+        final Object object = xContext.getServiceManager().createInstanceWithContext(collatorServiceName, xContext);
         oObj = UnoRuntime.queryInterface(XCollator.class, object);
         alg = oObj.listCollatorAlgorithms(loc);
     }


(openoffice) 02/18: Integrate the i18n unit tests with their new test framework, eliminate most method order dependencies, and other test fixes.

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

damjan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 2f709283d1bd576d3b419fe5eab3c9c4e094bc79
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Thu May 8 04:39:39 2025 +0200

    Integrate the i18n unit tests with their new test framework,
    eliminate most method order dependencies, and other
    test fixes.
    
    Patch by: me
---
 .../source/api/i18n/XBreakIteratorTest.java        | 228 +++++++++------
 test/testuno/source/api/i18n/XCalendarTest.java    | 312 +++++++++------------
 .../api/i18n/XCharacterClassificationTest.java     | 122 +++++---
 test/testuno/source/api/i18n/XCollatorTest.java    | 108 ++++---
 .../source/api/i18n/XExtendedCalendarTest.java     |  61 ++--
 .../api/i18n/XExtendedIndexEntrySupplierTest.java  | 130 ++++++---
 .../api/i18n/XExtendedTransliterationTest.java     |  49 +++-
 .../source/api/i18n/XIndexEntrySupplierTest.java   |  64 ++++-
 test/testuno/source/api/i18n/XLocaleDataTest.java  | 175 +++++++-----
 .../source/api/i18n/XNumberFormatCodeTest.java     |  62 +++-
 .../source/api/i18n/XTransliterationTest.java      | 141 ++++++----
 11 files changed, 899 insertions(+), 553 deletions(-)

diff --git a/test/testuno/source/api/i18n/XBreakIteratorTest.java b/test/testuno/source/api/i18n/XBreakIteratorTest.java
index 84aecc1c18..252793d006 100644
--- a/test/testuno/source/api/i18n/XBreakIteratorTest.java
+++ b/test/testuno/source/api/i18n/XBreakIteratorTest.java
@@ -21,14 +21,17 @@
 
 
 
-package ifc.i18n;
+package api.i18n;
 
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Vector;
 
-import lib.MultiMethodTest;
-import lib.Status;
-import lib.StatusException;
-
+import com.sun.star.beans.PropertyState;
+import com.sun.star.beans.PropertyValue;
 import com.sun.star.i18n.Boundary;
 import com.sun.star.i18n.LineBreakHyphenationOptions;
 import com.sun.star.i18n.LineBreakResults;
@@ -37,6 +40,19 @@ import com.sun.star.i18n.ScriptType;
 import com.sun.star.i18n.WordType;
 import com.sun.star.i18n.XBreakIterator;
 import com.sun.star.lang.Locale;
+import com.sun.star.lang.XComponent;
+import com.sun.star.text.XTextDocument;
+import com.sun.star.text.XTextRange;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Assert;
+import org.junit.Test;
+import org.openoffice.test.common.Testspace;
+import org.openoffice.test.uno.UnoApp;
 
 /**
 * Testing <code>com.sun.star.i18n.XBreakIterator</code>
@@ -76,31 +92,55 @@ import com.sun.star.lang.Locale;
 * <ul> <p>
 * @see com.sun.star.i18n.XBreakIterator
 */
-public class _XBreakIterator extends MultiMethodTest {
+public class XBreakIteratorTest {
+    private static final UnoApp app = new UnoApp();
+    private static final String iteratorPath = "api/i18n/Iterator.sxw";
+    private static String UnicodeString;
 
+    private XComponentContext xContext = null;
     public XBreakIterator oObj = null;
 
     Locale locale = null;
-    String UnicodeString = null;
 
     short wordType = WordType.ANYWORD_IGNOREWHITESPACES;
 
+    // setup and close connections
+    @BeforeClass
+    public static void setUpConnection() throws Exception
+    {
+        app.start();
+        UnicodeString = readFileContents(iteratorPath);
+    }
+
+    @AfterClass
+    public static void tearDownConnection() throws InterruptedException, com.sun.star.uno.Exception
+    {
+        app.close();
+    }
+
     /**
      * Retrieves object relations.
      * @throws StatusException If one of relations not found.
      */
-    protected void before() {
-        locale = (Locale)tEnv.getObjRelation("Locale");
-        if (locale == null) {
-            throw new StatusException
-                (Status.failed("Relation 'Locale' not found")) ;
-        }
+    @Before
+    public void before() throws Exception {
+        xContext = app.getComponentContext();
+        oObj = UnoRuntime.queryInterface(
+            XBreakIterator.class,
+            xContext.getServiceManager().createInstanceWithContext("com.sun.star.i18n.BreakIterator", xContext)
+        );
+
+        locale = new Locale("en", "US", "");
+    }
 
-        UnicodeString = (String)tEnv.getObjRelation("UnicodeString");
-        if (UnicodeString == null) {
-            throw new StatusException(Status.failed
-                ("Relation 'UnicodeString' not found")) ;
-        }
+    private static String readFileContents(String path) throws Exception {
+        String sample = Testspace.prepareData(path);
+        PropertyValue[] properties = new PropertyValue[1];
+        properties[0] = new PropertyValue("Hidden", -1, true, PropertyState.DIRECT_VALUE);
+        XComponent docComponent = app.loadDocument(sample, properties);
+        XTextDocument textDocument = (XTextDocument) UnoRuntime.queryInterface(XTextDocument.class, docComponent);
+        XTextRange xTextRange = (XTextRange)textDocument.getText();
+        return xTextRange.getString();
     }
 
     /**
@@ -109,6 +149,7 @@ public class _XBreakIterator extends MultiMethodTest {
      * Has <b>OK</b> status if position after travel and traveled length
      * has expected values.
      */
+    @Test
     public void _nextCharacters() {
         short nCharacterIteratorMode =
             com.sun.star.i18n.CharacterIteratorMode.SKIPCHARACTER;
@@ -127,16 +168,16 @@ public class _XBreakIterator extends MultiMethodTest {
             int[] lDone = new int[1];
             long lRes = oObj.nextCharacters(UnicodeString, nextCharacters[i][0],
                 locale, nCharacterIteratorMode, nextCharacters[i][1], lDone);
-            log.println("Expected result is: lRes = " + nextCharacters[i][2] +
+            System.out.println("Expected result is: lRes = " + nextCharacters[i][2] +
                         "; lDone = " + nextCharacters[i][3] );
-            log.println("Actual result is: lRes = " + lRes +
+            System.out.println("Actual result is: lRes = " + lRes +
                         "; lDone = " + lDone[0] );
 
             bRes = bRes && lRes == nextCharacters[i][2];
             bRes = bRes && lDone[0] == nextCharacters[i][3];
         }
 
-        tRes.tested("nextCharacters()", bRes);
+        Assert.assertTrue("nextCharacters()", bRes);
     }
 
     /**
@@ -145,6 +186,7 @@ public class _XBreakIterator extends MultiMethodTest {
      * Has <b>OK</b> status if position after travel and traveled length
      * has expected values.
      */
+    @Test
     public void _previousCharacters() {
         short nCharacterIteratorMode =
             com.sun.star.i18n.CharacterIteratorMode.SKIPCHARACTER;
@@ -163,42 +205,46 @@ public class _XBreakIterator extends MultiMethodTest {
                 previousCharacters[i][0],
                 locale, nCharacterIteratorMode,
                 previousCharacters[i][1], lDone);
-            log.println("Expected result is: lRes = " + previousCharacters[i][2]
+            System.out.println("Expected result is: lRes = " + previousCharacters[i][2]
                 + "; lDone = " + previousCharacters[i][3] );
-            log.println("Actual result is: lRes = " + lRes
+            System.out.println("Actual result is: lRes = " + lRes
                 + "; lDone = " + lDone[0]);
 
             bRes = bRes && lRes == previousCharacters[i][2];
             bRes = bRes && lDone[0] == previousCharacters[i][3];
         }
 
-        tRes.tested("previousCharacters()", bRes);
+        Assert.assertTrue("previousCharacters()", bRes);
     }
 
-    Vector vBounds = new Vector();
-
     /**
     * Saves bounds of all returned words for the future tests. <p>
     * Has <b>OK</b> status.
     */
+    @Test
     public void _nextWord() {
-        int i = 0;
+        ArrayList<Boundary> vBounds = nextWord();
+        Assert.assertTrue("nextWord()", vBounds != null && vBounds.size() > 0);
+    }
 
+    private ArrayList<Boundary> nextWord() {
+        int i = 0;
+        ArrayList<Boundary> vBounds = new ArrayList<>();
         while( i < UnicodeString.length() - 1 ) {
             Boundary bounds = oObj.nextWord
                 (UnicodeString, i, locale, wordType);
             if (bounds.endPos - bounds.startPos > 3) {
                 vBounds.add( bounds );
-                log.println("Word " + vBounds.size() + "("
+                System.out.println("Word " + vBounds.size() + "("
                     + bounds.startPos + "," + bounds.endPos + "): '" +
                     UnicodeString.substring(bounds.startPos,
                                             bounds.endPos) + "'");
             }
             i = bounds.endPos - 1;
         }
-        log.println("In text there are " + vBounds.size()
+        System.out.println("In text there are " + vBounds.size()
             + " words, if count from left to right");
-        tRes.tested("nextWord()", true);
+        return vBounds;
     }
 
     /**
@@ -206,26 +252,27 @@ public class _XBreakIterator extends MultiMethodTest {
     * by the method _nextWord().<p>
     * Has <b>OK</b> status if number of word bounds are equal.
     */
+    @Test
     public void _previousWord() {
-        requiredMethod("nextWord()");
+        ArrayList<Boundary> vBounds = nextWord();
 
         int i = UnicodeString.length() - 1;
-        Vector vPrevBounds = new Vector();
+        ArrayList<Boundary> vPrevBounds = new ArrayList<>();
         while( i > 0  ) {
             Boundary bounds =
                 oObj.previousWord(UnicodeString, i, locale, wordType);
             if (bounds.endPos - bounds.startPos > 3) {
                 vPrevBounds.add( bounds );
-                log.println("Word " + vPrevBounds.size() + "("
+                System.out.println("Word " + vPrevBounds.size() + "("
                     + bounds.startPos + "," + bounds.endPos + "): '"
                     + UnicodeString.substring(bounds.startPos, bounds.endPos)
                     + "'");
             }
             i = bounds.startPos;
         }
-        log.println("In text there are " + vPrevBounds.size()
+        System.out.println("In text there are " + vPrevBounds.size()
             + " words, if count from right to left");
-        tRes.tested("previousWord()", vPrevBounds.size() == vBounds.size() );
+        Assert.assertTrue("previousWord()", vPrevBounds.size() == vBounds.size() );
     }
 
     /**
@@ -235,8 +282,9 @@ public class _XBreakIterator extends MultiMethodTest {
      * Has <b>OK</b> status if bounds calculated by <code>getWordBoundary()</code>
      * method are the same as bounds obtained by <code>nextWord</code> method.
      */
+    @Test
     public void _getWordBoundary() {
-        requiredMethod("nextWord()");
+        ArrayList<Boundary> vBounds = nextWord();
 
         boolean bRes = true;
 
@@ -247,9 +295,9 @@ public class _XBreakIterator extends MultiMethodTest {
                         + iBounds.startPos;
             Boundary bounds = oObj.getWordBoundary(UnicodeString, iPos,
                 locale, wordType, true);
-            log.println("Expected result is: startPos = " + iBounds.startPos +
+            System.out.println("Expected result is: startPos = " + iBounds.startPos +
                                  "; endPos = " + iBounds.endPos);
-            log.println("Actual result is: startPos = " + bounds.startPos
+            System.out.println("Actual result is: startPos = " + bounds.startPos
                 + "; endPos = " + bounds.endPos + " Word is: '"
                 + UnicodeString.substring(bounds.startPos, bounds.endPos) + "'");
 
@@ -257,7 +305,7 @@ public class _XBreakIterator extends MultiMethodTest {
             bRes = bRes && iBounds.endPos == bounds.endPos;
         }
 
-        tRes.tested("getWordBoundary()", bRes);
+        Assert.assertTrue("getWordBoundary()", bRes);
     }
 
     /**
@@ -266,8 +314,9 @@ public class _XBreakIterator extends MultiMethodTest {
      *
      * Has <b>OK</b> status if every word has type <code>WordType.ANY_WORD</code>
      */
+    @Test
     public void _getWordType() {
-        requiredMethod("nextWord()");
+        ArrayList<Boundary> vBounds = nextWord();
 
         boolean bRes = true;
 
@@ -282,7 +331,7 @@ public class _XBreakIterator extends MultiMethodTest {
             bRes = bRes && type == WordType.ANY_WORD;
         }
 
-        tRes.tested("getWordType()", bRes);
+        Assert.assertTrue("getWordType()", bRes);
     }
 
     /**
@@ -293,8 +342,9 @@ public class _XBreakIterator extends MultiMethodTest {
      * Has <b>OK</b> status if in the first case <code>true</code>
      * returned and in the second - <code>false</code> for every word.
      */
+    @Test
     public void _isBeginWord() {
-        requiredMethod("nextWord()");
+        ArrayList<Boundary> vBounds = nextWord();
 
         boolean bRes = true;
 
@@ -303,17 +353,19 @@ public class _XBreakIterator extends MultiMethodTest {
             boolean isBegin = oObj.isBeginWord(UnicodeString, iBounds.startPos,
                                                locale, WordType.ANY_WORD);
             bRes = bRes && isBegin;
+            Assert.assertTrue("isBeginWord is wrong at position " + iBounds.startPos + ", string len " + UnicodeString.length(), isBegin);
             boolean isNotBegin = !oObj.isBeginWord(UnicodeString,
                     iBounds.startPos + 1, locale, WordType.ANY_WORD);
             bRes = bRes && isNotBegin;
+            Assert.assertTrue("isBeginWord is wrong at position " + (iBounds.startPos + 1) + " for bounds (" + iBounds.startPos + "," + iBounds.endPos, isNotBegin);
 
-            log.println("At position + " + iBounds.startPos
+            System.out.println("At position + " + iBounds.startPos
                 + " isBeginWord? " + isBegin);
-            log.println("At position + " + (iBounds.startPos + 1)
+            System.out.println("At position + " + (iBounds.startPos + 1)
                 + " isBeginWord? " + !isNotBegin);
         }
 
-        tRes.tested("isBeginWord()", bRes);
+        Assert.assertTrue("isBeginWord()", bRes);
     }
 
     /**
@@ -325,8 +377,9 @@ public class _XBreakIterator extends MultiMethodTest {
      * Has <b>OK</b> status if in the first case <code>true</code>
      * returned and in the second - <code>false</code> for every word.
      */
+    @Test
     public void _isEndWord() {
-        requiredMethod("nextWord()");
+        ArrayList<Boundary> vBounds = nextWord();
 
         boolean bRes = true;
 
@@ -339,13 +392,13 @@ public class _XBreakIterator extends MultiMethodTest {
                 iBounds.endPos - 1, locale, WordType.ANY_WORD);
             bRes = bRes && isNotEnd;
 
-            log.println("At position + " + iBounds.endPos
+            System.out.println("At position + " + iBounds.endPos
                 + " isEndWord? " + isEnd);
-            log.println("At position + " + (iBounds.endPos - 1)
+            System.out.println("At position + " + (iBounds.endPos - 1)
                 + " isEndWord? " + !isNotEnd);
         }
 
-        tRes.tested("isEndWord()", bRes);
+        Assert.assertTrue("isEndWord()", bRes);
     }
 
     Vector vSentenceStart = new Vector();
@@ -356,6 +409,7 @@ public class _XBreakIterator extends MultiMethodTest {
      *
      * Has <b>OK</b> status if -1 is returned for wrong position arguments.
      */
+    @Test
     public void _beginOfSentence() {
         int iPos = 0;
         while( iPos < UnicodeString.length() ) {
@@ -363,7 +417,7 @@ public class _XBreakIterator extends MultiMethodTest {
                 iPos, locale) );
             if (start.intValue() >= 0 && !vSentenceStart.contains(start) ) {
                 vSentenceStart.add( start );
-                log.println("Sentence " + vSentenceStart.size()
+                System.out.println("Sentence " + vSentenceStart.size()
                     + " : start from position " + start);
             }
             iPos++;
@@ -375,10 +429,10 @@ public class _XBreakIterator extends MultiMethodTest {
             UnicodeString.length() + 1, locale) == -1;
 
         if (!bRes) {
-            log.println("When invalid position, returned value isn't equal to -1");
+            System.out.println("When invalid position, returned value isn't equal to -1");
         }
 
-        tRes.tested("beginOfSentence()", bRes);
+        Assert.assertTrue("beginOfSentence()", bRes);
     }
 
     /**
@@ -391,13 +445,14 @@ public class _XBreakIterator extends MultiMethodTest {
      * Has <b>OK</b> status if the end position of every sentence
      * greater than starting and -1 returned for invalid arguments.
      */
+    @Test
     public void _endOfSentence() {
         boolean bRes = true;
         for(int i = 0; i < vSentenceStart.size(); i++) {
             int start = ((Integer)vSentenceStart.get(i)).intValue();
             int end = oObj.endOfSentence(UnicodeString, start, locale);
             bRes &= end > start;
-            log.println("Sentence " + i + " range is [" + start + ", "
+            System.out.println("Sentence " + i + " range is [" + start + ", "
                 + end + "]");
         }
 
@@ -407,10 +462,10 @@ public class _XBreakIterator extends MultiMethodTest {
             UnicodeString.length() + 1, locale) == -1;
 
         if (!bInvRes) {
-            log.println("When invalid position, returned value isn't equal to -1");
+            System.out.println("When invalid position, returned value isn't equal to -1");
         }
 
-        tRes.tested("endOfSentence()", bRes && bInvRes);
+        Assert.assertTrue("endOfSentence()", bRes && bInvRes);
     }
 
     /**
@@ -420,6 +475,7 @@ public class _XBreakIterator extends MultiMethodTest {
     * Has <b>OK</b> status if non-zero break position was found and it is
     * less or equal than position we trying to break.
     */
+    @Test
     public void _getLineBreak() {
         boolean bRes = true;
         LineBreakResults lineBreakResults;
@@ -445,11 +501,11 @@ public class _XBreakIterator extends MultiMethodTest {
         bRes = breakPos <= pos && breakPos > 0;
 
         if (!bRes) {
-            log.println("The last position was: " + pos
+            System.out.println("The last position was: " + pos
                 + ", and the break position was: " + breakPos);
         }
 
-        tRes.tested("getLineBreak()", bRes);
+        Assert.assertTrue("getLineBreak()", bRes);
     }
 
     // Asian type script
@@ -464,14 +520,15 @@ public class _XBreakIterator extends MultiMethodTest {
     * relatively to position passed. <p>
     * Has <b>OK</b> status if the starting position of script is returned.
     */
+    @Test
     public void _beginOfScript() {
         String multiScript = "ab" + katakana  ;
 
         int pos = oObj.beginOfScript(multiScript, 3, ScriptType.ASIAN) ;
 
-        log.println("Position = " + pos) ;
+        System.out.println("Position = " + pos) ;
 
-        tRes.tested("beginOfScript()", pos == 2) ;
+        Assert.assertTrue("beginOfScript()", pos == 2) ;
     }
 
     /**
@@ -479,14 +536,15 @@ public class _XBreakIterator extends MultiMethodTest {
     * relatively to position passed. <p>
     * Has <b>OK</b> status if the end position of script is returned.
     */
+    @Test
     public void _endOfScript() {
         String multiScript = "ab" + katakana + "cd" ;
 
         int pos = oObj.endOfScript(multiScript, 2, ScriptType.ASIAN) ;
 
-        log.println("Position = " + pos) ;
+        System.out.println("Position = " + pos) ;
 
-        tRes.tested("endOfScript()", pos == 4) ;
+        Assert.assertTrue("endOfScript()", pos == 4) ;
     }
 
     /**
@@ -494,14 +552,15 @@ public class _XBreakIterator extends MultiMethodTest {
     * relatively to position passed. <p>
     * Has <b>OK</b> status if the appropriate position is returned.
     */
+    @Test
     public void _nextScript() {
         String multiScript = "ab" + katakana + "cd"  ;
 
         int pos = oObj.nextScript(multiScript, 0, ScriptType.LATIN) ;
 
-        log.println("Position = " + pos) ;
+        System.out.println("Position = " + pos) ;
 
-        tRes.tested("nextScript()", pos == 4) ;
+        Assert.assertTrue("nextScript()", pos == 4) ;
     }
 
     /**
@@ -509,14 +568,15 @@ public class _XBreakIterator extends MultiMethodTest {
     * relatively to position passed. <p>
     * Has <b>OK</b> status if the appropriate position is returned.
     */
+    @Test
     public void _previousScript() {
         String multiScript = "ab" + katakana + "cd"  ;
 
         int pos = oObj.previousScript(multiScript, 5, ScriptType.ASIAN) ;
 
-        log.println("Position = " + pos) ;
+        System.out.println("Position = " + pos) ;
 
-        tRes.tested("previousScript()", pos == 2) ;
+        Assert.assertTrue("previousScript()", pos == 2) ;
     }
 
     /**
@@ -527,6 +587,7 @@ public class _XBreakIterator extends MultiMethodTest {
     * codepoints and <code>WEAK</code> for codepoints from Arrows
     * Unicode block.
     */
+    @Test
     public void _getScriptType() {
         boolean res = true ;
 
@@ -535,11 +596,9 @@ public class _XBreakIterator extends MultiMethodTest {
         res &= oObj.getScriptType(arabic, 0) == ScriptType.COMPLEX ;
         res &= oObj.getScriptType(arrows, 0) == ScriptType.WEAK ;
 
-        tRes.tested("getScriptType()", res) ;
+        Assert.assertTrue("getScriptType()", res) ;
     }
 
-    boolean bCharBlockRes = true;
-
     protected short getCharBlockType(int pos) {
         short i = 1;
         short cType = 0;
@@ -567,7 +626,13 @@ public class _XBreakIterator extends MultiMethodTest {
      * has position 0 and the end of the last block is at the end
      * of the whole string.
      */
+    @Test
     public void _beginOfCharBlock() {
+        Assert.assertTrue("beginOfCharBlock()", beginOfCharBlock());
+    }
+
+    private boolean beginOfCharBlock() {
+        boolean bCharBlockRes = true;
         int iPos = 0;
 
         while( iPos < UnicodeString.length() && iPos > -1) {
@@ -578,7 +643,7 @@ public class _XBreakIterator extends MultiMethodTest {
                 locale, charType);
             iPos = endPos;
             vCharBlockBounds.add(new Boundary(startPos, endPos));
-            log.println("" + vCharBlockBounds.size() + "). Bounds: ["
+            System.out.println("" + vCharBlockBounds.size() + "). Bounds: ["
                 + startPos + "," + endPos + "]; Type = " + charType);
             vCharBlockTypes.add(new Short(charType));
         }
@@ -589,16 +654,16 @@ public class _XBreakIterator extends MultiMethodTest {
             bCharBlockRes &= endPos == startPos;
         }
 
-        log.println("Testing for no intersections : " + bCharBlockRes);
+        System.out.println("Testing for no intersections : " + bCharBlockRes);
         int startPos = ((Boundary)vCharBlockBounds.get(0)).startPos;
         bCharBlockRes &= startPos == 0;
         int endPos = ((Boundary)vCharBlockBounds.get
             (vCharBlockBounds.size() - 1)).endPos;
         bCharBlockRes &= endPos == UnicodeString.length();
-        log.println("Regions should starts with 0 and ends with "
+        System.out.println("Regions should starts with 0 and ends with "
             + UnicodeString.length());
 
-        tRes.tested("beginOfCharBlock()", bCharBlockRes);
+        return bCharBlockRes;
     }
 
     /**
@@ -608,8 +673,7 @@ public class _XBreakIterator extends MultiMethodTest {
      * Has the status same as <code>beginOfCharBlock()</code> method status.
      */
     public void _endOfCharBlock() {
-        requiredMethod("beginOfCharBlock()");
-        tRes.tested("endOfCharBlock()", bCharBlockRes);
+        Assert.assertTrue("endOfCharBlock()", beginOfCharBlock());
     }
 
     /**
@@ -622,7 +686,7 @@ public class _XBreakIterator extends MultiMethodTest {
      * equal to this block boundary start.
      */
     public void _nextCharBlock() {
-        requiredMethod("beginOfCharBlock()");
+        beginOfCharBlock();
 
         boolean bRes = true;
         for(int i = 0; i < vCharBlockBounds.size(); i++) {
@@ -633,14 +697,14 @@ public class _XBreakIterator extends MultiMethodTest {
                 locale, type.shortValue());
             if (iPos != bounds.startPos) {
                 bRes = false;
-                log.println("nextCharBlock(UnicodeString, "
+                System.out.println("nextCharBlock(UnicodeString, "
                     + (bounds.startPos - 1) + ", locale, " + type
                     + ") should return " + bounds.startPos);
-                log.println("... and actual value is " + iPos);
+                System.out.println("... and actual value is " + iPos);
             }
         }
 
-        tRes.tested("nextCharBlock()", bRes);
+        Assert.assertTrue("nextCharBlock()", bRes);
     }
 
     /**
@@ -653,7 +717,7 @@ public class _XBreakIterator extends MultiMethodTest {
      * equal to this block boundary start.
      */
     public void _previousCharBlock() {
-        requiredMethod("beginOfCharBlock()");
+        beginOfCharBlock();
 
         boolean bRes = true;
         for(int i = 0; i < vCharBlockBounds.size(); i++) {
@@ -663,14 +727,14 @@ public class _XBreakIterator extends MultiMethodTest {
                 bounds.endPos + 1, locale, type.shortValue());
             if (iPos != bounds.startPos) {
                 bRes = false;
-                log.println("previousCharBlock(UnicodeString, "
+                System.out.println("previousCharBlock(UnicodeString, "
                     + (bounds.endPos + 1) + ", locale, " + type
                     + ") should return " + bounds.startPos);
-                log.println("... and actual value is " + iPos);
+                System.out.println("... and actual value is " + iPos);
             }
         }
 
-        tRes.tested("previousCharBlock()", bRes);
+        Assert.assertTrue("previousCharBlock()", bRes);
     }
 
 }
diff --git a/test/testuno/source/api/i18n/XCalendarTest.java b/test/testuno/source/api/i18n/XCalendarTest.java
index 6c3acd102a..1c63861032 100644
--- a/test/testuno/source/api/i18n/XCalendarTest.java
+++ b/test/testuno/source/api/i18n/XCalendarTest.java
@@ -21,9 +21,7 @@
 
 
 
-package ifc.i18n;
-
-import lib.MultiMethodTest;
+package api.i18n;
 
 import com.sun.star.i18n.CalendarDisplayIndex;
 import com.sun.star.i18n.CalendarFieldIndex;
@@ -33,6 +31,14 @@ import com.sun.star.i18n.XLocaleData;
 import com.sun.star.lang.Locale;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Assert;
+import org.junit.Test;
+import org.openoffice.test.uno.UnoApp;
 
 /**
 * Testing <code>com.sun.star.i18n.XCalendar</code>
@@ -62,42 +68,61 @@ import com.sun.star.uno.UnoRuntime;
 * Test is <b> NOT </b> multithread compliant. <p>
 * @see com.sun.star.i18n.XCalendar
 */
-public class _XCalendar extends MultiMethodTest {
+public class XCalendarTest {
+    private static final UnoApp app = new UnoApp();
+
+    private XComponentContext xContext = null;
     private boolean debug = false;
     public XCalendar oObj = null;
-    public String[][] calendars;
-    public int[] count;
     public double newDTime = 1000.75;
     public short newValue = 2;
-    public short firstDay = 2;
+    public final short firstDay = 2;
     public short mdfw = 3;
     double aOriginalDTime = 0;
     Locale[] installed_locales;
 
-    public void before() {
-        XLocaleData locData = null;
-        try {
-            locData = (XLocaleData) UnoRuntime.queryInterface(
-                XLocaleData.class,
-                    ((XMultiServiceFactory)tParam.getMSF()).createInstance(
-                    "com.sun.star.i18n.LocaleData"));
-        } catch (com.sun.star.uno.Exception e) {
+    static class CalendarData {
+        String[][] calendars;
+        int[] count;
+    };
 
-        }
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        app.start();
+    }
+
+    @AfterClass
+    public static void tearDown() throws Exception {
+        app.close();
+    }
+
+    @Before
+    public void before() throws Exception {
+        xContext = app.getComponentContext();
+
+        XLocaleData locData = null;
+        locData = UnoRuntime.queryInterface(
+            XLocaleData.class,
+            xContext.getServiceManager().createInstanceWithContext("com.sun.star.i18n.LocaleData", xContext)
+        );
+        oObj = UnoRuntime.queryInterface(
+            XCalendar.class,
+            xContext.getServiceManager().createInstanceWithContext("com.sun.star.i18n.LocaleCalendar", xContext)
+        );
         installed_locales = locData.getAllInstalledLocaleNames();
-        calendars = new String[installed_locales.length][];
-        count = new int[installed_locales.length];
         oObj.loadDefaultCalendar(installed_locales[0]);
         aOriginalDTime = oObj.getDateTime();
         
-        debug = tParam.getBool("DebugIsActive");
+        debug = false;
     }
 
     /**
      * Restore the changed time during the test to the original value of the
      * machine: has to be correct for the following interface tests.
      */
-    public void after() {
+    @After
+    public void after() throws Exception {
         oObj.loadDefaultCalendar(installed_locales[0]);
         oObj.setDateTime(aOriginalDTime);
     }
@@ -107,23 +132,15 @@ public class _XCalendar extends MultiMethodTest {
     * Has <b> OK </b> status if method loads calendar, that is
     * default for a given locale.
     */
+    @Test
     public void _loadDefaultCalendar() {
-        boolean res = true;
-
         for (int i=0; i<installed_locales.length; i++) {
             String lang = "Language: "+installed_locales[i].Language +
                           ", Country: "+ installed_locales[i].Country +
-                          ", Variant: "+ installed_locales[i].Country;
+                          ", Variant: "+ installed_locales[i].Variant;
             oObj.loadDefaultCalendar(installed_locales[i]);
-            if (oObj.getLoadedCalendar().Default) {
-                //log.println(lang + " ... OK");
-            } else {
-                log.println(lang + " ... FAILED");
-            }
-            res &= oObj.getLoadedCalendar().Default;
+            Assert.assertTrue(lang, oObj.getLoadedCalendar().Default);
         }
-
-        tRes.tested("loadDefaultCalendar()", res);
     }
 
     /**
@@ -131,23 +148,24 @@ public class _XCalendar extends MultiMethodTest {
     * Has <b> OK </b> status if the method returns more than zero calendars for
     * every locale.
     */
+    @Test
     public void _getAllCalendars() {
-        boolean res = true;
+        getAllCalendars();
+    }
 
+    private CalendarData getAllCalendars() {
+        CalendarData data = new CalendarData();
+        data.calendars = new String[installed_locales.length][];
+        data.count = new int[installed_locales.length];
         for (int i=0; i<installed_locales.length; i++) {
             String lang = "Language: "+installed_locales[i].Language +
                           ", Country: "+ installed_locales[i].Country +
-                          ", Variant: "+ installed_locales[i].Country;
-            calendars[i] = oObj.getAllCalendars(installed_locales[i]);
-            count[i] = calendars[i].length-1;
-            if (calendars[i].length > 0) {
-                //log.println(lang + " ... OK");
-            } else {
-                log.println(lang + " ... FAILED");
-            }
-            res &= (calendars[i].length > 0);
+                          ", Variant: "+ installed_locales[i].Variant;
+            data.calendars[i] = oObj.getAllCalendars(installed_locales[i]);
+            data.count[i] = data.calendars[i].length-1;
+            Assert.assertTrue(lang, data.calendars[i].length > 0);
         }
-        tRes.tested("getAllCalendars()", res);
+        return data;
     }
 
     /**
@@ -160,24 +178,21 @@ public class _XCalendar extends MultiMethodTest {
     *  locale </li>
     * </ul>
     */
+    @Test
     public void _loadCalendar() {
-        boolean res = true;
-        requiredMethod("getAllCalendars()");
+        loadCalendar();
+    }
 
+    private CalendarData loadCalendar() {
+        CalendarData data = getAllCalendars();
         for (int i=0; i<installed_locales.length; i++) {
             String lang = "Language: "+installed_locales[i].Language +
                           ", Country: "+ installed_locales[i].Country +
-                          ", Variant: "+ installed_locales[i].Country;
-            oObj.loadCalendar(calendars[i][0], installed_locales[i]);
-            if (calendars[i][0].equals(oObj.getLoadedCalendar().Name)) {
-                //log.println(lang + " ... OK");
-            } else {
-                log.println(lang + " ... FAILED");
-            }
-            res &= calendars[i][0].equals(oObj.getLoadedCalendar().Name);
+                          ", Variant: "+ installed_locales[i].Variant;
+            oObj.loadCalendar(data.calendars[i][0], installed_locales[i]);
+            Assert.assertEquals(lang, data.calendars[i][0], oObj.getLoadedCalendar().Name);
         }
-
-        tRes.tested("loadCalendar()", res);
+        return data;
     }
 
     /**
@@ -190,23 +205,16 @@ public class _XCalendar extends MultiMethodTest {
     *  and locale </li>
     * </ul>
     */
+    @Test
     public void _getLoadedCalendar() {
-        boolean res = true;
-
-        requiredMethod("loadCalendar()");
+        CalendarData data = loadCalendar();
         for (int i=0; i<installed_locales.length; i++) {
             String lang = "Language: "+installed_locales[i].Language +
                           ", Country: "+ installed_locales[i].Country +
-                          ", Variant: "+ installed_locales[i].Country;
-            oObj.loadCalendar(calendars[i][0], installed_locales[i]);
-            if (calendars[i][0].equals(oObj.getLoadedCalendar().Name)) {
-                //log.println(lang + " ... OK");
-            } else {
-                log.println(lang + " ... FAILED");
-            }
-            res &= calendars[i][0].equals(oObj.getLoadedCalendar().Name);
+                          ", Variant: "+ installed_locales[i].Variant;
+            oObj.loadCalendar(data.calendars[i][0], installed_locales[i]);
+            Assert.assertEquals(lang, data.calendars[i][0], oObj.getLoadedCalendar().Name);
         }
-        tRes.tested("getLoadedCalendar()", res);
     }
 
     /**
@@ -219,23 +227,17 @@ public class _XCalendar extends MultiMethodTest {
     *  and locale </li>
     * </ul>
     */
+    @Test
     public void _getUniqueID() {
-        boolean res = true;
+        CalendarData data = getAllCalendars();
         for (int i=0; i<installed_locales.length; i++) {
             String lang = "Language: "+installed_locales[i].Language +
                           ", Country: "+ installed_locales[i].Country +
-                          ", Variant: "+ installed_locales[i].Country;
-            oObj.loadCalendar(calendars[i][0], installed_locales[i]);
+                          ", Variant: "+ installed_locales[i].Variant;
+            oObj.loadCalendar(data.calendars[i][0], installed_locales[i]);
             String uID = oObj.getUniqueID();
-            if (uID.equals(calendars[i][0])) {
-                //log.println(lang + " ... OK");
-            } else {
-                log.println(lang + " ... FAILED");
-            }
-            res &= uID.equals(calendars[i][0]);
+            Assert.assertEquals(lang, uID, data.calendars[i][0]);
         }
-
-        tRes.tested("getUniqueID()",res);
     }
 
     /**
@@ -243,25 +245,16 @@ public class _XCalendar extends MultiMethodTest {
     * Has <b> OK </b> status if the method returns value, that's equal to
     * value set before. <p>
     */
-
+    @Test
     public void _setDateTime() {
-        boolean res = true;
-        
         for (int i=0; i<installed_locales.length; i++) {
             String lang = "Language: "+installed_locales[i].Language +
                           ", Country: "+ installed_locales[i].Country +
-                          ", Variant: "+ installed_locales[i].Country;
+                          ", Variant: "+ installed_locales[i].Variant;
             oObj.setDateTime(newDTime);
             double aDTime = oObj.getDateTime();
-            if (aDTime == newDTime) {
-                //log.println(lang + " ... OK");
-            } else {
-                log.println(lang + " ... FAILED");
-            }
-            res &= (aDTime == newDTime);
+            Assert.assertTrue(lang, aDTime == newDTime);
         }
-
-        tRes.tested("setDateTime()", res);
     }
 
     /**
@@ -269,24 +262,16 @@ public class _XCalendar extends MultiMethodTest {
     * Has <b> OK </b> status if the method returns value, that's equal to
     * value set before. <p>
     */
-
+    @Test
     public void _getDateTime() {
-        boolean res = true;
-
         for (int i=0; i<installed_locales.length; i++) {
             String lang = "Language: "+installed_locales[i].Language +
                           ", Country: "+ installed_locales[i].Country +
-                          ", Variant: "+ installed_locales[i].Country;
+                          ", Variant: "+ installed_locales[i].Variant;
             oObj.setDateTime(newDTime);
             double aDTime = oObj.getDateTime();
-            if (aDTime == newDTime) {
-                //log.println(lang + " ... OK");
-            } else {
-                log.println(lang + " ... FAILED");
-            }
-            res &= (aDTime == newDTime);
+            Assert.assertTrue(lang, aDTime == newDTime);
         }
-        tRes.tested("getDateTime()", res);
     }
 
     /**
@@ -294,19 +279,19 @@ public class _XCalendar extends MultiMethodTest {
     * Has <b> OK </b> status if the method returns value, that's equal to
     * value set before. <p>
     */
-
+    @Test
     public void _setValue() {
-        boolean res = true;
+        CalendarData data = getAllCalendars();
         for (int i=0; i<installed_locales.length; i++) {
             String error = "";
             String lang = "Language: "+installed_locales[i].Language +
                           ", Country: "+ installed_locales[i].Country +
                           ", Variant: "+ installed_locales[i].Variant +
-                          ", Name: "+calendars[i][count[i]];
+                          ", Name: "+data.calendars[i][data.count[i]];
             String[] names = new String[]{"DAY_OF_MONTH",
                 "HOUR","MINUTE","SECOND","MILLISECOND",
                 "YEAR","MONTH"};
-            oObj.loadCalendar(calendars[i][count[i]],installed_locales[i]);
+            oObj.loadCalendar(data.calendars[i][data.count[i]],installed_locales[i]);
             short[] fields = new short[]{CalendarFieldIndex.DAY_OF_MONTH,
                                          CalendarFieldIndex.HOUR,
                                          CalendarFieldIndex.MINUTE,
@@ -331,30 +316,22 @@ public class _XCalendar extends MultiMethodTest {
                 short get = oObj.getValue(fields[k]);
                 if (get != set) {
                     if (debug)
-                        log.println("ERROR occur: tried to set " + names[k] + " to value " + set);
-                        log.println("list of values BEFORE set " + names[k] + " to value " + set + ":");
+                        System.out.println("ERROR occur: tried to set " + names[k] + " to value " + set);
+                        System.out.println("list of values BEFORE set " + names[k] + " to value " + set + ":");
                         for (int n=0; n < oldValues.length; n++){
-                            log.println(names[n] + ":" + oldValues[n]);
+                            System.out.println(names[n] + ":" + oldValues[n]);
                         }
-                        log.println("list of values AFTER set " + names[k] + " to value " + set + ":");
+                        System.out.println("list of values AFTER set " + names[k] + " to value " + set + ":");
                         for (int n=0; n < fields.length;n++){
-                            log.println(names[n] + ":" + oObj.getValue(fields[n]));
+                            System.out.println(names[n] + ":" + oObj.getValue(fields[n]));
                         }
                         
                     error += "failed for "+names[k]+" expected "+
                                 set+" gained "+get+" ; \n";
                 }
             }
-            if (error.equals("")) {
-                log.println(lang + " ... OK");
-            } else {
-                log.println("*** "+lang + " ... FAILED ***");
-                log.println(error);
-            }
-            res &= (error.equals(""));
+            Assert.assertTrue(error, error.equals(""));
         }
-
-        tRes.tested("setValue()", res);
     }
 
     /**
@@ -362,18 +339,14 @@ public class _XCalendar extends MultiMethodTest {
     * Has <b> OK </b> status if the method returns value, that's equal to
     * value set before. <p>
     */
-
+    @Test
     public void _getValue() {
-        boolean res = true;
-
-        requiredMethod("setValue()");
+        _setValue();
         short aValue = oObj.getValue(CalendarFieldIndex.MONTH);
-        res &= (aValue == newValue);
-        if (!res){
-            log.println("the returned value is not the expected value:");
-            log.println("expexted: " + newValue + "  returned value: " + aValue);
-        }
-        tRes.tested("getValue()", res);
+        Assert.assertEquals(
+            "the returned value is not the expected value:" +
+            "expected: " + newValue + "  returned value: " + aValue,
+            aValue, newValue);
     }
 
     /**
@@ -386,18 +359,15 @@ public class _XCalendar extends MultiMethodTest {
     *  <li> <code> getValue() </code> : gets the value of a field </li>
     * </ul>
     */
+    @Test
     public void _addValue() {
-        boolean res = true;
-
-        requiredMethod("getValue()");
+        _setValue();
         oObj.addValue(CalendarFieldIndex.MONTH, 1);
         short aValue = oObj.getValue(CalendarFieldIndex.MONTH);
-        res &= (aValue > newValue);
-        if (!res){
-            log.println("the returned value is not the expected value:");
-            log.println("expexted: " + newValue + "  returned value: " + aValue);
-        }
-        tRes.tested("addValue()", res);
+        Assert.assertTrue(
+            "the returned value is not the expected value:" +
+            "expected: " + newValue + "  returned value: " + aValue,
+            aValue > newValue);
     }
 
     /**
@@ -405,12 +375,9 @@ public class _XCalendar extends MultiMethodTest {
     * Has <b> OK </b> status if the method successfully returns
     * and no exceptions were thrown.
     */
+    @Test
     public void _setFirstDayOfWeek() {
-        boolean res = true;
-
         oObj.setFirstDayOfWeek(firstDay);
-        res &= true;
-        tRes.tested("setFirstDayOfWeek()", res);
     }
 
     /**
@@ -423,13 +390,11 @@ public class _XCalendar extends MultiMethodTest {
     *  week</li>
     * </ul>
     */
+    @Test
     public void _getFirstDayOfWeek() {
-        boolean res = true;
-
-        requiredMethod("setFirstDayOfWeek()");
+        _setFirstDayOfWeek();
         short aFirstDayOfWeek = oObj.getFirstDayOfWeek();
-        res &= (aFirstDayOfWeek == firstDay);
-        tRes.tested("getFirstDayOfWeek()", res);
+        Assert.assertEquals("getFirstDayOfWeek()", aFirstDayOfWeek, firstDay);
     }
 
     /**
@@ -437,12 +402,9 @@ public class _XCalendar extends MultiMethodTest {
     * Has <b> OK </b> status if the method successfully returns
     * and no exceptions were thrown.
     */
+    @Test
     public void _setMinimumNumberOfDaysForFirstWeek() {
-        boolean res = true;
-
         oObj.setMinimumNumberOfDaysForFirstWeek(mdfw);
-        res &= true;
-        tRes.tested("setMinimumNumberOfDaysForFirstWeek()", res);
     }
 
     /**
@@ -455,75 +417,64 @@ public class _XCalendar extends MultiMethodTest {
     *  many days of a week must reside in the first week of a year</li>
     * </ul>
     */
+    @Test
     public void _getMinimumNumberOfDaysForFirstWeek() {
-        boolean res = true;
-
-        requiredMethod("setMinimumNumberOfDaysForFirstWeek()");
+        _setMinimumNumberOfDaysForFirstWeek();
         short aShort = oObj.getMinimumNumberOfDaysForFirstWeek();
-        res &= (aShort == mdfw);
-        tRes.tested("getMinimumNumberOfDaysForFirstWeek()", res);
+        Assert.assertEquals("getMinimumNumberOfDaysForFirstWeek()", aShort, mdfw);
     }
 
     /**
     * Test calls the method, then result is checked. <p>
     * Has <b> OK </b> status if the method returns 12.
     */
+    @Test
     public void _getNumberOfMonthsInYear() {
-        boolean res = true;
         short aShort = oObj.getNumberOfMonthsInYear();
-
-        res &= (aShort == (short) 12);
-        tRes.tested("getNumberOfMonthsInYear()", res);
+        Assert.assertTrue("getNumberOfMonthsInYear()", (aShort == (short) 12));
     }
 
     /**
     * Test calls the method, then result is checked. <p>
     * Has <b> OK </b> status if the method returns 7.
     */
+    @Test
     public void _getNumberOfDaysInWeek() {
-        boolean res = true;
         short aShort = oObj.getNumberOfDaysInWeek();
-
-        res &= (aShort == (short) 7);
-        tRes.tested("getNumberOfDaysInWeek()", res);
+        Assert.assertTrue("getNumberOfDaysInWeek()", (aShort == (short) 7));
     }
 
     /**
     * Test calls the method, then result is checked. <p>
     * Has <b> OK </b> status if length of array, returned by the method is 12.
     */
+    @Test
     public void _getMonths() {
-        boolean res = true;
         CalendarItem[] months = oObj.getMonths();
-
-        res &= (months.length == 12);
-        tRes.tested("getMonths()", res);
+        Assert.assertTrue("getMonths()", months.length == 12);
     }
 
     /**
     * Test calls the method, then result is checked. <p>
     * Has <b> OK </b> status if length of array, returned by the method is 7.
     */
+    @Test
     public void _getDays() {
-        boolean res = true;
         CalendarItem[] Days = oObj.getDays();
-
-        res &= (Days.length == 7);
-        tRes.tested("getDays()", res);
+        Assert.assertTrue("getDays()", Days.length == 7);
     }
 
     /**
     * After loading calendar, test calls the method, then result is checked.<p>
     * Has <b> OK </b> status if length of string, returned by the method is 3.
     */
+    @Test
     public void _getDisplayName() {
-        boolean res = true;
-
-        oObj.loadCalendar(calendars[0][0],installed_locales[0]);
+        CalendarData data = getAllCalendars();
+        oObj.loadCalendar(data.calendars[0][0],installed_locales[0]);
         String DisplayName = oObj.getDisplayName(CalendarDisplayIndex.MONTH,
             newValue, (short) 0);
-        res &= (DisplayName.length() == 3);
-        tRes.tested("getDisplayName()", res);
+        Assert.assertTrue("getDisplayName()", DisplayName.length() == 3);
     }
 
 
@@ -533,16 +484,13 @@ public class _XCalendar extends MultiMethodTest {
     * Has <b> OK </b> status if the method returns true when valid month is
     * set, and if the method returns false when set month is not valid.
     */
+    @Test
     public void _isValid() {
-        boolean res = true;
-        
         oObj.loadDefaultCalendar(installed_locales[0]);
         oObj.setValue(CalendarFieldIndex.MONTH, (short) 37);
-        res &= !oObj.isValid();
+        Assert.assertTrue(!oObj.isValid());
         oObj.setValue(CalendarFieldIndex.MONTH, (short) 10);
-        res &= oObj.isValid();
-
-        tRes.tested("isValid()", res);
+        Assert.assertTrue(oObj.isValid());
     }
 
     /**
diff --git a/test/testuno/source/api/i18n/XCharacterClassificationTest.java b/test/testuno/source/api/i18n/XCharacterClassificationTest.java
index 427f36cbb0..507a6c53f8 100644
--- a/test/testuno/source/api/i18n/XCharacterClassificationTest.java
+++ b/test/testuno/source/api/i18n/XCharacterClassificationTest.java
@@ -21,15 +21,22 @@
 
 
 
-package ifc.i18n;
-
-import lib.MultiMethodTest;
+package api.i18n;
 
 import com.sun.star.i18n.KParseTokens;
 import com.sun.star.i18n.KParseType;
 import com.sun.star.i18n.ParseResult;
 import com.sun.star.i18n.XCharacterClassification;
 import com.sun.star.lang.Locale;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Assert;
+import org.junit.Test;
+import org.openoffice.test.uno.UnoApp;
 
 /**
  * Testing <code>com.sun.star.i18n.XCharacterClassification</code>
@@ -49,7 +56,10 @@ import com.sun.star.lang.Locale;
  * Test is <b> NOT </b> multithread compliant. <p>
  * @see com.sun.star.i18n.XCharacterClassification
  */
-public class _XCharacterClassification extends MultiMethodTest {
+public class XCharacterClassificationTest {
+    private static final UnoApp app = new UnoApp();
+
+    private XComponentContext xContext = null;
     public XCharacterClassification oObj = null;
     public String[] languages = new String[]{"de","en","es","fr","ja","ko","zh"};
     public String[] countries = new String[]{"DE","US","ES","FR","JP","KR","CN"};
@@ -97,6 +107,28 @@ public class _XCharacterClassification extends MultiMethodTest {
         "U_CJK_COMPATIBILITY_FORMS","U_SMALL_FORM_VARIANTS","U_ARABIC_PRESENTATION_FORMS_B",
         "U_SPECIALS","U_HALFWIDTH_AND_FULLWIDTH_FORMS","U_CHAR_SCRIPT_COUNT","U_NO_SCRIPT"};
 
+    // setup and close connections
+    @BeforeClass
+    public static void setUpConnection() throws Exception
+    {
+        app.start();
+    }
+
+    @AfterClass
+    public static void tearDownConnection() throws InterruptedException, com.sun.star.uno.Exception
+    {
+        app.close();
+    }
+
+    @Before
+    public void before() throws Exception {
+        xContext = app.getComponentContext();
+        oObj = UnoRuntime.queryInterface(
+            XCharacterClassification.class,
+            xContext.getServiceManager().createInstanceWithContext("com.sun.star.i18n.CharacterClassification", xContext)
+        );
+    }
+
     /**
     * Test calls the method for different locales. Then each result is compared
     * with a string, converted to a upper case using
@@ -104,6 +136,7 @@ public class _XCharacterClassification extends MultiMethodTest {
     * Has <b> OK </b> status if string, returned by the method is equal to
     * a string that is returned by String.toUpperCase() for all locales.
     */
+    @Test
     public void _toUpper() {
         boolean res = true;
         char[] characters = new char[]{586,65,97,498,721,4588,772,8413,3404};
@@ -117,13 +150,13 @@ public class _XCharacterClassification extends MultiMethodTest {
                 new java.util.Locale(languages[i], countries[i]));
             res &= get.equals(exp);
             if (!res) {
-                log.println("FAILED for: language=" + languages[i] +
+                System.out.println("FAILED for: language=" + languages[i] +
                     " ; country=" + countries[i]);
-                log.println("Expected: " + exp);
-                log.println("Gained : " + get);
+                System.out.println("Expected: " + exp);
+                System.out.println("Gained : " + get);
             }
         }
-        tRes.tested("toUpper()", res);
+        Assert.assertTrue("toUpper()", res);
     }
 
     /**
@@ -133,6 +166,7 @@ public class _XCharacterClassification extends MultiMethodTest {
     * Has <b> OK </b> status if string, returned by the method is equal to
     * a string that is returned by String.toLowerCase() for all locales.
     */
+    @Test
     public void _toLower() {
         boolean res = true;
         char[] characters = new char[]{586,65,97,498,721,4588,772,8413,3404};
@@ -146,13 +180,13 @@ public class _XCharacterClassification extends MultiMethodTest {
                 new java.util.Locale(languages[i],countries[i]));
             res &= get.equals(exp);
             if (!res) {
-                log.println("FAILED for: language=" + languages[i]
+                System.out.println("FAILED for: language=" + languages[i]
                     + " ; country=" + countries[i]);
-                log.println("Expected: " + exp);
-                log.println("Gained : " + get);
+                System.out.println("Expected: " + exp);
+                System.out.println("Gained : " + get);
             }
         }
-        tRes.tested("toLower()", res);
+        Assert.assertTrue("toLower()", res);
     }
 
     /**
@@ -162,6 +196,7 @@ public class _XCharacterClassification extends MultiMethodTest {
     * Has <b> OK </b> status if string, returned by the method is equal to
     * a string that was converted using Character.toTitleCase() for all locales.
     */
+    @Test
     public void _toTitle() {
         boolean res = true;
         String toCheck = new String(new char[]{8112});
@@ -174,13 +209,13 @@ public class _XCharacterClassification extends MultiMethodTest {
                 new char[]{Character.toTitleCase(toCheck.toCharArray()[0])});
             res &= get.equals(exp);
             if (!res) {
-                log.println("FAILED for: language=" + languages[i]
+                System.out.println("FAILED for: language=" + languages[i]
                     + " ; country=" + countries[i]);
-                log.println("Expected: " + exp);
-                log.println("Gained : " + get);
+                System.out.println("Expected: " + exp);
+                System.out.println("Gained : " + get);
             }
         }
-        tRes.tested("toTitle()", res);
+        Assert.assertTrue("toTitle()", res);
     }
 
     /**
@@ -192,6 +227,7 @@ public class _XCharacterClassification extends MultiMethodTest {
     * is equal to an element number.<p>
     * @see com.sun.star.i18n.CharType
     */
+    @Test
     public void _getType() {
         boolean res = true;
         char[] characters = new char[]{586,65,97,498,721,4588,772,8413,3404,
@@ -206,12 +242,12 @@ public class _XCharacterClassification extends MultiMethodTest {
             int get = oObj.getType(toCheck, i);
             res &= (charstyles_office[get] == charstyles_office[i]);
             if (!res) {
-                log.println("Code :" + Integer.toHexString(charsInt[i]));
-                log.println("Gained: " + charstyles_office[get]);
-                log.println("Expected : " + charstyles_office[i]);
+                System.out.println("Code :" + Integer.toHexString(charsInt[i]));
+                System.out.println("Gained: " + charstyles_office[get]);
+                System.out.println("Expected : " + charstyles_office[i]);
             }
         }
-        tRes.tested("getType()", res);
+        Assert.assertTrue("getType()", res);
     }
 
     /**
@@ -220,6 +256,7 @@ public class _XCharacterClassification extends MultiMethodTest {
     * Has <b> OK </b> status if the method returns type, expected for a given
     * character and locale.
     */
+    @Test
     public void _getCharacterType() {
         boolean res = true;
         String toCheck = "Ab0)";
@@ -230,15 +267,15 @@ public class _XCharacterClassification extends MultiMethodTest {
                 int get = oObj.getCharacterType(toCheck, i, getLocale(j));
                 res &= (get == expected[i]);
                 if (!res) {
-                    log.println("FAILED for: language=" + languages[j] +
+                    System.out.println("FAILED for: language=" + languages[j] +
                         " ; country=" + countries[j]);
-                    log.println("Sysmbol :" + toCheck.toCharArray()[i]);
-                    log.println("Gained: " + get);
-                    log.println("Expected : " + expected[i]);
+                    System.out.println("Sysmbol :" + toCheck.toCharArray()[i]);
+                    System.out.println("Gained: " + get);
+                    System.out.println("Expected : " + expected[i]);
                 }
             }
         }
-        tRes.tested("getCharacterType()", res);
+        Assert.assertTrue("getCharacterType()", res);
     }
 
     /**
@@ -247,6 +284,7 @@ public class _XCharacterClassification extends MultiMethodTest {
     * Has <b> OK </b> status if the method returns type, expected for a given
     * string and locale.
     */
+    @Test
     public void _getStringType() {
         boolean res = true;
         String[] toCheck = new String[]{"01234","AAAAA","bbbbb","AA()bb"};
@@ -258,14 +296,14 @@ public class _XCharacterClassification extends MultiMethodTest {
                     toCheck[j].length(), getLocale(i));
                 res &= (get == exp[j]);
                 if (!res) {
-                    log.println("FAILED for: language=" + languages[i] +
+                    System.out.println("FAILED for: language=" + languages[i] +
                         " ; country=" + countries[i]);
-                    log.println("Expected: " + exp[j]);
-                    log.println("Gained : " + get);
+                    System.out.println("Expected: " + exp[j]);
+                    System.out.println("Gained : " + get);
                 }
             }
         }
-        tRes.tested("getStringType()", res);
+        Assert.assertTrue("getStringType()", res);
     }
 
     /**
@@ -276,6 +314,7 @@ public class _XCharacterClassification extends MultiMethodTest {
     * Has <b> OK </b> status if the method returns direction, that's equal to
     * a symbol position in the string.
     */
+    @Test
     public void _getCharacterDirection() {
         boolean res = true;
         String toCheck = new String(new char[]{65,1470,48,47,35,1632,44,10,
@@ -284,12 +323,12 @@ public class _XCharacterClassification extends MultiMethodTest {
             short get = oObj.getCharacterDirection(toCheck, i);
             res &= (get == i);
             if (!res) {
-                log.println("Code :" + toCheck.toCharArray()[i]);
-                log.println("Gained: " + get);
-                log.println("Expected: " + i);
+                System.out.println("Code :" + toCheck.toCharArray()[i]);
+                System.out.println("Gained: " + get);
+                System.out.println("Expected: " + i);
             }
         }
-        tRes.tested("getCharacterDirection()", res);
+        Assert.assertTrue("getCharacterDirection()", res);
     }
 
     /**
@@ -303,6 +342,7 @@ public class _XCharacterClassification extends MultiMethodTest {
     * since it hasn't the right neighborhood.<p>
     * @see "http://ppewww.ph.gla.ac.uk/~flavell/unicode/unidata.html"
     */
+    @Test
     public void _getScript() {
         boolean res = true;
         char[] characters = new char[]{65,128,256,384,592,750,773,924,1030,1331,1448,
@@ -328,13 +368,13 @@ public class _XCharacterClassification extends MultiMethodTest {
             //neighborhood
             if (toCheck.substring(i, i + 1).hashCode() == 55296) res = true;
             if (!res) {
-                log.println("-- " + toCheck.substring(i, i + 1).hashCode());
-                log.println("Code: " + Integer.toHexString(charsInt[i]));
-                log.println("Gained: " + unicode_script[get]);
-                log.println("Expected: " + unicode_script[i]);
+                System.out.println("-- " + toCheck.substring(i, i + 1).hashCode());
+                System.out.println("Code: " + Integer.toHexString(charsInt[i]));
+                System.out.println("Gained: " + unicode_script[get]);
+                System.out.println("Expected: " + unicode_script[i]);
             }
         }
-        tRes.tested("getScript()", res);
+        Assert.assertTrue("getScript()", res);
     }
 
     /**
@@ -344,6 +384,7 @@ public class _XCharacterClassification extends MultiMethodTest {
     * Has <b> OK </b> status if the method returns right results all three
     * times.
     */
+    @Test
     public void _parseAnyToken() {
         int nStartFlags = KParseTokens.ANY_ALPHA | KParseTokens.ASC_UNDERSCORE;
         int nContFlags = KParseTokens.ANY_ALNUM | KParseTokens.ASC_UNDERSCORE
@@ -369,7 +410,7 @@ public class _XCharacterClassification extends MultiMethodTest {
                   && (pRes.TokenType==1)
                   && (pRes.Value==0.0) );
         }
-        tRes.tested("parseAnyToken()", res);
+        Assert.assertTrue("parseAnyToken()", res);
     }
 
     /**
@@ -378,6 +419,7 @@ public class _XCharacterClassification extends MultiMethodTest {
     * checking result after every call. <p>
     * Has <b> OK </b> status if the method returns right results.
     */
+    @Test
     public void _parsePredefinedToken() {
         int nStartFlags = KParseTokens.ANY_ALPHA | KParseTokens.ASC_UNDERSCORE;
         int nContFlags = nStartFlags;
@@ -395,7 +437,7 @@ public class _XCharacterClassification extends MultiMethodTest {
                   && (pRes.TokenType==4)
                   && (pRes.Value==0.0) );
         }
-        tRes.tested("parsePredefinedToken()", res);
+        Assert.assertTrue("parsePredefinedToken()", res);
     }
 
 
diff --git a/test/testuno/source/api/i18n/XCollatorTest.java b/test/testuno/source/api/i18n/XCollatorTest.java
index dbeea9ee6f..8e82411513 100644
--- a/test/testuno/source/api/i18n/XCollatorTest.java
+++ b/test/testuno/source/api/i18n/XCollatorTest.java
@@ -21,15 +21,21 @@
 
 
 
-package ifc.i18n;
+package api.i18n;
 
 import java.text.Collator;
 
-import lib.MultiMethodTest;
-
 import com.sun.star.i18n.CollatorOptions;
 import com.sun.star.i18n.XCollator;
 import com.sun.star.lang.Locale;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Assert;
+import org.junit.Test;
+import org.openoffice.test.uno.UnoApp;
 
 /**
 * Testing <code>com.sun.star.i18n.XCollator</code>
@@ -46,26 +52,52 @@ import com.sun.star.lang.Locale;
 * Test is <b> NOT </b> multithread compliant. <p>
 * @see com.sun.star.i18n.XCollator
 */
-public class _XCollator extends MultiMethodTest {
-    public XCollator oObj = null;
+public class XCollatorTest {
+    private static final UnoApp app = new UnoApp();
+
+    private XComponentContext xContext = null;
+    private XCollator oObj = null;
     private String[] alg = null ;
     private int[] opt = null ;
     Locale loc = new Locale("en", "EN", "");
 
+    // setup and close connections
+    @BeforeClass
+    public static void setUpConnection() throws Exception
+    {
+        app.start();
+    }
+
+    @AfterClass
+    public static void tearDownConnection() throws InterruptedException, com.sun.star.uno.Exception
+    {
+        app.close();
+    }
+
+    @Before
+    public void before() throws Exception, java.lang.Exception
+    {
+        xContext = app.getComponentContext();
+        final Object object = xContext.getServiceManager().createInstanceWithContext("com.sun.star.i18n.Collator", xContext);
+        oObj = UnoRuntime.queryInterface(XCollator.class, object);
+        alg = oObj.listCollatorAlgorithms(loc);
+    }
+
     /**
     * Just retrieves a list of algorithms. <p>
     * Has <b>OK</b> status if non-zero length array returned.
     */
+    @Test
     public void _listCollatorAlgorithms() {
-        alg = oObj.listCollatorAlgorithms(loc) ;
-        log.println("Collator algorithms :");
-        if (alg != null) {
+        String[] algorithms = oObj.listCollatorAlgorithms(loc) ;
+        System.out.println("Collator algorithms :");
+        if (algorithms != null) {
             for (int i = 0; i < alg.length; i++) {
-                log.println("  '" + alg[i] + "'") ;
+                System.out.println("  '" + algorithms[i] + "'") ;
             }
-            tRes.tested("listCollatorAlgorithms()", alg.length > 0) ;
+            Assert.assertTrue("listCollatorAlgorithms()", algorithms.length > 0) ;
         } else {
-            tRes.tested("listCollatorAlgorithms()", false) ;
+            Assert.fail("listCollatorAlgorithms()");
         }
     }
 
@@ -78,17 +110,17 @@ public class _XCollator extends MultiMethodTest {
     *    algorithm name. </li>
     * </ul>
     */
+    @Test
     public void _listCollatorOptions() {
-        requiredMethod("listCollatorAlgorithms()") ;
         opt = oObj.listCollatorOptions(alg[0]) ;
-        log.println("Collator '" + alg[0] + "' options :");
+        System.out.println("Collator '" + alg[0] + "' options :");
         if (opt != null) {
             for (int i = 0; i < opt.length; i++) {
-                log.println("  " + opt[i]) ;
+                System.out.println("  " + opt[i]) ;
             }
-            tRes.tested("listCollatorOptions()", true) ;
+            Assert.assertTrue("listCollatorOptions()", true) ;
         } else {
-            tRes.tested("listCollatorOptions()", false) ;
+            Assert.fail("listCollatorOptions()") ;
         }
     }
 
@@ -97,13 +129,14 @@ public class _XCollator extends MultiMethodTest {
     * compares strings.<p>
     * Has <b>OK</b> status if compareString() returned correct values.
     */
+    @Test
     public void _loadDefaultCollator() {
         oObj.loadDefaultCollator(loc, 0);
         boolean res = oObj.compareString("A", "a") != 0;
         oObj.loadDefaultCollator(loc,
             CollatorOptions.CollatorOptions_IGNORE_CASE);
         res &= oObj.compareString("a", "A") == 0;
-        tRes.tested("loadDefaultCollator()", res) ;
+        Assert.assertTrue("loadDefaultCollator()", res) ;
     }
 
     /**
@@ -116,14 +149,14 @@ public class _XCollator extends MultiMethodTest {
     *    algorithm name. </li>
     * </ul>
     */
+    @Test
     public void _loadCollatorAlgorithm() {
-        requiredMethod("listCollatorAlgorithms()");
         oObj.loadCollatorAlgorithm(alg[0], loc,
             CollatorOptions.CollatorOptions_IGNORE_CASE);
         boolean res = oObj.compareString("A", "a") == 0;
         oObj.loadCollatorAlgorithm(alg[0], loc, 0);
         res &= oObj.compareString("a", "A") != 0;
-        tRes.tested("loadCollatorAlgorithm()", res);
+        Assert.assertTrue("loadCollatorAlgorithm()", res);
     }
 
     /**
@@ -136,15 +169,15 @@ public class _XCollator extends MultiMethodTest {
     *    algorithm name. </li>
     * </ul>
     */
+    @Test
     public void _loadCollatorAlgorithmWithEndUserOption() {
-        requiredMethod("listCollatorAlgorithms()");
         oObj.loadCollatorAlgorithmWithEndUserOption(alg[0], loc,
             new int[] {0});
         boolean res = oObj.compareString("A", "a") != 0;
         oObj.loadCollatorAlgorithmWithEndUserOption(alg[0], loc,
             new int[] {CollatorOptions.CollatorOptions_IGNORE_CASE});
         res = oObj.compareString("A", "a") == 0;
-        tRes.tested("loadCollatorAlgorithmWithEndUserOption()", res);
+        Assert.assertTrue("loadCollatorAlgorithmWithEndUserOption()", res);
     }
 
     /**
@@ -158,12 +191,13 @@ public class _XCollator extends MultiMethodTest {
     * of two equal strings returns 0. The such comparing is performed
     * for one character strings.
     */
+    @Test
     public void _compareSubstring() {
         boolean result = true ;
         char[] chars = new char[2] ;
         Collator col = null ;
 
-        log.println(" #### Testing English locale ####") ;
+        System.out.println(" #### Testing English locale ####") ;
         oObj.loadDefaultCollator(loc, 0) ;
         col = Collator.getInstance(new java.util.Locale("en", "EN")) ;
         for (char ch = 0x0020; ch < 0x007F; ch ++) {
@@ -171,7 +205,7 @@ public class _XCollator extends MultiMethodTest {
             result &= testCompareSubstring(chars, col) ;
         }
 
-        log.println(" #### Testing Russian locale ####") ;
+        System.out.println(" #### Testing Russian locale ####") ;
         oObj.loadDefaultCollator(
             new com.sun.star.lang.Locale("ru", "RU", ""), 0) ;
         col = Collator.getInstance(new java.util.Locale("ru", "RU")) ;
@@ -180,7 +214,7 @@ public class _XCollator extends MultiMethodTest {
             result &= testCompareSubstring(chars, col) ;
         }
 
-        log.println(" #### Testing Japan locale ####") ;
+        System.out.println(" #### Testing Japan locale ####") ;
         oObj.loadDefaultCollator(
             new com.sun.star.lang.Locale("ja", "JP", ""), 0) ;
         col = Collator.getInstance(new java.util.Locale("ja", "JP")) ;
@@ -189,7 +223,7 @@ public class _XCollator extends MultiMethodTest {
             result &= testCompareSubstring(chars, col) ;
         }
 
-        log.println(" #### Testing China locale ####") ;
+        System.out.println(" #### Testing China locale ####") ;
         oObj.loadDefaultCollator(new Locale("zh", "CN", ""), 0) ;
         col = Collator.getInstance(new java.util.Locale("zh", "CN")) ;
         for (char ch = 0x4E00; ch < 0x4EFD; ch ++) {
@@ -197,7 +231,7 @@ public class _XCollator extends MultiMethodTest {
             result &= testCompareSubstring(chars, col) ;
         }
 
-        log.println(" #### Testing Korean locale ####") ;
+        System.out.println(" #### Testing Korean locale ####") ;
         oObj.loadDefaultCollator(new Locale("ko", "KR", ""), 0) ;
         col = Collator.getInstance(new java.util.Locale("ko", "KR")) ;
         for (char ch = 0x4E00; ch < 0x4EFD; ch ++) {
@@ -205,7 +239,7 @@ public class _XCollator extends MultiMethodTest {
             result &= testCompareSubstring(chars, col) ;
         }
 
-        tRes.tested("compareSubstring()", result) ;
+        Assert.assertTrue("compareSubstring()", result) ;
     }
 
     /**
@@ -219,11 +253,12 @@ public class _XCollator extends MultiMethodTest {
     * of two equal strings returns 0. The such comparing is performed
     * for one character strings.
     */
+    @Test
     public void _compareString() {
         boolean result = true ;
         char[] chars = new char[2] ;
         Collator col = null ;
-        log.println(" #### Testing English locale ####") ;
+        System.out.println(" #### Testing English locale ####") ;
         oObj.loadDefaultCollator(
             new com.sun.star.lang.Locale("en", "EN", ""), 0) ;
         col = Collator.getInstance(new java.util.Locale("en", "EN")) ;
@@ -232,7 +267,7 @@ public class _XCollator extends MultiMethodTest {
             result &= testCompareString(chars, col) ;
         }
 
-        log.println(" #### Testing Russian locale ####") ;
+        System.out.println(" #### Testing Russian locale ####") ;
         oObj.loadDefaultCollator(
             new com.sun.star.lang.Locale("ru", "RU", ""), 0) ;
         col = Collator.getInstance(new java.util.Locale("ru", "RU")) ;
@@ -241,7 +276,7 @@ public class _XCollator extends MultiMethodTest {
             result &= testCompareString(chars, col) ;
         }
 
-        log.println(" #### Testing Japan locale ####") ;
+        System.out.println(" #### Testing Japan locale ####") ;
         oObj.loadDefaultCollator(
             new com.sun.star.lang.Locale("ja", "JP", ""), 0) ;
         col = Collator.getInstance(new java.util.Locale("ja", "JP")) ;
@@ -250,7 +285,7 @@ public class _XCollator extends MultiMethodTest {
             result &= testCompareString(chars, col) ;
         }
 
-        log.println(" #### Testing China locale ####") ;
+        System.out.println(" #### Testing China locale ####") ;
         oObj.loadDefaultCollator(new Locale("zh", "CN", ""), 0) ;
         col = Collator.getInstance(new java.util.Locale("zh", "CN")) ;
         for (char ch = 0x4E00; ch < 0x4EFD; ch ++) {
@@ -258,7 +293,7 @@ public class _XCollator extends MultiMethodTest {
             result &= testCompareString(chars, col) ;
         }
 
-        log.println(" #### Testing Korean locale ####") ;
+        System.out.println(" #### Testing Korean locale ####") ;
         oObj.loadDefaultCollator(new Locale("ko", "KR", ""), 0) ;
         col = Collator.getInstance(new java.util.Locale("ko", "KR")) ;
         for (char ch = 0x4E00; ch < 0x4EFD; ch ++) {
@@ -266,10 +301,9 @@ public class _XCollator extends MultiMethodTest {
             result &= testCompareString(chars, col) ;
         }
 
-        tRes.tested("compareString()", result) ;
+        Assert.assertTrue("compareString()", result) ;
     }
 
-
     /**
     * Testing compareString() method. At first method is testing single chars
     * comparing, then strings comparing.
@@ -347,12 +381,11 @@ public class _XCollator extends MultiMethodTest {
         }
 
         if (!result) {
-            log.println(msg) ;
+            System.out.println(msg) ;
         }
         return result ;
     }
 
-
     /**
     * Testing compareSubstring() method. Method is testing substrings comparing.
     * @param locChar sequence of at list two characters of a given locale
@@ -402,12 +435,11 @@ public class _XCollator extends MultiMethodTest {
         }
 
         if (!result) {
-            log.println(msg) ;
+            System.out.println(msg) ;
         }
         return result ;
     }
 
-
     /**
     * Transforms string to unicode hex codes.
     * @param str String to be transformed
diff --git a/test/testuno/source/api/i18n/XExtendedCalendarTest.java b/test/testuno/source/api/i18n/XExtendedCalendarTest.java
index 34f5b56603..bb9f24f482 100644
--- a/test/testuno/source/api/i18n/XExtendedCalendarTest.java
+++ b/test/testuno/source/api/i18n/XExtendedCalendarTest.java
@@ -20,7 +20,7 @@
  *************************************************************/
 
 
-package ifc.i18n;
+package api.i18n;
 
 import com.sun.star.i18n.CalendarDisplayCode;
 import com.sun.star.i18n.NativeNumberMode;
@@ -29,32 +29,59 @@ import com.sun.star.i18n.XLocaleData;
 import com.sun.star.lang.Locale;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Assert;
+import org.junit.Test;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
-import lib.MultiMethodTest;
+import org.openoffice.test.uno.UnoApp;
+
 
 /**
  *
  */
-public class _XExtendedCalendar extends MultiMethodTest {
+public class XExtendedCalendarTest {
+    private static final UnoApp app = new UnoApp();
+
+    private XComponentContext xContext = null;
     public XExtendedCalendar oObj = null;
     boolean useUSENLocale = false;
+
+    // setup and close connections
+    @BeforeClass
+    public static void setUpConnection() throws Exception
+    {
+        app.start();
+    }
+
+    @AfterClass
+    public static void tearDownConnection() throws InterruptedException, com.sun.star.uno.Exception
+    {
+        app.close();
+    }
+
     /**
      * Load a calendar
      */
-    public void before() {
+    @Before
+    public void before() throws Exception {
+        xContext = app.getComponentContext();
         Locale[] installed_locales = null;
         XLocaleData locData = null;
-        try {
-            locData = (XLocaleData) UnoRuntime.queryInterface(
-                XLocaleData.class,
-                    ((XMultiServiceFactory)tParam.getMSF()).createInstance(
-                    "com.sun.star.i18n.LocaleData"));
-        } catch (com.sun.star.uno.Exception e) {
-
-        }
+        locData = UnoRuntime.queryInterface(
+            XLocaleData.class,
+            xContext.getServiceManager().createInstanceWithContext("com.sun.star.i18n.LocaleData", xContext)
+        );
+        oObj = UnoRuntime.queryInterface(
+            XExtendedCalendar.class,
+            xContext.getServiceManager().createInstanceWithContext("com.sun.star.i18n.LocaleCalendar", xContext)
+        );
         installed_locales = locData.getAllInstalledLocaleNames();
         // use first Locale as fallback, if US-English is not found
         Locale lo = installed_locales[0];
@@ -66,11 +93,11 @@ public class _XExtendedCalendar extends MultiMethodTest {
                 useUSENLocale = true;
             }
         }
-        log.println("Choose Locale: '" + lo.Language + "', '" + lo.Country + "'");
+        System.out.println("Choose Locale: '" + lo.Language + "', '" + lo.Country + "'");
         oObj.loadDefaultCalendar(lo);
     }
     
-    
+    @Test    
     public void _getDisplayString() {
         // against regression: the current state is the right one.
         boolean result = true;
@@ -113,18 +140,18 @@ public class _XExtendedCalendar extends MultiMethodTest {
             if (useUSENLocale) {
                 locResult = displayString[i].equals(expectedStringResult[i]);
                 if (!locResult)
-                    log.println("getDisplayString() result " + i + ": '" + displayString[i] 
+                    System.out.println("getDisplayString() result " + i + ": '" + displayString[i] 
                                         + "', expected: '" + expectedStringResult[i] + "'");
                 result &= locResult;
             }
             else { // no defaults for other locales, just expect a String
                 locResult &= displayString[i] != null;
                 if (!locResult)
-                    log.println("getDisplayString() result " + i + " was 'null'"); 
+                    System.out.println("getDisplayString() result " + i + " was 'null'"); 
                 result &= locResult;
             }
         }
-        tRes.tested("getDisplayString()", result);
+        Assert.assertTrue("getDisplayString()", result);
     }
     
     private SimpleDateFormat getSDF(String format){
diff --git a/test/testuno/source/api/i18n/XExtendedIndexEntrySupplierTest.java b/test/testuno/source/api/i18n/XExtendedIndexEntrySupplierTest.java
index 40214c846a..a55cc561d0 100644
--- a/test/testuno/source/api/i18n/XExtendedIndexEntrySupplierTest.java
+++ b/test/testuno/source/api/i18n/XExtendedIndexEntrySupplierTest.java
@@ -20,24 +20,58 @@
  *************************************************************/
 
 
-package ifc.i18n;
+package api.i18n;
 
 import com.sun.star.i18n.CollatorOptions;
 import com.sun.star.i18n.XExtendedIndexEntrySupplier;
 import com.sun.star.lang.Locale;
-
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Assert;
+import org.junit.Test;
+import org.openoffice.test.uno.UnoApp;
 import java.util.HashMap;
 
-import lib.MultiMethodTest;
 
+public class XExtendedIndexEntrySupplierTest {
+    private static final UnoApp app = new UnoApp();
 
-public class _XExtendedIndexEntrySupplier extends MultiMethodTest {
+    private XComponentContext xContext = null;
     public XExtendedIndexEntrySupplier oObj;
     protected Locale[] locales = null;
-    protected HashMap algorithms = new HashMap();
+    protected HashMap<Integer,String[]> algorithms = new HashMap<Integer,String[]>();
+
+    // setup and close connections
+    @BeforeClass
+    public static void setUpConnection() throws Exception
+    {
+        app.start();
+    }
 
+    @AfterClass
+    public static void tearDownConnection() throws InterruptedException, com.sun.star.uno.Exception
+    {
+        app.close();
+    }
+
+    @Before
+    public void before() throws Exception {
+        xContext = app.getComponentContext();
+        oObj = UnoRuntime.queryInterface(
+            XExtendedIndexEntrySupplier.class,
+            xContext.getServiceManager().createInstanceWithContext("com.sun.star.i18n.IndexEntrySupplier", xContext)
+        );
+        locales = oObj.getLocaleList();
+        algorithms = getAlgorithmList();
+    }
+
+    @Test
     public void _compareIndexEntry() {
-        requiredMethod("getIndexKey()");
+        getIndexKey();
         Locale locale = new Locale("zh", "CN", "");
         String val1 = new String(new char[]{UnicodeStringPair.getUnicodeValue(0), UnicodeStringPair.getUnicodeValue(1)});
         String val2 = new String(new char[]{UnicodeStringPair.getUnicodeValue(1), UnicodeStringPair.getUnicodeValue(0)});
@@ -45,22 +79,21 @@ public class _XExtendedIndexEntrySupplier extends MultiMethodTest {
         short result2 = oObj.compareIndexEntry(val1, "", locale, val2, "", locale);
         short result3 = oObj.compareIndexEntry(val2, "", locale, val1, "", locale);
         
-        tRes.tested("compareIndexEntry()", result1 == 0 && result2 + result3 == 0);
+        Assert.assertTrue("compareIndexEntry()", result1 == 0 && result2 + result3 == 0);
     }
 
     /*
      * gets the list of all algorithms for each listed language
      * is OK if everyone of the returned lists are filled
      */
+    @Test
     public void _getAlgorithmList() {
-        requiredMethod("getLocaleList()");
-
+        HashMap<Integer, String[]> algorithms = getAlgorithmList();
         boolean result = true;
         boolean locResult = false; 
         
         for (int i = 0; i < locales.length; i++) {
-            String[] algNames = oObj.getAlgorithmList(locales[i]);
-            algorithms.put(new Integer(i), algNames);
+            String[] algNames = algorithms.get(i);
 
             locResult = algNames != null && algNames.length > 0;
             System.out.println("Locale " + i + ": " + locales[i].Country+","+locales[i].Language);
@@ -70,52 +103,65 @@ public class _XExtendedIndexEntrySupplier extends MultiMethodTest {
             }
             
             if (!locResult) {
-                log.println("No Algorithm found for " + locales[i].Country + 
+                System.out.println("No Algorithm found for " + locales[i].Country + 
                             "," + locales[i].Language);
             }
 
             result &= locResult;
         }
 
-        tRes.tested("getAlgorithmList()", result);
+        Assert.assertTrue("getAlgorithmList()", result);
+    }
+
+    private HashMap<Integer, String[]> getAlgorithmList() {
+        HashMap<Integer, String[]> algorithms = new HashMap<Integer, String[]>();
+        for (int i = 0; i < locales.length; i++) {
+            String[] algNames = oObj.getAlgorithmList(locales[i]);
+            algorithms.put(i, algNames);
+        }
+        return algorithms;
     }
 
+    @Test
     public void _getIndexKey() {
-        requiredMethod("loadAlgorithm()");
+        Assert.assertTrue("getIndexKey()", getIndexKey());
+    }
+
+    private boolean getIndexKey() {
         char[] characters = new char[] { 19968 };
         String getIndexFor = new String(characters);
         for (int i = 0; i < locales.length; i++) {
-            log.println("Language: " + locales[i].Language);
+            System.out.println("Language: " + locales[i].Language);
 
             for (int j = 0; j < algorithms.size(); j++) {
                 String[] algs = (String[])algorithms.get(new Integer(j));
                 for (int k=0;k<algs.length;k++) {
-                log.println("\t Algorithm :" + 
+                System.out.println("\t Algorithm :" + 
                             algs[k]);
                 oObj.loadAlgorithm(locales[i], algs[k], CollatorOptions.CollatorOptions_IGNORE_CASE);
-                log.println("\t\t Get: " + 
+                System.out.println("\t\t Get: " + 
                             oObj.getIndexKey(getIndexFor, "", locales[i]));
                 }
             }
         }
-        tRes.tested("getIndexKey()", true);
+        return true;
     }
 
     /*
      * gets a list of all locales, is OK if this list isn't empty
      */
+    @Test
     public void _getLocaleList() {
-        locales = oObj.getLocaleList();
-        tRes.tested("getLocaleList()", locales.length > 0);
+        // they were fetched in before()
+        Assert.assertTrue("getLocaleList()", locales.length > 0);
     }
 
     /*
      * gets one phonetic candidate for the chinese local
      * is ok if 'yi' is returned as expected.
      */
+    @Test
     public void _getPhoneticCandidate() {
-        requiredMethod("getLocaleList()");
-
         boolean res = true;
 
         Locale loc = new Locale("zh", "CN", "");
@@ -129,14 +175,14 @@ public class _XExtendedIndexEntrySupplier extends MultiMethodTest {
             boolean locResult = getting.equals(UnicodeStringPair.getExpectedPhoneticString(i));
 
             if (!locResult) {
-                log.println("Char: "+ c[0] + " (" + (int)c[0] + ")");
-                log.println("Expected " + UnicodeStringPair.getExpectedPhoneticString(i));
-                log.println("Getting " + getting);
+                System.out.println("Char: "+ c[0] + " (" + (int)c[0] + ")");
+                System.out.println("Expected " + UnicodeStringPair.getExpectedPhoneticString(i));
+                System.out.println("Getting " + getting);
             }
 
             res &= locResult;
-       }
-        tRes.tested("getPhoneticCandidate()", res);
+        }
+        Assert.assertTrue("getPhoneticCandidate()", res);
     }
 
     /*
@@ -144,55 +190,53 @@ public class _XExtendedIndexEntrySupplier extends MultiMethodTest {
      * Is OK if no exception occurs and the method returns 
      * true for each valid algorithm and false otherwise
      */
+    @Test
     public void _loadAlgorithm() {
-        requiredMethod("getAlgorithmList()");
-
         boolean res = true;
 
         for (int i = 0; i < algorithms.size(); i++) {
             String[] names = (String[]) algorithms.get(new Integer(i));
-            log.println("loading algorithms for " + locales[i].Country + 
+            System.out.println("loading algorithms for " + locales[i].Country + 
                         "," + locales[i].Language);
 
             for (int j = 0; j < names.length; j++) {
-                log.println("\t Loading " + names[j]);
+                System.out.println("\t Loading " + names[j]);
 
                 boolean localres = oObj.loadAlgorithm(locales[i], names[j], 
                                                       CollatorOptions.CollatorOptions_IGNORE_CASE);
 
                 if (!localres) {
-                    log.println("\t ... didn't work - FAILED");
+                    System.out.println("\t ... didn't work - FAILED");
                 } else {
-                    log.println("\t ... worked - OK");
+                    System.out.println("\t ... worked - OK");
                 }
 
                 res &= localres;
             }
 
-/*            log.println("\tTrying to load 'dummy' algorithm");
+/*            System.out.println("\tTrying to load 'dummy' algorithm");
 
             boolean localres = !oObj.loadAlgorithm(locales[i], "dummy", 
                                                    CollatorOptions.CollatorOptions_IGNORE_WIDTH);
 
             if (!localres) {
-                log.println("\t ... didn't work as expected - FAILED");
+                System.out.println("\t ... didn't work as expected - FAILED");
             } else {
-                log.println("\t ... worked - OK");
+                System.out.println("\t ... worked - OK");
             }
 
             res &= localres;*/
         }
 
-        tRes.tested("loadAlgorithm()", res);
+        Assert.assertTrue("loadAlgorithm()", res);
     }
 
     /*
      * checks the method usePhoneticEntry(). Only the languages ja, ko and zh 
      * should return true. Has OK state if exactly this is the case.
      */
+    @Test
     public void _usePhoneticEntry() {
-        requiredMethod("getLocaleList()");
-
         boolean res = true;
 
         for (int i = 0; i < locales.length; i++) {
@@ -207,15 +251,15 @@ public class _XExtendedIndexEntrySupplier extends MultiMethodTest {
             boolean locResult = oObj.usePhoneticEntry(locales[i]) == expected;
 
             if (!locResult) {
-                log.println("Failure for language " + locales[i].Language);
-                log.println("Expected " + expected);
-                log.println("Getting " + oObj.usePhoneticEntry(locales[i]));
+                System.out.println("Failure for language " + locales[i].Language);
+                System.out.println("Expected " + expected);
+                System.out.println("Getting " + oObj.usePhoneticEntry(locales[i]));
             }
 
             res &= locResult;
         }
 
-        tRes.tested("usePhoneticEntry()", res);
+        Assert.assertTrue("usePhoneticEntry()", res);
     }
     
     /**
diff --git a/test/testuno/source/api/i18n/XExtendedTransliterationTest.java b/test/testuno/source/api/i18n/XExtendedTransliterationTest.java
index 8c023a2da0..200996c928 100644
--- a/test/testuno/source/api/i18n/XExtendedTransliterationTest.java
+++ b/test/testuno/source/api/i18n/XExtendedTransliterationTest.java
@@ -20,28 +20,59 @@
  *************************************************************/
 
 
-package ifc.i18n;
+package api.i18n;
 
 import com.sun.star.i18n.TransliterationModules;
 import com.sun.star.i18n.XExtendedTransliteration;
 import com.sun.star.lang.Locale;
-import lib.MultiMethodTest;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Assert;
+import org.junit.Test;
+import org.openoffice.test.uno.UnoApp;
 
 /**
  *
  */
-public class _XExtendedTransliteration extends MultiMethodTest {
+public class XExtendedTransliterationTest {
+    private static final UnoApp app = new UnoApp();
+
+    private XComponentContext xContext = null;
     public XExtendedTransliteration oObj = null;
 //    private Locale loc = new Locale("ja", "JP", "") ;
     private Locale loc = new Locale("en", "US", "") ;
-    
-    public void before() {
+
+    // setup and close connections
+    @BeforeClass
+    public static void setUpConnection() throws Exception
+    {
+        app.start();
+    }
+
+    @AfterClass
+    public static void tearDownConnection() throws InterruptedException, com.sun.star.uno.Exception
+    {
+        app.close();
+    }
+
+    @Before
+    public void before() throws Exception {
+        xContext = app.getComponentContext();
+        oObj = UnoRuntime.queryInterface(
+            XExtendedTransliteration.class,
+            xContext.getServiceManager().createInstanceWithContext("com.sun.star.i18n.Transliteration", xContext)
+        );
         oObj.loadModule(TransliterationModules.LOWERCASE_UPPERCASE, loc);
     }
     
     /**
      * Check lowercase - uppercase conversion of chars
      */
+    @Test
     public void _transliterateChar2Char() {
         boolean result = true;
         char in = 'a';
@@ -54,9 +85,9 @@ public class _XExtendedTransliteration extends MultiMethodTest {
             result &= out == '$';
         }
         catch(com.sun.star.i18n.MultipleCharsOutputException e) {
-            e.printStackTrace((java.io.PrintWriter)log);
+            e.printStackTrace(System.out);
         }
-        tRes.tested("transliterateChar2Char()", result);
+        Assert.assertTrue("transliterateChar2Char()", result);
     }
     
     /**
@@ -71,7 +102,7 @@ public class _XExtendedTransliteration extends MultiMethodTest {
         in = '$'; // should not be changed
         out = oObj.transliterateChar2String(in) ;
         result &= out.equals("$");
-        tRes.tested("transliterateChar2String()", result);
+        Assert.assertTrue("transliterateChar2String()", result);
     }
     
     /**
@@ -86,6 +117,6 @@ public class _XExtendedTransliteration extends MultiMethodTest {
         in = "$"; // should not be changed
         out = oObj.transliterateString2String(in, 0, 1) ;
         result &= out.equals("$");
-        tRes.tested("transliterateString2String()", result);
+        Assert.assertTrue("transliterateString2String()", result);
     }
 }
diff --git a/test/testuno/source/api/i18n/XIndexEntrySupplierTest.java b/test/testuno/source/api/i18n/XIndexEntrySupplierTest.java
index 56d108668b..a12feb086c 100644
--- a/test/testuno/source/api/i18n/XIndexEntrySupplierTest.java
+++ b/test/testuno/source/api/i18n/XIndexEntrySupplierTest.java
@@ -21,12 +21,19 @@
 
 
 
-package ifc.i18n;
-
-import lib.MultiMethodTest;
+package api.i18n;
 
 import com.sun.star.i18n.XIndexEntrySupplier;
 import com.sun.star.lang.Locale;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Assert;
+import org.junit.Test;
+import org.openoffice.test.uno.UnoApp;
 
 /**
 * Testing <code>com.sun.star.i18n.XIndexEntrySupplier</code>
@@ -38,28 +45,54 @@ import com.sun.star.lang.Locale;
 * Test is <b> NOT </b> multithread compliant. <p>
 * @see com.sun.star.i18n.XIndexEntrySupplier
 */
-public class _XIndexEntrySupplier extends MultiMethodTest {
+public class XIndexEntrySupplierTest {
+    private static final UnoApp app = new UnoApp();
+
+    private XComponentContext xContext = null;
     public XIndexEntrySupplier oObj = null;
     public String[] languages = new String[]{"de","en","es","fr","ja","ko","zh"};
     public String[] countries = new String[]{"DE","US","ES","FR","JP","KR","CN"};
     public String[] onePage = new String[]{"f.","p."," s."," sv","p.","",""};
     public String[] morePages = new String[]{"ff.","pp."," ss."," sv","pp.","",""};
 
+    // setup and close connections
+    @BeforeClass
+    public static void setUpConnection() throws Exception
+    {
+        app.start();
+    }
+
+    @AfterClass
+    public static void tearDownConnection() throws InterruptedException, com.sun.star.uno.Exception
+    {
+        app.close();
+    }
+
+    @Before
+    public void before() throws Exception {
+        xContext = app.getComponentContext();
+        oObj = UnoRuntime.queryInterface(
+            XIndexEntrySupplier.class,
+            xContext.getServiceManager().createInstanceWithContext("com.sun.star.i18n.IndexEntrySupplier", xContext)
+        );
+    }
+
     /**
     * Test calls the method, then result is checked. <p>
     * Has <b> OK </b> status if the method returns right index for several
     * locales and word.
     */
+    @Test
     public void _getIndexCharacter() {
         boolean res = true;
-        log.println("getIndexCharacter('chapter', getLocale(i), '')");
+        System.out.println("getIndexCharacter('chapter', getLocale(i), '')");
         for (int i=0; i<7; i++) {
-            log.print("getIndexCharacter('chapter', " + countries[i] + ") :");
+            System.out.print("getIndexCharacter('chapter', " + countries[i] + ") :");
             String get = oObj.getIndexCharacter("chapter", getLocale(i), "");
-            log.println(get);
+            System.out.println(get);
             res &= get.equals("C");
         }
-        tRes.tested("getIndexCharacter()", res);
+        Assert.assertTrue("getIndexCharacter()", res);
     }
 
     /**
@@ -67,26 +100,27 @@ public class _XIndexEntrySupplier extends MultiMethodTest {
     * for several pages, after every call result is checked. <p>
     * Has <b> OK </b> status if method returns right index for several locales.
     */
+    @Test
     public void _getIndexFollowPageWord() {
         boolean res = true;
 
         for (int i=0; i<7; i++) {
             String get = oObj.getIndexFollowPageWord(true, getLocale(i));
             if (! get.equals(morePages[i]) ) {
-                log.println("Language: " + languages[i]);
-                log.println("Getting: #" + get + "#");
-                log.println("Expected: #" + morePages[i] + "#");
+                System.out.println("Language: " + languages[i]);
+                System.out.println("Getting: #" + get + "#");
+                System.out.println("Expected: #" + morePages[i] + "#");
             }
             res &= get.equals(morePages[i]);
             get = oObj.getIndexFollowPageWord(false,getLocale(i));
             if (! get.equals(onePage[i]) ) {
-                log.println("Language: " + languages[i]);
-                log.println("Getting: #" + get + "#");
-                log.println("Expected: #" + onePage[i] + "#");
+                System.out.println("Language: " + languages[i]);
+                System.out.println("Getting: #" + get + "#");
+                System.out.println("Expected: #" + onePage[i] + "#");
             }
             res &= get.equals(onePage[i]);
         }
-        tRes.tested("getIndexFollowPageWord()", res);
+        Assert.assertTrue("getIndexFollowPageWord()", res);
     }
 
     /**
diff --git a/test/testuno/source/api/i18n/XLocaleDataTest.java b/test/testuno/source/api/i18n/XLocaleDataTest.java
index 97e7c1e90b..641c9ab7ad 100644
--- a/test/testuno/source/api/i18n/XLocaleDataTest.java
+++ b/test/testuno/source/api/i18n/XLocaleDataTest.java
@@ -21,9 +21,7 @@
 
 
 
-package ifc.i18n;
-
-import lib.MultiMethodTest;
+package api.i18n;
 
 import com.sun.star.i18n.Calendar;
 import com.sun.star.i18n.Currency;
@@ -34,6 +32,14 @@ import com.sun.star.i18n.LanguageCountryInfo;
 import com.sun.star.i18n.LocaleDataItem;
 import com.sun.star.i18n.XLocaleData;
 import com.sun.star.lang.Locale;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Assert;
+import org.junit.Test;
+import org.openoffice.test.uno.UnoApp;
 
 /**
 * Testing <code>com.sun.star.i18n.XLocaleData</code>
@@ -55,17 +61,41 @@ import com.sun.star.lang.Locale;
 * Test is <b> NOT </b> multithread compliant. <p>
 * @see com.sun.star.i18n.XLocaleData
 */
-public class _XLocaleData extends MultiMethodTest {
+public class XLocaleDataTest {
+    private static final UnoApp app = new UnoApp();
+
+    private XComponentContext xContext = null;
     public XLocaleData oObj = null;
     public String[] languages = new String[]{"de","en","es","fr","ja","ko","ko"};
     public String[] countries = new String[]{"DE","US","ES","FR","JP","KR","KR"};
 
+    // setup and close connections
+    @BeforeClass
+    public static void setUpConnection() throws Exception
+    {
+        app.start();
+    }
+
+    @AfterClass
+    public static void tearDownConnection() throws InterruptedException, com.sun.star.uno.Exception
+    {
+        app.close();
+    }
+
+    @Before
+    public void before() throws Exception, java.lang.Exception
+    {
+        xContext = app.getComponentContext();
+        final Object object = xContext.getServiceManager().createInstanceWithContext("com.sun.star.i18n.LocaleData", xContext);
+        oObj = UnoRuntime.queryInterface(XLocaleData.class, object);
+    }
 
     /**
     * Test calls the method, then result is checked. <p>
     * Has <b> OK </b> status if structure, returned by the method includes
     * correct values of fields 'Language' and 'Country' for all given locales.
     */
+    @Test
     public void _getLanguageCountryInfo() {
         boolean res = true;
         LanguageCountryInfo lci = null;
@@ -73,20 +103,20 @@ public class _XLocaleData extends MultiMethodTest {
         for (int i=0;i<7;i++) {
             lci = oObj.getLanguageCountryInfo(getLocale(i));
             /* For debug purposes
-            log.println("Using: language="+languages[i]+" ; country="+countries[i]);
-            log.println("Getting: ");
-            log.println("\t Language="+lci.Language);
-            log.println("\t LanguageDefaultName="+lci.LanguageDefaultName);
-            log.println("\t Country="+lci.Country);
-            log.println("\t CountryDefaultName="+lci.CountryDefaultName);
+            System.out.println("Using: language="+languages[i]+" ; country="+countries[i]);
+            System.out.println("Getting: ");
+            System.out.println("\t Language="+lci.Language);
+            System.out.println("\t LanguageDefaultName="+lci.LanguageDefaultName);
+            System.out.println("\t Country="+lci.Country);
+            System.out.println("\t CountryDefaultName="+lci.CountryDefaultName);
             boolean lang = ( lci.Language.equals(languages[i]) );
-            if (!lang) log.println("getting false for language: "+lci.LanguageDefaultName);
+            if (!lang) System.out.println("getting false for language: "+lci.LanguageDefaultName);
             lang = ( lci.Country.equals(countries[i]) );
-            if (!lang) log.println("getting false for country: "+lci.CountryDefaultName);
+            if (!lang) System.out.println("getting false for country: "+lci.CountryDefaultName);
             */
             res &= ( ( lci.Language.equals(languages[i]) ) && ( lci.Country.equals(countries[i]) ) );
         }
-        tRes.tested("getLanguageCountryInfo()",res);
+        Assert.assertTrue("getLanguageCountryInfo()",res);
     }
 
     /**
@@ -94,6 +124,7 @@ public class _XLocaleData extends MultiMethodTest {
     * Has <b> OK </b> status if structure, returned by the method consists of
     * non empty strings for all given locales.
     */
+    @Test
     public void _getLocaleItem() {
         boolean res = true;
         LocaleDataItem ldi = null;
@@ -124,30 +155,30 @@ public class _XLocaleData extends MultiMethodTest {
 
             if (!locRes) {
                 /* for debugging puposes
-                log.println("FAILED for: language="+languages[i]+" ; country="+countries[i]);
-                log.println("Getting: ");
-                log.println("\t DateSeparator="+ldi.dateSeparator);
-                log.println("\t decimalSeparator="+ldi.decimalSeparator);
-                log.println("\t doubleQuotationEnd="+ldi.doubleQuotationEnd);
-                log.println("\t doubleQuotationStart="+ldi.doubleQuotationStart);
-                log.println("\t listSeparator="+ldi.listSeparator);
-                log.println("\t LongDateDayOfWeekSeparator="+ldi.LongDateDayOfWeekSeparator+"end");
-                log.println("\t LongDateDaySeparator="+ldi.LongDateDaySeparator+"end");
-                log.println("\t LongDateMonthSeparator="+ldi.LongDateMonthSeparator+"end");
-                log.println("\t LongDateYearSeparator="+ldi.LongDateYearSeparator+"end");
-                log.println("\t measurementSystem="+ldi.measurementSystem);
-                log.println("\t quotationEnd="+ldi.quotationEnd);
-                log.println("\t quotationStart="+ldi.quotationStart);
-                log.println("\t thousandSeparator="+ldi.thousandSeparator);
-                log.println("\t time100SecSeparator="+ldi.time100SecSeparator);
-                log.println("\t timeAM="+ldi.timeAM);
-                log.println("\t timePM="+ldi.timePM);
-                log.println("\t timeSeparator="+ldi.timeSeparator);
-                log.println("\t unoID="+ldi.unoID);
+                System.out.println("FAILED for: language="+languages[i]+" ; country="+countries[i]);
+                System.out.println("Getting: ");
+                System.out.println("\t DateSeparator="+ldi.dateSeparator);
+                System.out.println("\t decimalSeparator="+ldi.decimalSeparator);
+                System.out.println("\t doubleQuotationEnd="+ldi.doubleQuotationEnd);
+                System.out.println("\t doubleQuotationStart="+ldi.doubleQuotationStart);
+                System.out.println("\t listSeparator="+ldi.listSeparator);
+                System.out.println("\t LongDateDayOfWeekSeparator="+ldi.LongDateDayOfWeekSeparator+"end");
+                System.out.println("\t LongDateDaySeparator="+ldi.LongDateDaySeparator+"end");
+                System.out.println("\t LongDateMonthSeparator="+ldi.LongDateMonthSeparator+"end");
+                System.out.println("\t LongDateYearSeparator="+ldi.LongDateYearSeparator+"end");
+                System.out.println("\t measurementSystem="+ldi.measurementSystem);
+                System.out.println("\t quotationEnd="+ldi.quotationEnd);
+                System.out.println("\t quotationStart="+ldi.quotationStart);
+                System.out.println("\t thousandSeparator="+ldi.thousandSeparator);
+                System.out.println("\t time100SecSeparator="+ldi.time100SecSeparator);
+                System.out.println("\t timeAM="+ldi.timeAM);
+                System.out.println("\t timePM="+ldi.timePM);
+                System.out.println("\t timeSeparator="+ldi.timeSeparator);
+                System.out.println("\t unoID="+ldi.unoID);
                  */
             }
         }
-        tRes.tested("getLocaleItem()",res);
+        Assert.assertTrue("getLocaleItem()",res);
     }
 
     /**
@@ -157,6 +188,7 @@ public class _XLocaleData extends MultiMethodTest {
     * correct for all given locales. (boolean method goodCalendar() with a
     * calendar as an argument returns true)
     */
+    @Test
     public void _getAllCalendars() {
         boolean res = true;
         boolean printit = false;
@@ -170,10 +202,10 @@ public class _XLocaleData extends MultiMethodTest {
                 }
                 res &= goodCalendar(calendar[j]);
             }
-            if (printit) log.println("FAILED for: language="+languages[i]+" ; country="+countries[i]);
+            if (printit) System.out.println("FAILED for: language="+languages[i]+" ; country="+countries[i]);
             printit = false;
         }
-        tRes.tested("getAllCalendars()", res);
+        Assert.assertTrue("getAllCalendars()", res);
     }
 
     /**
@@ -183,6 +215,7 @@ public class _XLocaleData extends MultiMethodTest {
     * correct for all given locales. (boolean method goodCurrency() with a
     * currency as an argument returns true)
     */
+    @Test
     public void _getAllCurrencies() {
         boolean res = true;
         boolean printit = false;
@@ -196,10 +229,10 @@ public class _XLocaleData extends MultiMethodTest {
                 }
                 res &= goodCurrency(currency[j]);
             }
-            if (printit) log.println("FAILED for: language="+languages[i]+" ; country="+countries[i]);
+            if (printit) System.out.println("FAILED for: language="+languages[i]+" ; country="+countries[i]);
             printit =false;
         }
-        tRes.tested("getAllCurrencies()",res);
+        Assert.assertTrue("getAllCurrencies()",res);
     }
 
     /**
@@ -209,6 +242,7 @@ public class _XLocaleData extends MultiMethodTest {
     * correct for all given locales. (boolean method goodFormat() with a
     * format as an argument returns true)
     */
+    @Test
     public void _getAllFormats() {
         boolean res = true;
         boolean printit = false;
@@ -222,10 +256,10 @@ public class _XLocaleData extends MultiMethodTest {
                 }
                 res &= goodFormat(format[j]);
             }
-            if (printit) log.println("FAILED for: language="+languages[i]+" ; country="+countries[i]);
+            if (printit) System.out.println("FAILED for: language="+languages[i]+" ; country="+countries[i]);
             printit =false;
         }
-        tRes.tested("getAllFormats()",res);
+        Assert.assertTrue("getAllFormats()",res);
     }
 
     /**
@@ -234,6 +268,7 @@ public class _XLocaleData extends MultiMethodTest {
     * Has <b> OK </b> status if all structs, returned by the method have non
     * empty field 'UnoID' for all given locales.
     */
+    @Test
     public void _getCollatorImplementations() {
         boolean res = true;
         boolean printit = false;
@@ -247,11 +282,11 @@ public class _XLocaleData extends MultiMethodTest {
                 }
                 res &= (!impl[j].unoID.equals(""));
             }
-            if (printit) log.println("FAILED for: language=" + languages[i]
+            if (printit) System.out.println("FAILED for: language=" + languages[i]
                 + " ; country=" + countries[i]);
             printit = false;
         }
-        tRes.tested("getCollatorImplementations()", res);
+        Assert.assertTrue("getCollatorImplementations()", res);
     }
 
     /**
@@ -260,6 +295,7 @@ public class _XLocaleData extends MultiMethodTest {
     * Has <b> OK </b> status if all strings, returned by the method are not
     * empty for all given locales.
     */
+    @Test
     public void _getSearchOptions() {
         boolean res = true;
         boolean printit = false;
@@ -273,11 +309,11 @@ public class _XLocaleData extends MultiMethodTest {
                 }
                 res &= (!str.equals(""));
             }
-            if (printit) log.println("FAILED for: language=" + languages[i]
+            if (printit) System.out.println("FAILED for: language=" + languages[i]
                 + " ; country=" + countries[i]);
             printit = false;
         }
-        tRes.tested("getSearchOptions()",res);
+        Assert.assertTrue("getSearchOptions()",res);
     }
 
     /**
@@ -286,6 +322,7 @@ public class _XLocaleData extends MultiMethodTest {
     * Has <b> OK </b> status if all strings, returned by the method are not
     * empty for all given locales.
     */
+    @Test
     public void _getCollationOptions() {
         boolean res = true;
         boolean printit = false;
@@ -299,11 +336,11 @@ public class _XLocaleData extends MultiMethodTest {
                 }
                 res &= (!str.equals(""));
             }
-            if (printit) log.println("FAILED for: language=" + languages[i]
+            if (printit) System.out.println("FAILED for: language=" + languages[i]
                 + " ; country=" + countries[i]);
             printit = false;
         }
-        tRes.tested("getCollationOptions()", res);
+        Assert.assertTrue("getCollationOptions()", res);
     }
 
     /**
@@ -312,6 +349,7 @@ public class _XLocaleData extends MultiMethodTest {
     * Has <b> OK </b> status if all strings, returned by the method are not
     * empty for all given locales.
     */
+    @Test
     public void _getTransliterations() {
         boolean res = true;
         boolean printit = false;
@@ -325,11 +363,11 @@ public class _XLocaleData extends MultiMethodTest {
                 }
                 res &= (!str.equals(""));
             }
-            if (printit) log.println("FAILED for: language=" + languages[i]
+            if (printit) System.out.println("FAILED for: language=" + languages[i]
                 + " ; country=" + countries[i]);
             printit = false;
         }
-        tRes.tested("getTransliterations()", res);
+        Assert.assertTrue("getTransliterations()", res);
     }
 
     /**
@@ -338,6 +376,7 @@ public class _XLocaleData extends MultiMethodTest {
     * Has <b> OK </b> status if the method returns structure with non-empty
     * fields for all given locales.
     */
+    @Test
     public void _getForbiddenCharacters() {
         boolean res = true;
         ForbiddenCharacters fc = null;
@@ -347,10 +386,10 @@ public class _XLocaleData extends MultiMethodTest {
             fc = oObj.getForbiddenCharacters(getLocale(i));
             res &= !( fc.beginLine.equals("") || fc.endLine.equals("") );
             if ( !res ) {
-                log.println("FAILED for: language="+languages[i]+" ; country="+countries[i]);
+                System.out.println("FAILED for: language="+languages[i]+" ; country="+countries[i]);
             }
         }
-        tRes.tested("getForbiddenCharacters()", res);
+        Assert.assertTrue("getForbiddenCharacters()", res);
     }
 
 
@@ -360,6 +399,7 @@ public class _XLocaleData extends MultiMethodTest {
     * Has <b> OK </b> status if all strings, returned by the method are not
     * empty for all given locales.
     */
+    @Test
     public void _getReservedWord() {
         boolean res = true;
         boolean printit = false;
@@ -373,11 +413,11 @@ public class _XLocaleData extends MultiMethodTest {
                 }
                 res &= (!str.equals(""));
             }
-            if (printit) log.println("FAILED for: language=" + languages[i]
+            if (printit) System.out.println("FAILED for: language=" + languages[i]
                 + " ; country=" + countries[i]);
             printit = false;
         }
-        tRes.tested("getReservedWord()", res);
+        Assert.assertTrue("getReservedWord()", res);
     }
 
 
@@ -386,6 +426,7 @@ public class _XLocaleData extends MultiMethodTest {
     * Has <b> OK </b> status if locale sequence, returned by the method contains
     * given locales.
     */
+    @Test
     public void _getAllInstalledLocaleNames() {
         boolean res = true;
         Locale[] locs = oObj.getAllInstalledLocaleNames();
@@ -394,7 +435,7 @@ public class _XLocaleData extends MultiMethodTest {
         for (int i=0;i<7;i++) {
             res &= contains(locs, getLocale(i));
         }
-        tRes.tested("getAllInstalledLocaleNames()",res);
+        Assert.assertTrue("getAllInstalledLocaleNames()",res);
     }
 
 
@@ -414,34 +455,34 @@ public class _XLocaleData extends MultiMethodTest {
     public boolean goodCalendar(Calendar calendar) {
         boolean good = true;
         for (int i=0;i<calendar.Days.length;i++) {
-            //log.println("Day "+i+"(AbbrevName): "+calendar.Days[i].AbbrevName);
+            //System.out.println("Day "+i+"(AbbrevName): "+calendar.Days[i].AbbrevName);
             good &= (! calendar.Days[i].AbbrevName.equals("") );
-            //log.println("Day "+i+"(FullName): "+calendar.Days[i].FullName);
+            //System.out.println("Day "+i+"(FullName): "+calendar.Days[i].FullName);
             good &= (! calendar.Days[i].FullName.equals("") );
-            //log.println("Day "+i+"(ID): "+calendar.Days[i].ID);
+            //System.out.println("Day "+i+"(ID): "+calendar.Days[i].ID);
             good &= (! calendar.Days[i].ID.equals("") );
         }
         for (int i=0;i<calendar.Months.length;i++) {
-            //log.println("Day "+i+"(AbbrevName): "+calendar.Months[i].AbbrevName);
+            //System.out.println("Day "+i+"(AbbrevName): "+calendar.Months[i].AbbrevName);
             good &= (! calendar.Months[i].AbbrevName.equals("") );
-            //log.println("Day "+i+"(FullName): "+calendar.Months[i].FullName);
+            //System.out.println("Day "+i+"(FullName): "+calendar.Months[i].FullName);
             good &= (! calendar.Months[i].FullName.equals("") );
-            //log.println("Day "+i+"(ID): "+calendar.Months[i].ID);
+            //System.out.println("Day "+i+"(ID): "+calendar.Months[i].ID);
             good &= (! calendar.Months[i].ID.equals("") );
         }
         for (int i=0;i<calendar.Eras.length;i++) {
-            //log.println("Era "+i+"(AbbrevName): "+calendar.Eras[i].AbbrevName);
+            //System.out.println("Era "+i+"(AbbrevName): "+calendar.Eras[i].AbbrevName);
             good &= (! calendar.Eras[i].AbbrevName.equals("") );
-            //log.println("Era "+i+"(FullName): "+calendar.Eras[i].FullName);
+            //System.out.println("Era "+i+"(FullName): "+calendar.Eras[i].FullName);
             good &= (! calendar.Eras[i].FullName.equals("") );
-            //log.println("Era "+i+"(ID): "+calendar.Eras[i].ID);
+            //System.out.println("Era "+i+"(ID): "+calendar.Eras[i].ID);
             good &= (! calendar.Eras[i].ID.equals("") );
         }
-        //log.println("Start of Week: "+calendar.StartOfWeek);
+        //System.out.println("Start of Week: "+calendar.StartOfWeek);
         good &= (! calendar.StartOfWeek.equals("") );
-        //log.println("MinimumNumberOfDaysForFirstWeek: "+calendar.MinimumNumberOfDaysForFirstWeek);
-        //log.println("Default: "+calendar.Default);
-        //log.println("Name: "+calendar.Name);
+        //System.out.println("MinimumNumberOfDaysForFirstWeek: "+calendar.MinimumNumberOfDaysForFirstWeek);
+        //System.out.println("Default: "+calendar.Default);
+        //System.out.println("Name: "+calendar.Name);
         good &= (! calendar.Name.equals("") );
         return good;
     }
@@ -485,7 +526,7 @@ public class _XLocaleData extends MultiMethodTest {
                     break;
             }
         }
-        if (!cont) log.println("Not contained: " + oneLoc.Language);
+        if (!cont) System.out.println("Not contained: " + oneLoc.Language);
         return cont;
     }
 
diff --git a/test/testuno/source/api/i18n/XNumberFormatCodeTest.java b/test/testuno/source/api/i18n/XNumberFormatCodeTest.java
index c2712fd34c..fba93b6744 100644
--- a/test/testuno/source/api/i18n/XNumberFormatCodeTest.java
+++ b/test/testuno/source/api/i18n/XNumberFormatCodeTest.java
@@ -21,9 +21,7 @@
 
 
 
-package ifc.i18n;
-
-import lib.MultiMethodTest;
+package api.i18n;
 
 import com.sun.star.i18n.KNumberFormatType;
 import com.sun.star.i18n.KNumberFormatUsage;
@@ -31,6 +29,16 @@ import com.sun.star.i18n.NumberFormatCode;
 import com.sun.star.i18n.NumberFormatIndex;
 import com.sun.star.i18n.XNumberFormatCode;
 import com.sun.star.lang.Locale;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Assert;
+import org.junit.Test;
+import org.openoffice.test.uno.UnoApp;
+
 
 /**
 * Testing <code>com.sun.star.i18n.XNumberFormatCode</code>
@@ -44,19 +52,46 @@ import com.sun.star.lang.Locale;
 * Test is <b> NOT </b> multithread compliant. <p>
 * @see com.sun.star.i18n.XNumberFormatCode
 */
-public class _XNumberFormatCode extends MultiMethodTest {
+public class XNumberFormatCodeTest {
+    private static final UnoApp app = new UnoApp();
+
+    private XComponentContext xContext = null;
     public XNumberFormatCode oObj = null;
     public String[] languages = new String[]
         {"de","en","es","fr","ko","ko","zh"};
     public String[] countries = new String[]
         {"DE","US","ES","FR","KR","KR","CN"};
 
+    // setup and close connections
+    @BeforeClass
+    public static void setUpConnection() throws Exception
+    {
+        app.start();
+    }
+
+    @AfterClass
+    public static void tearDownConnection() throws InterruptedException, com.sun.star.uno.Exception
+    {
+        app.close();
+    }
+
+    @Before
+    public void before() throws Exception {
+        xContext = app.getComponentContext();
+        oObj = UnoRuntime.queryInterface(
+            XNumberFormatCode.class,
+            xContext.getServiceManager().createInstanceWithContext("com.sun.star.i18n.NumberFormatCodeMapper", xContext)
+        );
+    }
+
+
     /**
     * Test calls the method twice with two different format types as
     * parameters for each locale. Result is checked after every call.<p>
     * Has <b> OK </b> status if both times returned structure's field 'Code'
     * does not equal to empty string.
     */
+    @Test
     public void _getDefault() {
         boolean res = true;
         NumberFormatCode nfc = null;
@@ -66,9 +101,9 @@ public class _XNumberFormatCode extends MultiMethodTest {
                 KNumberFormatUsage.DATE, getLocale(i));
             String str = nfc.Code;
             if (str.equals("")) {
-                log.println("'NumberFormat.code.equals(\"\") = true' for"
+                System.out.println("'NumberFormat.code.equals(\"\") = true' for"
                     + " language: " + languages[i]);
-                log.println("Usage: oObj.getDefault(KNumberFormatType.SHORT,"
+                System.out.println("Usage: oObj.getDefault(KNumberFormatType.SHORT,"
                     + " KNumberFormatUsage.DATE,new Locale(" + languages[i]
                     + "," + countries[i] + ",\"\");");
             }
@@ -78,15 +113,15 @@ public class _XNumberFormatCode extends MultiMethodTest {
                 KNumberFormatUsage.DATE,getLocale(i));
             str = nfc.Code;
             if (str.equals("")) {
-                log.println("'NumberFormat.code.equals(\"\") = true' for "
+                System.out.println("'NumberFormat.code.equals(\"\") = true' for "
                     + "language: " + languages[i]);
-                log.println("Usage: oObj.getDefault(KNumberFormatType.LONG,"
+                System.out.println("Usage: oObj.getDefault(KNumberFormatType.LONG,"
                     + " KNumberFormatUsage.DATE,new Locale(" + languages[i]
                     + "," + countries[i] + ",\"\");");
             }
             res &= ( ! str.equals("") );
         }
-        tRes.tested("getDefault()", res);
+        Assert.assertTrue("getDefault()", res);
     }
 
     /**
@@ -95,6 +130,7 @@ public class _XNumberFormatCode extends MultiMethodTest {
     * Has <b> OK </b> status if both times returned structure's field 'Code'
     * does not equal to a empty string.
     */
+    @Test
     public void _getFormatCode() {
         boolean res = true;
         NumberFormatCode nfc = null;
@@ -107,7 +143,7 @@ public class _XNumberFormatCode extends MultiMethodTest {
                 (NumberFormatIndex.DATE_SYSTEM_LONG,getLocale(i));
             res &= ( ! nfc.Code.equals("") );
         }
-        tRes.tested("getFormatCode()", res);
+        Assert.assertTrue("getFormatCode()", res);
     }
 
     /**
@@ -116,6 +152,7 @@ public class _XNumberFormatCode extends MultiMethodTest {
     * Has <b> OK </b> status if both times returned array's length does not
     * equal to zero.
     */
+    @Test
     public void _getAllFormatCode() {
         boolean res = true;
         NumberFormatCode[] nfc = null;
@@ -126,13 +163,14 @@ public class _XNumberFormatCode extends MultiMethodTest {
             nfc = oObj.getAllFormatCode(KNumberFormatUsage.TIME, getLocale(i));
             res &= ( nfc.length != 0 );
         }
-        tRes.tested("getAllFormatCode()", res);
+        Assert.assertTrue("getAllFormatCode()", res);
     }
 
     /**
     * Test calls the method for each locale. <p>
     * Has <b> OK </b> status if returned array's length does not equal to zero.
     */
+    @Test
     public void _getAllFormatCodes() {
         boolean res = true;
         NumberFormatCode[] nfc = null;
@@ -141,7 +179,7 @@ public class _XNumberFormatCode extends MultiMethodTest {
             nfc = oObj.getAllFormatCodes(getLocale(i));
             res &= ( nfc.length != 0 );
         }
-        tRes.tested("getAllFormatCodes()", res);
+        Assert.assertTrue("getAllFormatCodes()", res);
     }
 
     /**
diff --git a/test/testuno/source/api/i18n/XTransliterationTest.java b/test/testuno/source/api/i18n/XTransliterationTest.java
index 36c9551ff9..8acce5a98d 100644
--- a/test/testuno/source/api/i18n/XTransliterationTest.java
+++ b/test/testuno/source/api/i18n/XTransliterationTest.java
@@ -21,15 +21,22 @@
 
 
 
-package ifc.i18n;
-
-import lib.MultiMethodTest;
+package api.i18n;
 
 import com.sun.star.i18n.TransliterationModules;
 import com.sun.star.i18n.TransliterationModulesNew;
 import com.sun.star.i18n.TransliterationType;
 import com.sun.star.i18n.XTransliteration;
 import com.sun.star.lang.Locale;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Assert;
+import org.junit.Test;
+import org.openoffice.test.uno.UnoApp;
 
 /**
 * Testing <code>com.sun.star.i18n.XTransliteration</code>
@@ -50,30 +57,56 @@ import com.sun.star.lang.Locale;
 * Test is <b> NOT </b> multithread compliant. <p>
 * @see com.sun.star.i18n.XTransliteration
 */
-public class _XTransliteration extends MultiMethodTest {
+public class XTransliterationTest {
+    private static final UnoApp app = new UnoApp();
 
+    private XComponentContext xContext = null;
     public XTransliteration oObj = null;
     private String[] mod = null ;
     private Locale loc = new Locale("en", "EN", "") ;
 
+
+    // setup and close connections
+    @BeforeClass
+    public static void setUpConnection() throws Exception
+    {
+        app.start();
+    }
+
+    @AfterClass
+    public static void tearDownConnection() throws InterruptedException, com.sun.star.uno.Exception
+    {
+        app.close();
+    }
+
+    @Before
+    public void before() throws Exception {
+        xContext = app.getComponentContext();
+        oObj = UnoRuntime.queryInterface(
+            XTransliteration.class,
+            xContext.getServiceManager().createInstanceWithContext("com.sun.star.i18n.Transliteration", xContext)
+        );
+    }
+
     /**
     * Gets all available transliteration modules. <p>
     * Has <b>OK</b> status if array returned has at least
     * one module name.
     */
+    @Test
     public void _getAvailableModules() {
         mod = oObj.getAvailableModules(loc, TransliterationType.ONE_TO_ONE);
 
         if (mod != null) {
-            log.println("Available modules :") ;
+            System.out.println("Available modules :") ;
             for (int i = 0; i < mod.length; i++) {
-                log.println("  '" + mod[i] + "'") ;
+                System.out.println("  '" + mod[i] + "'") ;
             }
         } else {
-            log.println("!!! NULL returned !!!") ;
+            System.out.println("!!! NULL returned !!!") ;
         }
 
-        tRes.tested("getAvailableModules()", mod != null && mod.length > 0) ;
+        Assert.assertTrue("getAvailableModules()", mod != null && mod.length > 0) ;
     }
 
     /**
@@ -82,15 +115,16 @@ public class _XTransliteration extends MultiMethodTest {
     * Has <b>OK</b> status if the method <code>getName</code> returns the
     * string "case ignore (generic)".
     */
+    @Test
     public void _loadModule() {
-        log.println("Load module IGNORE_CASE");
+        System.out.println("Load module IGNORE_CASE");
         oObj.loadModule(TransliterationModules.IGNORE_CASE, loc);
 
         String name = oObj.getName();
         boolean res = name.equals("case ignore (generic)");
-        log.println("getName return: " + name);
+        System.out.println("getName return: " + name);
 
-        tRes.tested("loadModule()", res );
+        Assert.assertTrue("loadModule()", res );
     }
 
     /**
@@ -100,6 +134,7 @@ public class _XTransliteration extends MultiMethodTest {
      * Has <b>OK</b> status if the name of the object is equals to
      * 'lower_to_upper(generic)'
      */
+    @Test
     public void _loadModuleNew() {
         boolean result = true ;
 
@@ -109,9 +144,9 @@ public class _XTransliteration extends MultiMethodTest {
 
         String name = oObj.getName();
         result = name.equals("lower_to_upper(generic)");
-        log.println("getName return: " + name);
+        System.out.println("getName return: " + name);
 
-        tRes.tested("loadModuleNew()", result);
+        Assert.assertTrue("loadModuleNew()", result);
     }
 
     /**
@@ -120,15 +155,16 @@ public class _XTransliteration extends MultiMethodTest {
     * Has <b>OK</b> status if the method <code>getName</code> returns the
     * string "lower_to_upper(generic)".
     */
+    @Test
     public void _loadModuleByImplName() {
-        log.println("Load module LOWERCASE_UPPERCASE");
+        System.out.println("Load module LOWERCASE_UPPERCASE");
         oObj.loadModuleByImplName("LOWERCASE_UPPERCASE", loc);
 
         String name = oObj.getName();
         boolean res = name.equals("lower_to_upper(generic)");
-        log.println("getName return: " + name);
+        System.out.println("getName return: " + name);
 
-        tRes.tested("loadModuleByImplName()", res);
+        Assert.assertTrue("loadModuleByImplName()", res);
     }
 
     /**
@@ -137,25 +173,27 @@ public class _XTransliteration extends MultiMethodTest {
     * Has <b>OK</b> status if the method <code>getName</code> returns the
     * string "upper_to_lower(generic)".
     */
+    @Test
     public void _loadModulesByImplNames() {
-        log.println("Load module UPPERCASE_LOWERCASE");
+        System.out.println("Load module UPPERCASE_LOWERCASE");
         oObj.loadModulesByImplNames(new String[]{"UPPERCASE_LOWERCASE"}, loc);
 
         String name = oObj.getName();
         boolean res = name.equals("upper_to_lower(generic)");
-        log.println("getName return: " + name);
+        System.out.println("getName return: " + name);
 
-        tRes.tested("loadModulesByImplNames()", res);
+        Assert.assertTrue("loadModulesByImplNames()", res);
     }
 
     /**
      * Loads <code>LOWERCASE_UPPERCASE</code> module and checks current type.
      * <p>Has <b>OK</b> status if the type is <code>ONE_TO_ONE</code>
      */
+    @Test
     public void _getType() {
         oObj.loadModule(TransliterationModules.LOWERCASE_UPPERCASE, loc);
         boolean result = oObj.getType() == TransliterationType.ONE_TO_ONE;
-        tRes.tested("getType()", result);
+        Assert.assertTrue("getType()", result);
     }
 
     /**
@@ -165,14 +203,15 @@ public class _XTransliteration extends MultiMethodTest {
     * Has <b>OK</b> status if the method <code>getName</code> returns the
     * string "upper_to_lower(generic)".
     */
+    @Test
     public void _getName() {
         oObj.loadModule(TransliterationModules.LOWERCASE_UPPERCASE, loc);
 
         String name = oObj.getName();
         boolean res = name.equals("lower_to_upper(generic)");
-        log.println("getName return: " + name);
+        System.out.println("getName return: " + name);
 
-        tRes.tested("getName()", res);
+        Assert.assertTrue("getName()", res);
     }
 
     /**
@@ -183,6 +222,7 @@ public class _XTransliteration extends MultiMethodTest {
     * elements are positions of substring characters in the source
     * string.
     */
+    @Test
     public void _transliterate() {
         oObj.loadModule(TransliterationModules.LOWERCASE_UPPERCASE, loc);
 
@@ -196,7 +236,7 @@ public class _XTransliteration extends MultiMethodTest {
             offs[0][2] == 3 &&
             offs[0][3] == 4 ;
 
-        tRes.tested("transliterate()", result) ;
+        Assert.assertTrue("transliterate()", result) ;
     }
 
 
@@ -207,14 +247,15 @@ public class _XTransliteration extends MultiMethodTest {
     * returned (not null, length = 4, with two ranges
     * (a, i), (A, I) in any order).
     */
+    @Test
     public void _transliterateRange() {
         oObj.loadModule(TransliterationModules.IGNORE_CASE, loc);
 
         String[] out = oObj.transliterateRange("a", "i") ;
 
-        log.println("transliterateRange return:");
+        System.out.println("transliterateRange return:");
         for(int i = 0; i < out.length; i++) {
-            log.println(out[i]);
+            System.out.println(out[i]);
         }
 
         boolean bOK = out != null &&
@@ -225,14 +266,14 @@ public class _XTransliteration extends MultiMethodTest {
             "A".equals(out[2]) && "I".equals(out[3])) ;
 
         if (!bOK) {
-            log.println("Unexpected range returned :");
+            System.out.println("Unexpected range returned :");
             for (int i = 0; i < out.length; i++) {
-                log.print("'" + out[i] +"', ");
+                System.out.print("'" + out[i] +"', ");
             }
-            log.println();
+            System.out.println();
         }
 
-        tRes.tested("transliterateRange()", bOK);
+        Assert.assertTrue("transliterateRange()", bOK);
     }
 
     /**
@@ -240,6 +281,7 @@ public class _XTransliteration extends MultiMethodTest {
     * method so it indirectly tested in this method. <p>
     * Always has <b>OK</b> status.
     */
+    @Test
     public void _folding() {
         oObj.loadModule(TransliterationModules.LOWERCASE_UPPERCASE, loc);
 
@@ -254,7 +296,7 @@ public class _XTransliteration extends MultiMethodTest {
             offs[0][3] == 4 ;
 
 
-        tRes.tested("folding()", result) ;
+        Assert.assertTrue("folding()", result) ;
     }
 
 
@@ -263,6 +305,7 @@ public class _XTransliteration extends MultiMethodTest {
     * Tries to compare two equal substrings. <p>
     * Has <b>OK</b> status if the method returned <code>true</code>.
     */
+    @Test
     public void _equals() {
         oObj.loadModule(TransliterationModules.LOWERCASE_UPPERCASE, loc);
 
@@ -272,10 +315,10 @@ public class _XTransliteration extends MultiMethodTest {
         boolean res = oObj.equals("aAbBcC", 1, 3, match1, "aAbBcC", 1,
             3, match2) ;
 
-        log.println("Returned : " + res + " Match1 = " + match1[0] +
+        System.out.println("Returned : " + res + " Match1 = " + match1[0] +
             " Match2 = " + match2[0]) ;
 
-        tRes.tested("equals()", res) ;
+        Assert.assertTrue("equals()", res) ;
     }
 
     /**
@@ -288,6 +331,7 @@ public class _XTransliteration extends MultiMethodTest {
      * proper value according to lexicographical order and if
      * comparisons with invalid parameters return none 0 value.
      */
+    @Test
     public void _compareSubstring() {
         oObj.loadModule(TransliterationModules.LOWERCASE_UPPERCASE, loc);
         boolean result = true ;
@@ -311,7 +355,7 @@ public class _XTransliteration extends MultiMethodTest {
 
         // testing with wrong offsets and lengths
 
-        tRes.tested("compareSubstring()", result) ;
+        Assert.assertTrue("compareSubstring()", result) ;
     }
 
     /**
@@ -332,34 +376,34 @@ public class _XTransliteration extends MultiMethodTest {
         try {
             res = oObj.compareSubstring(str1, p1, len1, str2, p2, len2);
         } catch (java.lang.NullPointerException e) {
-            log.println("Exception while method calling occurs :" + e);
+            System.out.println("Exception while method calling occurs :" + e);
         }
 
         if (res != expRes) {
-            log.print("Comparing FAILED; return: " + res + ", expected: " +
+            System.out.print("Comparing FAILED; return: " + res + ", expected: " +
                 expRes + " ");
             ret = false ;
         } else {
-            log.print("Comparing OK : ");
+            System.out.print("Comparing OK : ");
         }
-        log.println("('" + str1 + "', " + p1 + ", " + len1 + ", '" +
+        System.out.println("('" + str1 + "', " + p1 + ", " + len1 + ", '" +
             str2 + "', " + p2 + ", " + len2 + ")");
 
         res = -666 ;
         try {
             res = oObj.compareSubstring(str2, p2, len2, str1, p1, len1);
         } catch (java.lang.NullPointerException e) {
-            log.println("Exception while method calling occurs :" + e);
+            System.out.println("Exception while method calling occurs :" + e);
         }
 
         if (res != -expRes) {
-            log.print("Comparing FAILED; return: " + res + ", expected: " +
+            System.out.print("Comparing FAILED; return: " + res + ", expected: " +
                 -expRes  + " ");
             ret = false ;
         } else {
-            log.print("Comparing OK :");
+            System.out.print("Comparing OK :");
         }
-        log.println("('" + str2 + "', " + p2 + ", " + len2 + ", '" +
+        System.out.println("('" + str2 + "', " + p2 + ", " + len2 + ", '" +
             str1 + "', " + p1 + ", " + len1 + ")");
 
         return ret ;
@@ -373,6 +417,7 @@ public class _XTransliteration extends MultiMethodTest {
      * always return 0 and if comparisons of none equal returns
      * proper value according to lexicographical order .
      */
+    @Test
     public void _compareString() {
         oObj.loadModule(TransliterationModules.LOWERCASE_UPPERCASE, loc);
         boolean result = true ;
@@ -392,7 +437,7 @@ public class _XTransliteration extends MultiMethodTest {
         result &= testString("aaa\t\na", "aaa\t\na", 0) ;
         result &= testString("aaa\t\nb", "aaa\t\na", 1) ;
 
-        tRes.tested("compareString()", result) ;
+        Assert.assertTrue("compareString()", result) ;
     }
 
     /**
@@ -418,13 +463,13 @@ public class _XTransliteration extends MultiMethodTest {
         try {
             res = oObj.compareString(str1, str2);
         } catch (java.lang.NullPointerException e) {
-            log.println("Exception while method calling occurs :" + e);
+            System.out.println("Exception while method calling occurs :" + e);
         }
 
         if (res == expRes) {
-            log.println("Comparing of '" + str1 + "' and '" + str2 + "' OK" );
+            System.out.println("Comparing of '" + str1 + "' and '" + str2 + "' OK" );
         } else {
-            log.println("Comparing of '" + str1 + "' and '" + str2 +
+            System.out.println("Comparing of '" + str1 + "' and '" + str2 +
                 "' FAILED; return: " + res + ", expected: " + expRes);
             ret = false ;
         }
@@ -435,13 +480,13 @@ public class _XTransliteration extends MultiMethodTest {
         try {
             res = oObj.compareString(str2, str1);
         } catch (java.lang.NullPointerException e) {
-            log.println("Exception while method calling occurs :" + e);
+            System.out.println("Exception while method calling occurs :" + e);
         }
 
         if (res == -expRes) {
-            log.println("Comparing of '" + str2 + "' and '" + str1 + "' OK" );
+            System.out.println("Comparing of '" + str2 + "' and '" + str1 + "' OK" );
         } else {
-            log.println("Comparing of '" + str2 + "' and '" + str1 +
+            System.out.println("Comparing of '" + str2 + "' and '" + str1 +
                 "' FAILED; return: " + res + ", expected: " + -expRes);
             ret = false ;
         }


(openoffice) 08/18: Fix the test failures in XCharacterClassificationTest._getType(). Some of the hardcoded characters no longer had the type they were originally expected to have, probably due to changes in new Unicode versions. Replace them with other characters that have the expected types now.

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

damjan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 24ef62ed281c580a966a40983f5182b11c60b2ff
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Thu May 8 17:26:22 2025 +0200

    Fix the test failures in XCharacterClassificationTest._getType().
    Some of the hardcoded characters no longer had the type they were
    originally expected to have, probably due to changes in new Unicode
    versions. Replace them with other characters that have the expected
    types now.
    
    Patch by: me
---
 .../source/api/i18n/XCharacterClassificationTest.java  | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/test/testuno/source/api/i18n/XCharacterClassificationTest.java b/test/testuno/source/api/i18n/XCharacterClassificationTest.java
index 8a78192373..471fc2b879 100644
--- a/test/testuno/source/api/i18n/XCharacterClassificationTest.java
+++ b/test/testuno/source/api/i18n/XCharacterClassificationTest.java
@@ -230,11 +230,15 @@ public class XCharacterClassificationTest {
     @Test
     public void _getType() {
         boolean res = true;
-        char[] characters = new char[]{586,65,97,498,721,4588,772,8413,3404,
-            48,8544,179,32,8232,8233,144,8204,57344,56320,173,40,41,95,3852,247,
-            3647,901,3896,171,187};
-        int[] charsInt = new int[]{586,65,97,498,721,4588,772,8413,3404,48,
-            8544,179,32,8232,8233,144,8204,57344,56320,173,40,41,95,3852,247,
+        // If or when this list gets out of date again,
+        // find new characters of the required type with:
+        // for (int i = 30; i <= 0xffff; i++) {
+        //     String s = new String("" + (char)i);
+        //     int type = oObj.getType(s, 0);
+        //     System.out.println("character " + i + " has type " + charstyles_office[type]);
+        // }
+        char[] characters = new char[]{888,65,97,498,721,4588,772,8413,3404,
+            48,8544,179,32,8232,8233,144,8204,57344,56320,45,40,41,95,3852,247,
             3647,901,3896,171,187};
         String toCheck = new String(characters);
 
@@ -242,9 +246,9 @@ public class XCharacterClassificationTest {
             int get = oObj.getType(toCheck, i);
             res &= (charstyles_office[get] == charstyles_office[i]);
             if (!res) {
-                System.out.println("Code :" + Integer.toHexString(charsInt[i]));
+                System.out.println("Code: " + Integer.toHexString((int)characters[i]));
                 System.out.println("Gained: " + charstyles_office[get]);
-                System.out.println("Expected : " + charstyles_office[i]);
+                System.out.println("Expected: " + charstyles_office[i]);
             }
         }
         Assert.assertTrue("getType()", res);


(openoffice) 03/18: Add the test document for XBreakIteratorTest.

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

damjan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit c7202f3b2cd2fc922a4f542bf640fc70578d770d
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Thu May 8 04:44:43 2025 +0200

    Add the test document for XBreakIteratorTest.
    
    Patch by: me
---
 test/testuno/data/api/i18n/Iterator.sxw | Bin 0 -> 5627 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/test/testuno/data/api/i18n/Iterator.sxw b/test/testuno/data/api/i18n/Iterator.sxw
new file mode 100644
index 0000000000..9a7f8961bb
Binary files /dev/null and b/test/testuno/data/api/i18n/Iterator.sxw differ


(openoffice) 12/18: Fix the test failures in XBreakIteratorTest._isBeginWord() and _isEndWord(). It was failing because the word type differed: it used WordType.ANY_WORD when calling XBreakIterator.isBeginWord() and XBreakIterator.isEndWord(), but used WordType.ANYWORD_IGNOREWHITESPACES instead when determining word boundaries to test in nextWord().

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

damjan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 10a136b91c2b6359b8961d840270dd9f4203f77b
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Fri May 9 03:28:39 2025 +0200

    Fix the test failures in XBreakIteratorTest._isBeginWord() and _isEndWord().
    It was failing because the word type differed: it used WordType.ANY_WORD
    when calling XBreakIterator.isBeginWord() and XBreakIterator.isEndWord(),
    but used WordType.ANYWORD_IGNOREWHITESPACES instead when determining
    word boundaries to test in nextWord().
    
    Patch by: me
---
 test/testuno/source/api/i18n/XBreakIteratorTest.java | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/test/testuno/source/api/i18n/XBreakIteratorTest.java b/test/testuno/source/api/i18n/XBreakIteratorTest.java
index 252793d006..cb8da5faaa 100644
--- a/test/testuno/source/api/i18n/XBreakIteratorTest.java
+++ b/test/testuno/source/api/i18n/XBreakIteratorTest.java
@@ -351,13 +351,11 @@ public class XBreakIteratorTest {
         for(int i = 0; i < vBounds.size(); i++) {
             Boundary iBounds = (Boundary)vBounds.get(i);
             boolean isBegin = oObj.isBeginWord(UnicodeString, iBounds.startPos,
-                                               locale, WordType.ANY_WORD);
+                                               locale, wordType);
             bRes = bRes && isBegin;
-            Assert.assertTrue("isBeginWord is wrong at position " + iBounds.startPos + ", string len " + UnicodeString.length(), isBegin);
             boolean isNotBegin = !oObj.isBeginWord(UnicodeString,
-                    iBounds.startPos + 1, locale, WordType.ANY_WORD);
+                    iBounds.startPos + 1, locale, wordType);
             bRes = bRes && isNotBegin;
-            Assert.assertTrue("isBeginWord is wrong at position " + (iBounds.startPos + 1) + " for bounds (" + iBounds.startPos + "," + iBounds.endPos, isNotBegin);
 
             System.out.println("At position + " + iBounds.startPos
                 + " isBeginWord? " + isBegin);
@@ -386,10 +384,10 @@ public class XBreakIteratorTest {
         for(int i = 0; i < vBounds.size(); i++) {
             Boundary iBounds = (Boundary)vBounds.get(i);
             boolean isEnd = oObj.isEndWord(UnicodeString, iBounds.endPos,
-                locale, WordType.ANY_WORD);
+                locale, wordType);
             bRes = bRes && isEnd;
             boolean isNotEnd = !oObj.isEndWord(UnicodeString,
-                iBounds.endPos - 1, locale, WordType.ANY_WORD);
+                iBounds.endPos - 1, locale, wordType);
             bRes = bRes && isNotEnd;
 
             System.out.println("At position + " + iBounds.endPos


(openoffice) 14/18: Document the changes.

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

damjan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit ce881ba3061b5749b6f78df0f24b15d31e660560
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Fri May 9 18:35:06 2025 +0200

    Document the changes.
    
    Patch by: me
---
 test/README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/README.md b/test/README.md
index 31068a05a8..a1d123bf06 100644
--- a/test/README.md
+++ b/test/README.md
@@ -77,7 +77,9 @@ ant -Dopenoffice.home="C:\Program Files (x86)\OpenOffice 4" compile
 ```
 
 ## Running Tests
-There are three test suites available. Build Verification Test (BVT), Function Verification Test (FVT), and Performance Verification Test (PVT).
+There are several test suites available. API test, Build Verification Test (BVT), Function Verification Test (FVT), and Performance Verification Test (PVT).
+
+The **API** test will test OpenOffice using UNO API tests ported from main/qadevOOo.
 
 The **Build Verification Test** Suite includes approximately fifty unit tests used for general build verification.
 
@@ -97,6 +99,8 @@ FVT Example:
 ```shell
 ./run -Dopenoffice.home="$PWD/testspace/install/openoffice4" -tp fvt
 ```
+API test Example (Linux):
+./run -Dopenoffice.home="$PWD/testspace/install/openoffice4" -tp api
 ### Running a Single Class
 ```shell
 ./run -Dopenoffice.home="$PWD/testspace/install/openoffice4" -tc bvt.gui.BasicFunctionTest


(openoffice) 11/18: Document that XcharacterClassification._toLower() has bug #87590.

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

damjan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit daf711bf7204b9f3958c09907cb8a37809369d54
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Fri May 9 03:05:35 2025 +0200

    Document that XcharacterClassification._toLower() has bug #87590.
    
    Patch by: me
---
 test/testuno/source/api/i18n/XCharacterClassificationTest.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/testuno/source/api/i18n/XCharacterClassificationTest.java b/test/testuno/source/api/i18n/XCharacterClassificationTest.java
index 329daf364d..532831ce80 100644
--- a/test/testuno/source/api/i18n/XCharacterClassificationTest.java
+++ b/test/testuno/source/api/i18n/XCharacterClassificationTest.java
@@ -35,6 +35,7 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.openoffice.test.uno.UnoApp;
 
@@ -167,6 +168,7 @@ public class XCharacterClassificationTest {
     * a string that is returned by String.toLowerCase() for all locales.
     */
     @Test
+    @Ignore("Bug #87590 Incorrect casing for U+026A, U+0268, U+0197...")
     public void _toLower() {
         boolean res = true;
         char[] characters = new char[]{586,65,97,498,721,4588,772,8413,3404};


(openoffice) 01/18: Begin moving i18n unit tests from main/qadevOOo to test/testuno/source/api. Delete these from the broken/unused main/framework/qa/complex/api_internal/api.lst.

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

damjan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit de76a5ada4912555267334a137577732392f43a0
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Thu May 8 04:16:07 2025 +0200

    Begin moving i18n unit tests from main/qadevOOo to test/testuno/source/api.
    Delete these from the broken/unused main/framework/qa/complex/api_internal/api.lst.
    
    Patch by: me
---
 main/framework/qa/complex/api_internal/api.lst     | 541 ++++++++++-----------
 .../source/api/i18n/XBreakIteratorTest.java        |   0
 .../testuno/source/api/i18n/XCalendarTest.java     |   0
 .../api/i18n/XCharacterClassificationTest.java     |   0
 .../testuno/source/api/i18n/XCollatorTest.java     |   0
 .../source/api/i18n/XExtendedCalendarTest.java     |   0
 .../api/i18n/XExtendedIndexEntrySupplierTest.java  |   0
 .../api/i18n/XExtendedTransliterationTest.java     |   0
 .../source/api/i18n/XIndexEntrySupplierTest.java   |   0
 .../testuno/source/api/i18n/XLocaleDataTest.java   |   0
 .../source/api/i18n/XNumberFormatCodeTest.java     |   0
 .../source/api/i18n/XTransliterationTest.java      |   0
 12 files changed, 268 insertions(+), 273 deletions(-)

diff --git a/main/framework/qa/complex/api_internal/api.lst b/main/framework/qa/complex/api_internal/api.lst
index 3e8361566a..23730fb656 100644
--- a/main/framework/qa/complex/api_internal/api.lst
+++ b/main/framework/qa/complex/api_internal/api.lst
@@ -48,276 +48,271 @@ job48=forms.OTimeModel
 job49=fwk.MailToDispatcher
 job50=fwk.ServiceHandler
 job51=fwl.PathSettings
-job52=i18n.ChapterCollator
-job53=i18n.Collator
-job54=i18n.LocaleData
-job55=i18n.NumberFormatCodeMapper
-job56=i18n.TextSearch
-job57=implreg.uno.ImplementationRegistration
-job58=introspection.uno.Introspection
-job59=invocadapt.uno.InvocationAdapterFactory
-job60=invocation.uno.Invocation
-job61=javavm.uno.JavaVirtualMachine
-job62=lng.LinguProps
-job63=mcnttype.MimeContentTypeFactory
-job64=namingservice.uno.NamingService
-job65=nestedreg.uno.NestedRegistry
-job66=proxyfac.uno.ProxyFactory
-job68=regtypeprov.uno.RegistryTypeDescriptionProvider
-job69=remotebridge.uno.various
-job70=sc.AccessibleEditableTextPara_HeaderFooter
-job71=sc.ScAccessibleCell
-job72=sc.ScAccessiblePageHeader
-job73=sc.ScAccessiblePreviewTable
-job74=sc.ScAccessibleSpreadsheet
-job75=sc.ScAnnotationObj
-job76=sc.ScAnnotationsObj
-job77=sc.ScAreaLinksObj
-job78=sc.ScAutoFormatFieldObj
-job79=sc.ScAutoFormatObj
-job80=sc.ScAutoFormatsObj
-job81=sc.ScCellFieldObj
-job82=sc.ScCellFieldsObj
-job83=sc.ScCellFormatsEnumeration
-job84=sc.ScCellFormatsObj
-job85=sc.ScCellSearchObj
-job86=sc.ScCellsEnumeration
-job87=sc.ScCellsObj
-job88=sc.ScDatabaseRangeObj
-job89=sc.ScDatabaseRangesObj
-job90=sc.ScDataPilotFieldObj
-job91=sc.ScDataPilotFieldsObj
-job92=sc.ScDataPilotTablesObj
-job93=sc.ScDDELinkObj
-job94=sc.ScDDELinksObj
-job95=sc.ScDrawPagesObj
-job96=sc.ScFilterDescriptorBase
-job97=sc.ScFunctionListObj
-job98=sc.ScHeaderFieldObj
-job99=sc.ScHeaderFieldsObj
-job100=sc.ScHeaderFooterContentObj
-job101=sc.ScIndexEnumeration_CellAnnotationsEnumeration
-job102=sc.ScIndexEnumeration_CellAreaLinksEnumeration
-job103=sc.ScIndexEnumeration_DatabaseRangesEnumeration
-job104=sc.ScIndexEnumeration_DataPilotFieldsEnumeration
-job105=sc.ScIndexEnumeration_DataPilotTablesEnumeration
-job106=sc.ScIndexEnumeration_DDELinksEnumeration
-job107=sc.ScIndexEnumeration_FunctionDescriptionEnumeration
-job108=sc.ScIndexEnumeration_LabelRangesEnumeration
-job109=sc.ScIndexEnumeration_NamedRangesEnumeration
-job110=sc.ScIndexEnumeration_ScenariosEnumeration
-job111=sc.ScIndexEnumeration_SheetCellRangesEnumeration
-job112=sc.ScIndexEnumeration_SheetLinksEnumeration
-job113=sc.ScIndexEnumeration_SpreadsheetsEnumeration
-job114=sc.ScIndexEnumeration_SpreadsheetViewPanesEnumeration
-job115=sc.ScIndexEnumeration_SubTotalFieldsEnumeration
-job116=sc.ScIndexEnumeration_TableAutoFormatEnumeration
-job117=sc.ScIndexEnumeration_TableChartsEnumeration
-job118=sc.ScIndexEnumeration_TableColumnsEnumeration
-job119=sc.ScIndexEnumeration_TableConditionalEntryEnumeration
-job120=sc.ScIndexEnumeration_TextFieldEnumeration
-job121=sc.ScLabelRangeObj
-job122=sc.ScLabelRangesObj
-job123=sc.ScNamedRangeObj
-job124=sc.ScRecentFunctionsObj
-job125=sc.ScScenariosObj
-job126=sc.ScSheetLinkObj
-job127=sc.ScSheetLinksObj
-job128=sc.ScSpreadsheetSettings
-job129=sc.ScSpreadsheetSettingsObj
-job130=sc.ScStyleFamiliesObj
-job131=sc.ScStyleFamilyObj
-job132=sc.ScStyleObj
-job133=sc.ScSubTotalFieldObj
-job134=sc.ScTableColumnObj
-job135=sc.ScTableColumnsObj
-job136=sc.ScTableConditionalEntry
-job137=sc.ScTableConditionalFormat
-job138=sc.ScTableRowObj
-job139=sc.ScTableValidationObj
-job140=sc.XMLContentExporter
-job141=sc.XMLContentImporter
-job142=sc.XMLImporter
-job143=sc.XMLMetaExporter
-job144=sc.XMLMetaImporter
-job145=sc.XMLSettingsExporter
-job146=sc.XMLSettingsImporter
-job147=sc.XMLStylesExporter
-job148=sc.XMLStylesImporter
-job149=sd.AccessibleDrawDocumentView
-job150=sd.AccessibleOutlineView
-job151=sd.AccessibleSlideView
-job152=sd.SdDocLinkTargets
-job153=sd.SdDrawPagesAccess
-job154=sd.SdLayer
-job155=sd.SdLayerManager
-job156=sd.SdMasterPagesAccess
-job157=sd.SdXCustomPresentation
-job158=sd.SdXPresentation
-job159=servicemgr.uno.OServiceManager
-job160=sfx.SfxMacroLoader
-job161=simplereg.uno.SimpleRegistry
-job162=sm.SmEditAccessible
-job163=sm.SmModel
-job164=sm.XMLExporter
-job165=sm.XMLMetaExporter
-job166=sm.XMLSettingsExporter
-job167=sm.XMLSettingsImporter
-job168=srtrs.SortedDynamicResultSetFactory
-job169=streams.uno.DataInputStream
-job170=streams.uno.DataOutputStream
-job171=streams.uno.MarkableInputStream
-job172=streams.uno.MarkableOutputStream
-job173=streams.uno.ObjectInputStream
-job174=streams.uno.ObjectOutputStream
-job175=streams.uno.Pipe
-job176=streams.uno.Pump
-job177=svtools.AccessibleBrowseBoxHeaderBar
-job178=svtools.AccessibleBrowseBoxHeaderCell
-job179=svtools.AccessibleBrowseBoxTable
-job180=svtools.AccessibleBrowseBoxTableCell
-job181=svtools.AccessibleTabBar
-job182=svtools.AccessibleTabBarPageList
-job183=svx.AccessibleControlShape
-job184=svx.AccessibleGraphicShape
-job185=svx.AccessiblePresentationGraphicShape
-job186=svx.AccessiblePresentationShape
-job187=svx.AccessibleShape
-job188=svx.SvxShapeCollection
-job189=svx.SvxUnoTextContent
-job190=svx.SvxUnoTextContentEnum
-job191=svx.SvxUnoTextField
-job192=svx.SvxUnoTextRangeEnumeration
-job193=sw.SwAccessibleDocumentPageView
-job194=sw.SwAccessibleDocumentView
-job195=sw.SwAccessibleEndnoteView
-job196=sw.SwAccessibleFooterView
-job197=sw.SwAccessibleFootnoteView
-job198=sw.SwAccessibleHeaderView
-job199=sw.SwAccessibleParagraphView
-job200=sw.SwAccessibleTableCellView
-job201=sw.SwAccessibleTextFrameView
-job202=sw.SwAccessibleTextGraphicObject
-job203=sw.SwXBodyText
-job204=sw.SwXBookmark
-job205=sw.SwXBookmarks
-job206=sw.SwXCell
-job207=sw.SwXDocumentIndexes
-job208=sw.SwXDocumentIndexMark
-job209=sw.SwXEndnoteProperties
-job210=sw.SwXFieldEnumeration
-job211=sw.SwXFieldMaster
-job212=sw.SwXFootnote
-job213=sw.SwXFootnoteProperties
-job214=sw.SwXFootnotes
-job215=sw.SwXFootnoteText
-job216=sw.SwXFrames
-job217=sw.SwXHeadFootText
-job218=sw.SwXLineNumberingProperties
-job219=sw.SwXModule
-job220=sw.SwXParagraphEnumeration
-job221=sw.SwXPrintSettings
-job222=sw.SwXPropertySet
-job223=sw.SwXPropertySetInfo
-job224=sw.SwXReferenceMark
-job225=sw.SwXReferenceMarks
-job226=sw.SwXStyle
-job227=sw.SwXStyleFamilies
-job228=sw.SwXStyleFamily
-job229=sw.SwXTableCellText
-job230=sw.SwXTableRows
-job231=sw.SwXTextColumns
-job232=sw.SwXTextDefaults
-job233=sw.SwXTextEmbeddedObjects
-job234=sw.SwXTextField
-job235=sw.SwXTextFieldMasters
-job236=sw.SwXTextFieldTypes
-job237=sw.SwXTextFrameText
-job238=sw.SwXTextGraphicObjects
-job239=sw.SwXTextPortionEnumeration
-job240=sw.SwXTextRanges
-job241=sw.SwXTextSearch
-job242=sw.SwXTextSection
-job243=sw.SwXTextSections
-job244=sw.SwXTextTableRow
-job245=sw.SwXTextTables
-job246=sw.SwXViewSettings
-job247=sw.XMLContentExporter
-job248=sw.XMLExporter
-job249=sw.XMLImporter
-job250=sw.XMLMetaExporter
-job251=sw.XMLSettingsExporter
-job252=sw.XMLSettingsImporter
-job253=sw.XMLStylesExporter
-job254=sysdtrans.SystemClipboard
-job255=syssh.SystemShellExecute
-job256=text.DefaultNumberingProvider
-job257=toolkit.AccessibleComboBox
-job258=toolkit.AccessibleList
-job259=toolkit.AccessibleListBox
-job260=toolkit.AccessibleMenuSeparator
-job261=toolkit.AccessibleStatusBar
-job262=toolkit.AccessibleTabControl
-job263=toolkit.AccessibleWindow
-job264=toolkit.TabControllerModel
-job265=toolkit.UnoControlCheckBox
-job266=toolkit.UnoControlCheckBoxModel
-job267=toolkit.UnoControlComboBox
-job268=toolkit.UnoControlComboBoxModel
-job269=toolkit.UnoControlContainerModel
-job270=toolkit.UnoControlCurrencyField
-job271=toolkit.UnoControlCurrencyFieldModel
-job272=toolkit.UnoControlDateField
-job273=toolkit.UnoControlDateFieldModel
-job274=toolkit.UnoControlEdit
-job275=toolkit.UnoControlEditModel
-job276=toolkit.UnoControlFileControlModel
-job277=toolkit.UnoControlFixedText
-job278=toolkit.UnoControlFixedTextModel
-job279=toolkit.UnoControlFormattedField
-job280=toolkit.UnoControlFormattedFieldModel
-job281=toolkit.UnoControlGroupBox
-job282=toolkit.UnoControlGroupBoxModel
-job283=toolkit.UnoControlImageControl
-job284=toolkit.UnoControlImageControlModel
-job285=toolkit.UnoControlListBox
-job286=toolkit.UnoControlListBoxModel
-job287=toolkit.UnoControlNumericFieldModel
-job288=toolkit.UnoControlPatternField
-job289=toolkit.UnoControlPatternFieldModel
-job290=toolkit.UnoControlProgressBarModel
-job291=toolkit.UnoControlRadioButton
-job292=toolkit.UnoControlRadioButtonModel
-job293=toolkit.UnoControlScrollBarModel
-job294=toolkit.UnoControlTimeField
-job295=toolkit.UnoControlTimeFieldModel
-job296=typeconverter.uno.TypeConverter
-job297=typemgr.uno.TypeDescriptionManager
-job298=ucb.UcbContentProviderProxyFactory
-job299=ucb.UcbPropertiesManager
-job300=ucb.UcbStore
-job301=ucb.UniversalContentBroker
-job302=ucpchelp.CHelpContentProvider
-job303=ucpdav.WebDAVContentProvider
-job304=ucpfile.FileProvider
-job305=ucpftp.FTPContentProvider
-job306=ucphier.HierarchyContentProvider
-job307=ucphier.HierarchyDataSource
-job308=ucppkg.PackageContentProvider
-job309=uui.UUIInteractionHandler
-job310=xmloff.Draw.XMLContentExporter
-job311=xmloff.Draw.XMLExporter
-job312=xmloff.Draw.XMLMetaExporter
-job313=xmloff.Draw.XMLSettingsExporter
-job314=xmloff.Draw.XMLSettingsImporter
-job315=xmloff.Draw.XMLStylesExporter
-job316=xmloff.Impress.XMLContentExporter
-job317=xmloff.Impress.XMLExporter
-job318=xmloff.Impress.XMLMetaExporter
-job319=xmloff.Impress.XMLSettingsExporter
-job320=xmloff.Impress.XMLSettingsImporter
-job321=xmloff.Impress.XMLStylesExporter
-job322=cfgmgr2.AdministrationProvider
-job323=cfgmgr2.ConfigurationProvider
-job324=cfgmgr2.ConfigurationProviderWrapper
-job325=cfgmgr2.OConfigurationRegistry
+job52=implreg.uno.ImplementationRegistration
+job53=introspection.uno.Introspection
+job54=invocadapt.uno.InvocationAdapterFactory
+job55=invocation.uno.Invocation
+job56=javavm.uno.JavaVirtualMachine
+job57=lng.LinguProps
+job58=mcnttype.MimeContentTypeFactory
+job59=namingservice.uno.NamingService
+job60=nestedreg.uno.NestedRegistry
+job61=proxyfac.uno.ProxyFactory
+job62=regtypeprov.uno.RegistryTypeDescriptionProvider
+job63=remotebridge.uno.various
+job64=sc.AccessibleEditableTextPara_HeaderFooter
+job65=sc.ScAccessibleCell
+job66=sc.ScAccessiblePageHeader
+job67=sc.ScAccessiblePreviewTable
+job68=sc.ScAccessibleSpreadsheet
+job69=sc.ScAnnotationObj
+job70=sc.ScAnnotationsObj
+job71=sc.ScAreaLinksObj
+job72=sc.ScAutoFormatFieldObj
+job73=sc.ScAutoFormatObj
+job74=sc.ScAutoFormatsObj
+job75=sc.ScCellFieldObj
+job76=sc.ScCellFieldsObj
+job77=sc.ScCellFormatsEnumeration
+job78=sc.ScCellFormatsObj
+job79=sc.ScCellSearchObj
+job80=sc.ScCellsEnumeration
+job81=sc.ScCellsObj
+job82=sc.ScDatabaseRangeObj
+job83=sc.ScDatabaseRangesObj
+job84=sc.ScDataPilotFieldObj
+job85=sc.ScDataPilotFieldsObj
+job86=sc.ScDataPilotTablesObj
+job87=sc.ScDDELinkObj
+job88=sc.ScDDELinksObj
+job89=sc.ScDrawPagesObj
+job90=sc.ScFilterDescriptorBase
+job91=sc.ScFunctionListObj
+job92=sc.ScHeaderFieldObj
+job93=sc.ScHeaderFieldsObj
+job94=sc.ScHeaderFooterContentObj
+job95=sc.ScIndexEnumeration_CellAnnotationsEnumeration
+job96=sc.ScIndexEnumeration_CellAreaLinksEnumeration
+job97=sc.ScIndexEnumeration_DatabaseRangesEnumeration
+job98=sc.ScIndexEnumeration_DataPilotFieldsEnumeration
+job99=sc.ScIndexEnumeration_DataPilotTablesEnumeration
+job100=sc.ScIndexEnumeration_DDELinksEnumeration
+job101=sc.ScIndexEnumeration_FunctionDescriptionEnumeration
+job102=sc.ScIndexEnumeration_LabelRangesEnumeration
+job103=sc.ScIndexEnumeration_NamedRangesEnumeration
+job104=sc.ScIndexEnumeration_ScenariosEnumeration
+job105=sc.ScIndexEnumeration_SheetCellRangesEnumeration
+job106=sc.ScIndexEnumeration_SheetLinksEnumeration
+job107=sc.ScIndexEnumeration_SpreadsheetsEnumeration
+job108=sc.ScIndexEnumeration_SpreadsheetViewPanesEnumeration
+job109=sc.ScIndexEnumeration_SubTotalFieldsEnumeration
+job110=sc.ScIndexEnumeration_TableAutoFormatEnumeration
+job111=sc.ScIndexEnumeration_TableChartsEnumeration
+job112=sc.ScIndexEnumeration_TableColumnsEnumeration
+job113=sc.ScIndexEnumeration_TableConditionalEntryEnumeration
+job114=sc.ScIndexEnumeration_TextFieldEnumeration
+job115=sc.ScLabelRangeObj
+job116=sc.ScLabelRangesObj
+job117=sc.ScNamedRangeObj
+job118=sc.ScRecentFunctionsObj
+job119=sc.ScScenariosObj
+job120=sc.ScSheetLinkObj
+job121=sc.ScSheetLinksObj
+job122=sc.ScSpreadsheetSettings
+job123=sc.ScSpreadsheetSettingsObj
+job124=sc.ScStyleFamiliesObj
+job125=sc.ScStyleFamilyObj
+job126=sc.ScStyleObj
+job127=sc.ScSubTotalFieldObj
+job128=sc.ScTableColumnObj
+job129=sc.ScTableColumnsObj
+job130=sc.ScTableConditionalEntry
+job131=sc.ScTableConditionalFormat
+job132=sc.ScTableRowObj
+job133=sc.ScTableValidationObj
+job134=sc.XMLContentExporter
+job135=sc.XMLContentImporter
+job136=sc.XMLImporter
+job137=sc.XMLMetaExporter
+job138=sc.XMLMetaImporter
+job139=sc.XMLSettingsExporter
+job140=sc.XMLSettingsImporter
+job141=sc.XMLStylesExporter
+job142=sc.XMLStylesImporter
+job143=sd.AccessibleDrawDocumentView
+job144=sd.AccessibleOutlineView
+job145=sd.AccessibleSlideView
+job146=sd.SdDocLinkTargets
+job147=sd.SdDrawPagesAccess
+job148=sd.SdLayer
+job149=sd.SdLayerManager
+job150=sd.SdMasterPagesAccess
+job151=sd.SdXCustomPresentation
+job152=sd.SdXPresentation
+job153=servicemgr.uno.OServiceManager
+job154=sfx.SfxMacroLoader
+job155=simplereg.uno.SimpleRegistry
+job156=sm.SmEditAccessible
+job157=sm.SmModel
+job158=sm.XMLExporter
+job159=sm.XMLMetaExporter
+job160=sm.XMLSettingsExporter
+job161=sm.XMLSettingsImporter
+job162=srtrs.SortedDynamicResultSetFactory
+job163=streams.uno.DataInputStream
+job164=streams.uno.DataOutputStream
+job165=streams.uno.MarkableInputStream
+job166=streams.uno.MarkableOutputStream
+job167=streams.uno.ObjectInputStream
+job168=streams.uno.ObjectOutputStream
+job169=streams.uno.Pipe
+job170=streams.uno.Pump
+job171=svtools.AccessibleBrowseBoxHeaderBar
+job172=svtools.AccessibleBrowseBoxHeaderCell
+job173=svtools.AccessibleBrowseBoxTable
+job174=svtools.AccessibleBrowseBoxTableCell
+job175=svtools.AccessibleTabBar
+job176=svtools.AccessibleTabBarPageList
+job177=svx.AccessibleControlShape
+job178=svx.AccessibleGraphicShape
+job179=svx.AccessiblePresentationGraphicShape
+job180=svx.AccessiblePresentationShape
+job181=svx.AccessibleShape
+job182=svx.SvxShapeCollection
+job183=svx.SvxUnoTextContent
+job184=svx.SvxUnoTextContentEnum
+job185=svx.SvxUnoTextField
+job186=svx.SvxUnoTextRangeEnumeration
+job187=sw.SwAccessibleDocumentPageView
+job188=sw.SwAccessibleDocumentView
+job189=sw.SwAccessibleEndnoteView
+job190=sw.SwAccessibleFooterView
+job191=sw.SwAccessibleFootnoteView
+job192=sw.SwAccessibleHeaderView
+job193=sw.SwAccessibleParagraphView
+job194=sw.SwAccessibleTableCellView
+job195=sw.SwAccessibleTextFrameView
+job196=sw.SwAccessibleTextGraphicObject
+job197=sw.SwXBodyText
+job198=sw.SwXBookmark
+job199=sw.SwXBookmarks
+job200=sw.SwXCell
+job201=sw.SwXDocumentIndexes
+job202=sw.SwXDocumentIndexMark
+job203=sw.SwXEndnoteProperties
+job204=sw.SwXFieldEnumeration
+job205=sw.SwXFieldMaster
+job206=sw.SwXFootnote
+job207=sw.SwXFootnoteProperties
+job208=sw.SwXFootnotes
+job209=sw.SwXFootnoteText
+job210=sw.SwXFrames
+job211=sw.SwXHeadFootText
+job212=sw.SwXLineNumberingProperties
+job213=sw.SwXModule
+job214=sw.SwXParagraphEnumeration
+job215=sw.SwXPrintSettings
+job216=sw.SwXPropertySet
+job217=sw.SwXPropertySetInfo
+job218=sw.SwXReferenceMark
+job219=sw.SwXReferenceMarks
+job220=sw.SwXStyle
+job221=sw.SwXStyleFamilies
+job222=sw.SwXStyleFamily
+job223=sw.SwXTableCellText
+job224=sw.SwXTableRows
+job225=sw.SwXTextColumns
+job226=sw.SwXTextDefaults
+job227=sw.SwXTextEmbeddedObjects
+job228=sw.SwXTextField
+job229=sw.SwXTextFieldMasters
+job230=sw.SwXTextFieldTypes
+job231=sw.SwXTextFrameText
+job232=sw.SwXTextGraphicObjects
+job233=sw.SwXTextPortionEnumeration
+job234=sw.SwXTextRanges
+job235=sw.SwXTextSearch
+job236=sw.SwXTextSection
+job237=sw.SwXTextSections
+job238=sw.SwXTextTableRow
+job239=sw.SwXTextTables
+job240=sw.SwXViewSettings
+job241=sw.XMLContentExporter
+job242=sw.XMLExporter
+job243=sw.XMLImporter
+job244=sw.XMLMetaExporter
+job245=sw.XMLSettingsExporter
+job246=sw.XMLSettingsImporter
+job247=sw.XMLStylesExporter
+job248=sysdtrans.SystemClipboard
+job249=syssh.SystemShellExecute
+job250=text.DefaultNumberingProvider
+job251=toolkit.AccessibleComboBox
+job252=toolkit.AccessibleList
+job253=toolkit.AccessibleListBox
+job254=toolkit.AccessibleMenuSeparator
+job255=toolkit.AccessibleStatusBar
+job256=toolkit.AccessibleTabControl
+job257=toolkit.AccessibleWindow
+job258=toolkit.TabControllerModel
+job259=toolkit.UnoControlCheckBox
+job260=toolkit.UnoControlCheckBoxModel
+job261=toolkit.UnoControlComboBox
+job262=toolkit.UnoControlComboBoxModel
+job263=toolkit.UnoControlContainerModel
+job264=toolkit.UnoControlCurrencyField
+job265=toolkit.UnoControlCurrencyFieldModel
+job266=toolkit.UnoControlDateField
+job267=toolkit.UnoControlDateFieldModel
+job268=toolkit.UnoControlEdit
+job269=toolkit.UnoControlEditModel
+job270=toolkit.UnoControlFileControlModel
+job271=toolkit.UnoControlFixedText
+job272=toolkit.UnoControlFixedTextModel
+job273=toolkit.UnoControlFormattedField
+job274=toolkit.UnoControlFormattedFieldModel
+job275=toolkit.UnoControlGroupBox
+job276=toolkit.UnoControlGroupBoxModel
+job277=toolkit.UnoControlImageControl
+job278=toolkit.UnoControlImageControlModel
+job279=toolkit.UnoControlListBox
+job280=toolkit.UnoControlListBoxModel
+job281=toolkit.UnoControlNumericFieldModel
+job282=toolkit.UnoControlPatternField
+job283=toolkit.UnoControlPatternFieldModel
+job284=toolkit.UnoControlProgressBarModel
+job285=toolkit.UnoControlRadioButton
+job286=toolkit.UnoControlRadioButtonModel
+job287=toolkit.UnoControlScrollBarModel
+job288=toolkit.UnoControlTimeField
+job289=toolkit.UnoControlTimeFieldModel
+job290=typeconverter.uno.TypeConverter
+job291=typemgr.uno.TypeDescriptionManager
+job292=ucb.UcbContentProviderProxyFactory
+job293=ucb.UcbPropertiesManager
+job294=ucb.UcbStore
+job295=ucb.UniversalContentBroker
+job296=ucpchelp.CHelpContentProvider
+job297=ucpdav.WebDAVContentProvider
+job298=ucpfile.FileProvider
+job299=ucpftp.FTPContentProvider
+job300=ucphier.HierarchyContentProvider
+job301=ucphier.HierarchyDataSource
+job302=ucppkg.PackageContentProvider
+job303=uui.UUIInteractionHandler
+job304=xmloff.Draw.XMLContentExporter
+job305=xmloff.Draw.XMLExporter
+job306=xmloff.Draw.XMLMetaExporter
+job307=xmloff.Draw.XMLSettingsExporter
+job308=xmloff.Draw.XMLSettingsImporter
+job309=xmloff.Draw.XMLStylesExporter
+job310=xmloff.Impress.XMLContentExporter
+job311=xmloff.Impress.XMLExporter
+job312=xmloff.Impress.XMLMetaExporter
+job313=xmloff.Impress.XMLSettingsExporter
+job314=xmloff.Impress.XMLSettingsImporter
+job315=xmloff.Impress.XMLStylesExporter
+job316=cfgmgr2.AdministrationProvider
+job317=cfgmgr2.ConfigurationProvider
+job318=cfgmgr2.ConfigurationProviderWrapper
+job319=cfgmgr2.OConfigurationRegistry
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XBreakIterator.java b/test/testuno/source/api/i18n/XBreakIteratorTest.java
similarity index 100%
rename from main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XBreakIterator.java
rename to test/testuno/source/api/i18n/XBreakIteratorTest.java
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XCalendar.java b/test/testuno/source/api/i18n/XCalendarTest.java
similarity index 100%
rename from main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XCalendar.java
rename to test/testuno/source/api/i18n/XCalendarTest.java
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XCharacterClassification.java b/test/testuno/source/api/i18n/XCharacterClassificationTest.java
similarity index 100%
rename from main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XCharacterClassification.java
rename to test/testuno/source/api/i18n/XCharacterClassificationTest.java
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XCollator.java b/test/testuno/source/api/i18n/XCollatorTest.java
similarity index 100%
rename from main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XCollator.java
rename to test/testuno/source/api/i18n/XCollatorTest.java
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XExtendedCalendar.java b/test/testuno/source/api/i18n/XExtendedCalendarTest.java
similarity index 100%
rename from main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XExtendedCalendar.java
rename to test/testuno/source/api/i18n/XExtendedCalendarTest.java
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XExtendedIndexEntrySupplier.java b/test/testuno/source/api/i18n/XExtendedIndexEntrySupplierTest.java
similarity index 100%
rename from main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XExtendedIndexEntrySupplier.java
rename to test/testuno/source/api/i18n/XExtendedIndexEntrySupplierTest.java
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XExtendedTransliteration.java b/test/testuno/source/api/i18n/XExtendedTransliterationTest.java
similarity index 100%
rename from main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XExtendedTransliteration.java
rename to test/testuno/source/api/i18n/XExtendedTransliterationTest.java
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XIndexEntrySupplier.java b/test/testuno/source/api/i18n/XIndexEntrySupplierTest.java
similarity index 100%
rename from main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XIndexEntrySupplier.java
rename to test/testuno/source/api/i18n/XIndexEntrySupplierTest.java
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XLocaleData.java b/test/testuno/source/api/i18n/XLocaleDataTest.java
similarity index 100%
rename from main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XLocaleData.java
rename to test/testuno/source/api/i18n/XLocaleDataTest.java
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XNumberFormatCode.java b/test/testuno/source/api/i18n/XNumberFormatCodeTest.java
similarity index 100%
rename from main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XNumberFormatCode.java
rename to test/testuno/source/api/i18n/XNumberFormatCodeTest.java
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XTransliteration.java b/test/testuno/source/api/i18n/XTransliterationTest.java
similarity index 100%
rename from main/qadevOOo/java/OOoRunner/src/main/java/ifc/i18n/_XTransliteration.java
rename to test/testuno/source/api/i18n/XTransliterationTest.java


(openoffice) 07/18: Fix spacing.

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

damjan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit c4369f90e82a84b7ca52f293444547c42a6998c3
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Thu May 8 04:58:55 2025 +0200

    Fix spacing.
    
    Patch by: me
---
 test/testuno/source/api/i18n/XCharacterClassificationTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/testuno/source/api/i18n/XCharacterClassificationTest.java b/test/testuno/source/api/i18n/XCharacterClassificationTest.java
index ca5ef31fa7..8a78192373 100644
--- a/test/testuno/source/api/i18n/XCharacterClassificationTest.java
+++ b/test/testuno/source/api/i18n/XCharacterClassificationTest.java
@@ -269,9 +269,9 @@ public class XCharacterClassificationTest {
                 if (!res) {
                     System.out.println("FAILED for: language=" + languages[j] +
                         " ; country=" + countries[j]);
-                    System.out.println("Symbol :" + toCheck.toCharArray()[i]);
+                    System.out.println("Symbol: " + toCheck.toCharArray()[i]);
                     System.out.println("Gained: " + get);
-                    System.out.println("Expected : " + expected[i]);
+                    System.out.println("Expected: " + expected[i]);
                 }
             }
         }


(openoffice) 18/18: Delete the CSV files used in the old i18n tests.

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

damjan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit c04e01988b5a3100b5d8e7382317cccc743cb9ac
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sun May 11 08:05:51 2025 +0200

    Delete the CSV files used in the old i18n tests.
    
    Patch by: me
---
 .../i18n/com.sun.star.i18n.BreakIterator.csv       | 23 ---------------------
 .../objdsc/i18n/com.sun.star.i18n.CalendarImpl.csv | 24 ----------------------
 .../i18n/com.sun.star.i18n.ChapterCollator.csv     | 10 ---------
 .../com.sun.star.i18n.CharacterClassification.csv  | 13 ------------
 .../objdsc/i18n/com.sun.star.i18n.Collator.csv     | 10 ---------
 .../i18n/com.sun.star.i18n.IndexEntrySupplier.csv  | 12 -----------
 .../objdsc/i18n/com.sun.star.i18n.LocaleData.csv   | 15 --------------
 .../com.sun.star.i18n.NumberFormatCodeMapper.csv   |  7 -------
 .../i18n/com.sun.star.i18n.Transliteration.csv     | 19 -----------------
 .../objdsc/i18n/com.sun.star.util.TextSearch.csv   |  3 ---
 10 files changed, 136 deletions(-)

diff --git a/main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.BreakIterator.csv b/main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.BreakIterator.csv
deleted file mode 100644
index f6c5e07f7a..0000000000
--- a/main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.BreakIterator.csv
+++ /dev/null
@@ -1,23 +0,0 @@
-"BreakIterator";"com::sun::star::lang::XServiceInfo";"getImplementationName()"
-"BreakIterator";"com::sun::star::lang::XServiceInfo";"supportsService()"
-"BreakIterator";"com::sun::star::lang::XServiceInfo";"getSupportedServiceNames()"
-"BreakIterator";"com::sun::star::i18n::XBreakIterator";"nextCharacters()"
-"BreakIterator";"com::sun::star::i18n::XBreakIterator";"previousCharacters()"
-"BreakIterator";"com::sun::star::i18n::XBreakIterator";"nextWord()"
-"BreakIterator";"com::sun::star::i18n::XBreakIterator";"previousWord()"
-"BreakIterator";"com::sun::star::i18n::XBreakIterator";"getWordBoundary()"
-"BreakIterator";"com::sun::star::i18n::XBreakIterator";"getWordType()"
-"BreakIterator";"com::sun::star::i18n::XBreakIterator";"isBeginWord()"
-"BreakIterator";"com::sun::star::i18n::XBreakIterator";"isEndWord()"
-"BreakIterator";"com::sun::star::i18n::XBreakIterator";"beginOfSentence()"
-"BreakIterator";"com::sun::star::i18n::XBreakIterator";"endOfSentence()"
-"BreakIterator";"com::sun::star::i18n::XBreakIterator";"getLineBreak()"
-"BreakIterator";"com::sun::star::i18n::XBreakIterator";"beginOfScript()"
-"BreakIterator";"com::sun::star::i18n::XBreakIterator";"endOfScript()"
-"BreakIterator";"com::sun::star::i18n::XBreakIterator";"nextScript()"
-"BreakIterator";"com::sun::star::i18n::XBreakIterator";"previousScript()"
-"BreakIterator";"com::sun::star::i18n::XBreakIterator";"getScriptType()"
-"BreakIterator";"com::sun::star::i18n::XBreakIterator";"beginOfCharBlock()"
-"BreakIterator";"com::sun::star::i18n::XBreakIterator";"endOfCharBlock()"
-"BreakIterator";"com::sun::star::i18n::XBreakIterator";"nextCharBlock()"
-"BreakIterator";"com::sun::star::i18n::XBreakIterator";"previousCharBlock()"
diff --git a/main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.CalendarImpl.csv b/main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.CalendarImpl.csv
deleted file mode 100644
index ee8ab03e28..0000000000
--- a/main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.CalendarImpl.csv
+++ /dev/null
@@ -1,24 +0,0 @@
-"CalendarImpl";"com::sun::star::i18n::XCalendar";"loadDefaultCalendar()"
-"CalendarImpl";"com::sun::star::i18n::XCalendar";"loadCalendar()"
-"CalendarImpl";"com::sun::star::i18n::XCalendar";"getLoadedCalendar()"
-"CalendarImpl";"com::sun::star::i18n::XCalendar";"getAllCalendars()"
-"CalendarImpl";"com::sun::star::i18n::XCalendar";"getUniqueID()"
-"CalendarImpl";"com::sun::star::i18n::XCalendar";"setDateTime()"
-"CalendarImpl";"com::sun::star::i18n::XCalendar";"getDateTime()"
-"CalendarImpl";"com::sun::star::i18n::XCalendar";"setValue()"
-"CalendarImpl";"com::sun::star::i18n::XCalendar";"getValue()"
-"CalendarImpl";"com::sun::star::i18n::XCalendar";"isValid()"
-"CalendarImpl";"com::sun::star::i18n::XCalendar";"addValue()"
-"CalendarImpl";"com::sun::star::i18n::XCalendar";"getFirstDayOfWeek()"
-"CalendarImpl";"com::sun::star::i18n::XCalendar";"setFirstDayOfWeek()"
-"CalendarImpl";"com::sun::star::i18n::XCalendar";"setMinimumNumberOfDaysForFirstWeek()"
-"CalendarImpl";"com::sun::star::i18n::XCalendar";"getMinimumNumberOfDaysForFirstWeek()"
-"CalendarImpl";"com::sun::star::i18n::XCalendar";"getNumberOfMonthsInYear()"
-"CalendarImpl";"com::sun::star::i18n::XCalendar";"getNumberOfDaysInWeek()"
-"CalendarImpl";"com::sun::star::i18n::XCalendar";"getMonths()"
-"CalendarImpl";"com::sun::star::i18n::XCalendar";"getDays()"
-"CalendarImpl";"com::sun::star::i18n::XCalendar";"getDisplayName()"
-"CalendarImpl";"com::sun::star::lang::XServiceInfo";"getImplementationName()"
-"CalendarImpl";"com::sun::star::lang::XServiceInfo";"supportsService()"
-"CalendarImpl";"com::sun::star::lang::XServiceInfo";"getSupportedServiceNames()"
-"CalendarImpl";"com::sun::star::i18n::XExtendedCalendar#optional";"getDisplayString()"
diff --git a/main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.ChapterCollator.csv b/main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.ChapterCollator.csv
deleted file mode 100644
index 2bcb67b6c9..0000000000
--- a/main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.ChapterCollator.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-"ChapterCollator";"com::sun::star::lang::XServiceInfo";"getImplementationName()"
-"ChapterCollator";"com::sun::star::lang::XServiceInfo";"supportsService()"
-"ChapterCollator";"com::sun::star::lang::XServiceInfo";"getSupportedServiceNames()"
-"ChapterCollator";"com::sun::star::i18n::XCollator";"compareSubstring()"
-"ChapterCollator";"com::sun::star::i18n::XCollator";"compareString()"
-"ChapterCollator";"com::sun::star::i18n::XCollator";"loadDefaultCollator()"
-"ChapterCollator";"com::sun::star::i18n::XCollator";"loadCollatorAlgorithm()"
-"ChapterCollator";"com::sun::star::i18n::XCollator";"listCollatorAlgorithms()"
-"ChapterCollator";"com::sun::star::i18n::XCollator";"loadCollatorAlgorithmWithEndUserOption()"
-"ChapterCollator";"com::sun::star::i18n::XCollator";"listCollatorOptions()"
diff --git a/main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.CharacterClassification.csv b/main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.CharacterClassification.csv
deleted file mode 100644
index 1bac53629e..0000000000
--- a/main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.CharacterClassification.csv
+++ /dev/null
@@ -1,13 +0,0 @@
-"CharacterClassification";"com::sun::star::lang::XServiceInfo";"getImplementationName()"
-"CharacterClassification";"com::sun::star::lang::XServiceInfo";"supportsService()"
-"CharacterClassification";"com::sun::star::lang::XServiceInfo";"getSupportedServiceNames()"
-"CharacterClassification";"com::sun::star::i18n::XCharacterClassification";"toUpper()"
-"CharacterClassification";"com::sun::star::i18n::XCharacterClassification";"toLower()"
-"CharacterClassification";"com::sun::star::i18n::XCharacterClassification";"toTitle()"
-"CharacterClassification";"com::sun::star::i18n::XCharacterClassification";"getType()"
-"CharacterClassification";"com::sun::star::i18n::XCharacterClassification";"getCharacterDirection()"
-"CharacterClassification";"com::sun::star::i18n::XCharacterClassification";"getScript()"
-"CharacterClassification";"com::sun::star::i18n::XCharacterClassification";"getCharacterType()"
-"CharacterClassification";"com::sun::star::i18n::XCharacterClassification";"getStringType()"
-"CharacterClassification";"com::sun::star::i18n::XCharacterClassification";"parseAnyToken()"
-"CharacterClassification";"com::sun::star::i18n::XCharacterClassification";"parsePredefinedToken()"
diff --git a/main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.Collator.csv b/main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.Collator.csv
deleted file mode 100644
index df33241573..0000000000
--- a/main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.Collator.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-"Collator";"com::sun::star::lang::XServiceInfo";"getImplementationName()"
-"Collator";"com::sun::star::lang::XServiceInfo";"supportsService()"
-"Collator";"com::sun::star::lang::XServiceInfo";"getSupportedServiceNames()"
-"Collator";"com::sun::star::i18n::XCollator";"compareSubstring()"
-"Collator";"com::sun::star::i18n::XCollator";"compareString()"
-"Collator";"com::sun::star::i18n::XCollator";"loadDefaultCollator()"
-"Collator";"com::sun::star::i18n::XCollator";"loadCollatorAlgorithm()"
-"Collator";"com::sun::star::i18n::XCollator";"listCollatorAlgorithms()"
-"Collator";"com::sun::star::i18n::XCollator";"loadCollatorAlgorithmWithEndUserOption()"
-"Collator";"com::sun::star::i18n::XCollator";"listCollatorOptions()"
diff --git a/main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.IndexEntrySupplier.csv b/main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.IndexEntrySupplier.csv
deleted file mode 100644
index 537f8522bf..0000000000
--- a/main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.IndexEntrySupplier.csv
+++ /dev/null
@@ -1,12 +0,0 @@
-"IndexEntrySupplier";"com::sun::star::i18n::XExtendedIndexEntrySupplier#optional";"getLocaleList()"
-"IndexEntrySupplier";"com::sun::star::i18n::XExtendedIndexEntrySupplier#optional";"getAlgorithmList()"
-"IndexEntrySupplier";"com::sun::star::i18n::XExtendedIndexEntrySupplier#optional";"usePhoneticEntry()"
-"IndexEntrySupplier";"com::sun::star::i18n::XExtendedIndexEntrySupplier#optional";"getPhoneticCandidate()"
-"IndexEntrySupplier";"com::sun::star::i18n::XExtendedIndexEntrySupplier#optional";"loadAlgorithm()"
-"IndexEntrySupplier";"com::sun::star::i18n::XExtendedIndexEntrySupplier#optional";"getIndexKey()"
-"IndexEntrySupplier";"com::sun::star::i18n::XExtendedIndexEntrySupplier#optional";"compareIndexEntry()"
-"IndexEntrySupplier";"com::sun::star::i18n::XIndexEntrySupplier";"getIndexCharacter()"
-"IndexEntrySupplier";"com::sun::star::i18n::XIndexEntrySupplier";"getIndexFollowPageWord()"
-"IndexEntrySupplier";"com::sun::star::lang::XServiceInfo";"getImplementationName()"
-"IndexEntrySupplier";"com::sun::star::lang::XServiceInfo";"supportsService()"
-"IndexEntrySupplier";"com::sun::star::lang::XServiceInfo";"getSupportedServiceNames()"
diff --git a/main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.LocaleData.csv b/main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.LocaleData.csv
deleted file mode 100644
index 0ad6a0b81d..0000000000
--- a/main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.LocaleData.csv
+++ /dev/null
@@ -1,15 +0,0 @@
-"LocaleData";"com::sun::star::lang::XServiceInfo";"getImplementationName()"
-"LocaleData";"com::sun::star::lang::XServiceInfo";"supportsService()"
-"LocaleData";"com::sun::star::lang::XServiceInfo";"getSupportedServiceNames()"
-"LocaleData";"com::sun::star::i18n::XLocaleData";"getLanguageCountryInfo()"
-"LocaleData";"com::sun::star::i18n::XLocaleData";"getLocaleItem()"
-"LocaleData";"com::sun::star::i18n::XLocaleData";"getAllCalendars()"
-"LocaleData";"com::sun::star::i18n::XLocaleData";"getAllCurrencies()"
-"LocaleData";"com::sun::star::i18n::XLocaleData";"getAllFormats()"
-"LocaleData";"com::sun::star::i18n::XLocaleData";"getCollatorImplementations()"
-"LocaleData";"com::sun::star::i18n::XLocaleData";"getSearchOptions()"
-"LocaleData";"com::sun::star::i18n::XLocaleData";"getCollationOptions()"
-"LocaleData";"com::sun::star::i18n::XLocaleData";"getTransliterations()"
-"LocaleData";"com::sun::star::i18n::XLocaleData";"getForbiddenCharacters()"
-"LocaleData";"com::sun::star::i18n::XLocaleData";"getReservedWord()"
-"LocaleData";"com::sun::star::i18n::XLocaleData";"getAllInstalledLocaleNames()"
diff --git a/main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.NumberFormatCodeMapper.csv b/main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.NumberFormatCodeMapper.csv
deleted file mode 100644
index a21ceb721f..0000000000
--- a/main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.NumberFormatCodeMapper.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-"NumberFormatCodeMapper";"com::sun::star::lang::XServiceInfo";"getImplementationName()"
-"NumberFormatCodeMapper";"com::sun::star::lang::XServiceInfo";"supportsService()"
-"NumberFormatCodeMapper";"com::sun::star::lang::XServiceInfo";"getSupportedServiceNames()"
-"NumberFormatCodeMapper";"com::sun::star::i18n::XNumberFormatCode";"getDefault()"
-"NumberFormatCodeMapper";"com::sun::star::i18n::XNumberFormatCode";"getFormatCode()"
-"NumberFormatCodeMapper";"com::sun::star::i18n::XNumberFormatCode";"getAllFormatCode()"
-"NumberFormatCodeMapper";"com::sun::star::i18n::XNumberFormatCode";"getAllFormatCodes()"
diff --git a/main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.Transliteration.csv b/main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.Transliteration.csv
deleted file mode 100644
index 00ba548244..0000000000
--- a/main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.i18n.Transliteration.csv
+++ /dev/null
@@ -1,19 +0,0 @@
-"Transliteration";"com::sun::star::lang::XServiceInfo";"getImplementationName()"
-"Transliteration";"com::sun::star::lang::XServiceInfo";"supportsService()"
-"Transliteration";"com::sun::star::lang::XServiceInfo";"getSupportedServiceNames()"
-"Transliteration";"com::sun::star::i18n::XExtendedTransliteration#optional";"transliterateString2String()"
-"Transliteration";"com::sun::star::i18n::XExtendedTransliteration#optional";"transliterateChar2String()"
-"Transliteration";"com::sun::star::i18n::XExtendedTransliteration#optional";"transliterateChar2Char()"
-"Transliteration";"com::sun::star::i18n::XTransliteration";"getName()"
-"Transliteration";"com::sun::star::i18n::XTransliteration";"getType()"
-"Transliteration";"com::sun::star::i18n::XTransliteration";"loadModule()"
-"Transliteration";"com::sun::star::i18n::XTransliteration";"loadModuleNew()"
-"Transliteration";"com::sun::star::i18n::XTransliteration";"loadModuleByImplName()"
-"Transliteration";"com::sun::star::i18n::XTransliteration";"loadModulesByImplNames()"
-"Transliteration";"com::sun::star::i18n::XTransliteration";"getAvailableModules()"
-"Transliteration";"com::sun::star::i18n::XTransliteration";"transliterate()"
-"Transliteration";"com::sun::star::i18n::XTransliteration";"folding()"
-"Transliteration";"com::sun::star::i18n::XTransliteration";"equals()"
-"Transliteration";"com::sun::star::i18n::XTransliteration";"transliterateRange()"
-"Transliteration";"com::sun::star::i18n::XTransliteration";"compareSubstring()"
-"Transliteration";"com::sun::star::i18n::XTransliteration";"compareString()"
diff --git a/main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.util.TextSearch.csv b/main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.util.TextSearch.csv
deleted file mode 100644
index 6cb6ae9ffc..0000000000
--- a/main/qadevOOo/java/OOoRunner/src/main/resources/objdsc/i18n/com.sun.star.util.TextSearch.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"TextSearch";"com::sun::star::util::XTextSearch";"setOptions()"
-"TextSearch";"com::sun::star::util::XTextSearch";"searchForward()"
-"TextSearch";"com::sun::star::util::XTextSearch";"searchBackward()"


(openoffice) 10/18: Fix the error and failure in the XCharacterClassificationTest._getScript() unit test. Don't check the surrogate pairs, which getScript() doesn't seem to identify correctly. Also verify the script is in range of our known script value range to avoid ArrayIndexOutOfBoundsException.

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

damjan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 07b0567639065325a4ab02b0e8addd3ac9d3dae1
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Thu May 8 19:39:00 2025 +0200

    Fix the error and failure in the XCharacterClassificationTest._getScript()
    unit test. Don't check the surrogate pairs, which getScript() doesn't
    seem to identify correctly. Also verify the script is in range of our known
    script value range to avoid ArrayIndexOutOfBoundsException.
    
    Patch by: me
---
 .../source/api/i18n/XCharacterClassificationTest.java  | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/test/testuno/source/api/i18n/XCharacterClassificationTest.java b/test/testuno/source/api/i18n/XCharacterClassificationTest.java
index 0bf64cfd7a..329daf364d 100644
--- a/test/testuno/source/api/i18n/XCharacterClassificationTest.java
+++ b/test/testuno/source/api/i18n/XCharacterClassificationTest.java
@@ -364,25 +364,19 @@ public class XCharacterClassificationTest {
             9734,9999,10247,11911,12034,12274,12294,12358,12456,12552,12605,12688,12727,
             12806,13065,13312,19968,40964,42152,44032,55296,56192,56320,57344,63744,
             64257,64370,65056,65073,65131,65146,65532,65288};
-        int[] charsInt = new int[]{65,128,256,384,592,750,773,924,1030,1331,1448,
-            1569,1792,1936,2313,2465,2570,2707,2822,2972,3079,3240,3337,3464,3590,
-            3745,3906,4097,4274,4357,4621,5040,5200,5776,5806,6030,6155,7683,7943,
-            8202,8319,8352,8413,8452,8545,8616,8715,8965,9217,9281,9336,9474,9608,9719,
-            9734,9999,10247,11911,12034,12274,12294,12358,12456,12552,12605,12688,12727,
-            12806,13065,13312,19968,40964,42152,44032,55296,56192,56320,57344,63744,
-            64257,64370,65056,65073,65131,65146,65532,65288};
         String toCheck = new String(characters);
 
         for (int i=0;i<characters.length;i++) {
             int get = oObj.getScript(toCheck, i);
-            res &= (get == i);
             //The HIGH_SURROGATE 55296 doesn't work since it hasn't the right
-            //neighborhood
-            if (toCheck.substring(i, i + 1).hashCode() == 55296) res = true;
+            //neighborhood. Neither does 56192 - it combines with 55296 into another code point.
+            if (toCheck.charAt(i) != 55296 && toCheck.charAt(i) != 56192) {
+                res &= (get == i);
+            }
             if (!res) {
                 System.out.println("-- " + toCheck.substring(i, i + 1).hashCode());
-                System.out.println("Code: " + Integer.toHexString(charsInt[i]));
-                System.out.println("Gained: " + unicode_script[get]);
+                System.out.println("Code: " + Integer.toHexString((int)characters[i]));
+                System.out.println("Gained: " + get + " (" + (0 <= get && get < unicode_script.length ? unicode_script[get] : "out of range") + ")");
                 System.out.println("Expected: " + unicode_script[i]);
             }
         }


(openoffice) 13/18: Test for October properly. Month 10 will fail both of these tests else if (month > 6 && month < 10) { quarter = "Q3"; longQuarter = "3rd quarter"; } else if (month > 10 && month < 13) {quarter = "Q4"; longQuarter = "4th quarter"; } as 10 is neither greater nor lesser than 10. Rewrite the comparison to include 10 properly, and clean it up.

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

damjan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit da5c8a22e4ea82a12a4a329a529062243b0c9b33
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Fri May 9 17:53:20 2025 +0200

    Test for October properly. Month 10 will fail both of these tests
            else if (month > 6 && month < 10) { quarter = "Q3"; longQuarter = "3rd quarter"; }
            else if (month > 10 && month < 13) {quarter = "Q4"; longQuarter = "4th quarter"; }
    as 10 is neither greater nor lesser than 10.
    Rewrite the comparison to include 10 properly, and clean it up.
    
    Patch by: me
    Fixes: https://bz.apache.org/ooo/show_bug.cgi?id=94658
---
 test/testuno/source/api/i18n/XExtendedCalendarTest.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/testuno/source/api/i18n/XExtendedCalendarTest.java b/test/testuno/source/api/i18n/XExtendedCalendarTest.java
index bb9f24f482..0a50936a5d 100644
--- a/test/testuno/source/api/i18n/XExtendedCalendarTest.java
+++ b/test/testuno/source/api/i18n/XExtendedCalendarTest.java
@@ -119,9 +119,9 @@ public class XExtendedCalendarTest {
         int month = cal.get(Calendar.MONTH) + 1;
         String quarter = "Q1";
         String longQuarter = "1st quarter";
-        if (month > 3 && month < 7) { quarter = "Q2"; longQuarter = "2nd quarter"; }
-        else if (month > 6 && month < 10) { quarter = "Q3"; longQuarter = "3rd quarter"; }
-        else if (month > 10 && month < 13) {quarter = "Q4"; longQuarter = "4th quarter"; }
+        if (4 <= month && month <= 6) { quarter = "Q2"; longQuarter = "2nd quarter"; }
+        else if (7 <= month && month <= 9) { quarter = "Q3"; longQuarter = "3rd quarter"; }
+        else if (10 <= month && month <= 12) {quarter = "Q4"; longQuarter = "4th quarter"; }
         expectedStringResult[3] = quarter;
         expectedStringResult[4] = longQuarter;
         


(openoffice) 09/18: Fix the test failure in XCharacterClassificationTest._getCharacterType(). The ')' doesn't have type PRINTABLE any longer, so use '*' instead which does have it.

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

damjan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 5c977050c2e1a4a4b1ea2ea26c77b0321226f137
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Thu May 8 17:29:30 2025 +0200

    Fix the test failure in XCharacterClassificationTest._getCharacterType().
    The ')' doesn't have type PRINTABLE any longer, so use '*' instead
    which does have it.
    
    Patch by: me
---
 test/testuno/source/api/i18n/XCharacterClassificationTest.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/test/testuno/source/api/i18n/XCharacterClassificationTest.java b/test/testuno/source/api/i18n/XCharacterClassificationTest.java
index 471fc2b879..0bf64cfd7a 100644
--- a/test/testuno/source/api/i18n/XCharacterClassificationTest.java
+++ b/test/testuno/source/api/i18n/XCharacterClassificationTest.java
@@ -263,7 +263,15 @@ public class XCharacterClassificationTest {
     @Test
     public void _getCharacterType() {
         boolean res = true;
-        String toCheck = "Ab0)";
+        // If or when this list gets out of date again,
+        // find new characters of the required type with:
+        //for (int i = 32; i <= 0xffff; i++) {
+        //    int charType = oObj.getCharacterType("" + (char)i, 0, getLocale(1));
+        //    if (charType == 32) {
+        //        System.out.println("character " + i + " has type 32");
+        //    }
+        //}
+        String toCheck = "Ab0*";
         int[] expected = new int[]{226,228,97,32};
 
         for (int i=0;i<toCheck.length();i++) {


(openoffice) 16/18: Delete the i18n mod in qadevOOo.

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

damjan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 66ceb4cf46a7a3af2cfa9b8a28e66999f07a70e8
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Fri May 9 18:45:24 2025 +0200

    Delete the i18n mod in qadevOOo.
    
    Patch by: me
---
 .../src/main/java/mod/_i18n/BreakIterator.java     | 118 ---------------------
 .../src/main/java/mod/_i18n/CalendarImpl.java      |  75 -------------
 .../src/main/java/mod/_i18n/ChapterCollator.java   |  79 --------------
 .../java/mod/_i18n/CharacterClassification.java    |  82 --------------
 .../src/main/java/mod/_i18n/Collator.java          |  76 -------------
 .../main/java/mod/_i18n/IndexEntrySupplier.java    |  81 --------------
 .../src/main/java/mod/_i18n/LocaleData.java        |  80 --------------
 .../java/mod/_i18n/NumberFormatCodeMapper.java     |  86 ---------------
 .../src/main/java/mod/_i18n/TextSearch.java        |  76 -------------
 .../src/main/java/mod/_i18n/Transliteration.java   |  76 -------------
 10 files changed, 829 deletions(-)

diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/BreakIterator.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/BreakIterator.java
deleted file mode 100644
index b669ca3478..0000000000
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/BreakIterator.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/**************************************************************
- * 
- * 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
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- *************************************************************/
-
-
-
-package mod._i18n;
-
-import java.io.PrintWriter;
-
-import lib.StatusException;
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-import util.SOfficeFactory;
-import util.utils;
-
-import com.sun.star.lang.Locale;
-import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.text.XTextDocument;
-import com.sun.star.text.XTextRange;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XInterface;
-
-/**
-* Test for object which is represented by service
-* <code>com.sun.star.i18n.BreakIterator</code>. <p>
-* Object implements the following interfaces :
-* <ul>
-*  <li> <code>com::sun::star::i18n::XBreakIterator</code></li>
-* </ul>
-* This object test <b> is NOT </b> designed to be run in several
-* threads concurrently.
-* @see ifc.i18n._XBreakIterator
-*/
-public class BreakIterator extends TestCase {
-
-    XComponent xTextDoc;
-
-    /**
-     * Loads a Text document with name 'Iterator.sxw' from test
-     * documents directory
-     */
-    protected void initialize( TestParameters tParam, PrintWriter log ) {
-
-        SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() );
-
-        try {
-            log.println( "creating a drawdoc" );
-            xTextDoc = SOF.loadDocument(utils.getFullTestURL("Iterator.sxw"));
-        } catch ( com.sun.star.uno.Exception e ) {
-            // Some exception occurred. FAILED
-            e.printStackTrace( log );
-            throw new StatusException( "Couldn't load document", e );
-        }
-    }
-
-    /**
-    * Creating a Testenvironment for the interfaces to be tested.
-    * Creates an instance of the service
-    * <code>com.sun.star.i18n.BreakIterator</code>.
-    */
-    public TestEnvironment createTestEnvironment( TestParameters Param,
-                                                  PrintWriter log )
-                                                    throws StatusException {
-        XInterface oObj = null;
-        Object oInterface = null;
-
-        try {
-            XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF();
-            oInterface = xMSF.createInstance( "com.sun.star.i18n.BreakIterator" );
-        }
-        catch( com.sun.star.uno.Exception e ) {
-            log.println("Can't create an object." );
-            throw new StatusException( "Can't create an object", e );
-        }
-
-        oObj = (XInterface) oInterface;
-
-        TestEnvironment tEnv = new TestEnvironment( oObj );
-
-        tEnv.addObjRelation("Locale",  new Locale("en", "US", ""));
-
-        XTextDocument xDoc = (XTextDocument)UnoRuntime.queryInterface
-            (XTextDocument.class, xTextDoc);
-        XTextRange xTextRange = (XTextRange)xDoc.getText();
-        tEnv.addObjRelation("UnicodeString", xTextRange.getString());
-
-        return tEnv;
-    } // finish method getTestEnvironment
-
-    /**
-    * Disposes the Text document loaded before.
-    */
-    protected void cleanup( TestParameters tParam, PrintWriter log ) {
-        log.println( "    disposing xTextDoc " );
-        xTextDoc.dispose();
-    }
-
-}    // finish class BreakIterator
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/CalendarImpl.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/CalendarImpl.java
deleted file mode 100644
index 82c37e6930..0000000000
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/CalendarImpl.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**************************************************************
- * 
- * 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
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- *************************************************************/
-
-
-
-package mod._i18n;
-
-import java.io.PrintWriter;
-
-import lib.StatusException;
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.uno.XInterface;
-
-/**
-* Test for object which is represented by service
-* <code>com.sun.star.i18n.Calendar</code>. <p>
-* Object implements the following interfaces :
-* <ul>
-*  <li> <code>com::sun::star::i18n::Calendar</code></li>
-* </ul>
-* @see ifc.i18n._XCalendar
-*/
-public class CalendarImpl extends TestCase {
-
-    /**
-    * Creating a Testenvironment for the interfaces to be tested.
-    * Creates an instance of the service
-    * <code>com.sun.star.i18n.Calendar</code>.
-    */
-    protected TestEnvironment createTestEnvironment
-            (TestParameters Param, PrintWriter log) {
-        XInterface oObj = null;
-        Object oInterface = null;
-
-        try {
-            XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF();
-            oInterface = xMSF.createInstance
-                ( "com.sun.star.i18n.LocaleCalendar" );
-        }
-        catch( com.sun.star.uno.Exception e ) {
-            log.println("Can't create an object." );
-            throw new StatusException( "Can't create an object", e );
-        }
-
-        oObj = (XInterface) oInterface;
-
-        TestEnvironment tEnv = new TestEnvironment( oObj );
-
-        return tEnv;
-
-    } // finish method getTestEnvironment
-
-}
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/ChapterCollator.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/ChapterCollator.java
deleted file mode 100644
index 18f97b853d..0000000000
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/ChapterCollator.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**************************************************************
- * 
- * 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
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- *************************************************************/
-
-
-
-package mod._i18n;
-
-import java.io.PrintWriter;
-
-import lib.StatusException;
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.uno.XInterface;
-
-/**
-* Test for object which is represented by service
-* <code>com.sun.star.i18n.ChapterCollator</code>. <p>
-* Object implements the following interfaces :
-* <ul>
-*  <li> <code>com::sun::star::i18n::XCollator</code></li>
-*  <li> <code>com::sun::star::lang::XServiceInfo</code></li>
-* </ul>
-* This object test <b> is NOT </b> designed to be run in several
-* threads concurrently.
-* @see ifc.i18n._XCollator
-* @see ifc.lang._XServiceInfo
-*/
-public class ChapterCollator extends TestCase {
-
-    /**
-    * Creating a Testenvironment for the interfaces to be tested.
-    * Creates an instance of the service
-    * <code>com.sun.star.i18n.ChapterCollator</code>.
-    */
-    public TestEnvironment createTestEnvironment( TestParameters Param,
-                                                  PrintWriter log )
-                                                    throws StatusException {
-        XInterface oObj = null;
-        Object oInterface = null;
-
-        try {
-            XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF();
-            oInterface = xMSF.createInstance
-                ( "com.sun.star.i18n.ChapterCollator" );
-        }
-        catch( com.sun.star.uno.Exception e ) {
-            log.println("Can't create an object." );
-            throw new StatusException( "Can't create an object", e );
-        }
-
-        oObj = (XInterface) oInterface;
-
-        TestEnvironment tEnv = new TestEnvironment( oObj );
-
-        return tEnv;
-    } // finish method getTestEnvironment
-
-}
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/CharacterClassification.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/CharacterClassification.java
deleted file mode 100644
index f8285dcf6b..0000000000
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/CharacterClassification.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/**************************************************************
- * 
- * 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
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- *************************************************************/
-
-
-
-package mod._i18n;
-
-import java.io.PrintWriter;
-
-import lib.StatusException;
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.uno.XInterface;
-
-/**
- * Test for object which is represented by service
- * <code>com.sun.star.i18n.CharacterClassification</code>. <p>
- *
- * Object implements the following interfaces :
- * <ul>
- *  <li> <code>com::sun::star::i18n::XCharacterClassification</code></li>
- * </ul> <p>
- *
- * This object test <b> is NOT </b> designed to be run in several
- * threads concurrently.
- *
- * @see com.sun.star.i18n.XCharacterClassification
- * @see ifc.i18n._XCharacterClassification
- */
-public class CharacterClassification extends TestCase {
-
-    /**
-     * Creating a Testenvironment for the interfaces to be tested.
-     * Creates an instance of the service
-     * <code>com.sun.star.i18n.CharacterClassification</code>.
-     */
-    public TestEnvironment createTestEnvironment( TestParameters Param,
-                                                  PrintWriter log )
-                                                    throws StatusException {
-        XInterface oObj = null;
-        Object oInterface = null;
-
-        try {
-            XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF();
-            oInterface = xMSF.createInstance
-                ( "com.sun.star.i18n.CharacterClassification" );
-        } catch( com.sun.star.uno.Exception e ) {
-            log.println("CharacterClassification Service not available" );
-            throw new StatusException
-                ( "CharacterClassification Service not available", e );
-        }
-
-        oObj = (XInterface) oInterface;
-
-        log.println( "    creating a new environment for CharacterClassification object" );
-        TestEnvironment tEnv = new TestEnvironment( oObj );
-
-        return tEnv;
-    } // finish method getTestEnvironment
-
-}    // finish class CharacterClassification
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/Collator.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/Collator.java
deleted file mode 100644
index 5160853977..0000000000
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/Collator.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**************************************************************
- * 
- * 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
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- *************************************************************/
-
-
-
-package mod._i18n;
-
-import java.io.PrintWriter;
-
-import lib.StatusException;
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.uno.XInterface;
-
-/**
-* Test for object which is represented by service
-* <code>com.sun.star.i18n.Collator</code>. <p>
-* Object implements the following interfaces :
-* <ul>
-*  <li> <code>com::sun::star::i18n::XCollator</code></li>
-* </ul>
-* This object test <b> is NOT </b> designed to be run in several
-* threads concurrently.
-* @see ifc.i18n._XCollator
-*/
-public class Collator extends TestCase {
-
-    /**
-    * Creating a Testenvironment for the interfaces to be tested.
-    * Creates an instance of the service
-    * <code>com.sun.star.i18n.Collator</code>.
-    */
-    public TestEnvironment createTestEnvironment( TestParameters Param,
-                                                  PrintWriter log )
-                                                    throws StatusException {
-        XInterface oObj = null;
-        Object oInterface = null;
-
-        try {
-            XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF();
-            oInterface = xMSF.createInstance( "com.sun.star.i18n.Collator" );
-        }
-        catch( com.sun.star.uno.Exception e ) {
-            log.println("Can't create an object." );
-            throw new StatusException( "Can't create an object", e );
-        }
-
-        oObj = (XInterface) oInterface;
-
-        TestEnvironment tEnv = new TestEnvironment( oObj );
-
-        return tEnv;
-    } // finish method getTestEnvironment
-
-}
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/IndexEntrySupplier.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/IndexEntrySupplier.java
deleted file mode 100644
index dddd262e79..0000000000
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/IndexEntrySupplier.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**************************************************************
- * 
- * 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
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- *************************************************************/
-
-
-
-package mod._i18n;
-
-import java.io.PrintWriter;
-
-import lib.StatusException;
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.uno.XInterface;
-
-/**
- * Test for object which is represented by service
- * <code>com.sun.star.i18n.IndexEntrySupplier</code>. <p>
- *
- * Object implements the following interfaces :
- * <ul>
- *  <li> <code>com::sun::star::i18n::XIndexEntrySupplier</code></li>
- * </ul> <p>
- *
- * This object test <b> is NOT </b> designed to be run in several
- * threads concurrently.
- *
- * @see com.sun.star.i18n.XIndexEntrySupplier
- * @see ifc.i18n._XIndexEntrySupplier
- */
-public class IndexEntrySupplier extends TestCase {
-
-    /**
-     * Creating a Testenvironment for the interfaces to be tested.
-     * Creates an instance of the service
-     * <code>com.sun.star.i18n.IndexEntrySupplier</code>.
-     */
-    public TestEnvironment createTestEnvironment( TestParameters Param,
-                                                  PrintWriter log )
-                                                    throws StatusException {
-        XInterface oObj = null;
-        Object oInterface = null;
-
-        try {
-            XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF();
-            oInterface = xMSF.createInstance
-                ( "com.sun.star.i18n.IndexEntrySupplier" );
-        }
-        catch( com.sun.star.uno.Exception e ) {
-            log.println("Can't create an object." );
-            throw new StatusException( "Can't create an object", e );
-        }
-
-        oObj = (XInterface) oInterface;
-
-        TestEnvironment tEnv = new TestEnvironment( oObj );
-
-        return tEnv;
-    } // finish method getTestEnvironment
-
-}
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/LocaleData.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/LocaleData.java
deleted file mode 100644
index dfd61bd72b..0000000000
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/LocaleData.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**************************************************************
- * 
- * 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
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- *************************************************************/
-
-
-
-package mod._i18n;
-
-import java.io.PrintWriter;
-
-import lib.StatusException;
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.uno.XInterface;
-
-/**
- * Test for object which is represented by service
- * <code>com.sun.star.i18n.LocaleData</code>. <p>
- *
- * Object implements the following interfaces :
- * <ul>
- *  <li> <code>com::sun::star::i18n::XLocaleData</code></li>
- * </ul> <p>
- *
- * This object test <b> is NOT </b> designed to be run in several
- * threads concurrently.
- *
- * @see com.sun.star.i18n.XLocaleData
- * @see ifc.i18n._XLocaleData
- */
-public class LocaleData extends TestCase {
-
-    /**
-     * Creating a Testenvironment for the interfaces to be tested.
-     * Creates an instance of the service
-     * <code>com.sun.star.i18n.LocaleData</code>.
-     */
-    public TestEnvironment createTestEnvironment( TestParameters Param,
-                                                  PrintWriter log )
-                                                    throws StatusException {
-        XInterface oObj = null;
-        Object oInterface = null;
-
-        try {
-            XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF();
-            oInterface = xMSF.createInstance( "com.sun.star.i18n.LocaleData" );
-        } catch( com.sun.star.uno.Exception e ) {
-            log.println("LocaleData Service not available" );
-            throw new StatusException( "LocaleData Service not available", e );
-        }
-
-        oObj = (XInterface) oInterface;
-
-        log.println( "    creating a new environment for LocaleData object" );
-        TestEnvironment tEnv = new TestEnvironment( oObj );
-
-        return tEnv;
-    } // finish method getTestEnvironment
-
-}    // finish class LocaleData
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/NumberFormatCodeMapper.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/NumberFormatCodeMapper.java
deleted file mode 100644
index 850a718cfa..0000000000
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/NumberFormatCodeMapper.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/**************************************************************
- * 
- * 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
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- *************************************************************/
-
-
-
-package mod._i18n;
-
-import java.io.PrintWriter;
-
-import lib.StatusException;
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.uno.XInterface;
-
-/**
- * Test for object which is represented by service
- * <code>com.sun.star.i18n.NumberFormatCodeMapper</code>. <p>
- *
- * Object implements the following interfaces :
- * <ul>
- *  <li> <code>com::sun::star::lang::XServiceInfo</code></li>
- *  <li> <code>com::sun::star::i18n::XNumberFormatCode</code></li>
- * </ul> <p>
- *
- * This object test <b> is NOT </b> designed to be run in several
- * threads concurrently.
- *
- * @see com.sun.star.lang.XServiceInfo
- * @see com.sun.star.i18n.XNumberFormatCode
- * @see ifc.lang._XServiceInfo
- * @see ifc.i18n._XNumberFormatCode
- */
-public class NumberFormatCodeMapper extends TestCase {
-
-    /**
-     * Creating a Testenvironment for the interfaces to be tested.
-     * Creates an instance of the service
-     * <code>com.sun.star.i18n.NumberFormatCodeMapper</code>.
-     */
-    public TestEnvironment createTestEnvironment( TestParameters Param,
-                                                  PrintWriter log )
-                                                    throws StatusException {
-        XInterface oObj = null;
-        Object oInterface = null;
-
-        try {
-            XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF();
-            oInterface = xMSF.createInstance
-                ( "com.sun.star.i18n.NumberFormatCodeMapper" );
-        }
-        catch( com.sun.star.uno.Exception e ) {
-            log.println("NumberFormatCodeMapper Service not available" );
-            throw new StatusException
-                ( "NumberFormatCodeMapper Service not available", e );
-        }
-
-        oObj = (XInterface) oInterface;
-
-        log.println( "    creating a new environment for NumberFormatCodeMapper object" );
-        TestEnvironment tEnv = new TestEnvironment( oObj );
-
-        return tEnv;
-    } // finish method getTestEnvironment
-
-}    // finish class NumberFormatCodeMapper
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/TextSearch.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/TextSearch.java
deleted file mode 100644
index 1d7e35083b..0000000000
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/TextSearch.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**************************************************************
- * 
- * 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
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- *************************************************************/
-
-
-
-package mod._i18n;
-
-import java.io.PrintWriter;
-
-import lib.StatusException;
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.uno.XInterface;
-
-/**
-* Test for object which is represented by service
-* <code>com.sun.star.util.TextSearch</code>. <p>
-* Object implements the following interfaces :
-* <ul>
-*  <li> <code>com::sun::star::util::XTextSearch</code></li>
-* </ul>
-* This object test <b> is NOT </b> designed to be run in several
-* threads concurrently.
-* @see ifc.util._XTextSearch
-*/
-public class TextSearch extends TestCase {
-
-    /**
-    * Creating a Testenvironment for the interfaces to be tested.
-    * Creates an instance of the service
-    * <code>com.sun.star.util.TextSearch</code>.
-    */
-    public TestEnvironment createTestEnvironment( TestParameters Param,
-                                                  PrintWriter log )
-                                                    throws StatusException {
-        XInterface oObj = null;
-        Object oInterface = null;
-
-        try {
-            XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF();
-            oInterface = xMSF.createInstance( "com.sun.star.util.TextSearch" );
-        }
-        catch( com.sun.star.uno.Exception e ) {
-            log.println("Can't create an object." );
-            throw new StatusException( "Can't create an object", e );
-        }
-
-        oObj = (XInterface) oInterface;
-
-        TestEnvironment tEnv = new TestEnvironment( oObj );
-
-        return tEnv;
-    } // finish method getTestEnvironment
-
-}
diff --git a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/Transliteration.java b/main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/Transliteration.java
deleted file mode 100644
index 2ef4971f1f..0000000000
--- a/main/qadevOOo/java/OOoRunner/src/main/java/mod/_i18n/Transliteration.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**************************************************************
- * 
- * 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
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- *************************************************************/
-
-
-
-package mod._i18n;
-
-import java.io.PrintWriter;
-
-import lib.StatusException;
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.uno.XInterface;
-
-/**
-* Test for object which is represented by service
-* <code>com.sun.star.i18n.Transliteration</code>. <p>
-* Object implements the following interfaces :
-* <ul>
-*  <li> <code>com::sun::star::i18n::XTransliteration</code></li>
-* </ul>
-* This object test <b> is NOT </b> designed to be run in several
-* threads concurrently.
-* @see ifc.i18n._XTransliteration
-*/
-public class Transliteration extends TestCase {
-
-    /**
-    * Creating a Testenvironment for the interfaces to be tested.
-    * Creates an instance of the service
-    * <code>com.sun.star.i18n.Transliteration</code>.
-    */
-    public TestEnvironment createTestEnvironment( TestParameters Param,
-                                                  PrintWriter log )
-                                                    throws StatusException {
-        XInterface oObj = null;
-        Object oInterface = null;
-
-        try {
-            XMultiServiceFactory xMSF = (XMultiServiceFactory)Param.getMSF();
-            oInterface = xMSF.createInstance( "com.sun.star.i18n.Transliteration" );
-        }
-        catch( com.sun.star.uno.Exception e ) {
-            log.println("Can't create an object." );
-            throw new StatusException( "Can't create an object", e );
-        }
-
-        oObj = (XInterface) oInterface;
-
-        TestEnvironment tEnv = new TestEnvironment( oObj );
-
-        return tEnv;
-    } // finish method getTestEnvironment
-
-}


(openoffice) 04/18: Fix a deadlock in the DBAccess test when connecting to OpenOffice for each test instead of once for the whole class.

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

damjan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit d01bf5ec1f78d57bb6531eb8307d286a2beba2c5
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Thu May 8 04:49:33 2025 +0200

    Fix a deadlock in the DBAccess test when connecting to OpenOffice
    for each test instead of once for the whole class.
    
    Patch by: me
---
 test/testuno/source/fvt/uno/db/DBAccess.java | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/test/testuno/source/fvt/uno/db/DBAccess.java b/test/testuno/source/fvt/uno/db/DBAccess.java
index fb18be63c3..2667188739 100644
--- a/test/testuno/source/fvt/uno/db/DBAccess.java
+++ b/test/testuno/source/fvt/uno/db/DBAccess.java
@@ -42,7 +42,9 @@ import java.io.IOException;
 
 // ---------- junit imports -----------------
 import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.openoffice.test.common.FileUtil;
 import org.openoffice.test.common.Testspace;
@@ -54,7 +56,7 @@ import static org.junit.Assert.*;
  * test case for Base's application UI
  */
 public class DBAccess {
-	UnoApp app = new UnoApp();
+	static final UnoApp app = new UnoApp();
 	private XOfficeDatabaseDocument m_databaseDocument;
 	private XDatabaseDocumentUI m_documentUI;
 
@@ -62,10 +64,18 @@ public class DBAccess {
 //		super();
 //	}
 
+	@BeforeClass
+	public static void setUpConnection() throws Exception {
+		app.start();
+	}
+
+	@AfterClass
+	public static void tearDownConnection() throws InterruptedException, Exception {
+		app.close();
+	}
 
 	@Before
 	public void before() throws java.lang.Exception {
-		app.start();
 		String a = null;
 		switchToDocument(a);
 	}
@@ -73,7 +83,6 @@ public class DBAccess {
 	@After
 	public void after() throws java.lang.Exception {
 		closeDocument();
-		app.close();
 	}
 	
 	private void closeDocument() {


(openoffice) 15/18: Make Java 1.7 the minimum version.

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

damjan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit c09e96c517f9fb1efa7399a4f6c9e002ea5377a1
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Fri May 9 18:36:16 2025 +0200

    Make Java 1.7 the minimum version.
    
    Patch by: me
---
 test/build.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/build.xml b/test/build.xml
index f59027f629..8b44b34c8c 100644
--- a/test/build.xml
+++ b/test/build.xml
@@ -85,7 +85,7 @@
 	</target>
 
 	<target name="testcommon.compile" depends="testcommon.init, prepare.junit">
-		<javac destdir="testcommon/bin" debug="on" source="1.6" target="1.6" encoding="utf-8" includeantruntime="false">
+		<javac destdir="testcommon/bin" debug="on" source="1.7" target="1.7" encoding="utf-8" includeantruntime="false">
 			<src path="testcommon/source"/>
 			<classpath>
 				<fileset dir="lib">
@@ -105,7 +105,7 @@
 	</target>
 
 	<target name="testgui.compile" depends="testcommon.compile, testgui.init">
-		<javac destdir="testgui/bin" debug="on" source="1.6" target="1.6" encoding="utf-8" includeantruntime="false">
+		<javac destdir="testgui/bin" debug="on" source="1.7" target="1.7" encoding="utf-8" includeantruntime="false">
 			<src path="testgui/source"/>
 			<classpath>
 				<fileset dir="lib">
@@ -126,7 +126,7 @@
 	</target>
 
 	<target name="testuno.compile" depends="testcommon.compile, testuno.init">
-		<javac destdir="testuno/bin" debug="on" source="1.6" target="1.6" encoding="utf-8" includeantruntime="false">
+		<javac destdir="testuno/bin" debug="on" source="1.7" target="1.7" encoding="utf-8" includeantruntime="false">
 			<src path="testuno/source"/>
 			<classpath>
 				<fileset dir="lib">