svn commit: r13680 - trunk/tests/org/argouml: model notation notation/providers

Author: tfmorris
Date: 2007-10-11 01:45:42-0700
New Revision: 13680

Modified:
   trunk/tests/org/argouml/model/GenericUmlObjectTestFixture.java
   trunk/tests/org/argouml/notation/TestNotationProvider.java
   trunk/tests/org/argouml/notation/providers/TestNotationProviderFactory2.java

Log:
Use interfaces (Map) instead of implementation types (HashMap) in APIs.

Modified: trunk/tests/org/argouml/model/GenericUmlObjectTestFixture.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/model/GenericUmlObjectTestFixture.java?view=diff&rev=13680&p1=trunk/tests/org/argouml/model/GenericUmlObjectTestFixture.java&p2=trunk/tests/org/argouml/model/GenericUmlObjectTestFixture.java&r1=13679&r2=13680
==============================================================================
--- trunk/tests/org/argouml/model/GenericUmlObjectTestFixture.java	(original)
+++ trunk/tests/org/argouml/model/GenericUmlObjectTestFixture.java	2007-10-11 01:45:42-0700
@@ -25,6 +25,7 @@
 package org.argouml.model;
 
 import java.util.HashMap;
+import java.util.Map;
 
 import junit.framework.TestCase;
 
@@ -33,7 +34,7 @@
  */
 public abstract class GenericUmlObjectTestFixture extends TestCase {
 
-    private HashMap truths = new HashMap();
+    private Map<Object, Boolean> truths = new HashMap<Object, Boolean>();
 
     private boolean validated = false;
 
@@ -110,7 +111,7 @@
      * @param b the value
      */
     protected void setTruth(Object class1, boolean b) {
-	truths.put(class1, new Boolean(b));
+	truths.put(class1, Boolean.valueOf(b));
     }
 
     /**
@@ -247,7 +248,7 @@
      */
     private void runTruthTest(boolean result, Object class1) {
         // TODO: Look up class in truth table
-        Boolean truth = (Boolean) truths.get(class1);
+        Boolean truth = truths.get(class1);
         if (truth == null) {
 	    truth = Boolean.FALSE;
         }

Modified: trunk/tests/org/argouml/notation/TestNotationProvider.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/notation/TestNotationProvider.java?view=diff&rev=13680&p1=trunk/tests/org/argouml/notation/TestNotationProvider.java&p2=trunk/tests/org/argouml/notation/TestNotationProvider.java&r1=13679&r2=13680
==============================================================================
--- trunk/tests/org/argouml/notation/TestNotationProvider.java	(original)
+++ trunk/tests/org/argouml/notation/TestNotationProvider.java	2007-10-11 01:45:42-0700
@@ -27,6 +27,7 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.HashMap;
+import java.util.Map;
 
 import junit.framework.TestCase;
 
@@ -55,12 +56,12 @@
 
     /**
      * Test the existence of the 
-     * toString(Object modelElement, HashMap args) method.
+     * toString(Object modelElement, Map args) method.
      * TODO: Need to find a more useful test.
      */
     public void testToString() {
         NotationProvider np = new NPImpl();
-        HashMap<String, String> args = new HashMap<String, String>();
+        Map<String, String> args = new HashMap<String, String>();
         args.put("b", "c");
         assertTrue("Test toString()", "a1".equals(np.toString("a", args)));
         args.put("d", "e");
@@ -71,7 +72,7 @@
      * Test the isValue utility function.
      */
     public void testIsValue() {
-        HashMap<String, Object> args = new HashMap<String, Object>();
+        Map<String, Object> args = new HashMap<String, Object>();
         args.put("not a boolean", "c");
         args.put("true", Boolean.TRUE);
         args.put("false", Boolean.FALSE);
@@ -98,9 +99,9 @@
         }
 
         /*
-         * @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.HashMap)
+         * @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.Map)
          */
-        public String toString(Object modelElement, HashMap args) {
+        public String toString(Object modelElement, Map args) {
             return modelElement.toString() + args.size();
         }
 

Modified: trunk/tests/org/argouml/notation/providers/TestNotationProviderFactory2.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/notation/providers/TestNotationProviderFactory2.java?view=diff&rev=13680&p1=trunk/tests/org/argouml/notation/providers/TestNotationProviderFactory2.java&p2=trunk/tests/org/argouml/notation/providers/TestNotationProviderFactory2.java&r1=13679&r2=13680
==============================================================================
--- trunk/tests/org/argouml/notation/providers/TestNotationProviderFactory2.java	(original)
+++ trunk/tests/org/argouml/notation/providers/TestNotationProviderFactory2.java	2007-10-11 01:45:42-0700
@@ -24,7 +24,7 @@
 
 package org.argouml.notation.providers;
 
-import java.util.HashMap;
+import java.util.Map;
 
 import junit.framework.TestCase;
 import org.argouml.model.InitializeModel;
@@ -112,9 +112,9 @@
         }
 
         /*
-         * @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.HashMap)
+         * @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.Map)
          */
-        public String toString(Object modelElement, HashMap args) {
+        public String toString(Object modelElement, Map args) {
             return modelElement.toString() + args.size();
         }