You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@poi.apache.org by gl...@apache.org on 2004/02/16 23:25:54 UTC

cvs commit: jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel TestEscherGraphics.java TestEscherGraphics2d.java

glens       2004/02/16 14:25:54

  Modified:    src/testcases/org/apache/poi/hssf/usermodel Tag:
                        REL_2_BRANCH TestEscherGraphics.java
                        TestEscherGraphics2d.java
  Log:
  Patching EcherGraphics test cases so that they fall through if the system is converting the font to dialog.  I better solution would be great but I suspect this is not solvable and is just a limitation of using a 'Graphics' interface
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.2.2   +5 -1      jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/Attic/TestEscherGraphics.java
  
  Index: TestEscherGraphics.java
  ===================================================================
  RCS file: /home/cvs/jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/Attic/TestEscherGraphics.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- TestEscherGraphics.java	10 Feb 2004 22:07:50 -0000	1.1.2.1
  +++ TestEscherGraphics.java	16 Feb 2004 22:25:54 -0000	1.1.2.2
  @@ -27,11 +27,15 @@
       public void testGetFont() throws Exception
       {
           Font f = graphics.getFont();
  -        assertEquals("java.awt.Font[family=Arial,name=Arial,style=plain,size=10]", f.toString());
  +        if (f.toString().indexOf("dialog") == -1)
  +            assertEquals("java.awt.Font[family=Arial,name=Arial,style=plain,size=10]", f.toString());
       }
   
       public void testGetFontMetrics() throws Exception
       {
  +        Font f = graphics.getFont();
  +        if (f.toString().indexOf("dialog") != -1)
  +            return;
           FontMetrics fontMetrics = graphics.getFontMetrics(graphics.getFont());
           assertEquals(7, fontMetrics.charWidth('X'));
           assertEquals("java.awt.Font[family=Arial,name=Arial,style=plain,size=10]", fontMetrics.getFont().toString());
  
  
  
  1.1.2.2   +5 -0      jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/Attic/TestEscherGraphics2d.java
  
  Index: TestEscherGraphics2d.java
  ===================================================================
  RCS file: /home/cvs/jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/Attic/TestEscherGraphics2d.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- TestEscherGraphics2d.java	10 Feb 2004 22:07:50 -0000	1.1.2.1
  +++ TestEscherGraphics2d.java	16 Feb 2004 22:25:54 -0000	1.1.2.2
  @@ -49,6 +49,8 @@
       public void testGetFontMetrics() throws Exception
       {
           FontMetrics fontMetrics = graphics.getFontMetrics(graphics.getFont());
  +	if (graphics.getFont().toString().indexOf("dialog") != -1) // 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());
       }
  @@ -69,6 +71,9 @@
       public void testGetFont() throws Exception
       {
           Font f = graphics.getFont();
  +        if (graphics.getFont().toString().indexOf("dialog") != -1) // 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());
       }
   }
  
  
  

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