Skip to content

Commit 84ea9e1

Browse files
committed
Fix BuildFile and code-format
1 parent 736cee3 commit 84ea9e1

File tree

2 files changed

+23
-29
lines changed

2 files changed

+23
-29
lines changed

L1Trigger/L1TCaloLayer1/test/BuildFile.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,4 @@
1313
<use name="hls4mlEmulatorExtras"/>
1414
<use name="CICADA"/>
1515
<use name="cppunit"/>
16-
<use name="Utilities/Testing"/>
1716
</bin>
Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//Test of the external CICADA model emulation model loading and model unloading
22
//Developed by Andrew Loeliger, Princeton University, Feb 23, 2023
33

4-
//We can't test a load of a bad model here, since that is a segfault, not an exception, which is
4+
//We can't test a load of a bad model here, since that is a segfault, not an exception, which is
55
//OS level and cppunit cannot test against that in any way that qualifies as a success
66

77
//TODO: However, it would be good in the future to assure that loading multiple CICADA models at the
@@ -19,39 +19,34 @@
1919
#include <memory>
2020
#include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
2121

22-
class test_CICADA: public CppUnit::TestFixture{
23-
CPPUNIT_TEST_SUITE(test_CICADA);
24-
CPPUNIT_TEST(doModelV1Load);
25-
CPPUNIT_TEST(doModelV2Load);
26-
CPPUNIT_TEST(doMultiModelLoad);
27-
CPPUNIT_TEST_SUITE_END();
28-
29-
public:
30-
void doModelV1Load();
31-
void doModelV2Load();
32-
void doMultiModelLoad();
33-
34-
22+
class test_CICADA : public CppUnit::TestFixture {
23+
CPPUNIT_TEST_SUITE(test_CICADA);
24+
CPPUNIT_TEST(doModelV1Load);
25+
CPPUNIT_TEST(doModelV2Load);
26+
CPPUNIT_TEST(doMultiModelLoad);
27+
CPPUNIT_TEST_SUITE_END();
28+
29+
public:
30+
void doModelV1Load();
31+
void doModelV2Load();
32+
void doMultiModelLoad();
3533
};
3634

3735
CPPUNIT_TEST_SUITE_REGISTRATION(test_CICADA);
3836

39-
void test_CICADA::doModelV1Load(){
40-
auto loader = hls4mlEmulator::ModelLoader("CICADAModel_v1");
41-
auto model = loader.load_model();
37+
void test_CICADA::doModelV1Load() {
38+
auto loader = hls4mlEmulator::ModelLoader("CICADAModel_v1");
39+
auto model = loader.load_model();
4240
}
4341

44-
void test_CICADA::doModelV2Load(){
45-
auto loader = hls4mlEmulator::ModelLoader("CICADAModel_v2");
46-
auto model = loader.load_model();
42+
void test_CICADA::doModelV2Load() {
43+
auto loader = hls4mlEmulator::ModelLoader("CICADAModel_v2");
44+
auto model = loader.load_model();
4745
}
4846

49-
void test_CICADA::doMultiModelLoad(){
50-
auto loader_v1 = hls4mlEmulator::ModelLoader("CICADAModel_v1");
51-
auto loader_v2 = hls4mlEmulator::ModelLoader("CICADAModel_v2");
52-
auto model_v1 = loader_v1.load_model();
53-
auto model_v2 = loader_v2.load_model();
47+
void test_CICADA::doMultiModelLoad() {
48+
auto loader_v1 = hls4mlEmulator::ModelLoader("CICADAModel_v1");
49+
auto loader_v2 = hls4mlEmulator::ModelLoader("CICADAModel_v2");
50+
auto model_v1 = loader_v1.load_model();
51+
auto model_v2 = loader_v2.load_model();
5452
}
55-
56-
57-

0 commit comments

Comments
 (0)