Renamed catch2 test files in DataFormats/Common

Author: Dr15Jones

DataFormats/Common/test/BuildFile.xml

@@ -14,7 +14,7 @@
 <bin name="testDataFormatsCommon" file="testRunner.cpp,testOwnVector.cc,testOneToOneAssociation.cc,testValueMap.cc,testOneToManyAssociation.cc,testAssociationVector.cc,testAssociationNew.cc,testValueMapNew.cc,testSortedCollection.cc,testRangeMap.cc,ref_t.cppunit.cc,DetSetRefVector_t.cppunit.cc,reftobasevector_t.cppunit.cc,cloningptr_t.cppunit.cc,ptr_t.cppunit.cc,ptrvector_t.cppunit.cc,containermask_t.cppunit.cc,reftobaseprod_t.cppunit.cc,handle_t.cppunit.cc">
 </bin>
 
-<bin name="testDataFormatsCommonCatch2" file="DetSetVector_t.cpp,DetSetVectorWithKey_t.cpp,exDSTV.cpp,exTrie.cpp,OwnVector_t.cpp,Wrapper_t.cpp,testBoostRange.cpp,reftobase_t.cpp,Ref_t.cpp,RefCore_t.cpp,StdArray_t.cpp,ThinnedRefSet_t.cpp,traits_t.cpp,RefVector_t.cpp,DataFrame_t.cpp,DictionaryTools_t.cpp,MapOfVectors_t.cpp,Trie_t.cpp,DetSetNew_t.cpp,DetSetNewTS_t.cpp">
+<bin name="testDataFormatsCommonCatch2" file="test_catch2_*.cpp">
 <use name="catch2"/>
 </bin>
 

…taFormats/Common/test/testBoostRange.cpp …s/Common/test/test_catch2_BoostRange.cppDataFormats/Common/test/testBoostRange.cpp renamed to DataFormats/Common/test/test_catch2_BoostRange.cpp DataFormats/Common/test/testBoostRange.cpp renamed to DataFormats/Common/test/test_catch2_BoostRange.cpp

@@ -286,9 +286,7 @@ TEST_CASE("DetSetNew", "[DetSetNew]") {
     }
     REQUIRE(detsets.size() == 5);
     REQUIRE(!detsets.exists(31));
-    {
-      FF ff1(detsets, 32, true);
-    }
+    { FF ff1(detsets, 32, true); }
     REQUIRE(detsets.size() == 6);
 
     DSTV detsets2(detsets);

DataFormats/Common/test/DataFrame_t.cpp …ts/Common/test/test_catch2_DataFrame.cppDataFormats/Common/test/DataFrame_t.cpp renamed to DataFormats/Common/test/test_catch2_DataFrame.cpp DataFormats/Common/test/DataFrame_t.cpp renamed to DataFormats/Common/test/test_catch2_DataFrame.cpp

@@ -27,10 +27,6 @@ class TestDetSet {
 };
 
 namespace {
-  namespace global {
-    Mutex coutLock;
-  }
-
   template <typename T>
   inline void spinlock(std::atomic<T> const& lock, T val) {
     while (lock.load(std::memory_order_acquire) != val) {
@@ -204,7 +200,7 @@ TEST_CASE("DetSetNewTS", "[DetSetNewTS]") {
     REQUIRE(maxDet == int(detsets.size()));
     std::atomic<int> lock(0);
     std::atomic<int> idet(0);
-    std::atomic<int> count(0);
+    //std::atomic<int> count(0);
     DST df31 = detsets[31];
     //std::cout << "start parallel section" << std::endl;
     parallel_run([&lock, &detsets, &idet, maxDet, &g](unsigned int threadNumber, unsigned int numberOfThreads) {