svn commit: r12914 - branches/gsoc2007/maurelio1234/tests: . org/argouml/moduleloader org/argouml/uml org/argouml/uml/profile org/argouml/uml/profile/java org/argouml/uml/ui

Author: maurelio1234
Date: 2007-06-28 05:14:51-0700
New Revision: 12914

Added:
   branches/gsoc2007/maurelio1234/tests/
      - copied from r12912, /trunk/tests/
   branches/gsoc2007/maurelio1234/tests/org/argouml/uml/profile/
   branches/gsoc2007/maurelio1234/tests/org/argouml/uml/profile/java/
   branches/gsoc2007/maurelio1234/tests/org/argouml/uml/profile/java/TestProfileJava.java
      - copied, changed from r12912, /trunk/tests/org/argouml/uml/TestProfileJava.java
Removed:
   branches/gsoc2007/maurelio1234/tests/org/argouml/uml/TestProfileJava.java
Modified:
   branches/gsoc2007/maurelio1234/tests/org/argouml/moduleloader/GUITestModuleLoader2.java
   branches/gsoc2007/maurelio1234/tests/org/argouml/uml/ui/MockUMLUserInterfaceContainer.java

Log:
Uploading tests for profile

Modified: branches/gsoc2007/maurelio1234/tests/org/argouml/moduleloader/GUITestModuleLoader2.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/tests/org/argouml/moduleloader/GUITestModuleLoader2.java?view=diff&rev=12914&p1=/trunk/tests/org/argouml/moduleloader/GUITestModuleLoader2.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/moduleloader/GUITestModuleLoader2.java&r1=12912&r2=12914
==============================================================================
--- /trunk/tests/org/argouml/moduleloader/GUITestModuleLoader2.java	(original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/moduleloader/GUITestModuleLoader2.java	2007-06-28 05:14:51-0700
@@ -86,7 +86,7 @@
     }
 
     public void testGetExtensionLocations() {
-	List extensionLocations =
+	List<String> extensionLocations =
 	    ModuleLoader2.getInstance().getExtensionLocations();
 	assertNotNull(extensionLocations);
 	for (Iterator iter = extensionLocations.iterator();

Removed: /trunk/tests/org/argouml/uml/TestProfileJava.java
Url: http://argouml.tigris.org/source/browse/argouml//trunk/tests/org/argouml/uml/TestProfileJava.java?view=auto&rev=12912

Copied: branches/gsoc2007/maurelio1234/tests/org/argouml/uml/profile/java/TestProfileJava.java (from r12912, /trunk/tests/org/argouml/uml/TestProfileJava.java)
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/tests/org/argouml/uml/profile/java/TestProfileJava.java?view=diff&rev=12914&p1=/trunk/tests/org/argouml/uml/TestProfileJava.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/uml/profile/java/TestProfileJava.java&r1=12912&r2=12914
==============================================================================
--- /trunk/tests/org/argouml/uml/TestProfileJava.java	(original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/uml/profile/java/TestProfileJava.java	2007-06-28 05:14:51-0700
@@ -22,14 +22,14 @@
 // CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
 // UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
-package org.argouml.uml;
+package org.argouml.uml.profile.java;
 
 import java.util.Collection;
 
-import org.argouml.model.Model;
-
 import junit.framework.TestCase;
+
 import org.argouml.model.InitializeModel;
+import org.argouml.model.Model;
 
 /**
  * 
@@ -57,18 +57,13 @@
     }
 
     /**
-     * Test whether we can load default model (profile). ProfileJava will throw
-     * an exception for an invalid profile model, but just create and return an
-     * empty model if the file for the profile doesn't exist. Check
-     * for both failure modes.
-     * 
-     * @throws ProfileException
-     *             exception thrown by ProfileJava for invalid profile file.
+     * Test whether we can load default model (profile). ProfileJava will just 
+     * create and return an empty model if the file for the profile doesn't 
+     * exist.
      */
-    public void testLoadProfileModel() throws ProfileException {
+    public void testLoadProfileModel() {
         ProfileJava profile = new ProfileJava();
-        Object model = profile.loadProfileModel();
-        assertNotNull("Can't load profile model", model);
+        Object model = profile.getModel();
         Collection stereos = Model.getModelManagementHelper()
                 .getAllModelElementsOfKind(model,
                         Model.getMetaTypes().getStereotype());

Modified: branches/gsoc2007/maurelio1234/tests/org/argouml/uml/ui/MockUMLUserInterfaceContainer.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/maurelio1234/tests/org/argouml/uml/ui/MockUMLUserInterfaceContainer.java?view=diff&rev=12914&p1=/trunk/tests/org/argouml/uml/ui/MockUMLUserInterfaceContainer.java&p2=branches/gsoc2007/maurelio1234/tests/org/argouml/uml/ui/MockUMLUserInterfaceContainer.java&r1=12912&r2=12914
==============================================================================
--- /trunk/tests/org/argouml/uml/ui/MockUMLUserInterfaceContainer.java	(original)
+++ branches/gsoc2007/maurelio1234/tests/org/argouml/uml/ui/MockUMLUserInterfaceContainer.java	2007-06-28 05:14:51-0700
@@ -26,7 +26,7 @@
 
 import java.util.Iterator;
 
-import org.argouml.uml.Profile;
+import org.argouml.uml.profile.ProfileConfiguration;
 
 /**
  * @since Oct 12, 2002
@@ -61,7 +61,7 @@
     /**
      * @see org.argouml.uml.ui.UMLUserInterfaceContainer#getProfile()
      */
-    public Profile getProfile() {
+    public ProfileConfiguration getProfile() {
         return null;
     }