whitespace

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1715787 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Javen O'Neal 2015-11-23 12:32:26 +00:00
parent 090394287b
commit 831fa71953

View File

@ -49,172 +49,172 @@ import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRst;
public class TestCommentsTable { public class TestCommentsTable {
private static final String TEST_A2_TEXT = "test A2 text"; private static final String TEST_A2_TEXT = "test A2 text";
private static final String TEST_A1_TEXT = "test A1 text"; private static final String TEST_A1_TEXT = "test A1 text";
private static final String TEST_AUTHOR = "test author"; private static final String TEST_AUTHOR = "test author";
@Test @Test
public void findAuthor() throws Exception { public void findAuthor() throws Exception {
CommentsTable sheetComments = new CommentsTable(); CommentsTable sheetComments = new CommentsTable();
assertEquals(1, sheetComments.getNumberOfAuthors()); assertEquals(1, sheetComments.getNumberOfAuthors());
assertEquals(0, sheetComments.findAuthor("")); assertEquals(0, sheetComments.findAuthor(""));
assertEquals("", sheetComments.getAuthor(0)); assertEquals("", sheetComments.getAuthor(0));
assertEquals(1, sheetComments.findAuthor(TEST_AUTHOR)); assertEquals(1, sheetComments.findAuthor(TEST_AUTHOR));
assertEquals(2, sheetComments.findAuthor("another author")); assertEquals(2, sheetComments.findAuthor("another author"));
assertEquals(1, sheetComments.findAuthor(TEST_AUTHOR)); assertEquals(1, sheetComments.findAuthor(TEST_AUTHOR));
assertEquals(3, sheetComments.findAuthor("YAA")); assertEquals(3, sheetComments.findAuthor("YAA"));
assertEquals(2, sheetComments.findAuthor("another author")); assertEquals(2, sheetComments.findAuthor("another author"));
} }
@Test @Test
public void getCellComment() throws Exception { public void getCellComment() throws Exception {
CommentsTable sheetComments = new CommentsTable(); CommentsTable sheetComments = new CommentsTable();
CTComments comments = sheetComments.getCTComments(); CTComments comments = sheetComments.getCTComments();
CTCommentList commentList = comments.getCommentList(); CTCommentList commentList = comments.getCommentList();
// Create 2 comments for A1 and A" cells // Create 2 comments for A1 and A" cells
CTComment comment0 = commentList.insertNewComment(0); CTComment comment0 = commentList.insertNewComment(0);
comment0.setRef("A1"); comment0.setRef("A1");
CTRst ctrst0 = CTRst.Factory.newInstance(); CTRst ctrst0 = CTRst.Factory.newInstance();
ctrst0.setT(TEST_A1_TEXT); ctrst0.setT(TEST_A1_TEXT);
comment0.setText(ctrst0); comment0.setText(ctrst0);
CTComment comment1 = commentList.insertNewComment(0); CTComment comment1 = commentList.insertNewComment(0);
comment1.setRef("A2"); comment1.setRef("A2");
CTRst ctrst1 = CTRst.Factory.newInstance(); CTRst ctrst1 = CTRst.Factory.newInstance();
ctrst1.setT(TEST_A2_TEXT); ctrst1.setT(TEST_A2_TEXT);
comment1.setText(ctrst1); comment1.setText(ctrst1);
// test finding the right comment for a cell // test finding the right comment for a cell
assertSame(comment0, sheetComments.getCTComment(new CellAddress("A1"))); assertSame(comment0, sheetComments.getCTComment(new CellAddress("A1")));
assertSame(comment1, sheetComments.getCTComment(new CellAddress("A2"))); assertSame(comment1, sheetComments.getCTComment(new CellAddress("A2")));
assertNull(sheetComments.getCTComment(new CellAddress("A3"))); assertNull(sheetComments.getCTComment(new CellAddress("A3")));
} }
@Test @Test
public void existing() { public void existing() {
Workbook workbook = XSSFTestDataSamples.openSampleWorkbook("WithVariousData.xlsx"); Workbook workbook = XSSFTestDataSamples.openSampleWorkbook("WithVariousData.xlsx");
Sheet sheet1 = workbook.getSheetAt(0); Sheet sheet1 = workbook.getSheetAt(0);
Sheet sheet2 = workbook.getSheetAt(1); Sheet sheet2 = workbook.getSheetAt(1);
assertTrue( ((XSSFSheet)sheet1).hasComments() ); assertTrue( ((XSSFSheet)sheet1).hasComments() );
assertFalse( ((XSSFSheet)sheet2).hasComments() ); assertFalse( ((XSSFSheet)sheet2).hasComments() );
// Comments should be in C5 and C7 // Comments should be in C5 and C7
Row r5 = sheet1.getRow(4); Row r5 = sheet1.getRow(4);
Row r7 = sheet1.getRow(6); Row r7 = sheet1.getRow(6);
assertNotNull( r5.getCell(2).getCellComment() ); assertNotNull( r5.getCell(2).getCellComment() );
assertNotNull( r7.getCell(2).getCellComment() ); assertNotNull( r7.getCell(2).getCellComment() );
// Check they have what we expect // Check they have what we expect
// TODO: Rich text formatting // TODO: Rich text formatting
Comment cc5 = r5.getCell(2).getCellComment(); Comment cc5 = r5.getCell(2).getCellComment();
Comment cc7 = r7.getCell(2).getCellComment(); Comment cc7 = r7.getCell(2).getCellComment();
assertEquals("Nick Burch", cc5.getAuthor()); assertEquals("Nick Burch", cc5.getAuthor());
assertEquals("Nick Burch:\nThis is a comment", cc5.getString().getString()); assertEquals("Nick Burch:\nThis is a comment", cc5.getString().getString());
assertEquals(4, cc5.getRow()); assertEquals(4, cc5.getRow());
assertEquals(2, cc5.getColumn()); assertEquals(2, cc5.getColumn());
assertEquals("Nick Burch", cc7.getAuthor()); assertEquals("Nick Burch", cc7.getAuthor());
assertEquals("Nick Burch:\nComment #1\n", cc7.getString().getString()); assertEquals("Nick Burch:\nComment #1\n", cc7.getString().getString());
assertEquals(6, cc7.getRow()); assertEquals(6, cc7.getRow());
assertEquals(2, cc7.getColumn()); assertEquals(2, cc7.getColumn());
} }
@Test @Test
public void writeRead() { public void writeRead() {
XSSFWorkbook workbook = XSSFTestDataSamples.openSampleWorkbook("WithVariousData.xlsx"); XSSFWorkbook workbook = XSSFTestDataSamples.openSampleWorkbook("WithVariousData.xlsx");
XSSFSheet sheet1 = workbook.getSheetAt(0); XSSFSheet sheet1 = workbook.getSheetAt(0);
XSSFSheet sheet2 = workbook.getSheetAt(1); XSSFSheet sheet2 = workbook.getSheetAt(1);
assertTrue( sheet1.hasComments() ); assertTrue( sheet1.hasComments() );
assertFalse( sheet2.hasComments() ); assertFalse( sheet2.hasComments() );
// Change on comment on sheet 1, and add another into // Change on comment on sheet 1, and add another into
// sheet 2 // sheet 2
Row r5 = sheet1.getRow(4); Row r5 = sheet1.getRow(4);
Comment cc5 = r5.getCell(2).getCellComment(); Comment cc5 = r5.getCell(2).getCellComment();
cc5.setAuthor("Apache POI"); cc5.setAuthor("Apache POI");
cc5.setString(new XSSFRichTextString("Hello!")); cc5.setString(new XSSFRichTextString("Hello!"));
Row r2s2 = sheet2.createRow(2); Row r2s2 = sheet2.createRow(2);
Cell c1r2s2 = r2s2.createCell(1); Cell c1r2s2 = r2s2.createCell(1);
assertNull(c1r2s2.getCellComment()); assertNull(c1r2s2.getCellComment());
Drawing dg = sheet2.createDrawingPatriarch(); Drawing dg = sheet2.createDrawingPatriarch();
Comment cc2 = dg.createCellComment(new XSSFClientAnchor()); Comment cc2 = dg.createCellComment(new XSSFClientAnchor());
cc2.setAuthor("Also POI"); cc2.setAuthor("Also POI");
cc2.setString(new XSSFRichTextString("A new comment")); cc2.setString(new XSSFRichTextString("A new comment"));
c1r2s2.setCellComment(cc2); c1r2s2.setCellComment(cc2);
// Save, and re-load the file // Save, and re-load the file
workbook = XSSFTestDataSamples.writeOutAndReadBack(workbook); workbook = XSSFTestDataSamples.writeOutAndReadBack(workbook);
// Check we still have comments where we should do // Check we still have comments where we should do
sheet1 = workbook.getSheetAt(0); sheet1 = workbook.getSheetAt(0);
sheet2 = workbook.getSheetAt(1); sheet2 = workbook.getSheetAt(1);
assertNotNull(sheet1.getRow(4).getCell(2).getCellComment()); assertNotNull(sheet1.getRow(4).getCell(2).getCellComment());
assertNotNull(sheet1.getRow(6).getCell(2).getCellComment()); assertNotNull(sheet1.getRow(6).getCell(2).getCellComment());
assertNotNull(sheet2.getRow(2).getCell(1).getCellComment()); assertNotNull(sheet2.getRow(2).getCell(1).getCellComment());
// And check they still have the contents they should do // And check they still have the contents they should do
assertEquals("Apache POI", assertEquals("Apache POI",
sheet1.getRow(4).getCell(2).getCellComment().getAuthor()); sheet1.getRow(4).getCell(2).getCellComment().getAuthor());
assertEquals("Nick Burch", assertEquals("Nick Burch",
sheet1.getRow(6).getCell(2).getCellComment().getAuthor()); sheet1.getRow(6).getCell(2).getCellComment().getAuthor());
assertEquals("Also POI", assertEquals("Also POI",
sheet2.getRow(2).getCell(1).getCellComment().getAuthor()); sheet2.getRow(2).getCell(1).getCellComment().getAuthor());
assertEquals("Hello!", assertEquals("Hello!",
sheet1.getRow(4).getCell(2).getCellComment().getString().getString()); sheet1.getRow(4).getCell(2).getCellComment().getString().getString());
} }
@Test @Test
public void readWriteMultipleAuthors() { public void readWriteMultipleAuthors() {
XSSFWorkbook workbook = XSSFTestDataSamples.openSampleWorkbook("WithMoreVariousData.xlsx"); XSSFWorkbook workbook = XSSFTestDataSamples.openSampleWorkbook("WithMoreVariousData.xlsx");
XSSFSheet sheet1 = workbook.getSheetAt(0); XSSFSheet sheet1 = workbook.getSheetAt(0);
XSSFSheet sheet2 = workbook.getSheetAt(1); XSSFSheet sheet2 = workbook.getSheetAt(1);
assertTrue( sheet1.hasComments() ); assertTrue( sheet1.hasComments() );
assertFalse( sheet2.hasComments() ); assertFalse( sheet2.hasComments() );
assertEquals("Nick Burch", assertEquals("Nick Burch",
sheet1.getRow(4).getCell(2).getCellComment().getAuthor()); sheet1.getRow(4).getCell(2).getCellComment().getAuthor());
assertEquals("Nick Burch", assertEquals("Nick Burch",
sheet1.getRow(6).getCell(2).getCellComment().getAuthor()); sheet1.getRow(6).getCell(2).getCellComment().getAuthor());
assertEquals("Torchbox", assertEquals("Torchbox",
sheet1.getRow(12).getCell(2).getCellComment().getAuthor()); sheet1.getRow(12).getCell(2).getCellComment().getAuthor());
// Save, and re-load the file // Save, and re-load the file
workbook = XSSFTestDataSamples.writeOutAndReadBack(workbook); workbook = XSSFTestDataSamples.writeOutAndReadBack(workbook);
// Check we still have comments where we should do // Check we still have comments where we should do
sheet1 = workbook.getSheetAt(0); sheet1 = workbook.getSheetAt(0);
assertNotNull(sheet1.getRow(4).getCell(2).getCellComment()); assertNotNull(sheet1.getRow(4).getCell(2).getCellComment());
assertNotNull(sheet1.getRow(6).getCell(2).getCellComment()); assertNotNull(sheet1.getRow(6).getCell(2).getCellComment());
assertNotNull(sheet1.getRow(12).getCell(2).getCellComment()); assertNotNull(sheet1.getRow(12).getCell(2).getCellComment());
// And check they still have the contents they should do // And check they still have the contents they should do
assertEquals("Nick Burch", assertEquals("Nick Burch",
sheet1.getRow(4).getCell(2).getCellComment().getAuthor()); sheet1.getRow(4).getCell(2).getCellComment().getAuthor());
assertEquals("Nick Burch", assertEquals("Nick Burch",
sheet1.getRow(6).getCell(2).getCellComment().getAuthor()); sheet1.getRow(6).getCell(2).getCellComment().getAuthor());
assertEquals("Torchbox", assertEquals("Torchbox",
sheet1.getRow(12).getCell(2).getCellComment().getAuthor()); sheet1.getRow(12).getCell(2).getCellComment().getAuthor());
// Todo - check text too, once bug fixed // Todo - check text too, once bug fixed
} }
@Test @Test
public void removeComment() throws Exception { public void removeComment() throws Exception {
final CellAddress addrA1 = new CellAddress("A1"); final CellAddress addrA1 = new CellAddress("A1");
final CellAddress addrA2 = new CellAddress("A2"); final CellAddress addrA2 = new CellAddress("A2");
final CellAddress addrA3 = new CellAddress("A3"); final CellAddress addrA3 = new CellAddress("A3");
CommentsTable sheetComments = new CommentsTable(); CommentsTable sheetComments = new CommentsTable();
CTComment a1 = sheetComments.newComment(addrA1); CTComment a1 = sheetComments.newComment(addrA1);
CTComment a2 = sheetComments.newComment(addrA2); CTComment a2 = sheetComments.newComment(addrA2);
@ -244,7 +244,7 @@ public class TestCommentsTable {
assertNull(sheetComments.getCTComment(addrA3)); assertNull(sheetComments.getCTComment(addrA3));
} }
@Test @Test
public void bug54920() throws IOException { public void bug54920() throws IOException {
final Workbook workbook = new XSSFWorkbook(); final Workbook workbook = new XSSFWorkbook();
final Sheet sheet = workbook.createSheet("sheet01"); final Sheet sheet = workbook.createSheet("sheet01");