From 3dda986a8ca3c5ca689ff03dc1c68a85dcf0cdc4 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 18 Jan 2010 15:43:42 +0000
Subject: [PATCH] LMS-1343 increase heap size and enable all system tests.
SVN: 14328
---
openbis/build/build.xml | 2 +-
.../cisd/openbis/generic/SystemTestSuite.java | 18 +++++++++++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/openbis/build/build.xml b/openbis/build/build.xml
index b4548e52de1..dba8bfc514d 100644
--- a/openbis/build/build.xml
+++ b/openbis/build/build.xml
@@ -52,7 +52,7 @@
<target name="run-system-tests" depends="prepare-gwt, compile-tests">
<delete dir="${output.test}" />
<mkdir dir="${output.test}" />
- <junit dir="." fork="true" forkmode="once" maxmemory="512m" showoutput="true" failureproperty="tests-failed">
+ <junit dir="." fork="true" forkmode="once" maxmemory="1024m" showoutput="true" failureproperty="tests-failed">
<classpath>
<pathelement location="${sources}" />
<pathelement location="${sources.test}" />
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/SystemTestSuite.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/SystemTestSuite.java
index 5fd45a8561b..9bac0448555 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/SystemTestSuite.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/SystemTestSuite.java
@@ -25,10 +25,26 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.Authentica
import ch.systemsx.cisd.openbis.generic.client.web.client.application.AuthorizationGroupsTest;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.AuthorizationManagementConsolTest;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.DataSetSearchTest;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.EntityTypeBrowserTest;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.EntityTypePropertyTypeAssignmentTest;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.ExperimentBrowserTest;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.FileFormatTypeGridTest;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.MaterialBrowserTest;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.ProjectRegistrationTest;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.PropertyTypeAssignmentBrowserTest;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.PropertyTypeBrowserTest;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.PropertyTypeRegistrationTest;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.SampleBrowserTest;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.SearchTest;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.VocabularyBrowserTest;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.VocabularyRegistrationTest;
import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.dataset.GenericDataSetEditorTest;
import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.dataset.GenericDataSetViewerTest;
+import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.experiment.GenericExperimentAttachmentDownloadTest;
+import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.experiment.GenericExperimentEditorTest;
+import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.experiment.GenericExperimentViewerTest;
+import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.sample.GenericSampleRegistrationTest;
+import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.sample.GenericSampleViewerTest;
/**
* @author Franz-Josef Elmer
@@ -49,6 +65,7 @@ public class SystemTestSuite extends GWTTestSuite
/*
* TODO 2010-01-11 Commented out tests until we can figure out what the problem is with
* running the new tests under GWT 2.0.
+ */
testSuite.addTestSuite(SampleBrowserTest.class);
testSuite.addTestSuite(GenericSampleViewerTest.class);
testSuite.addTestSuite(SearchTest.class);
@@ -71,7 +88,6 @@ public class SystemTestSuite extends GWTTestSuite
testSuite.addTestSuite(GenericExperimentAttachmentDownloadTest.class);
testSuite.addTestSuite(ProjectRegistrationTest.class);
testSuite.addTestSuite(EntityTypeBrowserTest.class);
-*/
return testSuite;
}
}
\ No newline at end of file
--
GitLab