svn commit: r13681 - trunk/tests/org/argouml: model uml/reveng

Author: tfmorris
Date: 2007-10-11 01:47:00-0700
New Revision: 13681

Modified:
   trunk/tests/org/argouml/model/TestUmlGeneralization.java
   trunk/tests/org/argouml/uml/reveng/TestJavaImportClass.java
   trunk/tests/org/argouml/uml/reveng/TestJavaImportInterface.java

Log:
Clean up usage of deprecated methods

Modified: trunk/tests/org/argouml/model/TestUmlGeneralization.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/model/TestUmlGeneralization.java?view=diff&rev=13681&p1=trunk/tests/org/argouml/model/TestUmlGeneralization.java&p2=trunk/tests/org/argouml/model/TestUmlGeneralization.java&r1=13680&r2=13681
==============================================================================
--- trunk/tests/org/argouml/model/TestUmlGeneralization.java	(original)
+++ trunk/tests/org/argouml/model/TestUmlGeneralization.java	2007-10-11 01:47:00-0700
@@ -59,7 +59,7 @@
         assertNotNull(gen);
         assertTrue(gen.size() == 1);
         assertTrue(gen.contains(gen2));
-        assertTrue(Model.getFacade().getParent(gen2) == class3);
+        assertTrue(Model.getFacade().getGeneral(gen2) == class3);
     }
 
     /**
@@ -71,7 +71,7 @@
         assertNotNull(gen);
         assertTrue(gen.size() == 1);
         assertTrue(gen.contains(gen1));
-        assertTrue(Model.getFacade().getChild(gen1) == class1);
+        assertTrue(Model.getFacade().getSpecific(gen1) == class1);
     }
     
     /**

Modified: trunk/tests/org/argouml/uml/reveng/TestJavaImportClass.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/reveng/TestJavaImportClass.java?view=diff&rev=13681&p1=trunk/tests/org/argouml/uml/reveng/TestJavaImportClass.java&p2=trunk/tests/org/argouml/uml/reveng/TestJavaImportClass.java&r1=13680&r2=13681
==============================================================================
--- trunk/tests/org/argouml/uml/reveng/TestJavaImportClass.java	(original)
+++ trunk/tests/org/argouml/uml/reveng/TestJavaImportClass.java	2007-10-11 01:47:00-0700
@@ -58,6 +58,7 @@
     /*
      * @see junit.framework.TestCase#setUp()
      */
+    @Override
     protected void setUp() {
         if (isParsed) {
             return;
@@ -203,11 +204,11 @@
         assertEquals("The generalization name is wrong.",
             "TestClass -> Object", Model.getFacade().getName(generalization));
         assertEquals("The child of the generalization should be the class.",
-            parsedClass, Model.getFacade().getChild(generalization));
+            parsedClass, Model.getFacade().getSpecific(generalization));
         assertEquals("The parent of the generalization should be \"Object\".",
             "Object",
             Model.getFacade().getName(
-                        Model.getFacade().getParent(generalization)));
+                        Model.getFacade().getGeneral(generalization)));
         Collection dependencies =
             Model.getFacade().getClientDependencies(parsedClass);
         assertNotNull("No dependencies found for class.", dependencies);

Modified: trunk/tests/org/argouml/uml/reveng/TestJavaImportInterface.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/reveng/TestJavaImportInterface.java?view=diff&rev=13681&p1=trunk/tests/org/argouml/uml/reveng/TestJavaImportInterface.java&p2=trunk/tests/org/argouml/uml/reveng/TestJavaImportInterface.java&r1=13680&r2=13681
==============================================================================
--- trunk/tests/org/argouml/uml/reveng/TestJavaImportInterface.java	(original)
+++ trunk/tests/org/argouml/uml/reveng/TestJavaImportInterface.java	2007-10-11 01:47:00-0700
@@ -58,6 +58,7 @@
     /*
      * @see junit.framework.TestCase#setUp()
      */
+    @Override
     protected void setUp() {
         if (isParsed) {
             return;
@@ -205,11 +206,11 @@
             "TestInterface -> Observer",
             Model.getFacade().getName(generalization));
         assertEquals("The child of the generalization should be the interface.",
-            parsedInterface, Model.getFacade().getChild(generalization));
+            parsedInterface, Model.getFacade().getSpecific(generalization));
         assertEquals(
                 "The parent of the generalization should be \"Observer\".",
                 "Observer", Model.getFacade().getName(
-                        Model.getFacade().getParent(generalization)));
+                        Model.getFacade().getGeneral(generalization)));
     }
 
     /**