Skip to content

Commit

Permalink
Fix formatting in tests (#12559)
Browse files Browse the repository at this point in the history
  • Loading branch information
ktf authored Jan 19, 2024
1 parent cd2008f commit e4dfd2f
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 16 deletions.
2 changes: 1 addition & 1 deletion Framework/Core/test/test_Expressions.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ static BindingNode testInt{"testInt", 6, atype::INT32};

namespace o2::aod::track
{
DECLARE_SOA_EXPRESSION_COLUMN(Pze, pz, float, o2::aod::track::tgl*(1.f / o2::aod::track::signed1Pt));
DECLARE_SOA_EXPRESSION_COLUMN(Pze, pz, float, o2::aod::track::tgl * (1.f / o2::aod::track::signed1Pt));
} // namespace o2::aod::track

TEST_CASE("TestTreeParsing")
Expand Down
2 changes: 1 addition & 1 deletion Framework/Core/test/test_ExternalFairMQDeviceWorkflow.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ std::vector<DataProcessorSpec> defineDataProcessing(ConfigContext const& config)
output.AddPart(std::move(inputs.At(msgidx)));
}
}
auto &messageContext = services.get<MessageContext>();
auto& messageContext = services.get<MessageContext>();
o2::framework::sendOnChannel(*device, output, channelName, (size_t)-1);
messageContext.fakeDispatch();
return output.Size() != 0;
Expand Down
2 changes: 1 addition & 1 deletion Framework/Core/test/test_FrameworkDataFlowToO2Control.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace
{
WorkflowSpec defineDataProcessing()
{
return {{.name = "A", //
return {{.name = "A", //
.outputs = Outputs{OutputSpec{"TST", "A1"}, OutputSpec{"TST", "A2"}}, // A1 will be consumed twice, A2 is dangling
.algorithm = AlgorithmSpec{}, //
.options = {ConfigParamSpec{"channel-config", VariantType::String, // raw input channel
Expand Down
2 changes: 1 addition & 1 deletion Framework/Core/test/test_O2DatabasePDG.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ struct PdgTest {
TParticlePDG* p = pdgOld->GetParticle(300553);
ASSERT_ERROR(p != nullptr);
ASSERT_ERROR(p->Mass() == 10.580);
ASSERT_ERROR(p->Stable() == kFALSE);
ASSERT_ERROR(p->Stable() == kFALSE);
ASSERT_ERROR(p->Charge() == 0);
ASSERT_ERROR(p->Width() == 0.000);

Expand Down
6 changes: 3 additions & 3 deletions Framework/Core/test/test_Parallel.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ std::vector<DataProcessorSpec> defineDataProcessing(ConfigContext const&)
Outputs{
{"TPC", "CLUSTERS_P", 0, Lifetime::Timeframe}},
AlgorithmSpec{
//CLion says it ambiguous without (AlgorithmSpec::ProcessCallback), but cmake compiles fine anyway.
// CLion says it ambiguous without (AlgorithmSpec::ProcessCallback), but cmake compiles fine anyway.
(AlgorithmSpec::ProcessCallback)someProcessingStageAlgorithm}},
parallelSize,
[](DataProcessorSpec& spec, size_t index) {
Expand Down Expand Up @@ -95,7 +95,7 @@ std::vector<DataProcessorSpec> defineDataProcessing(ConfigContext const&)
auto matcher = DataSpecUtils::asConcreteDataMatcher(*inputSpec);
o2::header::DataDescription outputDescription = matcher.description;

//todo: better sampled data flagging
// todo: better sampled data flagging
size_t len = strlen(outputDescription.str);
if (len < outputDescription.size - 2) {
outputDescription.str[len] = '_';
Expand All @@ -113,7 +113,7 @@ std::vector<DataProcessorSpec> defineDataProcessing(ConfigContext const&)
const auto* inputHeader = DataRefUtils::getHeader<o2::header::DataHeader*>(input);
auto& output = ctx.outputs().make<char>(description, inputHeader->size());

//todo: use some std function or adopt(), when it is available for POD data
// todo: use some std function or adopt(), when it is available for POD data
const char* input_ptr = input.payload;
for (char& it : output) {
it = *input_ptr++;
Expand Down
5 changes: 2 additions & 3 deletions Framework/Core/test/test_Root2ArrowTable.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ TEST_CASE("RootTree2Table")
t1.Branch("ev", &ev, "ev/I");
t1.Branch("xyz", xyz, "xyz[3]/F");
t1.Branch("ij", ij, "ij[2]/I");
//fill the tree
// fill the tree
for (Int_t i = 0; i < 1000; i++) {
xyz[0] = 1;
xyz[1] = 2;
Expand Down Expand Up @@ -91,7 +91,6 @@ TEST_CASE("RootTree2Table")
REQUIRE(array->length() == 3000);
const float* c = reinterpret_cast<float const*>(array->values()->data());


CHECK(c[0] == 1);
CHECK(c[1] == 2);
CHECK(c[2] == 1);
Expand Down Expand Up @@ -146,7 +145,7 @@ TEST_CASE("RootTree2TableViaASoA")
t2.Branch("ev", &ev, "ev/I");
t2.Branch("xyz", xyz, "xyz[3]/F");
t2.Branch("ij", ij, "ij[2]/I");
//fill the tree
// fill the tree
for (Int_t i = 0; i < 1000; i++) {
gRandom->Rannor(xyz[0], xyz[1]);
gRandom->Rannor(px, py);
Expand Down
2 changes: 1 addition & 1 deletion Framework/Core/test/test_Services.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ static ServiceRegistry::Salt salt_1 = ServiceRegistry::Salt{1, 0};
static ServiceRegistry::Salt salt_2 = ServiceRegistry::Salt{2, 0};
static ServiceRegistry::Salt salt_3 = ServiceRegistry::Salt{3, 0};
static ServiceRegistry::Salt salt_1_1 = ServiceRegistry::Salt{1, 1};
}
} // namespace o2::framework

TEST_CASE("TestSerialServices")
{
Expand Down
2 changes: 1 addition & 1 deletion Framework/Core/test/test_StaggeringWorkflow.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ void customize(std::vector<o2::framework::CompletionPolicy>& policies)
// search for spec names starting with "processor"
return spec.name.find("processor") == 0;
},
[](auto const&, auto const&, auto &) { return o2::framework::CompletionPolicy::CompletionOp::Consume; }});
[](auto const&, auto const&, auto&) { return o2::framework::CompletionPolicy::CompletionOp::Consume; }});
}

#include "Framework/runDataProcessing.h"
Expand Down
4 changes: 2 additions & 2 deletions Framework/Core/test/test_TableBuilder.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ namespace test2
DECLARE_SOA_COLUMN_FULL(X, x, uint64_t, "x");
DECLARE_SOA_COLUMN_FULL(Y, y, uint64_t, "y");
DECLARE_SOA_COLUMN_FULL(Pos, pos, int[4], "pos");
} // namespace test
} // namespace test2

using TestTable = o2::soa::Table<test2::X, test2::Y>;
using ArrayTable = o2::soa::Table<test2::Pos>;
Expand Down Expand Up @@ -295,7 +295,7 @@ TEST_CASE("TestColumnCount")

TEST_CASE("TestMakeFields")
{
auto fields = TableBuilderHelpers::makeFields<int, float>({ "i", "f" });
auto fields = TableBuilderHelpers::makeFields<int, float>({"i", "f"});
REQUIRE(fields.size() == 2);
REQUIRE(fields[0]->name() == "i");
REQUIRE(fields[1]->name() == "f");
Expand Down
2 changes: 1 addition & 1 deletion Framework/Core/test/test_TreeToTable.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ TEST_CASE("TreeToTableConversion")
t1.Branch("xyzw", xyzw, "xyzw[96]/F");
t1.Branch("small", &b, "small/b");

//fill the tree
// fill the tree
int ntruein[2] = {0};
for (int i = 0; i < ndp; i++) {
ok = (i % 2) == 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ namespace test
// a header with the information expected in the payload
// will be sent on the header stack
struct SequenceDesc : public o2::header::BaseHeader {
//static data for this header type/version
// static data for this header type/version
static constexpr uint32_t sVersion{1};
static constexpr o2::header::HeaderType sHeaderType{o2::header::String2<uint64_t>("SequDesc")};
static constexpr o2::header::SerializationMethod sSerializationMethod{o2::header::gSerializationMethodNone};
Expand Down

0 comments on commit e4dfd2f

Please sign in to comment.