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

Merge from SEAMIST3

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10727 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2008-09-04 10:58:29 +00:00
parent 86fa1c011f
commit 7e0b3f5453
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/repo/cmis/rest/CMISWebScriptTest.java
View File

@@ -39,7 +39,7 @@ import javax.xml.validation.Validator;
import org.alfresco.repo.cmis.rest.xsd.CMISValidator; import org.alfresco.repo.cmis.rest.xsd.CMISValidator;
import org.alfresco.repo.web.scripts.BaseWebScriptTest; import org.alfresco.repo.web.scripts.BaseWebScriptTest;
import org.alfresco.web.scripts.TestWebScriptServer.Request; import org.alfresco.web.scripts.TestWebScriptServer.Request;
import org.springframework.mock.web.MockHttpServletResponse; import org.alfresco.web.scripts.TestWebScriptServer.Response;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.xml.sax.InputSource; import org.xml.sax.InputSource;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
@@ -153,7 +153,7 @@ public class CMISWebScriptTest extends BaseWebScriptTest
* @return response * @return response
* @throws IOException * @throws IOException
*/ */
protected MockHttpServletResponse sendRequest(Request req, int expectedStatus, String asUser) protected Response sendRequest(Request req, int expectedStatus, String asUser)
throws IOException throws IOException
{ {
if (argsAsHeaders) if (argsAsHeaders)

48
source/java/org/alfresco/repo/cmis/rest/TestCMIS.java
View File

@@ -35,6 +35,7 @@ import org.alfresco.web.scripts.TestWebScriptServer.GetRequest;
import org.alfresco.web.scripts.TestWebScriptServer.PostRequest; import org.alfresco.web.scripts.TestWebScriptServer.PostRequest;
import org.alfresco.web.scripts.TestWebScriptServer.PutRequest; import org.alfresco.web.scripts.TestWebScriptServer.PutRequest;
import org.alfresco.web.scripts.TestWebScriptServer.Request; import org.alfresco.web.scripts.TestWebScriptServer.Request;
import org.alfresco.web.scripts.TestWebScriptServer.Response;
import org.alfresco.web.scripts.atom.AbderaService; import org.alfresco.web.scripts.atom.AbderaService;
import org.alfresco.web.scripts.atom.AbderaServiceImpl; import org.alfresco.web.scripts.atom.AbderaServiceImpl;
import org.apache.abdera.ext.cmis.CMISConstants; import org.apache.abdera.ext.cmis.CMISConstants;
@@ -46,7 +47,6 @@ import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed; import org.apache.abdera.model.Feed;
import org.apache.abdera.model.Link; import org.apache.abdera.model.Link;
import org.apache.abdera.model.Service; import org.apache.abdera.model.Service;
import org.springframework.mock.web.MockHttpServletResponse;
/** /**
@@ -83,7 +83,7 @@ public class TestCMIS extends CMISWebScriptTest
{ {
if (service == null) if (service == null)
{ {
MockHttpServletResponse res = sendRequest(new GetRequest("/api/repository"), 200); Response res = sendRequest(new GetRequest("/api/repository"), 200);
String xml = res.getContentAsString(); String xml = res.getContentAsString();
assertNotNull(xml); assertNotNull(xml);
assertTrue(xml.length() > 0); assertTrue(xml.length() > 0);
@@ -138,7 +138,7 @@ public class TestCMIS extends CMISWebScriptTest
throws Exception throws Exception
{ {
Request get = new GetRequest(href.toString()).setArgs(args); Request get = new GetRequest(href.toString()).setArgs(args);
MockHttpServletResponse res = sendRequest(get, 200); Response res = sendRequest(get, 200);
assertNotNull(res); assertNotNull(res);
String xml = res.getContentAsString(); String xml = res.getContentAsString();
Entry entry = abdera.parseEntry(new StringReader(xml), null); Entry entry = abdera.parseEntry(new StringReader(xml), null);
@@ -157,7 +157,7 @@ public class TestCMIS extends CMISWebScriptTest
throws Exception throws Exception
{ {
Request get = new GetRequest(href.toString()).setArgs(args); Request get = new GetRequest(href.toString()).setArgs(args);
MockHttpServletResponse res = sendRequest(get, 200); Response res = sendRequest(get, 200);
assertNotNull(res); assertNotNull(res);
String xml = res.getContentAsString(); String xml = res.getContentAsString();
Feed feed = abdera.parseFeed(new StringReader(xml), null); Feed feed = abdera.parseFeed(new StringReader(xml), null);
@@ -173,7 +173,7 @@ public class TestCMIS extends CMISWebScriptTest
String guid = GUID.generate(); String guid = GUID.generate();
createFolder = createFolder.replace("${NAME}", name); createFolder = createFolder.replace("${NAME}", name);
createFolder = createFolder.replace("${GUID}", guid); createFolder = createFolder.replace("${GUID}", guid);
MockHttpServletResponse res = sendRequest(new PostRequest(parent.toString(), createFolder, Format.ATOMENTRY.mimetype()), 201); Response res = sendRequest(new PostRequest(parent.toString(), createFolder, Format.ATOMENTRY.mimetype()), 201);
assertNotNull(res); assertNotNull(res);
String xml = res.getContentAsString(); String xml = res.getContentAsString();
Entry entry = abdera.parseEntry(new StringReader(xml), null); Entry entry = abdera.parseEntry(new StringReader(xml), null);
@@ -194,7 +194,7 @@ public class TestCMIS extends CMISWebScriptTest
String guid = GUID.generate(); String guid = GUID.generate();
createFile = createFile.replace("${NAME}", name); createFile = createFile.replace("${NAME}", name);
createFile = createFile.replace("${GUID}", guid); createFile = createFile.replace("${GUID}", guid);
MockHttpServletResponse res = sendRequest(new PostRequest(parent.toString(), createFile, Format.ATOMENTRY.mimetype()), 201); Response res = sendRequest(new PostRequest(parent.toString(), createFile, Format.ATOMENTRY.mimetype()), 201);
assertNotNull(res); assertNotNull(res);
String xml = res.getContentAsString(); String xml = res.getContentAsString();
Entry entry = abdera.parseEntry(new StringReader(xml), null); Entry entry = abdera.parseEntry(new StringReader(xml), null);
@@ -273,7 +273,7 @@ public class TestCMIS extends CMISWebScriptTest
assertEquals(testDocument.getSummary(), testDocumentFromGet.getSummary()); assertEquals(testDocument.getSummary(), testDocumentFromGet.getSummary());
// get something that doesn't exist // get something that doesn't exist
MockHttpServletResponse res = sendRequest(new GetRequest("/api/node/workspace/SpacesStore/" + GUID.generate()), 404); Response res = sendRequest(new GetRequest("/api/node/workspace/SpacesStore/" + GUID.generate()), 404);
assertNotNull(res); assertNotNull(res);
} }
@@ -292,12 +292,12 @@ public class TestCMIS extends CMISWebScriptTest
assertNotNull(document3); assertNotNull(document3);
// checkout one of the children to ensure private working copy isn't included // checkout one of the children to ensure private working copy isn't included
MockHttpServletResponse documentRes = sendRequest(new GetRequest(document2.getSelfLink().getHref().toString()), 200); Response documentRes = sendRequest(new GetRequest(document2.getSelfLink().getHref().toString()), 200);
assertNotNull(documentRes); assertNotNull(documentRes);
String documentXML = documentRes.getContentAsString(); String documentXML = documentRes.getContentAsString();
assertNotNull(documentXML); assertNotNull(documentXML);
IRI checkedoutHREF = getCheckedOutCollection(service); IRI checkedoutHREF = getCheckedOutCollection(service);
MockHttpServletResponse pwcRes = sendRequest(new PostRequest(checkedoutHREF.toString(), documentXML, Format.ATOMENTRY.mimetype()), 201); Response pwcRes = sendRequest(new PostRequest(checkedoutHREF.toString(), documentXML, Format.ATOMENTRY.mimetype()), 201);
assertNotNull(pwcRes); assertNotNull(pwcRes);
Entry pwc = abdera.parseEntry(new StringReader(pwcRes.getContentAsString()), null); Entry pwc = abdera.parseEntry(new StringReader(pwcRes.getContentAsString()), null);
@@ -382,7 +382,7 @@ public class TestCMIS extends CMISWebScriptTest
// create document for delete // create document for delete
Entry document = createDocument(childrenLink.getHref(), "testDelete"); Entry document = createDocument(childrenLink.getHref(), "testDelete");
MockHttpServletResponse documentRes = sendRequest(new GetRequest(document.getSelfLink().getHref().toString()), 200); Response documentRes = sendRequest(new GetRequest(document.getSelfLink().getHref().toString()), 200);
assertNotNull(documentRes); assertNotNull(documentRes);
// ensure document has been created // ensure document has been created
@@ -392,7 +392,7 @@ public class TestCMIS extends CMISWebScriptTest
assertEquals(entriesAfterCreate, entriesBefore +1); assertEquals(entriesAfterCreate, entriesBefore +1);
// delete // delete
MockHttpServletResponse deleteRes = sendRequest(new DeleteRequest(document.getSelfLink().getHref().toString()), 204); Response deleteRes = sendRequest(new DeleteRequest(document.getSelfLink().getHref().toString()), 204);
assertNotNull(deleteRes); assertNotNull(deleteRes);
// ensure document has been deleted // ensure document has been deleted
@@ -418,7 +418,7 @@ public class TestCMIS extends CMISWebScriptTest
String updateFile = loadString("/cmis/rest/updatedocument.atomentry.xml"); String updateFile = loadString("/cmis/rest/updatedocument.atomentry.xml");
String guid = GUID.generate(); String guid = GUID.generate();
updateFile = updateFile.replace("${GUID}", guid); updateFile = updateFile.replace("${GUID}", guid);
MockHttpServletResponse res = sendRequest(new PutRequest(document.getSelfLink().getHref().toString(), updateFile, Format.ATOMENTRY.mimetype()), 200); Response res = sendRequest(new PutRequest(document.getSelfLink().getHref().toString(), updateFile, Format.ATOMENTRY.mimetype()), 200);
assertNotNull(res); assertNotNull(res);
Entry updated = abdera.parseEntry(new StringReader(res.getContentAsString()), null); Entry updated = abdera.parseEntry(new StringReader(res.getContentAsString()), null);
@@ -427,7 +427,7 @@ public class TestCMIS extends CMISWebScriptTest
assertEquals(document.getPublished(), updated.getPublished()); assertEquals(document.getPublished(), updated.getPublished());
assertEquals("Updated Title " + guid, updated.getTitle()); assertEquals("Updated Title " + guid, updated.getTitle());
assertEquals("text/plain", updated.getContentMimeType().toString()); assertEquals("text/plain", updated.getContentMimeType().toString());
MockHttpServletResponse contentRes = sendRequest(new GetRequest(updated.getContentSrc().toString()), 200); Response contentRes = sendRequest(new GetRequest(updated.getContentSrc().toString()), 200);
assertEquals("updated content " + guid, contentRes.getContentAsString()); assertEquals("updated content " + guid, contentRes.getContentAsString());
} }
@@ -464,14 +464,14 @@ public class TestCMIS extends CMISWebScriptTest
// create document for checkout // create document for checkout
Entry document = createDocument(scope.getSelfLink().getHref(), "testCheckout"); Entry document = createDocument(scope.getSelfLink().getHref(), "testCheckout");
MockHttpServletResponse documentRes = sendRequest(new GetRequest(document.getSelfLink().getHref().toString()), 200); Response documentRes = sendRequest(new GetRequest(document.getSelfLink().getHref().toString()), 200);
assertNotNull(documentRes); assertNotNull(documentRes);
String documentXML = documentRes.getContentAsString(); String documentXML = documentRes.getContentAsString();
assertNotNull(documentXML); assertNotNull(documentXML);
// checkout // checkout
IRI checkedoutHREF = getCheckedOutCollection(service); IRI checkedoutHREF = getCheckedOutCollection(service);
MockHttpServletResponse pwcRes = sendRequest(new PostRequest(checkedoutHREF.toString(), documentXML, Format.ATOMENTRY.mimetype()), 201); Response pwcRes = sendRequest(new PostRequest(checkedoutHREF.toString(), documentXML, Format.ATOMENTRY.mimetype()), 201);
assertNotNull(pwcRes); assertNotNull(pwcRes);
// TODO: test private working copy properties // TODO: test private working copy properties
@@ -495,14 +495,14 @@ public class TestCMIS extends CMISWebScriptTest
// create document for checkout // create document for checkout
Entry document = createDocument(scope.getSelfLink().getHref(), "testCancelCheckout"); Entry document = createDocument(scope.getSelfLink().getHref(), "testCancelCheckout");
MockHttpServletResponse documentRes = sendRequest(new GetRequest(document.getSelfLink().getHref().toString()), 200); Response documentRes = sendRequest(new GetRequest(document.getSelfLink().getHref().toString()), 200);
assertNotNull(documentRes); assertNotNull(documentRes);
String xml = documentRes.getContentAsString(); String xml = documentRes.getContentAsString();
assertNotNull(xml); assertNotNull(xml);
// checkout // checkout
IRI checkedoutHREF = getCheckedOutCollection(service); IRI checkedoutHREF = getCheckedOutCollection(service);
MockHttpServletResponse pwcRes = sendRequest(new PostRequest(checkedoutHREF.toString(), xml, Format.ATOMENTRY.mimetype()), 201); Response pwcRes = sendRequest(new PostRequest(checkedoutHREF.toString(), xml, Format.ATOMENTRY.mimetype()), 201);
assertNotNull(pwcRes); assertNotNull(pwcRes);
// test getCheckedOut is updated // test getCheckedOut is updated
@@ -518,7 +518,7 @@ public class TestCMIS extends CMISWebScriptTest
String pwcXml = pwcRes.getContentAsString(); String pwcXml = pwcRes.getContentAsString();
Entry pwc = abdera.parseEntry(new StringReader(pwcXml), null); Entry pwc = abdera.parseEntry(new StringReader(pwcXml), null);
assertNotNull(pwc); assertNotNull(pwc);
MockHttpServletResponse cancelRes = sendRequest(new DeleteRequest(pwc.getSelfLink().getHref().toString()), 204); Response cancelRes = sendRequest(new DeleteRequest(pwc.getSelfLink().getHref().toString()), 204);
assertNotNull(cancelRes); assertNotNull(cancelRes);
// test getCheckedOut is updated // test getCheckedOut is updated
@@ -541,14 +541,14 @@ public class TestCMIS extends CMISWebScriptTest
// create document for checkout // create document for checkout
Entry document = createDocument(scope.getSelfLink().getHref(), "testCheckin"); Entry document = createDocument(scope.getSelfLink().getHref(), "testCheckin");
MockHttpServletResponse documentRes = sendRequest(new GetRequest(document.getSelfLink().getHref().toString()), 200); Response documentRes = sendRequest(new GetRequest(document.getSelfLink().getHref().toString()), 200);
assertNotNull(documentRes); assertNotNull(documentRes);
String xml = documentRes.getContentAsString(); String xml = documentRes.getContentAsString();
assertNotNull(xml); assertNotNull(xml);
// checkout // checkout
IRI checkedoutHREF = getCheckedOutCollection(service); IRI checkedoutHREF = getCheckedOutCollection(service);
MockHttpServletResponse pwcRes = sendRequest(new PostRequest(checkedoutHREF.toString(), xml, Format.ATOMENTRY.mimetype()), 201); Response pwcRes = sendRequest(new PostRequest(checkedoutHREF.toString(), xml, Format.ATOMENTRY.mimetype()), 201);
assertNotNull(pwcRes); assertNotNull(pwcRes);
Entry pwc = abdera.parseEntry(new StringReader(pwcRes.getContentAsString()), null); Entry pwc = abdera.parseEntry(new StringReader(pwcRes.getContentAsString()), null);
assertNotNull(pwc); assertNotNull(pwc);
@@ -566,7 +566,7 @@ public class TestCMIS extends CMISWebScriptTest
String updateFile = loadString("/cmis/rest/updatedocument.atomentry.xml"); String updateFile = loadString("/cmis/rest/updatedocument.atomentry.xml");
String guid = GUID.generate(); String guid = GUID.generate();
updateFile = updateFile.replace("${GUID}", guid); updateFile = updateFile.replace("${GUID}", guid);
MockHttpServletResponse pwcUpdatedres = sendRequest(new PutRequest(pwc.getEditLink().getHref().toString(), updateFile, Format.ATOMENTRY.mimetype()), 200); Response pwcUpdatedres = sendRequest(new PutRequest(pwc.getEditLink().getHref().toString(), updateFile, Format.ATOMENTRY.mimetype()), 200);
assertNotNull(pwcUpdatedres); assertNotNull(pwcUpdatedres);
Entry updated = abdera.parseEntry(new StringReader(pwcUpdatedres.getContentAsString()), null); Entry updated = abdera.parseEntry(new StringReader(pwcUpdatedres.getContentAsString()), null);
// ensure update occurred // ensure update occurred
@@ -574,7 +574,7 @@ public class TestCMIS extends CMISWebScriptTest
assertEquals(pwc.getPublished(), updated.getPublished()); assertEquals(pwc.getPublished(), updated.getPublished());
assertEquals("Updated Title " + guid, updated.getTitle()); assertEquals("Updated Title " + guid, updated.getTitle());
assertEquals("text/plain", updated.getContentMimeType().toString()); assertEquals("text/plain", updated.getContentMimeType().toString());
MockHttpServletResponse pwcContentRes = sendRequest(new GetRequest(pwc.getContentSrc().toString()), 200); Response pwcContentRes = sendRequest(new GetRequest(pwc.getContentSrc().toString()), 200);
assertEquals("updated content " + guid, pwcContentRes.getContentAsString()); assertEquals("updated content " + guid, pwcContentRes.getContentAsString());
// checkin // checkin
@@ -582,7 +582,7 @@ public class TestCMIS extends CMISWebScriptTest
String checkinUrl = pwc.getSelfLink().getHref().toString(); String checkinUrl = pwc.getSelfLink().getHref().toString();
Map<String, String> args2 = new HashMap<String, String>(); Map<String, String> args2 = new HashMap<String, String>();
args2.put("checkinComment", guid); args2.put("checkinComment", guid);
MockHttpServletResponse checkinRes = sendRequest(new PutRequest(checkinUrl, checkinFile, Format.ATOMENTRY.mimetype()).setArgs(args2), 200); Response checkinRes = sendRequest(new PutRequest(checkinUrl, checkinFile, Format.ATOMENTRY.mimetype()).setArgs(args2), 200);
assertNotNull(checkinRes); assertNotNull(checkinRes);
// test getCheckedOut is updated // test getCheckedOut is updated
@@ -600,7 +600,7 @@ public class TestCMIS extends CMISWebScriptTest
// TODO: issue with updating name on PWC and it not reflecting on checked-in document // TODO: issue with updating name on PWC and it not reflecting on checked-in document
//assertEquals("Updated Title " + guid, updatedDoc.getTitle()); //assertEquals("Updated Title " + guid, updatedDoc.getTitle());
assertEquals("text/plain", updatedDoc.getContentMimeType().toString()); assertEquals("text/plain", updatedDoc.getContentMimeType().toString());
MockHttpServletResponse updatedContentRes = sendRequest(new GetRequest(updatedDoc.getContentSrc().toString()), 200); Response updatedContentRes = sendRequest(new GetRequest(updatedDoc.getContentSrc().toString()), 200);
assertEquals("updated content " + guid, updatedContentRes.getContentAsString()); assertEquals("updated content " + guid, updatedContentRes.getContentAsString());
} }