From 07f082ad3d6afb717e55972ae0c4a64c5d1e53b4 Mon Sep 17 00:00:00 2001 From: Vincent Hennebert Date: Fri, 18 Nov 2011 17:08:20 +0000 Subject: Bugzilla #52151: added ant script to get JaCoCo code coverage Patch by Mehdi Houshmand, applied with changes git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1203749 13f79535-47bb-0310-9956-ffa450edef68 --- .../layoutengine/HyphenationLayoutTestCase.java | 53 ++++++++++++++++++++++ .../fop/layoutengine/LayoutEngineTestUtils.java | 15 +++++- 2 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 test/java/org/apache/fop/layoutengine/HyphenationLayoutTestCase.java (limited to 'test') diff --git a/test/java/org/apache/fop/layoutengine/HyphenationLayoutTestCase.java b/test/java/org/apache/fop/layoutengine/HyphenationLayoutTestCase.java new file mode 100644 index 000000000..6b5ebbf71 --- /dev/null +++ b/test/java/org/apache/fop/layoutengine/HyphenationLayoutTestCase.java @@ -0,0 +1,53 @@ +/* + * 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.layoutengine; + +import java.io.File; +import java.io.IOException; +import java.util.Collection; + +import org.junit.runners.Parameterized.Parameters; + +/** + * Class for testing the FOP's hyphenation layout engine using testcases specified in XML + * files. + */ +public class HyphenationLayoutTestCase extends LayoutEngineTestCase { + + /** + * Creates the parameters for this test. + * + * @return the list of file arrays populated with test files + * @throws IOException if an I/O error occurs while reading the test file + */ + @Parameters + public static Collection getParameters() throws IOException { + return LayoutEngineTestUtils.getLayoutTestFiles("hyphenation-testcases"); + } + + /** + * Constructor + * @param testFile the file to test + */ + public HyphenationLayoutTestCase(File testFile) { + super(testFile); + } + +} diff --git a/test/java/org/apache/fop/layoutengine/LayoutEngineTestUtils.java b/test/java/org/apache/fop/layoutengine/LayoutEngineTestUtils.java index 772204d28..935b86c3b 100644 --- a/test/java/org/apache/fop/layoutengine/LayoutEngineTestUtils.java +++ b/test/java/org/apache/fop/layoutengine/LayoutEngineTestUtils.java @@ -172,15 +172,26 @@ public final class LayoutEngineTestUtils { * @return A collection of file arrays that contain the test files */ public static Collection getLayoutTestFiles() { - TestFilesConfiguration.Builder builder = new TestFilesConfiguration.Builder(); String testSet = System.getProperty("fop.layoutengine.testset"); testSet = (testSet != null ? testSet : "standard") + "-testcases"; + return getLayoutTestFiles(testSet); + } + + /** + * This is a helper method that uses the standard parameters for FOP's layout engine tests, + * given a test set name returns a set of test files. + * + * @param testSetName the name of the test set + * @return A collection of file arrays that contain the test files + */ + public static Collection getLayoutTestFiles(String testSetName) { + TestFilesConfiguration.Builder builder = new TestFilesConfiguration.Builder(); builder.testDir("test/layoutengine") .singleProperty("fop.layoutengine.single") .startsWithProperty("fop.layoutengine.starts-with") .suffix(".xml") - .testSet(testSet) + .testSet(testSetName) .disabledProperty("fop.layoutengine.disabled", "test/layoutengine/disabled-testcases.xml") .privateTestsProperty("fop.layoutengine.private"); -- cgit v1.2.3