From 1a25908b0207d82c7155861760dc900cfb400436 Mon Sep 17 00:00:00 2001 From: Daniel Quathamer Date: Wed, 3 Jul 2024 12:22:39 +0200 Subject: [PATCH 1/2] Remove obsolete file, Empty values in dbtest assertions #4 --- rsync_to_superx.x | 2 +- .../module/qa/datentabellen/qa_dbtest_ausfuehren.sql | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/rsync_to_superx.x b/rsync_to_superx.x index 2a46819..41d347a 100755 --- a/rsync_to_superx.x +++ b/rsync_to_superx.x @@ -1,7 +1,7 @@ #!/bin/bash #Synchronisierung webapp zum Zielpfad -ant -DMODULE_PATH=$MEINMODUL_PFAD -DBASE_DIR=. -DMODULE=meinmodul all +ant -DMODULE_PATH=$QA_PFAD -DBASE_DIR=. -DMODULE=qa all diff --git a/src-modules/module/qa/datentabellen/qa_dbtest_ausfuehren.sql b/src-modules/module/qa/datentabellen/qa_dbtest_ausfuehren.sql index a33df33..fca23a9 100644 --- a/src-modules/module/qa/datentabellen/qa_dbtest_ausfuehren.sql +++ b/src-modules/module/qa/datentabellen/qa_dbtest_ausfuehren.sql @@ -95,6 +95,13 @@ select ${dbtest_assertion.tid}, A.beginn, 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}= <#if dbtest_assertion.def_col_function !=""> ${dbtest_assertion.def_col_function}('${dbtest_assertion.def_col_value}') @@ -102,7 +109,10 @@ ${dbtest_assertion.def_col_function}('${dbtest_assertion.def_col_value}') '${dbtest_assertion.def_col_value}' then 0 -else 1 end as result_code, +else 1 end + + +as result_code, T.${dbtest_assertion.def_col_name} as result_value from tmp_anfang A left outer join tmp_rs T on (A.dbtest_id=${dbtest_assertion.dbtest_id} From 01f6e7a402e8b816b506081c0091c20a50729775 Mon Sep 17 00:00:00 2001 From: Daniel Quathamer Date: Mon, 8 Jul 2024 08:08:44 +0200 Subject: [PATCH 2/2] =?UTF-8?q?Bugfix=20Protokollmaske=20zeigt=20keine=20D?= =?UTF-8?q?B-Tests=20wenn=20eine=20Maske=20ausgew=C3=A4hlt=20ist=20#4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-modules/module/qa/masken/37020_maskeninfo.unl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src-modules/module/qa/masken/37020_maskeninfo.unl b/src-modules/module/qa/masken/37020_maskeninfo.unl index 809a23c..12cc695 100644 --- a/src-modules/module/qa/masken/37020_maskeninfo.unl +++ b/src-modules/module/qa/masken/37020_maskeninfo.unl @@ -166,7 +166,8 @@ from qa_mask_execution2project TP, qa_project P\ where TP.mask_execution_id=tmp_testcase.mask_execution_id\ and P.tid=TP.project_id\ ;\ ---nun DB-Tests:\ +--nun DB-Tests, wenn keine Maske ausgewählt ist:\ +<#if "<>" =="">\ <@selectintotmp \ select="\ T.tid,\ @@ -271,7 +272,7 @@ from tmp_qa_dbtest\ \ drop table tmp_qa_dbtest;\ \ -\ + --Ende wenn keine Maske ausgewählt ist\ \ <#if inEtl>\ \