You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2021/05/22 20:22:17 UTC

svn commit: r1890119 [10/10] - in /poi/trunk/poi-ooxml/src: main/java/org/apache/poi/ooxml/extractor/ main/java/org/apache/poi/ooxml/util/ main/java/org/apache/poi/openxml4j/exceptions/ main/java/org/apache/poi/openxml4j/opc/ main/java/org/apache/poi/o...

Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFont.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFont.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFont.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFont.java Sat May 22 20:22:16 2021
@@ -53,52 +53,52 @@ import org.openxmlformats.schemas.spread
 
 public final class TestXSSFFont extends BaseTestFont{
 
-	public TestXSSFFont() {
-		super(XSSFITestDataProvider.instance);
-	}
-
-	@SuppressWarnings("unused")
-	public static Stream<Arguments> defaultFont() {
-		return Stream.of(Arguments.of("Calibri", (short) 220, IndexedColors.BLACK.getIndex()));
-	}
-
-	@Test
-	void testConstructor() {
-		XSSFFont xssfFont=new XSSFFont();
-		assertNotNull(xssfFont.getCTFont());
-	}
-
-	@Test
-	void testBold() {
-		CTFont ctFont=CTFont.Factory.newInstance();
-		CTBooleanProperty bool=ctFont.addNewB();
-		bool.setVal(false);
-		ctFont.setBArray(0,bool);
-		XSSFFont xssfFont=new XSSFFont(ctFont);
+    public TestXSSFFont() {
+        super(XSSFITestDataProvider.instance);
+    }
+
+    @SuppressWarnings("unused")
+    public static Stream<Arguments> defaultFont() {
+        return Stream.of(Arguments.of("Calibri", (short) 220, IndexedColors.BLACK.getIndex()));
+    }
+
+    @Test
+    void testConstructor() {
+        XSSFFont xssfFont=new XSSFFont();
+        assertNotNull(xssfFont.getCTFont());
+    }
+
+    @Test
+    void testBold() {
+        CTFont ctFont=CTFont.Factory.newInstance();
+        CTBooleanProperty bool=ctFont.addNewB();
+        bool.setVal(false);
+        ctFont.setBArray(0,bool);
+        XSSFFont xssfFont=new XSSFFont(ctFont);
         assertFalse(xssfFont.getBold());
 
 
-		xssfFont.setBold(true);
-		assertEquals(ctFont.sizeOfBArray(),1);
+        xssfFont.setBold(true);
+        assertEquals(ctFont.sizeOfBArray(),1);
         assertTrue(ctFont.getBArray(0).getVal());
-	}
+    }
 
-	@SuppressWarnings("deprecation")
-	@Test
-	void testCharSetWithDeprecatedFontCharset() throws IOException {
-		CTFont ctFont=CTFont.Factory.newInstance();
-		CTIntProperty prop=ctFont.addNewCharset();
-		prop.setVal(org.apache.poi.ss.usermodel.FontCharset.ANSI.getValue());
-
-		ctFont.setCharsetArray(0,prop);
-		XSSFFont xssfFont=new XSSFFont(ctFont);
-		assertEquals(Font.ANSI_CHARSET,xssfFont.getCharSet());
+    @SuppressWarnings("deprecation")
+    @Test
+    void testCharSetWithDeprecatedFontCharset() throws IOException {
+        CTFont ctFont=CTFont.Factory.newInstance();
+        CTIntProperty prop=ctFont.addNewCharset();
+        prop.setVal(org.apache.poi.ss.usermodel.FontCharset.ANSI.getValue());
+
+        ctFont.setCharsetArray(0,prop);
+        XSSFFont xssfFont=new XSSFFont(ctFont);
+        assertEquals(Font.ANSI_CHARSET,xssfFont.getCharSet());
 
-		xssfFont.setCharSet(org.apache.poi.ss.usermodel.FontCharset.DEFAULT);
-		assertEquals(org.apache.poi.ss.usermodel.FontCharset.DEFAULT.getValue(),ctFont.getCharsetArray(0).getVal());
+        xssfFont.setCharSet(org.apache.poi.ss.usermodel.FontCharset.DEFAULT);
+        assertEquals(org.apache.poi.ss.usermodel.FontCharset.DEFAULT.getValue(),ctFont.getCharsetArray(0).getVal());
 
-		// Try with a few less usual ones:
-		// Set with the Charset itself
+        // Try with a few less usual ones:
+        // Set with the Charset itself
         xssfFont.setCharSet(org.apache.poi.ss.usermodel.FontCharset.RUSSIAN);
         assertEquals(org.apache.poi.ss.usermodel.FontCharset.RUSSIAN.getValue(), xssfFont.getCharSet());
         // And set with the Charset index
@@ -110,269 +110,269 @@ public final class TestXSSFFont extends
         // This one isn't allowed
         assertNull(org.apache.poi.ss.usermodel.FontCharset.valueOf(9999));
         assertThrows(POIXMLException.class, () -> xssfFont.setCharSet(9999),
-			"Shouldn't be able to set an invalid charset");
+            "Shouldn't be able to set an invalid charset");
 
-		// Now try with a few sample files
+        // Now try with a few sample files
 
-		// Normal charset
+        // Normal charset
         try (XSSFWorkbook wb1 = XSSFTestDataSamples.openSampleWorkbook("Formatting.xlsx")) {
-			assertEquals(0,
-				wb1.getSheetAt(0).getRow(0).getCell(0).getCellStyle().getFont().getCharSet()
-			);
-		}
+            assertEquals(0,
+                wb1.getSheetAt(0).getRow(0).getCell(0).getCellStyle().getFont().getCharSet()
+            );
+        }
 
-		// GB2312 charset
+        // GB2312 charset
         try (XSSFWorkbook wb2 = XSSFTestDataSamples.openSampleWorkbook("49273.xlsx")) {
-			assertEquals(134,
-				wb2.getSheetAt(0).getRow(0).getCell(0).getCellStyle().getFont().getCharSet()
-			);
-		}
-	}
-
-	@Test
-	void testCharSet() throws IOException {
-		CTFont ctFont=CTFont.Factory.newInstance();
-		CTIntProperty prop=ctFont.addNewCharset();
-		prop.setVal(FontCharset.ANSI.getNativeId());
-
-		ctFont.setCharsetArray(0,prop);
-		XSSFFont xssfFont=new XSSFFont(ctFont);
-		assertEquals(Font.ANSI_CHARSET,xssfFont.getCharSet());
-
-		xssfFont.setCharSet(FontCharset.DEFAULT);
-		assertEquals(FontCharset.DEFAULT.getNativeId(),ctFont.getCharsetArray(0).getVal());
-
-		// Try with a few less usual ones:
-		// Set with the Charset itself
-		xssfFont.setCharSet(FontCharset.RUSSIAN);
-		assertEquals(FontCharset.RUSSIAN.getNativeId(), xssfFont.getCharSet());
-		// And set with the Charset index
-		xssfFont.setCharSet(FontCharset.ARABIC.getNativeId());
-		assertEquals(FontCharset.ARABIC.getNativeId(), xssfFont.getCharSet());
-		xssfFont.setCharSet((byte)(FontCharset.ARABIC.getNativeId()));
-		assertEquals(FontCharset.ARABIC.getNativeId(), xssfFont.getCharSet());
-
-		// This one isn't allowed
-		assertNull(FontCharset.valueOf(9999));
-		assertThrows(POIXMLException.class, () -> xssfFont.setCharSet(9999), "Shouldn't be able to set an invalid charset");
-
-		// Now try with a few sample files
-
-		// Normal charset
-		try (XSSFWorkbook wb1 = XSSFTestDataSamples.openSampleWorkbook("Formatting.xlsx")) {
-			assertEquals(0,
-				wb1.getSheetAt(0).getRow(0).getCell(0).getCellStyle().getFont().getCharSet()
-			);
-		}
-
-		// GB2312 charset
-		try (XSSFWorkbook wb2 = XSSFTestDataSamples.openSampleWorkbook("49273.xlsx")) {
-			assertEquals(134,
-				wb2.getSheetAt(0).getRow(0).getCell(0).getCellStyle().getFont().getCharSet()
-			);
-		}
-	}
-
-	@Test
-	void testFontName() {
-		CTFont ctFont=CTFont.Factory.newInstance();
-		CTFontName fname=ctFont.addNewName();
-		fname.setVal("Arial");
-		ctFont.setNameArray(0,fname);
-
-		XSSFFont xssfFont=new XSSFFont(ctFont);
-		assertEquals("Arial", xssfFont.getFontName());
-
-		xssfFont.setFontName("Courier");
-		assertEquals("Courier",ctFont.getNameArray(0).getVal());
-	}
-
-	@Test
-	void testItalic() {
-		CTFont ctFont=CTFont.Factory.newInstance();
-		CTBooleanProperty bool=ctFont.addNewI();
-		bool.setVal(false);
-		ctFont.setIArray(0,bool);
+            assertEquals(134,
+                wb2.getSheetAt(0).getRow(0).getCell(0).getCellStyle().getFont().getCharSet()
+            );
+        }
+    }
 
-		XSSFFont xssfFont=new XSSFFont(ctFont);
+    @Test
+    void testCharSet() throws IOException {
+        CTFont ctFont=CTFont.Factory.newInstance();
+        CTIntProperty prop=ctFont.addNewCharset();
+        prop.setVal(FontCharset.ANSI.getNativeId());
+
+        ctFont.setCharsetArray(0,prop);
+        XSSFFont xssfFont=new XSSFFont(ctFont);
+        assertEquals(Font.ANSI_CHARSET,xssfFont.getCharSet());
+
+        xssfFont.setCharSet(FontCharset.DEFAULT);
+        assertEquals(FontCharset.DEFAULT.getNativeId(),ctFont.getCharsetArray(0).getVal());
+
+        // Try with a few less usual ones:
+        // Set with the Charset itself
+        xssfFont.setCharSet(FontCharset.RUSSIAN);
+        assertEquals(FontCharset.RUSSIAN.getNativeId(), xssfFont.getCharSet());
+        // And set with the Charset index
+        xssfFont.setCharSet(FontCharset.ARABIC.getNativeId());
+        assertEquals(FontCharset.ARABIC.getNativeId(), xssfFont.getCharSet());
+        xssfFont.setCharSet((byte)(FontCharset.ARABIC.getNativeId()));
+        assertEquals(FontCharset.ARABIC.getNativeId(), xssfFont.getCharSet());
+
+        // This one isn't allowed
+        assertNull(FontCharset.valueOf(9999));
+        assertThrows(POIXMLException.class, () -> xssfFont.setCharSet(9999), "Shouldn't be able to set an invalid charset");
+
+        // Now try with a few sample files
+
+        // Normal charset
+        try (XSSFWorkbook wb1 = XSSFTestDataSamples.openSampleWorkbook("Formatting.xlsx")) {
+            assertEquals(0,
+                wb1.getSheetAt(0).getRow(0).getCell(0).getCellStyle().getFont().getCharSet()
+            );
+        }
+
+        // GB2312 charset
+        try (XSSFWorkbook wb2 = XSSFTestDataSamples.openSampleWorkbook("49273.xlsx")) {
+            assertEquals(134,
+                wb2.getSheetAt(0).getRow(0).getCell(0).getCellStyle().getFont().getCharSet()
+            );
+        }
+    }
+
+    @Test
+    void testFontName() {
+        CTFont ctFont=CTFont.Factory.newInstance();
+        CTFontName fname=ctFont.addNewName();
+        fname.setVal("Arial");
+        ctFont.setNameArray(0,fname);
+
+        XSSFFont xssfFont=new XSSFFont(ctFont);
+        assertEquals("Arial", xssfFont.getFontName());
+
+        xssfFont.setFontName("Courier");
+        assertEquals("Courier",ctFont.getNameArray(0).getVal());
+    }
+
+    @Test
+    void testItalic() {
+        CTFont ctFont=CTFont.Factory.newInstance();
+        CTBooleanProperty bool=ctFont.addNewI();
+        bool.setVal(false);
+        ctFont.setIArray(0,bool);
+
+        XSSFFont xssfFont=new XSSFFont(ctFont);
         assertFalse(xssfFont.getItalic());
 
-		xssfFont.setItalic(true);
-		assertEquals(ctFont.sizeOfIArray(),1);
+        xssfFont.setItalic(true);
+        assertEquals(ctFont.sizeOfIArray(),1);
         assertTrue(ctFont.getIArray(0).getVal());
         assertTrue(ctFont.getIArray(0).getVal());
-	}
+    }
 
-	@Test
-	void testStrikeout() {
-		CTFont ctFont=CTFont.Factory.newInstance();
-		CTBooleanProperty bool=ctFont.addNewStrike();
-		bool.setVal(false);
-		ctFont.setStrikeArray(0,bool);
+    @Test
+    void testStrikeout() {
+        CTFont ctFont=CTFont.Factory.newInstance();
+        CTBooleanProperty bool=ctFont.addNewStrike();
+        bool.setVal(false);
+        ctFont.setStrikeArray(0,bool);
 
-		XSSFFont xssfFont=new XSSFFont(ctFont);
+        XSSFFont xssfFont=new XSSFFont(ctFont);
         assertFalse(xssfFont.getStrikeout());
 
-		xssfFont.setStrikeout(true);
-		assertEquals(ctFont.sizeOfStrikeArray(),1);
+        xssfFont.setStrikeout(true);
+        assertEquals(ctFont.sizeOfStrikeArray(),1);
         assertTrue(ctFont.getStrikeArray(0).getVal());
         assertTrue(ctFont.getStrikeArray(0).getVal());
-	}
+    }
+
+    @Test
+    void testFontHeight() {
+        CTFont ctFont=CTFont.Factory.newInstance();
+        CTFontSize size=ctFont.addNewSz();
+        size.setVal(11);
+        ctFont.setSzArray(0,size);
+
+        XSSFFont xssfFont=new XSSFFont(ctFont);
+        assertEquals(11,xssfFont.getFontHeightInPoints());
+
+        xssfFont.setFontHeight(20);
+        assertEquals(20.0, ctFont.getSzArray(0).getVal(), 0.0);
+    }
+
+    @Test
+    void testFontHeightInPoint() {
+        CTFont ctFont=CTFont.Factory.newInstance();
+        CTFontSize size=ctFont.addNewSz();
+        size.setVal(14);
+        ctFont.setSzArray(0,size);
+
+        XSSFFont xssfFont=new XSSFFont(ctFont);
+        assertEquals(14,xssfFont.getFontHeightInPoints());
 
-	@Test
-	void testFontHeight() {
-		CTFont ctFont=CTFont.Factory.newInstance();
-		CTFontSize size=ctFont.addNewSz();
-		size.setVal(11);
-		ctFont.setSzArray(0,size);
-
-		XSSFFont xssfFont=new XSSFFont(ctFont);
-		assertEquals(11,xssfFont.getFontHeightInPoints());
-
-		xssfFont.setFontHeight(20);
-		assertEquals(20.0, ctFont.getSzArray(0).getVal(), 0.0);
-	}
-
-	@Test
-	void testFontHeightInPoint() {
-		CTFont ctFont=CTFont.Factory.newInstance();
-		CTFontSize size=ctFont.addNewSz();
-		size.setVal(14);
-		ctFont.setSzArray(0,size);
-
-		XSSFFont xssfFont=new XSSFFont(ctFont);
-		assertEquals(14,xssfFont.getFontHeightInPoints());
-
-		xssfFont.setFontHeightInPoints((short)20);
-		assertEquals(20.0, ctFont.getSzArray(0).getVal(), 0.0);
-	}
-
-	@Test
-	void testUnderline() {
-		CTFont ctFont=CTFont.Factory.newInstance();
-		CTUnderlineProperty underlinePropr=ctFont.addNewU();
-		underlinePropr.setVal(STUnderlineValues.SINGLE);
-		ctFont.setUArray(0,underlinePropr);
-
-		XSSFFont xssfFont=new XSSFFont(ctFont);
-		assertEquals(Font.U_SINGLE, xssfFont.getUnderline());
-
-		xssfFont.setUnderline(Font.U_DOUBLE);
-		assertEquals(ctFont.sizeOfUArray(),1);
-		assertEquals(STUnderlineValues.DOUBLE,ctFont.getUArray(0).getVal());
-
-		xssfFont.setUnderline(FontUnderline.DOUBLE_ACCOUNTING);
-		assertEquals(ctFont.sizeOfUArray(),1);
-		assertEquals(STUnderlineValues.DOUBLE_ACCOUNTING,ctFont.getUArray(0).getVal());
-	}
-
-	@Test
-	void testColor() {
-		CTFont ctFont=CTFont.Factory.newInstance();
-		CTColor color=ctFont.addNewColor();
-		color.setIndexed(XSSFFont.DEFAULT_FONT_COLOR);
-		ctFont.setColorArray(0,color);
-
-		XSSFFont xssfFont=new XSSFFont(ctFont);
-		assertEquals(IndexedColors.BLACK.getIndex(),xssfFont.getColor());
-
-		xssfFont.setColor(IndexedColors.RED.getIndex());
-		assertEquals(IndexedColors.RED.getIndex(), ctFont.getColorArray(0).getIndexed());
-	}
-
-	@Test
-	void testRgbColor() {
-		CTFont ctFont=CTFont.Factory.newInstance();
-		CTColor color=ctFont.addNewColor();
-
-		color.setRgb(Integer.toHexString(0xFFFFFF).getBytes(LocaleUtil.CHARSET_1252));
-		ctFont.setColorArray(0,color);
-
-		XSSFFont xssfFont=new XSSFFont(ctFont);
-		assertEquals(ctFont.getColorArray(0).getRgb()[0],xssfFont.getXSSFColor().getRGB()[0]);
-		assertEquals(ctFont.getColorArray(0).getRgb()[1],xssfFont.getXSSFColor().getRGB()[1]);
-		assertEquals(ctFont.getColorArray(0).getRgb()[2],xssfFont.getXSSFColor().getRGB()[2]);
-		assertEquals(ctFont.getColorArray(0).getRgb()[3],xssfFont.getXSSFColor().getRGB()[3]);
+        xssfFont.setFontHeightInPoints((short)20);
+        assertEquals(20.0, ctFont.getSzArray(0).getVal(), 0.0);
+    }
+
+    @Test
+    void testUnderline() {
+        CTFont ctFont=CTFont.Factory.newInstance();
+        CTUnderlineProperty underlinePropr=ctFont.addNewU();
+        underlinePropr.setVal(STUnderlineValues.SINGLE);
+        ctFont.setUArray(0,underlinePropr);
+
+        XSSFFont xssfFont=new XSSFFont(ctFont);
+        assertEquals(Font.U_SINGLE, xssfFont.getUnderline());
+
+        xssfFont.setUnderline(Font.U_DOUBLE);
+        assertEquals(ctFont.sizeOfUArray(),1);
+        assertEquals(STUnderlineValues.DOUBLE,ctFont.getUArray(0).getVal());
+
+        xssfFont.setUnderline(FontUnderline.DOUBLE_ACCOUNTING);
+        assertEquals(ctFont.sizeOfUArray(),1);
+        assertEquals(STUnderlineValues.DOUBLE_ACCOUNTING,ctFont.getUArray(0).getVal());
+    }
+
+    @Test
+    void testColor() {
+        CTFont ctFont=CTFont.Factory.newInstance();
+        CTColor color=ctFont.addNewColor();
+        color.setIndexed(XSSFFont.DEFAULT_FONT_COLOR);
+        ctFont.setColorArray(0,color);
+
+        XSSFFont xssfFont=new XSSFFont(ctFont);
+        assertEquals(IndexedColors.BLACK.getIndex(),xssfFont.getColor());
+
+        xssfFont.setColor(IndexedColors.RED.getIndex());
+        assertEquals(IndexedColors.RED.getIndex(), ctFont.getColorArray(0).getIndexed());
+    }
+
+    @Test
+    void testRgbColor() {
+        CTFont ctFont=CTFont.Factory.newInstance();
+        CTColor color=ctFont.addNewColor();
+
+        color.setRgb(Integer.toHexString(0xFFFFFF).getBytes(LocaleUtil.CHARSET_1252));
+        ctFont.setColorArray(0,color);
+
+        XSSFFont xssfFont=new XSSFFont(ctFont);
+        assertEquals(ctFont.getColorArray(0).getRgb()[0],xssfFont.getXSSFColor().getRGB()[0]);
+        assertEquals(ctFont.getColorArray(0).getRgb()[1],xssfFont.getXSSFColor().getRGB()[1]);
+        assertEquals(ctFont.getColorArray(0).getRgb()[2],xssfFont.getXSSFColor().getRGB()[2]);
+        assertEquals(ctFont.getColorArray(0).getRgb()[3],xssfFont.getXSSFColor().getRGB()[3]);
 
-		xssfFont.setColor((short)23);
+        xssfFont.setColor((short)23);
 
-		byte[] bytes = Integer.toHexString(0xF1F1F1).getBytes(LocaleUtil.CHARSET_1252);
+        byte[] bytes = Integer.toHexString(0xF1F1F1).getBytes(LocaleUtil.CHARSET_1252);
         color.setRgb(bytes);
-		XSSFColor newColor=XSSFColor.from(color, null);
-		xssfFont.setColor(newColor);
-		assertEquals(ctFont.getColorArray(0).getRgb()[2],newColor.getRGB()[2]);
-
-		assertArrayEquals(bytes, xssfFont.getXSSFColor().getRGB());
-		assertEquals(0, xssfFont.getColor());
-	}
-
-	@Test
-	void testThemeColor() {
-		CTFont ctFont=CTFont.Factory.newInstance();
-		CTColor color=ctFont.addNewColor();
-		color.setTheme(1);
-		ctFont.setColorArray(0,color);
-
-		XSSFFont xssfFont=new XSSFFont(ctFont);
-		assertEquals(ctFont.getColorArray(0).getTheme(),xssfFont.getThemeColor());
-
-		xssfFont.setThemeColor(IndexedColors.RED.getIndex());
-		assertEquals(IndexedColors.RED.getIndex(),ctFont.getColorArray(0).getTheme());
-	}
-
-	@Test
-	void testFamily() {
-		CTFont ctFont=CTFont.Factory.newInstance();
-		CTFontFamily family=ctFont.addNewFamily();
-		family.setVal(FontFamily.MODERN.getValue());
-		ctFont.setFamilyArray(0,family);
-
-		XSSFFont xssfFont=new XSSFFont(ctFont);
-		assertEquals(FontFamily.MODERN.getValue(),xssfFont.getFamily());
-	}
-
-	@Test
-	void testScheme() {
-		CTFont ctFont=CTFont.Factory.newInstance();
-		CTFontScheme scheme=ctFont.addNewScheme();
-		scheme.setVal(STFontScheme.MAJOR);
-		ctFont.setSchemeArray(0,scheme);
-
-		XSSFFont font=new XSSFFont(ctFont);
-		assertEquals(FontScheme.MAJOR,font.getScheme());
-
-		font.setScheme(FontScheme.NONE);
-		assertEquals(STFontScheme.NONE,ctFont.getSchemeArray(0).getVal());
-	}
-
-	@Test
-	void testTypeOffset() {
-		CTFont ctFont=CTFont.Factory.newInstance();
-		CTVerticalAlignFontProperty valign=ctFont.addNewVertAlign();
-		valign.setVal(STVerticalAlignRun.BASELINE);
-		ctFont.setVertAlignArray(0,valign);
-
-		XSSFFont font=new XSSFFont(ctFont);
-		assertEquals(Font.SS_NONE,font.getTypeOffset());
-
-		font.setTypeOffset(XSSFFont.SS_SUPER);
-		assertEquals(STVerticalAlignRun.SUPERSCRIPT,ctFont.getVertAlignArray(0).getVal());
-	}
-
-	// store test from TestSheetUtil here as it uses XSSF
-	@Test
-	void testCanComputeWidthXSSF() throws IOException {
+        XSSFColor newColor=XSSFColor.from(color, null);
+        xssfFont.setColor(newColor);
+        assertEquals(ctFont.getColorArray(0).getRgb()[2],newColor.getRGB()[2]);
+
+        assertArrayEquals(bytes, xssfFont.getXSSFColor().getRGB());
+        assertEquals(0, xssfFont.getColor());
+    }
+
+    @Test
+    void testThemeColor() {
+        CTFont ctFont=CTFont.Factory.newInstance();
+        CTColor color=ctFont.addNewColor();
+        color.setTheme(1);
+        ctFont.setColorArray(0,color);
+
+        XSSFFont xssfFont=new XSSFFont(ctFont);
+        assertEquals(ctFont.getColorArray(0).getTheme(),xssfFont.getThemeColor());
+
+        xssfFont.setThemeColor(IndexedColors.RED.getIndex());
+        assertEquals(IndexedColors.RED.getIndex(),ctFont.getColorArray(0).getTheme());
+    }
+
+    @Test
+    void testFamily() {
+        CTFont ctFont=CTFont.Factory.newInstance();
+        CTFontFamily family=ctFont.addNewFamily();
+        family.setVal(FontFamily.MODERN.getValue());
+        ctFont.setFamilyArray(0,family);
+
+        XSSFFont xssfFont=new XSSFFont(ctFont);
+        assertEquals(FontFamily.MODERN.getValue(),xssfFont.getFamily());
+    }
+
+    @Test
+    void testScheme() {
+        CTFont ctFont=CTFont.Factory.newInstance();
+        CTFontScheme scheme=ctFont.addNewScheme();
+        scheme.setVal(STFontScheme.MAJOR);
+        ctFont.setSchemeArray(0,scheme);
+
+        XSSFFont font=new XSSFFont(ctFont);
+        assertEquals(FontScheme.MAJOR,font.getScheme());
+
+        font.setScheme(FontScheme.NONE);
+        assertEquals(STFontScheme.NONE,ctFont.getSchemeArray(0).getVal());
+    }
+
+    @Test
+    void testTypeOffset() {
+        CTFont ctFont=CTFont.Factory.newInstance();
+        CTVerticalAlignFontProperty valign=ctFont.addNewVertAlign();
+        valign.setVal(STVerticalAlignRun.BASELINE);
+        ctFont.setVertAlignArray(0,valign);
+
+        XSSFFont font=new XSSFFont(ctFont);
+        assertEquals(Font.SS_NONE,font.getTypeOffset());
+
+        font.setTypeOffset(XSSFFont.SS_SUPER);
+        assertEquals(STVerticalAlignRun.SUPERSCRIPT,ctFont.getVertAlignArray(0).getVal());
+    }
+
+    // store test from TestSheetUtil here as it uses XSSF
+    @Test
+    void testCanComputeWidthXSSF() throws IOException {
         try (Workbook wb = new XSSFWorkbook()) {
 
-			// cannot check on result because on some machines we get back false here!
-			SheetUtil.canComputeColumnWidth(wb.getFontAt(0));
+            // cannot check on result because on some machines we get back false here!
+            SheetUtil.canComputeColumnWidth(wb.getFontAt(0));
 
-		}
+        }
     }
 
     // store test from TestSheetUtil here as it uses XSSF
-	@Test
-	void testCanComputeWidthInvalidFont() {
+    @Test
+    void testCanComputeWidthInvalidFont() {
         Font font = new XSSFFont(CTFont.Factory.newInstance());
         font.setFontName("some non existing font name");
 
@@ -380,120 +380,120 @@ public final class TestXSSFFont extends
         SheetUtil.canComputeColumnWidth(font);
     }
 
-	/**
-	 * Test that fonts get added properly
-	 */
-	@Test
-	void testFindFont() throws IOException {
-		try (XSSFWorkbook wb = new XSSFWorkbook()) {
-			assertEquals(1, wb.getNumberOfFonts());
-
-			XSSFSheet s = wb.createSheet();
-			s.createRow(0);
-			s.createRow(1);
-			s.getRow(0).createCell(0);
-			s.getRow(1).createCell(0);
-
-			assertEquals(1, wb.getNumberOfFonts());
-
-			XSSFFont f1 = wb.getFontAt(0);
-			assertFalse(f1.getBold());
-
-			// Check that asking for the same font
-			//  multiple times gives you the same thing.
-			// Otherwise, our tests wouldn't work!
-			assertSame(wb.getFontAt(0), wb.getFontAt(0));
-			assertEquals(
-				wb.getFontAt(0),
-				wb.getFontAt(0)
-			);
-
-			// Look for a new font we have
-			//  yet to add
-			assertNull(
-				wb.findFont(
-					false, IndexedColors.INDIGO.getIndex(), (short) 22,
-					"Thingy", false, true, (short) 2, (byte) 2
-				)
-			);
-			assertNull(
-				wb.getStylesSource().findFont(
-					false, new XSSFColor(IndexedColors.INDIGO, new DefaultIndexedColorMap()), (short) 22,
-					"Thingy", false, true, (short) 2, (byte) 2
-				)
-			);
-
-			XSSFFont nf = wb.createFont();
-			assertEquals(2, wb.getNumberOfFonts());
-
-			assertEquals(1, nf.getIndex());
-			assertEquals(nf, wb.getFontAt(1));
-
-			nf.setBold(false);
-			nf.setColor(IndexedColors.INDIGO.getIndex());
-			nf.setFontHeight((short) 22);
-			nf.setFontName("Thingy");
-			nf.setItalic(false);
-			nf.setStrikeout(true);
-			nf.setTypeOffset((short) 2);
-			nf.setUnderline((byte) 2);
-
-			assertEquals(2, wb.getNumberOfFonts());
-			assertEquals(nf, wb.getFontAt(1));
-
-			assertNotSame(wb.getFontAt(0), wb.getFontAt(1));
-
-			// Find it now
-			assertNotNull(
-				wb.findFont(
-					false, IndexedColors.INDIGO.getIndex(), (short) 22,
-					"Thingy", false, true, (short) 2, (byte) 2
-				)
-			);
-			assertNotNull(
-				wb.getStylesSource().findFont(
-					false, new XSSFColor(IndexedColors.INDIGO, new DefaultIndexedColorMap()), (short) 22,
-					"Thingy", false, true, (short) 2, (byte) 2
-				)
-			);
-
-			XSSFFont font = wb.findFont(
-				false, IndexedColors.INDIGO.getIndex(), (short) 22,
-				"Thingy", false, true, (short) 2, (byte) 2
-			);
-			assertNotNull(font);
-			assertEquals(
-				1,
-				font.getIndex()
-			);
-			assertEquals(nf,
-				wb.findFont(
-					false, IndexedColors.INDIGO.getIndex(), (short) 22,
-					"Thingy", false, true, (short) 2, (byte) 2
-				)
-			);
-			assertEquals(nf,
-				wb.getStylesSource().findFont(
-					false, new XSSFColor(IndexedColors.INDIGO, new DefaultIndexedColorMap()), (short) 22,
-					"Thingy", false, true, (short) 2, (byte) 2
-				)
-			);
-
-		}
-	}
-
-	@Test
-	void testEquals() {
-		XSSFFont font = new XSSFFont();
-		XSSFFont equ = new XSSFFont();
-		XSSFFont notequ = new XSSFFont();
-		notequ.setItalic(true);
-
-		assertEquals(equ, font);
-		assertNotEquals(font, notequ);
-
-		notequ.setItalic(false);
-		notequ.setThemeColor((short)123);
-		assertNotEquals(font, notequ);
-	}
+    /**
+     * Test that fonts get added properly
+     */
+    @Test
+    void testFindFont() throws IOException {
+        try (XSSFWorkbook wb = new XSSFWorkbook()) {
+            assertEquals(1, wb.getNumberOfFonts());
+
+            XSSFSheet s = wb.createSheet();
+            s.createRow(0);
+            s.createRow(1);
+            s.getRow(0).createCell(0);
+            s.getRow(1).createCell(0);
+
+            assertEquals(1, wb.getNumberOfFonts());
+
+            XSSFFont f1 = wb.getFontAt(0);
+            assertFalse(f1.getBold());
+
+            // Check that asking for the same font
+            //  multiple times gives you the same thing.
+            // Otherwise, our tests wouldn't work!
+            assertSame(wb.getFontAt(0), wb.getFontAt(0));
+            assertEquals(
+                wb.getFontAt(0),
+                wb.getFontAt(0)
+            );
+
+            // Look for a new font we have
+            //  yet to add
+            assertNull(
+                wb.findFont(
+                    false, IndexedColors.INDIGO.getIndex(), (short) 22,
+                    "Thingy", false, true, (short) 2, (byte) 2
+                )
+            );
+            assertNull(
+                wb.getStylesSource().findFont(
+                    false, new XSSFColor(IndexedColors.INDIGO, new DefaultIndexedColorMap()), (short) 22,
+                    "Thingy", false, true, (short) 2, (byte) 2
+                )
+            );
+
+            XSSFFont nf = wb.createFont();
+            assertEquals(2, wb.getNumberOfFonts());
+
+            assertEquals(1, nf.getIndex());
+            assertEquals(nf, wb.getFontAt(1));
+
+            nf.setBold(false);
+            nf.setColor(IndexedColors.INDIGO.getIndex());
+            nf.setFontHeight((short) 22);
+            nf.setFontName("Thingy");
+            nf.setItalic(false);
+            nf.setStrikeout(true);
+            nf.setTypeOffset((short) 2);
+            nf.setUnderline((byte) 2);
+
+            assertEquals(2, wb.getNumberOfFonts());
+            assertEquals(nf, wb.getFontAt(1));
+
+            assertNotSame(wb.getFontAt(0), wb.getFontAt(1));
+
+            // Find it now
+            assertNotNull(
+                wb.findFont(
+                    false, IndexedColors.INDIGO.getIndex(), (short) 22,
+                    "Thingy", false, true, (short) 2, (byte) 2
+                )
+            );
+            assertNotNull(
+                wb.getStylesSource().findFont(
+                    false, new XSSFColor(IndexedColors.INDIGO, new DefaultIndexedColorMap()), (short) 22,
+                    "Thingy", false, true, (short) 2, (byte) 2
+                )
+            );
+
+            XSSFFont font = wb.findFont(
+                false, IndexedColors.INDIGO.getIndex(), (short) 22,
+                "Thingy", false, true, (short) 2, (byte) 2
+            );
+            assertNotNull(font);
+            assertEquals(
+                1,
+                font.getIndex()
+            );
+            assertEquals(nf,
+                wb.findFont(
+                    false, IndexedColors.INDIGO.getIndex(), (short) 22,
+                    "Thingy", false, true, (short) 2, (byte) 2
+                )
+            );
+            assertEquals(nf,
+                wb.getStylesSource().findFont(
+                    false, new XSSFColor(IndexedColors.INDIGO, new DefaultIndexedColorMap()), (short) 22,
+                    "Thingy", false, true, (short) 2, (byte) 2
+                )
+            );
+
+        }
+    }
+
+    @Test
+    void testEquals() {
+        XSSFFont font = new XSSFFont();
+        XSSFFont equ = new XSSFFont();
+        XSSFFont notequ = new XSSFFont();
+        notequ.setItalic(true);
+
+        assertEquals(equ, font);
+        assertNotEquals(font, notequ);
+
+        notequ.setItalic(false);
+        notequ.setThemeColor((short)123);
+        assertNotEquals(font, notequ);
+    }
 }

Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXDDFChartLegend.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXDDFChartLegend.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXDDFChartLegend.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXDDFChartLegend.java Sat May 22 20:22:16 2021
@@ -37,28 +37,28 @@ import org.junit.jupiter.api.Test;
  */
 public final class TestXDDFChartLegend {
     @Test
-	void testLegendPositionAccessMethods() throws IOException {
-		XSSFWorkbook wb = new XSSFWorkbook();
-		XSSFSheet sheet = wb.createSheet();
-		XSSFDrawing drawing = sheet.createDrawingPatriarch();
-		XSSFClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, 1, 1, 10, 30);
-		XSSFChart chart = drawing.createChart(anchor);
-		XDDFChartLegend legend = chart.getOrAddLegend();
+    void testLegendPositionAccessMethods() throws IOException {
+        XSSFWorkbook wb = new XSSFWorkbook();
+        XSSFSheet sheet = wb.createSheet();
+        XSSFDrawing drawing = sheet.createDrawingPatriarch();
+        XSSFClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, 1, 1, 10, 30);
+        XSSFChart chart = drawing.createChart(anchor);
+        XDDFChartLegend legend = chart.getOrAddLegend();
 
-		legend.setPosition(LegendPosition.TOP_RIGHT);
-		assertEquals(LegendPosition.TOP_RIGHT, legend.getPosition());
+        legend.setPosition(LegendPosition.TOP_RIGHT);
+        assertEquals(LegendPosition.TOP_RIGHT, legend.getPosition());
 
-		wb.close();
-	}
+        wb.close();
+    }
 
     @Test
     void test_setOverlay_defaultChartLegend_expectOverlayInitialValueSetToFalse() throws IOException {
         // Arrange
-    	XSSFWorkbook wb = new XSSFWorkbook();
-    	XSSFSheet sheet = wb.createSheet();
-    	XSSFDrawing drawing = sheet.createDrawingPatriarch();
-    	XSSFClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, 1, 1, 10, 30);
-    	XSSFChart chart = drawing.createChart(anchor);
+        XSSFWorkbook wb = new XSSFWorkbook();
+        XSSFSheet sheet = wb.createSheet();
+        XSSFDrawing drawing = sheet.createDrawingPatriarch();
+        XSSFClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, 1, 1, 10, 30);
+        XSSFChart chart = drawing.createChart(anchor);
         XDDFChartLegend legend = chart.getOrAddLegend();
 
         // Act
@@ -72,19 +72,19 @@ public final class TestXDDFChartLegend {
     @Test
     void test_setOverlay_chartLegendSetToTrue_expectOverlayInitialValueSetToTrue() throws IOException {
         // Arrange
-    	XSSFWorkbook wb = new XSSFWorkbook();
+        XSSFWorkbook wb = new XSSFWorkbook();
         XSSFSheet sheet = wb.createSheet();
-		XSSFDrawing drawing = sheet.createDrawingPatriarch();
-		XSSFClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, 1, 1, 10, 30);
-		XSSFChart chart = drawing.createChart(anchor);
-		XDDFChartLegend legend = chart.getOrAddLegend();
+        XSSFDrawing drawing = sheet.createDrawingPatriarch();
+        XSSFClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, 1, 1, 10, 30);
+        XSSFChart chart = drawing.createChart(anchor);
+        XDDFChartLegend legend = chart.getOrAddLegend();
 
         // Act
-		legend.setOverlay(true);
+        legend.setOverlay(true);
 
         // Assert
         assertTrue(legend.isOverlay());
 
         wb.close();
-	}
+    }
 }

Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXDDFManualLayout.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXDDFManualLayout.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXDDFManualLayout.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXDDFManualLayout.java Sat May 22 20:22:16 2021
@@ -55,64 +55,64 @@ public final class TestXDDFManualLayout
         wb.close();
     }
 
-	/*
-	 * Accessor methods are not trivial. They use lazy underlying bean
-	 * initialization so there can be some errors (NPE, for example).
-	 */
+    /*
+     * Accessor methods are not trivial. They use lazy underlying bean
+     * initialization so there can be some errors (NPE, for example).
+     */
     @Test
     void testAccessorMethods() {
-		final double newRatio = 1.1;
-		final double newCoordinate = 0.3;
-		final LayoutMode nonDefaultMode = LayoutMode.FACTOR;
-		final LayoutTarget nonDefaultTarget = LayoutTarget.OUTER;
+        final double newRatio = 1.1;
+        final double newCoordinate = 0.3;
+        final LayoutMode nonDefaultMode = LayoutMode.FACTOR;
+        final LayoutTarget nonDefaultTarget = LayoutTarget.OUTER;
 
-		layout.setWidthRatio(newRatio);
+        layout.setWidthRatio(newRatio);
         assertEquals(layout.getWidthRatio(), newRatio, 0.0);
 
-		layout.setHeightRatio(newRatio);
+        layout.setHeightRatio(newRatio);
         assertEquals(layout.getHeightRatio(), newRatio, 0.0);
 
-		layout.setX(newCoordinate);
+        layout.setX(newCoordinate);
         assertEquals(layout.getX(), newCoordinate, 0.0);
 
-		layout.setY(newCoordinate);
+        layout.setY(newCoordinate);
         assertEquals(layout.getY(), newCoordinate, 0.0);
 
-		layout.setXMode(nonDefaultMode);
+        layout.setXMode(nonDefaultMode);
         assertSame(layout.getXMode(), nonDefaultMode);
 
-		layout.setYMode(nonDefaultMode);
+        layout.setYMode(nonDefaultMode);
         assertSame(layout.getYMode(), nonDefaultMode);
 
-		layout.setWidthMode(nonDefaultMode);
+        layout.setWidthMode(nonDefaultMode);
         assertSame(layout.getWidthMode(), nonDefaultMode);
 
-		layout.setHeightMode(nonDefaultMode);
+        layout.setHeightMode(nonDefaultMode);
         assertSame(layout.getHeightMode(), nonDefaultMode);
 
-		layout.setTarget(nonDefaultTarget);
+        layout.setTarget(nonDefaultTarget);
         assertSame(layout.getTarget(), nonDefaultTarget);
 
-	}
+    }
 
-	/*
-	 * Layout must have reasonable default values and must not throw
-	 * any exceptions.
-	 */
+    /*
+     * Layout must have reasonable default values and must not throw
+     * any exceptions.
+     */
     @Test
     void testDefaultValues() {
-		assertNotNull(layout.getTarget());
-		assertNotNull(layout.getXMode());
-		assertNotNull(layout.getYMode());
-		assertNotNull(layout.getHeightMode());
-		assertNotNull(layout.getWidthMode());
-		/*
-		 * According to interface, 0.0 should be returned for
-		 * uninitialized double properties.
-		 */
+        assertNotNull(layout.getTarget());
+        assertNotNull(layout.getXMode());
+        assertNotNull(layout.getYMode());
+        assertNotNull(layout.getHeightMode());
+        assertNotNull(layout.getWidthMode());
+        /*
+         * According to interface, 0.0 should be returned for
+         * uninitialized double properties.
+         */
         assertEquals(0.0, layout.getX(), 0.0);
         assertEquals(0.0, layout.getY(), 0.0);
         assertEquals(0.0, layout.getWidthRatio(), 0.0);
         assertEquals(0.0, layout.getHeightRatio(), 0.0);
-	}
+    }
 }

Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFCategoryAxis.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFCategoryAxis.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFCategoryAxis.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFCategoryAxis.java Sat May 22 20:22:16 2021
@@ -30,19 +30,19 @@ import org.apache.poi.xssf.usermodel.XSS
 import org.junit.jupiter.api.Test;
 
 public final class TestXSSFCategoryAxis {
-	@Test
-	void testAccessMethods() throws Exception {
-		try (XSSFWorkbook wb = new XSSFWorkbook()) {
-			XSSFSheet sheet = wb.createSheet();
-			XSSFDrawing drawing = sheet.createDrawingPatriarch();
-			XSSFClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, 1, 1, 10, 30);
-			XSSFChart chart = drawing.createChart(anchor);
-			XDDFCategoryAxis axis = chart.createCategoryAxis(AxisPosition.BOTTOM);
+    @Test
+    void testAccessMethods() throws Exception {
+        try (XSSFWorkbook wb = new XSSFWorkbook()) {
+            XSSFSheet sheet = wb.createSheet();
+            XSSFDrawing drawing = sheet.createDrawingPatriarch();
+            XSSFClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, 1, 1, 10, 30);
+            XSSFChart chart = drawing.createChart(anchor);
+            XDDFCategoryAxis axis = chart.createCategoryAxis(AxisPosition.BOTTOM);
 
-			axis.setCrosses(AxisCrosses.AUTO_ZERO);
-			assertEquals(axis.getCrosses(), AxisCrosses.AUTO_ZERO);
+            axis.setCrosses(AxisCrosses.AUTO_ZERO);
+            assertEquals(axis.getCrosses(), AxisCrosses.AUTO_ZERO);
 
-			assertEquals(chart.getAxes().size(), 1);
-		}
-	}
+            assertEquals(chart.getAxes().size(), 1);
+        }
+    }
 }

Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java Sat May 22 20:22:16 2021
@@ -40,124 +40,124 @@ import org.junit.jupiter.api.Test;
 
 public final class TestXSSFChartAxis {
 
-	private static final double EPSILON = 1E-7;
-	private XSSFWorkbook wb;
-	private XDDFChartAxis axis;
-
-	@BeforeEach
-	void setup() {
-		wb = new XSSFWorkbook();
-		XSSFSheet sheet = wb.createSheet();
-		XSSFDrawing drawing = sheet.createDrawingPatriarch();
-		XSSFClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, 1, 1, 10, 30);
-		XSSFChart chart = drawing.createChart(anchor);
-		axis = chart.createValueAxis(AxisPosition.BOTTOM);
-	}
-
-	@AfterEach
-	void teardown() throws IOException {
-		wb.close();
-		wb = null;
-		axis = null;
-	}
-
-	@Test
-	void testLogBaseIllegalArgument() {
-		IllegalArgumentException iae = null;
-		try {
-			axis.setLogBase(0.0);
-		} catch (IllegalArgumentException e) {
-			iae = e;
-		}
-		assertNotNull(iae);
-
-		iae = null;
-		try {
-			axis.setLogBase(30000.0);
-		} catch (IllegalArgumentException e) {
-			iae = e;
-		}
-		assertNotNull(iae);
-	}
-
-	@Test
-	void testLogBaseLegalArgument() {
-		axis.setLogBase(Math.E);
-		assertTrue(Math.abs(axis.getLogBase() - Math.E) < EPSILON);
-	}
-
-	@Test
-	void testNumberFormat() {
-		final String numberFormat = "General";
-		axis.setNumberFormat(numberFormat);
-		assertEquals(numberFormat, axis.getNumberFormat());
-	}
-
-	@Test
-	void testMaxAndMinAccessMethods() {
-		final double newValue = 10.0;
-
-		axis.setMinimum(newValue);
-		assertTrue(Math.abs(axis.getMinimum() - newValue) < EPSILON);
-
-		axis.setMaximum(newValue);
-		assertTrue(Math.abs(axis.getMaximum() - newValue) < EPSILON);
-	}
-
-	@Test
-	void testVisibleAccessMethods() {
-		axis.setVisible(true);
-		assertTrue(axis.isVisible());
-
-		axis.setVisible(false);
-		assertFalse(axis.isVisible());
-	}
-
-	@Test
-	void testMajorTickMarkAccessMethods() {
-		axis.setMajorTickMark(AxisTickMark.NONE);
-		assertEquals(AxisTickMark.NONE, axis.getMajorTickMark());
-
-		axis.setMajorTickMark(AxisTickMark.IN);
-		assertEquals(AxisTickMark.IN, axis.getMajorTickMark());
-
-		axis.setMajorTickMark(AxisTickMark.OUT);
-		assertEquals(AxisTickMark.OUT, axis.getMajorTickMark());
-
-		axis.setMajorTickMark(AxisTickMark.CROSS);
-		assertEquals(AxisTickMark.CROSS, axis.getMajorTickMark());
-	}
-
-	@Test
-	void testMinorTickMarkAccessMethods() {
-		axis.setMinorTickMark(AxisTickMark.NONE);
-		assertEquals(AxisTickMark.NONE, axis.getMinorTickMark());
-
-		axis.setMinorTickMark(AxisTickMark.IN);
-		assertEquals(AxisTickMark.IN, axis.getMinorTickMark());
-
-		axis.setMinorTickMark(AxisTickMark.OUT);
-		assertEquals(AxisTickMark.OUT, axis.getMinorTickMark());
-
-		axis.setMinorTickMark(AxisTickMark.CROSS);
-		assertEquals(AxisTickMark.CROSS, axis.getMinorTickMark());
-	}
-
-	@Test
-	void testGetChartAxisBug57362() throws IOException {
-	  //Load existing excel with some chart on it having primary and secondary axis.
-	    try (final XSSFWorkbook workbook = XSSFTestDataSamples.openSampleWorkbook("57362.xlsx")) {
-			final XSSFSheet sh = workbook.getSheetAt(0);
-			final XSSFDrawing drawing = sh.createDrawingPatriarch();
-			final XSSFChart chart = drawing.getCharts().get(0);
-
-			final List<? extends XDDFChartAxis> axisList = chart.getAxes();
-
-			assertEquals(4, axisList.size());
-			assertNotNull(axisList.get(0));
-			assertNotNull(axisList.get(1));
-			assertNotNull(axisList.get(2));
-			assertNotNull(axisList.get(3));
-		}
-	}
+    private static final double EPSILON = 1E-7;
+    private XSSFWorkbook wb;
+    private XDDFChartAxis axis;
+
+    @BeforeEach
+    void setup() {
+        wb = new XSSFWorkbook();
+        XSSFSheet sheet = wb.createSheet();
+        XSSFDrawing drawing = sheet.createDrawingPatriarch();
+        XSSFClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, 1, 1, 10, 30);
+        XSSFChart chart = drawing.createChart(anchor);
+        axis = chart.createValueAxis(AxisPosition.BOTTOM);
+    }
+
+    @AfterEach
+    void teardown() throws IOException {
+        wb.close();
+        wb = null;
+        axis = null;
+    }
+
+    @Test
+    void testLogBaseIllegalArgument() {
+        IllegalArgumentException iae = null;
+        try {
+            axis.setLogBase(0.0);
+        } catch (IllegalArgumentException e) {
+            iae = e;
+        }
+        assertNotNull(iae);
+
+        iae = null;
+        try {
+            axis.setLogBase(30000.0);
+        } catch (IllegalArgumentException e) {
+            iae = e;
+        }
+        assertNotNull(iae);
+    }
+
+    @Test
+    void testLogBaseLegalArgument() {
+        axis.setLogBase(Math.E);
+        assertTrue(Math.abs(axis.getLogBase() - Math.E) < EPSILON);
+    }
+
+    @Test
+    void testNumberFormat() {
+        final String numberFormat = "General";
+        axis.setNumberFormat(numberFormat);
+        assertEquals(numberFormat, axis.getNumberFormat());
+    }
+
+    @Test
+    void testMaxAndMinAccessMethods() {
+        final double newValue = 10.0;
+
+        axis.setMinimum(newValue);
+        assertTrue(Math.abs(axis.getMinimum() - newValue) < EPSILON);
+
+        axis.setMaximum(newValue);
+        assertTrue(Math.abs(axis.getMaximum() - newValue) < EPSILON);
+    }
+
+    @Test
+    void testVisibleAccessMethods() {
+        axis.setVisible(true);
+        assertTrue(axis.isVisible());
+
+        axis.setVisible(false);
+        assertFalse(axis.isVisible());
+    }
+
+    @Test
+    void testMajorTickMarkAccessMethods() {
+        axis.setMajorTickMark(AxisTickMark.NONE);
+        assertEquals(AxisTickMark.NONE, axis.getMajorTickMark());
+
+        axis.setMajorTickMark(AxisTickMark.IN);
+        assertEquals(AxisTickMark.IN, axis.getMajorTickMark());
+
+        axis.setMajorTickMark(AxisTickMark.OUT);
+        assertEquals(AxisTickMark.OUT, axis.getMajorTickMark());
+
+        axis.setMajorTickMark(AxisTickMark.CROSS);
+        assertEquals(AxisTickMark.CROSS, axis.getMajorTickMark());
+    }
+
+    @Test
+    void testMinorTickMarkAccessMethods() {
+        axis.setMinorTickMark(AxisTickMark.NONE);
+        assertEquals(AxisTickMark.NONE, axis.getMinorTickMark());
+
+        axis.setMinorTickMark(AxisTickMark.IN);
+        assertEquals(AxisTickMark.IN, axis.getMinorTickMark());
+
+        axis.setMinorTickMark(AxisTickMark.OUT);
+        assertEquals(AxisTickMark.OUT, axis.getMinorTickMark());
+
+        axis.setMinorTickMark(AxisTickMark.CROSS);
+        assertEquals(AxisTickMark.CROSS, axis.getMinorTickMark());
+    }
+
+    @Test
+    void testGetChartAxisBug57362() throws IOException {
+      //Load existing excel with some chart on it having primary and secondary axis.
+        try (final XSSFWorkbook workbook = XSSFTestDataSamples.openSampleWorkbook("57362.xlsx")) {
+            final XSSFSheet sh = workbook.getSheetAt(0);
+            final XSSFDrawing drawing = sh.createDrawingPatriarch();
+            final XSSFChart chart = drawing.getCharts().get(0);
+
+            final List<? extends XDDFChartAxis> axisList = chart.getAxes();
+
+            assertEquals(4, axisList.size());
+            assertNotNull(axisList.get(0));
+            assertNotNull(axisList.get(1));
+            assertNotNull(axisList.get(2));
+            assertNotNull(axisList.get(3));
+        }
+    }
 }

Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartTitle.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartTitle.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartTitle.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartTitle.java Sat May 22 20:22:16 2021
@@ -54,8 +54,8 @@ import org.junit.jupiter.api.Test;
  */
 class TestXSSFChartTitle {
     private XSSFWorkbook createWorkbookWithChart() {
-    	XSSFWorkbook wb = new XSSFWorkbook();
-    	XSSFSheet sheet = wb.createSheet("linechart");
+        XSSFWorkbook wb = new XSSFWorkbook();
+        XSSFSheet sheet = wb.createSheet("linechart");
         final int NUM_OF_ROWS = 3;
         final int NUM_OF_COLUMNS = 10;
 

Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFDateAxis.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFDateAxis.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFDateAxis.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFDateAxis.java Sat May 22 20:22:16 2021
@@ -31,19 +31,19 @@ import org.junit.jupiter.api.Test;
 
 public final class TestXSSFDateAxis {
 
-	@Test
-	void testAccessMethods() throws Exception {
-		try (XSSFWorkbook wb = new XSSFWorkbook()) {
-			XSSFSheet sheet = wb.createSheet();
-			XSSFDrawing drawing = sheet.createDrawingPatriarch();
-			XSSFClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, 1, 1, 10, 30);
-			XSSFChart chart = drawing.createChart(anchor);
-			XDDFDateAxis axis = chart.createDateAxis(AxisPosition.BOTTOM);
+    @Test
+    void testAccessMethods() throws Exception {
+        try (XSSFWorkbook wb = new XSSFWorkbook()) {
+            XSSFSheet sheet = wb.createSheet();
+            XSSFDrawing drawing = sheet.createDrawingPatriarch();
+            XSSFClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, 1, 1, 10, 30);
+            XSSFChart chart = drawing.createChart(anchor);
+            XDDFDateAxis axis = chart.createDateAxis(AxisPosition.BOTTOM);
 
-			axis.setCrosses(AxisCrosses.AUTO_ZERO);
-			assertEquals(axis.getCrosses(), AxisCrosses.AUTO_ZERO);
+            axis.setCrosses(AxisCrosses.AUTO_ZERO);
+            assertEquals(axis.getCrosses(), AxisCrosses.AUTO_ZERO);
 
-			assertEquals(chart.getAxes().size(), 1);
-		}
-	}
+            assertEquals(chart.getAxes().size(), 1);
+        }
+    }
 }

Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFScatterChartData.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFScatterChartData.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFScatterChartData.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFScatterChartData.java Sat May 22 20:22:16 2021
@@ -53,8 +53,8 @@ public final class TestXSSFScatterChartD
 
     @Test
     void testOneSeriePlot() throws IOException {
-    	XSSFWorkbook wb = new XSSFWorkbook();
-    	XSSFSheet sheet = (XSSFSheet) new SheetBuilder(wb, plotData).build();
+        XSSFWorkbook wb = new XSSFWorkbook();
+        XSSFSheet sheet = (XSSFSheet) new SheetBuilder(wb, plotData).build();
         XSSFDrawing drawing = sheet.createDrawingPatriarch();
         XSSFClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, 1, 1, 10, 30);
         XSSFChart chart = drawing.createChart(anchor);

Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFValueAxis.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFValueAxis.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFValueAxis.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFValueAxis.java Sat May 22 20:22:16 2021
@@ -32,22 +32,22 @@ import org.junit.jupiter.api.Test;
 
 public final class TestXSSFValueAxis {
 
-	@Test
-	void testAccessMethods() throws Exception {
-		try (XSSFWorkbook wb = new XSSFWorkbook()) {
-			XSSFSheet sheet = wb.createSheet();
-			XSSFDrawing drawing = sheet.createDrawingPatriarch();
-			XSSFClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, 1, 1, 10, 30);
-			XSSFChart chart = drawing.createChart(anchor);
-			XDDFValueAxis axis = chart.createValueAxis(AxisPosition.BOTTOM);
+    @Test
+    void testAccessMethods() throws Exception {
+        try (XSSFWorkbook wb = new XSSFWorkbook()) {
+            XSSFSheet sheet = wb.createSheet();
+            XSSFDrawing drawing = sheet.createDrawingPatriarch();
+            XSSFClientAnchor anchor = drawing.createAnchor(0, 0, 0, 0, 1, 1, 10, 30);
+            XSSFChart chart = drawing.createChart(anchor);
+            XDDFValueAxis axis = chart.createValueAxis(AxisPosition.BOTTOM);
 
-			axis.setCrossBetween(AxisCrossBetween.MIDPOINT_CATEGORY);
-			assertEquals(axis.getCrossBetween(), AxisCrossBetween.MIDPOINT_CATEGORY);
+            axis.setCrossBetween(AxisCrossBetween.MIDPOINT_CATEGORY);
+            assertEquals(axis.getCrossBetween(), AxisCrossBetween.MIDPOINT_CATEGORY);
 
-			axis.setCrosses(AxisCrosses.AUTO_ZERO);
-			assertEquals(axis.getCrosses(), AxisCrosses.AUTO_ZERO);
+            axis.setCrosses(AxisCrosses.AUTO_ZERO);
+            assertEquals(axis.getCrosses(), AxisCrosses.AUTO_ZERO);
 
-			assertEquals(chart.getAxes().size(), 1);
-		}
-	}
+            assertEquals(chart.getAxes().size(), 1);
+        }
+    }
 }

Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFBorder.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFBorder.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFBorder.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFBorder.java Sat May 22 20:22:16 2021
@@ -30,27 +30,27 @@ import org.openxmlformats.schemas.spread
 
 class TestXSSFBorder {
 
-	@Test
-	void testGetBorderStyle() {
-		CTStylesheet stylesheet = CTStylesheet.Factory.newInstance();
-		CTBorder border = stylesheet.addNewBorders().addNewBorder();
-		CTBorderPr top = border.addNewTop();
-		CTBorderPr right = border.addNewRight();
-		CTBorderPr bottom = border.addNewBottom();
-
-		top.setStyle(STBorderStyle.DASH_DOT);
-		right.setStyle(STBorderStyle.NONE);
-		bottom.setStyle(STBorderStyle.THIN);
-
-		XSSFCellBorder cellBorderStyle = new XSSFCellBorder(border);
-		assertEquals("DASH_DOT", cellBorderStyle.getBorderStyle(BorderSide.TOP).toString());
+    @Test
+    void testGetBorderStyle() {
+        CTStylesheet stylesheet = CTStylesheet.Factory.newInstance();
+        CTBorder border = stylesheet.addNewBorders().addNewBorder();
+        CTBorderPr top = border.addNewTop();
+        CTBorderPr right = border.addNewRight();
+        CTBorderPr bottom = border.addNewBottom();
+
+        top.setStyle(STBorderStyle.DASH_DOT);
+        right.setStyle(STBorderStyle.NONE);
+        bottom.setStyle(STBorderStyle.THIN);
+
+        XSSFCellBorder cellBorderStyle = new XSSFCellBorder(border);
+        assertEquals("DASH_DOT", cellBorderStyle.getBorderStyle(BorderSide.TOP).toString());
 
-		assertEquals("NONE", cellBorderStyle.getBorderStyle(BorderSide.RIGHT).toString());
-		assertEquals(BorderStyle.NONE.ordinal(), cellBorderStyle.getBorderStyle(BorderSide.RIGHT).ordinal());
+        assertEquals("NONE", cellBorderStyle.getBorderStyle(BorderSide.RIGHT).toString());
+        assertEquals(BorderStyle.NONE.ordinal(), cellBorderStyle.getBorderStyle(BorderSide.RIGHT).ordinal());
 
-		assertEquals("THIN", cellBorderStyle.getBorderStyle(BorderSide.BOTTOM).toString());
+        assertEquals("THIN", cellBorderStyle.getBorderStyle(BorderSide.BOTTOM).toString());
 
-		assertEquals(BorderStyle.THIN.ordinal(), cellBorderStyle.getBorderStyle(BorderSide.BOTTOM).ordinal());
-	}
+        assertEquals(BorderStyle.THIN.ordinal(), cellBorderStyle.getBorderStyle(BorderSide.BOTTOM).ordinal());
+    }
 
 }

Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/TestDocumentProtection.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/TestDocumentProtection.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/TestDocumentProtection.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/TestDocumentProtection.java Sat May 22 20:22:16 2021
@@ -83,7 +83,7 @@ class TestDocumentProtection {
 
     @Test
     void testShouldEnforceForReadOnly() throws IOException {
-        //		XWPFDocument document = createDocumentFromSampleFile("test-data/document/documentProtection_no_protection.docx");
+        //      XWPFDocument document = createDocumentFromSampleFile("test-data/document/documentProtection_no_protection.docx");
         XWPFDocument document = XWPFTestDataSamples.openSampleDocument("documentProtection_no_protection.docx");
         assertFalse(document.isEnforcedReadonlyProtection());
 

Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java Sat May 22 20:22:16 2021
@@ -454,21 +454,21 @@ public final class TestXWPFDocument {
         doc.close();
     }
 
-	@Test
-	void testEnforcedWith() throws IOException {
+    @Test
+    void testEnforcedWith() throws IOException {
         try (XWPFDocument docx = XWPFTestDataSamples.openSampleDocument("EnforcedWith.docx")) {
             assertTrue(docx.isEnforcedProtection());
         }
     }
 
-	@Test
-	@Disabled("XWPF should be able to write to a new Stream when opened Read-Only")
-	void testWriteFromReadOnlyOPC() throws Exception {
-	    OPCPackage opc = OPCPackage.open(
-	            POIDataSamples.getDocumentInstance().getFile("SampleDoc.docx"),
-	            PackageAccess.READ
-	    );
-	    XWPFDocument doc = new XWPFDocument(opc);
+    @Test
+    @Disabled("XWPF should be able to write to a new Stream when opened Read-Only")
+    void testWriteFromReadOnlyOPC() throws Exception {
+        OPCPackage opc = OPCPackage.open(
+                POIDataSamples.getDocumentInstance().getFile("SampleDoc.docx"),
+                PackageAccess.READ
+        );
+        XWPFDocument doc = new XWPFDocument(opc);
 
         final String origText;
         try (XWPFWordExtractor ext = new XWPFWordExtractor(doc)) {

Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFHeadings.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFHeadings.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFHeadings.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFHeadings.java Sat May 22 20:22:16 2021
@@ -47,19 +47,19 @@ public final class TestXWPFHeadings {
             doc.createTOC();
         /*
         // TODO - finish this test
-		if (false) {
-			CTStyles styles = doc.getStyle();
-			CTStyle style = styles.addNewStyle();
-			style.setType(STStyleType.PARAGRAPH);
-			style.setStyleId("Heading1");
-		}
+        if (false) {
+            CTStyles styles = doc.getStyle();
+            CTStyle style = styles.addNewStyle();
+            style.setType(STStyleType.PARAGRAPH);
+            style.setStyleId("Heading1");
+        }
 
-		if (false) {
-			File file = TempFile.createTempFile("testHeaders", ".docx");
-			OutputStream out = new FileOutputStream(file);
-			doc.write(out);
-			out.close();
-		}
+        if (false) {
+            File file = TempFile.createTempFile("testHeaders", ".docx");
+            OutputStream out = new FileOutputStream(file);
+            doc.write(out);
+            out.close();
+        }
         */
         }
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org