From 74fbbb86ebb18850b66e85b73c918152eff9cb46 Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Fri, 14 Dec 2007 11:48:46 +0000
Subject: [PATCH] LMS-182, Rename lims to openBIS in integration-tests
SVN: 3093
---
integration-tests/run.sh | 4 ++--
.../.lims-default => openBIS-client/.openBIS-default} | 0
.../{lims-client => openBIS-client}/check-results.sh | 2 +-
.../templates/{lims-client => openBIS-client}/commands.txt | 0
.../{lims-client => openBIS-client}/load-lims-data.sh | 2 +-
.../{lims-client => openBIS-client}/testdata/MP001-1.txt | 0
.../{lims-client => openBIS-client}/testdata/MP002-1.txt | 0
.../testdata/exampleCellPlates.txt | 0
.../testdata/exampleDilutionPlates.txt | 0
.../testdata/register-experiments/CL-3V.txt | 0
.../testdata/register-experiments/cellPlates.txt | 0
.../testdata/register-experiments/example3VExperiments.txt | 0
.../templates/{lims-server => openBIS-server}/roles.conf | 0
.../{lims-server => openBIS-server}/service.properties | 0
14 files changed, 4 insertions(+), 4 deletions(-)
rename integration-tests/templates/{lims-client/.lims-default => openBIS-client/.openBIS-default} (100%)
rename integration-tests/templates/{lims-client => openBIS-client}/check-results.sh (86%)
rename integration-tests/templates/{lims-client => openBIS-client}/commands.txt (100%)
rename integration-tests/templates/{lims-client => openBIS-client}/load-lims-data.sh (93%)
rename integration-tests/templates/{lims-client => openBIS-client}/testdata/MP001-1.txt (100%)
rename integration-tests/templates/{lims-client => openBIS-client}/testdata/MP002-1.txt (100%)
rename integration-tests/templates/{lims-client => openBIS-client}/testdata/exampleCellPlates.txt (100%)
rename integration-tests/templates/{lims-client => openBIS-client}/testdata/exampleDilutionPlates.txt (100%)
rename integration-tests/templates/{lims-client => openBIS-client}/testdata/register-experiments/CL-3V.txt (100%)
rename integration-tests/templates/{lims-client => openBIS-client}/testdata/register-experiments/cellPlates.txt (100%)
rename integration-tests/templates/{lims-client => openBIS-client}/testdata/register-experiments/example3VExperiments.txt (100%)
rename integration-tests/templates/{lims-server => openBIS-server}/roles.conf (100%)
rename integration-tests/templates/{lims-server => openBIS-server}/service.properties (100%)
diff --git a/integration-tests/run.sh b/integration-tests/run.sh
index 1077a276a08..6dbb056ee37 100755
--- a/integration-tests/run.sh
+++ b/integration-tests/run.sh
@@ -350,7 +350,7 @@ function launch_tests {
function assert_correct_results {
local res=$WORK/client-result.txt
call_in_dir check-results.sh $LIMS_CLIENT/ > $res
- assert_pattern_present $res 3 ".*NEMO.*EXP1.*IMAGE ANALYSIS.*3VCP[[:digit:]].*microX.*3VCP[[:digit:]]"
+ assert_pattern_present $res 3 ".*NEMO.*EXP1.*IMAGE_ANALYSIS_DATA.*3VCP[[:digit:]].*microX.*3VCP[[:digit:]]"
assert_pattern_present $res 3 ".*NEMO.*EXP1.*IMAGE\/.*3VCP[[:digit:]].*microX.*3VCP[[:digit:]]"
assert_dir_empty $DATA/in-raw
@@ -358,7 +358,7 @@ function assert_correct_results {
assert_dir_empty $DATA/in-analys
assert_dir_empty $DATA/out-analys
assert_dir_empty $DATA/analys-copy
- imgAnalys="$DATA/store-analys/Project_NEMO/Experiment_EXP1/ObservableType_IMAGE ANALYSIS/Barcode_3VCP1/1"
+ imgAnalys="$DATA/store-analys/Project_NEMO/Experiment_EXP1/ObservableType_IMAGE_ANALYSIS_DATA/Barcode_3VCP1/1"
assert_dir_exists "$imgAnalys"
rawData="$DATA/store-raw/3V/Project_NEMO/Experiment_EXP1/ObservableType_IMAGE/Barcode_3VCP1/1"
assert_dir_exists "$rawData"
diff --git a/integration-tests/templates/lims-client/.lims-default b/integration-tests/templates/openBIS-client/.openBIS-default
similarity index 100%
rename from integration-tests/templates/lims-client/.lims-default
rename to integration-tests/templates/openBIS-client/.openBIS-default
diff --git a/integration-tests/templates/lims-client/check-results.sh b/integration-tests/templates/openBIS-client/check-results.sh
similarity index 86%
rename from integration-tests/templates/lims-client/check-results.sh
rename to integration-tests/templates/openBIS-client/check-results.sh
index f987f84c2af..d660a6ff628 100755
--- a/integration-tests/templates/lims-client/check-results.sh
+++ b/integration-tests/templates/openBIS-client/check-results.sh
@@ -1,4 +1,4 @@
-CL=./lims.sh
+CL=./bis.sh
$CL login -o 3V -u test -p unimportant
$CL get-experiment-info NEMO EXP1
$CL logout
\ No newline at end of file
diff --git a/integration-tests/templates/lims-client/commands.txt b/integration-tests/templates/openBIS-client/commands.txt
similarity index 100%
rename from integration-tests/templates/lims-client/commands.txt
rename to integration-tests/templates/openBIS-client/commands.txt
diff --git a/integration-tests/templates/lims-client/load-lims-data.sh b/integration-tests/templates/openBIS-client/load-lims-data.sh
similarity index 93%
rename from integration-tests/templates/lims-client/load-lims-data.sh
rename to integration-tests/templates/openBIS-client/load-lims-data.sh
index 4a9010ce88e..c7f72738480 100755
--- a/integration-tests/templates/lims-client/load-lims-data.sh
+++ b/integration-tests/templates/openBIS-client/load-lims-data.sh
@@ -1,4 +1,4 @@
-CL=./lims.sh
+CL=./bis.sh
CMDS_FILE=commands.txt
PASSWORD=unimportant
diff --git a/integration-tests/templates/lims-client/testdata/MP001-1.txt b/integration-tests/templates/openBIS-client/testdata/MP001-1.txt
similarity index 100%
rename from integration-tests/templates/lims-client/testdata/MP001-1.txt
rename to integration-tests/templates/openBIS-client/testdata/MP001-1.txt
diff --git a/integration-tests/templates/lims-client/testdata/MP002-1.txt b/integration-tests/templates/openBIS-client/testdata/MP002-1.txt
similarity index 100%
rename from integration-tests/templates/lims-client/testdata/MP002-1.txt
rename to integration-tests/templates/openBIS-client/testdata/MP002-1.txt
diff --git a/integration-tests/templates/lims-client/testdata/exampleCellPlates.txt b/integration-tests/templates/openBIS-client/testdata/exampleCellPlates.txt
similarity index 100%
rename from integration-tests/templates/lims-client/testdata/exampleCellPlates.txt
rename to integration-tests/templates/openBIS-client/testdata/exampleCellPlates.txt
diff --git a/integration-tests/templates/lims-client/testdata/exampleDilutionPlates.txt b/integration-tests/templates/openBIS-client/testdata/exampleDilutionPlates.txt
similarity index 100%
rename from integration-tests/templates/lims-client/testdata/exampleDilutionPlates.txt
rename to integration-tests/templates/openBIS-client/testdata/exampleDilutionPlates.txt
diff --git a/integration-tests/templates/lims-client/testdata/register-experiments/CL-3V.txt b/integration-tests/templates/openBIS-client/testdata/register-experiments/CL-3V.txt
similarity index 100%
rename from integration-tests/templates/lims-client/testdata/register-experiments/CL-3V.txt
rename to integration-tests/templates/openBIS-client/testdata/register-experiments/CL-3V.txt
diff --git a/integration-tests/templates/lims-client/testdata/register-experiments/cellPlates.txt b/integration-tests/templates/openBIS-client/testdata/register-experiments/cellPlates.txt
similarity index 100%
rename from integration-tests/templates/lims-client/testdata/register-experiments/cellPlates.txt
rename to integration-tests/templates/openBIS-client/testdata/register-experiments/cellPlates.txt
diff --git a/integration-tests/templates/lims-client/testdata/register-experiments/example3VExperiments.txt b/integration-tests/templates/openBIS-client/testdata/register-experiments/example3VExperiments.txt
similarity index 100%
rename from integration-tests/templates/lims-client/testdata/register-experiments/example3VExperiments.txt
rename to integration-tests/templates/openBIS-client/testdata/register-experiments/example3VExperiments.txt
diff --git a/integration-tests/templates/lims-server/roles.conf b/integration-tests/templates/openBIS-server/roles.conf
similarity index 100%
rename from integration-tests/templates/lims-server/roles.conf
rename to integration-tests/templates/openBIS-server/roles.conf
diff --git a/integration-tests/templates/lims-server/service.properties b/integration-tests/templates/openBIS-server/service.properties
similarity index 100%
rename from integration-tests/templates/lims-server/service.properties
rename to integration-tests/templates/openBIS-server/service.properties
--
GitLab