svn commit: r12794 - trunk/tests/org/argouml/model

Author: tfmorris
Date: 2007-06-08 12:29:23-0700
New Revision: 12794

Modified:
   trunk/tests/org/argouml/model/TestModelFacade2.java
   trunk/tests/org/argouml/model/TestModelFacade3.java

Log:
Allow ClassCastException as alternative to IllegalArgumentException

Modified: trunk/tests/org/argouml/model/TestModelFacade2.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/model/TestModelFacade2.java?view=diff&rev=12794&p1=trunk/tests/org/argouml/model/TestModelFacade2.java&p2=trunk/tests/org/argouml/model/TestModelFacade2.java&r1=12793&r2=12794
==============================================================================
--- trunk/tests/org/argouml/model/TestModelFacade2.java	(original)
+++ trunk/tests/org/argouml/model/TestModelFacade2.java	2007-06-08 12:29:23-0700
@@ -65,8 +65,13 @@
 	try {
 	    Model.getFacade().isAsynchronous(new Object());
 	    assertTrue("Error was not thrown", false);
-	} catch (IllegalArgumentException e) {
-	    // We expected an error to be thrown.
+	} catch (Throwable e) {
+            if (e instanceof IllegalArgumentException 
+                    || e instanceof ClassCastException) {
+                // one of the expected errors, just ignore
+            } else {
+                throw new RuntimeException(e);
+            }
 	}
     }
 

Modified: trunk/tests/org/argouml/model/TestModelFacade3.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/model/TestModelFacade3.java?view=diff&rev=12794&p1=trunk/tests/org/argouml/model/TestModelFacade3.java&p2=trunk/tests/org/argouml/model/TestModelFacade3.java&r1=12793&r2=12794
==============================================================================
--- trunk/tests/org/argouml/model/TestModelFacade3.java	(original)
+++ trunk/tests/org/argouml/model/TestModelFacade3.java	2007-06-08 12:29:23-0700
@@ -157,7 +157,8 @@
             fail(methodToTest.getName()
                     + " does not deliver an IllegalArgumentException");
         } catch (InvocationTargetException e) {
-            if (e.getTargetException() instanceof IllegalArgumentException) {
+            if (e.getTargetException() instanceof IllegalArgumentException 
+                    || e.getTargetException() instanceof ClassCastException) {
                 return;
             }
             fail("Test failed for " + methodToTest.toString()