Merged /BRANCHES/V3.4 to HEAD:

23464: Reinstate transfer test of greek paths.
      - Manifest was being written by FileWriter() which would use default character set.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@23662 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Brian Remmington
2010-11-16 08:00:52 +00:00
parent 3d8c239fb7
commit 3419d5b067
4 changed files with 222 additions and 12 deletions

View File

@@ -20,8 +20,11 @@ package org.alfresco.repo.transfer.manifest;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@@ -119,7 +122,7 @@ public class ManifestIntegrationTest extends BaseAlfrescoSpringTest
nodeService.setProperty(childNodeRef, ContentModel.PROP_NAME, CONTENT_NAME);
snapshotFile = TempFileProvider.createTempFile("xxx", ".xml");
FileWriter snapshotWriter = new FileWriter(snapshotFile);
Writer snapshotWriter = new OutputStreamWriter(new FileOutputStream(snapshotFile), "UTF-8");
Set<NodeRef> nodes = new HashSet<NodeRef>();
@@ -252,7 +255,7 @@ public class ManifestIntegrationTest extends BaseAlfrescoSpringTest
*/
private static void outputFile(File file) throws Exception
{
BufferedReader reader = new BufferedReader(new FileReader(file));
BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), "UTF-8"));
String s = reader.readLine();
while(s != null)
{