Changed CRLF to LF in ooxml/testcases. Minor fixes for compiler warnings and formatting

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

1 files changed, 105 insertions, 104 deletions

diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java
index 50b90e746e..1fb96061bd 100755
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java
@@ -1,104 +1,105 @@
-/* ====================================================================

-   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;

-

-import junit.framework.TestCase;

-import org.apache.poi.xssf.XSSFTestDataSamples;

-import org.apache.poi.POIXMLDocumentPart;

-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTDrawing;

-

-import java.util.List;

-import java.util.Arrays;

-import java.io.IOException;

-

-/**

- * @author Yegor Kozlov

- */

-public class TestXSSFPictureData extends TestCase {

-    public void testRead(){

-        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("WithDrawing.xlsx");

-        List<XSSFPictureData> pictures = wb.getAllPictures();

-        //wb.getAllPictures() should return the same instance across multiple calls

-        assertSame(pictures, wb.getAllPictures());

-

-        assertEquals(5, pictures.size());

-        String[] ext = {"jpeg", "emf", "png", "emf", "wmf"};

-        for (int i = 0; i < pictures.size(); i++) {

-            assertEquals(ext[i], pictures.get(i).suggestFileExtension());

-        }

-

-        int num = pictures.size();

-

-        byte[] pictureData = {0xA, 0xB, 0XC, 0xD, 0xE, 0xF};

-

-        int idx = wb.addPicture(pictureData, XSSFWorkbook.PICTURE_TYPE_JPEG);

-        assertEquals(num + 1, pictures.size());

-        //idx is 0-based index in the #pictures array

-        assertEquals(pictures.size() - 1, idx);

-        XSSFPictureData pict = pictures.get(idx);

-        assertEquals("jpeg", pict.suggestFileExtension());

-        assertTrue(Arrays.equals(pictureData, pict.getData()));

-    }

-

-    public void testNew(){

-        XSSFWorkbook wb = new XSSFWorkbook();

-        XSSFSheet sheet = wb.createSheet();

-        XSSFDrawing drawing = sheet.createDrawingPatriarch();

-

-        byte[] jpegData = "test jpeg data".getBytes();

-        byte[] wmfData =  "test wmf data".getBytes();

-        byte[] pngData =  "test png data".getBytes();

-

-        List<XSSFPictureData> pictures = wb.getAllPictures();

-        assertEquals(0, pictures.size());

-

-        int jpegIdx = wb.addPicture(jpegData, XSSFWorkbook.PICTURE_TYPE_JPEG);

-        assertEquals(1, pictures.size());

-        assertEquals("jpeg", pictures.get(jpegIdx).suggestFileExtension());

-        assertTrue(Arrays.equals(jpegData, pictures.get(jpegIdx).getData()));

-

-        int wmfIdx = wb.addPicture(wmfData, XSSFWorkbook.PICTURE_TYPE_WMF);

-        assertEquals(2, pictures.size());

-        assertEquals("wmf", pictures.get(wmfIdx).suggestFileExtension());

-        assertTrue(Arrays.equals(wmfData, pictures.get(wmfIdx).getData()));

-

-        int pngIdx = wb.addPicture(pngData, XSSFWorkbook.PICTURE_TYPE_PNG);

-        assertEquals(3, pictures.size());

-        assertEquals("png", pictures.get(pngIdx).suggestFileExtension());

-        assertTrue(Arrays.equals(pngData, pictures.get(pngIdx).getData()));

-

-        //TODO finish usermodel API for XSSFPicture

-        XSSFPicture p1 = drawing.createPicture(new XSSFClientAnchor(), jpegIdx);

-        XSSFPicture p2 = drawing.createPicture(new XSSFClientAnchor(), wmfIdx);

-        XSSFPicture p3 = drawing.createPicture(new XSSFClientAnchor(), pngIdx);

-

-        //check that the added pictures are accessible after write

-        wb = XSSFTestDataSamples.writeOutAndReadBack(wb);

-        List<XSSFPictureData> pictures2 = wb.getAllPictures();

-        assertEquals(3, pictures2.size());

-

-        assertEquals("jpeg", pictures2.get(jpegIdx).suggestFileExtension());

-        assertTrue(Arrays.equals(jpegData, pictures2.get(jpegIdx).getData()));

-

-        assertEquals("wmf", pictures2.get(wmfIdx).suggestFileExtension());

-        assertTrue(Arrays.equals(wmfData, pictures2.get(wmfIdx).getData()));

-

-        assertEquals("png", pictures2.get(pngIdx).suggestFileExtension());

-        assertTrue(Arrays.equals(pngData, pictures2.get(pngIdx).getData()));

-

-    }

-}

+/* ====================================================================
+   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;
+
+import junit.framework.TestCase;
+import org.apache.poi.xssf.XSSFTestDataSamples;
+import org.apache.poi.POIXMLDocumentPart;
+import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTDrawing;
+
+import java.util.List;
+import java.util.Arrays;
+import java.io.IOException;
+
+/**
+ * @author Yegor Kozlov
+ */
+public final class TestXSSFPictureData extends TestCase {
+    public void testRead(){
+        XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("WithDrawing.xlsx");
+        List<XSSFPictureData> pictures = wb.getAllPictures();
+        //wb.getAllPictures() should return the same instance across multiple calls
+        assertSame(pictures, wb.getAllPictures());
+
+        assertEquals(5, pictures.size());
+        String[] ext = {"jpeg", "emf", "png", "emf", "wmf"};
+        for (int i = 0; i < pictures.size(); i++) {
+            assertEquals(ext[i], pictures.get(i).suggestFileExtension());
+        }
+
+        int num = pictures.size();
+
+        byte[] pictureData = {0xA, 0xB, 0XC, 0xD, 0xE, 0xF};
+
+        int idx = wb.addPicture(pictureData, XSSFWorkbook.PICTURE_TYPE_JPEG);
+        assertEquals(num + 1, pictures.size());
+        //idx is 0-based index in the #pictures array
+        assertEquals(pictures.size() - 1, idx);
+        XSSFPictureData pict = pictures.get(idx);
+        assertEquals("jpeg", pict.suggestFileExtension());
+        assertTrue(Arrays.equals(pictureData, pict.getData()));
+    }
+
+    public void testNew(){
+        XSSFWorkbook wb = new XSSFWorkbook();
+        XSSFSheet sheet = wb.createSheet();
+        XSSFDrawing drawing = sheet.createDrawingPatriarch();
+
+        byte[] jpegData = "test jpeg data".getBytes();
+        byte[] wmfData =  "test wmf data".getBytes();
+        byte[] pngData =  "test png data".getBytes();
+
+        List<XSSFPictureData> pictures = wb.getAllPictures();
+        assertEquals(0, pictures.size());
+
+        int jpegIdx = wb.addPicture(jpegData, XSSFWorkbook.PICTURE_TYPE_JPEG);
+        assertEquals(1, pictures.size());
+        assertEquals("jpeg", pictures.get(jpegIdx).suggestFileExtension());
+        assertTrue(Arrays.equals(jpegData, pictures.get(jpegIdx).getData()));
+
+        int wmfIdx = wb.addPicture(wmfData, XSSFWorkbook.PICTURE_TYPE_WMF);
+        assertEquals(2, pictures.size());
+        assertEquals("wmf", pictures.get(wmfIdx).suggestFileExtension());
+        assertTrue(Arrays.equals(wmfData, pictures.get(wmfIdx).getData()));
+
+        int pngIdx = wb.addPicture(pngData, XSSFWorkbook.PICTURE_TYPE_PNG);
+        assertEquals(3, pictures.size());
+        assertEquals("png", pictures.get(pngIdx).suggestFileExtension());
+        assertTrue(Arrays.equals(pngData, pictures.get(pngIdx).getData()));
+
+        //TODO finish usermodel API for XSSFPicture
+        XSSFPicture p1 = drawing.createPicture(new XSSFClientAnchor(), jpegIdx);
+        XSSFPicture p2 = drawing.createPicture(new XSSFClientAnchor(), wmfIdx);
+        XSSFPicture p3 = drawing.createPicture(new XSSFClientAnchor(), pngIdx);
+
+        //check that the added pictures are accessible after write
+        wb = XSSFTestDataSamples.writeOutAndReadBack(wb);
+        List<XSSFPictureData> pictures2 = wb.getAllPictures();
+        assertEquals(3, pictures2.size());
+
+        assertEquals("jpeg", pictures2.get(jpegIdx).suggestFileExtension());
+        assertTrue(Arrays.equals(jpegData, pictures2.get(jpegIdx).getData()));
+
+        assertEquals("wmf", pictures2.get(wmfIdx).suggestFileExtension());
+        assertTrue(Arrays.equals(wmfData, pictures2.get(wmfIdx).getData()));
+
+        assertEquals("png", pictures2.get(pngIdx).suggestFileExtension());
+        assertTrue(Arrays.equals(pngData, pictures2.get(pngIdx).getData()));
+
+    }
+}