consolidated TestXSSFHeaderFooter

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

diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHeaderFooter.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHeaderFooter.java
index dff65669ecc659de0fc93085c78860159024d3c7..7c50d6aed4802bca3b0618d3ba79b38e91e4da02 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHeaderFooter.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHeaderFooter.java
@@ -17,10 +17,14 @@
 
 package org.apache.poi.xssf.usermodel;
 
+import org.apache.poi.xssf.usermodel.extensions.XSSFHeaderFooter;
 import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTHeaderFooter;
 
 import junit.framework.TestCase;
 
+/**
+ * Tests for {@link XSSFHeaderFooter}
+ */
 public class TestXSSFHeaderFooter extends TestCase {
        public void testStripFields() {
                String simple = "I am a test header";
@@ -41,22 +45,45 @@ public class TestXSSFHeaderFooter extends TestCase {
                XSSFEvenHeader head = new XSSFEvenHeader(CTHeaderFooter.Factory.newInstance());
                head.setCenter("Center");
                head.setLeft("In the left");
-    
-       assertEquals("In the left", head.getLeft());
-       assertEquals("Center", head.getCenter());
-       assertEquals("", head.getRight());
-       
-       head.setLeft("Top &P&F&D Left");
-       assertEquals("Top &P&F&D Left", head.getLeft());
-       assertFalse(head.areFieldsStripped());
-       
-       head.setAreFieldsStripped(true);
-       assertEquals("Top  Left", head.getLeft());
-       assertTrue(head.areFieldsStripped());
-       
-       // Now even more complex
-       head.setCenter("HEADER TEXT &P&N&D&T&Z&F&F&A&V");
-       assertEquals("HEADER TEXT &V", head.getCenter());
+       
+               assertEquals("In the left", head.getLeft());
+               assertEquals("Center", head.getCenter());
+               assertEquals("", head.getRight());
+               
+               head.setLeft("Top &P&F&D Left");
+               assertEquals("Top &P&F&D Left", head.getLeft());
+               assertFalse(head.areFieldsStripped());
+               
+               head.setAreFieldsStripped(true);
+               assertEquals("Top  Left", head.getLeft());
+               assertTrue(head.areFieldsStripped());
+               
+               // Now even more complex
+               head.setCenter("HEADER TEXT &P&N&D&T&Z&F&F&A&V");
+               assertEquals("HEADER TEXT &V", head.getCenter());
+       }
+
+       public void testGetSetCenterLeftRight() {
+               
+               XSSFOddFooter footer = new XSSFOddFooter(CTHeaderFooter.Factory.newInstance());
+               assertEquals("", footer.getCenter());
+               footer.setCenter("My first center section");
+               assertEquals("My first center section", footer.getCenter());
+               footer.setCenter("No, let's update the center section");
+               assertEquals("No, let's update the center section", footer.getCenter());
+               footer.setLeft("And add a left one");
+               footer.setRight("Finally the right section is added");
+               assertEquals("And add a left one", footer.getLeft());
+               assertEquals("Finally the right section is added", footer.getRight());
+               
+               // Test changing the three sections value
+               footer.setCenter("Second center version");
+               footer.setLeft("Second left version");
+               footer.setRight("Second right version");
+               assertEquals("Second center version", footer.getCenter());
+               assertEquals("Second left version", footer.getLeft());
+               assertEquals("Second right version", footer.getRight());
+               
        }
        
        // TODO Rest of tests

diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFHeaderFooter.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFHeaderFooter.java
deleted file mode 100644 (file)
index a41b024..0000000
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFHeaderFooter.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ====================================================================
-   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
-==================================================================== */
-
-package org.apache.poi.xssf.usermodel.extensions;
-
-import org.apache.poi.xssf.usermodel.XSSFOddFooter;
-import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTHeaderFooter;
-
-import junit.framework.TestCase;
-
-
-public class TestXSSFHeaderFooter extends TestCase {
-    
-    public void testGetSetCenterLeftRight() {
-        
-        XSSFOddFooter footer = new XSSFOddFooter(CTHeaderFooter.Factory.newInstance());
-        assertEquals("", footer.getCenter());
-        footer.setCenter("My first center section");
-        assertEquals("My first center section", footer.getCenter());
-        footer.setCenter("No, let's update the center section");
-        assertEquals("No, let's update the center section", footer.getCenter());
-        footer.setLeft("And add a left one");
-        footer.setRight("Finally the right section is added");
-        assertEquals("And add a left one", footer.getLeft());
-        assertEquals("Finally the right section is added", footer.getRight());
-        
-        // Test changing the three sections value
-        footer.setCenter("Second center version");
-        footer.setLeft("Second left version");
-        footer.setRight("Second right version");
-        assertEquals("Second center version", footer.getCenter());
-        assertEquals("Second left version", footer.getLeft());
-        assertEquals("Second right version", footer.getRight());
-        
-    }
-    
-}