INTEGRATION: CWS mmt7 (1.5.14); FILE MERGED

2006/02/14 12:18:28 sb 1.5.14.1: #i60643# Fixed a problem revealed by the fix for i60341.

1 files changed, 2 insertions, 29 deletions

diff --git a/jurt/test/com/sun/star/uno/AnyConverter_Test.java b/jurt/test/com/sun/star/uno/AnyConverter_Test.java
index ea71a46e5..d0961cd1b 100644
--- a/jurt/test/com/sun/star/uno/AnyConverter_Test.java
+++ b/jurt/test/com/sun/star/uno/AnyConverter_Test.java
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: AnyConverter_Test.java,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 19:17:26 $
+ *  last change: $Author: rt $ $Date: 2006-05-04 08:10:11 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -62,7 +62,6 @@ public final class AnyConverter_Test extends ComplexTestCase {
     Any anyLong; //
     Any anyFloat; //
     Any anyDouble; //
-    Any anyObj; //
     Any anyStr; //
     Any anyType; //
     Any anyArByte; //
@@ -92,7 +91,6 @@ public final class AnyConverter_Test extends ComplexTestCase {
         anyLong= new Any(new Type(Long.TYPE), aLong);
         anyFloat= new Any(new Type(Float.TYPE), aFloat);
         anyDouble= new Any(new Type(Double.TYPE), aDouble);
-        anyObj= new Any(new Type(Object.class) /* any */, aObj);
         anyStr= new Any(new Type(String.class), aStr);
         anyType= new Any(new Type(Type.class), aType);
         anyArByte= new Any(new Type(byte[].class), arByte);
@@ -139,8 +137,6 @@ public final class AnyConverter_Test extends ComplexTestCase {
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toBoolean(aObj); failed("");
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
-        try { AnyConverter.toBoolean(anyObj); failed("");
-        } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toBoolean(aStr); failed("");
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toBoolean(anyStr); failed("");
@@ -197,8 +193,6 @@ public final class AnyConverter_Test extends ComplexTestCase {
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toChar(aObj); failed("");
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
-        try { AnyConverter.toChar(anyObj); failed("");
-        } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toChar(aStr); failed("");
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toChar(anyStr); failed("");
@@ -251,8 +245,6 @@ public final class AnyConverter_Test extends ComplexTestCase {
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toByte(aObj); failed("");
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
-        try { AnyConverter.toByte(anyObj); failed("");
-        } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toByte(aStr); failed("");
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toByte(anyStr); failed("");
@@ -319,8 +311,6 @@ public final class AnyConverter_Test extends ComplexTestCase {
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toShort(aObj); failed("");
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
-        try { AnyConverter.toShort(anyObj); failed("");
-        } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toShort(aStr); failed("");
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toShort(anyStr); failed("");
@@ -388,8 +378,6 @@ public final class AnyConverter_Test extends ComplexTestCase {
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toInt(aObj); failed("");
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
-        try { AnyConverter.toInt(anyObj); failed("");
-        } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toInt(aStr); failed("");
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toInt(anyStr); failed("");
@@ -462,8 +450,6 @@ public final class AnyConverter_Test extends ComplexTestCase {
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toLong(aObj); failed("");
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
-        try { AnyConverter.toLong(anyObj); failed("");
-        } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toLong(aStr); failed("");
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toLong(anyStr); failed("");
@@ -520,8 +506,6 @@ public final class AnyConverter_Test extends ComplexTestCase {
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toFloat(aObj); failed("");
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
-        try { AnyConverter.toFloat(anyObj); failed("");
-        } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toFloat(aStr); failed("");
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toFloat(anyStr); failed("");
@@ -579,8 +563,6 @@ public final class AnyConverter_Test extends ComplexTestCase {
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toDouble(aObj); failed("");
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
-        try { AnyConverter.toDouble(anyObj); failed("");
-        } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toDouble(aStr); failed("");
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toDouble(anyStr); failed("");
@@ -604,8 +586,6 @@ public final class AnyConverter_Test extends ComplexTestCase {
         Type _type= new Type(XTypeProvider.class);
         Object val= AnyConverter.toObject(_type, aObj);
         assure("", UnoRuntime.areSame(val, aObj));
-        val= AnyConverter.toObject(_type, anyObj);
-        assure("", UnoRuntime.areSame(val, anyObj.getObject()));
         val= AnyConverter.toObject(
             _type, new Any( new Type(XTypeProvider.class), null));
         assure("", val == null);
@@ -699,8 +679,6 @@ public final class AnyConverter_Test extends ComplexTestCase {
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toString(aObj); failed("");
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
-        try { AnyConverter.toString(anyObj); failed("");
-        } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toString(aType); failed("");
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toString(anyType); failed("");
@@ -757,8 +735,6 @@ public final class AnyConverter_Test extends ComplexTestCase {
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toType(aObj); failed("");
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
-        try { AnyConverter.toType(anyObj); failed("");
-        } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toType(aStr); failed("");
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toType(anyStr); failed("");
@@ -815,8 +791,6 @@ public final class AnyConverter_Test extends ComplexTestCase {
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toType(aObj); failed("");
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
-        try { AnyConverter.toType(anyObj); failed("");
-        } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toType(aStr); failed("");
         } catch (com.sun.star.lang.IllegalArgumentException ie) {}
         try { AnyConverter.toType(anyStr); failed("");
@@ -894,7 +868,6 @@ public final class AnyConverter_Test extends ComplexTestCase {
 
     public void test_isObject() {
         assure("", AnyConverter.isObject(aObj));
-        assure("", AnyConverter.isObject(anyObj));
         assure("", AnyConverter.isObject( new Any( XInterface.class, null)));
         assure("", !AnyConverter.isObject(new Object()));
     }