From 56433f322c202bdc31b4a049a7027b02dd45254f Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk>
Date: Mon, 6 May 2013 08:34:44 +0000
Subject: [PATCH] SP-555 / BIS-366 : openbis.js - delete utilities.js files and
use openbis-action-deferrer.js - database dumps are available at
lascar:/links/groups/cisd/js-test
SVN: 29001
---
js-test/README.txt | 12 +-
.../db/pathinfo_test_js_dsu.sql | 322 ------------------
2 files changed, 9 insertions(+), 325 deletions(-)
delete mode 100644 js-test/servers/dsu/datastore_server/db/pathinfo_test_js_dsu.sql
diff --git a/js-test/README.txt b/js-test/README.txt
index ee5fbc76a80..bac0c785548 100644
--- a/js-test/README.txt
+++ b/js-test/README.txt
@@ -1,10 +1,16 @@
To run js tests manually:
-- run create-and-run-webapp ant target and wait until AS, DSS1 and DSS2 start up
+- run create-webapp-common and run-webapp-common ant targets and wait until AS, DSS1 and DSS2 start up
- login as admin to openBIS at http://localhost:20000/openbis/ using Firefox browser
- enter Utilities->openbis-test.js and Utilities->openbis-screening-test.js to run js tests
To run automatic js tests on a new server:
-- run create-webapp and run-tests-js-on-new-server ant targets
+- run create-webapp-common and run-automated-tests-on-new-server ant targets
To run automatic js tests on an existing and already running server:
-- run create-webapp and run-tests-js-on-existing-server ant targets
\ No newline at end of file
+- run create-webapp-common and run-automated-tests-on-existing-server ant targets
+
+To run a lab specific webapp:
+- download database dumps from lascar:/links/groups/cisd/js-test/ directory to
+ appropriate local directories i.e. pathinfo_test_js_XXX.js to servers/XXX/datastore_server/db
+ and openbis_test_js_XXX.js to servers/XXX/openBIS-server/db
+- run create-webapp-XXX and run-webapp-XXX ant targets
diff --git a/js-test/servers/dsu/datastore_server/db/pathinfo_test_js_dsu.sql b/js-test/servers/dsu/datastore_server/db/pathinfo_test_js_dsu.sql
deleted file mode 100644
index e8d341322b4..00000000000
--- a/js-test/servers/dsu/datastore_server/db/pathinfo_test_js_dsu.sql
+++ /dev/null
@@ -1,322 +0,0 @@
---
--- PostgreSQL database dump
---
-
-SET statement_timeout = 0;
-SET client_encoding = 'UTF8';
-SET standard_conforming_strings = on;
-SET check_function_bodies = false;
-SET client_min_messages = warning;
-
---
--- Name: plpgsql; Type: EXTENSION; Schema: -; Owner: -
---
-
-CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;
-
-
---
--- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner: -
---
-
-COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language';
-
-
-SET search_path = public, pg_catalog;
-
---
--- Name: boolean_char; Type: DOMAIN; Schema: public; Owner: -
---
-
-CREATE DOMAIN boolean_char AS boolean DEFAULT false;
-
-
---
--- Name: code; Type: DOMAIN; Schema: public; Owner: -
---
-
-CREATE DOMAIN code AS character varying(40);
-
-
---
--- Name: file_path; Type: DOMAIN; Schema: public; Owner: -
---
-
-CREATE DOMAIN file_path AS character varying(1000);
-
-
---
--- Name: tech_id; Type: DOMAIN; Schema: public; Owner: -
---
-
-CREATE DOMAIN tech_id AS bigint;
-
-
---
--- Name: time_stamp; Type: DOMAIN; Schema: public; Owner: -
---
-
-CREATE DOMAIN time_stamp AS timestamp with time zone;
-
-
-SET default_tablespace = '';
-
-SET default_with_oids = false;
-
---
--- Name: data_set_files; Type: TABLE; Schema: public; Owner: -; Tablespace:
---
-
-CREATE TABLE data_set_files (
- id bigint NOT NULL,
- dase_id tech_id NOT NULL,
- parent_id tech_id,
- relative_path file_path NOT NULL,
- file_name file_path NOT NULL,
- size_in_bytes bigint NOT NULL,
- checksum_crc32 integer,
- is_directory boolean_char NOT NULL,
- last_modified time_stamp DEFAULT now() NOT NULL
-);
-
-
---
--- Name: data_set_files_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE data_set_files_id_seq
- START WITH 1
- INCREMENT BY 1
- NO MINVALUE
- NO MAXVALUE
- CACHE 1;
-
-
---
--- Name: data_set_files_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE data_set_files_id_seq OWNED BY data_set_files.id;
-
-
---
--- Name: data_set_files_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('data_set_files_id_seq', 1, false);
-
-
---
--- Name: data_sets; Type: TABLE; Schema: public; Owner: -; Tablespace:
---
-
-CREATE TABLE data_sets (
- id bigint NOT NULL,
- code code NOT NULL,
- location file_path NOT NULL
-);
-
-
---
--- Name: data_sets_id_seq; Type: SEQUENCE; Schema: public; Owner: -
---
-
-CREATE SEQUENCE data_sets_id_seq
- START WITH 1
- INCREMENT BY 1
- NO MINVALUE
- NO MAXVALUE
- CACHE 1;
-
-
---
--- Name: data_sets_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
---
-
-ALTER SEQUENCE data_sets_id_seq OWNED BY data_sets.id;
-
-
---
--- Name: data_sets_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
---
-
-SELECT pg_catalog.setval('data_sets_id_seq', 1, false);
-
-
---
--- Name: database_version_logs; Type: TABLE; Schema: public; Owner: -; Tablespace:
---
-
-CREATE TABLE database_version_logs (
- db_version character varying(4) NOT NULL,
- module_name character varying(250),
- run_status character varying(10),
- run_status_timestamp timestamp without time zone,
- module_code bytea,
- run_exception bytea
-);
-
-
---
--- Name: events; Type: TABLE; Schema: public; Owner: -; Tablespace:
---
-
-CREATE TABLE events (
- last_seen_deletion_event_id tech_id NOT NULL
-);
-
-
---
--- Name: last_feeding_event; Type: TABLE; Schema: public; Owner: -; Tablespace:
---
-
-CREATE TABLE last_feeding_event (
- registration_timestamp time_stamp NOT NULL
-);
-
-
---
--- Name: id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE data_set_files ALTER COLUMN id SET DEFAULT nextval('data_set_files_id_seq'::regclass);
-
-
---
--- Name: id; Type: DEFAULT; Schema: public; Owner: -
---
-
-ALTER TABLE data_sets ALTER COLUMN id SET DEFAULT nextval('data_sets_id_seq'::regclass);
-
-
---
--- Data for Name: data_set_files; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY data_set_files (id, dase_id, parent_id, relative_path, file_name, size_in_bytes, checksum_crc32, is_directory, last_modified) FROM stdin;
-\.
-
-
---
--- Data for Name: data_sets; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY data_sets (id, code, location) FROM stdin;
-\.
-
-
---
--- Data for Name: database_version_logs; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY database_version_logs (db_version, module_name, run_status, run_status_timestamp, module_code, run_exception) FROM stdin;
-005 ../datastore_server/source/sql/postgresql/005/schema-005.sql SUCCESS 2013-02-13 13:23:07.049 \\x0a2f2a202d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d202a2f0a2f2a20446f6d61696e73202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202a2f0a2f2a202d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d202a2f0a0a43524541544520444f4d41494e20544543485f494420415320424947494e543b0a0a43524541544520444f4d41494e20434f44452041532056415243484152283430293b0a0a43524541544520444f4d41494e2046494c455f5041544820415320564152434841522831303030293b0a0a43524541544520444f4d41494e20424f4f4c45414e5f4348415220415320424f4f4c45414e2044454641554c542046414c53453b0a0a43524541544520444f4d41494e2054494d455f5354414d502041532054494d455354414d5020574954482054494d45205a4f4e453b0a0a0a2f2a202d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d202a2f0a2f2a205461626c657320202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202020202a2f0a2f2a202d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d202a2f0a0a435245415445205441424c4520444154415f5345545320280a202049442042494753455249414c204e4f54204e554c4c2c0a2020434f444520434f4445204e4f54204e554c4c2c0a20204c4f434154494f4e2046494c455f50415448204e4f54204e554c4c2c0a0a20205052494d415259204b455920284944292c0a2020554e495155452028434f4445290a293b0a0a43524541544520494e44455820444154415f534554535f434f44455f494458204f4e20444154415f534554532028434f4445293b0a0a435245415445205441424c4520444154415f5345545f46494c455320280a202049442042494753455249414c204e4f54204e554c4c2c0a2020444153455f494420544543485f4944204e4f54204e554c4c2c0a2020504152454e545f494420544543485f49442c0a202052454c41544956455f504154482046494c455f50415448204e4f54204e554c4c2c0a202046494c455f4e414d452046494c455f50415448204e4f54204e554c4c2c0a202053495a455f494e5f425954455320424947494e54204e4f54204e554c4c2c0a2020434845434b53554d5f435243333220494e54454745522c0a202049535f4449524543544f525920424f4f4c45414e5f43484152204e4f54204e554c4c2c0a20204c4153545f4d4f4449464945442054494d455f5354414d50204e4f54204e554c4c2044454641554c54204e4f5728292c0a0a20205052494d415259204b455920284944292c0a2020434f4e53545241494e5420464b5f444154415f5345545f46494c45535f444154415f5345545320464f524549474e204b45592028444153455f494429205245464552454e43455320444154415f534554532028494429204f4e2044454c4554452043415343414445204f4e2055504441544520434153434144452c0a2020434f4e53545241494e5420464b5f444154415f5345545f46494c45535f444154415f5345545f46494c455320464f524549474e204b45592028504152454e545f494429205245464552454e43455320444154415f5345545f46494c45532028494429204f4e2044454c4554452043415343414445204f4e2055504441544520434153434144450a293b0a0a43524541544520494e44455820444154415f5345545f46494c45535f444153455f49445f494458204f4e20444154415f5345545f46494c45532028444153455f4944293b0a43524541544520494e44455820444154415f5345545f46494c45535f444153455f49445f504152454e545f49445f494458204f4e20444154415f5345545f46494c45532028444153455f49442c20504152454e545f4944293b0a43524541544520494e44455820444154415f5345545f46494c45535f444153455f49445f52454c41544956455f504154485f494458204f4e20444154415f5345545f46494c45532028444153455f49442c2052454c41544956455f50415448293b0a43524541544520494e44455820444154415f5345545f46494c45535f444153455f49445f46494c455f4e414d455f494458204f4e20444154415f5345545f46494c45532028444153455f49442c2046494c455f4e414d45293b0a0a435245415445205441424c45204556454e545320280a20204c4153545f5345454e5f44454c4554494f4e5f4556454e545f494420544543485f4944204e4f54204e554c4c0a293b0a0a \N
-006 ../datastore_server/source/sql/postgresql/migration/migration-005-006.sql SUCCESS 2013-03-20 13:20:21.176 \\x0a435245415445205441424c45204c4153545f46454544494e475f4556454e5420280a2020524547495354524154494f4e5f54494d455354414d502054494d455f5354414d50204e4f54204e554c4c0a293b0a \N
-\.
-
-
---
--- Data for Name: events; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY events (last_seen_deletion_event_id) FROM stdin;
-\.
-
-
---
--- Data for Name: last_feeding_event; Type: TABLE DATA; Schema: public; Owner: -
---
-
-COPY last_feeding_event (registration_timestamp) FROM stdin;
-\.
-
-
---
--- Name: data_set_files_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace:
---
-
-ALTER TABLE ONLY data_set_files
- ADD CONSTRAINT data_set_files_pkey PRIMARY KEY (id);
-
-
---
--- Name: data_sets_code_key; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace:
---
-
-ALTER TABLE ONLY data_sets
- ADD CONSTRAINT data_sets_code_key UNIQUE (code);
-
-
---
--- Name: data_sets_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace:
---
-
-ALTER TABLE ONLY data_sets
- ADD CONSTRAINT data_sets_pkey PRIMARY KEY (id);
-
-
---
--- Name: data_set_files_dase_id_file_name_idx; Type: INDEX; Schema: public; Owner: -; Tablespace:
---
-
-CREATE INDEX data_set_files_dase_id_file_name_idx ON data_set_files USING btree (dase_id, file_name);
-
-
---
--- Name: data_set_files_dase_id_idx; Type: INDEX; Schema: public; Owner: -; Tablespace:
---
-
-CREATE INDEX data_set_files_dase_id_idx ON data_set_files USING btree (dase_id);
-
-
---
--- Name: data_set_files_dase_id_parent_id_idx; Type: INDEX; Schema: public; Owner: -; Tablespace:
---
-
-CREATE INDEX data_set_files_dase_id_parent_id_idx ON data_set_files USING btree (dase_id, parent_id);
-
-
---
--- Name: data_set_files_dase_id_relative_path_idx; Type: INDEX; Schema: public; Owner: -; Tablespace:
---
-
-CREATE INDEX data_set_files_dase_id_relative_path_idx ON data_set_files USING btree (dase_id, relative_path);
-
-
---
--- Name: data_sets_code_idx; Type: INDEX; Schema: public; Owner: -; Tablespace:
---
-
-CREATE INDEX data_sets_code_idx ON data_sets USING btree (code);
-
-
---
--- Name: fk_data_set_files_data_set_files; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY data_set_files
- ADD CONSTRAINT fk_data_set_files_data_set_files FOREIGN KEY (parent_id) REFERENCES data_set_files(id) ON UPDATE CASCADE ON DELETE CASCADE;
-
-
---
--- Name: fk_data_set_files_data_sets; Type: FK CONSTRAINT; Schema: public; Owner: -
---
-
-ALTER TABLE ONLY data_set_files
- ADD CONSTRAINT fk_data_set_files_data_sets FOREIGN KEY (dase_id) REFERENCES data_sets(id) ON UPDATE CASCADE ON DELETE CASCADE;
-
-
---
--- Name: public; Type: ACL; Schema: -; Owner: -
---
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM postgres;
-GRANT ALL ON SCHEMA public TO postgres;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
--- PostgreSQL database dump complete
---
-
--
GitLab