svn commit: r16440 - trunk/src/argouml-app/tests/org/argouml/profile: . internal/ocl

Author: maurelio1234
Date: 2008-12-23 18:39:12-0800
New Revision: 16440

Added:
   trunk/src/argouml-app/tests/org/argouml/profile/internal/ocl/
      - copied from r16438, /branches/gsoc2008/work_issue5042_merged15552_maurelio1234/tests/org/argouml/profile/internal/ocl/
   trunk/src/argouml-app/tests/org/argouml/profile/internal/ocl/TestCrOCL.java
      - copied unchanged from r16438, /branches/gsoc2008/work_issue5042_merged15552_maurelio1234/tests/org/argouml/profile/internal/ocl/TestCrOCL.java
   trunk/src/argouml-app/tests/org/argouml/profile/internal/ocl/TestCrOCL2.java
      - copied unchanged from r16438, /branches/gsoc2008/work_issue5042_merged15552_maurelio1234/tests/org/argouml/profile/internal/ocl/TestCrOCL2.java
   trunk/src/argouml-app/tests/org/argouml/profile/internal/ocl/TestDefaultOclEvaluator.java
      - copied, changed from r16438, /branches/gsoc2008/work_issue5042_merged15552_maurelio1234/tests/org/argouml/profile/internal/ocl/TestDefaultOclEvaluator.java
   trunk/src/argouml-app/tests/org/argouml/profile/internal/ocl/TestOclInterpreter.java
      - copied, changed from r16438, /branches/gsoc2008/work_issue5042_merged15552_maurelio1234/tests/org/argouml/profile/internal/ocl/TestOclInterpreter.java
Modified:
   trunk/src/argouml-app/tests/org/argouml/profile/   (props changed)
   trunk/src/argouml-app/tests/org/argouml/profile/TestUserDefinedProfile.java

Log:
commiting tests for the OCL Evaluator

Modified: trunk/src/argouml-app/tests/org/argouml/profile/TestUserDefinedProfile.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/profile/TestUserDefinedProfile.java?view=diff&pathrev=16440&r1=16439&r2=16440
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/profile/TestUserDefinedProfile.java	(original)
+++ trunk/src/argouml-app/tests/org/argouml/profile/TestUserDefinedProfile.java	2008-12-23 18:39:12-0800
@@ -34,6 +34,7 @@
 import org.argouml.cognitive.Critic;
 import org.argouml.model.InitializeModel;
 import org.argouml.profile.internal.ProfileManagerImpl;
+import org.argouml.profile.internal.ocl.CrOCL;
 
 /**
  * Some basic tests for the {@link UserDefinedProfile} class.
@@ -93,14 +94,18 @@
         File profileFile = new File(testDir, "testLoadingConstructor.xmi");
         profileMother.saveProfileModel(model, profileFile);
 
+        CrOCL critic = new CrOCL("context Class inv: 3 > 2", null, null, null,
+                null, null, null);
         Set<Critic> critics = new HashSet<Critic>();
         Set<String> profiles = new HashSet<String>();
         profiles.add(pm.getUMLProfile().getProfileIdentifier());
+        critics.add(critic);
 
         Profile profile = new UserDefinedProfile("displayName", profileFile
                 .toURI().toURL(), critics, profiles);
 
         assertEquals(profile.getDisplayName(), "displayName");
         assertTrue(profile.getDependencies().contains(pm.getUMLProfile()));
+        assertTrue(profile.getCritics().contains(critic));
     }
 }

Copied: trunk/src/argouml-app/tests/org/argouml/profile/internal/ocl/TestDefaultOclEvaluator.java (from r16438, /branches/gsoc2008/work_issue5042_merged15552_maurelio1234/tests/org/argouml/profile/internal/ocl/TestDefaultOclEvaluator.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/profile/internal/ocl/TestDefaultOclEvaluator.java?view=diff&pathrev=16440&r1=16438&r2=16440
==============================================================================
--- /branches/gsoc2008/work_issue5042_merged15552_maurelio1234/tests/org/argouml/profile/internal/ocl/TestDefaultOclEvaluator.java	(original)
+++ trunk/src/argouml-app/tests/org/argouml/profile/internal/ocl/TestDefaultOclEvaluator.java	2008-12-23 18:39:12-0800
@@ -28,6 +28,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import junit.framework.TestCase;
@@ -43,7 +44,8 @@
  * @author maurelio1234
  */
 public class TestDefaultOclEvaluator extends TestCase {
-
+    
+    @SuppressWarnings("unused")
     private class DummyModelInterpreter implements ModelInterpreter {
 
         /**
@@ -53,12 +55,12 @@
             return null;
         }
 
-        /**
-         * @see org.argouml.profile.internal.ocl.ModelInterpreter#invokeFeature(java.util.HashMap,
-         *      java.lang.Object, java.lang.String, java.lang.String,
-         *      java.lang.Object[])
-         */
         public Object invokeFeature(HashMap<String, Object> vt, Object subject,
+                 String feature, String type, Object[] parameters) {
+            return null;
+        }
+
+        public Object invokeFeature(Map<String, Object> vt, Object subject,
                 String feature, String type, Object[] parameters) {
             return null;
         }
@@ -163,8 +165,8 @@
         assertEquals(DefaultOclEvaluator.getInstance().evaluate(vt, mi,
             "x.oclIsTypeOf(Interface)"), true);
         
-        assertEquals(DefaultOclEvaluator.getInstance().evaluate(vt, mi,
-                "x.oclIsKindOf(Classifier)"), true);               
+//        assertEquals(DefaultOclEvaluator.getInstance().evaluate(vt, mi,
+//                "x.oclIsKindOf(Classifier)"), true);               
     }
 
     // TODO do tests for allInstances (8.5.11),

Copied: trunk/src/argouml-app/tests/org/argouml/profile/internal/ocl/TestOclInterpreter.java (from r16438, /branches/gsoc2008/work_issue5042_merged15552_maurelio1234/tests/org/argouml/profile/internal/ocl/TestOclInterpreter.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/profile/internal/ocl/TestOclInterpreter.java?view=diff&pathrev=16440&r1=16438&r2=16440
==============================================================================
--- /branches/gsoc2008/work_issue5042_merged15552_maurelio1234/tests/org/argouml/profile/internal/ocl/TestOclInterpreter.java	(original)
+++ trunk/src/argouml-app/tests/org/argouml/profile/internal/ocl/TestOclInterpreter.java	2008-12-23 18:39:12-0800
@@ -25,6 +25,7 @@
 package org.argouml.profile.internal.ocl;
 
 import java.util.HashMap;
+import java.util.Map;
 
 import junit.framework.TestCase;
 
@@ -38,6 +39,7 @@
  */
 public class TestOclInterpreter extends TestCase {
 
+    @SuppressWarnings("unused")
     private class DefaultModelInterpreter implements ModelInterpreter {
         public Object invokeFeature(HashMap<String, Object> vt, Object subject,
                 String feature, String type, Object[] parameters) {
@@ -47,6 +49,11 @@
         public Object getBuiltInSymbol(String sym) {
             return null;
         }
+
+        public Object invokeFeature(Map<String, Object> vt, Object subject,
+                String feature, String type, Object[] parameters) {
+            return null;
+        }
     }
 
     @Override

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

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