ST6RI-795 Added xpect tests to cover some special cases of redefinitions

- Added tests to verify redefinition behavior in diamond shaped
inheritance structures

 - Added test to verify redefinition behavior where the redefining
feature, rather than referencing the tail end of a chain of
redefinitions, references an element along the redefinition chain

org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/validation/invalid/RedefinitionDiamond_Invalid.sysml.xt

@@ -0,0 +1,43 @@
+//* 
+XPECT_SETUP org.omg.sysml.xpect.tests.validation.valid.SysMLTests
+	ResourceSet {
+       ThisFile {}
+        File {from ="/library.kernel/Base.kerml"}
+        File {from ="/library.kernel/Occurrences.kerml"}
+        File {from ="/library.kernel/Objects.kerml"}
+        File {from ="/library.kernel/Performances.kerml"}
+        File {from ="/library.systems/Items.sysml"}
+        File {from ="/library.systems/Parts.sysml"}
+    }
+    Workspace {
+        JavaProject {
+            SrcFolder {
+                ThisFile {}
+		            File {from ="/library.kernel/Base.kerml"}
+		            File {from ="/library.kernel/Occurrences.kerml"}
+		            File {from ="/library.kernel/Objects.kerml"}
+		            File {from ="/library.kernel/Performances.kerml"}
+		            File {from ="/library.systems/Items.sysml"}
+		            File {from ="/library.systems/Parts.sysml"}
+			}
+		}
+	}
+END_SETUP 
+*/
+package RedefinitionDiamond {
+	part A {
+		part p[*];
+	}
+	part A1 :> A {
+		p1 :>> p;
+	}
+	part A2 :> A {
+		p :>> p; // 1
+	}
+
+	part B :> A1, A2 {
+//		p2 :>> p1; // 2
+// XPECT warnings ---> "Duplicate of inherited member name" at "p"
+		part p;
+	}
+}

org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/validation/valid/RedefinitionDiamond0.sysml.xt

@@ -0,0 +1,43 @@
+//* 
+XPECT_SETUP org.omg.sysml.xpect.tests.validation.valid.SysMLTests
+	ResourceSet {
+       ThisFile {}
+        File {from ="/library.kernel/Base.kerml"}
+        File {from ="/library.kernel/Occurrences.kerml"}
+        File {from ="/library.kernel/Objects.kerml"}
+        File {from ="/library.kernel/Performances.kerml"}
+        File {from ="/library.systems/Items.sysml"}
+        File {from ="/library.systems/Parts.sysml"}
+    }
+    Workspace {
+        JavaProject {
+            SrcFolder {
+                ThisFile {}
+		            File {from ="/library.kernel/Base.kerml"}
+		            File {from ="/library.kernel/Occurrences.kerml"}
+		            File {from ="/library.kernel/Objects.kerml"}
+		            File {from ="/library.kernel/Performances.kerml"}
+		            File {from ="/library.systems/Items.sysml"}
+		            File {from ="/library.systems/Parts.sysml"}
+			}
+		}
+	}
+END_SETUP 
+*/
+package RedefinitionDiamond {
+	part A {
+		part p[*];
+	}
+	part A1 :> A {
+		p1 :>> p;
+	}
+	part A2 :> A {
+//		p :>> p; // 1
+	}
+
+	part B :> A1, A2 {
+//		p2 :>> p1; // 2
+// XPECT noErrors ---> ""
+		part p;
+	}
+}

org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/validation/valid/RedefinitionDiamond1.sysml.xt

@@ -0,0 +1,43 @@
+//* 
+XPECT_SETUP org.omg.sysml.xpect.tests.validation.valid.SysMLTests
+	ResourceSet {
+       ThisFile {}
+        File {from ="/library.kernel/Base.kerml"}
+        File {from ="/library.kernel/Occurrences.kerml"}
+        File {from ="/library.kernel/Objects.kerml"}
+        File {from ="/library.kernel/Performances.kerml"}
+        File {from ="/library.systems/Items.sysml"}
+        File {from ="/library.systems/Parts.sysml"}
+    }
+    Workspace {
+        JavaProject {
+            SrcFolder {
+                ThisFile {}
+		            File {from ="/library.kernel/Base.kerml"}
+		            File {from ="/library.kernel/Occurrences.kerml"}
+		            File {from ="/library.kernel/Objects.kerml"}
+		            File {from ="/library.kernel/Performances.kerml"}
+		            File {from ="/library.systems/Items.sysml"}
+		            File {from ="/library.systems/Parts.sysml"}
+			}
+		}
+	}
+END_SETUP 
+*/
+package RedefinitionDiamond {
+	part A {
+		part p[*];
+	}
+	part A1 :> A {
+		p1 :>> p;
+	}
+	part A2 :> A {
+		p :>> p; // 1
+	}
+
+	part B :> A1, A2 {
+		p2 :>> p1; // 2
+// XPECT noErrors ---> ""
+		part p;
+	}
+}

org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/validation/valid/RedefinitionDiamond2.sysml.xt

@@ -0,0 +1,43 @@
+//* 
+XPECT_SETUP org.omg.sysml.xpect.tests.validation.valid.SysMLTests
+	ResourceSet {
+       ThisFile {}
+        File {from ="/library.kernel/Base.kerml"}
+        File {from ="/library.kernel/Occurrences.kerml"}
+        File {from ="/library.kernel/Objects.kerml"}
+        File {from ="/library.kernel/Performances.kerml"}
+        File {from ="/library.systems/Items.sysml"}
+        File {from ="/library.systems/Parts.sysml"}
+    }
+    Workspace {
+        JavaProject {
+            SrcFolder {
+                ThisFile {}
+		            File {from ="/library.kernel/Base.kerml"}
+		            File {from ="/library.kernel/Occurrences.kerml"}
+		            File {from ="/library.kernel/Objects.kerml"}
+		            File {from ="/library.kernel/Performances.kerml"}
+		            File {from ="/library.systems/Items.sysml"}
+		            File {from ="/library.systems/Parts.sysml"}
+			}
+		}
+	}
+END_SETUP 
+*/
+package RedefinitionDiamond {
+	part A {
+		part p[*];
+	}
+	part A1 :> A {
+		p1 :>> p;
+	}
+	part A2 :> A {
+//		p :>> p; // 1
+	}
+
+	part B :> A1, A2 {
+		p2 :>> p1; // 2
+// XPECT noErrors ---> ""
+		part p;
+	}
+}

org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/validation/valid/RedefinitionHopthrough.sysml.xt

@@ -0,0 +1,40 @@
+//* 
+XPECT_SETUP org.omg.sysml.xpect.tests.validation.valid.SysMLTests
+	ResourceSet {
+       ThisFile {}
+        File {from ="/library.kernel/Base.kerml"}
+        File {from ="/library.kernel/Occurrences.kerml"}
+        File {from ="/library.kernel/Objects.kerml"}
+        File {from ="/library.kernel/Performances.kerml"}
+        File {from ="/library.systems/Items.sysml"}
+        File {from ="/library.systems/Parts.sysml"}
+        File {from ="/library.systems/Ports.sysml"}
+    }
+    Workspace {
+        JavaProject {
+            SrcFolder {
+                ThisFile {}
+		            File {from ="/library.kernel/Base.kerml"}
+		            File {from ="/library.kernel/Occurrences.kerml"}
+		            File {from ="/library.kernel/Objects.kerml"}
+		            File {from ="/library.kernel/Performances.kerml"}
+		            File {from ="/library.systems/Items.sysml"}
+		            File {from ="/library.systems/Parts.sysml"}
+		            File {from ="/library.systems/Ports.sysml"}
+			}
+		}
+	}
+END_SETUP 
+*/
+package 'Hop-through' {
+	port p;
+
+	part A {
+		p :>> p;
+	}
+
+	part B :> A {
+// XPECT noErrors ---> ""
+		p :>> 'Hop-through'::p;
+	}
+}