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

review updates (1)

Browse Source
This commit is contained in:
Rodica Sutu
2016-11-28 17:35:41 +02:00
parent 75910c0d81
commit 7bf7f72066
8 changed files with 57 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponent.java
View File

@@ -84,6 +84,7 @@ public class FilePlanComponent
@JsonProperty (value = ALLOWABLE_OPERATIONS) @JsonProperty (value = ALLOWABLE_OPERATIONS)
private List<String> allowableOperations; private List<String> allowableOperations;
private FilePlanComponentPath path; private FilePlanComponentPath path;
@JsonProperty (required = true) @JsonProperty (required = true)
@@ -203,7 +204,7 @@ public class FilePlanComponent
/** /**
* @return the isCategory * @return the isCategory
*/ */
public Boolean isIsCategory() public Boolean isCategory()
{ {
return this.isCategory; return this.isCategory;
} }
@@ -219,7 +220,7 @@ public class FilePlanComponent
/** /**
* @return the isRecordFolder * @return the isRecordFolder
*/ */
public Boolean isIsRecordFolder() public Boolean isRecordFolder()
{ {
return this.isRecordFolder; return this.isRecordFolder;
} }
@@ -235,7 +236,7 @@ public class FilePlanComponent
/** /**
* @return the isFile * @return the isFile
*/ */
public Boolean isIsFile() public Boolean isFile()
{ {
return this.isFile; return this.isFile;
} }
@@ -251,7 +252,7 @@ public class FilePlanComponent
/** /**
* @return the hasRetentionSchedule * @return the hasRetentionSchedule
*/ */
public Boolean isHasRetentionSchedule() public Boolean hasRetentionSchedule()
{ {
return this.hasRetentionSchedule; return this.hasRetentionSchedule;
} }

9
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/util/PojoUtility.java
View File

@@ -58,13 +58,16 @@ public class PojoUtility
//return the json object //return the json object
return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(model); return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(model);
} catch (JsonGenerationException e) }
catch (JsonGenerationException e)
{ {
return e.toString(); return e.toString();
} catch (JsonMappingException e) }
catch (JsonMappingException e)
{ {
return e.toString(); return e.toString();
} catch (IOException e) }
catch (IOException e)
{ {
return e.toString(); return e.toString();
} }

22
rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/RecordCategoryTest.java
View File

@@ -103,9 +103,9 @@ public class RecordCategoryTest extends BaseRestTest
restWrapper.assertStatusCodeIs(CREATED); restWrapper.assertStatusCodeIs(CREATED);
// Verify the returned file plan component // Verify the returned file plan component
assertTrue(filePlanComponent.isIsCategory()); assertTrue(filePlanComponent.isCategory());
assertFalse(filePlanComponent.isIsFile()); assertFalse(filePlanComponent.isFile());
assertFalse(filePlanComponent.isIsRecordFolder()); assertFalse(filePlanComponent.isRecordFolder());
assertEquals(filePlanComponent.getName(), categoryName); assertEquals(filePlanComponent.getName(), categoryName);
assertEquals(filePlanComponent.getNodeType(), RECORD_CATEGORY_TYPE.toString()); assertEquals(filePlanComponent.getNodeType(), RECORD_CATEGORY_TYPE.toString());
@@ -226,9 +226,9 @@ public class RecordCategoryTest extends BaseRestTest
// Verify child category // Verify child category
assertEquals(childCategory.getParentId(), rootCategory.getId()); assertEquals(childCategory.getParentId(), rootCategory.getId());
assertTrue(childCategory.isIsCategory()); assertTrue(childCategory.isCategory());
assertFalse(childCategory.isIsFile()); assertFalse(childCategory.isFile());
assertFalse(childCategory.isIsRecordFolder()); assertFalse(childCategory.isRecordFolder());
assertEquals(childCategory.getNodeType(), RECORD_CATEGORY_TYPE.toString()); assertEquals(childCategory.getNodeType(), RECORD_CATEGORY_TYPE.toString());
} }
@@ -295,19 +295,19 @@ public class RecordCategoryTest extends BaseRestTest
assertEquals(filePlanComponent.getParentId(), rootCategory.getId()); assertEquals(filePlanComponent.getParentId(), rootCategory.getId());
// Only categories or folders have been created // Only categories or folders have been created
assertFalse(filePlanComponent.isIsFile()); assertFalse(filePlanComponent.isFile());
// Boolean properties related to node type // Boolean properties related to node type
// Only RECORD_CATEGORY_TYPE and RECORD_FOLDER_TYPE have been created // Only RECORD_CATEGORY_TYPE and RECORD_FOLDER_TYPE have been created
if (filePlanComponent.getNodeType().equals(RECORD_CATEGORY_TYPE.toString())) if (filePlanComponent.getNodeType().equals(RECORD_CATEGORY_TYPE.toString()))
{ {
assertTrue(filePlanComponent.isIsCategory()); assertTrue(filePlanComponent.isCategory());
assertFalse(filePlanComponent.isIsRecordFolder()); assertFalse(filePlanComponent.isRecordFolder());
} }
else else
{ {
assertTrue(filePlanComponent.isIsRecordFolder()); assertTrue(filePlanComponent.isRecordFolder());
assertFalse(filePlanComponent.isIsCategory()); assertFalse(filePlanComponent.isCategory());
} }
// Does returned object have the same contents as the created one? // Does returned object have the same contents as the created one?

21
rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/RecordFolderTests.java
View File

@@ -99,15 +99,15 @@ public class RecordFolderTests extends BaseRestTest
// Create the record folder // Create the record folder
FilePlanComponent folder = filePlanComponentAPI.createFilePlanComponent(recordFolder, filePlanComponent.getId()); FilePlanComponent folder = filePlanComponentAPI.createFilePlanComponent(recordFolder, filePlanComponent.getId());
//filePlanComponentAPI.createFilePlanComponent(recordFolderProperties, filePlanComponent.getId());
filePlanComponentAPI.usingRestWrapper().assertStatusCodeIs(CREATED); filePlanComponentAPI.usingRestWrapper().assertStatusCodeIs(CREATED);
// Check folder has been created within the category created // Check folder has been created within the category created
assertEquals(filePlanComponent.getId(),folder.getParentId()); assertEquals(filePlanComponent.getId(),folder.getParentId());
// Verify the returned properties for the file plan component - record folder // Verify the returned properties for the file plan component - record folder
assertFalse(folder.isIsCategory()); assertFalse(folder.isCategory());
assertFalse(folder.isIsFile()); assertFalse(folder.isFile());
assertTrue(folder.isIsRecordFolder()); assertTrue(folder.isRecordFolder());
assertEquals(folder.getName(), FOLDER_NAME); assertEquals(folder.getName(), FOLDER_NAME);
assertEquals(folder.getNodeType(), RECORD_FOLDER_TYPE.toString()); assertEquals(folder.getNodeType(), RECORD_FOLDER_TYPE.toString());
@@ -168,9 +168,9 @@ public class RecordFolderTests extends BaseRestTest
// Verify the returned properties for the file plan component - record folder // Verify the returned properties for the file plan component - record folder
assertEquals(RECORD_FOLDER_TYPE.toString(),folderDetails.getNodeType()); assertEquals(RECORD_FOLDER_TYPE.toString(),folderDetails.getNodeType());
assertTrue(folderDetails.isIsRecordFolder()); assertTrue(folderDetails.isRecordFolder());
assertFalse(folderDetails.isIsCategory()); assertFalse(folderDetails.isCategory());
assertFalse(folderDetails.isIsFile()); assertFalse(folderDetails.isFile());
assertFalse(folderDetails.isClosed()); assertFalse(folderDetails.isClosed());
assertEquals(FOLDER_NAME,folderDetails.getName()); assertEquals(FOLDER_NAME,folderDetails.getName());
@@ -231,7 +231,6 @@ public class RecordFolderTests extends BaseRestTest
assertNotNull(folderUpdated.getProperties().getReviewPeriod().getPeriodType()); assertNotNull(folderUpdated.getProperties().getReviewPeriod().getPeriodType());
assertNotNull(folderUpdated.getProperties().getReviewPeriod().getExpression()); assertNotNull(folderUpdated.getProperties().getReviewPeriod().getExpression());
} }
/** /**
@@ -325,11 +324,11 @@ public class RecordFolderTests extends BaseRestTest
// Is parent Id set correctly // Is parent Id set correctly
assertEquals(filePlanComponent.getParentId(), category.getId()); assertEquals(filePlanComponent.getParentId(), category.getId());
assertFalse(filePlanComponent.isIsFile()); assertFalse(filePlanComponent.isFile());
// Boolean properties related to node type // Boolean properties related to node type
assertTrue(filePlanComponent.isIsRecordFolder()); assertTrue(filePlanComponent.isRecordFolder());
assertFalse(filePlanComponent.isIsCategory()); assertFalse(filePlanComponent.isCategory());
assertEquals(createdComponent.getName(), filePlanComponent.getName()); assertEquals(createdComponent.getName(), filePlanComponent.getName());
assertEquals(createdComponent.getNodeType(), filePlanComponent.getNodeType()); assertEquals(createdComponent.getNodeType(), filePlanComponent.getNodeType());

12
rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/UnfiledRecordsFolderTests.java
View File

@@ -117,9 +117,9 @@ public class UnfiledRecordsFolderTests extends BaseRestTest
filePlanComponentAPI.usingRestWrapper().assertStatusCodeIs(CREATED); filePlanComponentAPI.usingRestWrapper().assertStatusCodeIs(CREATED);
// Verify the returned file plan component // Verify the returned file plan component
assertFalse(filePlanComponent.isIsCategory()); assertFalse(filePlanComponent.isCategory());
assertFalse(filePlanComponent.isIsFile()); assertFalse(filePlanComponent.isFile());
assertFalse(filePlanComponent.isIsRecordFolder()); // it is not a _normal_ record folder! assertFalse(filePlanComponent.isRecordFolder()); // it is not a _normal_ record folder!
assertEquals(filePlanComponent.getName(), folderName); assertEquals(filePlanComponent.getName(), folderName);
assertEquals(filePlanComponent.getNodeType(), UNFILED_RECORD_FOLDER_TYPE.toString()); assertEquals(filePlanComponent.getNodeType(), UNFILED_RECORD_FOLDER_TYPE.toString());
@@ -200,9 +200,9 @@ public class UnfiledRecordsFolderTests extends BaseRestTest
restWrapper.assertStatusCodeIs(CREATED); restWrapper.assertStatusCodeIs(CREATED);
// Verify the returned file plan component // Verify the returned file plan component
assertFalse(childFolder.isIsCategory()); assertFalse(childFolder.isCategory());
assertFalse(childFolder.isIsFile()); assertFalse(childFolder.isFile());
assertFalse(childFolder.isIsRecordFolder()); // it is not a _normal_ record folder! assertFalse(childFolder.isRecordFolder()); // it is not a _normal_ record folder!
assertEquals(childFolder.getName(), childFolderName); assertEquals(childFolder.getName(), childFolderName);
assertEquals(childFolder.getNodeType(), UNFILED_RECORD_FOLDER_TYPE.toString()); assertEquals(childFolder.getNodeType(), UNFILED_RECORD_FOLDER_TYPE.toString());