Removed System.out.println and compiler warnings from test code
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@736193 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
07fd83a278
commit
3463da015d
@ -27,14 +27,11 @@ import java.awt.geom.Line2D;
|
||||
*
|
||||
* @author Glen Stampoultzis (glens at apache.org)
|
||||
*/
|
||||
public class TestEscherGraphics2d extends TestCase
|
||||
{
|
||||
public final class TestEscherGraphics2d extends TestCase {
|
||||
private HSSFShapeGroup escherGroup;
|
||||
private EscherGraphics2d graphics;
|
||||
|
||||
protected void setUp() throws Exception
|
||||
{
|
||||
super.setUp();
|
||||
protected void setUp() {
|
||||
|
||||
HSSFWorkbook workbook = new HSSFWorkbook();
|
||||
HSSFSheet sheet = workbook.createSheet("test");
|
||||
@ -42,11 +39,9 @@ public class TestEscherGraphics2d extends TestCase
|
||||
escherGroup = new HSSFShapeGroup(null, new HSSFChildAnchor());
|
||||
EscherGraphics g = new EscherGraphics(this.escherGroup, workbook, Color.black, 1.0f);
|
||||
graphics = new EscherGraphics2d(g);
|
||||
|
||||
}
|
||||
|
||||
public void testDrawString() throws Exception
|
||||
{
|
||||
public void testDrawString() {
|
||||
graphics.drawString("This is a test", 10, 10);
|
||||
HSSFTextbox t = (HSSFTextbox) escherGroup.getChildren().get(0);
|
||||
assertEquals("This is a test", t.getString().getString().toString());
|
||||
@ -72,11 +67,11 @@ public class TestEscherGraphics2d extends TestCase
|
||||
graphics.drawString("This is another test", 10, 10);
|
||||
fail();
|
||||
} catch(IllegalArgumentException e) {
|
||||
// expected
|
||||
}
|
||||
}
|
||||
|
||||
public void testFillRect() throws Exception
|
||||
{
|
||||
public void testFillRect() {
|
||||
graphics.fillRect( 10, 10, 20, 20 );
|
||||
HSSFSimpleShape s = (HSSFSimpleShape) escherGroup.getChildren().get(0);
|
||||
assertEquals(HSSFSimpleShape.OBJECT_TYPE_RECTANGLE, s.getShapeType());
|
||||
@ -86,39 +81,39 @@ public class TestEscherGraphics2d extends TestCase
|
||||
assertEquals(30, s.getAnchor().getDx2());
|
||||
}
|
||||
|
||||
public void testGetFontMetrics() throws Exception
|
||||
{
|
||||
public void testGetFontMetrics() {
|
||||
FontMetrics fontMetrics = graphics.getFontMetrics(graphics.getFont());
|
||||
if (graphics.getFont().toString().indexOf("dialog") != -1 || graphics.getFont().toString().indexOf("Dialog") != -1) // if dialog is returned we can't run the test properly.
|
||||
if (isDialogPresent()) // if dialog is returned we can't run the test properly.
|
||||
return;
|
||||
assertEquals(7, fontMetrics.charWidth('X'));
|
||||
assertEquals("java.awt.Font[family=Arial,name=Arial,style=plain,size=10]", fontMetrics.getFont().toString());
|
||||
}
|
||||
|
||||
public void testSetFont() throws Exception
|
||||
{
|
||||
public void testSetFont() {
|
||||
Font f = new Font("Helvetica", 0, 12);
|
||||
graphics.setFont(f);
|
||||
assertEquals(f, graphics.getFont());
|
||||
}
|
||||
|
||||
public void testSetColor() throws Exception
|
||||
{
|
||||
public void testSetColor() {
|
||||
graphics.setColor(Color.red);
|
||||
assertEquals(Color.red, graphics.getColor());
|
||||
}
|
||||
|
||||
public void testGetFont() throws Exception
|
||||
{
|
||||
public void testGetFont() {
|
||||
Font f = graphics.getFont();
|
||||
if (graphics.getFont().toString().indexOf("dialog") != -1 || graphics.getFont().toString().indexOf("Dialog") != -1) // if dialog is returned we can't run the test properly.
|
||||
if (isDialogPresent()) // if dialog is returned we can't run the test properly.
|
||||
return;
|
||||
|
||||
assertEquals("java.awt.Font[family=Arial,name=Arial,style=plain,size=10]", f.toString());
|
||||
}
|
||||
|
||||
public void testDraw() throws Exception
|
||||
{
|
||||
private boolean isDialogPresent() {
|
||||
String fontDebugStr = graphics.getFont().toString();
|
||||
return fontDebugStr.indexOf("dialog") != -1 || fontDebugStr.indexOf("Dialog") != -1;
|
||||
}
|
||||
|
||||
public void testDraw() {
|
||||
graphics.draw(new Line2D.Double(10,10,20,20));
|
||||
HSSFSimpleShape s = (HSSFSimpleShape) escherGroup.getChildren().get(0);
|
||||
assertTrue(s.getShapeType() == HSSFSimpleShape.OBJECT_TYPE_LINE);
|
||||
@ -126,6 +121,5 @@ public class TestEscherGraphics2d extends TestCase
|
||||
assertEquals(10, s.getAnchor().getDy1());
|
||||
assertEquals(20, s.getAnchor().getDx2());
|
||||
assertEquals(20, s.getAnchor().getDy2());
|
||||
System.out.println("s = " + s);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user