svn commit: r13352 - branches/gsoc2007/b00__1/tests/org/argouml/model

Author: b00__1
Date: 2007-08-14 13:34:25-0700
New Revision: 13352

Modified:
   branches/gsoc2007/b00__1/tests/org/argouml/model/TestCoreFactory.java
   branches/gsoc2007/b00__1/tests/org/argouml/model/TestModelManagementFactory.java
   branches/gsoc2007/b00__1/tests/org/argouml/model/TestModelManagementHelper.java

Log:
reverted the changes at Tom's suggestion

Modified: branches/gsoc2007/b00__1/tests/org/argouml/model/TestCoreFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/b00__1/tests/org/argouml/model/TestCoreFactory.java?view=diff&rev=13352&p1=branches/gsoc2007/b00__1/tests/org/argouml/model/TestCoreFactory.java&p2=branches/gsoc2007/b00__1/tests/org/argouml/model/TestCoreFactory.java&r1=13351&r2=13352
==============================================================================
--- branches/gsoc2007/b00__1/tests/org/argouml/model/TestCoreFactory.java	(original)
+++ branches/gsoc2007/b00__1/tests/org/argouml/model/TestCoreFactory.java	2007-08-14 13:34:25-0700
@@ -118,16 +118,6 @@
         c.remove("BehavioralFeature");
         c.remove("Relationship");
         c.remove("PresentationElement");
-        
-        c.remove("AssociationEnd");
-        c.remove("Attribute");
-        c.remove("Binding");
-        c.remove("ElementResidence");
-        c.remove("Flow");
-        c.remove("Method");
-        c.remove("ModelElement");
-        c.remove("Permission");
-        c.remove("TemplateArgument");
         return c;
     }
     

Modified: branches/gsoc2007/b00__1/tests/org/argouml/model/TestModelManagementFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/b00__1/tests/org/argouml/model/TestModelManagementFactory.java?view=diff&rev=13352&p1=branches/gsoc2007/b00__1/tests/org/argouml/model/TestModelManagementFactory.java&p2=branches/gsoc2007/b00__1/tests/org/argouml/model/TestModelManagementFactory.java&r1=13351&r2=13352
==============================================================================
--- branches/gsoc2007/b00__1/tests/org/argouml/model/TestModelManagementFactory.java	(original)
+++ branches/gsoc2007/b00__1/tests/org/argouml/model/TestModelManagementFactory.java	2007-08-14 13:34:25-0700
@@ -1,4 +1,4 @@
-// $Id:TestModelManagementFactory.java 12576 2007-05-09 14:19:16Z tfmorris $
+// $Id$
 // Copyright (c) 2002-2007 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
 // software and its documentation without fee, and without a written
@@ -24,7 +24,6 @@
 
 package org.argouml.model;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -58,15 +57,6 @@
     protected static String[] getAllModelElements() {
         return allModelElements;
     }
-    
-    /**
-     * @return Returns the allModelElements for UML2.
-     */
-    protected static String[] getAllModelElementsForUML2() {
-	List<String> l = new ArrayList<String>(Arrays.asList(allModelElements));
-	l.remove("Subsystem");
-        return l.toArray(new String[0]);
-    }
 
     /**
      * @return all testable model elements

Modified: branches/gsoc2007/b00__1/tests/org/argouml/model/TestModelManagementHelper.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/b00__1/tests/org/argouml/model/TestModelManagementHelper.java?view=diff&rev=13352&p1=branches/gsoc2007/b00__1/tests/org/argouml/model/TestModelManagementHelper.java&p2=branches/gsoc2007/b00__1/tests/org/argouml/model/TestModelManagementHelper.java&r1=13351&r2=13352
==============================================================================
--- branches/gsoc2007/b00__1/tests/org/argouml/model/TestModelManagementHelper.java	(original)
+++ branches/gsoc2007/b00__1/tests/org/argouml/model/TestModelManagementHelper.java	2007-08-14 13:34:25-0700
@@ -1,4 +1,4 @@
-// $Id:TestModelManagementHelper.java 12485 2007-05-03 05:59:35Z linus $
+// $Id$
 // Copyright (c) 1996-2007 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
 // software and its documentation without fee, and without a written
@@ -65,7 +65,7 @@
     public void testGetMetaModelName() {
 	CheckUMLModelHelper.metaModelNameCorrect(
 			 Model.getModelManagementFactory(),
-			 TestModelManagementFactory.getAllModelElementsForUML2());
+			 TestModelManagementFactory.getAllModelElements());
     }
 
     /**