From bd7c39270d57591651a2c1a91d80344db58d050b Mon Sep 17 00:00:00 2001 From: Samuel Langlois Date: Thu, 14 Jun 2012 16:41:35 +0000 Subject: [PATCH] BDE-74: Mimic property def of alfresco build and database reset, so that tests run properly git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.0@37801 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- rm-server/build.gradle | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/rm-server/build.gradle b/rm-server/build.gradle index 4489d317f6..07d30b9eee 100644 --- a/rm-server/build.gradle +++ b/rm-server/build.gradle @@ -15,15 +15,48 @@ dependencies { testRuntime group: 'org.alfresco.enterprise', name: 'alfresco', version: alfrescoBaseVersion, type: 'war' } +task resetDatabase << { + // Loading the properties in all possible locations + ant.property(file: System.properties.getProperty('DB_PROPERTIES') ) + ant.property(file: System.properties.getProperty('user.home')+'/alfresco/extension/repository.properties' ) + ant.property(resource: 'alfresco/domain/transaction.properties', classpath: configurations.compile.asPath ) + ant.property(resource: 'alfresco/version.properties', classpath: configurations.compile.asPath ) + ant.property(resource: 'alfresco/repository.properties', classpath: configurations.compile.asPath ) + + // Set default values if nothing was found (remember Ant props are 'first set wins') + ant.property(name: "db.name", value: "alfresco") + ant.property(name: "db.url", value: "jdbc:postgresql:alfresco") + ant.property(name: "db.master.url", value: "jdbc:postgresql:template1") + ant.property(name: "db.username", value: "alfresco") + ant.property(name: "db.password", value: "alfresco") + + println "Recreating database " + ant.getProperty("db.name") + " as user " + ant.getProperty("db.username") + ant.sql(driver: 'org.postgresql.Driver', + url: ant.getProperty("db.master.url"), + userid: ant.getProperty("db.username"), + password: ant.getProperty("db.password"), + print: 'true', + autocommit: 'true', + classpath: configurations.compile.asPath, + 'drop database if exists ' + ant.getProperty("db.name") + '; create database ' + ant.getProperty("db.name") + ';') +} + test { + dependsOn resetDatabase include '**/DispositionServiceImplTest.class' testLogging.showStandardStreams = true jvmArgs '-Xms256M', '-Xmx1024M', '-XX:MaxPermSize=256M' + + // Put systemProperty definition in a doFirst closure, otherwise it's executed before resetDatabase task + doFirst { + ant.property(name: "dir.root", value: System.getProperty("user.dir") + "/build/test_alf_data") + systemProperties = ant.getProperties() + } beforeTest { descriptor -> logger.lifecycle("Running test: " + descriptor) } -} \ No newline at end of file +}