svn commit: r16420 - trunk/src/argouml-app/tests/org/argouml/model

Author: tfmorris
Date: 2008-12-22 14:47:22-0800
New Revision: 16420

Modified:
   trunk/src/argouml-app/tests/org/argouml/model/TestActivityGraphsFactory.java
   trunk/src/argouml-app/tests/org/argouml/model/TestAgainstUmlModel.java

Log:
Don't bother testing ActivityGraph since it's not in UML 2.x

Modified: trunk/src/argouml-app/tests/org/argouml/model/TestActivityGraphsFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/model/TestActivityGraphsFactory.java?view=diff&pathrev=16420&r1=16419&r2=16420
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/model/TestActivityGraphsFactory.java	(original)
+++ trunk/src/argouml-app/tests/org/argouml/model/TestActivityGraphsFactory.java	2008-12-22 14:47:22-0800
@@ -24,6 +24,7 @@
 
 package org.argouml.model;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -48,6 +49,10 @@
         "Partition",
         "SubactivityState",
     };
+    
+    private static String[] skippedModelElements = {
+        "ActivityGraph",
+    };
 
     /**
      * The constructor.
@@ -94,6 +99,9 @@
      * @return all testable model elements
      */
     static List<String> getTestableModelElements() {
-        return Arrays.asList(allModelElements);
+        List<String> result = 
+            new ArrayList<String>(Arrays.asList(allModelElements));
+        result.removeAll(Arrays.asList(skippedModelElements));
+        return result;
     } 
 }

Modified: trunk/src/argouml-app/tests/org/argouml/model/TestAgainstUmlModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/model/TestAgainstUmlModel.java?view=diff&pathrev=16420&r1=16419&r2=16420
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/model/TestAgainstUmlModel.java	(original)
+++ trunk/src/argouml-app/tests/org/argouml/model/TestAgainstUmlModel.java	2008-12-22 14:47:22-0800
@@ -356,6 +356,8 @@
         dontTest.add("Primitive");
         dontTest.add("ProgrammingLanguageDataType");
         dontTest.add("UseCaseInstance");
+        
+        dontTest.add("ActivityGraph");
 
         dontTest.add("ActionExpression");
         dontTest.add("ArgListsExpression");

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=990132

To unsubscribe from this discussion, e-mail: [[email protected]].