From f11c81c665a03ed15dff2f75a0df437935fd5840 Mon Sep 17 00:00:00 2001
From: anttil <anttil>
Date: Mon, 6 May 2013 11:49:58 +0000
Subject: [PATCH] SWE-22 / SP-641: enable cleandb test suite
SVN: 29004
---
gradle/javaproject.gradle | 7 +++----
openbis/build.gradle | 9 +++++++++
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/gradle/javaproject.gradle b/gradle/javaproject.gradle
index 8ed952349cd..382d4c91b76 100644
--- a/gradle/javaproject.gradle
+++ b/gradle/javaproject.gradle
@@ -34,10 +34,9 @@ repositories {
}
test {
- useTestNG {
- suites = ['sourceTest/java/tests.xml']
- }
-
+ useTestNG()
+ options.suites('sourceTest/java/tests.xml')
+
jvmArgs '-Xmx2048m', '-XX:MaxPermSize=256m'
testLogging.showStandardStreams = true
diff --git a/openbis/build.gradle b/openbis/build.gradle
index 2a75120723c..c473840f10c 100644
--- a/openbis/build.gradle
+++ b/openbis/build.gradle
@@ -115,6 +115,13 @@ sourceSets {
}
}
+
+task cleanDbSuite(type: Test) {
+ useTestNG()
+ options.suites('sourceTest/java/tests_system_cleandb_excluding_authorization.xml')
+}
+
+
// This task is here to make WebAppsPropertiesTest to work. It requires some data files
// to be present on the same directory than the class file itself.
task copyTestData(type: Copy, dependsOn: testClasses) {
@@ -123,6 +130,8 @@ task copyTestData(type: Copy, dependsOn: testClasses) {
include '*.properties'
}
test.dependsOn(copyTestData)
+test.dependsOn(cleanDbSuite)
+
task compileGwt (dependsOn: classes, type: JavaExec) {
--
GitLab