From 03dac255acd2b9fe951aa5b6f7ee68d2fdafa021 Mon Sep 17 00:00:00 2001
From: John Chapman <jchapman@cern.ch>
Date: Wed, 12 Aug 2020 00:45:05 +0200
Subject: [PATCH] Migrate EventBookkeeperAthenaPool TPCnv unit tests to
ComponentAccumulator EventBookkeeperTPCnv_16.0.0_test - passes
EventBookkeeperTPCnv_18.0.0_test - passes
---
.../EventBookkeeperAthenaPool/CMakeLists.txt | 5 +++--
.../test/EventBookkeeperTPCnv_16.0.0_test.py | 21 +++++++++++++++++++
.../test/EventBookkeeperTPCnv_18.0.0_test.py | 20 ++++++++++++++++++
3 files changed, 44 insertions(+), 2 deletions(-)
create mode 100755 Event/EventBookkeeperAthenaPool/test/EventBookkeeperTPCnv_16.0.0_test.py
create mode 100755 Event/EventBookkeeperAthenaPool/test/EventBookkeeperTPCnv_18.0.0_test.py
diff --git a/Event/EventBookkeeperAthenaPool/CMakeLists.txt b/Event/EventBookkeeperAthenaPool/CMakeLists.txt
index 33252f7aac2..dc5ccdccfaa 100644
--- a/Event/EventBookkeeperAthenaPool/CMakeLists.txt
+++ b/Event/EventBookkeeperAthenaPool/CMakeLists.txt
@@ -15,6 +15,7 @@ atlas_add_poolcnv_library( EventBookkeeperAthenaPoolPoolCnv
# Install files from the package:
atlas_install_joboptions( share/*.py )
+atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
find_package( AthenaPoolUtilitiesTest )
@@ -22,9 +23,9 @@ find_package( AthenaPoolUtilitiesTest )
if( ATHENAPOOLUTILITIESTEST_FOUND AND NOT GENERATIONBASE )
set( EVENTBOOKKEEPERATHENAPOOL_REFERENCE_TAG
EventBookkeeperAthenaPoolReference-01-00-00 )
- run_tpcnv_legacy_test( EventBookkeeperTPCnv_16.0.0 AOD-16.0.0-full
+ run_tpcnv_test( EventBookkeeperTPCnv_16.0.0 AOD-16.0.0-full
REFERENCE_TAG ${EVENTBOOKKEEPERATHENAPOOL_REFERENCE_TAG} )
- run_tpcnv_legacy_test( EventBookkeeperTPCnv_18.0.0 AOD-18.0.0-full
+ run_tpcnv_test( EventBookkeeperTPCnv_18.0.0 AOD-18.0.0-full
REFERENCE_TAG ${EVENTBOOKKEEPERATHENAPOOL_REFERENCE_TAG} )
elseif( NOT ATHENAPOOLUTILITIESTEST_FOUND )
message( WARNING
diff --git a/Event/EventBookkeeperAthenaPool/test/EventBookkeeperTPCnv_16.0.0_test.py b/Event/EventBookkeeperAthenaPool/test/EventBookkeeperTPCnv_16.0.0_test.py
new file mode 100755
index 00000000000..1f1bb17c6a2
--- /dev/null
+++ b/Event/EventBookkeeperAthenaPool/test/EventBookkeeperTPCnv_16.0.0_test.py
@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+"""
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""
+
+from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
+
+if __name__ == "__main__":
+ infile = 'aod/AOD-16.0.0/AOD-16.0.0-full.pool.root'
+ keys = [
+ #EventBookkeeperCollection_p1
+ 'InputMetaDataStore/EventBookkeepers@4',
+ 'InputMetaDataStore/EventSelector.Counter',
+
+ #SkimDecisionCollection_p1
+ 'StreamAOD_SkimDecisionsContainer',
+ 'StreamESD_SkimDecisionsContainer',
+ ]
+
+ TPCnvTest(infile, keys, useIOVDbSvc=True)
+
diff --git a/Event/EventBookkeeperAthenaPool/test/EventBookkeeperTPCnv_18.0.0_test.py b/Event/EventBookkeeperAthenaPool/test/EventBookkeeperTPCnv_18.0.0_test.py
new file mode 100755
index 00000000000..57bec474576
--- /dev/null
+++ b/Event/EventBookkeeperAthenaPool/test/EventBookkeeperTPCnv_18.0.0_test.py
@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+"""
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""
+
+from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
+
+if __name__ == "__main__":
+ infile = 'aod/AOD-18.0.0/AOD-18.0.0-full.pool.root'
+ keys = [
+ #EventBookkeeperCollection_p2
+ 'InputMetaDataStore/IncompleteEventBookkeepers',
+ 'InputMetaDataStore/EventBookkeepers@4',
+
+ #SkimDecisionCollection_p1
+ 'StreamESD_SkimDecisionsContainer',
+ ]
+
+ TPCnvTest(infile, keys, useIOVDbSvc=True)
+
--
GitLab