Merged DEV/CMIS0_61 to HEAD (final part)

14168 Minor fixes for issues found at CMIS PlugFest:
  - test framework: allow remote requests without authentication headers
  - test framework: validate requests toggle was not working; always treated as true
  - web services: expose root document, folder, policy and relationship types in getTypeDefinitions()

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14178 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2009-05-01 21:33:09 +00:00
parent a8603091e9
commit 46661c29d4
5 changed files with 14 additions and 15 deletions

View File

@@ -70,6 +70,7 @@ public class CMISTest extends BaseCMISWebScriptTest
// server.username = "admin";
// server.password = "admin";
// setRemoteServer(server);
// setServiceUrl("http://localhost:8080/alfresco/service/api/cmis");
// setValidateResponse(false);
// setListener(new CMISTestListener(System.out));
// setTraceReqRes(true);

View File

@@ -177,6 +177,7 @@ public class CMISTestRunner
CMISTest test = (CMISTest)allSuite.testAt(i);
if (match == null || match.equals("*") || test.getName().matches(match.replace("*", "[A-Za-z0-9]*")))
{
test.setValidateResponse(validateResponse);
if (listener != null)
{
test.setListener(listener);

View File

@@ -64,15 +64,11 @@ public class CMISTestRunnerWebScript extends AbstractWebScript
runner.setUserPass(userpass);
}
String validate = req.getParameter("validate");
if (validate != null && validate.length() > 0)
{
runner.setValidateResponse(Boolean.valueOf(validate));
}
runner.setValidateResponse(Boolean.valueOf(validate));
String trace = req.getParameter("trace");
if (trace != null && trace.length() > 0)
{
runner.setTraceReqRes(Boolean.valueOf(trace));
}
runner.setTraceReqRes(Boolean.valueOf(trace));
String match = req.getParameter("tests");
if (match != null && match.length() > 0)
{

View File

@@ -352,7 +352,10 @@ public class DMRepositoryServicePort extends DMAbstractServicePort implements Re
cmisTypeDefinition.setQueryName(typeDefinition.getQueryName());
cmisTypeDefinition.setDisplayName(typeDefinition.getDisplayName());
cmisTypeDefinition.setBaseType(EnumBaseObjectType.fromValue(typeDefinition.getBaseType().getTypeId().getId()));
cmisTypeDefinition.setParentId(typeDefinition.getParentType().getTypeId().getId());
if (typeDefinition.getParentType() != null)
{
cmisTypeDefinition.setParentId(typeDefinition.getParentType().getTypeId().getId());
}
cmisTypeDefinition.setBaseTypeQueryName(typeDefinition.getBaseType().getQueryName());
cmisTypeDefinition.setDescription(typeDefinition.getDescription());
cmisTypeDefinition.setCreatable(typeDefinition.isCreatable());
@@ -381,11 +384,6 @@ public class DMRepositoryServicePort extends DMAbstractServicePort implements Re
*/
private CmisTypeDefinitionType getCmisTypeDefinition(CMISTypeDefinition typeDef, boolean includeProperties) throws CmisException
{
if (typeDef.getParentType() == null)
{
return null;
}
if (typeDef == null)
{
throw cmisObjectsUtils.createCmisException("Type not found", EnumServiceException.OBJECT_NOT_FOUND);

View File

@@ -230,7 +230,10 @@ public abstract class BaseWebScriptTest extends TestCase
{
httpClient = new HttpClient();
httpClient.getParams().setBooleanParameter(HttpClientParams.PREEMPTIVE_AUTHENTICATION, true);
httpClient.getState().setCredentials(new AuthScope(AuthScope.ANY_HOST, AuthScope.ANY_PORT), new UsernamePasswordCredentials(remoteServer.username, remoteServer.password));
if (remoteServer.username != null)
{
httpClient.getState().setCredentials(new AuthScope(AuthScope.ANY_HOST, AuthScope.ANY_PORT), new UsernamePasswordCredentials(remoteServer.username, remoteServer.password));
}
}
}