From 0af9970da3a23f63752033128976ad9ea420f828 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 25 Apr 2013 17:43:03 +0200
Subject: Mark TypeDescriptionProvider service as "don't create by name"

...had to adapt one test that had picked this service apparently arbitrarily.

Change-Id: Iaa17b7c622b9ac3601beb3ba931f7b1d99f649f1
---
 .../tests/java/ifc/script/_XEventAttacherManager.java     | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'qadevOOo')

diff --git a/qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java b/qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java
index d6a4483fcc58..ce389b1c2156 100644
--- a/qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java
+++ b/qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java
@@ -52,7 +52,7 @@ public class _XEventAttacherManager extends MultiMethodTest {
      */
     public XEventAttacherManager oObj = null;
 
-    int index;
+    private final int index = 0;
 
     /**
     * Test calls the method and stores index of new entry. <p>
@@ -60,7 +60,6 @@ public class _XEventAttacherManager extends MultiMethodTest {
     * and no exceptions were thrown. <p>
     */
     public void _insertEntry() {
-        index = 0;
         try {
             oObj.insertEntry(index);
             tRes.tested("insertEntry()", true);
@@ -260,7 +259,7 @@ public class _XEventAttacherManager extends MultiMethodTest {
     Object attachedObject;
 
     /**
-    * Test creates instance of <code>TypeDescriptionProvider</code>,
+    * Test creates instance of <code>NamingService</code> (arbitrarily),
     * stores it and attaches it to the entry with index stored in the method
     * <code>insertEntry()</code>. <p>
     * Has <b> OK </b> status if the method successfully returns
@@ -268,7 +267,6 @@ public class _XEventAttacherManager extends MultiMethodTest {
     * The following method tests are to be completed successfully before :
     * <ul>
     *  <li> <code> insertEntry() </code> : to have entry's index for attach</li>
-    * @see com.sun.star.reflection.TypeDescriptionProvider
     */
     public void _attach() {
         requiredMethod("insertEntry()");
@@ -276,13 +274,18 @@ public class _XEventAttacherManager extends MultiMethodTest {
         try {
             XMultiServiceFactory xMSF = (XMultiServiceFactory)tParam.getMSF();
             attachedObject = xMSF.createInstance
-                ( "com.sun.star.reflection.TypeDescriptionProvider" );
+                ( "com.sun.star.uno.NamingService" );
         } catch( com.sun.star.uno.Exception e ) {
-            log.println("Service not available" );
+            log.println("com.sun.star.uno.NamingService not available" );
             e.printStackTrace(log);
             tRes.tested("attach()", false);
             return;
         }
+        if (attachedObject == null) {
+            log.println("com.sun.star.uno.NamingService not available" );
+            tRes.tested("attach()", false);
+            return;
+        }
 
         try {
             oObj.attach(index, attachedObject, "param");
-- 
cgit