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@10735 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2008-09-04 11:25:34 +00:00
parent 385ea356c4
commit 40bb33b90e
95 changed files with 5392 additions and 2278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/test/java/org/alfresco/repo/cmis/ws/BaseServicePortTest.java
View File

@@ -28,7 +28,6 @@ import javax.transaction.UserTransaction;
import org.alfresco.cmis.CMISService;
import org.alfresco.cmis.dictionary.CMISMapping;
import org.alfresco.cmis.property.CMISPropertyNameMapping;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.node.integrity.IntegrityChecker;
import org.alfresco.repo.security.authentication.AuthenticationComponent;
@@ -122,11 +121,10 @@ public class BaseServicePortTest extends AbstractDependencyInjectionSpringContex
protected String getPropertyIDValue(PropertiesType properties, String propertyName)
{
String result = null;
String realPropertyName = CMISPropertyNameMapping.getWebServiceName(propertyName);
for (PropertyIDType property : properties.getPropertyID())
{
if (realPropertyName.equals(property.getName()))
if (propertyName.equals(property.getName()))
{
result = property.getValue();
break;
@@ -139,11 +137,10 @@ public class BaseServicePortTest extends AbstractDependencyInjectionSpringContex
protected String getPropertyStringValue(PropertiesType properties, String propertyName)
{
String result = null;
String realPropertyName = CMISPropertyNameMapping.getWebServiceName(propertyName);
for (PropertyStringType property : properties.getPropertyString())
{
if (realPropertyName.equals(property.getName()))
if (propertyName.equals(property.getName()))
{
result = property.getValue();
break;
@@ -156,11 +153,10 @@ public class BaseServicePortTest extends AbstractDependencyInjectionSpringContex
protected boolean getPropertyBooleanValue(PropertiesType properties, String propertyName)
{
boolean result = false;
String realPropertyName = CMISPropertyNameMapping.getWebServiceName(propertyName);
for (PropertyBooleanType property : properties.getPropertyBoolean())
{
if (realPropertyName.equals(property.getName()))
if (propertyName.equals(property.getName()))
{
result = property.isValue();
break;

6
source/test/java/org/alfresco/repo/cmis/ws/DMObjectServicePortTest.java
View File

@@ -53,7 +53,7 @@ public class DMObjectServicePortTest extends BaseServicePortContentTest
GetPropertiesResponse response = objectServicePort.getProperties(request);
assertNotNull(response);
assertEquals(rootNodeRef.toString(), getPropertyIDValue(response.getObject().getProperties(), CMISMapping.PROP_PARENT));
assertEquals(rootNodeRef.toString(), getPropertyIDValue(response.getObject().getProperties(), CMISMapping.PROP_PARENT_ID));
assertEquals(L0_FOLDER_0, getPropertyStringValue(response.getObject().getProperties(), CMISMapping.PROP_NAME));
}
@@ -147,7 +147,7 @@ public class DMObjectServicePortTest extends BaseServicePortContentTest
assertNotNull(response);
assertNull(getPropertyStringValue(response.getObject().getProperties(), CMISMapping.PROP_CHECKIN_COMMENT));
assertTrue(getPropertyBooleanValue(response.getObject().getProperties(), CMISMapping.PROP_VERSION_SERIES_IS_CHECKED_OUT));
assertTrue(getPropertyBooleanValue(response.getObject().getProperties(), CMISMapping.PROP_IS_VERSION_SERIES_CHECKED_OUT));
assertEquals(getPropertyStringValue(response.getObject().getProperties(), CMISMapping.PROP_VERSION_SERIES_CHECKED_OUT_BY), authenticationComponent.getSystemUserName());
assertEquals(getPropertyIDValue(response.getObject().getProperties(), CMISMapping.PROP_VERSION_SERIES_CHECKED_OUT_ID), workingCopyNodeRef.toString());
@@ -157,7 +157,7 @@ public class DMObjectServicePortTest extends BaseServicePortContentTest
response = objectServicePort.getProperties(request);
assertNotNull(response);
assertNull(getPropertyStringValue(response.getObject().getProperties(), CMISMapping.PROP_CHECKIN_COMMENT));
assertTrue(getPropertyBooleanValue(response.getObject().getProperties(), CMISMapping.PROP_VERSION_SERIES_IS_CHECKED_OUT));
assertTrue(getPropertyBooleanValue(response.getObject().getProperties(), CMISMapping.PROP_IS_VERSION_SERIES_CHECKED_OUT));
assertEquals(getPropertyStringValue(response.getObject().getProperties(), CMISMapping.PROP_VERSION_SERIES_CHECKED_OUT_BY), authenticationComponent.getSystemUserName());
assertEquals(getPropertyIDValue(response.getObject().getProperties(), CMISMapping.PROP_VERSION_SERIES_CHECKED_OUT_ID), workingCopyNodeRef.toString());
}