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

[avik]

avik        2002/06/11 13:20:41

  Modified:    src/testcases/org/apache/poi/hssf/usermodel
                        TestFormulas.java
  Log:
  updated tests without ReferenceUtil
  
  Revision  Changes    Path
  1.18      +10 -6     
jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java
  
  Index: TestFormulas.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-poi/src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- TestFormulas.java 27 May 2002 21:00:12 -0000      1.17
  +++ TestFormulas.java 11 Jun 2002 20:20:41 -0000      1.18
  @@ -62,7 +62,7 @@
   import org.apache.poi.hssf.record.Record;
   import org.apache.poi.hssf.record.BOFRecord;
   import org.apache.poi.hssf.record.EOFRecord;
  -import org.apache.poi.hssf.util.ReferenceUtil;
  +import org.apache.poi.hssf.util.CellReference;
   
   import java.io.File;
   import java.io.FileInputStream;
  @@ -344,8 +344,11 @@
                       refy2=(short)(y-3);
                   }
                   
  -                ref = ReferenceUtil.getReferenceFromXY(refx1,refy1);                
    
  -                ref2 = ReferenceUtil.getReferenceFromXY(refx2,refy2);
  +                c = r.getCell((short) y);
  +                CellReference cr= new CellReference(refx1,refy1);
  +                ref=cr.toString();
  +                cr=new CellReference(refx2,refy2);
  +                ref2=cr.toString();
   
                   c = r.createCell((short) y);
                   c.setCellFormula("" + ref + operator + ref2);
  @@ -419,9 +422,10 @@
                   }
   
                   c = r.getCell((short) y);
  -
  -                ref = ReferenceUtil.getReferenceFromXY(refx1,refy1);                
    
  -                ref2 = ReferenceUtil.getReferenceFromXY(refx2,refy2);
  +                CellReference cr= new CellReference(refx1,refy1);
  +                ref=cr.toString();
  +                cr=new CellReference(refx2,refy2);
  +                ref2=cr.toString();
                   
                   
                   assertTrue("loop Formula is as expected 
"+ref+operator+ref2+"!="+c.getCellFormula(),(
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>