From 34d703ea0dd60d84bff4be34ada6999cd2893d25 Mon Sep 17 00:00:00 2001
From: Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
Date: Thu, 30 Jan 2020 12:40:52 +0100
Subject: [PATCH] Updated xAODEventInfo to unit-test the latest version of
xAOD::EventAuxInfo.
Instead of setting up unit tests separately for each version of the
classes, it seems a lot more meaningful to test only the latest
version.
Didn't touch the unit tests of the other types yet though...
---
Event/xAOD/xAODEventInfo/CMakeLists.txt | 4 ++--
.../share/ut_xaodeventinfo_eventauxinfo_test.ref | 2 ++
.../share/ut_xaodeventinfo_eventauxinfo_v1_test.ref | 2 --
...st.cxx => ut_xaodeventinfo_eventauxinfo_test.cxx} | 12 ++++++------
4 files changed, 10 insertions(+), 10 deletions(-)
create mode 100644 Event/xAOD/xAODEventInfo/share/ut_xaodeventinfo_eventauxinfo_test.ref
delete mode 100644 Event/xAOD/xAODEventInfo/share/ut_xaodeventinfo_eventauxinfo_v1_test.ref
rename Event/xAOD/xAODEventInfo/test/{ut_xaodeventinfo_eventauxinfo_v1_test.cxx => ut_xaodeventinfo_eventauxinfo_test.cxx} (86%)
diff --git a/Event/xAOD/xAODEventInfo/CMakeLists.txt b/Event/xAOD/xAODEventInfo/CMakeLists.txt
index 8dddfcc70392..fec4b88e6f3a 100644
--- a/Event/xAOD/xAODEventInfo/CMakeLists.txt
+++ b/Event/xAOD/xAODEventInfo/CMakeLists.txt
@@ -45,8 +45,8 @@ atlas_add_test( ut_xaodeventinfo_subevent_test
SOURCES test/ut_xaodeventinfo_subevent_test.cxx
LINK_LIBRARIES AthLinks xAODCore xAODEventInfo )
-atlas_add_test( ut_xaodeventinfo_eventauxinfo_v1_test
- SOURCES test/ut_xaodeventinfo_eventauxinfo_v1_test.cxx
+atlas_add_test( ut_xaodeventinfo_eventauxinfo_test
+ SOURCES test/ut_xaodeventinfo_eventauxinfo_test.cxx
LINK_LIBRARIES AthLinks xAODCore xAODEventInfo )
atlas_add_test( ut_xaodeventinfo_eventinfoauxcontainer_v1_test
diff --git a/Event/xAOD/xAODEventInfo/share/ut_xaodeventinfo_eventauxinfo_test.ref b/Event/xAOD/xAODEventInfo/share/ut_xaodeventinfo_eventauxinfo_test.ref
new file mode 100644
index 000000000000..8a61c65fd039
--- /dev/null
+++ b/Event/xAOD/xAODEventInfo/share/ut_xaodeventinfo_eventauxinfo_test.ref
@@ -0,0 +1,2 @@
+ut_xaodeventinfo_eventauxinfo_test
+test1
diff --git a/Event/xAOD/xAODEventInfo/share/ut_xaodeventinfo_eventauxinfo_v1_test.ref b/Event/xAOD/xAODEventInfo/share/ut_xaodeventinfo_eventauxinfo_v1_test.ref
deleted file mode 100644
index c94516e86fac..000000000000
--- a/Event/xAOD/xAODEventInfo/share/ut_xaodeventinfo_eventauxinfo_v1_test.ref
+++ /dev/null
@@ -1,2 +0,0 @@
-ut_xaodeventinfo_eventauxinfo_v1_test
-test1
diff --git a/Event/xAOD/xAODEventInfo/test/ut_xaodeventinfo_eventauxinfo_v1_test.cxx b/Event/xAOD/xAODEventInfo/test/ut_xaodeventinfo_eventauxinfo_test.cxx
similarity index 86%
rename from Event/xAOD/xAODEventInfo/test/ut_xaodeventinfo_eventauxinfo_v1_test.cxx
rename to Event/xAOD/xAODEventInfo/test/ut_xaodeventinfo_eventauxinfo_test.cxx
index a8bad2a14270..15c65ec6d53a 100644
--- a/Event/xAOD/xAODEventInfo/test/ut_xaodeventinfo_eventauxinfo_v1_test.cxx
+++ b/Event/xAOD/xAODEventInfo/test/ut_xaodeventinfo_eventauxinfo_test.cxx
@@ -1,17 +1,17 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*
*/
/**
- * @file xAODEventInfo/test/ut_xoadeventinfo_eventauxinfo_v1_test.cxx
+ * @file xAODEventInfo/test/ut_xoadeventinfo_eventauxinfo_test.cxx
* @author scott snyder <snyder@bnl.gov>
* @date Apr, 2018
- * @brief Unit tests for EventAuxInfo_v1.
+ * @brief Unit tests for EventAuxInfo.
*/
#undef NDEBUG
-#include "xAODEventInfo/versions/EventAuxInfo_v1.h"
+#include "xAODEventInfo/EventAuxInfo.h"
#include "AthContainers/AuxTypeRegistry.h"
#include "AthContainers/exceptions.h"
#include "TestTools/expect_exception.h"
@@ -24,7 +24,7 @@ void test1()
std::cout << "test1\n";
SG::AuxTypeRegistry& r = SG::AuxTypeRegistry::instance();
- xAOD::EventAuxInfo_v1 eai;
+ xAOD::EventAuxInfo eai;
SG::auxid_t runid = r.findAuxID ("runNumber");
SG::auxid_t pixid = r.findAuxID ("pixelFlags");
@@ -74,7 +74,7 @@ void test1()
int main()
{
- std::cout << "ut_xaodeventinfo_eventauxinfo_v1_test\n";
+ std::cout << "ut_xaodeventinfo_eventauxinfo_test\n";
test1();
return 0;
}
--
GitLab