Skip to content

Commit 6a370cf

Browse files
authored
Merge pull request #48299 from Dr15Jones/catch2DataFormatsCommon
Convert many tests to use catch2 in DataFormat/Common
2 parents 4040f18 + 9fe08fa commit 6a370cf

31 files changed

+1569
-1960
lines changed

DataFormats/Common/test/BuildFile.xml

Lines changed: 3 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -14,47 +14,8 @@
1414
<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">
1515
</bin>
1616

17-
<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">
18-
<use name="catch2"/>
17+
<bin name="testDataFormatsCommonCatch2" file="test_catch2_*.cpp">
18+
<use name="catch2"/>
1919
</bin>
2020

21-
<bin file="DictionaryTools_t.cpp">
22-
</bin>
23-
24-
<bin file="traits_t.cpp">
25-
</bin>
26-
27-
<bin file="RefCore_t.cpp">
28-
</bin>
29-
30-
<bin file="Ref_t.cpp">
31-
</bin>
32-
33-
<bin file="ThinnedRefSet_t.cpp">
34-
<use name="catch2"/>
35-
</bin>
36-
37-
<bin file="RefVector_t.cpp">
38-
</bin>
39-
40-
<bin file="DataFrame_t.cpp">
41-
</bin>
42-
43-
<bin file="DetSetNew_t.cpp">
44-
</bin>
45-
46-
<bin file="DetSetNewTS_t.cpp">
47-
</bin>
48-
49-
<bin file="MapOfVectors_t.cpp">
50-
</bin>
51-
52-
<bin file="Trie_t.cpp">
53-
</bin>
54-
55-
<bin name="testMultiAssociation" file="testRunner.cpp,testMultiAssociation.cc">
56-
</bin>
57-
58-
<bin file="StdArray_t.cpp">
59-
<use name="catch2"/>
60-
</bin>
21+
<bin name="testMultiAssociation" file="testRunner.cpp,testMultiAssociation.cc"/>

DataFormats/Common/test/DataFrame_t.cpp

Lines changed: 0 additions & 139 deletions
This file was deleted.

0 commit comments

Comments
 (0)