diff --git a/build.gradle b/build.gradle index 8b43ad0572..4faaac8596 100644 --- a/build.gradle +++ b/build.gradle @@ -15,6 +15,16 @@ task wrapper(type: Wrapper) { gradleVersion = '1.0-milestone-8' } +task downloadAlfresco << { + + def address = "https://bamboo.alfresco.com/bamboo/artifact/ALF-ENTERPRISEV40/JOB1/build-891/ALL/alfresco-enterprise-4.0.1.zip?os_authType=basic&os_username=rwetherall&os_password=31vegaleg" + + def file = new FileOutputStream(file('alfresco.zip')) + def out = new BufferedOutputStream(file) + out << new URL(address).openStream() + out.close() +} + /** Subproject configuration */ subprojects { @@ -25,10 +35,13 @@ subprojects { explodedDepsDir = 'explodedDeps' explodedLibsDir = "${explodedDepsDir}/lib" + explodedConfigDir = "${explodedDepsDir}/config" buildDistDir = 'build/dist' buildLibDir = 'build/libs' sourceJavaDir = 'source/java' sourceWebDir = 'source/web' + testJavaDir = 'test/java' + testResourceDir = 'test/resource' configDir = 'config' configModuleDir = "config/alfresco/module/${moduleid}" moduleProperties = 'module.properties' @@ -42,6 +55,14 @@ subprojects { main { java { srcDir sourceJavaDir + } + } + test { + java { + srcDir testJavaDir + } + resources { + srcDir testResourceDir } } } diff --git a/rm-server/.classpath b/rm-server/.classpath index be9bb7c2f2..dce9320965 100644 --- a/rm-server/.classpath +++ b/rm-server/.classpath @@ -1,6 +1,8 @@ + + @@ -277,5 +279,6 @@ + diff --git a/rm-server/build.gradle b/rm-server/build.gradle index f11203b9a3..708db68c1d 100644 --- a/rm-server/build.gradle +++ b/rm-server/build.gradle @@ -1,5 +1,26 @@ dependencies { + compile fileTree(dir: 'libs', include: '*.jar') compile 'javax.servlet:servlet-api:2.5' - compile 'org.springframework:spring-test:2.5' + + testCompile 'org.springframework:spring-test:2.5' + + testRuntime files(explodedConfigDir) + testRuntime files(configDir) +} + +test { + //makes the standard streams (err and out) visible at console when running tests + testLogging.showStandardStreams = true + + //tweaking memory settings for the forked vm that runs tests + jvmArgs '-Xms256M', '-Xmx1024M', '-XX:MaxPermSize=256M' + + //listening to test execution events + beforeTest { descriptor -> + logger.lifecycle("Running test: " + descriptor) + } + onOutput { descriptor, event -> + logger.lifecycle(event.message) + } } \ No newline at end of file diff --git a/rm-server/libs/postgresql-9.0-801.jdbc4.jar b/rm-server/libs/postgresql-9.0-801.jdbc4.jar new file mode 100644 index 0000000000..63e54165ec Binary files /dev/null and b/rm-server/libs/postgresql-9.0-801.jdbc4.jar differ diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/CapabilitiesTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/CapabilitiesTestSuite.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/CapabilitiesTestSuite.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/CapabilitiesTestSuite.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/DOD5015Test.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/DOD5015Test.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/DOD5015Test.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/DOD5015Test.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/JScriptTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/JScriptTestSuite.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/JScriptTestSuite.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/JScriptTestSuite.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/ServicesTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/ServicesTestSuite.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/ServicesTestSuite.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/ServicesTestSuite.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/WebScriptTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/WebScriptTestSuite.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/WebScriptTestSuite.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/WebScriptTestSuite.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/AddModifyEventDatesCapabilityTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/AddModifyEventDatesCapabilityTest.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/AddModifyEventDatesCapabilityTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/AddModifyEventDatesCapabilityTest.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/ApproveRecordsScheduledForCutoffCapability.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/ApproveRecordsScheduledForCutoffCapability.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/ApproveRecordsScheduledForCutoffCapability.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/ApproveRecordsScheduledForCutoffCapability.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/BaseCapabilitiesTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/BaseCapabilitiesTest.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/BaseCapabilitiesTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/BaseCapabilitiesTest.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/BaseTestCapabilities.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/BaseTestCapabilities.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/BaseTestCapabilities.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/BaseTestCapabilities.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/CapabilitiesTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/CapabilitiesTest.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/CapabilitiesTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/CapabilitiesTest.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/DeclarativeCapabilityTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/DeclarativeCapabilityTest.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/DeclarativeCapabilityTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/DeclarativeCapabilityTest.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/jscript/CapabilitiesTest.js b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/jscript/CapabilitiesTest.js similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/jscript/CapabilitiesTest.js rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/jscript/CapabilitiesTest.js diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/jscript/JSONConversionComponentTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/jscript/JSONConversionComponentTest.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/jscript/JSONConversionComponentTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/jscript/JSONConversionComponentTest.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/jscript/RMJScriptTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/jscript/RMJScriptTest.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/jscript/RMJScriptTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/jscript/RMJScriptTest.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/service/DispositionServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/DispositionServiceImplTest.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/service/DispositionServiceImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/DispositionServiceImplTest.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/service/RMCaveatConfigServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RMCaveatConfigServiceImplTest.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/service/RMCaveatConfigServiceImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RMCaveatConfigServiceImplTest.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementActionServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementActionServiceImplTest.java similarity index 96% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementActionServiceImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementActionServiceImplTest.java index aaef219d15..8a058abbc3 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementActionServiceImplTest.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementActionServiceImplTest.java @@ -63,7 +63,7 @@ public class RecordsManagementActionServiceImplTest extends TestCase { private static final String[] CONFIG_LOCATIONS = new String[] { "classpath:alfresco/application-context.xml", - "classpath:org/alfresco/module/org_alfresco_module_rm/test/util/test-context.xml"}; + "classpath:test-context.xml"}; private ApplicationContext ctx; diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementAdminServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementAdminServiceImplTest.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementAdminServiceImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementAdminServiceImplTest.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementAuditServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementAuditServiceImplTest.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementAuditServiceImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementAuditServiceImplTest.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementEventServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementEventServiceImplTest.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementEventServiceImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementEventServiceImplTest.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementSearchServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementSearchServiceImplTest.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementSearchServiceImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementSearchServiceImplTest.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementSecurityServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementSecurityServiceImplTest.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementSecurityServiceImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementSecurityServiceImplTest.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementServiceImplTest.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementServiceImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementServiceImplTest.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/service/VitalRecordServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/VitalRecordServiceImplTest.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/service/VitalRecordServiceImplTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/VitalRecordServiceImplTest.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/system/CapabilitiesSystemTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/system/CapabilitiesSystemTest.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/system/CapabilitiesSystemTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/system/CapabilitiesSystemTest.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/system/DODDataLoadSystemTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/system/DODDataLoadSystemTest.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/system/DODDataLoadSystemTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/system/DODDataLoadSystemTest.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/system/NotificationServiceHelperSystemTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/system/NotificationServiceHelperSystemTest.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/system/NotificationServiceHelperSystemTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/system/NotificationServiceHelperSystemTest.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/system/PerformanceDataLoadSystemTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/system/PerformanceDataLoadSystemTest.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/system/PerformanceDataLoadSystemTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/system/PerformanceDataLoadSystemTest.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/system/RecordsManagementServiceImplSystemTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/system/RecordsManagementServiceImplSystemTest.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/system/RecordsManagementServiceImplSystemTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/system/RecordsManagementServiceImplSystemTest.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java similarity index 97% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java index 9037eca3fc..131302ffd8 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java @@ -77,7 +77,7 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase protected static final String[] CONFIG_LOCATIONS = new String[] { "classpath:alfresco/application-context.xml", - "classpath:org/alfresco/module/org_alfresco_module_rm/test/util/test-context.xml" + "classpath:test-context.xml" }; protected ApplicationContext applicationContext; diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestAction.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestAction.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestAction.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestAction.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestAction2.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestAction2.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestAction2.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestAction2.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestActionParams.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestActionParams.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestActionParams.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestActionParams.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestUtilities.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestUtilities.java similarity index 96% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestUtilities.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestUtilities.java index b579549521..5a1f68f198 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestUtilities.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestUtilities.java @@ -102,7 +102,7 @@ public class TestUtilities implements RecordsManagementModel // Do the data load into the the provided filePlan node reference // TODO ... InputStream is = TestUtilities.class.getClassLoader().getResourceAsStream( - "alfresco/module/org_alfresco_module_rm/bootstrap/DODExampleFilePlan.xml"); + "alfresco/module/org_alfresco_module_rm/dod5015/DODExampleFilePlan.xml"); //"alfresco/module/org_alfresco_module_rm/bootstrap/temp.xml"); Assert.assertNotNull("The DODExampleFilePlan.xml import file could not be found", is); Reader viewReader = new InputStreamReader(is); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestWebScriptRepoServer.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestWebScriptRepoServer.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestWebScriptRepoServer.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestWebScriptRepoServer.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/BootstraptestDataRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/BootstraptestDataRestApiTest.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/BootstraptestDataRestApiTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/BootstraptestDataRestApiTest.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/DispositionRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/DispositionRestApiTest.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/DispositionRestApiTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/DispositionRestApiTest.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EmailMapScriptTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EmailMapScriptTest.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EmailMapScriptTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EmailMapScriptTest.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EventRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EventRestApiTest.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EventRestApiTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/EventRestApiTest.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RMCaveatConfigScriptTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RMCaveatConfigScriptTest.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RMCaveatConfigScriptTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RMCaveatConfigScriptTest.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RMConstraintScriptTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RMConstraintScriptTest.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RMConstraintScriptTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RMConstraintScriptTest.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmRestApiTest.java similarity index 97% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmRestApiTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmRestApiTest.java index 8c3e0e27f6..ed44c7db6e 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmRestApiTest.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmRestApiTest.java @@ -117,7 +117,7 @@ public class RmRestApiTest extends BaseWebScriptTest implements RecordsManagemen @Override protected void setUp() throws Exception { - setCustomContext("classpath:org/alfresco/module/org_alfresco_module_rm/test/util/test-context.xml"); + setCustomContext("classpath:test-context.xml"); super.setUp(); this.namespaceService = (NamespaceService) getServer().getApplicationContext().getBean("NamespaceService"); diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RoleRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RoleRestApiTest.java similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RoleRestApiTest.java rename to rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RoleRestApiTest.java diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/util/test-context.xml b/rm-server/test/resources/test-context.xml similarity index 95% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/util/test-context.xml rename to rm-server/test/resources/test-context.xml index 6e094dcc19..56abe6dc78 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/util/test-context.xml +++ b/rm-server/test/resources/test-context.xml @@ -7,7 +7,7 @@ - org/alfresco/module/org_alfresco_module_rm/test/util/test-model.xml + test-model.xml diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/util/test-model.xml b/rm-server/test/resources/test-model.xml similarity index 100% rename from rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/test/util/test-model.xml rename to rm-server/test/resources/test-model.xml diff --git a/rm-server/test-resources/testCaveatConfig1.json b/rm-server/test/resources/testCaveatConfig1.json similarity index 100% rename from rm-server/test-resources/testCaveatConfig1.json rename to rm-server/test/resources/testCaveatConfig1.json diff --git a/rm-server/test-resources/testCaveatConfig2.json b/rm-server/test/resources/testCaveatConfig2.json similarity index 100% rename from rm-server/test-resources/testCaveatConfig2.json rename to rm-server/test/resources/testCaveatConfig2.json