Browse Source

Neue Tabelle qa_dbtest2project, Bearbeitungsformulare #4

qa_0.6_Release
Daniel Quathamer 3 years ago
parent
commit
50e476ca3c
  1. 30
      src-modules/module/qa/conf/qa.xml
  2. 6
      src-modules/module/qa/masken/37100_felderinfo.unl
  3. 12
      src-modules/module/qa/masken/37100_maskeninfo.unl
  4. 10
      src-modules/module/qa/masken/37120_felderinfo.unl
  5. 2
      src-modules/module/qa/masken/37120_masken_felder_bez.unl
  6. 14
      src-modules/module/qa/masken/37120_maskeninfo.unl
  7. 8
      src-modules/module/qa/masken/37140_felderinfo.unl
  8. 1
      src-modules/module/qa/masken/37140_masken_felder_bez.unl
  9. 15
      src-modules/module/qa/masken/37140_maskeninfo.unl

30
src-modules/module/qa/conf/qa.xml

@ -493,7 +493,7 @@ notnull="false">
<columns><column name="tid" type ="SERIAL" size ="10" default ="" notnull ="true" description=""/> <columns><column name="tid" type ="SERIAL" size ="10" default ="" notnull ="true" description=""/>
<column name="uniquename" type ="VARCHAR" size ="255" default ="" notnull ="true" description="Schlüssel"/> <column name="uniquename" type ="VARCHAR" size ="255" default ="" notnull ="true" description="Schlüssel"/>
<column name="name" type ="VARCHAR" size ="255" default ="" notnull ="false" description="Name"/> <column name="name" type ="VARCHAR" size ="255" default ="" notnull ="false" description="Name"/>
<column name="systeminfo_id" type ="INTEGER" size ="10" default ="" notnull ="true" description="Komponente"/> <column name="systeminfo_id" type ="INTEGER" size ="10" default ="" notnull ="false" description="Komponente"/>
<column name="resultset_field_id" type ="INTEGER" size ="10" default ="" notnull ="false" description="Ergebnistabelle"/> <column name="resultset_field_id" type ="INTEGER" size ="10" default ="" notnull ="false" description="Ergebnistabelle"/>
<column name="whereclause" type ="TEXT" size ="2147483647" default ="" notnull ="false" description="Bedingung"><comment>formuliert als SQL-where-Ausdruck</comment></column> <column name="whereclause" type ="TEXT" size ="2147483647" default ="" notnull ="false" description="Bedingung"><comment>formuliert als SQL-where-Ausdruck</comment></column>
<column name="active" type ="SMALLINT" size ="5" default ="" notnull ="false" description="Aktiv"/> <column name="active" type ="SMALLINT" size ="5" default ="" notnull ="false" description="Aktiv"/>
@ -521,7 +521,7 @@ notnull="false">
</table> </table>
<table name="qa_dbtest2project" caption="Datenbank-Test zu Projekt" thema="Qualitätssicherung" typ="Schlüsseltabelle"> <table name="qa_dbtest2project" caption="Datenbank-Test zu Projekt" thema="Qualitätssicherung" typ="Schlüsseltabelle">
<columns><column name="tid" type ="SERIAL" size ="10" default ="" notnull ="true" description=""/> <columns><column name="tid" type ="SERIAL" size ="10" default ="" notnull ="true" description=""/>
<column name="dbtest_id" type ="INTEGER" size ="255" default ="" notnull ="true" description="DB-Test"/> <column name="dbtest_id" type ="INTEGER" size ="255" default ="" notnull ="true" isKey="true" description="DB-Test"/>
<column name="project_id" type ="INTEGER" size ="10" default ="" notnull ="true" description="Projekt"/> <column name="project_id" type ="INTEGER" size ="10" default ="" notnull ="true" description="Projekt"/>
</columns> </columns>
<indexes> <indexes>
@ -771,17 +771,28 @@ delete="FALSE" displayType="select" visibleFields="name"
format="%s"> format="%s">
<relation-column from="tid" to="resultset_id" /> <relation-column from="tid" to="resultset_id" />
</relation> </relation>
<!--qa_dbtest--> <!--qa_dbtest2project-->
<relation from="qa_project" to="qa_dbtest" <relation from="qa_project" to="qa_dbtest2project"
delete="FALSE" displayType="select" visibleFields="name" delete="FALSE" displayType="select" visibleFields="name"
format="%s"> format="%s">
<relation-column from="tid" to="project_id" /> <relation-column from="tid" to="project_id" />
</relation> </relation>
<relation from="qa_dbtest" to="qa_dbtest2project"
delete="FALSE" displayType="select" visibleFields="name"
format="%s">
<relation-column from="tid" to="dbtest_id" />
</relation>
<!--qa_dbtest-->
<relation from="qa_resultset_field" to="qa_dbtest" <relation from="qa_resultset_field" to="qa_dbtest"
delete="FALSE" displayType="select" visibleFields="name" delete="FALSE" displayType="select" visibleFields="name"
format="%s"> format="%s">
<relation-column from="tid" to="resultset_field_id" /> <relation-column from="tid" to="resultset_field_id" />
</relation> </relation>
<relation from="systeminfo" to="qa_dbtest"
delete="FALSE" displayType="select" visibleFields="name"
format="%s">
<relation-column from="tid" to="systeminfo_id" />
</relation>
<!--qa_dbtest_assertion--> <!--qa_dbtest_assertion-->
<relation from="qa_dbtest" to="qa_dbtest_assertion" <relation from="qa_dbtest" to="qa_dbtest_assertion"
delete="FALSE" displayType="select" visibleFields="name" delete="FALSE" displayType="select" visibleFields="name"
@ -985,12 +996,19 @@ mode="full">
</filters> </filters>
<field-selection complete="false" /> <field-selection complete="false" />
<customfield name="tid" /> <customfield name="tid" />
<customfield name="systeminfo_id" visibleSize="50" nullFieldValue="" />
<customfield name="name" visibleSize="50" nullFieldValue="" /> <customfield name="name" visibleSize="50" nullFieldValue="" />
<customfield name="uniquename" visibleSize="50" nullFieldValue="" /> <customfield name="uniquename" visibleSize="50" nullFieldValue="" />
<customfield name="resultset_field_id" visibleSize="50" nullFieldValue="" /> <customfield name="resultset_field_id" visibleSize="50" nullFieldValue="" />
<customfield name="whereclause" visibleSize="80" nullFieldValue="" /> <customfield name="whereclause" visibleSize="80" nullFieldValue="" />
<!--<customfield name="Feld-Vorbelegung" type="include" path="/edit/qa/qa_mask_execution_felderinfo_edit.inc"/>--> <customfield name="Projekt" type="subform" multipart="false" autoUpdate="false"
<!--<customfield name="Erwartetes Ergebnis" type="include" path="/edit/qa/qa_dbtest_assertion_edit.inc"/>--> maxRows="*" table="qa_dbtest2project" parentField="tid" childField="dbtest_id"
orderBy="" allowNew="true"
mode="update_insert_delete">
<field-selection complete="false" />
<customfield name="dbtest_id" type="hidden" overrideValue="tid" />
<customfield name="project_id" nullFieldValue="" visibleSize="5" />
</customfield>
<customfield name="Erwartetes Ergebnis" type="subform" multipart="false" autoUpdate="false" <customfield name="Erwartetes Ergebnis" type="subform" multipart="false" autoUpdate="false"
maxRows="*" table="qa_dbtest_assertion" parentField="tid" childField="dbtest_id" maxRows="*" table="qa_dbtest_assertion" parentField="tid" childField="dbtest_id"
orderBy="" allowNew="true" orderBy="" allowNew="true"

6
src-modules/module/qa/masken/37100_felderinfo.unl

@ -5,5 +5,7 @@
37104^Komponente^10^0^0^150^200^1^integer^200^0^1^<<SQL>> select tid,name from systeminfo order by 2;^^^ 37104^Komponente^10^0^0^150^200^1^integer^200^0^1^<<SQL>> select tid,name from systeminfo order by 2;^^^
37105^Nur aktive^30^0^0^150^80^1^integer^200^0^1^<<SQL>> select 1,'Ja' from xdummy union select 0,'nein' from xdummy order by 1 desc;^^<<SQL>>select 1,'Ja' from xdummy^ 37105^Nur aktive^30^0^0^150^80^1^integer^200^0^1^<<SQL>> select 1,'Ja' from xdummy union select 0,'nein' from xdummy order by 1 desc;^^<<SQL>>select 1,'Ja' from xdummy^
37106^Ab Datum^40^0^0^150^80^1^date^200^0^0^ ^^<<SQL>> select today()-3 from xdummy^ 37106^Ab Datum^40^0^0^150^80^1^date^200^0^0^ ^^<<SQL>> select today()-3 from xdummy^
37107^DB-Test^100^0^0^150^200^1^integer^200^0^1^<<SQL>> select tid,name from qa_dbtest where 1=1 \ 37107^DB-Test^100^0^0^150^200^1^integer^200^0^1^<<SQL>> select T.tid,T.name from qa_dbtest T where active=1 \
/* and project_id=<<Projekt>> */ order by 2^ ^ ^ /* and T.tid in (select P.dbtest_id from qa_dbtest2project P where P.project_id=<<Projekt>>) */ \
/* and T.systeminfo_id=<<Komponente>> */\
order by 2^ ^ ^

12
src-modules/module/qa/masken/37100_maskeninfo.unl

@ -22,23 +22,21 @@ R.result_code,\
null::integer as result_status,\ null::integer as result_status,\
''::char(255) as result_status_str,\ ''::char(255) as result_status_str,\
R.result_value,\ R.result_value,\
P.systeminfo_id,\ T.systeminfo_id,\
''::char(255) as systeminfo_id_str,\ ''::char(255) as systeminfo_id_str,\
A.tid as qa_dbtest_assertion_id,\ A.tid as qa_dbtest_assertion_id,\
A.def_col_caption,\ A.def_col_caption,\
A.def_col_name,\ A.def_col_name,\
A.def_col_value\ A.def_col_value\
"\ "\
source="qa_project P,qa_dbtest T, qa_dbtest_assertion A left outer join qa_dbtest_result R on (R.dbtest_assertion_id=A.tid /* and date(R.execution_start) >= date_val(<<Ab Datum>>) */)"\ source="qa_dbtest T, qa_dbtest_assertion A left outer join qa_dbtest_result R on (R.dbtest_assertion_id=A.tid /* and date(R.execution_start) >= date_val(<<Ab Datum>>) */)"\
target="tmp_qa_dbtest">\ target="tmp_qa_dbtest">\
-- nested in selectinto muss die where Bedingung u. ggfs. group by etc kommen\
where \ where \
P.tid=T.project_id\ T.tid=A.dbtest_id\
and T.tid=A.dbtest_id\
/* and T.active=<<Nur aktive>> */\ /* and T.active=<<Nur aktive>> */\
/* and P.tid=<<Projekt>> */\ /* and T.tid in (select P.dbtest_id from qa_dbtest2project P where P.project_id=<<Projekt>>) */\
/* and E.userinfo_id=<<Benutzer/in>> */\ /* and E.userinfo_id=<<Benutzer/in>> */\
/* and P.systeminfo_id=<<Komponente>> */\ /* and T.systeminfo_id=<<Komponente>> */\
/* and T.name ilike '%<<Testfall-Name (Stichwort)>>%' */\ /* and T.name ilike '%<<Testfall-Name (Stichwort)>>%' */\
/* and T.tid=<<DB-Test>> */\ /* and T.tid=<<DB-Test>> */\
</@selectintotmp>\ </@selectintotmp>\

10
src-modules/module/qa/masken/37120_felderinfo.unl

@ -1,6 +1,8 @@
37120^Benutzer/in^50^0^0^150^200^1^integer^200^0^1^<<SQL>> select tid,nvl(name,benutzer) from userinfo order by 2;^hidden^^ 37120^Benutzer/in^50^0^0^150^200^1^integer^200^0^1^<<SQL>> select tid,nvl(name,benutzer) from userinfo order by 2;^hidden^^
37121^Ausgabetabelle^0^0^0^150^80^1^integer^200^0^1^<<SQL>> select tid,name from qa_resultset order by 2;^^^ 37121^Ausgabetabelle^10^0^0^150^80^1^integer^200^0^1^<<SQL>> select tid,name from qa_resultset where 1=1 /* and systeminfo_id=<<Komponente>> */ order by 2;^^^
37122^Ausgabetabellen^100^0^0^150^300^1^char^30^0^18^^^<<SQL>> select '../edit/qa/qa_resultset_list.jsp' from xdummy;^ 37122^Ausgabetabellen verwalten^100^0^0^150^300^1^char^30^0^18^^^<<SQL>> select '../edit/qa/qa_resultset_list.jsp' from xdummy;^
37123^Name^20^0^0^150^150^1^sql^50^0^0^^^^ 37123^Name^20^0^0^150^150^1^sql^50^0^0^^^^
37124^Komponente^30^0^0^150^200^1^integer^200^0^1^<<SQL>> select tid,name from systeminfo order by 2;^hidden^^ 37124^Komponente^1^0^0^150^200^1^integer^200^0^1^<<SQL>> select tid,name from systeminfo order by 2;^ ^^
37125^Projekte^200^0^0^150^300^1^char^30^0^18^^^<<SQL>> select '../edit/qa/qa_project_list.jsp' from xdummy;^ 37125^Projekte verwalten^200^0^0^150^300^1^char^30^0^18^^^<<SQL>> select '../edit/qa/qa_project_list.jsp' from xdummy;^
37126^Projekt^5^0^0^150^200^1^integer^200^0^1^<<SQL>> select tid,name from qa_project where active=1 /* and systeminfo_id=<<Komponente>> */ order by 2;^^^
37127^Status Test^200^0^0^150^200^1^integer^200^0^1^<<SQL>> select 1,'nur aktive' from xdummy union select 0,'nur inaktive' from xdummy order by 2;^^<<SQL>> select 1,'nur aktive' from xdummy^

2
src-modules/module/qa/masken/37120_masken_felder_bez.unl

@ -4,3 +4,5 @@
37120^37123^ 37120^37123^
37120^37124^ 37120^37124^
37120^37125^ 37120^37125^
37120^37126^
37120^37127^

14
src-modules/module/qa/masken/37120_maskeninfo.unl

@ -6,7 +6,7 @@ ord smallint,\
tid INTEGER , \ tid INTEGER , \
uniquename VARCHAR(255) , \ uniquename VARCHAR(255) , \
name VARCHAR(255) , \ name VARCHAR(255) , \
project_id INTEGER , \ systeminfo_id INTEGER , \
resultset_id INTEGER ,\ resultset_id INTEGER ,\
resultset_str varchar(255) , \ resultset_str varchar(255) , \
resultset_field_id INTEGER , \ resultset_field_id INTEGER , \
@ -21,7 +21,7 @@ insert into tmp_qa_dbtest (ord,\
tid,\ tid,\
uniquename,\ uniquename,\
name,\ name,\
project_id,\ systeminfo_id,\
resultset_field_id,\ resultset_field_id,\
whereclause,\ whereclause,\
active,\ active,\
@ -31,7 +31,7 @@ select 1 as ord,\
tid,\ tid,\
uniquename,\ uniquename,\
name,\ name,\
project_id,\ systeminfo_id,\
resultset_field_id,\ resultset_field_id,\
whereclause,\ whereclause,\
active,\ active,\
@ -39,9 +39,11 @@ select 1 as ord,\
('37140&DB-Test=' || D.tid)::varchar(255) as nexttable\ ('37140&DB-Test=' || D.tid)::varchar(255) as nexttable\
FROM qa_dbtest D\ FROM qa_dbtest D\
where 1=1\ where 1=1\
/* and T.resultset_field_id=<<Ausgabetabelle>> */\ /* and D.resultset_field_id=<<Ausgabetabelle>> */\
/* and T.name like '%<<Name>>%' */\ /* and D.name like '%<<Name>>%' */\
/* and T.systeminfo_id=<<Komponente>> */\ /* and D.tid in (select P.dbtest_id from qa_dbtest2project P where P.project_id=<<Projekt>> )*/\
/* and D.systeminfo_id=<<Komponente>> */\
/* and D.active=<<Status Test>> */\
;\ ;\
\ \
update tmp_qa_dbtest set resultset_id=R.resultset_id,\ update tmp_qa_dbtest set resultset_id=R.resultset_id,\

8
src-modules/module/qa/masken/37140_felderinfo.unl

@ -1,2 +1,6 @@
37140^DB-Test^50^0^0^150^200^1^integer^200^1^1^<<SQL>> select tid,name from qa_dbtest order by 2^ ^ ^ 37140^DB-Test^50^0^0^150^200^1^integer^200^1^1^<<SQL>> select T.tid,T.name from qa_dbtest T where T.active=1\
37144^Komponente^1^0^0^150^200^1^integer^200^0^1^<<SQL>> select tid,name from systeminfo order by 2;^hidden^ ^ /* and T.systeminfo_id=<<Komponente>> */\
/* and T.tid in (select P.dbtest_id from qa_dbtest2project P where P.project_id=<<Projekt>>) */\
order by 2^ ^ ^
37141^Projekt^20^0^0^150^80^1^integer^200^0^1^<<SQL>> select tid,name from qa_project where active=1 /* and systeminfo_id=<<Komponente>> */ order by 2;^^^
37144^Komponente^1^0^0^150^200^1^integer^200^0^1^<<SQL>> select tid,name from systeminfo order by 2;^ ^ ^

1
src-modules/module/qa/masken/37140_masken_felder_bez.unl

@ -1,2 +1,3 @@
37140^37140^ 37140^37140^
37140^37141^
37140^37144^ 37140^37144^

15
src-modules/module/qa/masken/37140_maskeninfo.unl

@ -36,6 +36,10 @@ where A.dbtest_id=<<DB-Test>>\
</sqlvar>\ </sqlvar>\
</sqlvars>\ </sqlvars>\
\ \
create temp table tmp_qa_dbtest_result_id\
(qa_dbtest_result_id integer);\
\
\
<#foreach dbtest in qa_dbtests>\ <#foreach dbtest in qa_dbtests>\
\ \
\ \
@ -49,6 +53,7 @@ where ${dbtest.whereclause}\
;\ ;\
\ \
\ \
\
<#foreach dbtest_assertion in qa_dbtest_assertions>\ <#foreach dbtest_assertion in qa_dbtest_assertions>\
<#if dbtest_assertion.dbtest_id==dbtest.tid>\ <#if dbtest_assertion.dbtest_id==dbtest.tid>\
\ \
@ -70,6 +75,13 @@ T.${dbtest_assertion.def_col_name} as result_value\
from tmp_anfang A left outer join tmp_rs T\ from tmp_anfang A left outer join tmp_rs T\
on (1=${dbtest_assertion.rownr})\ on (1=${dbtest_assertion.rownr})\
;\ ;\
insert into tmp_qa_dbtest_result_id(qa_dbtest_result_id)\
<#if SQLdialect='Postgres'>\
select currval('qa_dbtest_result_tid_seq') from xdummy\
<#else>\
select max(tid) from qa_dbtest_result\
</#if>\
;\
\ \
</#if>\ </#if>\
</#foreach>\ </#foreach>\
@ -89,6 +101,7 @@ select R.dbtest_id,\
FROM qa_dbtest T, qa_dbtest_result R\ FROM qa_dbtest T, qa_dbtest_result R\
where T.tid=R.dbtest_id\ where T.tid=R.dbtest_id\
and T.tid=<<DB-Test>>\ and T.tid=<<DB-Test>>\
and R.tid in (select qa_dbtest_result_id from tmp_qa_dbtest_result_id)\
order by 4 desc;^XIL List\ order by 4 desc;^XIL List\
drop_and_delete movable_columns sizable_columns horizontal_scrolling\ drop_and_delete movable_columns sizable_columns horizontal_scrolling\
white_space_color=COLOR_WHITE fixed_columns=2\ white_space_color=COLOR_WHITE fixed_columns=2\
@ -114,4 +127,4 @@ Column CID=1 heading_text="DB-Test Ergebnis \\n Wert" center_heading\
Column CID=1 heading_text="DB-Test \\nProtokoll" center_heading\ Column CID=1 heading_text="DB-Test \\nProtokoll" center_heading\
row_selectable col_selectable heading_platform readonly\ row_selectable col_selectable heading_platform readonly\
width=9 text_size=200\ width=9 text_size=200\
@@@^^^Einen Datenbank-Test ausführen^ ^^1^440^360^0^1^^ @@@^^^Einen Datenbank-Test ausführen^drop table tmp_qa_dbtest_result_id;^^1^440^360^0^1^^

Loading…
Cancel
Save