Added license header to disabled testcases XML file. Removed obsolete files and code.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@345785 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 49 insertions, 59 deletions

diff --git a/test/fotree/disabled-testcases.txt b/test/fotree/disabled-testcases.txt
deleted file mode 100644
index 59cd3c9c0..000000000
--- a/test/fotree/disabled-testcases.txt
+++ /dev/null
@@ -1 +0,0 @@
-demo-test-failure.fo
diff --git a/test/fotree/disabled-testcases.xml b/test/fotree/disabled-testcases.xml
index 0b13bb1df..2b7ae2ad6 100755
--- a/test/fotree/disabled-testcases.xml
+++ b/test/fotree/disabled-testcases.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2005 The Apache Software Foundation
+
+  Licensed 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: $ -->
 <disabled-testcases>
   <testcase>
     <name>demo test failure</name>
diff --git a/test/java/org/apache/fop/layoutengine/LayoutEngineTestSuite.java b/test/java/org/apache/fop/layoutengine/LayoutEngineTestSuite.java
index f09b84971..f90d9f8e7 100644
--- a/test/java/org/apache/fop/layoutengine/LayoutEngineTestSuite.java
+++ b/test/java/org/apache/fop/layoutengine/LayoutEngineTestSuite.java
@@ -63,17 +63,6 @@ public class LayoutEngineTestSuite {
         DebugHelper.registerStandardElementListObservers();
     }
     
-    public static String[] readLinesFromFile(File f) throws IOException {
-        List lines = new java.util.ArrayList();
-        Reader reader = new FileReader(f);
-        BufferedReader br = new BufferedReader(reader);
-        String line;
-        while ((line = br.readLine()) != null) {
-            lines.add(line);
-        }
-        return (String[])lines.toArray(new String[lines.size()]);
-    }
-    
     public static String[] readDisabledTestcases(File f) throws IOException {
         List lines = new java.util.ArrayList();
         Source stylesheet = new StreamSource(
@@ -133,7 +122,6 @@ public class LayoutEngineTestSuite {
         String disabled = System.getProperty("fop.layoutengine.disabled");
         if (disabled != null && disabled.length() > 0) {
             filter = new AndFileFilter(new NotFileFilter(
-//                           new NameFileFilter(readLinesFromFile(new File(disabled)))),
                            new NameFileFilter(readDisabledTestcases(new File(disabled)))),
                     filter);
         }
diff --git a/test/layoutengine/disabled-testcases.dtd b/test/layoutengine/disabled-testcases.dtd
index f99198169..d3db57974 100755
--- a/test/layoutengine/disabled-testcases.dtd
+++ b/test/layoutengine/disabled-testcases.dtd
@@ -1,3 +1,19 @@
+<!--

+  Copyright 2005 The Apache Software Foundation

+

+  Licensed 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: $ -->

 <!ELEMENT disabled-testcases (testcase)*>

 <!ELEMENT testcase (name?,file,description?,reference*)>

 <!ATTLIST testcase id ID #IMPLIED>

diff --git a/test/layoutengine/disabled-testcases.txt b/test/layoutengine/disabled-testcases.txt
deleted file mode 100644
index 8bb23ac87..000000000
--- a/test/layoutengine/disabled-testcases.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-block-container_reference-orientation_bug36391.xml
-block-container_space-before_space-after_3.xml
-block_font-stretch.xml
-block_linefeed-treatment.xml
-block_padding_2.xml
-block_space-before_space-after_8.xml
-block_white-space-collapse_2.xml
-block_white-space-treatment_1.xml
-block_white-space-treatment_2.xml
-block_word-spacing.xml
-block_word-spacing_text-align_justify.xml
-external-graphic_oversized.xml
-footnote_space-resolution.xml
-inline-block_keep-together.xml
-inline_block_nested_3.xml
-inline-container_block_nested.xml
-inline-container_border_padding.xml
-inline_letter-spacing.xml
-inline_word-spacing.xml
-inline_word-spacing_text-align_justify.xml
-leader-alignment.xml
-leader_leader-pattern_use-content_bug.xml
-list-block_keep-with-previous.xml
-list-item_block_keep-with-previous.xml
-marker_bug.xml
-page-breaking_4.xml
-page-breaking_6.xml
-page-height_indefinite_simple.xml
-page-number-citation_background-image.xml
-page-number-citation_complex_1.xml
-page-number-citation_complex_2.xml
-page-number_initial-page-number_2.xml
-region-body_column-count_footnote.xml
-region-body_column-count_bug36356.xml
-table-body_background-image.xml
-table_border-collapse_collapse_1.xml
-table_border-collapse_collapse_2.xml
-table_border_padding.xml
-table-cell_block_keep-with-previous.xml
-table-cell_border_padding_conditionality.xml
-table-column_first-row-width.xml
-table-header_background-image.xml
-table-row_keep-with-previous.xml
-table_table-layout_fixed_2.xml
-table_border-width_conditionality.xml
diff --git a/test/layoutengine/disabled-testcases.xml b/test/layoutengine/disabled-testcases.xml
index b1debef39..1089827d9 100755
--- a/test/layoutengine/disabled-testcases.xml
+++ b/test/layoutengine/disabled-testcases.xml
@@ -1,5 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE disabled-testcases SYSTEM "disabled-testcases.dtd">
+<!--
+  Copyright 2005 The Apache Software Foundation
+
+  Licensed 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: $ -->
+<!--DOCTYPE disabled-testcases SYSTEM "disabled-testcases.dtd"-->
 <disabled-testcases>
   <testcase>
     <name>block-container reference-orientation bug36391</name>