Merged V3.2 to HEAD

18021: AVM - fix AVMNodeService.getChildByName
    18065: (record-only) 
    18254: WCM/AVM - ETHREEOH-2057 (Submitting WCM Content through WF JSF Error - due to AVM Sync issue)
    18442: ETHREEOH-4004 - rework test
    18467: ETHTREEOH-4004 - test fix (avoid conversion, replace UTF-16 with UTF-8)
    18835: (record-only) Merged V3.1 to V3.2 (record-only)
        18783: (record-only) MT: ensure group (EMAIL_CONTRIBUTORS) bootstraps tenant admin user (when creating tenant) - fixed by r14588
    19146: (record-only) Undo previous/unwanted commit (version.properties)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19288 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2010-03-15 13:31:38 +00:00
parent a974734210
commit deb5fc9c08
4 changed files with 99 additions and 2 deletions

View File

@@ -267,11 +267,16 @@ public class AVMServiceTestBase extends TestCase
fService.createFile("main:/a/b/c", "bar").close();
writer = fService.getContentWriter("main:/a/b/c/bar");
/*
// Force a conversion
writer.setEncoding("UTF-16");
writer.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN);
writer.putContent(new ByteArrayInputStream("I am main:/a/b/c/bar".getBytes("UTF-16")));
*/
writer.setEncoding("UTF-8");
writer.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN);
writer.putContent("I am main:/a/b/c/bar");
fService.createSnapshot("main", null, null);
}