Compare commits

..

No commits in common. 'master' and 'testfallprotokoll_mail' have entirely different histories.

  1. 2
      rsync_to_superx.x
  2. 12
      src-modules/module/qa/datentabellen/qa_dbtest_ausfuehren.sql
  3. 10
      src-modules/module/qa/hilfstabellen/qa_sos_stg_aggr_astat_fuellen.sql
  4. 4
      src-modules/module/qa/hilfstabellen/qa_sos_stg_aggr_int_fuellen.sql
  5. 5
      src-modules/module/qa/masken/37020_maskeninfo.unl
  6. 13
      src-modules/module/qa/masken/37060_maskeninfo.unl

2
rsync_to_superx.x

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
#Synchronisierung webapp zum Zielpfad #Synchronisierung webapp zum Zielpfad
ant -DMODULE_PATH=$QA_PFAD -DBASE_DIR=. -DMODULE=qa all ant -DMODULE_PATH=$MEINMODUL_PFAD -DBASE_DIR=. -DMODULE=meinmodul all

12
src-modules/module/qa/datentabellen/qa_dbtest_ausfuehren.sql

@ -95,13 +95,6 @@ select
${dbtest_assertion.tid}, ${dbtest_assertion.tid},
A.beginn, A.beginn,
now(), now(),
<#if dbtest_assertion.def_col_value="">
--Test wenn Zielspalte leer sein soll:
case when T.${dbtest_assertion.def_col_name} is null or '' || T.${dbtest_assertion.def_col_name}=''
then 0
else 1 end
<#else>
case when T.${dbtest_assertion.def_col_name}= case when T.${dbtest_assertion.def_col_name}=
<#if dbtest_assertion.def_col_function !=""> <#if dbtest_assertion.def_col_function !="">
${dbtest_assertion.def_col_function}('${dbtest_assertion.def_col_value}') ${dbtest_assertion.def_col_function}('${dbtest_assertion.def_col_value}')
@ -109,10 +102,7 @@ ${dbtest_assertion.def_col_function}('${dbtest_assertion.def_col_value}')
'${dbtest_assertion.def_col_value}' '${dbtest_assertion.def_col_value}'
</#if> </#if>
then 0 then 0
else 1 end else 1 end as result_code,
</#if>
as result_code,
T.${dbtest_assertion.def_col_name} as result_value 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 (A.dbtest_id=${dbtest_assertion.dbtest_id} on (A.dbtest_id=${dbtest_assertion.dbtest_id}

10
src-modules/module/qa/hilfstabellen/qa_sos_stg_aggr_astat_fuellen.sql

@ -5,9 +5,9 @@
select sp_table_exists('sos_stg_aggr') from xdummy select sp_table_exists('sos_stg_aggr') from xdummy
</sqlvar> </sqlvar>
<sqlvar name="qa_tablecomp_profile_is_active"><![CDATA[ <sqlvar name="qa_tablecomp_profile_is_active"><![CDATA[
select 1 from xdummy where 0 < (select count(*) from qa_tablecomp_profile P where P.uniquename='sos_stud_astat_stg_abschluss_s1' and is_active=1) select 1 from xdummy where 0 < (select count(*) from qa_tablecomp_profile P where P.uniquename='sos_stud_astat' and is_active=1)
union union
select 0 from xdummy where 0 = (select count(*) from qa_tablecomp_profile P where P.uniquename='sos_stud_astat_stg_abschluss_s1' and is_active=1) select 0 from xdummy where 0 = (select count(*) from qa_tablecomp_profile P where P.uniquename='sos_stud_astat' and is_active=1)
]]></sqlvar> ]]></sqlvar>
</sqlvars> </sqlvars>
@ -270,6 +270,8 @@ group by 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20
</#foreach> </#foreach>
update tmp_stg_aggr_astat set stg='0' || stg
where length(trim(stg))=3;
delete from qa_sos_stg_aggr_astat delete from qa_sos_stg_aggr_astat
where sem_rueck_beur_ein in (select distinct K.sem_rueck_beur_ein where sem_rueck_beur_ein in (select distinct K.sem_rueck_beur_ein
@ -344,7 +346,9 @@ insert into qa_sos_stg_aggr_astat(hs_nr,
from tmp_stg_aggr_astat from tmp_stg_aggr_astat
group by 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30 group by 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30
; ;
update qa_sos_stg_aggr_astat set stg='0'||stg where length(stg)=3
and substring(stg from 1 for 1) in ('0','1','2','3','4','5','6','7','8','9')
;
drop table tmp_stg_aggr_astat; drop table tmp_stg_aggr_astat;

4
src-modules/module/qa/hilfstabellen/qa_sos_stg_aggr_int_fuellen.sql

@ -5,9 +5,9 @@
select sp_table_exists('sos_stg_aggr') from xdummy select sp_table_exists('sos_stg_aggr') from xdummy
</sqlvar> </sqlvar>
<sqlvar name="qa_tablecomp_profile_is_active"><![CDATA[ <sqlvar name="qa_tablecomp_profile_is_active"><![CDATA[
select 1 from xdummy where 0 < (select count(*) from qa_tablecomp_profile P where P.uniquename='sos_stud_astat_stg_abschluss_s1' and is_active=1) select 1 from xdummy where 0 < (select count(*) from qa_tablecomp_profile P where P.uniquename='sos_stud_astat' and is_active=1)
union union
select 0 from xdummy where 0 = (select count(*) from qa_tablecomp_profile P where P.uniquename='sos_stud_astat_stg_abschluss_s1' and is_active=1) select 0 from xdummy where 0 = (select count(*) from qa_tablecomp_profile P where P.uniquename='sos_stud_astat' and is_active=1)
]]></sqlvar> ]]></sqlvar>
</sqlvars> </sqlvars>

5
src-modules/module/qa/masken/37020_maskeninfo.unl

@ -166,8 +166,7 @@ from qa_mask_execution2project TP, qa_project P\
where TP.mask_execution_id=tmp_testcase.mask_execution_id\ where TP.mask_execution_id=tmp_testcase.mask_execution_id\
and P.tid=TP.project_id\ and P.tid=TP.project_id\
;\ ;\
--nun DB-Tests, wenn keine Maske ausgewählt ist:\ --nun DB-Tests:\
<#if "<<Maske>>" =="">\
<@selectintotmp \ <@selectintotmp \
select="\ select="\
T.tid,\ T.tid,\
@ -272,7 +271,7 @@ from tmp_qa_dbtest\
\ \
drop table tmp_qa_dbtest;\ drop table tmp_qa_dbtest;\
\ \
</#if> --Ende wenn keine Maske ausgewählt ist\ \
\ \
<#if inEtl>\ <#if inEtl>\
\ \

13
src-modules/module/qa/masken/37060_maskeninfo.unl

@ -358,10 +358,8 @@ zeitraum,\
comparison,\ comparison,\
result_table_1,\ result_table_1,\
result_table_2,\ result_table_2,\
--50 as _graphbar,\ result_code_str,\
(100-( result_table_1::decimal(8,2))/(result_table_2::decimal(8,2))*100)::integer as _graphbar,\ hidden_summe\
result_code_str\
--hidden_summe\
from tmp_abgleich\ from tmp_abgleich\
where 1=1\ where 1=1\
/* and <<Ausführungs-Status>>=result_code */\ /* and <<Ausführungs-Status>>=result_code */\
@ -427,9 +425,6 @@ Column CID=1 heading_text="Wert ${profile.table_1_caption}" center_heading\
Column CID=1 heading_text="Wert ${profile.table_2_caption}" center_heading\ Column CID=1 heading_text="Wert ${profile.table_2_caption}" center_heading\
row_selectable col_selectable heading_platform readonly\ row_selectable col_selectable heading_platform readonly\
width=10 text_size=200\ width=10 text_size=200\
Column CID=1 heading_text="Differenz graphisch" center_heading\
row_selectable col_selectable heading_platform readonly\
width=10 \
Column CID=1 heading_text="Status" center_heading\ Column CID=1 heading_text="Status" center_heading\
row_selectable col_selectable heading_platform readonly\ row_selectable col_selectable heading_platform readonly\
width=10 text_size=200\ width=10 text_size=200\
@ -477,4 +472,6 @@ Column CID=1 heading_text="Ergebnis" center_heading row_selectable col_selectabl
Column CID=1 heading_text="hidden_Summe" center_heading row_selectable col_selectableh eading_platform readonly width=10 text_size=20\ Column CID=1 heading_text="hidden_Summe" center_heading row_selectable col_selectableh eading_platform readonly width=10 text_size=20\
Column CID=1 heading_text="Summe" center_heading row_selectable col_selectableh eading_platform readonly width=1 text_size=1\ Column CID=1 heading_text="Summe" center_heading row_selectable col_selectableh eading_platform readonly width=1 text_size=1\
</#if>\ </#if>\
@@@^ ^ ^Generische Auswertung eines Tabellenabgleichs mit Link zu Details bei Auswertung mit Aggregation des Vergleichs=Felder^drop table tmp_abgleich; drop table tmp_abgleich_ds; drop table tmp_abgleich_summen;^^1^440^360^^1^ ^ @@@^ ^ ^Generische Auswertung eines Tabellenabgleichs mit Link zu Details bei Auswertung mit Aggregation des Vergleichs=Felder^drop table tmp_abgleich; \
drop table tmp_abgleich_ds; \
drop table tmp_abgleich_summen;^^1^440^360^^1^^

Loading…
Cancel
Save