AtlasTest/ControlTest/share/SGDataLink_test.ref

@@ -29,8 +29,6 @@ StoreGateSvc        DEBUG trying to create store SGImplSvc/StoreGateSvc_Impl
 StoreGateSvc_Impl   DEBUG Property update for OutputLevel : new value = 1
 StoreGateSvc_Impl VERBOSE Initializing StoreGateSvc_Impl
 StoreGateSvc_Impl   DEBUG Service base class initialized successfully
-StoreGateSvc_Impl VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
-StoreGateSvc_Impl VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
 StoreGateSvc        DEBUG Recorded object @0x4ce3340 with key foo2 of type Foo(CLID 8101)
  in DataObject @0x4ce45a0
  object modifiable when retrieved

AtlasTest/ControlTest/share/StoreGateSvcClient_test.txt

-#include "ControlTest/StoreGateTestCommon.txt"

AtlasTest/ControlTest/share/StoreID.ref

@@ -29,6 +29,4 @@ StoreGateSvc        DEBUG trying to create store SGImplSvc/StoreGateSvc_Impl
 StoreGateSvc_Impl   DEBUG Property update for OutputLevel : new value = 1
 StoreGateSvc_Impl VERBOSE Initializing StoreGateSvc_Impl
 StoreGateSvc_Impl   DEBUG Service base class initialized successfully
-StoreGateSvc_Impl VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
-StoreGateSvc_Impl VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
 *** StoreID_test OK ***

AtlasTest/ControlTest/share/test_interactive_athena.py

@@ -34,7 +34,7 @@ class TestAlg(PyAthena.Alg):
     pass # class TestAlg
 
 def test_lock():
-    printfunc ('test lock')
+    print ('test lock')
     sg = PyAthena.py_svc('StoreGateSvc')
     ei = PyAthena.EventInfo()
     sg.record (ei, 'EventInfo')
@@ -46,7 +46,7 @@ def test_lock():
     assert (not ll.m_locked)
     sg.setConst (ll).ignore()
     assert (ll.m_locked)
-    printfunc ('done test lock')
+    print ('done test lock')
     import sys
     sys.stdout.flush()
     return
@@ -62,9 +62,9 @@ for _ in range(10):
 test_lock()
 
 theApp.finalize().ignore()
-printfunc ("="*80)
-printfunc ("test [OK]")
-printfunc ("="*80)
+print ("="*80)
+print ("test [OK]")
+print ("="*80)
 theApp.exit()
 
     

AtlasTest/ControlTest/test/CircularDep_test.cxx

 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #undef NDEBUG
@@ -44,10 +44,8 @@ int main() {
   }  
 
   assert(pSvcLoc);
-  StoreGateSvc* pSG;
-  
-  const bool CREATEIF(true);
-  assert((pSvcLoc->service("StoreGateSvc", pSG, CREATEIF)).isSuccess());
+
+  SmartIF<StoreGateSvc> pSG(pSvcLoc->service("StoreGateSvc"));
   assert(pSG);
 
   Circular *circ0(new Circular), *circ1(new Circular);

AtlasTest/ControlTest/test/DataProxy_test.cxx

 /*
-  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2025 CERN for the benefit of the ATLAS collaboration
 */
 
 #undef NDEBUG
@@ -16,12 +16,11 @@
 #include "AthenaKernel/CLASS_DEF.h"
 #include "SGTools/T2pMap.h"
 #include "SGTools/TransientAddress.h"
+#include "SGTools/DataProxy_cast.h"
 #include <iostream>
 
 #include <cassert>
 
-const bool CREATEIF(true);
-
 struct Bla{
   Bla(): i(0) {}
   Bla(int m): i(m) {}
@@ -85,9 +84,7 @@ int main() {
   assert( (DataProxy_cast<Bla>(&transientProxy))->i == 77 );
 
 
-  IConversionSvc* pIConvSvc(nullptr);
-  StatusCode cs((pSvcLoc->service("EventPersistencySvc", pIConvSvc, CREATEIF)));
-  assert(cs.isSuccess());
+  SmartIF<IConversionSvc> pIConvSvc(pSvcLoc->service("EventPersistencySvc"));
   assert(pIConvSvc);
   // create a transient address with IOA.
   TransientAddress* tGen = new TransientAddress(ClassID_traits<Foo>::ID(),
@@ -114,9 +111,7 @@ int main() {
   fptr->doNothing(); //remove warning
 
 
-  IProxyProviderSvc* pIPPSvc(nullptr);
-  StatusCode psc(pSvcLoc->service("ProxyProviderSvc", pIPPSvc, CREATEIF));
-  assert( psc.isSuccess() );
+  SmartIF<IProxyProviderSvc> pIPPSvc(pSvcLoc->service("ProxyProviderSvc"));
   assert( pIPPSvc );
 
   TransientAddress* tad = new TransientAddress(ClassID_traits<Bla>::ID(), "bla");

AtlasTest/ControlTest/test/ElementLinkVector_test.cxx

 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TestTools/SGassert.h"
@@ -133,10 +133,8 @@ int main() {
     return 0;
   }  
   assert(pSvcLoc);
-  StoreGateSvc* pSG;
-  
-  const bool CREATEIF(true);
-  assert((pSvcLoc->service("StoreGateSvc", pSG, CREATEIF)).isSuccess());
+
+  SmartIF<StoreGateSvc> pSG(pSvcLoc->service("StoreGateSvc"));
   assert(pSG);
 
   linkVector(*pSG);

AtlasTest/ControlTest/test/ElementLink_test.cxx

 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "TestTools/FLOATassert.h"
@@ -134,9 +134,7 @@ int main(int argc, char** argv) {
     std::cerr << " This test cannot be run without init Gaudi" << endl;
   }
   assert(pSvcLoc);
-  StoreGateSvc* pSG;
-  const bool CREATEIF(true);
-  assert((pSvcLoc->service("StoreGateSvc", pSG, CREATEIF)).isSuccess());
+  SmartIF<StoreGateSvc> pSG(pSvcLoc->service("StoreGateSvc"));
   assert(pSG);
 
   StatusCode sc;

AtlasTest/ControlTest/test/ProxyProviderSvc_test.cxx

 /*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 /** @file ProxyProviderSvc_test.cxx
@@ -61,13 +61,8 @@ private:
 CLASS_DEF(FooBar, 8109, 0)
 
 template <typename PROXIED>
-class TestProvider : public IAddressProvider {
+class TestProvider : public implements<IAddressProvider> {
 public:
-  virtual unsigned long addRef() override { std::abort(); }
-  virtual unsigned long release() override { std::abort(); }
-  virtual StatusCode queryInterface(const InterfaceID &/*ti*/, void** /*pp*/) override
-  { std::abort(); }
-
   TestProvider(const std::string& key) :
     m_ID(ClassID_traits<PROXIED>::ID()), m_key(key)
   {  }
@@ -180,12 +175,9 @@ int main ATLAS_NOT_THREAD_SAFE () {
   }  
   assert( pSvcLoc );
 
-  StoreGateSvc* pStore(nullptr);
-  static const bool CREATE(true);
-  assert( (pSvcLoc->service("StoreGateSvc", pStore, CREATE)).isSuccess() );
+  SmartIF<StoreGateSvc> pStore(pSvcLoc->service("StoreGateSvc"));
   assert( pStore );
-  IProxyProviderSvc* pIPPSvc;
-  assert( (pSvcLoc->service("ProxyProviderSvc", pIPPSvc, CREATE)).isSuccess() );
+  SmartIF<IProxyProviderSvc> pIPPSvc(pSvcLoc->service("ProxyProviderSvc"));
   assert( pIPPSvc );
 
   pIPPSvc->addProvider(new TestProvider<Foo>("aFoo"));

AtlasTest/ControlTest/test/SGDataLink_test.cxx

 /*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 */
 
 #undef NDEBUG
@@ -217,6 +217,8 @@ namespace Athena_test
     DataLink<Bar> fLink("a Bar");
     assert(fLink.isValid());
     assert(pBar == &*fLink);
+    // cppcheck-suppress memleak; pBar not really leaked
+    pBar = nullptr;
 
     //a link to an element
     IntVector* pvint(new IntVector);
@@ -333,6 +335,7 @@ namespace Athena_test
     std::cout << "xxx " << der << " " << link.cptr() << "\n";
     //assert (link.cptr() == der);
     cout << "*** DataLink_test FwdBase OK ***\n\n" <<endl;
+    // cppcheck-suppress memleak; der not really leaked
   }
 } //end namespace
 
@@ -347,10 +350,7 @@ int main() {
   errorcheck::ReportMessage::hideErrorLocus();
 
   assert(pSvcLoc);
-  StoreGateSvc* pSG;
-  
-  const bool CREATEIF(true);
-  assert((pSvcLoc->service("StoreGateSvc", pSG, CREATEIF)).isSuccess());
+  SmartIF<StoreGateSvc> pSG(pSvcLoc->service("StoreGateSvc"));
   assert(pSG);
 
   Foo* pFoo = new Foo;

AtlasTest/ControlTest/test/StoreID_test.cxx

-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/***************************************************************************
- test the store ID setting
- -------------------------------------------
- ATLAS Collaboration
- ***************************************************************************/
-
-// $Id: StoreID_test.cxx 770224 2016-08-26 01:59:31Z ssnyder $
-
-#include <iostream>
-
-#undef NDEBUG
-
-#include "StoreGate/StoreGateSvc.h"
-#include "StoreGate/SGtests.h"
-
-
-#ifndef NOGAUDI
-#include "TestTools/initGaudi.h"
-using namespace Athena_test;
-using namespace std;
-
-int main() {
-  cout << "*** StoreID_test BEGINS ***" <<endl;
-  ISvcLocator* pSvcLoc;
-  if (!initGaudi("StoreGateTestCommon.txt", pSvcLoc)) {
-    cerr << "This test can not be run" << endl;
-    return 0;
-  }  
-  assert(pSvcLoc);
-
-  StoreGateSvc* pStore(nullptr);
-  static const bool CREATE(true);
-  assert((pSvcLoc->service("StoreGateSvc", pStore, CREATE)).isSuccess());
-  assert(pStore);
-  
-  assert(pStore->storeID() == StoreID::EVENT_STORE);
-
-  assert((pSvcLoc->service("DetectorStore", pStore)).isSuccess());
-  assert(pStore);
-  assert(pStore->storeID() == StoreID::DETECTOR_STORE);
-  
-  assert((pSvcLoc->service("ConditionStore", pStore, CREATE)).isSuccess());
-  assert(pStore);
-  assert(pStore->storeID() == StoreID::CONDITION_STORE);
-  
-  cout << "*** StoreID_test OK ***" <<endl;
-  return 0;
-}
-#endif /*NOGAUDI*/
-
-
-
-
-
-
-
-
-
-
-
-
-

AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/ATLAS_CHECK_THREAD_SAFETY

-AtlasTest/DatabaseTest/AthenaDBTestRec

AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/AthenaDBTestRecDataDict.h

-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef ATHENADBTESTREC_ATHENADBTESTRECDATADICT_H
-#define ATHENADBTESTREC_ATHENADBTESTRECDATADICT_H
-
-// include all header files for dictionary
-#include "AthenaDBTestRec/TestCoolRecPoolData.h"
-#include "AthenaDBTestRec/TestCoolRecPoolDataColl.h"
-
-#endif // ATHENADBTESTREC_ATHENADBTESTRECDATADICT_H

AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/DetStoreDump.h

-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef ATHENADBTESTREC_DETSTOREDUMP_H
-#define ATHENADBTESTREC_DETSTOREDUMP_H
-
-#include <string>
-#include <vector>
-#include "AthenaBaseComps/AthAlgorithm.h"
-#include "StoreGate/DataHandle.h"
-
-
-class DetStoreDump : public AthAlgorithm
-{
- public:
-  DetStoreDump(const std::string& name, ISvcLocator* pSvcLocator);
-  ~DetStoreDump();
-
-  StatusCode initialize();
-  StatusCode execute();
-  StatusCode finalize();
-
- private:
-  // parameters
-  int m_mode;
-
-  bool m_first;
-};
-
-#endif // ATHENADBTESTREC_DETSTOREDUMP_H

AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/TestCoolRecFolder.h

-/*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef ATHENADBTESTREC_TESTCOOLRECFOLDER_H
-#define ATHENADBTESTREC_TESTCOOLRECFOLDER_H
-// TestCoolRecFolder.h - to keep details of a COOL folder being tested
-// in readback mode
-// Folders can be of different types:
-// type=0 : CondAttrListCollection
-// type=1 : TestCoolRecPoolDataColl (multichannel POOL objects)
-// type=2 : CondAttrListVec (for CoraCool)
-// type=3 : Generic objects (no callback, accessed via data proxy)
-// >3 acts as type 0 with modulo run number
-
-#include <string>
-#include <fstream>
-#include "GaudiKernel/StatusCode.h"
-#include "AthenaKernel/IIOVSvc.h"
-#include "CxxUtils/checker_macros.h"
-
-class StoreGateSvc;
-namespace SG {
-  class DataProxy;
-}
-class IOVTime;
-
-class ATLAS_NOT_THREAD_SAFE TestCoolRecFolder {
- public:
-  TestCoolRecFolder(const std::string& key,const int type,
-		    const SG::DataProxy* proxy,
-		    const int dumpchan,std::ofstream* dumpf);
-  StatusCode regCallBack(StoreGateSvc* detstore);
-  StatusCode access(StoreGateSvc* detstore, const int run, const int event,
-		    const IOVTime iovkey);
-  StatusCode callBack( IOVSVC_CALLBACK_ARGS );
-  std::string iovprint(const IOVTime& time, const bool isTS);
-
-  const std::string name() const;
-  int type() const;
-  int nAccess() const;
-  int nError() const;
-  int nMisMatch() const;
-  int nItems() const;
-  int nCallBack() const;
-
- private:
-  std::string m_key;
-  int m_type;
-  const SG::DataProxy* m_proxy;
-  int m_dumpchan;
-  std::ofstream* m_dumpf;
-  int m_naccess;
-  int m_nerror;
-  int m_nmismatch;
-  int m_nitems;
-  int m_ncallback;
-};
-
-inline const std::string TestCoolRecFolder::name() const { return m_key;}
-inline int TestCoolRecFolder::type() const { return m_type;}
-inline int TestCoolRecFolder::nAccess() const { return m_naccess;}
-inline int TestCoolRecFolder::nError() const { return m_nerror;}
-inline int TestCoolRecFolder::nMisMatch() const { return m_nmismatch;}
-inline int TestCoolRecFolder::nItems() const { return m_nitems;}
-inline int TestCoolRecFolder::nCallBack() const { return m_ncallback;}
-
-#endif // ATHENADBTESTREC_TESTCOOLRECFOLDER_H

AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/TestCoolRecPoolData.h

-/*
-  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef ATHENADBTESTREC_TESTCOOLRECPOOLDATA_H
-#define ATHENADBTESTREC_TESTCOOLRECPOOLDATA_H
-
-// TestCoolRecPoolData.h - test class for conditions data stored as POOL obj
-// Richard Hawkings, started 15/8/06
-
-#include<vector>
-#include<string>
-#include "AthenaKernel/CLASS_DEF.h"
-
-class TestCoolRecPoolData {
- public:
-  TestCoolRecPoolData();
-  TestCoolRecPoolData(const int run, const int chan, const std::string& folder,
-		      const int size);
-  ~TestCoolRecPoolData();
-  // get methods
-  int run() const;
-  int chan() const;
-  const std::string folder() const;
-  // data access
-  int size() const;
-  std::vector<float>::iterator dbegin();
-  std::vector<float>::iterator dend();
-  std::vector<float>::const_iterator cdbegin() const;
-  std::vector<float>::const_iterator cdend() const;
-
- private:
-  int m_run;
-  int m_chan;
-  std::string m_folder;
-  std::vector<float> m_data;
-};
-
-inline int TestCoolRecPoolData::run() const { return m_run;}
-inline int TestCoolRecPoolData::chan() const { return m_chan;}
-inline const std::string TestCoolRecPoolData::folder() const { return m_folder;}
-inline int TestCoolRecPoolData::size() const { return m_data.size();}
-inline std::vector<float>::iterator TestCoolRecPoolData::dbegin()
-{ return m_data.begin(); }
-inline std::vector<float>::iterator TestCoolRecPoolData::dend()
-{ return m_data.end(); }
-inline std::vector<float>::const_iterator TestCoolRecPoolData::cdbegin() const
-{ return m_data.begin(); }
-inline std::vector<float>::const_iterator TestCoolRecPoolData::cdend() const
-{ return m_data.end(); }
-
-CLASS_DEF( TestCoolRecPoolData , 113918902 , 1 )
-
-#endif // ATHENADBTESTREC_TESTCOOLRECPOOLDATA_H

AtlasTest/DatabaseTest/AthenaDBTestRec/AthenaDBTestRec/TestCoolRecPoolDataColl.h

-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef ATHENADBTESTREC_TESTCOOLRECPOOLDATACOLL_H
-#define ATHENADBTESTREC_TESTCOOLRECPOOLDATACOLL_H
-// collection of TestCoolRecPoolData objects for storing in a 
-// COOL multichannel folder
-// Richard Hawkings, started 16/8/06
-#include "AthenaPoolUtilities/CondMultChanCollection.h"
-#include "AthenaDBTestRec/TestCoolRecPoolData.h"
-#include "AthenaKernel/CLASS_DEF.h"
-
-typedef CondMultChanCollection<TestCoolRecPoolData> TestCoolRecPoolDataColl;
-
-CLASS_DEF( TestCoolRecPoolDataColl , 117237436 , 1 )
-
-#endif //  ATHENADBTESTREC_TESTCOOLRECPOOLDATACOLL_H