diff --git a/Control/StoreGate/CMakeLists.txt b/Control/StoreGate/CMakeLists.txt
index 274955820c1224fa702bdcf2e54eb5496e51d413..eeb5cbcf2056caf341e0d4aabc2c9db7cc099de9 100644
--- a/Control/StoreGate/CMakeLists.txt
+++ b/Control/StoreGate/CMakeLists.txt
@@ -40,25 +40,22 @@ atlas_add_library( SGtests test/SGtests.cxx
NO_PUBLIC_HEADERS
LINK_LIBRARIES StoreGateLib TestTools )
-# Declare the package's tests:
+# Declare the package's tests:o
atlas_add_test( ActiveStore_test
SOURCES test/ActiveStore_test.cxx
- LINK_LIBRARIES SGtests
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES SGtests )
set( _hivePatterns "JobOptionsSvc +INFO|StoreGateSvc.*DEBUG|HiveMgrSvc +DEBUG" )
atlas_add_test( SGTiming_test
SOURCES test/SGTiming_test.cxx
LINK_LIBRARIES SGtests
- LOG_IGNORE_PATTERN "${_hivePatterns}|rec:|averages"
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LOG_IGNORE_PATTERN "${_hivePatterns}|rec:|averages" )
atlas_add_test( SGHive_test
SOURCES test/SGHive_test.cxx
LINK_LIBRARIES SGtests
- LOG_IGNORE_PATTERN "${_hivePatterns}"
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LOG_IGNORE_PATTERN "${_hivePatterns}" )
atlas_add_test( DataHandle_test
SOURCES test/DataHandle_test.cxx
@@ -94,13 +91,11 @@ atlas_add_test( VarHandleKey_test
atlas_add_test( VarHandleKeyProperty_test
SOURCES test/VarHandleKeyProperty_test.cxx
- LINK_LIBRARIES SGtests
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES SGtests )
atlas_add_test( VarHandleProperty_test
SOURCES test/VarHandleProperty_test.cxx
- LINK_LIBRARIES SGtests
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES SGtests )
atlas_add_test( ReadHandleKey_test
SOURCES test/ReadHandleKey_test.cxx
@@ -120,9 +115,7 @@ atlas_add_test( TypelessWriteHandleKey_test
atlas_add_test( VarHandleBase_test
SOURCES test/VarHandleBase_test.cxx
- LINK_LIBRARIES SGtests
- LOG_IGNORE_PATTERN "could not get proxy for|try using a ReadHandle"
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES SGtests )
atlas_add_test( VarHandles_test
SOURCES test/VarHandles_test.cxx
@@ -130,23 +123,19 @@ atlas_add_test( VarHandles_test
atlas_add_test( WriteHandle_test
SOURCES test/WriteHandle_test.cxx
- LINK_LIBRARIES SGtests AthContainers
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES SGtests AthContainers )
atlas_add_test( ReadHandle_test
SOURCES test/ReadHandle_test.cxx
- LINK_LIBRARIES SGtests
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES SGtests )
atlas_add_test( UpdateHandle_test
SOURCES test/UpdateHandle_test.cxx
- LINK_LIBRARIES SGtests
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES SGtests )
atlas_add_test( TypelessWriteHandle_test
SOURCES test/TypelessWriteHandle_test.cxx
- LINK_LIBRARIES SGtests AthContainers
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES SGtests AthContainers )
atlas_add_test( DecorKeyHelpers_test
SOURCES test/DecorKeyHelpers_test.cxx
@@ -155,73 +144,59 @@ atlas_add_test( DecorKeyHelpers_test
atlas_add_test( ReadDecorHandleKey_test
SOURCES test/ReadDecorHandleKey_test.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES StoreGateLib TestTools
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES StoreGateLib TestTools )
atlas_add_test( WriteDecorHandleKey_test
SOURCES test/WriteDecorHandleKey_test.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES StoreGateLib TestTools
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES StoreGateLib TestTools )
atlas_add_test( ReadDecorHandle_test
SOURCES test/ReadDecorHandle_test.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES StoreGateLib AthContainers TestTools
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES StoreGateLib AthContainers TestTools )
atlas_add_test( WriteDecorHandle_test
SOURCES test/WriteDecorHandle_test.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES StoreGateLib AthContainers TestTools
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES StoreGateLib AthContainers TestTools )
atlas_add_test( CondHandleKeyArray_test
SOURCES test/CondHandleKeyArray_test.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES StoreGateLib AthContainers TestTools
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES StoreGateLib AthContainers TestTools )
atlas_add_test( WriteCondHandle_test
SOURCES test/WriteCondHandle_test.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES StoreGateLib AthContainers TestTools
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES StoreGateLib AthContainers TestTools )
atlas_add_test( WriteDecorHandleKeyArray_test
SOURCES test/WriteDecorHandleKeyArray_test.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES StoreGateLib TestTools
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES StoreGateLib TestTools )
atlas_add_test( ReadDecorHandleKeyArray_test
SOURCES test/ReadDecorHandleKeyArray_test.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES StoreGateLib TestTools
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES StoreGateLib TestTools )
atlas_add_test( ThinningHandleKey_test
SOURCES test/ThinningHandleKey_test.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES StoreGateLib AthContainers TestTools
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES StoreGateLib AthContainers TestTools )
atlas_add_test( ThinningHandleBase_test
SOURCES test/ThinningHandleBase_test.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES StoreGateLib AthContainers TestTools
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES StoreGateLib AthContainers TestTools )
atlas_add_test( ThinningHandle_test
SOURCES test/ThinningHandle_test.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES StoreGateLib AthContainers TestTools
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES StoreGateLib AthContainers TestTools )
# Install files from the package:
-atlas_install_joboptions( share/StoreGate_jobOptions.txt
- share/StoreGate_jobOptions.py
- share/SGHive_test.txt
- share/SGTiming_test.txt
- share/ActiveStore_test.txt )
+atlas_install_joboptions( share/*.txt
+ share/StoreGate_jobOptions.py )
diff --git a/Control/StoreGate/StoreGate/WriteDecorHandle.h b/Control/StoreGate/StoreGate/WriteDecorHandle.h
index 3c3ca915c6af454a8282f4ea8b5ffaa575ca7656..3d447c95f9861d4c08a3a30e5a79f08f891c5f8d 100644
--- a/Control/StoreGate/StoreGate/WriteDecorHandle.h
+++ b/Control/StoreGate/StoreGate/WriteDecorHandle.h
@@ -235,6 +235,24 @@ private:
virtual void* typeless_dataPointer_impl (bool quiet) override;
+ /**
+ * @brief Test to see if this variable exists in the store,
+ * for the referenced object.
+ * Specialization for the case of a standalone object
+ * (@c T derives from @c SG::AuxElement).
+ */
+ bool isAvailable (std::true_type);
+
+
+ /**
+ * @brief Test to see if this variable exists in the store,
+ * for the referenced object.
+ * Specialization for the case of a container
+ * (@c T does not derive from @c SG::AuxElement).
+ */
+ bool isAvailable (std::false_type);
+
+
/**
* @brief Return the referenced object as a @c SG::AuxVectorData.
* Specialization for the case of a standalone object
@@ -268,6 +286,8 @@ private:
/// Accessor for the aux data item.
accessor_t m_acc;
+
+ bool m_madeAlias;
};
diff --git a/Control/StoreGate/StoreGate/WriteDecorHandle.icc b/Control/StoreGate/StoreGate/WriteDecorHandle.icc
index 409e1ab0bdd8691dea7cd3e54cacf122fbabbde2..61c68ffd4fdc06f68a830f9b3aa1501aa671eb82 100644
--- a/Control/StoreGate/StoreGate/WriteDecorHandle.icc
+++ b/Control/StoreGate/StoreGate/WriteDecorHandle.icc
@@ -26,7 +26,8 @@ template <class T, class D>
WriteDecorHandle<T, D>::WriteDecorHandle (const WriteDecorHandleKey<T>& key)
: Base (key, nullptr),
m_contHandle (key.contHandleKey()),
- m_acc (SG::decorKeyFromKey (key.key()))
+ m_acc (SG::decorKeyFromKey (key.key())),
+ m_madeAlias (false)
{
}
@@ -47,7 +48,8 @@ WriteDecorHandle<T, D>::WriteDecorHandle (const WriteDecorHandleKey<T>& key,
const EventContext& ctx)
: Base (key, &ctx),
m_contHandle (key.contHandleKey(), ctx),
- m_acc (SG::decorKeyFromKey (key.key()))
+ m_acc (SG::decorKeyFromKey (key.key())),
+ m_madeAlias (false)
{
}
@@ -59,7 +61,8 @@ template <class T, class D>
WriteDecorHandle<T, D>::WriteDecorHandle (const WriteDecorHandle& rhs)
: Base (rhs),
m_contHandle (rhs.m_contHandle),
- m_acc (rhs.m_acc)
+ m_acc (rhs.m_acc),
+ m_madeAlias (rhs.m_madeAlias)
{
}
@@ -71,8 +74,10 @@ template <class T, class D>
WriteDecorHandle<T, D>::WriteDecorHandle (WriteDecorHandle&& rhs)
: Base (std::move (rhs)),
m_contHandle (std::move (rhs.m_contHandle)),
- m_acc (std::move (rhs.m_acc))
+ m_acc (std::move (rhs.m_acc)),
+ m_madeAlias (rhs.m_madeAlias)
{
+ rhs.m_madeAlias = false;
}
@@ -83,7 +88,7 @@ template <class T, class D>
WriteDecorHandle<T, D>::~WriteDecorHandle()
{
// Lock the decoration. But don't do anything if we haven't touched it.
- if (this->cachedPtr()) {
+ if (m_madeAlias) {
const IConstAuxStore* store = this->vectorData()->getConstStore();
if (store) {
IConstAuxStore* store_nc ATLAS_THREAD_SAFE = const_cast<IConstAuxStore*> (store);
@@ -103,6 +108,7 @@ WriteDecorHandle<T, D>& WriteDecorHandle<T, D>::operator= (const WriteDecorHandl
*static_cast<Base*>(this) = rhs;
m_acc = rhs.m_acc;
m_contHandle = rhs.m_contHandle;
+ m_madeAlias = rhs.m_madeAlias;
}
return *this;
}
@@ -118,6 +124,8 @@ WriteDecorHandle<T, D>& WriteDecorHandle<T, D>::operator= (WriteDecorHandle&& rh
*static_cast<Base*>(this) = std::move (rhs);
m_acc = std::move (rhs.m_acc);
m_contHandle = std::move (rhs.m_contHandle);
+ m_madeAlias = rhs.m_madeAlias;
+ rhs.m_madeAlias = false;
}
return *this;
}
@@ -150,6 +158,7 @@ bool WriteDecorHandle<T, D>::isPresent() const
template <class T, class D>
StatusCode WriteDecorHandle<T, D>::setProxyDict (IProxyDict* store)
{
+ m_madeAlias = false;
if (m_contHandle.setProxyDict (store).isFailure())
return StatusCode::FAILURE;
return Base::setProxyDict (store);
@@ -201,24 +210,59 @@ WriteDecorHandle<T, D>::getDecorationArray()
/**
* @brief Test to see if this variable exists in the store,
* for the referenced object.
+ * Specialization for the case of a standalone object
+ * (@c T derives from @c SG::AuxElement).
*/
template <class T, class D>
inline
-bool WriteDecorHandle<T, D>::isAvailable()
+bool WriteDecorHandle<T, D>::isAvailable (std::true_type)
{
- const SG::AuxVectorData* obj = static_cast<SG::AuxVectorData*> (this->m_ptr);
- if (!obj) {
- obj = static_cast<SG::AuxVectorData*> (ReadHandle<T>::typeless_dataPointer_impl (true));
+ if (this->m_ptr) {
+ const SG::AuxVectorData* obj = static_cast<const T*>(this->m_ptr)->container();
+ if (obj) {
+ return obj->isAvailable (m_acc.auxid());
+ }
}
- if (obj) {
- return obj->isAvailable (m_acc.auxid());
+ return false;
+}
+
+
+/**
+ * @brief Test to see if this variable exists in the store,
+ * for the referenced object.
+ * Specialization for the case of a container
+ * (@c T does not derive from @c SG::AuxElement).
+ */
+template <class T, class D>
+inline
+bool WriteDecorHandle<T, D>::isAvailable (std::false_type)
+{
+ if (this->m_ptr) {
+ return static_cast<const T*>(this->m_ptr)->isAvailable (m_acc.auxid());
}
return false;
}
+/**
+ * @brief Test to see if this variable exists in the store,
+ * for the referenced object.
+ */
+template <class T, class D>
+inline
+bool WriteDecorHandle<T, D>::isAvailable()
+{
+ if (!this->m_ptr) {
+ ReadHandle<T>::typeless_dataPointer_impl (true);
+ }
+ // We can't just use vectorData() because that will create the decoration
+ // as a side effect.
+ return isAvailable (typename std::is_base_of<SG::AuxElement, T>::type());
+}
+
+
/**
* @brief Return the aux id for this variable.
*/
@@ -239,18 +283,21 @@ SG::auxid_t WriteDecorHandle<T, D>::auxid() const
template <class T, class D>
void* WriteDecorHandle<T, D>::typeless_dataPointer_impl (bool quiet)
{
- if (this->m_ptr)
+ if (this->m_ptr && this->m_madeAlias)
return this->m_ptr;
if (m_contHandle.alias (WriteHandleKey<T> (this->key())).isFailure())
return nullptr;
- void* ptr = ReadHandle<T>::typeless_dataPointer_impl (quiet);
+ if (!this->m_ptr) {
+ ReadHandle<T>::typeless_dataPointer_impl (quiet);
+ }
// Important to call the base class method above before calling vectorData;
// otherwise, we'll get an infinite recursion.
// Also don't call getDecorationArray if the container is empty.
- if (ptr && this->vectorData()->size_v() > 0) {
+ if (this->m_ptr && this->vectorData()->size_v() > 0) {
m_acc.getDecorationArray (*this->vectorData());
}
- return ptr;
+ this->m_madeAlias = true;
+ return this->m_ptr;
}
diff --git a/Control/StoreGate/test/ActiveStore_test.cxx b/Control/StoreGate/test/ActiveStore_test.cxx
index b0be54800403b1d88d07869a55adb7c5627e501f..002d3a7f6f55a8c709662dd3e8ea3b02ca819b8f 100644
--- a/Control/StoreGate/test/ActiveStore_test.cxx
+++ b/Control/StoreGate/test/ActiveStore_test.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/***************************************************************************
@@ -8,9 +8,6 @@
ATLAS Collaboration
***************************************************************************/
-// $Id: ActiveStore_test.cxx 698338 2015-10-03 18:39:22Z ssnyder $
-
-//<<<<<< INCLUDES >>>>>>
#include <string>
#include "TestTools/initGaudi.h"
#include "TestTools/SGassert.h"
@@ -41,7 +38,7 @@ CLASS_DEF(Foo, 8101, 1)
int main() {
cout << "*** ActiveStoreTest BEGINS ***" << endl;
ISvcLocator* pSvcLoc;
- if (!initGaudi("ActiveStore_test.txt", pSvcLoc)) {
+ if (!initGaudi("StoreGate/ActiveStore_test.txt", pSvcLoc)) {
return 1;
}
ActiveStoreSvc* pASS(0);
diff --git a/Control/StoreGate/test/CondHandleKeyArray_test.cxx b/Control/StoreGate/test/CondHandleKeyArray_test.cxx
index 946a9d04e22f315515514a999072434614611a97..80547cba532f075361481ca9c4553248403b9e83 100644
--- a/Control/StoreGate/test/CondHandleKeyArray_test.cxx
+++ b/Control/StoreGate/test/CondHandleKeyArray_test.cxx
@@ -129,7 +129,7 @@ int main()
{
ISvcLocator* svcloc;
//need MessageSvc
- if (!Athena_test::initGaudi("CondHandleKeyArray_test.txt", svcloc)) {
+ if (!Athena_test::initGaudi("StoreGate/CondHandleKeyArray_test.txt", svcloc)) {
return 1;
}
diff --git a/Control/StoreGate/test/ReadDecorHandleKeyArray_test.cxx b/Control/StoreGate/test/ReadDecorHandleKeyArray_test.cxx
index 9b714c1b5fc8b51b5f1701a5c70635caab2fda83..ada84e817ba92dce3c305a255c87870aa7c9204c 100644
--- a/Control/StoreGate/test/ReadDecorHandleKeyArray_test.cxx
+++ b/Control/StoreGate/test/ReadDecorHandleKeyArray_test.cxx
@@ -1,10 +1,6 @@
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-/*
- */
-
-// $Id$
/**
* @file StoreGate/test/ReadDecorHandleKeyArrau_test.cxx
* @author Jovan Mitrevski <Jovan.Mitrevski.cern.ch>
diff --git a/Control/StoreGate/test/ReadDecorHandleKey_test.cxx b/Control/StoreGate/test/ReadDecorHandleKey_test.cxx
index 839c8ae0fc06118d134f01d804173066f8e4a031..4acde5b3ec1700431b1754334eb4b663e9aaa428 100644
--- a/Control/StoreGate/test/ReadDecorHandleKey_test.cxx
+++ b/Control/StoreGate/test/ReadDecorHandleKey_test.cxx
@@ -1,8 +1,6 @@
/*
* Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
*/
-
-// $Id$
/**
* @file StoreGate/test/ReadDecorHandleKey_test.cxx
* @author scott snyder <snyder@bnl.gov>
diff --git a/Control/StoreGate/test/ReadDecorHandle_test.cxx b/Control/StoreGate/test/ReadDecorHandle_test.cxx
index fa2f249216da831d63345020e3c257bef7cb8a26..30e781ec901a233ae544a269258285cfcee2e5f0 100644
--- a/Control/StoreGate/test/ReadDecorHandle_test.cxx
+++ b/Control/StoreGate/test/ReadDecorHandle_test.cxx
@@ -1,10 +1,6 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-/*
- */
-
-// $Id$
/**
* @file StoreGate/test/ReadDecorHandle_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -315,7 +311,7 @@ int main()
errorcheck::ReportMessage::hideErrorLocus();
ISvcLocator* svcloc;
//need MessageSvc
- if (!Athena_test::initGaudi("VarHandleBase_test.txt", svcloc)) {
+ if (!Athena_test::initGaudi("StoreGate/VarHandleBase_test.txt", svcloc)) {
return 1;
}
diff --git a/Control/StoreGate/test/ReadHandle_test.cxx b/Control/StoreGate/test/ReadHandle_test.cxx
index d58b989bc5621188355b11f5552624a1b1cc7070..de00f13bbacbca7099b46859c257a959c7717fc0 100644
--- a/Control/StoreGate/test/ReadHandle_test.cxx
+++ b/Control/StoreGate/test/ReadHandle_test.cxx
@@ -1,8 +1,6 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id$
/**
* @file StoreGate/test/ReadHandle_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -375,7 +373,7 @@ int main (int argc, char** argv)
errorcheck::ReportMessage::hideErrorLocus();
ISvcLocator* svcloc;
//need MessageSvc
- if (!Athena_test::initGaudi("VarHandleBase_test.txt", svcloc)) {
+ if (!Athena_test::initGaudi("StoreGate/VarHandleBase_test.txt", svcloc)) {
return 1;
}
diff --git a/Control/StoreGate/test/SGHive_test.cxx b/Control/StoreGate/test/SGHive_test.cxx
index e0262012be75fdc18622aeef652b260d9ce6f4c1..69969e475d31df3a387e4e7f9990fb3f934adcd9 100644
--- a/Control/StoreGate/test/SGHive_test.cxx
+++ b/Control/StoreGate/test/SGHive_test.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/***************************************************************************
@@ -8,8 +8,6 @@
ATLAS Collaboration
***************************************************************************/
-// $Id: SGHive_test.cxx 797434 2017-02-15 23:30:43Z ssnyder $
-
#undef NDEBUG
#include <string>
@@ -115,7 +113,7 @@ public:
int main() {
cout << "*** SGHiveTest BEGINS ***" << endl;
ISvcLocator* pSvcLoc;
- if (!initGaudi("SGHive_test.txt", pSvcLoc)) {
+ if (!initGaudi("StoreGate/SGHive_test.txt", pSvcLoc)) {
return 1;
}
IHiveWhiteBoard* pWB(0);
diff --git a/Control/StoreGate/test/SGTiming_test.cxx b/Control/StoreGate/test/SGTiming_test.cxx
index befd1dc4555c63f52068fac9f5286173c93de2c5..dbe3a1345152545edec6a59ce856f8975a7cd927 100644
--- a/Control/StoreGate/test/SGTiming_test.cxx
+++ b/Control/StoreGate/test/SGTiming_test.cxx
@@ -21,7 +21,7 @@ int main() {
std::cout << "**** SGTimingTest BEGINS ****" << std::endl;
ISvcLocator* pSvcLoc;
- if (!Athena_test::initGaudi("SGTiming_test.txt", pSvcLoc)) {
+ if (!Athena_test::initGaudi("StoreGate/SGTiming_test.txt", pSvcLoc)) {
return 1;
}
diff --git a/Control/StoreGate/test/ThinningHandleBase_test.cxx b/Control/StoreGate/test/ThinningHandleBase_test.cxx
index 1bc3870cebf2fd6a153a71a2c930c95d1a95e15d..72ce48bc7e682961f9b76051fd7bf6fa1495eedd 100644
--- a/Control/StoreGate/test/ThinningHandleBase_test.cxx
+++ b/Control/StoreGate/test/ThinningHandleBase_test.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**
* @file StoreGate/test/ThinningHandleBase_test.cxx
@@ -114,7 +114,7 @@ int main()
errorcheck::ReportMessage::hideErrorLocus();
errorcheck::ReportMessage::hideFunctionNames();
ISvcLocator* svcloc;
- if (!Athena_test::initGaudi("VarHandleBase_test.txt", svcloc)) {
+ if (!Athena_test::initGaudi("StoreGate/VarHandleBase_test.txt", svcloc)) {
return 1;
}
diff --git a/Control/StoreGate/test/ThinningHandle_test.cxx b/Control/StoreGate/test/ThinningHandle_test.cxx
index 616995cfd1d8f7d403d357f933916b496953bd7a..1a610fd53aa617a8bc0881ce470330e6888ad919 100644
--- a/Control/StoreGate/test/ThinningHandle_test.cxx
+++ b/Control/StoreGate/test/ThinningHandle_test.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**
* @file StoreGate/test/ThinningHandle_test.cxx
@@ -122,7 +122,7 @@ int main()
errorcheck::ReportMessage::hideErrorLocus();
errorcheck::ReportMessage::hideFunctionNames();
ISvcLocator* svcloc;
- if (!Athena_test::initGaudi("VarHandleBase_test.txt", svcloc)) {
+ if (!Athena_test::initGaudi("StoreGate/VarHandleBase_test.txt", svcloc)) {
return 1;
}
diff --git a/Control/StoreGate/test/UpdateHandle_test.cxx b/Control/StoreGate/test/UpdateHandle_test.cxx
index 9fe4e9a42a8a5f12f91efdc48898be5b25d5abc6..e6dbeb62bfaf35cc262d6da2b6dd8046c984d0e0 100644
--- a/Control/StoreGate/test/UpdateHandle_test.cxx
+++ b/Control/StoreGate/test/UpdateHandle_test.cxx
@@ -1,8 +1,6 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id$
/**
* @file StoreGate/test/UpdateHandle_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -264,7 +262,7 @@ int main()
errorcheck::ReportMessage::hideFunctionNames();
ISvcLocator* svcloc;
//need MessageSvc
- if (!Athena_test::initGaudi("VarHandleBase_test.txt", svcloc)) {
+ if (!Athena_test::initGaudi("StoreGate/VarHandleBase_test.txt", svcloc)) {
return 1;
}
diff --git a/Control/StoreGate/test/VarHandleBase_test.cxx b/Control/StoreGate/test/VarHandleBase_test.cxx
index 98f9e71a4c5e5b9e6d6cc6d0a961b5f1fcc5dffa..df5283ce6f7db336d8577a83d1154fd3c08f8e4c 100644
--- a/Control/StoreGate/test/VarHandleBase_test.cxx
+++ b/Control/StoreGate/test/VarHandleBase_test.cxx
@@ -1,8 +1,6 @@
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id$
/**
* @file StoreGate/test/VarHandleBase_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -757,7 +755,7 @@ int main()
errorcheck::ReportMessage::hideErrorLocus();
ISvcLocator* svcloc;
//need MessageSvc
- if (!Athena_test::initGaudi("VarHandleBase_test.txt", svcloc)) {
+ if (!Athena_test::initGaudi("StoreGate/VarHandleBase_test.txt", svcloc)) {
return 1;
}
diff --git a/Control/StoreGate/test/VarHandleKeyProperty_test.cxx b/Control/StoreGate/test/VarHandleKeyProperty_test.cxx
index f25e7d2d4db211d742958abdc776948ab37a55b2..e05f07c80d44984cf762cfc075fcfe822bb0f680 100644
--- a/Control/StoreGate/test/VarHandleKeyProperty_test.cxx
+++ b/Control/StoreGate/test/VarHandleKeyProperty_test.cxx
@@ -1,8 +1,6 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id$
/**
* @file StoreGate/test/VarHandleKeyProperty_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -265,7 +263,7 @@ void test5()
int main()
{
ISvcLocator* pDum;
- if (!Athena_test::initGaudi("VarHandleKeyProperty_test.txt", pDum)) {
+ if (!Athena_test::initGaudi("StoreGate/VarHandleKeyProperty_test.txt", pDum)) {
return 1;
}
diff --git a/Control/StoreGate/test/VarHandleProperty_test.cxx b/Control/StoreGate/test/VarHandleProperty_test.cxx
index f76accc00abba7ab4ddbd1f2ece757f1391e8f74..8443c28fee2ad017e1d7296c263b3b9cc7877394 100644
--- a/Control/StoreGate/test/VarHandleProperty_test.cxx
+++ b/Control/StoreGate/test/VarHandleProperty_test.cxx
@@ -1,8 +1,6 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id$
/**
* @file StoreGate/test/VarHandleProperty_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -113,7 +111,7 @@ void test1()
int main()
{
ISvcLocator* pDum;
- if (!Athena_test::initGaudi("VarHandleProperty_test.txt", pDum)) {
+ if (!Athena_test::initGaudi("StoreGate/VarHandleProperty_test.txt", pDum)) {
return 1;
}
diff --git a/Control/StoreGate/test/WriteCondHandle_test.cxx b/Control/StoreGate/test/WriteCondHandle_test.cxx
index 13da01a0189b804eaecedd3d47dc7a4c1b90c532..7a8329f150838affa86528a5902b39129fd3969a 100644
--- a/Control/StoreGate/test/WriteCondHandle_test.cxx
+++ b/Control/StoreGate/test/WriteCondHandle_test.cxx
@@ -433,7 +433,7 @@ int main()
{
ISvcLocator* svcloc;
//need MessageSvc
- if (!Athena_test::initGaudi("WriteCondHandle_test.txt", svcloc)) {
+ if (!Athena_test::initGaudi("StoreGate/WriteCondHandle_test.txt", svcloc)) {
return 1;
}
diff --git a/Control/StoreGate/test/WriteDecorHandleKey_test.cxx b/Control/StoreGate/test/WriteDecorHandleKey_test.cxx
index b9e8c76b52ae71cedfcb2cc8aafd68409a928552..7fc7170853781ebfa36ca0a7ab3c2bfd760a2b13 100644
--- a/Control/StoreGate/test/WriteDecorHandleKey_test.cxx
+++ b/Control/StoreGate/test/WriteDecorHandleKey_test.cxx
@@ -1,8 +1,6 @@
/*
* Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
*/
-
-// $Id$
/**
* @file StoreGate/test/WriteDecorHandleKey_test.cxx
* @author scott snyder <snyder@bnl.gov>
diff --git a/Control/StoreGate/test/WriteDecorHandle_test.cxx b/Control/StoreGate/test/WriteDecorHandle_test.cxx
index d4cf6175989e8736849688842662e6b42791ac36..c625497cb16d701ec23301a95878e756f0a0d7af 100644
--- a/Control/StoreGate/test/WriteDecorHandle_test.cxx
+++ b/Control/StoreGate/test/WriteDecorHandle_test.cxx
@@ -1,10 +1,6 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-/*
- */
-
-// $Id$
/**
* @file StoreGate/test/WriteDecorHandle_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -247,11 +243,13 @@ void test4()
SG::WriteDecorHandle<MyObj, int> h1 (k1);
assert (h1.setProxyDict (&testStore).isSuccess());
assert (h1.auxid() == ityp);
+ assert (!h1.isAvailable());
h1 (*pobj) = 22;
MyObj::Accessor<int> bdec ("bbb");
assert (bdec (*pobj) == 22);
+ assert (h1.isAvailable());
}
@@ -309,7 +307,7 @@ int main()
errorcheck::ReportMessage::hideErrorLocus();
ISvcLocator* svcloc;
//need MessageSvc
- if (!Athena_test::initGaudi("VarHandleBase_test.txt", svcloc)) {
+ if (!Athena_test::initGaudi("StoreGate/VarHandleBase_test.txt", svcloc)) {
return 1;
}
diff --git a/Control/StoreGate/test/WriteHandle_test.cxx b/Control/StoreGate/test/WriteHandle_test.cxx
index 4439e74bb3ae354538cbdb02382a52df6c98677c..ea464a3ee808da56f34e9e1be680ff5e04dedabf 100644
--- a/Control/StoreGate/test/WriteHandle_test.cxx
+++ b/Control/StoreGate/test/WriteHandle_test.cxx
@@ -1,8 +1,6 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id$
/**
* @file StoreGate/test/WriteHandle_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -720,7 +718,7 @@ int main()
errorcheck::ReportMessage::hideFunctionNames();
ISvcLocator* svcloc;
//need MessageSvc
- if (!Athena_test::initGaudi("VarHandleBase_test.txt", svcloc)) {
+ if (!Athena_test::initGaudi("StoreGate/VarHandleBase_test.txt", svcloc)) {
return 1;
}