Author: sergiykarpenko Date: 2010-09-03 09:07:59 -0400 (Fri, 03 Sep 2010) New Revision: 3053 Modified: core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestOpenOfficeDocumentReader.java core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestPropertiesExtracting.java core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/tika/TestHtmlOnTikaDocumentReader.java core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/tika/TestOpenOfficeOnTikaDocumentReader.java core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/tika/TestPropertiesExtractionOnTika.java core/trunk/exo.core.component.document/src/test/resources/test.odt Log: EXOJCR-749: tests fixed Modified: core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestOpenOfficeDocumentReader.java =================================================================== --- core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestOpenOfficeDocumentReader.java 2010-09-03 11:19:03 UTC (rev 3052) +++ core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestOpenOfficeDocumentReader.java 2010-09-03 13:07:59 UTC (rev 3053) @@ -49,7 +49,7 @@ { String text = service.getDocumentReader("application/vnd.oasis.opendocument.text").getContentAsText(is); - String expected = "This is a test Open Office document `1234567890-= !@#$%^ & *()_+~|�:? > < |\\,./[]{}"; + String expected = "This is a test Open Office document `1234567890-= !@#$%^ & *()_+~|:? > < |\\,./[]{}"; assertEquals("Wrong string returned", normalizeWhitespaces(expected), normalizeWhitespaces(text)); } Modified: core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestPropertiesExtracting.java =================================================================== --- core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestPropertiesExtracting.java 2010-09-03 11:19:03 UTC (rev 3052) +++ core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/TestPropertiesExtracting.java 2010-09-03 13:07:59 UTC (rev 3053) @@ -249,7 +249,7 @@ etalon.put(DCMetaData.TITLE, "test-Title"); etalon.put(DCMetaData.LANGUAGE, "ru-RU"); - etalon.put(DCMetaData.DATE, "2010-08-31T14:53:42.68"); + etalon.put(DCMetaData.DATE, "2010-09-03T14:37:59.10"); etalon.put(DCMetaData.SUBJECT, "test-Subject"); etalon.put(DCMetaData.CREATOR, "Sergiy Karpenko"); etalon.put(DCMetaData.DESCRIPTION, "test-Comments"); Modified: core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/tika/TestHtmlOnTikaDocumentReader.java =================================================================== --- core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/tika/TestHtmlOnTikaDocumentReader.java 2010-09-03 11:19:03 UTC (rev 3052) +++ core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/tika/TestHtmlOnTikaDocumentReader.java 2010-09-03 13:07:59 UTC (rev 3053) @@ -68,14 +68,8 @@ DocumentReader dr = service.getDocumentReader(mimeType); String text = dr.getContentAsText(is); - String expected = - "JBoss.orgCommunity Documentation Prev Next Chapter�58.�eXo Core 58.1. eXo Core " - + "introduction 58.1.�eXo Core introduction The eXo Core is a set of common services " - + "that are used by eXo products and modules, it also can be used in the business logic. " - + "It's Authentication and Security, Organization, Database, Logging, JNDI, LDAP," - + " Document reader and other services. PrevPart�III.�eXoCore Top of page Front page" - + " NextChapter�59.�Database Creator"; - assertEquals("Wrong string returned", normalizeWhitespaces(expected), normalizeWhitespaces(text)); + assertTrue((normalizeWhitespaces(text)) + .contains("The eXo Core is a set of common services that are used by eXo products and modules, it also can be used in the business logic. It's Authentication and Security, Organization, Database, Logging, JNDI, LDAP, Document reader and other services.")); } } Modified: core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/tika/TestOpenOfficeOnTikaDocumentReader.java =================================================================== --- core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/tika/TestOpenOfficeOnTikaDocumentReader.java 2010-09-03 11:19:03 UTC (rev 3052) +++ core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/tika/TestOpenOfficeOnTikaDocumentReader.java 2010-09-03 13:07:59 UTC (rev 3053) @@ -49,7 +49,7 @@ { String text = service.getDocumentReader("application/vnd.oasis.opendocument.text").getContentAsText(is); - String expected = "This is a test Open Office document `1234567890-= !@#$%^&*()_+~|�:?><|\\,./[]{}"; + String expected = "This is a test Open Office document `1234567890-= !@#$%^&*()_+~|:?><|\\,./[]{}"; assertEquals("Wrong string returned", normalizeWhitespaces(expected), normalizeWhitespaces(text)); } finally @@ -77,7 +77,7 @@ } String text = buf.toString(); - String expected = "This is a test Open Office document `1234567890-= !@#$%^&*()_+~|�:?><|\\,./[]{}"; + String expected = "This is a test Open Office document `1234567890-= !@#$%^&*()_+~|:?><|\\,./[]{}"; assertEquals("Wrong string returned", normalizeWhitespaces(expected), normalizeWhitespaces(text)); } finally Modified: core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/tika/TestPropertiesExtractionOnTika.java =================================================================== --- core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/tika/TestPropertiesExtractionOnTika.java 2010-09-03 11:19:03 UTC (rev 3052) +++ core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/tika/TestPropertiesExtractionOnTika.java 2010-09-03 13:07:59 UTC (rev 3053) @@ -261,7 +261,7 @@ etalon.put(DCMetaData.TITLE, "test-Title"); etalon.put(DCMetaData.LANGUAGE, "ru-RU"); - etalon.put(DCMetaData.DATE, "2010-08-31T14:53:42.68"); + etalon.put(DCMetaData.DATE, "2010-09-03T14:37:59.10"); etalon.put(DCMetaData.SUBJECT, "test-Subject"); etalon.put(DCMetaData.CREATOR, "Sergiy Karpenko"); etalon.put(DCMetaData.DESCRIPTION, "test-Comments"); Modified: core/trunk/exo.core.component.document/src/test/resources/test.odt =================================================================== (Binary files differ)