inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)

Browse Source 
71625: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      71396: MNT-8624 : CMIS Query breaks with non cmis objects
         - Test failures fixed on Alfresco v4.2


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74708 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-06-25 15:32:56 +00:00
parent 1af4dde0ca
commit e0cdffa4b6
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/test-java/org/alfresco/repo/cmis/rest/test/CMISAtomTemplatesTest.java
View File

@@ -29,20 +29,17 @@ import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.ApplicationContextHelper;
import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Link;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.context.ApplicationContext;
import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
import org.springframework.extensions.webscripts.TestWebScriptServer.Request;
import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
public class CMISAtomTemplatesTest extends BaseCMISTest
{
private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext(new String[]{ApplicationContextHelper.CONFIG_LOCATIONS[0],"classpath:test-cmisinteger_modell-context.xml"});
private NodeService nodeService;
static String docName;
@@ -64,7 +61,7 @@ public class CMISAtomTemplatesTest extends BaseCMISTest
xmlResponse = documentRes.getContentAsString();
Assert.assertNotNull(xmlResponse);
this.nodeService = (NodeService)ctx.getBean("NodeService");
this.nodeService = (NodeService)getServer().getApplicationContext().getBean("NodeService");
}
@Test