Modified: xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/bitmap/AbstractBitmapRendererConfiguratorTest.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/bitmap/AbstractBitmapRendererConfiguratorTest.java?rev=1353992&r1=1353991&r2=1353992&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/bitmap/AbstractBitmapRendererConfiguratorTest.java (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/bitmap/AbstractBitmapRendererConfiguratorTest.java Tue Jun 26 12:31:50 2012 @@ -28,13 +28,13 @@ import org.apache.fop.apps.BitmapRendere import org.apache.fop.render.intermediate.IFDocumentHandler; import org.apache.fop.util.ColorUtil; -import static org.apache.fop.render.bitmap.BitmapRendererConfigOption.COLOR_MODE_BILEVEL; -import static org.apache.fop.render.bitmap.BitmapRendererConfigOption.COLOR_MODE_BINARY; -import static org.apache.fop.render.bitmap.BitmapRendererConfigOption.COLOR_MODE_GRAY; -import static org.apache.fop.render.bitmap.BitmapRendererConfigOption.COLOR_MODE_RGB; -import static org.apache.fop.render.bitmap.BitmapRendererConfigOption.COLOR_MODE_RGBA; -import static org.apache.fop.render.bitmap.BitmapRendererConfigOption.RENDERING_QUALITY; -import static org.apache.fop.render.bitmap.BitmapRendererConfigOption.RENDERING_SPEED; +import static org.apache.fop.render.bitmap.BitmapRendererOption.COLOR_MODE_BILEVEL; +import static org.apache.fop.render.bitmap.BitmapRendererOption.COLOR_MODE_BINARY; +import static org.apache.fop.render.bitmap.BitmapRendererOption.COLOR_MODE_GRAY; +import static org.apache.fop.render.bitmap.BitmapRendererOption.COLOR_MODE_RGB; +import static org.apache.fop.render.bitmap.BitmapRendererOption.COLOR_MODE_RGBA; +import static org.apache.fop.render.bitmap.BitmapRendererOption.RENDERING_QUALITY; +import static org.apache.fop.render.bitmap.BitmapRendererOption.RENDERING_SPEED; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue;
Modified: xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pcl/PCLRendererConfBuilder.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pcl/PCLRendererConfBuilder.java?rev=1353992&r1=1353991&r2=1353992&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pcl/PCLRendererConfBuilder.java (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pcl/PCLRendererConfBuilder.java Tue Jun 26 12:31:50 2012 @@ -23,9 +23,9 @@ package org.apache.fop.render.pcl; import org.apache.fop.apps.FopConfBuilder.RendererConfBuilder; import org.apache.fop.apps.MimeConstants; -import static org.apache.fop.render.pcl.Java2DRendererConfigOption.DISABLE_PJL; -import static org.apache.fop.render.pcl.Java2DRendererConfigOption.RENDERING_MODE; -import static org.apache.fop.render.pcl.Java2DRendererConfigOption.TEXT_RENDERING; +import static org.apache.fop.render.pcl.Java2DRendererOption.DISABLE_PJL; +import static org.apache.fop.render.pcl.Java2DRendererOption.RENDERING_MODE; +import static org.apache.fop.render.pcl.Java2DRendererOption.TEXT_RENDERING; /** * A config builder specific to a particular renderer for specific MIME type. */ @@ -51,7 +51,7 @@ public final class PCLRendererConfBuilde return createTextElement(DISABLE_PJL, String.valueOf(value)); } - private PCLRendererConfBuilder createTextElement(Java2DRendererConfigOption option, String value) { + private PCLRendererConfBuilder createTextElement(Java2DRendererOption option, String value) { createTextElement(option.getName(), value); return this; } Modified: xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java?rev=1353992&r1=1353991&r2=1353992&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java Tue Jun 26 12:31:50 2012 @@ -19,8 +19,6 @@ package org.apache.fop.render.pdf; -import static org.junit.Assert.fail; - import java.io.File; import java.io.IOException; @@ -30,6 +28,8 @@ import org.xml.sax.SAXException; import org.apache.fop.apps.FOUserAgent; import org.apache.fop.pdf.PDFConformanceException; +import static org.junit.Assert.fail; + /** * Tests PDF/A-1 functionality. */ @@ -66,17 +66,12 @@ public class PDFAConformanceTestCase ext * Test exception when PDF/A-1 is enabled together with encryption. * @throws Exception if the test fails */ - @Test + @Test(expected = PDFConformanceException.class) public void testNoEncryption() throws Exception { final FOUserAgent ua = getUserAgent(); ua.getRendererOptions().put("owner-password", "mypassword"); //To enabled encryption File foFile = new File(foBaseDir, "minimal-pdf-a.fo"); - try { - convertFO(foFile, ua, dumpPDF); - fail("Expected PDFConformanceException. PDF/A-1 and PDF encryption don't go together."); - } catch (PDFConformanceException e) { - //Good! - } + convertFO(foFile, ua, dumpPDF); } /** Modified: xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pdf/PDFRendererConfigParserTestCase.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pdf/PDFRendererConfigParserTestCase.java?rev=1353992&r1=1353991&r2=1353992&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pdf/PDFRendererConfigParserTestCase.java (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pdf/PDFRendererConfigParserTestCase.java Tue Jun 26 12:31:50 2012 @@ -22,8 +22,6 @@ package org.apache.fop.render.pdf; import org.junit.Test; import org.apache.fop.apps.AbstractRendererConfigParserTester; -import org.apache.fop.apps.FOPException; -import org.apache.fop.apps.FopConfBuilder; import org.apache.fop.apps.PDFRendererConfBuilder; import org.apache.fop.pdf.PDFAMode; import org.apache.fop.pdf.PDFXMode; @@ -48,11 +46,10 @@ public class PDFRendererConfigParserTest .startEncryptionParams() .setUserPassword(testPassword) .endEncryptionParams()); - assertEquals(testPassword, conf.getEncryptionParameters().getUserPassword()); + assertEquals(testPassword, conf.getConfigOptions().getEncryptionParameters().getUserPassword()); } - private void testRestrictEncryptionParameter(PDFRendererConfigOption option) - throws Exception { + private void testRestrictEncryptionParameter(PDFEncryptionOption option) throws Exception { parseConfig(createRenderer().startEncryptionParams() .setAllowParam(option) .endEncryptionParams()); @@ -62,24 +59,24 @@ public class PDFRendererConfigParserTest assertTrue(testEncryptionParameter(option)); } - public boolean testEncryptionParameter(PDFRendererConfigOption option) throws Exception { + public boolean testEncryptionParameter(PDFEncryptionOption option) throws Exception { switch (option) { case NO_PRINT: - return conf.getEncryptionParameters().isAllowPrint(); + return conf.getConfigOptions().getEncryptionParameters().isAllowPrint(); case NO_ACCESSCONTENT: - return conf.getEncryptionParameters().isAllowAccessContent(); + return conf.getConfigOptions().getEncryptionParameters().isAllowAccessContent(); case NO_ANNOTATIONS: - return conf.getEncryptionParameters().isAllowEditAnnotations(); + return conf.getConfigOptions().getEncryptionParameters().isAllowEditAnnotations(); case NO_ASSEMBLEDOC: - return conf.getEncryptionParameters().isAllowAssembleDocument(); + return conf.getConfigOptions().getEncryptionParameters().isAllowAssembleDocument(); case NO_COPY_CONTENT: - return conf.getEncryptionParameters().isAllowCopyContent(); + return conf.getConfigOptions().getEncryptionParameters().isAllowCopyContent(); case NO_EDIT_CONTENT: - return conf.getEncryptionParameters().isAllowEditContent(); + return conf.getConfigOptions().getEncryptionParameters().isAllowEditContent(); case NO_FILLINFORMS: - return conf.getEncryptionParameters().isAllowFillInForms(); + return conf.getConfigOptions().getEncryptionParameters().isAllowFillInForms(); case NO_PRINTHQ: - return conf.getEncryptionParameters().isAllowPrintHq(); + return conf.getConfigOptions().getEncryptionParameters().isAllowPrintHq(); default: throw new IllegalStateException("Wrong parameter given"); } @@ -88,14 +85,14 @@ public class PDFRendererConfigParserTest @Test public void testAllEncryptionRestrictions() throws Exception { - testRestrictEncryptionParameter(PDFRendererConfigOption.NO_PRINT); - testRestrictEncryptionParameter(PDFRendererConfigOption.NO_ACCESSCONTENT); - testRestrictEncryptionParameter(PDFRendererConfigOption.NO_ANNOTATIONS); - testRestrictEncryptionParameter(PDFRendererConfigOption.NO_ASSEMBLEDOC); - testRestrictEncryptionParameter(PDFRendererConfigOption.NO_COPY_CONTENT); - testRestrictEncryptionParameter(PDFRendererConfigOption.NO_EDIT_CONTENT); - testRestrictEncryptionParameter(PDFRendererConfigOption.NO_FILLINFORMS); - testRestrictEncryptionParameter(PDFRendererConfigOption.NO_PRINTHQ); + testRestrictEncryptionParameter(PDFEncryptionOption.NO_PRINT); + testRestrictEncryptionParameter(PDFEncryptionOption.NO_ACCESSCONTENT); + testRestrictEncryptionParameter(PDFEncryptionOption.NO_ANNOTATIONS); + testRestrictEncryptionParameter(PDFEncryptionOption.NO_ASSEMBLEDOC); + testRestrictEncryptionParameter(PDFEncryptionOption.NO_COPY_CONTENT); + testRestrictEncryptionParameter(PDFEncryptionOption.NO_EDIT_CONTENT); + testRestrictEncryptionParameter(PDFEncryptionOption.NO_FILLINFORMS); + testRestrictEncryptionParameter(PDFEncryptionOption.NO_PRINTHQ); } @Test @@ -105,47 +102,47 @@ public class PDFRendererConfigParserTest .startEncryptionParams() .setOwnerPassword(testPassword) .endEncryptionParams()); - assertEquals(testPassword, conf.getEncryptionParameters().getOwnerPassword()); + assertEquals(testPassword, conf.getConfigOptions().getEncryptionParameters().getOwnerPassword()); } @Test public void testFilterListDefaultFlate() throws Exception { parseConfig(createRenderer().createFilterList(null, "flate")); - assertEquals("flate", conf.getFilterMap().get("default").get(0)); + assertEquals("flate", conf.getConfigOptions().getFilterMap().get("default").get(0)); } @Test public void testFilterListDefaultNull() throws Exception { parseConfig(createRenderer().createFilterList(null, "null")); - assertEquals("null", conf.getFilterMap().get("default").get(0)); + assertEquals("null", conf.getConfigOptions().getFilterMap().get("default").get(0)); } @Test public void testFilterListImage() throws Exception { parseConfig(createRenderer().createFilterList("image", "flate", "ascii-85")); - assertEquals("flate", conf.getFilterMap().get("image").get(0)); - assertEquals("ascii-85", conf.getFilterMap().get("image").get(1)); + assertEquals("flate", conf.getConfigOptions().getFilterMap().get("image").get(0)); + assertEquals("ascii-85", conf.getConfigOptions().getFilterMap().get("image").get(1)); } @Test public void testPDFAMode() throws Exception { parseConfig(createRenderer().setPDFAMode(PDFAMode.PDFA_1A.getName())); - assertEquals(PDFAMode.PDFA_1A, conf.getPDFAMode()); + assertEquals(PDFAMode.PDFA_1A, conf.getConfigOptions().getPDFAMode()); parseConfig(createRenderer().setPDFAMode(PDFAMode.PDFA_1B.getName())); - assertEquals(PDFAMode.PDFA_1B, conf.getPDFAMode()); + assertEquals(PDFAMode.PDFA_1B, conf.getConfigOptions().getPDFAMode()); parseConfig(createRenderer().setPDFAMode(PDFAMode.DISABLED.getName())); - assertEquals(null, conf.getPDFAMode()); + assertEquals(null, conf.getConfigOptions().getPDFAMode()); } @Test public void testPDFXMode() throws Exception { parseConfig(createRenderer().setPDFXMode(PDFXMode.PDFX_3_2003.getName())); - assertEquals(PDFXMode.PDFX_3_2003, conf.getPDFXMode()); + assertEquals(PDFXMode.PDFX_3_2003, conf.getConfigOptions().getPDFXMode()); parseConfig(createRenderer().setPDFXMode(PDFXMode.DISABLED.getName())); - assertEquals(null, conf.getPDFXMode()); + assertEquals(null, conf.getConfigOptions().getPDFXMode()); } @Test @@ -155,7 +152,7 @@ public class PDFRendererConfigParserTest .startEncryptionParams() .setEncryptionLength(i) .endEncryptionParams()); - assertEquals(40, conf.getEncryptionParameters().getEncryptionLengthInBits()); + assertEquals(40, conf.getConfigOptions().getEncryptionParameters().getEncryptionLengthInBits()); } for (int i = 40; i <= 128; i++) { @@ -164,7 +161,7 @@ public class PDFRendererConfigParserTest .setEncryptionLength(i) .endEncryptionParams()); int expectedLen = Math.round(i / 8.0f) * 8; - assertEquals(expectedLen, conf.getEncryptionParameters() + assertEquals(expectedLen, conf.getConfigOptions().getEncryptionParameters() .getEncryptionLengthInBits()); } @@ -173,7 +170,7 @@ public class PDFRendererConfigParserTest .startEncryptionParams() .setEncryptionLength(i) .endEncryptionParams()); - assertEquals(128, conf.getEncryptionParameters().getEncryptionLengthInBits()); + assertEquals(128, conf.getConfigOptions().getEncryptionParameters().getEncryptionLengthInBits()); } } @@ -186,7 +183,7 @@ public class PDFRendererConfigParserTest private void pdfVersionTester(String version) throws Exception { parseConfig(createRenderer().setPDFVersion(version)); - assertEquals(Version.getValueOf(version), conf.getPDFVersion()); + assertEquals(Version.getValueOf(version), conf.getConfigOptions().getPDFVersion()); } @Test(expected = IllegalArgumentException.class) @@ -199,7 +196,7 @@ public class PDFRendererConfigParserTest pdfVersionTester("0.9"); } - @Test(expected = FOPException.class) + @Test(expected = IllegalArgumentException.class) public void testErroneousPDFVersionsNotSet() throws Exception { pdfVersionTester(""); } Added: xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pdf/PDFRendererOptionsConfigTestCase.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pdf/PDFRendererOptionsConfigTestCase.java?rev=1353992&view=auto ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pdf/PDFRendererOptionsConfigTestCase.java (added) +++ xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pdf/PDFRendererOptionsConfigTestCase.java Tue Jun 26 12:31:50 2012 @@ -0,0 +1,123 @@ +/* + * 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.pdf; + +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Collections; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.junit.Test; + +import org.apache.fop.pdf.PDFAMode; +import org.apache.fop.pdf.PDFEncryptionParams; +import org.apache.fop.pdf.PDFXMode; +import org.apache.fop.pdf.Version; + +import static org.apache.fop.render.pdf.PDFRendererOption.DISABLE_SRGB_COLORSPACE; +import static org.apache.fop.render.pdf.PDFRendererOption.FILTER_LIST; +import static org.apache.fop.render.pdf.PDFRendererOption.OUTPUT_PROFILE; +import static org.apache.fop.render.pdf.PDFRendererOption.PDF_A_MODE; +import static org.apache.fop.render.pdf.PDFRendererOption.PDF_X_MODE; +import static org.apache.fop.render.pdf.PDFRendererOption.VERSION; +import static org.junit.Assert.assertEquals; + +public class PDFRendererOptionsConfigTestCase { + + private static final Map<PDFRendererOption, Object> DEFAULT_OPTIONS; + + private static final PDFEncryptionParams DEFAULT_ENCRYPTION_PARAMS = null; + + static { + final EnumMap<PDFRendererOption, Object> props + = new EnumMap<PDFRendererOption, Object>(PDFRendererOption.class); + for(PDFRendererOption option : PDFRendererOption.values()) { + props.put(option, option.getDefaultValue()); + } + DEFAULT_OPTIONS = Collections.unmodifiableMap(props); + } + + @Test + public void testDefaults() { + assertConfigEquals(DEFAULT_OPTIONS, DEFAULT_ENCRYPTION_PARAMS, PDFRendererOptionsConfig.DEFAULT); + } + + @Test + public void testConstructor() throws URISyntaxException { + final Map<PDFRendererOption, Object> options = createNonDefaultOptions(); + final PDFEncryptionParams encryptionParams = new PDFEncryptionParams(); + assertConfigEquals(options, encryptionParams, new PDFRendererOptionsConfig(options, encryptionParams)); + } + + @Test + public void testMerge() throws URISyntaxException { + final PDFRendererOptionsConfig defaults = PDFRendererOptionsConfig.DEFAULT; + final PDFEncryptionParams encryptionParams = new PDFEncryptionParams(); + final Map<PDFRendererOption, Object> options = createNonDefaultOptions(); + final PDFRendererOptionsConfig otherConfig = new PDFRendererOptionsConfig(options, encryptionParams); + assertConfigEquals(options, encryptionParams, defaults.merge(otherConfig)); + assertEquals(defaults, defaults.merge(null)); + } + + private Map<PDFRendererOption, Object> createNonDefaultOptions() throws URISyntaxException { + final EnumMap<PDFRendererOption, Object> options + = new EnumMap<PDFRendererOption, Object>(PDFRendererOption.class); + options.put(DISABLE_SRGB_COLORSPACE, Boolean.TRUE); + options.put(FILTER_LIST, new HashMap<String, List<String>>()); + options.put(OUTPUT_PROFILE, new URI("xxx")); + options.put(PDF_A_MODE, PDFAMode.PDFA_1A); + options.put(PDF_X_MODE, PDFXMode.PDFX_3_2003); + options.put(VERSION, Version.V1_0); + return Collections.unmodifiableMap(options); + } + + private static void assertConfigEquals(Map<PDFRendererOption, Object> expectedOptions, + PDFEncryptionParams expectedEncryptionParams, PDFRendererOptionsConfig actual) { + assertEquals((Boolean) expectedOptions.get(DISABLE_SRGB_COLORSPACE), actual.getDisableSRGBColorSpace()); + assertEquals((Map) expectedOptions.get(FILTER_LIST), actual.getFilterMap()); + assertEquals((URI) expectedOptions.get(OUTPUT_PROFILE), actual.getOutputProfileURI()); + assertEquals((PDFAMode) expectedOptions.get(PDF_A_MODE), actual.getPDFAMode()); + assertEquals((PDFXMode) expectedOptions.get(PDF_X_MODE), actual.getPDFXMode()); + assertEquals((Version) expectedOptions.get(VERSION), actual.getPDFVersion()); + assertEncryptionParamsEquals(expectedEncryptionParams, actual.getEncryptionParameters()); + } + + private static void assertEncryptionParamsEquals(PDFEncryptionParams expected, + PDFEncryptionParams actual) { + assertEquals(expected == null, actual == null); + if (actual != null) { + assertEquals(expected.getEncryptionLengthInBits(), actual.getEncryptionLengthInBits()); + assertEquals(expected.getOwnerPassword(), actual.getOwnerPassword()); + assertEquals(expected.getUserPassword(), actual.getUserPassword()); + assertEquals(expected.isAllowAccessContent(), actual.isAllowAccessContent()); + assertEquals(expected.isAllowAssembleDocument(), actual.isAllowAssembleDocument()); + assertEquals(expected.isAllowCopyContent(), actual.isAllowCopyContent()); + assertEquals(expected.isAllowEditAnnotations(), actual.isAllowEditAnnotations()); + assertEquals(expected.isAllowEditContent(), actual.isAllowEditContent()); + assertEquals(expected.isAllowFillInForms(), actual.isAllowFillInForms()); + assertEquals(expected.isAllowPrint(), actual.isAllowPrint()); + assertEquals(expected.isAllowPrintHq(), actual.isAllowPrintHq()); + } + } + +} Propchange: xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pdf/PDFRendererOptionsConfigTestCase.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pdf/RenderPDFTestSuite.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pdf/RenderPDFTestSuite.java?rev=1353992&r1=1353991&r2=1353992&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pdf/RenderPDFTestSuite.java (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/pdf/RenderPDFTestSuite.java Tue Jun 26 12:31:50 2012 @@ -28,6 +28,8 @@ import org.junit.runners.Suite.SuiteClas * A test suite for org.apache.fop.render.pdf.* */ @RunWith(Suite.class) -@SuiteClasses({ PDFRendererConfiguratorTestCase.class }) +@SuiteClasses({ + PDFRendererConfigParserTestCase.class +}) public final class RenderPDFTestSuite { } Modified: xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/txt/TxtRendererConfigParserTestCase.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/txt/TxtRendererConfigParserTestCase.java?rev=1353992&r1=1353991&r2=1353992&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/txt/TxtRendererConfigParserTestCase.java (original) +++ xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/render/txt/TxtRendererConfigParserTestCase.java Tue Jun 26 12:31:50 2012 @@ -24,7 +24,7 @@ import org.junit.Test; import org.apache.fop.apps.AbstractRendererConfigParserTester; import org.apache.fop.apps.TxtRendererConfBuilder; import org.apache.fop.render.RendererConfig.RendererConfigParser; -import org.apache.fop.render.txt.TxtRendererConfig.TxtRendererConfigOption; +import org.apache.fop.render.txt.TxtRendererConfig.TxtRendererOption; import org.apache.fop.render.txt.TxtRendererConfig.TxtRendererConfigParser; import static org.junit.Assert.assertEquals; @@ -47,7 +47,7 @@ public class TxtRendererConfigParserTest // Check the default behaviour is expected parseConfig(createRenderer()); - assertEquals(TxtRendererConfigOption.ENCODING.getDefaultValue(), conf.getEncoding()); + assertEquals(TxtRendererOption.ENCODING.getDefaultValue(), conf.getEncoding()); } } Added: xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/svg/PDFGraphics2DTestCase.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/svg/PDFGraphics2DTestCase.java?rev=1353992&view=auto ============================================================================== --- xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/svg/PDFGraphics2DTestCase.java (added) +++ xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/svg/PDFGraphics2DTestCase.java Tue Jun 26 12:31:50 2012 @@ -0,0 +1,48 @@ +/* + * 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.svg; + +import java.awt.BasicStroke; + +import org.junit.Test; + +import static org.junit.Assert.assertTrue; + +public class PDFGraphics2DTestCase { + + @Test + public void testApplyStrokeNullDash() { + PDFGraphics2D g2d = new PDFGraphics2D(false); + BasicStroke stroke = new BasicStroke(); + g2d.applyStroke(stroke); + assertTrue(g2d.getString().contains("[] 0 d\n")); + } + + @Test + public void testApplyStrokeNonNullDash() { + PDFGraphics2D g2d = new PDFGraphics2D(false); + float[] dashArray = {3.0f, 5.0f}; + BasicStroke stroke = new BasicStroke(1.0f, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_MITER, 10.0f, + dashArray, 0.0f); + g2d.applyStroke(stroke); + assertTrue(g2d.getString().contains("[3 5] 0 d\n")); + } + +} Propchange: xmlgraphics/fop/branches/Temp_URI_Unification/test/java/org/apache/fop/svg/PDFGraphics2DTestCase.java ------------------------------------------------------------------------------ svn:eol-style = native --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
