[exo-jcr-commits] exo-jcr SVN: r2998 - core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/test.

Author: nzamosenchuk Date: 2010-08-27 10:15:21 -0400 (Fri, 27 Aug 2010) New Revision: 2998 Modified: core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestMSExcelDocumentReader.java core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestMSXExcelDocumentReader.java Log: EXOJCR-886: fixing test on Excel documents (fixed date asserting) Modified: core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestMSExcelDocumentReader.java =================================================================== --- core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestMSExcelDocumentReader.java 2010-08-27 08:46:34 UTC (rev 2997) +++ core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestMSExcelDocumentReader.java 2010-08-27 14:15:21 UTC (rev 2998) @@ -21,6 +21,8 @@ import org.exoplatform.services.document.DocumentReaderService; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; /** * Created by The eXo Platform SAS Author : Sergey Karpenko @@ -31,8 +33,11 @@ public class TestMSExcelDocumentReader extends BaseStandaloneTest { + private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSZ"); + DocumentReaderService service; - + + @Override public void setUp() throws Exception { super.setUp(); @@ -46,20 +51,56 @@ { String text = service.getDocumentReader("application/excel").getContentAsText(is); String expected = - "Ronaldo Eric Cantona Kaka Ronaldonho " - + "ID Group Functionality Executor Begin End Tested " - + "XNNL XNNL Xay dung vung quan li nguyen lieu NamPH 2005-02-02 00:00:00.000+0200 2005-10-02 00:00:00.000+0300 Tested " - + "XNNL XNNL XNNL_HAVEST NamPH 1223554.0 2005-10-01 00:00:00.000+0300 Tested " - + "XNNL XNNL XNNL_PIECE_OF_GROUND NamPH 2005-10-12 00:00:00.000+0300 2005-10-02 00:00:00.000+0300 Tested " - + "XNNL XNNL XNNL_76 NamPH TRUE() 1984-12-10 00:00:00.000+0200 No " - + "XNNL XNNL XNNL_CREATE_REAP NamPH none 2005-10-03 00:00:00.000+0300 No " - + "XNNL XNNL XNNL_SCALE NamPH 1984-12-10 00:00:00.000+0200 2005-10-05 00:00:00.000+0300 Tested " - + "XNNL XNNL LASUCO_PROJECT NamPH 2005-10-05 00:00:00.000+0300 2005-10-06 00:00:00.000+0300 No " + "Ronaldo Eric Cantona Kaka Ronaldonho " + "ID Group Functionality Executor Begin End Tested " + + "XNNL XNNL Xay dung vung quan li nguyen lieu NamPH " + + getDate(2005, 2, 2) + + " " + + getDate(2005, 10, 2) + + " Tested " + + "XNNL XNNL XNNL_HAVEST NamPH 1223554.0 " + + getDate(2005, 10, 1) + + " Tested " + + "XNNL XNNL XNNL_PIECE_OF_GROUND NamPH " + + getDate(2005, 10, 12) + + " " + + getDate(2005, 10, 2) + + " Tested " + + "XNNL XNNL XNNL_76 NamPH TRUE() " + + getDate(1984, 12, 10) + + " No " + + "XNNL XNNL XNNL_CREATE_REAP NamPH none " + + getDate(2005, 10, 3) + + " No " + + "XNNL XNNL XNNL_SCALE NamPH " + + getDate(1984, 12, 10) + + " " + + getDate(2005, 10, 5) + + " Tested " + + "XNNL XNNL LASUCO_PROJECT NamPH " + + getDate(2005, 10, 5) + + " " + + getDate(2005, 10, 6) + + " No " + "XNNL XNNL LASUCO_PROJECT NamPH Tested " - + "XNNL XNNL XNNL_BRANCH NamPH 2005-12-12 00:00:00.000+0200 2005-06-10 00:00:00.000+0300 Tested " - + "XNNL XNNL XNNL_SUGAR_RACE NamPH 2005-05-09 00:00:00.000+0300 2005-06-10 00:00:00.000+0300 No " - + "XNNL XNNL F_XNNL_DISTRI NamPH 2005-05-09 00:00:00.000+0300 2005-06-10 00:00:00.000+0300 Tested " - + "XNNL XNNL XNNL_LASUCO_USER NamPH 2005-09-09 00:00:00.000+0300 2005-06-10 00:00:00.000+0300 No"; + + "XNNL XNNL XNNL_BRANCH NamPH " + + getDate(2005, 12, 12) + + " " + + getDate(2005, 6, 10) + + " Tested " + + "XNNL XNNL XNNL_SUGAR_RACE NamPH " + + getDate(2005, 5, 9) + + " " + + getDate(2005, 6, 10) + + " No " + + "XNNL XNNL F_XNNL_DISTRI NamPH " + + getDate(2005, 5, 9) + + " " + + getDate(2005, 6, 10) + + " Tested " + + "XNNL XNNL XNNL_LASUCO_USER NamPH " + + getDate(2005, 9, 9) + + " " + + getDate(2005, 6, 10) + " No"; assertEquals("Wrong string returned", normalizeWhitespaces(expected), normalizeWhitespaces(text)); } @@ -69,4 +110,13 @@ } } + + public String getDate(int year, int month, int day) + { + Calendar date = Calendar.getInstance(); + date.setTimeInMillis(0); + date.set(year, month - 1, day, 0, 0, 0); + + return (DATE_FORMAT.format(date.getTime())); + } } Modified: core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestMSXExcelDocumentReader.java =================================================================== --- core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestMSXExcelDocumentReader.java 2010-08-27 08:46:34 UTC (rev 2997) +++ core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestMSXExcelDocumentReader.java 2010-08-27 14:15:21 UTC (rev 2998) @@ -21,6 +21,8 @@ import org.exoplatform.services.document.DocumentReaderService; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; /** * Created by The eXo Platform SAS Author : Sergey Karpenko @@ -31,6 +33,9 @@ public class TestMSXExcelDocumentReader extends BaseStandaloneTest { + + private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSZ"); + DocumentReaderService service; @Override @@ -48,21 +53,58 @@ String text = service.getDocumentReader("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") .getContentAsText(is); + String expected = - "Ronaldo Eric Cantona Kaka Ronaldonho " - + "ID Group Functionality Executor Begin End Tested " - + "XNNL XNNL Xay dung vung quan li nguyen lieu NamPH 2005-02-02 00:00:00.000+0200 2005-10-02 00:00:00.000+0300 Tested " - + "XNNL XNNL XNNL_HAVEST NamPH 1223554.0 2005-10-01 00:00:00.000+0300 Tested " - + "XNNL XNNL XNNL_PIECE_OF_GROUND NamPH 2005-10-12 00:00:00.000+0300 2005-10-02 00:00:00.000+0300 Tested " - + "XNNL XNNL XNNL_76 NamPH TRUE() 1984-12-10 00:00:00.000+0200 No " - + "XNNL XNNL XNNL_CREATE_REAP NamPH none 2005-10-03 00:00:00.000+0300 No " - + "XNNL XNNL XNNL_SCALE NamPH 1984-12-10 00:00:00.000+0200 2005-10-05 00:00:00.000+0300 Tested " - + "XNNL XNNL LASUCO_PROJECT NamPH 2005-10-05 00:00:00.000+0300 2005-10-06 00:00:00.000+0300 No " + "Ronaldo Eric Cantona Kaka Ronaldonho " + "ID Group Functionality Executor Begin End Tested " + + "XNNL XNNL Xay dung vung quan li nguyen lieu NamPH " + + getDate(2005, 2, 2) + + " " + + getDate(2005, 10, 2) + + " Tested " + + "XNNL XNNL XNNL_HAVEST NamPH 1223554.0 " + + getDate(2005, 10, 1) + + " Tested " + + "XNNL XNNL XNNL_PIECE_OF_GROUND NamPH " + + getDate(2005, 10, 12) + + " " + + getDate(2005, 10, 2) + + " Tested " + + "XNNL XNNL XNNL_76 NamPH TRUE() " + + getDate(1984, 12, 10) + + " No " + + "XNNL XNNL XNNL_CREATE_REAP NamPH none " + + getDate(2005, 10, 3) + + " No " + + "XNNL XNNL XNNL_SCALE NamPH " + + getDate(1984, 12, 10) + + " " + + getDate(2005, 10, 5) + + " Tested " + + "XNNL XNNL LASUCO_PROJECT NamPH " + + getDate(2005, 10, 5) + + " " + + getDate(2005, 10, 6) + + " No " + "XNNL XNNL LASUCO_PROJECT NamPH Tested " - + "XNNL XNNL XNNL_BRANCH NamPH 2005-12-12 00:00:00.000+0200 2005-06-10 00:00:00.000+0300 Tested " - + "XNNL XNNL XNNL_SUGAR_RACE NamPH 2005-05-09 00:00:00.000+0300 2005-06-10 00:00:00.000+0300 No " - + "XNNL XNNL F_XNNL_DISTRI NamPH 2005-05-09 00:00:00.000+0300 2005-06-10 00:00:00.000+0300 Tested " - + "XNNL XNNL XNNL_LASUCO_USER NamPH 2005-09-09 00:00:00.000+0300 2005-06-10 00:00:00.000+0300 No"; + + "XNNL XNNL XNNL_BRANCH NamPH " + + getDate(2005, 12, 12) + + " " + + getDate(2005, 6, 10) + + " Tested " + + "XNNL XNNL XNNL_SUGAR_RACE NamPH " + + getDate(2005, 5, 9) + + " " + + getDate(2005, 6, 10) + + " No " + + "XNNL XNNL F_XNNL_DISTRI NamPH " + + getDate(2005, 5, 9) + + " " + + getDate(2005, 6, 10) + + " Tested " + + "XNNL XNNL XNNL_LASUCO_USER NamPH " + + getDate(2005, 9, 9) + + " " + + getDate(2005, 6, 10) + " No"; assertEquals("Wrong string returned", normalizeWhitespaces(expected), normalizeWhitespaces(text)); } @@ -71,4 +113,14 @@ is.close(); } } + + public String getDate(int year, int month, int day) + { + Calendar date = Calendar.getInstance(); + date.setTimeInMillis(0); + date.set(year, month - 1, day, 0, 0, 0); + + return (DATE_FORMAT.format(date.getTime())); + } + }