From 57e701e893891d1a09d0c5d68fd1dadd2f81917a Mon Sep 17 00:00:00 2001
From: ribeaudc <ribeaudc>
Date: Mon, 15 Sep 2008 11:31:17 +0000
Subject: [PATCH] [LMS-586] change: - 'JavaSystemTests' renamed to
'SystemTestRunner'. - Eclipse run configuration files. remove: - Unnecessary
Ant targets.
SVN: 8309
---
.../common/utilities/VoidExitHandler.java | 41 +++++++++++++++++++
integration-tests/run.sh | 6 +--
2 files changed, 43 insertions(+), 4 deletions(-)
create mode 100644 common/source/java/ch/systemsx/cisd/common/utilities/VoidExitHandler.java
diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/VoidExitHandler.java b/common/source/java/ch/systemsx/cisd/common/utilities/VoidExitHandler.java
new file mode 100644
index 00000000000..51ee0800df5
--- /dev/null
+++ b/common/source/java/ch/systemsx/cisd/common/utilities/VoidExitHandler.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2008 ETH Zuerich, CISD
+ *
+ * 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.
+ */
+
+package ch.systemsx.cisd.common.utilities;
+
+/**
+ * An {@link IExitHandler} implementation which does nothing.
+ *
+ * @author Christian Ribeaud
+ */
+public final class VoidExitHandler implements IExitHandler
+{
+ public final static VoidExitHandler INSTANCE = new VoidExitHandler();
+
+ private VoidExitHandler()
+ {
+ // Does nothing.
+ }
+
+ //
+ // IExitHandler
+ //
+
+ public final void exit(final int exitCode)
+ {
+ }
+
+}
diff --git a/integration-tests/run.sh b/integration-tests/run.sh
index 5cb13bd7dc9..62585c35a5f 100755
--- a/integration-tests/run.sh
+++ b/integration-tests/run.sh
@@ -577,8 +577,7 @@ function assert_correct_experiment_info {
local res=$WORK/client-result.txt
call_in_dir check-results.sh $LIMS_CLIENT/ > $res
assert_pattern_present $res 1 "DATA_ACQUISITION.processing-dir.Processing parameters from file .*processing-parameters.txt"
- # TODO 2008-08-26, Christian Ribeaud: Check this whether it is really OK!
- # assert_pattern_present $res 2 "DATA_ACQUISITION.*HCS_IMAGE.*NEMO.*EXP1.*HCS_IMAGE\/.*3VCP[[:digit:]].*microX.*3VCP[[:digit:]]"
+ assert_pattern_present $res 2 "DATA_ACQUISITION.*HCS_IMAGE.*NEMO.*EXP1.*HCS_IMAGE\/.*3VCP[[:digit:]].*microX.*3VCP[[:digit:]]"
assert_pattern_present $res 5 "IMAGE_ANALYSIS.*HCS_IMAGE_ANALYSIS_DATA.*NEMO.*EXP1.*HCS_IMAGE_ANALYSIS_DATA.*3VCP[[:digit:]].*microX.*3VCP[[:digit:]]"
}
@@ -766,8 +765,7 @@ function assert_correct_content {
assert_correct_dataset_content_in_database 3 "3;IMAGE_ANALYSIS;20[0-9]*-2;f;1;U;;"
assert_correct_dataset_content_in_database 5 "5;IMAGE_ANALYSIS;20[0-9]*-4;f;1;U;;"
assert_correct_dataset_content_in_database 7 "7;IMAGE_ANALYSIS;20[0-9]*-6;f;8;U;;"
- # TODO 2008-08-26, Christian Ribeaud: Check this whether it is really OK!
- # assert_correct_dataset_content_in_database 8 "8;DATA_ACQUISITION;MICROX-3VCP3;f;;F;microX;2008-01-01.*"
+ assert_correct_dataset_content_in_database 8 "8;DATA_ACQUISITION;MICROX-3VCP3;f;;F;microX;2008-01-01.*"
assert_correct_dataset_content_in_database 10 "10;IMAGE_ANALYSIS;20[0-9]*-9;f;11;U;;"
assert_correct_dataset_content_in_database 11 "11;UNKNOWN;MICROX-3VCP4;t;;;;"
assert_correct_dataset_content_in_database 14 "14;IMAGE_ANALYSIS;20[0-9]*-13;f;8;U;;"
--
GitLab