[185602] Making ConnectableElement::end, Vertex::incoming, Vertex::outgoing derived; up-versioning namespace URI.

6 files changed, 102 insertions, 12 deletions

diff --git a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ConnectableElementTest.java b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ConnectableElementTest.java
index ad5945c15..130fdf3ad 100644
--- a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ConnectableElementTest.java
+++ b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ConnectableElementTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *
- * $Id: ConnectableElementTest.java,v 1.4 2007/02/14 20:06:13 khussey Exp $
+ * $Id: ConnectableElementTest.java,v 1.5 2007/05/04 20:35:57 khussey Exp $
  */
 package org.eclipse.uml2.uml.tests;
 
@@ -19,6 +19,12 @@ import org.eclipse.uml2.uml.ConnectableElement;
  * A test case for the model object '<em><b>Connectable Element</b></em>'.
  * <!-- end-user-doc -->
  * <p>
+ * The following features are tested:
+ * <ul>
+ *   <li>{@link org.eclipse.uml2.uml.ConnectableElement#getEnds() <em>End</em>}</li>
+ * </ul>
+ * </p>
+ * <p>
  * The following operations are tested:
  * <ul>
  *   <li>{@link org.eclipse.uml2.uml.ParameterableElement#isCompatibleWith(org.eclipse.uml2.uml.ParameterableElement) <em>Is Compatible With</em>}</li>
@@ -52,6 +58,18 @@ public abstract class ConnectableElementTest
 	}
 
 	/**
+	 * Tests the '{@link org.eclipse.uml2.uml.ConnectableElement#getEnds() <em>End</em>}' feature getter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.uml2.uml.ConnectableElement#getEnds()
+	 * @generated
+	 */
+	public void testGetEnds() {
+		// TODO: implement this feature getter test method
+		// Ensure that you remove @generated or mark it @generated NOT
+	}
+
+	/**
 	 * Tests the '{@link org.eclipse.uml2.uml.ParameterableElement#isCompatibleWith(org.eclipse.uml2.uml.ParameterableElement) <em>Is Compatible With</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ElementTest.java b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ElementTest.java
index 7dd473a1c..e481b8789 100644
--- a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ElementTest.java
+++ b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/ElementTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *
- * $Id: ElementTest.java,v 1.8 2007/02/14 20:06:12 khussey Exp $
+ * $Id: ElementTest.java,v 1.9 2007/05/04 20:35:57 khussey Exp $
  */
 package org.eclipse.uml2.uml.tests;
 
@@ -92,6 +92,8 @@ import org.eclipse.uml2.uml.util.UMLSwitch;
 public abstract class ElementTest
 		extends TestCase {
 
+	protected static final String UML2_UML_PACKAGE_2_0_NS_URI = "http://www.eclipse.org/uml2/2.0.0/UML"; //$NON-NLS-1$
+
 	/**
 	 * The fixture for this Element test case.
 	 * <!-- begin-user-doc -->
@@ -297,7 +299,7 @@ public abstract class ElementTest
 	public void testHasKeyword__String() {
 		assertFalse(getFixture().hasKeyword(getName()));
 
-		UML2Util.createEAnnotation(getFixture(), UMLPackage.eNS_URI)
+		UML2Util.createEAnnotation(getFixture(), UML2_UML_PACKAGE_2_0_NS_URI)
 			.getDetails().put(getName(), null);
 
 		assertTrue(getFixture().hasKeyword(getName()));
@@ -313,7 +315,7 @@ public abstract class ElementTest
 	public void testGetKeywords() {
 		assertTrue(getFixture().getKeywords().isEmpty());
 
-		UML2Util.createEAnnotation(getFixture(), UMLPackage.eNS_URI)
+		UML2Util.createEAnnotation(getFixture(), UML2_UML_PACKAGE_2_0_NS_URI)
 			.getDetails().put(getName(), null);
 
 		assertTrue(getFixture().getKeywords().contains(getName()));
@@ -327,12 +329,12 @@ public abstract class ElementTest
 	 * @generated NOT
 	 */
 	public void testAddKeyword__String() {
-		assertNull(getFixture().getEAnnotation(UMLPackage.eNS_URI));
+		assertNull(getFixture().getEAnnotation(UML2_UML_PACKAGE_2_0_NS_URI));
 
 		assertTrue(getFixture().addKeyword(getName()));
 
 		EAnnotation eAnnotation = getFixture().getEAnnotation(
-			UMLPackage.eNS_URI);
+			UML2_UML_PACKAGE_2_0_NS_URI);
 		assertNotNull(eAnnotation);
 		assertTrue(eAnnotation.getDetails().containsKey(getName()));
 
@@ -353,7 +355,7 @@ public abstract class ElementTest
 		assertFalse(getFixture().removeKeyword(getName()));
 
 		EAnnotation eAnnotation = UML2Util.createEAnnotation(getFixture(),
-			UMLPackage.eNS_URI);
+			UML2_UML_PACKAGE_2_0_NS_URI);
 		eAnnotation.getDetails().put(getName(), null);
 
 		assertTrue(getFixture().removeKeyword(getName()));
diff --git a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/PropertyTest.java b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/PropertyTest.java
index 9e2546e46..265444410 100644
--- a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/PropertyTest.java
+++ b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/PropertyTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *
- * $Id: PropertyTest.java,v 1.11 2007/02/14 20:06:14 khussey Exp $
+ * $Id: PropertyTest.java,v 1.12 2007/05/04 20:35:57 khussey Exp $
  */
 package org.eclipse.uml2.uml.tests;
 
@@ -35,6 +35,7 @@ import org.eclipse.uml2.uml.ValueSpecification;
  * <p>
  * The following features are tested:
  * <ul>
+ *   <li>{@link org.eclipse.uml2.uml.ConnectableElement#getEnds() <em>End</em>}</li>
  *   <li>{@link org.eclipse.uml2.uml.DeploymentTarget#getDeployedElements() <em>Deployed Element</em>}</li>
  *   <li>{@link org.eclipse.uml2.uml.Property#getClass_() <em>Class</em>}</li>
  *   <li>{@link org.eclipse.uml2.uml.Property#getDefault() <em>Default</em>}</li>
@@ -132,6 +133,18 @@ public class PropertyTest
 	}
 
 	/**
+	 * Tests the '{@link org.eclipse.uml2.uml.ConnectableElement#getEnds() <em>End</em>}' feature getter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.uml2.uml.ConnectableElement#getEnds()
+	 * @generated
+	 */
+	public void testGetEnds() {
+		// TODO: implement this feature getter test method
+		// Ensure that you remove @generated or mark it @generated NOT
+	}
+
+	/**
 	 * Tests the '{@link org.eclipse.uml2.uml.DeploymentTarget#getDeployedElements() <em>Deployed Element</em>}' feature getter.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/StateTest.java b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/StateTest.java
index 03c0067e1..75ff86e37 100644
--- a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/StateTest.java
+++ b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/StateTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *
- * $Id: StateTest.java,v 1.6 2007/02/14 20:06:12 khussey Exp $
+ * $Id: StateTest.java,v 1.7 2007/05/04 20:35:57 khussey Exp $
  */
 package org.eclipse.uml2.uml.tests;
 
@@ -25,6 +25,8 @@ import org.eclipse.uml2.uml.UMLFactory;
  * The following features are tested:
  * <ul>
  *   <li>{@link org.eclipse.uml2.uml.State#getRedefinitionContexts() <em>Redefinition Context</em>}</li>
+ *   <li>{@link org.eclipse.uml2.uml.Vertex#getIncomings() <em>Incoming</em>}</li>
+ *   <li>{@link org.eclipse.uml2.uml.Vertex#getOutgoings() <em>Outgoing</em>}</li>
  *   <li>{@link org.eclipse.uml2.uml.State#isComposite() <em>Is Composite</em>}</li>
  *   <li>{@link org.eclipse.uml2.uml.State#isOrthogonal() <em>Is Orthogonal</em>}</li>
  *   <li>{@link org.eclipse.uml2.uml.State#isSimple() <em>Is Simple</em>}</li>
@@ -119,6 +121,30 @@ public class StateTest
 	}
 
 	/**
+	 * Tests the '{@link org.eclipse.uml2.uml.Vertex#getIncomings() <em>Incoming</em>}' feature getter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.uml2.uml.Vertex#getIncomings()
+	 * @generated
+	 */
+	public void testGetIncomings() {
+		// TODO: implement this feature getter test method
+		// Ensure that you remove @generated or mark it @generated NOT
+	}
+
+	/**
+	 * Tests the '{@link org.eclipse.uml2.uml.Vertex#getOutgoings() <em>Outgoing</em>}' feature getter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.uml2.uml.Vertex#getOutgoings()
+	 * @generated
+	 */
+	public void testGetOutgoings() {
+		// TODO: implement this feature getter test method
+		// Ensure that you remove @generated or mark it @generated NOT
+	}
+
+	/**
 	 * Tests the '{@link org.eclipse.uml2.uml.State#isComposite() <em>Is Composite</em>}' feature getter.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/UMLTests.java b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/UMLTests.java
index 94576dd63..573b9d02c 100644
--- a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/UMLTests.java
+++ b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/UMLTests.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *
- * $Id: UMLTests.java,v 1.3 2007/03/27 03:40:24 khussey Exp $
+ * $Id: UMLTests.java,v 1.4 2007/05/04 20:35:57 khussey Exp $
  */
 package org.eclipse.uml2.uml.tests;
 
@@ -60,6 +60,7 @@ public class UMLTests
 		suite.addTestSuite(AbstractionTest.class);
 		suite.addTestSuite(OpaqueExpressionTest.class);
 		suite.addTestSuite(ParameterTest.class);
+		suite.addTestSuite(ConnectableElementTemplateParameterTest.class);
 		suite.addTestSuite(ConnectorEndTest.class);
 		suite.addTestSuite(PropertyTest.class);
 		suite.addTestSuite(DeploymentTest.class);
@@ -92,7 +93,6 @@ public class UMLTests
 		suite.addTestSuite(ParameterSetTest.class);
 		suite.addTestSuite(DataTypeTest.class);
 		suite.addTestSuite(OperationTemplateParameterTest.class);
-		suite.addTestSuite(ConnectableElementTemplateParameterTest.class);
 		suite.addTestSuite(CollaborationUseTest.class);
 		suite.addTestSuite(CollaborationTest.class);
 		suite.addTestSuite(UseCaseTest.class);
diff --git a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/VertexTest.java b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/VertexTest.java
index 31f96a269..d89d14a69 100644
--- a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/VertexTest.java
+++ b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/tests/VertexTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - initial API and implementation
  *
- * $Id: VertexTest.java,v 1.4 2007/02/14 20:06:14 khussey Exp $
+ * $Id: VertexTest.java,v 1.5 2007/05/04 20:35:57 khussey Exp $
  */
 package org.eclipse.uml2.uml.tests;
 
@@ -19,6 +19,13 @@ import org.eclipse.uml2.uml.Vertex;
  * A test case for the model object '<em><b>Vertex</b></em>'.
  * <!-- end-user-doc -->
  * <p>
+ * The following features are tested:
+ * <ul>
+ *   <li>{@link org.eclipse.uml2.uml.Vertex#getIncomings() <em>Incoming</em>}</li>
+ *   <li>{@link org.eclipse.uml2.uml.Vertex#getOutgoings() <em>Outgoing</em>}</li>
+ * </ul>
+ * </p>
+ * <p>
  * The following operations are tested:
  * <ul>
  *   <li>{@link org.eclipse.uml2.uml.Vertex#containingStateMachine() <em>Containing State Machine</em>}</li>
@@ -51,6 +58,30 @@ public abstract class VertexTest
 	}
 
 	/**
+	 * Tests the '{@link org.eclipse.uml2.uml.Vertex#getIncomings() <em>Incoming</em>}' feature getter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.uml2.uml.Vertex#getIncomings()
+	 * @generated
+	 */
+	public void testGetIncomings() {
+		// TODO: implement this feature getter test method
+		// Ensure that you remove @generated or mark it @generated NOT
+	}
+
+	/**
+	 * Tests the '{@link org.eclipse.uml2.uml.Vertex#getOutgoings() <em>Outgoing</em>}' feature getter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.uml2.uml.Vertex#getOutgoings()
+	 * @generated
+	 */
+	public void testGetOutgoings() {
+		// TODO: implement this feature getter test method
+		// Ensure that you remove @generated or mark it @generated NOT
+	}
+
+	/**
 	 * Tests the '{@link org.eclipse.uml2.uml.Vertex#containingStateMachine() <em>Containing State Machine</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->