1 files changed, 10 insertions, 19 deletions

diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/Graph2GraphHierarchical/Graph2GraphHierarchical.qvti b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/Graph2GraphHierarchical/Graph2GraphHierarchical.qvti
index c357161dd..5da7e73ce 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/Graph2GraphHierarchical/Graph2GraphHierarchical.qvti
+++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/Graph2GraphHierarchical/Graph2GraphHierarchical.qvti
@@ -9,7 +9,6 @@ transformation CopyGraph {
 
 map __root__ in CopyGraph {
     
-    where () {}
     for g1 : SimpleGraph::Graph in SimpleGraph::Graph.allInstances() {
         call Graph2Middle {
             g1 := g1;
@@ -22,10 +21,8 @@ map Graph2Middle in CopyGraph {	        					-- L to M for G
     enforce middle() {
         realize middleG2G:Graph2Graph
     }
-    where () {
-        middleG2G.graph1 := g1;
-        middleG2G.name := g1.name.toLowerCase();
-    }
+    set middleG2G.graph1 := g1;
+    set middleG2G.name := g1.name.toLowerCase();
     for child in g1.element->select(e | e.oclIsTypeOf(simplegraph::Node)) {
 	    call Node2Middle {
 	    	n1 := child;
@@ -42,11 +39,9 @@ map Node2Middle in CopyGraph {    							-- L to M for N
     enforce middle(middleParent:Graph2Graph) {
     	realize n2n:Node2Node
     }
-    where () {
-        n2n.owner := middleParent;
-        n2n.node1 := n1;
-        n2n.label := n1.label.toLowerCase();
-    }
+    set n2n.owner := middleParent;
+    set n2n.node1 := n1;
+    set n2n.label := n1.label.toLowerCase();
 }
 	
 map Middle2Graph in CopyGraph {								-- M to R for G
@@ -54,10 +49,8 @@ map Middle2Graph in CopyGraph {								-- M to R for G
 	enforce lowerGraph() {
         realize g2:Graph
     }
-    where () {
-    	g2Gmiddle.graph2 := g2;
-        g2.name := g2Gmiddle.name;
-    }
+    set	g2Gmiddle.graph2 := g2;
+    set g2.name := g2Gmiddle.name;
     for child in g2Gmiddle.element2Element->select(e2e | e2e.oclIsTypeOf(simplegraph2graph::Node2Node)) {
 	    call Middle2Node {
 	    	n2n := child;
@@ -70,9 +63,7 @@ map Middle2Node in CopyGraph {						        -- M to R for N
 	enforce lowerGraph () {
         realize n2:Node
     }
-    where () {
-    	n2n.node2 := n2;
-		n2.graph := n2n.owner.graph2;
-        n2.label := n2n.label;
-    }
+    set	n2n.node2 := n2;
+	set	n2.graph := n2n.owner.graph2;
+    set n2.label := n2n.label;
 }