svn commit: r14853 - trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestEnumerationLiteralNotationUml.java

Author: tfmorris
Date: 2008-06-01 09:24:45-0700
New Revision: 14853

Modified:
   trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestEnumerationLiteralNotationUml.java

Log:
Issue 5119: use assertEquals where possible so that we get expected and actual strings in test failure messages

Modified: trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestEnumerationLiteralNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestEnumerationLiteralNotationUml.java?view=diff&rev=14853&p1=trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestEnumerationLiteralNotationUml.java&p2=trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestEnumerationLiteralNotationUml.java&r1=14852&r2=14853
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestEnumerationLiteralNotationUml.java	(original)
+++ trunk/src/argouml-app/tests/org/argouml/notation/providers/uml/TestEnumerationLiteralNotationUml.java	2008-06-01 09:24:45-0700
@@ -112,10 +112,10 @@
             eln.parseEnumerationLiteralFig(
                     Model.getFacade().getEnumeration(element),
                     element, text);
-            assertTrue(text
+            assertEquals(text
                        + " gave wrong name: "
                        + Model.getFacade().getName(element),
-                       name.equals(Model.getFacade().getName(element)));
+                       name, Model.getFacade().getName(element));
         } else {
             fail("Can only check name of a enumeration literal");
         }
@@ -213,8 +213,8 @@
     private void checkGenerate(Object literal, String text, Map args) {
         EnumerationLiteralNotationUml notation = 
             new EnumerationLiteralNotationUml(aLiteral); 
-        assertTrue("Incorrect generation", 
-                text.equals(notation.toString(literal, args)));
+        assertEquals("Incorrect generation", 
+                text, notation.toString(literal, args));
     }
     
     /**