Commit c5155032 authored by Tony Schaller's avatar Tony Schaller

testing scripts update

git-svn-id: https://svn.code.sf.net/p/ehealthconnector/code/trunk@1698 e99adb7c-5e35-42fd-8d1b-cdb378af05e8
parent dc2082e4
......@@ -32,11 +32,6 @@ echo ehc_testing_my_out_dir_prev=%ehc_testing_my_out_dir_prev%
echo ================================================== >> %ehc_testing_my_logfile%
SET eHCTempPath=%ehc_testing_my_out_dir_cur%
if exist "%ehc_testing_my_out_dir_cur%\xdm_*_Java.zip" DEL "%ehc_testing_my_out_dir_cur%\xdm_*_Java.zip"
if exist "%ehc_testing_my_out_dir_cur%\xdm_nist_Java" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_nist_Java"
if exist "%ehc_testing_my_out_dir_cur%\xdm_nist_Java_prev" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_nist_Java_prev"
if exist "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java"
if exist "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java_prev" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java_prev"
SET ehc_testing_my_out_file=DemoXua_Help_Java.txt
set EHC_COMMAND=java -Dehc_testing_my_logPath=%ehc_testing_my_log_dir:\=/% -Dlog4j.configuration=%ehc_testing_my_scriptBase%\testing\rsc\log4jConfigs\log4j.xml -jar %ehc_testing_my_eHCDemoJar% DemoXUA -h
call %ehc_testing_my_doOneComand% %ehc_testing_my_logBehavior% "%ehc_testing_my_logfile%" "%ehc_testing_my_out_dir_cur%\%ehc_testing_my_out_file%"
......
......@@ -32,13 +32,8 @@ echo ehc_testing_my_out_dir_prev=%ehc_testing_my_out_dir_prev%
echo ================================================== >> %ehc_testing_my_logfile%
SET eHCTempPath=%ehc_testing_my_out_dir_cur%
if exist "%ehc_testing_my_out_dir_cur%\xdm_*_Java.zip" DEL "%ehc_testing_my_out_dir_cur%\xdm_*_Java.zip"
if exist "%ehc_testing_my_out_dir_cur%\xdm_nist_Java" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_nist_Java"
if exist "%ehc_testing_my_out_dir_cur%\xdm_nist_Java_prev" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_nist_Java_prev"
if exist "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java"
if exist "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java_prev" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java_prev"
rmdir /s /q %ehc_testing_my_out_dir_cur%\demoxua-out
if "%1"=="" rmdir /s /q %ehc_testing_my_out_dir_cur%\demoxua-out
SET ehc_testing_my_out_file=DemoXua_IdPAuthenticationRequestbyHTTPPOSTandHINClient_Java.txt
set EHC_COMMAND=java -Dehc_testing_my_logPath=%ehc_testing_my_log_dir:\=/% -Dlog4j.configuration=%ehc_testing_my_scriptBase%\testing\rsc\log4jConfigs\log4j.xml -jar %ehc_testing_my_eHCDemoJar% DemoXUA --IdpHttpHinClient -x=localhost:5016 -k=rsc/demoXua/idp/credentials/validsigning.p12:ehctest:pkcs12:"ehctest" -o=%ehc_testing_my_out_dir_cur%\demoxua-out\idp
call %ehc_testing_my_doOneComand% %ehc_testing_my_logBehavior% "%ehc_testing_my_logfile%" "%ehc_testing_my_out_dir_cur%\%ehc_testing_my_out_file%"
......
......@@ -32,13 +32,8 @@ echo ehc_testing_my_out_dir_prev=%ehc_testing_my_out_dir_prev%
echo ================================================== >> %ehc_testing_my_logfile%
SET eHCTempPath=%ehc_testing_my_out_dir_cur%
if exist "%ehc_testing_my_out_dir_cur%\xdm_*_Java.zip" DEL "%ehc_testing_my_out_dir_cur%\xdm_*_Java.zip"
if exist "%ehc_testing_my_out_dir_cur%\xdm_nist_Java" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_nist_Java"
if exist "%ehc_testing_my_out_dir_cur%\xdm_nist_Java_prev" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_nist_Java_prev"
if exist "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java"
if exist "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java_prev" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java_prev"
rmdir /s /q %ehc_testing_my_out_dir_cur%\demoxua-out
if "%1"=="" rmdir /s /q %ehc_testing_my_out_dir_cur%\demoxua-out
SET ehc_testing_my_out_file=DemoXua_IdPAuthenticationRequestbyHTTPPOSTandcustomprotocolhandler_Java.txt
set EHC_COMMAND=java -Dehc_testing_my_logPath=%ehc_testing_my_log_dir:\=/% -Dlog4j.configuration=%ehc_testing_my_scriptBase%\testing\rsc\log4jConfigs\log4j.xml -jar %ehc_testing_my_eHCDemoJar% DemoXUA --IdpProtoSoe -y=ehcdemo -o=%ehc_testing_my_out_dir_cur%\demoxua-out\idp
call %ehc_testing_my_doOneComand% %ehc_testing_my_logBehavior% "%ehc_testing_my_logfile%" "%ehc_testing_my_out_dir_cur%\%ehc_testing_my_out_file%"
......
......@@ -32,13 +32,8 @@ echo ehc_testing_my_out_dir_prev=%ehc_testing_my_out_dir_prev%
echo ================================================== >> %ehc_testing_my_logfile%
SET eHCTempPath=%ehc_testing_my_out_dir_cur%
if exist "%ehc_testing_my_out_dir_cur%\xdm_*_Java.zip" DEL "%ehc_testing_my_out_dir_cur%\xdm_*_Java.zip"
if exist "%ehc_testing_my_out_dir_cur%\xdm_nist_Java" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_nist_Java"
if exist "%ehc_testing_my_out_dir_cur%\xdm_nist_Java_prev" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_nist_Java_prev"
if exist "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java"
if exist "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java_prev" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java_prev"
rmdir /s /q %ehc_testing_my_out_dir_cur%\demoxua-out
if "%1"=="" rmdir /s /q %ehc_testing_my_out_dir_cur%\demoxua-out
SET ehc_testing_my_out_file=DemoXua_IdPAuthenticationRequestbySOAPtoeHealthSuisseIdPsimulator_Java.txt
set EHC_COMMAND=java -Dehc_testing_my_logPath=%ehc_testing_my_log_dir:\=/% -Dlog4j.configuration=%ehc_testing_my_scriptBase%\testing\rsc\log4jConfigs\log4j.xml -jar %ehc_testing_my_eHCDemoJar% DemoXUA --IdpSoapEhs -u=aamrein -p=azerty -o=%ehc_testing_my_out_dir_cur%\demoxua-out\idp
call %ehc_testing_my_doOneComand% %ehc_testing_my_logBehavior% "%ehc_testing_my_logfile%" "%ehc_testing_my_out_dir_cur%\%ehc_testing_my_out_file%"
......
......@@ -32,13 +32,8 @@ echo ehc_testing_my_out_dir_prev=%ehc_testing_my_out_dir_prev%
echo ================================================== >> %ehc_testing_my_logfile%
SET eHCTempPath=%ehc_testing_my_out_dir_cur%
if exist "%ehc_testing_my_out_dir_cur%\xdm_*_Java.zip" DEL "%ehc_testing_my_out_dir_cur%\xdm_*_Java.zip"
if exist "%ehc_testing_my_out_dir_cur%\xdm_nist_Java" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_nist_Java"
if exist "%ehc_testing_my_out_dir_cur%\xdm_nist_Java_prev" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_nist_Java_prev"
if exist "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java"
if exist "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java_prev" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java_prev"
rmdir /s /q %ehc_testing_my_out_dir_cur%\demoxua-out
if "%1"=="" rmdir /s /q %ehc_testing_my_out_dir_cur%\demoxua-out
SET ehc_testing_my_out_file=DemoXua_PrivacyPolicyFeedAdd_Java.txt
set EHC_COMMAND=java -Dehc_testing_my_logPath=%ehc_testing_my_log_dir:\=/% -Dlog4j.configuration=%ehc_testing_my_scriptBase%\testing\rsc\log4jConfigs\log4j.xml -jar %ehc_testing_my_eHCDemoJar% DemoXUA --ChPpqEhs -m=add -n=rsc/demoXua/ppf/ehs_addpolicy.xml -i=rsc/demoXua/ppq/ehs_ppqrequest_input.xml -o=%ehc_testing_my_out_dir_cur%\demoxua-out\ppf
call %ehc_testing_my_doOneComand% %ehc_testing_my_logBehavior% "%ehc_testing_my_logfile%" "%ehc_testing_my_out_dir_cur%\%ehc_testing_my_out_file%"
......
......@@ -32,11 +32,6 @@ echo ehc_testing_my_out_dir_prev=%ehc_testing_my_out_dir_prev%
echo ================================================== >> %ehc_testing_my_logfile%
SET eHCTempPath=%ehc_testing_my_out_dir_cur%
if exist "%ehc_testing_my_out_dir_cur%\xdm_*_Java.zip" DEL "%ehc_testing_my_out_dir_cur%\xdm_*_Java.zip"
if exist "%ehc_testing_my_out_dir_cur%\xdm_nist_Java" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_nist_Java"
if exist "%ehc_testing_my_out_dir_cur%\xdm_nist_Java_prev" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_nist_Java_prev"
if exist "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java"
if exist "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java_prev" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java_prev"
SET ehc_testing_my_out_file=DemoXua_PrivacyPolicyFeedDelete_Java.txt
set EHC_COMMAND=java -Dehc_testing_my_logPath=%ehc_testing_my_log_dir:\=/% -Dlog4j.configuration=%ehc_testing_my_scriptBase%\testing\rsc\log4jConfigs\log4j.xml -jar %ehc_testing_my_eHCDemoJar% DemoXUA --ChPpqEhs -m=delete -n=rsc/demoXua/ppf/ppf_deletepolicy.xml -i=rsc/demoXua/ppq/ehs_ppqrequest_input.xml -o=%ehc_testing_my_out_dir_cur%\demoxua-out\ppf
call %ehc_testing_my_doOneComand% %ehc_testing_my_logBehavior% "%ehc_testing_my_logfile%" "%ehc_testing_my_out_dir_cur%\%ehc_testing_my_out_file%"
......
......@@ -32,11 +32,6 @@ echo ehc_testing_my_out_dir_prev=%ehc_testing_my_out_dir_prev%
echo ================================================== >> %ehc_testing_my_logfile%
SET eHCTempPath=%ehc_testing_my_out_dir_cur%
if exist "%ehc_testing_my_out_dir_cur%\xdm_*_Java.zip" DEL "%ehc_testing_my_out_dir_cur%\xdm_*_Java.zip"
if exist "%ehc_testing_my_out_dir_cur%\xdm_nist_Java" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_nist_Java"
if exist "%ehc_testing_my_out_dir_cur%\xdm_nist_Java_prev" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_nist_Java_prev"
if exist "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java"
if exist "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java_prev" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java_prev"
SET ehc_testing_my_out_file=DemoXua_PrivacyPolicyFeedUpdate_Java.txt
set EHC_COMMAND=java -Dehc_testing_my_logPath=%ehc_testing_my_log_dir:\=/% -Dlog4j.configuration=%ehc_testing_my_scriptBase%\testing\rsc\log4jConfigs\log4j.xml -jar %ehc_testing_my_eHCDemoJar% DemoXUA --ChPpqEhs -m=update -n=rsc/demoXua/ppf/ppf_updatepolicy.xml -i=rsc/demoXua/ppq/ehs_ppqrequest_input.xml -o=%ehc_testing_my_out_dir_cur%\demoxua-out\ppf
call %ehc_testing_my_doOneComand% %ehc_testing_my_logBehavior% "%ehc_testing_my_logfile%" "%ehc_testing_my_out_dir_cur%\%ehc_testing_my_out_file%"
......
......@@ -32,13 +32,8 @@ echo ehc_testing_my_out_dir_prev=%ehc_testing_my_out_dir_prev%
echo ================================================== >> %ehc_testing_my_logfile%
SET eHCTempPath=%ehc_testing_my_out_dir_cur%
if exist "%ehc_testing_my_out_dir_cur%\xdm_*_Java.zip" DEL "%ehc_testing_my_out_dir_cur%\xdm_*_Java.zip"
if exist "%ehc_testing_my_out_dir_cur%\xdm_nist_Java" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_nist_Java"
if exist "%ehc_testing_my_out_dir_cur%\xdm_nist_Java_prev" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_nist_Java_prev"
if exist "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java"
if exist "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java_prev" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java_prev"
rmdir /s /q %ehc_testing_my_out_dir_cur%\demoxua-out
if "%1"=="" rmdir /s /q %ehc_testing_my_out_dir_cur%\demoxua-out
SET ehc_testing_my_out_file=DemoXua_PrivacyPolicyQuery_Java.txt
set EHC_COMMAND=java -Dehc_testing_my_logPath=%ehc_testing_my_log_dir:\=/% -Dlog4j.configuration=%ehc_testing_my_scriptBase%\testing\rsc\log4jConfigs\log4j.xml -jar %ehc_testing_my_eHCDemoJar% DemoXUA --ChPpqEhs -m=query -i=rsc/demoXua/ppq/ehs_ppqrequest_input.xml -o=%ehc_testing_my_out_dir_cur%\demoxua-out\ppq
call %ehc_testing_my_doOneComand% %ehc_testing_my_logBehavior% "%ehc_testing_my_logfile%" "%ehc_testing_my_out_dir_cur%\%ehc_testing_my_out_file%"
......
......@@ -32,13 +32,8 @@ echo ehc_testing_my_out_dir_prev=%ehc_testing_my_out_dir_prev%
echo ================================================== >> %ehc_testing_my_logfile%
SET eHCTempPath=%ehc_testing_my_out_dir_cur%
if exist "%ehc_testing_my_out_dir_cur%\xdm_*_Java.zip" DEL "%ehc_testing_my_out_dir_cur%\xdm_*_Java.zip"
if exist "%ehc_testing_my_out_dir_cur%\xdm_nist_Java" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_nist_Java"
if exist "%ehc_testing_my_out_dir_cur%\xdm_nist_Java_prev" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_nist_Java_prev"
if exist "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java"
if exist "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java_prev" rmdir /S /Q "%ehc_testing_my_out_dir_cur%\xdm_swiss_Java_prev"
rmdir /s /q %ehc_testing_my_out_dir_cur%\demoxua-out
if "%1"=="" rmdir /s /q %ehc_testing_my_out_dir_cur%\demoxua-out
SET ehc_testing_my_out_file=DemoXua_XUserAssertionRequest_Java.txt
set EHC_COMMAND=java -Dehc_testing_my_logPath=%ehc_testing_my_log_dir:\=/% -Dlog4j.configuration=%ehc_testing_my_scriptBase%\testing\rsc\log4jConfigs\log4j.xml -jar %ehc_testing_my_eHCDemoJar% DemoXUA --XapEhs -i=rsc/demoXua/xap/ehs_xaprequest_input.xml -o=%ehc_testing_my_out_dir_cur%\demoxua-out\xap
call %ehc_testing_my_doOneComand% %ehc_testing_my_logBehavior% "%ehc_testing_my_logfile%" "%ehc_testing_my_out_dir_cur%\%ehc_testing_my_out_file%"
......
......@@ -30,6 +30,7 @@ rem Communication Tests
rem . XUA with HIN runs first because a user action is required
rem - source must run before consumer!
rem ===============================
rmdir /s /q %ehc_testing_my_out_dir_cur%\demoxua-out
call doallCommunication.cmd %ehc_testing_log_dir%
rem ===============================
......
......@@ -34,6 +34,7 @@ rem Communication Tests
rem . XUA with HIN runs first because a user action is required
rem - source must run before consumer!
rem ===============================
if "%1"=="" rmdir /s /q %ehc_testing_my_out_dir_cur%\demoxua-out
call communication\DemoXua_IdPAuthenticationRequestbyHTTPPOSTandHINClient.cmd %ehc_testing_eHCDemoJar% %ehc_testing_my_log_dir% %ehc_testing_eHCRscDir%
call communication\DemoXua_Help.cmd %ehc_testing_eHCDemoJar% %ehc_testing_my_log_dir% %ehc_testing_eHCRscDir%
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment