[500254] Use where rather than when for optional corrolary

1 files changed, 10 insertions, 11 deletions

diff --git a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/forward2reverse/Forward2Reverse.qvtr b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/forward2reverse/Forward2Reverse.qvtr
index 22285a78c..98562e939 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/forward2reverse/Forward2Reverse.qvtr
+++ b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/forward2reverse/Forward2Reverse.qvtr
@@ -24,26 +24,25 @@ package org::eclipse::qvtd::xtext::qvtrelation2::tests::forward2reverse {
 		 */
 		top relation list2list {
 			domain forward forwardList : DoublyLinkedList {
-				name = listName : String{},
-				headElement = forwardHead : Element{}
+				name = listName : String{}
 			};	   
 			enforce domain reverse reverseList : DoublyLinkedList {
-				name = listName,
-				headElement = reverseHead : Element{}
+				name = listName
 			};
-			when {
-				element2element(forwardHead, reverseHead);
+			where {
+				listHead2listHead(forwardList, reverseList);
 			}
 		}
-		top relation emptyList2emptyList {
+		relation listHead2listHead {
 			domain forward forwardList : DoublyLinkedList {
-				name = listName : String{},
-				headElement = null
+				headElement = forwardHead : Element{}
 			};	   
 			enforce domain reverse reverseList : DoublyLinkedList {
-				name = listName,
-				headElement = null
+				headElement = reverseHead : Element{}
 			};
+			when {
+				element2element(forwardHead, reverseHead);
+			}
 		}
 	
 		/**