From c01c49fbe3a3785b15008d2e5f41e5f0675cd01d Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Fri, 9 Jun 2006 17:03:09 +0000
Subject: [PATCH] Fixes to test to not use illegal characters

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3074 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../filefolder/FileFolderServiceImplTest.java | 33 +++++++++++--------
 .../filefolder/filefolder-test-import.xml     | 20 +++++------
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImplTest.java b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImplTest.java
index e0938fe6bb..dc9bb09cbf 100644
--- a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImplTest.java
+++ b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImplTest.java
@@ -56,16 +56,16 @@ public class FileFolderServiceImplTest extends TestCase
 {
     private static final String IMPORT_VIEW = "filefolder/filefolder-test-import.xml";
     
-    private static final String NAME_L0_FILE_A = "L0: File A";
-    private static final String NAME_L0_FILE_B = "L0: File B";
-    private static final String NAME_L0_FOLDER_A = "L0: Folder A";
-    private static final String NAME_L0_FOLDER_B = "L0: Folder B";
-    private static final String NAME_L0_FOLDER_C = "L0: Folder C";
-    private static final String NAME_L1_FOLDER_A = "L1: Folder A";
-    private static final String NAME_L1_FOLDER_B = "L1: Folder B";
-    private static final String NAME_L1_FILE_A = "L1: File A";
-    private static final String NAME_L1_FILE_B = "L1: File B";
-    private static final String NAME_L1_FILE_C = "L1: File C (%_)";
+    private static final String NAME_L0_FILE_A = "L0- File A";
+    private static final String NAME_L0_FILE_B = "L0- File B";
+    private static final String NAME_L0_FOLDER_A = "L0- Folder A";
+    private static final String NAME_L0_FOLDER_B = "L0- Folder B";
+    private static final String NAME_L0_FOLDER_C = "L0- Folder C";
+    private static final String NAME_L1_FOLDER_A = "L1- Folder A";
+    private static final String NAME_L1_FOLDER_B = "L1- Folder B";
+    private static final String NAME_L1_FILE_A = "L1- File A";
+    private static final String NAME_L1_FILE_B = "L1- File B";
+    private static final String NAME_L1_FILE_C = "L1- File C (%_)";
     private static final String NAME_DUPLICATE = "DUPLICATE";
     
     private static final ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();
@@ -118,7 +118,14 @@ public class FileFolderServiceImplTest extends TestCase
     
     public void tearDown() throws Exception
     {
-        txn.rollback();
+        try
+        {
+            txn.rollback();
+        }
+        catch (Throwable e)
+        {
+            e.printStackTrace();
+        }
     }
 
     /**
@@ -196,7 +203,7 @@ public class FileFolderServiceImplTest extends TestCase
     {
         List<FileInfo> files = fileFolderService.search(
                 workingRootNodeRef,
-                "?1:*",
+                "?1-*",
                 true,
                 true,
                 true);
@@ -209,7 +216,7 @@ public class FileFolderServiceImplTest extends TestCase
     {
         List<FileInfo> files = fileFolderService.search(
                 workingRootNodeRef,
-                "?1:*",
+                "?1-*",
                 true,
                 false,
                 true);
diff --git a/source/test-resources/filefolder/filefolder-test-import.xml b/source/test-resources/filefolder/filefolder-test-import.xml
index 3a7959300f..9d7609596f 100644
--- a/source/test-resources/filefolder/filefolder-test-import.xml
+++ b/source/test-resources/filefolder/filefolder-test-import.xml
@@ -4,44 +4,44 @@
 
     <!-- L0 files -->
     <cm:content>
-        <cm:name>L0: File A</cm:name>
+        <cm:name>L0- File A</cm:name>
         <cm:content>contentUrl=classpath:quick/quick.txt|mimetype=text/plain|size=|encoding=</cm:content>
     </cm:content>
     <cm:content>
-        <cm:name>L0: File B</cm:name>
+        <cm:name>L0- File B</cm:name>
         <cm:content>contentUrl=classpath:quick/quick.pdf|mimetype=application/pdf|size=|encoding=</cm:content>
     </cm:content>
     <!-- L0 folders -->
 	<cm:folder>
-		<cm:name>L0: Folder A</cm:name>
+		<cm:name>L0- Folder A</cm:name>
 		<cm:contains>
             <!-- L1 files -->
 			<cm:content>
-				<cm:name>L1: File A</cm:name>
+				<cm:name>L1- File A</cm:name>
 				<cm:content>contentUrl=classpath:quick/quick.txt|mimetype=text/plain|size=|encoding=</cm:content>
 			</cm:content>
 			<cm:content>
-				<cm:name>L1: File B</cm:name>
+				<cm:name>L1- File B</cm:name>
 				<cm:content>contentUrl=classpath:quick/quick.pdf|mimetype=application/pdf|size=|encoding=</cm:content>
 			</cm:content>
 			<cm:content>
-				<cm:name>L1: File C (%_)</cm:name>
+				<cm:name>L1- File C (%_)</cm:name>
 				<cm:content>contentUrl=classpath:quick/quick.html|mimetype=text/html|size=|encoding=</cm:content>
 			</cm:content>
             <!-- L2 folders -->
             <cm:folder>
-                <cm:name>L1: Folder A</cm:name>
+                <cm:name>L1- Folder A</cm:name>
             </cm:folder>
             <cm:folder>
-                <cm:name>L1: Folder B</cm:name>
+                <cm:name>L1- Folder B</cm:name>
             </cm:folder>
 		</cm:contains>
 	</cm:folder>
 	<cm:folder>
-		<cm:name>L0: Folder B</cm:name>
+		<cm:name>L0- Folder B</cm:name>
 	</cm:folder>
 	<cm:folder>
-		<cm:name>L0: Folder C</cm:name>
+		<cm:name>L0- Folder C</cm:name>
 		<cm:contains>
             <!-- L1 files -->
 			<cm:content>