diff --git a/.gitignore b/.gitignore index 19244f1..28b46bc 100644 --- a/.gitignore +++ b/.gitignore @@ -13,25 +13,25 @@ amp/.classpath amp/.project amp/.settings/ -test-data/SinglePassTests/FileFolderVolumeTests/sub1/ -test-data/SinglePassTests/FileFolderVolumeTests/sub2/ -test-data/SinglePassTests/FileFolderVolumeTests/sub3/ -test-data/SinglePassTests/FileNameTests/Punctuation/ -test-data/SinglePassTests/FileNameTests/Unicode/ -test-data/SinglePassTests/FileNameTests/file with a very very very very very very very very very very very very very very very very very very long name that is longer than 128 characters.txt -test-data/SinglePassTests/FileNameTests/file with spaces in the name.txt -test-data/SinglePassTests/FileSizeTests/oneGigabyte.bin -test-data/SinglePassTests/FileSizeTests/oneHundredKilobytes.bin -test-data/SinglePassTests/FileSizeTests/oneHundredMegabytes.bin -test-data/SinglePassTests/FileSizeTests/oneKilobyte.bin -test-data/SinglePassTests/FileSizeTests/oneMegabyte.bin -test-data/SinglePassTests/FileSizeTests/tenKilobytes.bin -test-data/SinglePassTests/FileSizeTests/tenMegabytes.bin -test-data/SinglePassTests/FileSizeTests/threeGigabytes.bin -test-data/SinglePassTests/FileSizeTests/zeroByte.bin -test-data/SinglePassTests/FileVolumeTests/100000files/ -test-data/SinglePassTests/FileVolumeTests/10000files/ -test-data/SinglePassTests/FileVolumeTests/1000files/ -test-data/SinglePassTests/FileVolumeTests/100files/ -test-data/SinglePassTests/PermissionTests/readable.txt -test-data/SinglePassTests/PermissionTests/unreadable.txt +test/data/SinglePassTests/FileFolderVolumeTests/sub1/ +test/data/SinglePassTests/FileFolderVolumeTests/sub2/ +test/data/SinglePassTests/FileFolderVolumeTests/sub3/ +test/data/SinglePassTests/FileNameTests/Punctuation/ +test/data/SinglePassTests/FileNameTests/Unicode/ +test/data/SinglePassTests/FileNameTests/file with a very very very very very very very very very very very very very very very very very very long name that is longer than 128 characters.txt +test/data/SinglePassTests/FileNameTests/file with spaces in the name.txt +test/data/SinglePassTests/FileSizeTests/oneGigabyte.bin +test/data/SinglePassTests/FileSizeTests/oneHundredKilobytes.bin +test/data/SinglePassTests/FileSizeTests/oneHundredMegabytes.bin +test/data/SinglePassTests/FileSizeTests/oneKilobyte.bin +test/data/SinglePassTests/FileSizeTests/oneMegabyte.bin +test/data/SinglePassTests/FileSizeTests/tenKilobytes.bin +test/data/SinglePassTests/FileSizeTests/tenMegabytes.bin +test/data/SinglePassTests/FileSizeTests/threeGigabytes.bin +test/data/SinglePassTests/FileSizeTests/zeroByte.bin +test/data/SinglePassTests/FileVolumeTests/100000files/ +test/data/SinglePassTests/FileVolumeTests/10000files/ +test/data/SinglePassTests/FileVolumeTests/1000files/ +test/data/SinglePassTests/FileVolumeTests/100files/ +test/data/SinglePassTests/PermissionTests/readable.txt +test/data/SinglePassTests/PermissionTests/unreadable.txt diff --git a/amp/src/main/java/org/alfresco/extension/bulkimport/actions/BulkImportActionExecutor.java b/amp/src/main/java/org/alfresco/extension/bulkimport/actions/BulkImportActionExecutor.java index 9b8c8af..733f77b 100644 --- a/amp/src/main/java/org/alfresco/extension/bulkimport/actions/BulkImportActionExecutor.java +++ b/amp/src/main/java/org/alfresco/extension/bulkimport/actions/BulkImportActionExecutor.java @@ -19,16 +19,21 @@ package org.alfresco.extension.bulkimport.actions; +import java.io.IOException; +import java.util.HashMap; import java.util.List; import java.util.Map; +import org.codehaus.jackson.JsonParseException; +import org.codehaus.jackson.map.JsonMappingException; +import org.codehaus.jackson.map.ObjectMapper; +import org.codehaus.jackson.type.TypeReference; import org.alfresco.repo.action.ParameterDefinitionImpl; import org.alfresco.repo.action.executer.ActionExecuterAbstractBase; import org.alfresco.service.cmr.action.Action; import org.alfresco.service.cmr.action.ParameterDefinition; import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.repository.NodeRef; - import org.alfresco.extension.bulkimport.BulkImporter; import org.alfresco.extension.bulkimport.source.fs.FilesystemBulkImportSource; @@ -41,7 +46,7 @@ * The parameters for this action are: * * @@ -52,9 +57,11 @@ public class BulkImportActionExecutor extends ActionExecuterAbstractBase { - private final static String PARAM_SOURCE_BEAN_ID = "source-bean-id"; - private final static String PARAM_PARAMETERS = "parameters"; - private final static String PARAM_TARGET = "target-noderef"; + public static final String NAME = "bulk-import"; + + public final static String PARAM_SOURCE_BEAN_ID = "import-source-bean-id"; + public final static String PARAM_PARAMETERS = "parameters"; + public final static String PARAM_TARGET = "target-noderef"; private final static String DEFAULT_SOURCE_BEAN_ID = FilesystemBulkImportSource.IMPORT_SOURCE_NAME; @@ -99,12 +106,20 @@ protected void executeImpl(final Action actionInstance, final NodeRef actedUponN NodeRef target = (NodeRef)actionInstance.getParameterValue(PARAM_TARGET); Map> parameters = null; - if (sourceBeanId == null) + // Action parameter wrangling + if (sourceBeanId == null || sourceBeanId.trim().length() == 0) { sourceBeanId = DEFAULT_SOURCE_BEAN_ID; } - parameters = parseParametersJson(parametersJson); + try + { + parameters = parseParametersJson(parametersJson); + } + catch (final Exception e) + { + throw new RuntimeException(e); + } // Initiate the import bulkImport.start(sourceBeanId, parameters, target); @@ -112,9 +127,15 @@ protected void executeImpl(final Action actionInstance, final NodeRef actedUponN private final Map> parseParametersJson(final String parametersJson) + throws IOException, JsonMappingException, JsonParseException { - //####TODO: IMPLEMENT THIS!!! - return(null); + Map> result = null; + final ObjectMapper mapper = new ObjectMapper(); + final TypeReference>> typeReference = new TypeReference>>() {}; + + result = mapper.readValue(parametersJson, typeReference); + + return(result); } } diff --git a/test-data/FailureTests/DuplicateName/file1.txt b/test/data/FailureTests/DuplicateName/file1.txt similarity index 100% rename from test-data/FailureTests/DuplicateName/file1.txt rename to test/data/FailureTests/DuplicateName/file1.txt diff --git a/test-data/FailureTests/DuplicateName/file1.txt.metadata.properties.xml b/test/data/FailureTests/DuplicateName/file1.txt.metadata.properties.xml similarity index 100% rename from test-data/FailureTests/DuplicateName/file1.txt.metadata.properties.xml rename to test/data/FailureTests/DuplicateName/file1.txt.metadata.properties.xml diff --git a/test-data/FailureTests/DuplicateName/file2.txt b/test/data/FailureTests/DuplicateName/file2.txt similarity index 100% rename from test-data/FailureTests/DuplicateName/file2.txt rename to test/data/FailureTests/DuplicateName/file2.txt diff --git a/test-data/FailureTests/DuplicateName/file2.txt.metadata.properties.xml b/test/data/FailureTests/DuplicateName/file2.txt.metadata.properties.xml similarity index 100% rename from test-data/FailureTests/DuplicateName/file2.txt.metadata.properties.xml rename to test/data/FailureTests/DuplicateName/file2.txt.metadata.properties.xml diff --git a/test-data/FailureTests/InvalidTag/invalidTag.txt b/test/data/FailureTests/InvalidTag/invalidTag.txt similarity index 100% rename from test-data/FailureTests/InvalidTag/invalidTag.txt rename to test/data/FailureTests/InvalidTag/invalidTag.txt diff --git a/test-data/FailureTests/InvalidTag/invalidTag.txt.metadata.properties.xml b/test/data/FailureTests/InvalidTag/invalidTag.txt.metadata.properties.xml similarity index 100% rename from test-data/FailureTests/InvalidTag/invalidTag.txt.metadata.properties.xml rename to test/data/FailureTests/InvalidTag/invalidTag.txt.metadata.properties.xml diff --git a/test-data/ManualTests/AssociationTest/multiValuedProperty.txt b/test/data/ManualTests/AssociationTest/multiValuedProperty.txt similarity index 100% rename from test-data/ManualTests/AssociationTest/multiValuedProperty.txt rename to test/data/ManualTests/AssociationTest/multiValuedProperty.txt diff --git a/test-data/ManualTests/AssociationTest/multiValuedProperty.txt.metadata.properties.xml b/test/data/ManualTests/AssociationTest/multiValuedProperty.txt.metadata.properties.xml similarity index 100% rename from test-data/ManualTests/AssociationTest/multiValuedProperty.txt.metadata.properties.xml rename to test/data/ManualTests/AssociationTest/multiValuedProperty.txt.metadata.properties.xml diff --git a/test-data/ManualTests/AssociationTest/taggedFile.txt b/test/data/ManualTests/AssociationTest/taggedFile.txt similarity index 100% rename from test-data/ManualTests/AssociationTest/taggedFile.txt rename to test/data/ManualTests/AssociationTest/taggedFile.txt diff --git a/test-data/ManualTests/AssociationTest/taggedFile.txt.metadata.properties.xml b/test/data/ManualTests/AssociationTest/taggedFile.txt.metadata.properties.xml similarity index 100% rename from test-data/ManualTests/AssociationTest/taggedFile.txt.metadata.properties.xml rename to test/data/ManualTests/AssociationTest/taggedFile.txt.metadata.properties.xml diff --git a/test-data/ManualTests/LongPropertyNameTest/import/bfsitContentModel.txt b/test/data/ManualTests/LongPropertyNameTest/import/bfsitContentModel.txt similarity index 100% rename from test-data/ManualTests/LongPropertyNameTest/import/bfsitContentModel.txt rename to test/data/ManualTests/LongPropertyNameTest/import/bfsitContentModel.txt diff --git a/test-data/ManualTests/LongPropertyNameTest/import/bfsitContentModel.txt.metadata.properties.xml b/test/data/ManualTests/LongPropertyNameTest/import/bfsitContentModel.txt.metadata.properties.xml similarity index 100% rename from test-data/ManualTests/LongPropertyNameTest/import/bfsitContentModel.txt.metadata.properties.xml rename to test/data/ManualTests/LongPropertyNameTest/import/bfsitContentModel.txt.metadata.properties.xml diff --git a/test-data/ManualTests/LongPropertyNameTest/model/bfsitContentModel.xml b/test/data/ManualTests/LongPropertyNameTest/model/bfsitContentModel.xml similarity index 100% rename from test-data/ManualTests/LongPropertyNameTest/model/bfsitContentModel.xml rename to test/data/ManualTests/LongPropertyNameTest/model/bfsitContentModel.xml diff --git a/test-data/ManualTests/LongPropertyNameTest/model/custom-bfsit-content-model-context.xml b/test/data/ManualTests/LongPropertyNameTest/model/custom-bfsit-content-model-context.xml similarity index 100% rename from test-data/ManualTests/LongPropertyNameTest/model/custom-bfsit-content-model-context.xml rename to test/data/ManualTests/LongPropertyNameTest/model/custom-bfsit-content-model-context.xml diff --git a/test-data/MultiPassTests/pass1/subDirectory/test.txt b/test/data/MultiPassTests/pass1/subDirectory/test.txt similarity index 100% rename from test-data/MultiPassTests/pass1/subDirectory/test.txt rename to test/data/MultiPassTests/pass1/subDirectory/test.txt diff --git a/test-data/MultiPassTests/pass1/test.txt b/test/data/MultiPassTests/pass1/test.txt similarity index 100% rename from test-data/MultiPassTests/pass1/test.txt rename to test/data/MultiPassTests/pass1/test.txt diff --git a/test-data/MultiPassTests/pass2/anotherFile.txt b/test/data/MultiPassTests/pass2/anotherFile.txt similarity index 100% rename from test-data/MultiPassTests/pass2/anotherFile.txt rename to test/data/MultiPassTests/pass2/anotherFile.txt diff --git a/test-data/MultiPassTests/pass2/subDirectory/anotherFile.txt b/test/data/MultiPassTests/pass2/subDirectory/anotherFile.txt similarity index 100% rename from test-data/MultiPassTests/pass2/subDirectory/anotherFile.txt rename to test/data/MultiPassTests/pass2/subDirectory/anotherFile.txt diff --git a/test-data/MultiPassTests/pass2/subDirectory/test.txt.metadata.properties.xml b/test/data/MultiPassTests/pass2/subDirectory/test.txt.metadata.properties.xml similarity index 100% rename from test-data/MultiPassTests/pass2/subDirectory/test.txt.metadata.properties.xml rename to test/data/MultiPassTests/pass2/subDirectory/test.txt.metadata.properties.xml diff --git a/test-data/MultiPassTests/pass2/test.txt.metadata.properties.xml b/test/data/MultiPassTests/pass2/test.txt.metadata.properties.xml similarity index 100% rename from test-data/MultiPassTests/pass2/test.txt.metadata.properties.xml rename to test/data/MultiPassTests/pass2/test.txt.metadata.properties.xml diff --git a/test-data/SinglePassTests/FileFolderVolumeTests/cleanTestData.sh b/test/data/SinglePassTests/FileFolderVolumeTests/cleanTestData.sh similarity index 100% rename from test-data/SinglePassTests/FileFolderVolumeTests/cleanTestData.sh rename to test/data/SinglePassTests/FileFolderVolumeTests/cleanTestData.sh diff --git a/test-data/SinglePassTests/FileFolderVolumeTests/createTestData.sh b/test/data/SinglePassTests/FileFolderVolumeTests/createTestData.sh similarity index 100% rename from test-data/SinglePassTests/FileFolderVolumeTests/createTestData.sh rename to test/data/SinglePassTests/FileFolderVolumeTests/createTestData.sh diff --git a/test-data/SinglePassTests/FileNameTests/cleanTestData.sh b/test/data/SinglePassTests/FileNameTests/cleanTestData.sh similarity index 100% rename from test-data/SinglePassTests/FileNameTests/cleanTestData.sh rename to test/data/SinglePassTests/FileNameTests/cleanTestData.sh diff --git a/test-data/SinglePassTests/FileNameTests/createTestData.sh b/test/data/SinglePassTests/FileNameTests/createTestData.sh similarity index 100% rename from test-data/SinglePassTests/FileNameTests/createTestData.sh rename to test/data/SinglePassTests/FileNameTests/createTestData.sh diff --git a/test-data/SinglePassTests/FileSizeTests/cleanTestData.sh b/test/data/SinglePassTests/FileSizeTests/cleanTestData.sh similarity index 100% rename from test-data/SinglePassTests/FileSizeTests/cleanTestData.sh rename to test/data/SinglePassTests/FileSizeTests/cleanTestData.sh diff --git a/test-data/SinglePassTests/FileSizeTests/createTestData.sh b/test/data/SinglePassTests/FileSizeTests/createTestData.sh similarity index 100% rename from test-data/SinglePassTests/FileSizeTests/createTestData.sh rename to test/data/SinglePassTests/FileSizeTests/createTestData.sh diff --git a/test-data/SinglePassTests/FileVolumeTests/cleanTestData.sh b/test/data/SinglePassTests/FileVolumeTests/cleanTestData.sh similarity index 100% rename from test-data/SinglePassTests/FileVolumeTests/cleanTestData.sh rename to test/data/SinglePassTests/FileVolumeTests/cleanTestData.sh diff --git a/test-data/SinglePassTests/FileVolumeTests/createTestData.sh b/test/data/SinglePassTests/FileVolumeTests/createTestData.sh similarity index 100% rename from test-data/SinglePassTests/FileVolumeTests/createTestData.sh rename to test/data/SinglePassTests/FileVolumeTests/createTestData.sh diff --git a/test-data/SinglePassTests/FolderStructureTests/cleanTestData.sh b/test/data/SinglePassTests/FolderStructureTests/cleanTestData.sh similarity index 100% rename from test-data/SinglePassTests/FolderStructureTests/cleanTestData.sh rename to test/data/SinglePassTests/FolderStructureTests/cleanTestData.sh diff --git a/test-data/SinglePassTests/FolderStructureTests/createTestData.sh b/test/data/SinglePassTests/FolderStructureTests/createTestData.sh similarity index 100% rename from test-data/SinglePassTests/FolderStructureTests/createTestData.sh rename to test/data/SinglePassTests/FolderStructureTests/createTestData.sh diff --git a/test-data/SinglePassTests/MIMETypeTests/JPEG_example_JPG_RIP_100.jpg b/test/data/SinglePassTests/MIMETypeTests/JPEG_example_JPG_RIP_100.jpg similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/JPEG_example_JPG_RIP_100.jpg rename to test/data/SinglePassTests/MIMETypeTests/JPEG_example_JPG_RIP_100.jpg diff --git a/test-data/SinglePassTests/MIMETypeTests/Newtons_cradle_animation_book_2.gif b/test/data/SinglePassTests/MIMETypeTests/Newtons_cradle_animation_book_2.gif similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Newtons_cradle_animation_book_2.gif rename to test/data/SinglePassTests/MIMETypeTests/Newtons_cradle_animation_book_2.gif diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco.html b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco.html similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco.html rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco.html diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/activision-logo-rollover.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/activision-logo-rollover.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/activision-logo-rollover.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/activision-logo-rollover.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/activiti-petal.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/activiti-petal.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/activiti-petal.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/activiti-petal.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/addthis-button.gif b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/addthis-button.gif similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/addthis-button.gif rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/addthis-button.gif diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/addthis_widget.js b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/addthis_widget.js similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/addthis_widget.js rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/addthis_widget.js diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/akeroilfieldservices-logo-rollover.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/akeroilfieldservices-logo-rollover.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/akeroilfieldservices-logo-rollover.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/akeroilfieldservices-logo-rollover.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/all.js b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/all.js similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/all.js rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/all.js diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/analytics b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/analytics similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/analytics rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/analytics diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/analytics(1) b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/analytics(1) similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/analytics(1) rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/analytics(1) diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/anu.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/anu.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/anu.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/anu.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/astrium.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/astrium.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/astrium.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/astrium.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/caceis-logo-rollover.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/caceis-logo-rollover.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/caceis-logo-rollover.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/caceis-logo-rollover.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/calendar-24.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/calendar-24.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/calendar-24.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/calendar-24.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/cisco.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/cisco.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/cisco.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/cisco.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/combo b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/combo similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/combo rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/combo diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/combo(1) b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/combo(1) similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/combo(1) rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/combo(1) diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/container-min.js b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/container-min.js similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/container-min.js rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/container-min.js diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/container.css b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/container.css similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/container.css rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/container.css diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/content-platform-petal.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/content-platform-petal.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/content-platform-petal.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/content-platform-petal.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/document-management-petal.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/document-management-petal.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/document-management-petal.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/document-management-petal.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/ea-logo-rollover.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/ea-logo-rollover.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/ea-logo-rollover.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/ea-logo-rollover.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/fox.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/fox.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/fox.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/fox.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/ga.js b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/ga.js similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/ga.js rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/ga.js diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/hbsp-logo-rollover.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/hbsp-logo-rollover.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/hbsp-logo-rollover.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/hbsp-logo-rollover.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/hotels.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/hotels.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/hotels.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/hotels.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/islington-logo-rollover.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/islington-logo-rollover.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/islington-logo-rollover.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/islington-logo-rollover.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/juntadeandalucia-logo-rollover.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/juntadeandalucia-logo-rollover.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/juntadeandalucia-logo-rollover.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/juntadeandalucia-logo-rollover.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/kaplan-logo-rollover.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/kaplan-logo-rollover.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/kaplan-logo-rollover.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/kaplan-logo-rollover.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/klm-logo-rollover.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/klm-logo-rollover.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/klm-logo-rollover.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/klm-logo-rollover.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/landsend.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/landsend.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/landsend.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/landsend.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/laposte-logo-rollover.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/laposte-logo-rollover.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/laposte-logo-rollover.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/laposte-logo-rollover.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/main.css b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/main.css similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/main.css rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/main.css diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/marriott-vacations.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/marriott-vacations.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/marriott-vacations.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/marriott-vacations.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/merck.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/merck.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/merck.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/merck.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/nasa-logo-rollover.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/nasa-logo-rollover.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/nasa-logo-rollover.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/nasa-logo-rollover.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/news-24.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/news-24.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/news-24.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/news-24.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/nxp-logo-rollover.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/nxp-logo-rollover.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/nxp-logo-rollover.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/nxp-logo-rollover.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/p.json b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/p.json similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/p.json rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/p.json diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/phila.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/phila.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/phila.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/phila.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/pi.js b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/pi.js similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/pi.js rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/pi.js diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/pipe(1).run b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/pipe(1).run similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/pipe(1).run rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/pipe(1).run diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/pipe.run b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/pipe.run similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/pipe.run rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/pipe.run diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/records-management-petal.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/records-management-petal.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/records-management-petal.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/records-management-petal.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/sesameworkshop-logo-rollover.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/sesameworkshop-logo-rollover.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/sesameworkshop-logo-rollover.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/sesameworkshop-logo-rollover.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/sh30.html b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/sh30.html similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/sh30.html rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/sh30.html diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/shadowbox.css b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/shadowbox.css similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/shadowbox.css rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/shadowbox.css diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/shadowbox.js b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/shadowbox.js similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/shadowbox.js rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/shadowbox.js diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/share-petal.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/share-petal.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/share-petal.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/share-petal.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/sncf.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/sncf.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/sncf.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/sncf.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/social-content-management-video.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/social-content-management-video.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/social-content-management-video.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/social-content-management-video.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/sonypictures-logo-rollover.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/sonypictures-logo-rollover.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/sonypictures-logo-rollover.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/sonypictures-logo-rollover.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/subnav.js b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/subnav.js similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/subnav.js rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/subnav.js diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/swfobject.js b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/swfobject.js similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/swfobject.js rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/swfobject.js diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/toyota.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/toyota.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/toyota.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/toyota.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/utilities.js b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/utilities.js similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/utilities.js rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/utilities.js diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/web-content-management-petal.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/web-content-management-petal.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/web-content-management-petal.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/web-content-management-petal.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/westminster.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/westminster.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/westminster.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/westminster.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/widget50.css b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/widget50.css similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/widget50.css rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/widget50.css diff --git a/test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/yell.png b/test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/yell.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/yell.png rename to test/data/SinglePassTests/MIMETypeTests/Open Source Enterprise Content Management System (CMS) by Alfresco_files/yell.png diff --git a/test-data/SinglePassTests/MIMETypeTests/PDF32000_2008.pdf b/test/data/SinglePassTests/MIMETypeTests/PDF32000_2008.pdf similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/PDF32000_2008.pdf rename to test/data/SinglePassTests/MIMETypeTests/PDF32000_2008.pdf diff --git a/test-data/SinglePassTests/MIMETypeTests/PNG_transparency_demonstration_1.png b/test/data/SinglePassTests/MIMETypeTests/PNG_transparency_demonstration_1.png similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/PNG_transparency_demonstration_1.png rename to test/data/SinglePassTests/MIMETypeTests/PNG_transparency_demonstration_1.png diff --git a/test-data/SinglePassTests/MIMETypeTests/Sunflower_as_gif_small.gif b/test/data/SinglePassTests/MIMETypeTests/Sunflower_as_gif_small.gif similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/Sunflower_as_gif_small.gif rename to test/data/SinglePassTests/MIMETypeTests/Sunflower_as_gif_small.gif diff --git a/test-data/SinglePassTests/MIMETypeTests/testdoc.doc b/test/data/SinglePassTests/MIMETypeTests/testdoc.doc similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/testdoc.doc rename to test/data/SinglePassTests/MIMETypeTests/testdoc.doc diff --git a/test-data/SinglePassTests/MIMETypeTests/testdocx.docx b/test/data/SinglePassTests/MIMETypeTests/testdocx.docx similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/testdocx.docx rename to test/data/SinglePassTests/MIMETypeTests/testdocx.docx diff --git a/test-data/SinglePassTests/MIMETypeTests/testpptx.ppt b/test/data/SinglePassTests/MIMETypeTests/testpptx.ppt similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/testpptx.ppt rename to test/data/SinglePassTests/MIMETypeTests/testpptx.ppt diff --git a/test-data/SinglePassTests/MIMETypeTests/testpptx.pptx b/test/data/SinglePassTests/MIMETypeTests/testpptx.pptx similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/testpptx.pptx rename to test/data/SinglePassTests/MIMETypeTests/testpptx.pptx diff --git a/test-data/SinglePassTests/MIMETypeTests/testtxt.txt b/test/data/SinglePassTests/MIMETypeTests/testtxt.txt similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/testtxt.txt rename to test/data/SinglePassTests/MIMETypeTests/testtxt.txt diff --git a/test-data/SinglePassTests/MIMETypeTests/testxls.xls b/test/data/SinglePassTests/MIMETypeTests/testxls.xls similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/testxls.xls rename to test/data/SinglePassTests/MIMETypeTests/testxls.xls diff --git a/test-data/SinglePassTests/MIMETypeTests/testxlsx.xlsx b/test/data/SinglePassTests/MIMETypeTests/testxlsx.xlsx similarity index 100% rename from test-data/SinglePassTests/MIMETypeTests/testxlsx.xlsx rename to test/data/SinglePassTests/MIMETypeTests/testxlsx.xlsx diff --git a/test-data/SinglePassTests/MetadataTests/basicProperties.txt b/test/data/SinglePassTests/MetadataTests/basicProperties.txt similarity index 100% rename from test-data/SinglePassTests/MetadataTests/basicProperties.txt rename to test/data/SinglePassTests/MetadataTests/basicProperties.txt diff --git a/test-data/SinglePassTests/MetadataTests/basicProperties.txt.metadata.properties.xml b/test/data/SinglePassTests/MetadataTests/basicProperties.txt.metadata.properties.xml similarity index 100% rename from test-data/SinglePassTests/MetadataTests/basicProperties.txt.metadata.properties.xml rename to test/data/SinglePassTests/MetadataTests/basicProperties.txt.metadata.properties.xml diff --git a/test-data/SinglePassTests/MetadataTests/directoryWithMetadata.metadata.properties.xml b/test/data/SinglePassTests/MetadataTests/directoryWithMetadata.metadata.properties.xml similarity index 100% rename from test-data/SinglePassTests/MetadataTests/directoryWithMetadata.metadata.properties.xml rename to test/data/SinglePassTests/MetadataTests/directoryWithMetadata.metadata.properties.xml diff --git a/test-data/SinglePassTests/MetadataTests/directoryWithMetadata/ignore.me b/test/data/SinglePassTests/MetadataTests/directoryWithMetadata/ignore.me similarity index 100% rename from test-data/SinglePassTests/MetadataTests/directoryWithMetadata/ignore.me rename to test/data/SinglePassTests/MetadataTests/directoryWithMetadata/ignore.me diff --git a/test-data/SinglePassTests/MetadataTests/directoryWithNamespace.metadata.properties.xml b/test/data/SinglePassTests/MetadataTests/directoryWithNamespace.metadata.properties.xml similarity index 100% rename from test-data/SinglePassTests/MetadataTests/directoryWithNamespace.metadata.properties.xml rename to test/data/SinglePassTests/MetadataTests/directoryWithNamespace.metadata.properties.xml diff --git a/test-data/SinglePassTests/MetadataTests/directoryWithNamespace/ignore.me b/test/data/SinglePassTests/MetadataTests/directoryWithNamespace/ignore.me similarity index 100% rename from test-data/SinglePassTests/MetadataTests/directoryWithNamespace/ignore.me rename to test/data/SinglePassTests/MetadataTests/directoryWithNamespace/ignore.me diff --git a/test-data/SinglePassTests/MetadataTests/dublinCore.txt b/test/data/SinglePassTests/MetadataTests/dublinCore.txt similarity index 100% rename from test-data/SinglePassTests/MetadataTests/dublinCore.txt rename to test/data/SinglePassTests/MetadataTests/dublinCore.txt diff --git a/test-data/SinglePassTests/MetadataTests/dublinCore.txt.metadata.properties.xml b/test/data/SinglePassTests/MetadataTests/dublinCore.txt.metadata.properties.xml similarity index 100% rename from test-data/SinglePassTests/MetadataTests/dublinCore.txt.metadata.properties.xml rename to test/data/SinglePassTests/MetadataTests/dublinCore.txt.metadata.properties.xml diff --git a/test-data/SinglePassTests/MetadataTests/fileWithMetadata.txt b/test/data/SinglePassTests/MetadataTests/fileWithMetadata.txt similarity index 100% rename from test-data/SinglePassTests/MetadataTests/fileWithMetadata.txt rename to test/data/SinglePassTests/MetadataTests/fileWithMetadata.txt diff --git a/test-data/SinglePassTests/MetadataTests/fileWithMetadata.txt.metadata.properties.xml b/test/data/SinglePassTests/MetadataTests/fileWithMetadata.txt.metadata.properties.xml similarity index 100% rename from test-data/SinglePassTests/MetadataTests/fileWithMetadata.txt.metadata.properties.xml rename to test/data/SinglePassTests/MetadataTests/fileWithMetadata.txt.metadata.properties.xml diff --git a/test-data/SinglePassTests/MetadataTests/fileWithWeirdExtension.properties.xml b/test/data/SinglePassTests/MetadataTests/fileWithWeirdExtension.properties.xml similarity index 100% rename from test-data/SinglePassTests/MetadataTests/fileWithWeirdExtension.properties.xml rename to test/data/SinglePassTests/MetadataTests/fileWithWeirdExtension.properties.xml diff --git a/test-data/SinglePassTests/MetadataTests/fileWithWeirdExtension2.metadata.properties b/test/data/SinglePassTests/MetadataTests/fileWithWeirdExtension2.metadata.properties similarity index 100% rename from test-data/SinglePassTests/MetadataTests/fileWithWeirdExtension2.metadata.properties rename to test/data/SinglePassTests/MetadataTests/fileWithWeirdExtension2.metadata.properties diff --git a/test-data/SinglePassTests/MetadataTests/fileWithoutExtension b/test/data/SinglePassTests/MetadataTests/fileWithoutExtension similarity index 100% rename from test-data/SinglePassTests/MetadataTests/fileWithoutExtension rename to test/data/SinglePassTests/MetadataTests/fileWithoutExtension diff --git a/test-data/SinglePassTests/MetadataTests/fileWithoutExtension.metadata.properties.xml b/test/data/SinglePassTests/MetadataTests/fileWithoutExtension.metadata.properties.xml similarity index 100% rename from test-data/SinglePassTests/MetadataTests/fileWithoutExtension.metadata.properties.xml rename to test/data/SinglePassTests/MetadataTests/fileWithoutExtension.metadata.properties.xml diff --git a/test-data/SinglePassTests/MetadataTests/issue54.txt b/test/data/SinglePassTests/MetadataTests/issue54.txt similarity index 100% rename from test-data/SinglePassTests/MetadataTests/issue54.txt rename to test/data/SinglePassTests/MetadataTests/issue54.txt diff --git a/test-data/SinglePassTests/MetadataTests/issue54.txt.metadata.properties.xml b/test/data/SinglePassTests/MetadataTests/issue54.txt.metadata.properties.xml similarity index 100% rename from test-data/SinglePassTests/MetadataTests/issue54.txt.metadata.properties.xml rename to test/data/SinglePassTests/MetadataTests/issue54.txt.metadata.properties.xml diff --git a/test-data/SinglePassTests/MetadataTests/metadataOnly.txt.metadata.properties.xml b/test/data/SinglePassTests/MetadataTests/metadataOnly.txt.metadata.properties.xml similarity index 100% rename from test-data/SinglePassTests/MetadataTests/metadataOnly.txt.metadata.properties.xml rename to test/data/SinglePassTests/MetadataTests/metadataOnly.txt.metadata.properties.xml diff --git a/test-data/SinglePassTests/MetadataTests/renamedFile.txt b/test/data/SinglePassTests/MetadataTests/renamedFile.txt similarity index 100% rename from test-data/SinglePassTests/MetadataTests/renamedFile.txt rename to test/data/SinglePassTests/MetadataTests/renamedFile.txt diff --git a/test-data/SinglePassTests/MetadataTests/renamedFile.txt.metadata.properties.xml b/test/data/SinglePassTests/MetadataTests/renamedFile.txt.metadata.properties.xml similarity index 100% rename from test-data/SinglePassTests/MetadataTests/renamedFile.txt.metadata.properties.xml rename to test/data/SinglePassTests/MetadataTests/renamedFile.txt.metadata.properties.xml diff --git a/test-data/SinglePassTests/MetadataTests/residualProperty.txt b/test/data/SinglePassTests/MetadataTests/residualProperty.txt similarity index 100% rename from test-data/SinglePassTests/MetadataTests/residualProperty.txt rename to test/data/SinglePassTests/MetadataTests/residualProperty.txt diff --git a/test-data/SinglePassTests/MetadataTests/residualProperty.txt.metadata.properties.xml b/test/data/SinglePassTests/MetadataTests/residualProperty.txt.metadata.properties.xml similarity index 100% rename from test-data/SinglePassTests/MetadataTests/residualProperty.txt.metadata.properties.xml rename to test/data/SinglePassTests/MetadataTests/residualProperty.txt.metadata.properties.xml diff --git a/test-data/SinglePassTests/MetadataTests/sampleAlfrescoContentModel.xml b/test/data/SinglePassTests/MetadataTests/sampleAlfrescoContentModel.xml similarity index 100% rename from test-data/SinglePassTests/MetadataTests/sampleAlfrescoContentModel.xml rename to test/data/SinglePassTests/MetadataTests/sampleAlfrescoContentModel.xml diff --git a/test-data/SinglePassTests/MetadataTests/sampleAlfrescoContentModel.xml.metadata.properties.xml b/test/data/SinglePassTests/MetadataTests/sampleAlfrescoContentModel.xml.metadata.properties.xml similarity index 100% rename from test-data/SinglePassTests/MetadataTests/sampleAlfrescoContentModel.xml.metadata.properties.xml rename to test/data/SinglePassTests/MetadataTests/sampleAlfrescoContentModel.xml.metadata.properties.xml diff --git a/test-data/SinglePassTests/MetadataTests/systemDirectory.metadata.properties.xml b/test/data/SinglePassTests/MetadataTests/systemDirectory.metadata.properties.xml similarity index 100% rename from test-data/SinglePassTests/MetadataTests/systemDirectory.metadata.properties.xml rename to test/data/SinglePassTests/MetadataTests/systemDirectory.metadata.properties.xml diff --git a/test-data/SinglePassTests/MetadataTests/systemDirectory/ignore.me b/test/data/SinglePassTests/MetadataTests/systemDirectory/ignore.me similarity index 100% rename from test-data/SinglePassTests/MetadataTests/systemDirectory/ignore.me rename to test/data/SinglePassTests/MetadataTests/systemDirectory/ignore.me diff --git a/test-data/SinglePassTests/MetadataTests/test.txt b/test/data/SinglePassTests/MetadataTests/test.txt similarity index 100% rename from test-data/SinglePassTests/MetadataTests/test.txt rename to test/data/SinglePassTests/MetadataTests/test.txt diff --git a/test-data/SinglePassTests/MetadataTests/unicodeProperties.txt b/test/data/SinglePassTests/MetadataTests/unicodeProperties.txt similarity index 100% rename from test-data/SinglePassTests/MetadataTests/unicodeProperties.txt rename to test/data/SinglePassTests/MetadataTests/unicodeProperties.txt diff --git a/test-data/SinglePassTests/MetadataTests/unicodeProperties.txt.metadata.properties.xml b/test/data/SinglePassTests/MetadataTests/unicodeProperties.txt.metadata.properties.xml similarity index 100% rename from test-data/SinglePassTests/MetadataTests/unicodeProperties.txt.metadata.properties.xml rename to test/data/SinglePassTests/MetadataTests/unicodeProperties.txt.metadata.properties.xml diff --git a/test-data/SinglePassTests/PermissionTests/cleanTestData.sh b/test/data/SinglePassTests/PermissionTests/cleanTestData.sh similarity index 100% rename from test-data/SinglePassTests/PermissionTests/cleanTestData.sh rename to test/data/SinglePassTests/PermissionTests/cleanTestData.sh diff --git a/test-data/SinglePassTests/PermissionTests/createTestData.sh b/test/data/SinglePassTests/PermissionTests/createTestData.sh similarity index 100% rename from test-data/SinglePassTests/PermissionTests/createTestData.sh rename to test/data/SinglePassTests/PermissionTests/createTestData.sh diff --git a/test-data/SinglePassTests/VersionTests/directoryWithMetadata.metadata.properties.xml b/test/data/SinglePassTests/VersionTests/directoryWithMetadata.metadata.properties.xml similarity index 100% rename from test-data/SinglePassTests/VersionTests/directoryWithMetadata.metadata.properties.xml rename to test/data/SinglePassTests/VersionTests/directoryWithMetadata.metadata.properties.xml diff --git a/test-data/SinglePassTests/VersionTests/directoryWithMetadata/fileToMakeGitHappy.txt b/test/data/SinglePassTests/VersionTests/directoryWithMetadata/fileToMakeGitHappy.txt similarity index 100% rename from test-data/SinglePassTests/VersionTests/directoryWithMetadata/fileToMakeGitHappy.txt rename to test/data/SinglePassTests/VersionTests/directoryWithMetadata/fileToMakeGitHappy.txt diff --git a/test-data/SinglePassTests/VersionTests/directoryWithMetadataVersions.metadata.properties.xml b/test/data/SinglePassTests/VersionTests/directoryWithMetadataVersions.metadata.properties.xml similarity index 100% rename from test-data/SinglePassTests/VersionTests/directoryWithMetadataVersions.metadata.properties.xml rename to test/data/SinglePassTests/VersionTests/directoryWithMetadataVersions.metadata.properties.xml diff --git a/test-data/SinglePassTests/VersionTests/directoryWithMetadataVersions.metadata.properties.xml.v1 b/test/data/SinglePassTests/VersionTests/directoryWithMetadataVersions.metadata.properties.xml.v1 similarity index 100% rename from test-data/SinglePassTests/VersionTests/directoryWithMetadataVersions.metadata.properties.xml.v1 rename to test/data/SinglePassTests/VersionTests/directoryWithMetadataVersions.metadata.properties.xml.v1 diff --git a/test-data/SinglePassTests/VersionTests/directoryWithMetadataVersions.metadata.properties.xml.v2 b/test/data/SinglePassTests/VersionTests/directoryWithMetadataVersions.metadata.properties.xml.v2 similarity index 100% rename from test-data/SinglePassTests/VersionTests/directoryWithMetadataVersions.metadata.properties.xml.v2 rename to test/data/SinglePassTests/VersionTests/directoryWithMetadataVersions.metadata.properties.xml.v2 diff --git a/test-data/SinglePassTests/VersionTests/directoryWithMetadataVersions/fileToMakeGitHappy.txt b/test/data/SinglePassTests/VersionTests/directoryWithMetadataVersions/fileToMakeGitHappy.txt similarity index 100% rename from test-data/SinglePassTests/VersionTests/directoryWithMetadataVersions/fileToMakeGitHappy.txt rename to test/data/SinglePassTests/VersionTests/directoryWithMetadataVersions/fileToMakeGitHappy.txt diff --git a/test-data/SinglePassTests/VersionTests/fileWithGappyVersions.txt b/test/data/SinglePassTests/VersionTests/fileWithGappyVersions.txt similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithGappyVersions.txt rename to test/data/SinglePassTests/VersionTests/fileWithGappyVersions.txt diff --git a/test-data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.metadata.properties.xml.v2 b/test/data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.metadata.properties.xml.v2 similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.metadata.properties.xml.v2 rename to test/data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.metadata.properties.xml.v2 diff --git a/test-data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.metadata.properties.xml.v7 b/test/data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.metadata.properties.xml.v7 similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.metadata.properties.xml.v7 rename to test/data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.metadata.properties.xml.v7 diff --git a/test-data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.metadata.properties.xml.v8 b/test/data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.metadata.properties.xml.v8 similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.metadata.properties.xml.v8 rename to test/data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.metadata.properties.xml.v8 diff --git a/test-data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v1 b/test/data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v1 similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v1 rename to test/data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v1 diff --git a/test-data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v10 b/test/data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v10 similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v10 rename to test/data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v10 diff --git a/test-data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v3 b/test/data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v3 similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v3 rename to test/data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v3 diff --git a/test-data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v4 b/test/data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v4 similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v4 rename to test/data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v4 diff --git a/test-data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v5 b/test/data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v5 similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v5 rename to test/data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v5 diff --git a/test-data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v6 b/test/data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v6 similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v6 rename to test/data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v6 diff --git a/test-data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v7 b/test/data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v7 similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v7 rename to test/data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v7 diff --git a/test-data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v9 b/test/data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v9 similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v9 rename to test/data/SinglePassTests/VersionTests/fileWithGappyVersions.txt.v9 diff --git a/test-data/SinglePassTests/VersionTests/fileWithMetadata.txt b/test/data/SinglePassTests/VersionTests/fileWithMetadata.txt similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithMetadata.txt rename to test/data/SinglePassTests/VersionTests/fileWithMetadata.txt diff --git a/test-data/SinglePassTests/VersionTests/fileWithMetadata.txt.metadata.properties.xml b/test/data/SinglePassTests/VersionTests/fileWithMetadata.txt.metadata.properties.xml similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithMetadata.txt.metadata.properties.xml rename to test/data/SinglePassTests/VersionTests/fileWithMetadata.txt.metadata.properties.xml diff --git a/test-data/SinglePassTests/VersionTests/fileWithNoVersions.txt b/test/data/SinglePassTests/VersionTests/fileWithNoVersions.txt similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithNoVersions.txt rename to test/data/SinglePassTests/VersionTests/fileWithNoVersions.txt diff --git a/test-data/SinglePassTests/VersionTests/fileWithSparseVersions.txt b/test/data/SinglePassTests/VersionTests/fileWithSparseVersions.txt similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithSparseVersions.txt rename to test/data/SinglePassTests/VersionTests/fileWithSparseVersions.txt diff --git a/test-data/SinglePassTests/VersionTests/fileWithSparseVersions.txt.v0 b/test/data/SinglePassTests/VersionTests/fileWithSparseVersions.txt.v0 similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithSparseVersions.txt.v0 rename to test/data/SinglePassTests/VersionTests/fileWithSparseVersions.txt.v0 diff --git a/test-data/SinglePassTests/VersionTests/fileWithSparseVersions.txt.v4 b/test/data/SinglePassTests/VersionTests/fileWithSparseVersions.txt.v4 similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithSparseVersions.txt.v4 rename to test/data/SinglePassTests/VersionTests/fileWithSparseVersions.txt.v4 diff --git a/test-data/SinglePassTests/VersionTests/fileWithSparseVersions.txt.v7 b/test/data/SinglePassTests/VersionTests/fileWithSparseVersions.txt.v7 similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithSparseVersions.txt.v7 rename to test/data/SinglePassTests/VersionTests/fileWithSparseVersions.txt.v7 diff --git a/test-data/SinglePassTests/VersionTests/fileWithVersions.txt b/test/data/SinglePassTests/VersionTests/fileWithVersions.txt similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithVersions.txt rename to test/data/SinglePassTests/VersionTests/fileWithVersions.txt diff --git a/test-data/SinglePassTests/VersionTests/fileWithVersions.txt.v1 b/test/data/SinglePassTests/VersionTests/fileWithVersions.txt.v1 similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithVersions.txt.v1 rename to test/data/SinglePassTests/VersionTests/fileWithVersions.txt.v1 diff --git a/test-data/SinglePassTests/VersionTests/fileWithVersions.txt.v2 b/test/data/SinglePassTests/VersionTests/fileWithVersions.txt.v2 similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithVersions.txt.v2 rename to test/data/SinglePassTests/VersionTests/fileWithVersions.txt.v2 diff --git a/test-data/SinglePassTests/VersionTests/fileWithVersions.txt.v3 b/test/data/SinglePassTests/VersionTests/fileWithVersions.txt.v3 similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithVersions.txt.v3 rename to test/data/SinglePassTests/VersionTests/fileWithVersions.txt.v3 diff --git a/test-data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt b/test/data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt rename to test/data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt diff --git a/test-data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt.metadata.properties.xml b/test/data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt.metadata.properties.xml similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt.metadata.properties.xml rename to test/data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt.metadata.properties.xml diff --git a/test-data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt.metadata.properties.xml.v1 b/test/data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt.metadata.properties.xml.v1 similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt.metadata.properties.xml.v1 rename to test/data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt.metadata.properties.xml.v1 diff --git a/test-data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt.metadata.properties.xml.v2 b/test/data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt.metadata.properties.xml.v2 similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt.metadata.properties.xml.v2 rename to test/data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt.metadata.properties.xml.v2 diff --git a/test-data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt.metadata.properties.xml.v3 b/test/data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt.metadata.properties.xml.v3 similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt.metadata.properties.xml.v3 rename to test/data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt.metadata.properties.xml.v3 diff --git a/test-data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt.v1 b/test/data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt.v1 similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt.v1 rename to test/data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt.v1 diff --git a/test-data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt.v2 b/test/data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt.v2 similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt.v2 rename to test/data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt.v2 diff --git a/test-data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt.v3 b/test/data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt.v3 similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt.v3 rename to test/data/SinglePassTests/VersionTests/fileWithVersionsAndMetadata.txt.v3 diff --git a/test-data/SinglePassTests/VersionTests/fileWithoutExtension b/test/data/SinglePassTests/VersionTests/fileWithoutExtension similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithoutExtension rename to test/data/SinglePassTests/VersionTests/fileWithoutExtension diff --git a/test-data/SinglePassTests/VersionTests/fileWithoutExtension.metadata.properties.xml b/test/data/SinglePassTests/VersionTests/fileWithoutExtension.metadata.properties.xml similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithoutExtension.metadata.properties.xml rename to test/data/SinglePassTests/VersionTests/fileWithoutExtension.metadata.properties.xml diff --git a/test-data/SinglePassTests/VersionTests/fileWithoutExtension.v1 b/test/data/SinglePassTests/VersionTests/fileWithoutExtension.v1 similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithoutExtension.v1 rename to test/data/SinglePassTests/VersionTests/fileWithoutExtension.v1 diff --git a/test-data/SinglePassTests/VersionTests/fileWithoutExtension.v2 b/test/data/SinglePassTests/VersionTests/fileWithoutExtension.v2 similarity index 100% rename from test-data/SinglePassTests/VersionTests/fileWithoutExtension.v2 rename to test/data/SinglePassTests/VersionTests/fileWithoutExtension.v2 diff --git a/test-data/SinglePassTests/VersionTests/majorMinor.txt b/test/data/SinglePassTests/VersionTests/majorMinor.txt similarity index 100% rename from test-data/SinglePassTests/VersionTests/majorMinor.txt rename to test/data/SinglePassTests/VersionTests/majorMinor.txt diff --git a/test-data/SinglePassTests/VersionTests/majorMinor.txt.v0 b/test/data/SinglePassTests/VersionTests/majorMinor.txt.v0 similarity index 100% rename from test-data/SinglePassTests/VersionTests/majorMinor.txt.v0 rename to test/data/SinglePassTests/VersionTests/majorMinor.txt.v0 diff --git a/test-data/SinglePassTests/VersionTests/majorMinor.txt.v0.1 b/test/data/SinglePassTests/VersionTests/majorMinor.txt.v0.1 similarity index 100% rename from test-data/SinglePassTests/VersionTests/majorMinor.txt.v0.1 rename to test/data/SinglePassTests/VersionTests/majorMinor.txt.v0.1 diff --git a/test-data/SinglePassTests/VersionTests/majorMinor.txt.v0.2 b/test/data/SinglePassTests/VersionTests/majorMinor.txt.v0.2 similarity index 100% rename from test-data/SinglePassTests/VersionTests/majorMinor.txt.v0.2 rename to test/data/SinglePassTests/VersionTests/majorMinor.txt.v0.2 diff --git a/test-data/SinglePassTests/VersionTests/majorMinor.txt.v1.0 b/test/data/SinglePassTests/VersionTests/majorMinor.txt.v1.0 similarity index 100% rename from test-data/SinglePassTests/VersionTests/majorMinor.txt.v1.0 rename to test/data/SinglePassTests/VersionTests/majorMinor.txt.v1.0 diff --git a/test-data/SinglePassTests/VersionTests/majorMinor.txt.v1.1 b/test/data/SinglePassTests/VersionTests/majorMinor.txt.v1.1 similarity index 100% rename from test-data/SinglePassTests/VersionTests/majorMinor.txt.v1.1 rename to test/data/SinglePassTests/VersionTests/majorMinor.txt.v1.1 diff --git a/test-data/SinglePassTests/VersionTests/majorMinor.txt.v2.0 b/test/data/SinglePassTests/VersionTests/majorMinor.txt.v2.0 similarity index 100% rename from test-data/SinglePassTests/VersionTests/majorMinor.txt.v2.0 rename to test/data/SinglePassTests/VersionTests/majorMinor.txt.v2.0 diff --git a/test-data/SinglePassTests/VersionTests/majorMinor.txt.v2.999 b/test/data/SinglePassTests/VersionTests/majorMinor.txt.v2.999 similarity index 100% rename from test-data/SinglePassTests/VersionTests/majorMinor.txt.v2.999 rename to test/data/SinglePassTests/VersionTests/majorMinor.txt.v2.999 diff --git a/test-data/SinglePassTests/VersionTests/majorMinor.txt.v999.999 b/test/data/SinglePassTests/VersionTests/majorMinor.txt.v999.999 similarity index 100% rename from test-data/SinglePassTests/VersionTests/majorMinor.txt.v999.999 rename to test/data/SinglePassTests/VersionTests/majorMinor.txt.v999.999 diff --git a/test-data/SinglePassTests/VersionTests/majorMinorNoHead.txt.v0 b/test/data/SinglePassTests/VersionTests/majorMinorNoHead.txt.v0 similarity index 100% rename from test-data/SinglePassTests/VersionTests/majorMinorNoHead.txt.v0 rename to test/data/SinglePassTests/VersionTests/majorMinorNoHead.txt.v0 diff --git a/test-data/SinglePassTests/VersionTests/majorMinorNoHead.txt.v1 b/test/data/SinglePassTests/VersionTests/majorMinorNoHead.txt.v1 similarity index 100% rename from test-data/SinglePassTests/VersionTests/majorMinorNoHead.txt.v1 rename to test/data/SinglePassTests/VersionTests/majorMinorNoHead.txt.v1 diff --git a/test-data/SinglePassTests/VersionTests/majorMinorNoHead.txt.v1.05 b/test/data/SinglePassTests/VersionTests/majorMinorNoHead.txt.v1.05 similarity index 100% rename from test-data/SinglePassTests/VersionTests/majorMinorNoHead.txt.v1.05 rename to test/data/SinglePassTests/VersionTests/majorMinorNoHead.txt.v1.05 diff --git a/test-data/SinglePassTests/VersionTests/majorMinorNoHead.txt.v1.1 b/test/data/SinglePassTests/VersionTests/majorMinorNoHead.txt.v1.1 similarity index 100% rename from test-data/SinglePassTests/VersionTests/majorMinorNoHead.txt.v1.1 rename to test/data/SinglePassTests/VersionTests/majorMinorNoHead.txt.v1.1 diff --git a/test-data/SinglePassTests/VersionTests/majorMinorNoHead.txt.v1.12 b/test/data/SinglePassTests/VersionTests/majorMinorNoHead.txt.v1.12 similarity index 100% rename from test-data/SinglePassTests/VersionTests/majorMinorNoHead.txt.v1.12 rename to test/data/SinglePassTests/VersionTests/majorMinorNoHead.txt.v1.12 diff --git a/test-data/SinglePassTests/VersionTests/majorMinorNoHead.txt.v2 b/test/data/SinglePassTests/VersionTests/majorMinorNoHead.txt.v2 similarity index 100% rename from test-data/SinglePassTests/VersionTests/majorMinorNoHead.txt.v2 rename to test/data/SinglePassTests/VersionTests/majorMinorNoHead.txt.v2 diff --git a/test-data/SinglePassTests/VersionTests/metadataOnly.txt.metadata.properties.xml b/test/data/SinglePassTests/VersionTests/metadataOnly.txt.metadata.properties.xml similarity index 100% rename from test-data/SinglePassTests/VersionTests/metadataOnly.txt.metadata.properties.xml rename to test/data/SinglePassTests/VersionTests/metadataOnly.txt.metadata.properties.xml diff --git a/test-data/SinglePassTests/VersionTests/orphanMetadataVersion.metadata.properties.xml.v4 b/test/data/SinglePassTests/VersionTests/orphanMetadataVersion.metadata.properties.xml.v4 similarity index 100% rename from test-data/SinglePassTests/VersionTests/orphanMetadataVersion.metadata.properties.xml.v4 rename to test/data/SinglePassTests/VersionTests/orphanMetadataVersion.metadata.properties.xml.v4 diff --git a/test-data/SinglePassTests/VersionTests/versionsOfMetadataOnly.txt.metadata.properties.xml b/test/data/SinglePassTests/VersionTests/versionsOfMetadataOnly.txt.metadata.properties.xml similarity index 100% rename from test-data/SinglePassTests/VersionTests/versionsOfMetadataOnly.txt.metadata.properties.xml rename to test/data/SinglePassTests/VersionTests/versionsOfMetadataOnly.txt.metadata.properties.xml diff --git a/test-data/SinglePassTests/VersionTests/versionsOfMetadataOnly.txt.metadata.properties.xml.v1 b/test/data/SinglePassTests/VersionTests/versionsOfMetadataOnly.txt.metadata.properties.xml.v1 similarity index 100% rename from test-data/SinglePassTests/VersionTests/versionsOfMetadataOnly.txt.metadata.properties.xml.v1 rename to test/data/SinglePassTests/VersionTests/versionsOfMetadataOnly.txt.metadata.properties.xml.v1 diff --git a/test-data/SinglePassTests/VersionTests/versionsOfMetadataOnly.txt.metadata.properties.xml.v2 b/test/data/SinglePassTests/VersionTests/versionsOfMetadataOnly.txt.metadata.properties.xml.v2 similarity index 100% rename from test-data/SinglePassTests/VersionTests/versionsOfMetadataOnly.txt.metadata.properties.xml.v2 rename to test/data/SinglePassTests/VersionTests/versionsOfMetadataOnly.txt.metadata.properties.xml.v2 diff --git a/test-data/SinglePassTests/VersionTests/versionsOfMetadataOnly.txt.metadata.properties.xml.v3 b/test/data/SinglePassTests/VersionTests/versionsOfMetadataOnly.txt.metadata.properties.xml.v3 similarity index 100% rename from test-data/SinglePassTests/VersionTests/versionsOfMetadataOnly.txt.metadata.properties.xml.v3 rename to test/data/SinglePassTests/VersionTests/versionsOfMetadataOnly.txt.metadata.properties.xml.v3 diff --git a/test-data/SinglePassTests/VersionTests/weirdFile1.v b/test/data/SinglePassTests/VersionTests/weirdFile1.v similarity index 100% rename from test-data/SinglePassTests/VersionTests/weirdFile1.v rename to test/data/SinglePassTests/VersionTests/weirdFile1.v diff --git a/test-data/SinglePassTests/VersionTests/weirdFile1.v.metadata.properties.xml b/test/data/SinglePassTests/VersionTests/weirdFile1.v.metadata.properties.xml similarity index 100% rename from test-data/SinglePassTests/VersionTests/weirdFile1.v.metadata.properties.xml rename to test/data/SinglePassTests/VersionTests/weirdFile1.v.metadata.properties.xml diff --git a/test-data/SinglePassTests/VersionTests/weirdFile1.v.metadata.properties.xml.v2 b/test/data/SinglePassTests/VersionTests/weirdFile1.v.metadata.properties.xml.v2 similarity index 100% rename from test-data/SinglePassTests/VersionTests/weirdFile1.v.metadata.properties.xml.v2 rename to test/data/SinglePassTests/VersionTests/weirdFile1.v.metadata.properties.xml.v2 diff --git a/test-data/SinglePassTests/VersionTests/weirdFile1.v.v1 b/test/data/SinglePassTests/VersionTests/weirdFile1.v.v1 similarity index 100% rename from test-data/SinglePassTests/VersionTests/weirdFile1.v.v1 rename to test/data/SinglePassTests/VersionTests/weirdFile1.v.v1 diff --git a/test-data/SinglePassTests/VersionTests/weirdFile1.v.v2 b/test/data/SinglePassTests/VersionTests/weirdFile1.v.v2 similarity index 100% rename from test-data/SinglePassTests/VersionTests/weirdFile1.v.v2 rename to test/data/SinglePassTests/VersionTests/weirdFile1.v.v2 diff --git a/test-data/SinglePassTests/cleanTestData.sh b/test/data/SinglePassTests/cleanTestData.sh similarity index 100% rename from test-data/SinglePassTests/cleanTestData.sh rename to test/data/SinglePassTests/cleanTestData.sh diff --git a/test-data/SinglePassTests/createFiles.sh b/test/data/SinglePassTests/createFiles.sh similarity index 100% rename from test-data/SinglePassTests/createFiles.sh rename to test/data/SinglePassTests/createFiles.sh diff --git a/test-data/SinglePassTests/createTestData.sh b/test/data/SinglePassTests/createTestData.sh similarity index 100% rename from test-data/SinglePassTests/createTestData.sh rename to test/data/SinglePassTests/createTestData.sh diff --git a/test/src/test-bulk-import-action.js b/test/src/test-bulk-import-action.js new file mode 100644 index 0000000..aee0394 --- /dev/null +++ b/test/src/test-bulk-import-action.js @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2012-2015 Peter Monks. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * This file is part of an unsupported extension to Alfresco. + * + */ + +/* + * This file tests the "bulk-import" repository action. + */ + +var bulkImport = actions.create("bulk-import"); + +if (bulkimport == null) +{ + throw "Bulk Import action is not available." +} + +if (space === undefined) +{ + throw "Bulk Import must be executed in the context of a space." +} + +bulkImport.parameters["import-source-bean-id"] = "bit.fs.source"; // Note: optional - will default if not provided +bulkImport.parameters["target-node-ref"] = space.nodeRef; +bulkImport.parameters["parameters"] = +"{ 'sourceDirectory': '/Users/pmonks/Development/Alfresco/forge/alfresco-bulk-import/test/data/SinglePassTests/MIMETypeTests', \ + 'replaceExisting': false, \ + 'dryRun': false }"; + +bulkImport.execute(null);