From e82e2067cefe5920d9cec11c172d2facf2e2cbbc Mon Sep 17 00:00:00 2001
From: David Caruana <david.caruana@alfresco.com>
Date: Wed, 4 Mar 2009 15:14:33 +0000
Subject: [PATCH] Fix ETHREEOH-1131: Syntax error with
 descendants.post.atomentry.201.ftl - added testCreateDocumentViaDescendants()

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13467 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../store/descendants.post.atomentry.201.ftl  |  6 +++--
 .../repo/cmis/rest/test/CMISTest.java         | 24 +++++++++++++++++--
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/store/descendants.post.atomentry.201.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/store/descendants.post.atomentry.201.ftl
index a9225b7edd..556fb6ae06 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/store/descendants.post.atomentry.201.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/store/descendants.post.atomentry.201.ftl
@@ -5,10 +5,12 @@
 
 <?xml version="1.0" encoding="UTF-8"?>
 
+[#assign namespace][@nsLib.entryNS/][/#assign]
+
 [#if node.isDocument]  
-  [@entryLib.document node ns=[@nsLib.entryNS/]/]
+  [@entryLib.document node=node ns=namespace/]
 [#else]
-  [@entryLib.folder node ns=[@nsLib.entryNS/]/]
+  [@entryLib.folder node=node ns=namespace/]
 [/#if]
 
 [/#compress]
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/cmis/rest/test/CMISTest.java b/source/java/org/alfresco/repo/cmis/rest/test/CMISTest.java
index 499cbf2246..d03fa64890 100644
--- a/source/java/org/alfresco/repo/cmis/rest/test/CMISTest.java
+++ b/source/java/org/alfresco/repo/cmis/rest/test/CMISTest.java
@@ -104,8 +104,8 @@ public class CMISTest extends BaseCMISWebScriptTest
 //        setRemoteServer(server);
 //        setArgsAsHeaders(false);
 //        setValidateResponse(false);
-        setListener(new CMISTestListener(System.out));
-        setTraceReqRes(true);
+//        setListener(new CMISTestListener(System.out));
+//        setTraceReqRes(true);
         
         super.setUp();
     }
@@ -420,6 +420,26 @@ public class CMISTest extends BaseCMISWebScriptTest
         assertNotNull(entry);
     }
     
+    public void testCreateDocumentViaDescendants()
+        throws Exception
+    {
+        Entry testFolder = createTestFolder("testCreateDocumentViaDescendants");
+        Link descendantsLink = testFolder.getLink(CMISConstants.REL_DESCENDANTS);
+        assertNotNull(descendantsLink);
+        Feed descendants = getFeed(descendantsLink.getHref());
+        assertNotNull(descendants);
+        int entriesBefore = descendants.getEntries().size();
+        Entry document = createDocument(descendants.getSelfLink().getHref(), "testCreateDocumentViaDescendants");
+        Response documentContentRes = sendRequest(new GetRequest(document.getContentSrc().toString()), 200);
+        String resContent = documentContentRes.getContentAsString();
+        assertEquals(document.getTitle(), resContent);
+        Feed feedFolderAfter = getFeed(descendantsLink.getHref());
+        int entriesAfter = feedFolderAfter.getEntries().size();
+        assertEquals(entriesBefore +1, entriesAfter);
+        Entry entry = feedFolderAfter.getEntry(document.getId().toString());
+        assertNotNull(entry);
+    }
+    
     public void testGet()
         throws Exception
     {