From e5aec88bbfdf59a47d6b75c9611c919eae4016c1 Mon Sep 17 00:00:00 2001
From: Shahzad Malik Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Wed, 22 Mar 2023 18:13:57 +0100
Subject: [PATCH] [RECONSTRUCTION] Various fixes/improvements for unit test

---
 JetMETCorrections/Type1MET/test/BuildFile.xml        |  5 +----
 JetMETCorrections/Type1MET/test/TestDriver.cpp       |  6 ------
 JetMETCorrections/Type1MET/test/runtests.sh          |  4 ++--
 RecoEgamma/ElectronIdentification/test/BuildFile.xml |  8 +-------
 .../test/runtestRecoEgammaElectronIdentification.cpp |  3 ---
 RecoEgamma/ElectronIdentification/test/runtests.sh   |  4 ++--
 RecoEgamma/PhotonIdentification/test/BuildFile.xml   |  8 +-------
 .../test/runtestRecoEgammaPhotonIdentification.cpp   |  3 ---
 RecoEgamma/PhotonIdentification/test/runtests.sh     |  4 ++--
 RecoLuminosity/LumiProducer/test/BuildFile.xml       |  6 ++----
 RecoLuminosity/LumiProducer/test/TestIntegration.cpp |  3 ---
 RecoLuminosity/LumiProducer/test/run_lumiProd.sh     |  8 +-------
 RecoMET/METProducers/test/BuildFile.xml              |  5 +----
 RecoMET/METProducers/test/TestDriver.cpp             |  6 ------
 RecoMET/METProducers/test/runtests.sh                | 12 ++++++------
 RecoTauTag/RecoTau/test/BuildFile.xml                |  8 +-------
 RecoTauTag/RecoTau/test/runtestRecoTauTagRecoTau.cpp |  3 ---
 RecoTauTag/RecoTau/test/runtests.sh                  |  6 +++---
 18 files changed, 23 insertions(+), 79 deletions(-)
 delete mode 100644 JetMETCorrections/Type1MET/test/TestDriver.cpp
 delete mode 100644 RecoEgamma/ElectronIdentification/test/runtestRecoEgammaElectronIdentification.cpp
 delete mode 100644 RecoEgamma/PhotonIdentification/test/runtestRecoEgammaPhotonIdentification.cpp
 delete mode 100755 RecoLuminosity/LumiProducer/test/TestIntegration.cpp
 delete mode 100644 RecoMET/METProducers/test/TestDriver.cpp
 delete mode 100644 RecoTauTag/RecoTau/test/runtestRecoTauTagRecoTau.cpp

diff --git a/JetMETCorrections/Type1MET/test/BuildFile.xml b/JetMETCorrections/Type1MET/test/BuildFile.xml
index 3fe9940065dcc..3e91ecd2ae28a 100644
--- a/JetMETCorrections/Type1MET/test/BuildFile.xml
+++ b/JetMETCorrections/Type1MET/test/BuildFile.xml
@@ -1,4 +1 @@
-<bin name="testJetMETCorrectionsType1MET" file="TestDriver.cpp">
-  <flags TEST_RUNNER_ARGS=" /bin/bash JetMETCorrections/Type1MET/test runtests.sh"/>
-  <use name="FWCore/Utilities"/>
-</bin>
+<test name="testJetMETCorrectionsType1MET" command="runtests.sh"/>
diff --git a/JetMETCorrections/Type1MET/test/TestDriver.cpp b/JetMETCorrections/Type1MET/test/TestDriver.cpp
deleted file mode 100644
index 3738a595bc8a4..0000000000000
--- a/JetMETCorrections/Type1MET/test/TestDriver.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "FWCore/Utilities/interface/TestHelper.h"
-
-//____________________________________________________________________________||
-RUNTEST()
-
-//____________________________________________________________________________||
diff --git a/JetMETCorrections/Type1MET/test/runtests.sh b/JetMETCorrections/Type1MET/test/runtests.sh
index c39a182b9b324..9d651ba90fb37 100755
--- a/JetMETCorrections/Type1MET/test/runtests.sh
+++ b/JetMETCorrections/Type1MET/test/runtests.sh
@@ -4,5 +4,5 @@
 function die { echo $1: status $2 ;  exit $2; }
 
 ##____________________________________________________________________________||
-cmsRun ${LOCAL_TEST_DIR}/corrMET_pfMet_cfg.py || die 'Failure using corrMET_pfMet_cfg.py' $?
-cmsRun ${LOCAL_TEST_DIR}/corrMET_caloMet_cfg.py || die 'Failure using corrMET_caloMet_cfg.py' $?
+cmsRun ${SCRAM_TEST_PATH}/corrMET_pfMet_cfg.py || die 'Failure using corrMET_pfMet_cfg.py' $?
+cmsRun ${SCRAM_TEST_PATH}/corrMET_caloMet_cfg.py || die 'Failure using corrMET_caloMet_cfg.py' $?
diff --git a/RecoEgamma/ElectronIdentification/test/BuildFile.xml b/RecoEgamma/ElectronIdentification/test/BuildFile.xml
index 7fe80d3dff6a6..9db27b1eeeb87 100644
--- a/RecoEgamma/ElectronIdentification/test/BuildFile.xml
+++ b/RecoEgamma/ElectronIdentification/test/BuildFile.xml
@@ -8,10 +8,4 @@
   <flags EDM_PLUGIN="1"/>
 </library>
 
-<environment>
-  <bin file="runtestRecoEgammaElectronIdentification.cpp">
-    <flags TEST_RUNNER_ARGS=" /bin/bash RecoEgamma/ElectronIdentification/test runtests.sh"/>
-    <use name="FWCore/Utilities"/>
-  </bin>
-
-</environment>
+<test name="runtestRecoEgammaElectronIdentification" command="runtests.sh"/>
diff --git a/RecoEgamma/ElectronIdentification/test/runtestRecoEgammaElectronIdentification.cpp b/RecoEgamma/ElectronIdentification/test/runtestRecoEgammaElectronIdentification.cpp
deleted file mode 100644
index b2991bd18ae57..0000000000000
--- a/RecoEgamma/ElectronIdentification/test/runtestRecoEgammaElectronIdentification.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "FWCore/Utilities/interface/TestHelper.h"
-
-RUNTEST()
diff --git a/RecoEgamma/ElectronIdentification/test/runtests.sh b/RecoEgamma/ElectronIdentification/test/runtests.sh
index 03f762544ce37..e975002b2a203 100755
--- a/RecoEgamma/ElectronIdentification/test/runtests.sh
+++ b/RecoEgamma/ElectronIdentification/test/runtests.sh
@@ -22,6 +22,6 @@ ids_to_test=(
 
 for id_set in "${ids_to_test[@]}"; do
     echo Checking: $id_set
-    cmsRun ${LOCAL_TEST_DIR}/runElectron_VID.py 1 $id_set || die "Failure using runElectron_VID.py on AOD $id_set" $?
-    cmsRun ${LOCAL_TEST_DIR}/runElectron_VID.py 0 $id_set || die "Failure using runElectron_VID.py on MiniAOD $id_set" $?
+    cmsRun ${SCRAM_TEST_PATH}/runElectron_VID.py 1 $id_set || die "Failure using runElectron_VID.py on AOD $id_set" $?
+    cmsRun ${SCRAM_TEST_PATH}/runElectron_VID.py 0 $id_set || die "Failure using runElectron_VID.py on MiniAOD $id_set" $?
 done
diff --git a/RecoEgamma/PhotonIdentification/test/BuildFile.xml b/RecoEgamma/PhotonIdentification/test/BuildFile.xml
index eb024edc388f2..df254ad1c764c 100644
--- a/RecoEgamma/PhotonIdentification/test/BuildFile.xml
+++ b/RecoEgamma/PhotonIdentification/test/BuildFile.xml
@@ -1,7 +1 @@
-<environment>
-  <bin file="runtestRecoEgammaPhotonIdentification.cpp">
-    <flags TEST_RUNNER_ARGS=" /bin/bash RecoEgamma/PhotonIdentification/test runtests.sh"/>
-    <use name="FWCore/Utilities"/>
-  </bin>
-
-</environment>
+<test name="runtestRecoEgammaPhotonIdentification" command="runtests.sh"/>
diff --git a/RecoEgamma/PhotonIdentification/test/runtestRecoEgammaPhotonIdentification.cpp b/RecoEgamma/PhotonIdentification/test/runtestRecoEgammaPhotonIdentification.cpp
deleted file mode 100644
index b2991bd18ae57..0000000000000
--- a/RecoEgamma/PhotonIdentification/test/runtestRecoEgammaPhotonIdentification.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "FWCore/Utilities/interface/TestHelper.h"
-
-RUNTEST()
diff --git a/RecoEgamma/PhotonIdentification/test/runtests.sh b/RecoEgamma/PhotonIdentification/test/runtests.sh
index 3d292f026f7ba..4122945b9d596 100755
--- a/RecoEgamma/PhotonIdentification/test/runtests.sh
+++ b/RecoEgamma/PhotonIdentification/test/runtests.sh
@@ -14,6 +14,6 @@ ids_to_test=(
 
 for id_set in "${ids_to_test[@]}"; do
     echo Checking: $id_set
-    cmsRun ${LOCAL_TEST_DIR}/runPhoton_VID.py 1 $id_set || die "Failure using runPhoton_VID.py on AOD $id_set" $?
-    cmsRun ${LOCAL_TEST_DIR}/runPhoton_VID.py 0 $id_set || die "Failure using runPhoton_VID.py on MiniAOD $id_set" $?
+    cmsRun ${SCRAM_TEST_PATH}/runPhoton_VID.py 1 $id_set || die "Failure using runPhoton_VID.py on AOD $id_set" $?
+    cmsRun ${SCRAM_TEST_PATH}/runPhoton_VID.py 0 $id_set || die "Failure using runPhoton_VID.py on MiniAOD $id_set" $?
 done
diff --git a/RecoLuminosity/LumiProducer/test/BuildFile.xml b/RecoLuminosity/LumiProducer/test/BuildFile.xml
index 9796ac1527dbf..864ef7a0fe74f 100644
--- a/RecoLuminosity/LumiProducer/test/BuildFile.xml
+++ b/RecoLuminosity/LumiProducer/test/BuildFile.xml
@@ -15,11 +15,9 @@
   <flags EDM_PLUGIN="1"/>
 </library>
 
-<bin file="TestIntegration.cpp" name="TestLumiProd">
+<test name="TestLumiProd" command="run_lumiProd.sh">
   <flags NO_TESTRUN="1"/>
-  <flags TEST_RUNNER_ARGS=" /bin/bash RecoLuminosity/LumiProducer/test run_lumiProd.sh"/>
-  <use name="FWCore/Utilities"/>
-</bin>
+</test>
 
 <bin file="testWrite2LumiDB.cpp" name="testWrite2LumiDB">
   <flags NO_TESTRUN="1"/>
diff --git a/RecoLuminosity/LumiProducer/test/TestIntegration.cpp b/RecoLuminosity/LumiProducer/test/TestIntegration.cpp
deleted file mode 100755
index b2991bd18ae57..0000000000000
--- a/RecoLuminosity/LumiProducer/test/TestIntegration.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "FWCore/Utilities/interface/TestHelper.h"
-
-RUNTEST()
diff --git a/RecoLuminosity/LumiProducer/test/run_lumiProd.sh b/RecoLuminosity/LumiProducer/test/run_lumiProd.sh
index 404401d09e20f..2cae4a38aa39f 100755
--- a/RecoLuminosity/LumiProducer/test/run_lumiProd.sh
+++ b/RecoLuminosity/LumiProducer/test/run_lumiProd.sh
@@ -2,10 +2,4 @@
 
 function die { echo Failure $1: status $2 ; exit $2 ; }
 
-pushd ${LOCAL_TMP_DIR}
-
-  cmsRun -p ${LOCAL_TEST_DIR}/testLumiProd_cfg.py || die "cmsRun testLumiProd_cfg.py" $?
-
-popd
-
-exit 0
+cmsRun -p ${SCRAM_TEST_PATH}/testLumiProd_cfg.py || die "cmsRun testLumiProd_cfg.py" $?
diff --git a/RecoMET/METProducers/test/BuildFile.xml b/RecoMET/METProducers/test/BuildFile.xml
index d1abf8a52df32..54168c1639330 100644
--- a/RecoMET/METProducers/test/BuildFile.xml
+++ b/RecoMET/METProducers/test/BuildFile.xml
@@ -1,4 +1 @@
-<bin name="testRecoMETMETProducers" file="TestDriver.cpp">
-  <flags TEST_RUNNER_ARGS=" /bin/bash RecoMET/METProducers/test runtests.sh"/>
-  <use name="FWCore/Utilities"/>
-</bin>
+<test name="testRecoMETMETProducers" command="runtests.sh"/>
diff --git a/RecoMET/METProducers/test/TestDriver.cpp b/RecoMET/METProducers/test/TestDriver.cpp
deleted file mode 100644
index 3738a595bc8a4..0000000000000
--- a/RecoMET/METProducers/test/TestDriver.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "FWCore/Utilities/interface/TestHelper.h"
-
-//____________________________________________________________________________||
-RUNTEST()
-
-//____________________________________________________________________________||
diff --git a/RecoMET/METProducers/test/runtests.sh b/RecoMET/METProducers/test/runtests.sh
index f66a8e463799f..80fddf53acad6 100755
--- a/RecoMET/METProducers/test/runtests.sh
+++ b/RecoMET/METProducers/test/runtests.sh
@@ -8,9 +8,9 @@ function die { echo $1: status $2 ;  exit $2; }
 # temporary: produce fastsim sample on the fly
 # can be removed as soon as relval samples are available with the new fastsim rechits
 cmsDriver.py TTbar_13TeV_TuneCUETP8M1_cfi  --conditions auto:run2_mc --fast  -n 1 --eventcontent FEVTDEBUGHLT -s GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,L1Reco,RECO --beamspot NominalCollision2015 --era Run2_2016 --fileout ttbarForMetTests.root || die 'Failure running cmsDriver' $?
-cmsRun ${LOCAL_TEST_DIR}/recoMET_pfMet_cfg.py || die 'Failure using recoMET_pfMet_cfg.py' $?
-cmsRun ${LOCAL_TEST_DIR}/recoMET_caloMet_cfg.py || die 'Failure using recoMET_caloMet_cfg.py' $?
-cmsRun ${LOCAL_TEST_DIR}/recoMET_tcMet_cfg.py || die 'Failure using recoMET_tcMet_cfg.py' $?
-cmsRun ${LOCAL_TEST_DIR}/recoMET_genMet_cfg.py || die 'Failure using recoMET_genMet_cfg.py' $?
-cmsRun ${LOCAL_TEST_DIR}/recoMET_pfChMet_cfg.py || die 'Failure using recoMET_pfChMet_cfg.py' $?
-cmsRun ${LOCAL_TEST_DIR}/recoMET_pfClusterMet_cfg.py || die 'Failure using recoMET_pfClusterMet_cfg.py' $?
+cmsRun ${SCRAM_TEST_PATH}/recoMET_pfMet_cfg.py || die 'Failure using recoMET_pfMet_cfg.py' $?
+cmsRun ${SCRAM_TEST_PATH}/recoMET_caloMet_cfg.py || die 'Failure using recoMET_caloMet_cfg.py' $?
+cmsRun ${SCRAM_TEST_PATH}/recoMET_tcMet_cfg.py || die 'Failure using recoMET_tcMet_cfg.py' $?
+cmsRun ${SCRAM_TEST_PATH}/recoMET_genMet_cfg.py || die 'Failure using recoMET_genMet_cfg.py' $?
+cmsRun ${SCRAM_TEST_PATH}/recoMET_pfChMet_cfg.py || die 'Failure using recoMET_pfChMet_cfg.py' $?
+cmsRun ${SCRAM_TEST_PATH}/recoMET_pfClusterMet_cfg.py || die 'Failure using recoMET_pfClusterMet_cfg.py' $?
diff --git a/RecoTauTag/RecoTau/test/BuildFile.xml b/RecoTauTag/RecoTau/test/BuildFile.xml
index c1d7b812cc02a..88d280bac5534 100644
--- a/RecoTauTag/RecoTau/test/BuildFile.xml
+++ b/RecoTauTag/RecoTau/test/BuildFile.xml
@@ -29,10 +29,4 @@
   <flags EDM_PLUGIN="1"/>
 </library>
 
-<environment>
-  <bin file="runtestRecoTauTagRecoTau.cpp">
-    <flags TEST_RUNNER_ARGS=" /bin/bash RecoTauTag/RecoTau/test runtests.sh"/>
-    <use name="FWCore/Utilities"/>
-  </bin>
-
-</environment>
+<test name="runtestRecoTauTagRecoTau" command="runtests.sh"/>
diff --git a/RecoTauTag/RecoTau/test/runtestRecoTauTagRecoTau.cpp b/RecoTauTag/RecoTau/test/runtestRecoTauTagRecoTau.cpp
deleted file mode 100644
index b2991bd18ae57..0000000000000
--- a/RecoTauTag/RecoTau/test/runtestRecoTauTagRecoTau.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "FWCore/Utilities/interface/TestHelper.h"
-
-RUNTEST()
diff --git a/RecoTauTag/RecoTau/test/runtests.sh b/RecoTauTag/RecoTau/test/runtests.sh
index f8d6f925486be..8172bea2fdd07 100755
--- a/RecoTauTag/RecoTau/test/runtests.sh
+++ b/RecoTauTag/RecoTau/test/runtests.sh
@@ -2,6 +2,6 @@
 
 function die { echo $1: status $2 ;  exit $2; }
 
-cmsRun ${LOCAL_TEST_DIR}/rerunTauRecoOnMiniAOD.py || die 'Failure using rerunTauRecoOnMiniAOD.py' $?
-cmsRun ${LOCAL_TEST_DIR}/runDeepTauIDsOnMiniAOD.py || die 'Failure using runDeepTauIDsOnMiniAOD.py' $?
-cmsRun ${LOCAL_TEST_DIR}/rerunMVAIsolationOnMiniAOD_Phase2.py || die 'Failure using rerunMVAIsolationOnMiniAOD_Phase2.py' $?
+cmsRun ${SCRAM_TEST_PATH}/rerunTauRecoOnMiniAOD.py || die 'Failure using rerunTauRecoOnMiniAOD.py' $?
+cmsRun ${SCRAM_TEST_PATH}/runDeepTauIDsOnMiniAOD.py || die 'Failure using runDeepTauIDsOnMiniAOD.py' $?
+cmsRun ${SCRAM_TEST_PATH}/rerunMVAIsolationOnMiniAOD_Phase2.py || die 'Failure using rerunMVAIsolationOnMiniAOD_Phase2.py' $?