[509305] Use HSV2HSL for a serialize test

3 files changed, 13 insertions, 11 deletions

diff --git a/tests/org.eclipse.qvtd.xtext.qvtbase.tests/src/org/eclipse/qvtd/xtext/qvtbase/tests/XtextTestCase.java b/tests/org.eclipse.qvtd.xtext.qvtbase.tests/src/org/eclipse/qvtd/xtext/qvtbase/tests/XtextTestCase.java
index bee167898..05e6a9555 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtbase.tests/src/org/eclipse/qvtd/xtext/qvtbase/tests/XtextTestCase.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtbase.tests/src/org/eclipse/qvtd/xtext/qvtbase/tests/XtextTestCase.java
@@ -47,7 +47,6 @@ import org.eclipse.ocl.pivot.Variable;
 import org.eclipse.ocl.pivot.VariableExp;
 import org.eclipse.ocl.pivot.internal.StandardLibraryImpl;
 import org.eclipse.ocl.pivot.internal.library.StandardLibraryContribution;
-import org.eclipse.ocl.pivot.internal.utilities.PivotUtilInternal;
 import org.eclipse.ocl.pivot.model.OCLstdlib;
 import org.eclipse.ocl.pivot.utilities.PivotConstants;
 import org.eclipse.ocl.pivot.utilities.PivotStandaloneSetup;
@@ -211,7 +210,7 @@ public class XtextTestCase extends PivotTestCase
 			return false;
 		}
 		if (pivotElement instanceof TupleType) {
-			return PivotUtilInternal.isLibraryType((TupleType)pivotElement);
+			return false;
 		}
 		if (pivotElement instanceof Type) {
 			EObject eContainer = pivotElement.eContainer();
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcSerializeTests.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcSerializeTests.java
index 30edb54d4..95408c6f5 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcSerializeTests.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/QVTcSerializeTests.java
@@ -144,6 +144,10 @@ public class QVTcSerializeTests extends LoadTestCase
 		doSerializeRoundTripFromCS("Class2RDBMS/Class2RDBMS");
 	}
 
+	public void testSerialize_HSV2HSL() throws Exception {
+		doSerializeRoundTripFromCS("hsv2hsl/HSV2HSL");
+	}
+
 	public void testSerialize_platformResource_BaseCS2AS() throws Exception {
 		doSerializeRoundTripFromCS("platformResource/org.eclipse.ocl.xtext.base/model/BaseCS2AS.qvtp");
 	}
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hsl/HSV2HSL.qvtc b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hsl/HSV2HSL.qvtc
index dec3df8d0..35dd67293 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hsl/HSV2HSL.qvtc
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hsl/HSV2HSL.qvtc
@@ -89,7 +89,7 @@ map HSV2HSLRecursion in hsv2hsl
 
 query hsv2hsl::hsl2rgb(color : HSLTree::HSL) : HSV2HSL::RGB[1]
 {
-	color
+	HSV2HSL::RGB{value=color}
 }
 
 query hsv2hsl::hsv2rgb(color : HSVTree::HSV) : HSV2HSL::RGB[1]
@@ -104,12 +104,12 @@ query hsv2hsl::hsv2rgb(color : HSVTree::HSV) : HSV2HSL::RGB[1]
 	let x : Real = c * (1 - (hh2 - 1).abs()) in
 	let m : Real = v -c in
 	let t : Tuple(r:Real,g:Real,b:Real) =
-	if h < 60 then Tuple{r=c,g=x,b=0}
-	elseif h < 120 then Tuple{r=x,g=c,b=0}
-	elseif h < 180 then Tuple{r=0,g=c,b=x}
-	elseif h < 240 then Tuple{r=0,g=x,b=c}
-	elseif h < 300 then Tuple{r=x,g=0,b=c}
-	else Tuple{r=c,g=0,b=x} endif in
+	if h < 60 then Tuple{r=c,g=x,b=0.0}
+	elseif h < 120 then Tuple{r=x,g=c,b=0.0}
+	elseif h < 180 then Tuple{r=0.0,g=c,b=x}
+	elseif h < 240 then Tuple{r=0.0,g=x,b=c}
+	elseif h < 300 then Tuple{r=x,g=0.0,b=c}
+	else Tuple{r=c,g=0.0,b=x} endif in
 	let r = (255 * (t.r + m)).round() in
 	let g = (255 * (t.g + m)).round() in
 	let b = (255 * (t.b + m)).round() in
@@ -137,8 +137,7 @@ query hsv2hsl::rgb2hsl(color : HSV2HSL::RGB) : HSLTree::HSL[1]
 
 query hsv2hsl::rgb2hsv(color : HSV2HSL::RGB) : HSVTree::HSV[1]
 {
-	color
---	HSVTree::HSV{'color'}
+	HSVTree::HSV{value=color}
 }
 
 /*