Author: vhennebert
Date: Fri Jul 18 13:42:05 2014
New Revision: 1611648
URL: http://svn.apache.org/r1611648
Log:
Cleaned up and re-organized PS gradient test case
Added:
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/render/ps/svg/GradientTestCase.java
(with props)
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/render/ps/svg/expected-linear-gradient.ps
- copied, changed from r1610965,
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/render/ps/svg/axial-shading-expected.dat
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/render/ps/svg/expected-radial-gradient.ps
- copied, changed from r1610965,
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/render/ps/svg/expected.ps
Removed:
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/render/ps/svg/PSSVGGraphics2DTestCase.java
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/render/ps/svg/PSSVGLinearGraphics2DTestCase.java
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/render/ps/svg/axial-shading-expected.dat
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/render/ps/svg/expected.ps
Modified:
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/build.xml
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/build.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/build.xml?rev=1611648&r1=1611647&r2=1611648&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/build.xml (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/build.xml Fri Jul 18
13:42:05 2014
@@ -732,6 +732,7 @@ list of possible build targets.
<include name="**/*.fo"/>
<include name="**/BidiTestData*.ser"/>
<include name="**/*.afp"/>
+ <include name="**/*.ps"/>
<include name="**/*.xsl"/>
</fileset>
<fileset dir="${build.dir}/test-gensrc">
Added:
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/render/ps/svg/GradientTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/render/ps/svg/GradientTestCase.java?rev=1611648&view=auto
==============================================================================
---
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/render/ps/svg/GradientTestCase.java
(added)
+++
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/render/ps/svg/GradientTestCase.java
Fri Jul 18 13:42:05 2014
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
+package org.apache.fop.render.ps.svg;
+
+import java.awt.Color;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+import org.apache.commons.io.IOUtils;
+
+import org.apache.batik.ext.awt.LinearGradientPaint;
+import org.apache.batik.ext.awt.MultipleGradientPaint;
+import org.apache.batik.ext.awt.RadialGradientPaint;
+
+import org.apache.xmlgraphics.java2d.GraphicContext;
+import org.apache.xmlgraphics.ps.PSGenerator;
+
+public class GradientTestCase {
+
+ @Test
+ public void testLinearGradient() throws IOException {
+ float[] fractions = {0f, 1f};
+ Color[] colors = {new Color(255, 255, 0), new Color(255, 0, 0)};
+ LinearGradientPaint gradient = new LinearGradientPaint(115f, 285f,
15f, 15f, fractions, colors);
+ testGradientRendering(gradient, "expected-linear-gradient.ps");
+ }
+
+ @Test
+ public void testRadialGradient() throws IOException {
+ float cx = 840f;
+ float cy = 180f;
+ float r = 16f;
+ float[] fractions = {0.2f, 0.6f, 0.8f, 1.0f};
+ Color[] colors = {
+ new Color(255, 255, 255),
+ new Color(200, 200, 200),
+ new Color(170, 170, 170),
+ new Color(140, 140, 140)};
+ RadialGradientPaint gradient = new RadialGradientPaint(cx, cy, r,
fractions, colors);
+ testGradientRendering(gradient, "expected-radial-gradient.ps");
+ }
+
+ private void testGradientRendering(MultipleGradientPaint gradient, String
expectedResourceName)
+ throws IOException {
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ PSSVGGraphics2D svgGraphics2D = new PSSVGGraphics2D(false, new
PSGenerator(out));
+ svgGraphics2D.setGraphicContext(new GraphicContext());
+ svgGraphics2D.applyPaint(gradient, true);
+ byte[] actual = out.toByteArray();
+ byte[] expected =
IOUtils.toByteArray(getClass().getResourceAsStream(expectedResourceName));
+ assertEquals(new String(expected, "US-ASCII"), new String(actual,
"US-ASCII"));
+ }
+
+}
Propchange:
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/render/ps/svg/GradientTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/render/ps/svg/GradientTestCase.java
------------------------------------------------------------------------------
svn:keywords = Revision Id
Copied:
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/render/ps/svg/expected-linear-gradient.ps
(from r1610965,
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/render/ps/svg/axial-shading-expected.dat)
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/render/ps/svg/expected-linear-gradient.ps?p2=xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/render/ps/svg/expected-linear-gradient.ps&p1=xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/render/ps/svg/axial-shading-expected.dat&r1=1610965&r2=1611648&rev=1611648&view=diff
==============================================================================
---
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/render/ps/svg/axial-shading-expected.dat
(original)
+++
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/render/ps/svg/expected-linear-gradient.ps
Fri Jul 18 13:42:05 2014
@@ -3,24 +3,24 @@
/Type /Pattern
/PatternType 2
/Shading <<
-/ShadingType 2
-/ColorSpace /DeviceRGB
- /Coords [ 115 285 15 15 ]
- /Domain [ 0 1 ]
- /Extend [ true true ]
- /Function <<
-/FunctionType 3
+/ShadingType 2
+/ColorSpace /DeviceRGB
+/Coords [ 115 285 15 15 ]
/Domain [ 0 1 ]
-/Functions [ <<
-/FunctionType 2
-/Domain [ 0 1 ]
-/C0 [ 1 1 0 ]
-/C1 [ 1 0 0 ]
-/N 1
->> ]
-/Encode [ 0 1 ]
+/Extend [ true true ]
+/Function <<
+/FunctionType 3
+/Domain [ 0 1 ]
+/Functions [ <<
+/FunctionType 2
+/Domain [ 0 1 ]
+/C0 [ 1 1 0 ]
+/C1 [ 1 0 0 ]
+/N 1
+>> ]
+/Encode [ 0 1 ]
/Bounds [ ]
+>>
>>
>>
->>
-matrix makepattern setcolor
+[ 1 0 0 1 0 0 ] makepattern setcolor
Copied:
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/render/ps/svg/expected-radial-gradient.ps
(from r1610965,
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/render/ps/svg/expected.ps)
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/render/ps/svg/expected-radial-gradient.ps?p2=xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/render/ps/svg/expected-radial-gradient.ps&p1=xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/render/ps/svg/expected.ps&r1=1610965&r2=1611648&rev=1611648&view=diff
==============================================================================
---
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/render/ps/svg/expected.ps
(original)
+++
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/test/java/org/apache/fop/render/ps/svg/expected-radial-gradient.ps
Fri Jul 18 13:42:05 2014
@@ -3,36 +3,42 @@
/Type /Pattern
/PatternType 2
/Shading <<
-/ShadingType 3
-/ColorSpace /DeviceRGB
- /Coords [ 841.890991 178.582993 3.28662 841.890991 178.582993 16.4331 ]
- /Domain [ 0 1 ]
- /Extend [ true true ]
- /Function <<
-/FunctionType 3
+/ShadingType 3
+/ColorSpace /DeviceRGB
+/Coords [ 840 180 0 840 180 16 ]
/Domain [ 0 1 ]
-/Functions [ <<
-/FunctionType 2
-/Domain [ 0 1 ]
-/C0 [ 1 1 1 ]
-/C1 [ 0.784314 0.784314 0.784314 ]
-/N 1
->> <<
-/FunctionType 2
-/Domain [ 0 1 ]
-/C0 [ 0.784314 0.784314 0.784314 ]
-/C1 [ 0.666667 0.666667 0.666667 ]
-/N 1
->> <<
-/FunctionType 2
-/Domain [ 0 1 ]
-/C0 [ 0.666667 0.666667 0.666667 ]
-/C1 [ 0.54902 0.54902 0.54902 ]
-/N 1
->> ]
-/Encode [ 0 1 0 1 0 1 ]
-/Bounds [ 0.6012 0.8094 ]
->>
+/Extend [ true true ]
+/Function <<
+/FunctionType 3
+/Domain [ 0 1 ]
+/Functions [ <<
+/FunctionType 2
+/Domain [ 0 1 ]
+/C0 [ 1 1 1 ]
+/C1 [ 1 1 1 ]
+/N 1
+>> <<
+/FunctionType 2
+/Domain [ 0 1 ]
+/C0 [ 1 1 1 ]
+/C1 [ 0.784 0.784 0.784 ]
+/N 1
+>> <<
+/FunctionType 2
+/Domain [ 0 1 ]
+/C0 [ 0.784 0.784 0.784 ]
+/C1 [ 0.667 0.667 0.667 ]
+/N 1
+>> <<
+/FunctionType 2
+/Domain [ 0 1 ]
+/C0 [ 0.667 0.667 0.667 ]
+/C1 [ 0.549 0.549 0.549 ]
+/N 1
+>> ]
+/Encode [ 0 1 0 1 0 1 0 1 ]
+/Bounds [ 0.2 0.6 0.8 ]
+>>
>>
>>
-matrix makepattern setcolor
+[ 1 0 0 1 0 0 ] makepattern setcolor
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
