Author: tolusha Date: 2010-09-01 10:51:06 -0400 (Wed, 01 Sep 2010) New Revision: 3043 Modified: jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/fs/TestRandomValueIO.java jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/index/IndexExcelFileTest.java jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/index/IndexPDFFileTest.java jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/index/IndexPPTFileTest.java jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/index/IndexTextPlainFileTest.java jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/index/IndexWordFileTest.java jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/index/SlowListTest.java jcr/branches/1.12.x/exo.jcr.component.core/src/test/resources/index/test_index.ppt Log: EXOJCR-936: Avoid converting binary value to String in tests Modified: jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/fs/TestRandomValueIO.java =================================================================== --- jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/fs/TestRandomValueIO.java 2010-09-01 14:50:28 UTC (rev 3042) +++ jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/fs/TestRandomValueIO.java 2010-09-01 14:51:06 UTC (rev 3043) @@ -18,7 +18,6 @@ */ package org.exoplatform.services.jcr.impl.storage.fs; -import org.exoplatform.commons.utils.MimeTypeResolver; import org.exoplatform.services.jcr.JcrImplBaseTest; import org.exoplatform.services.jcr.core.value.EditableBinaryValue; import org.exoplatform.services.jcr.core.value.ReadableBinaryValue; @@ -675,16 +674,12 @@ // create property String type = "nt:file"; - String name = "foo.doc"; + String name = "foo.txt"; Node createdNodeRef = testRoot.addNode(name, type); Node dataNode = createdNodeRef.addNode("jcr:content", "nt:resource"); - MimeTypeResolver mimetypeResolver = new MimeTypeResolver(); - mimetypeResolver.setDefaultMimeType("application/zip"); - String mimeType = mimetypeResolver.getMimeType(name); - - dataNode.setProperty("jcr:mimeType", mimeType); + dataNode.setProperty("jcr:mimeType", "text/plain"); dataNode.setProperty("jcr:lastModified", Calendar.getInstance()); dataNode.setProperty("jcr:data", new ByteArrayInputStream(new byte[]{})); Modified: jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/index/IndexExcelFileTest.java =================================================================== --- jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/index/IndexExcelFileTest.java 2010-09-01 14:50:28 UTC (rev 3042) +++ jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/index/IndexExcelFileTest.java 2010-09-01 14:51:06 UTC (rev 3043) @@ -51,16 +51,12 @@ { InputStream is = IndexExcelFileTest.class.getResourceAsStream("/index/test_index.xls"); assertNotNull("Can not create an input stream from file for indexing", is); - int size = is.available(); - byte b[] = new byte[size]; - is.read(b); - is.close(); Node cmr = root.addNode("cmr").addNode("categories").addNode("cmr"); Node cool = cmr.addNode("cool", "nt:file"); Node contentNode = cool.addNode("jcr:content", "nt:resource"); contentNode.setProperty("jcr:encoding", "UTF-8"); - contentNode.setProperty("jcr:data", session.getValueFactory().createValue(new String(b))); + contentNode.setProperty("jcr:data", is); contentNode.setProperty("jcr:mimeType", "application/excel"); contentNode.setProperty("jcr:lastModified", session.getValueFactory().createValue(Calendar.getInstance())); assertNotNull("Can not create a cmr node for indexing", cmr); Modified: jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/index/IndexPDFFileTest.java =================================================================== --- jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/index/IndexPDFFileTest.java 2010-09-01 14:50:28 UTC (rev 3042) +++ jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/index/IndexPDFFileTest.java 2010-09-01 14:51:06 UTC (rev 3043) @@ -51,16 +51,12 @@ { InputStream is = IndexPDFFileTest.class.getResourceAsStream("/index/test_index.pdf"); assertNotNull("Can not create an input stream from file for indexing", is); - int size = is.available(); - byte b[] = new byte[size]; - is.read(b); - is.close(); Node cmr = root.addNode("cmr").addNode("categories").addNode("cmr"); Node cool = cmr.addNode("cool", "nt:file"); Node contentNode = cool.addNode("jcr:content", "nt:resource"); contentNode.setProperty("jcr:encoding", "UTF-8"); - contentNode.setProperty("jcr:data", session.getValueFactory().createValue(new String(b))); + contentNode.setProperty("jcr:data", is); contentNode.setProperty("jcr:mimeType", "application/pdf"); contentNode.setProperty("jcr:lastModified", session.getValueFactory().createValue(Calendar.getInstance())); assertNotNull("Can not create a cmr node for indexing", cmr); Modified: jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/index/IndexPPTFileTest.java =================================================================== --- jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/index/IndexPPTFileTest.java 2010-09-01 14:50:28 UTC (rev 3042) +++ jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/index/IndexPPTFileTest.java 2010-09-01 14:51:06 UTC (rev 3043) @@ -52,16 +52,12 @@ { InputStream is = IndexPPTFileTest.class.getResourceAsStream("/index/test_index.ppt"); assertNotNull("Can not create an input stream from file for indexing", is); - int size = is.available(); - byte b[] = new byte[size]; - is.read(b); - is.close(); Node cmr = root.addNode("cmr").addNode("categories").addNode("cmr"); Node cool = cmr.addNode("cool", "nt:file"); Node contentNode = cool.addNode("jcr:content", "nt:resource"); contentNode.setProperty("jcr:encoding", "UTF-8"); - contentNode.setProperty("jcr:data", session.getValueFactory().createValue(new String(b))); + contentNode.setProperty("jcr:data", is); contentNode.setProperty("jcr:mimeType", "application/powerpoint"); contentNode.setProperty("jcr:lastModified", session.getValueFactory().createValue(Calendar.getInstance())); assertNotNull("Can not create a cmr node for indexing", cmr); Modified: jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/index/IndexTextPlainFileTest.java =================================================================== --- jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/index/IndexTextPlainFileTest.java 2010-09-01 14:50:28 UTC (rev 3042) +++ jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/index/IndexTextPlainFileTest.java 2010-09-01 14:51:06 UTC (rev 3043) @@ -51,16 +51,12 @@ { InputStream is = IndexTextPlainFileTest.class.getResourceAsStream("/index/test_index.txt"); assertNotNull("Can not create an input stream from file for indexing", is); - int size = is.available(); - byte b[] = new byte[size]; - is.read(b); - is.close(); Node cmr = root.addNode("cmr").addNode("categories").addNode("cmr"); Node cool = cmr.addNode("cool", "nt:file"); Node contentNode = cool.addNode("jcr:content", "nt:resource"); contentNode.setProperty("jcr:encoding", "UTF-8"); - contentNode.setProperty("jcr:data", session.getValueFactory().createValue(new String(b))); + contentNode.setProperty("jcr:data", is); contentNode.setProperty("jcr:mimeType", "text/plain"); contentNode.setProperty("jcr:lastModified", session.getValueFactory().createValue(Calendar.getInstance())); assertNotNull("Can not create a cmr node for indexing", cmr); Modified: jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/index/IndexWordFileTest.java =================================================================== --- jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/index/IndexWordFileTest.java 2010-09-01 14:50:28 UTC (rev 3042) +++ jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/index/IndexWordFileTest.java 2010-09-01 14:51:06 UTC (rev 3043) @@ -52,16 +52,12 @@ { InputStream is = IndexWordFileTest.class.getResourceAsStream("/index/test_index.doc"); assertNotNull("Can not create an input stream from file for indexing", is); - int size = is.available(); - byte b[] = new byte[size]; - is.read(b); - is.close(); Node cmr = root.addNode("cmr").addNode("categories").addNode("cmr"); Node cool = cmr.addNode("cool", "nt:file"); Node contentNode = cool.addNode("jcr:content", "nt:resource"); contentNode.setProperty("jcr:encoding", "UTF-8"); - contentNode.setProperty("jcr:data", session.getValueFactory().createValue(new String(b))); + contentNode.setProperty("jcr:data", is); contentNode.setProperty("jcr:mimeType", "application/msword"); contentNode.setProperty("jcr:lastModified", session.getValueFactory().createValue(Calendar.getInstance())); assertNotNull("Can not create a cmr node for indexing", cmr); Modified: jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/index/SlowListTest.java =================================================================== --- jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/index/SlowListTest.java 2010-09-01 14:50:28 UTC (rev 3042) +++ jcr/branches/1.12.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/index/SlowListTest.java 2010-09-01 14:51:06 UTC (rev 3043) @@ -50,10 +50,7 @@ long start, end; InputStream is = SlowListTest.class.getResourceAsStream("/index/test_index.xls"); assertNotNull("Can not create an input stream from file for indexing", is); - int size = is.available(); - byte b[] = new byte[size]; - is.read(b); - is.close(); + Node test = root.addNode("cms2").addNode("test"); start = System.currentTimeMillis(); // to get the time of start assertNotNull("Can not create a test node for indexing", test); @@ -63,7 +60,7 @@ Node cool = test.addNode(name, "nt:file"); Node contentNode = cool.addNode("jcr:content", "nt:resource"); contentNode.setProperty("jcr:encoding", "UTF-8"); - contentNode.setProperty("jcr:data", session.getValueFactory().createValue(new String(b))); + contentNode.setProperty("jcr:data", is); contentNode.setProperty("jcr:mimeType", "application/excel"); contentNode.setProperty("jcr:lastModified", session.getValueFactory().createValue(Calendar.getInstance())); assertNotNull("Can not create a cool node for indexing", cool); Modified: jcr/branches/1.12.x/exo.jcr.component.core/src/test/resources/index/test_index.ppt =================================================================== (Binary files differ)