mirror of
https://codeberg.org/comaps/comaps
synced 2025-12-20 05:13:58 +00:00
Format all C++ and Java code via clang-format
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
@@ -17,15 +17,13 @@ namespace
|
||||
{
|
||||
NumMwmId constexpr kTestMwmId = 777;
|
||||
|
||||
template <typename CrossMwmId> struct CrossMwmBuilderTestFixture
|
||||
template <typename CrossMwmId>
|
||||
struct CrossMwmBuilderTestFixture
|
||||
{
|
||||
CrossMwmConnector<CrossMwmId> connector;
|
||||
CrossMwmConnectorBuilder<CrossMwmId> builder;
|
||||
|
||||
explicit CrossMwmBuilderTestFixture(NumMwmId numMwmId = kTestMwmId)
|
||||
: connector(numMwmId), builder(connector)
|
||||
{
|
||||
}
|
||||
explicit CrossMwmBuilderTestFixture(NumMwmId numMwmId = kTestMwmId) : connector(numMwmId), builder(connector) {}
|
||||
};
|
||||
|
||||
template <typename CrossMwmId>
|
||||
@@ -69,13 +67,17 @@ void TestOneWayEnter(CrossMwmId const & crossMwmId)
|
||||
TEST_EQUAL(test.connector.GetNumEnters(), 1, ());
|
||||
TEST_EQUAL(test.connector.GetNumExits(), 0, ());
|
||||
TEST(!test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, true /* forward */),
|
||||
true /* isOutgoing */), ());
|
||||
true /* isOutgoing */),
|
||||
());
|
||||
TEST(test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, true /* forward */),
|
||||
false /* isOutgoing */), ());
|
||||
false /* isOutgoing */),
|
||||
());
|
||||
TEST(!test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, false /* forward */),
|
||||
true /* isOutgoing */), ());
|
||||
true /* isOutgoing */),
|
||||
());
|
||||
TEST(!test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, false /* forward */),
|
||||
false /* isOutgoing */), ());
|
||||
false /* isOutgoing */),
|
||||
());
|
||||
}
|
||||
|
||||
template <typename CrossMwmId>
|
||||
@@ -91,13 +93,17 @@ void TestOneWayExit(CrossMwmId const & crossMwmId)
|
||||
TEST_EQUAL(test.connector.GetNumEnters(), 0, ());
|
||||
TEST_EQUAL(test.connector.GetNumExits(), 1, ());
|
||||
TEST(test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, true /* forward */),
|
||||
true /* isOutgoing */), ());
|
||||
true /* isOutgoing */),
|
||||
());
|
||||
TEST(!test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, true /* forward */),
|
||||
false /* isOutgoing */), ());
|
||||
false /* isOutgoing */),
|
||||
());
|
||||
TEST(!test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, false /* forward */),
|
||||
true /* isOutgoing */), ());
|
||||
true /* isOutgoing */),
|
||||
());
|
||||
TEST(!test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, false /* forward */),
|
||||
false /* isOutgoing */), ());
|
||||
false /* isOutgoing */),
|
||||
());
|
||||
}
|
||||
|
||||
template <typename CrossMwmId>
|
||||
@@ -113,13 +119,17 @@ void TestTwoWayEnter(CrossMwmId const & crossMwmId)
|
||||
TEST_EQUAL(test.connector.GetNumEnters(), 1, ());
|
||||
TEST_EQUAL(test.connector.GetNumExits(), 1, ());
|
||||
TEST(!test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, true /* forward */),
|
||||
true /* isOutgoing */), ());
|
||||
true /* isOutgoing */),
|
||||
());
|
||||
TEST(test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, true /* forward */),
|
||||
false /* isOutgoing */), ());
|
||||
false /* isOutgoing */),
|
||||
());
|
||||
TEST(test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, false /* forward */),
|
||||
true /* isOutgoing */), ());
|
||||
true /* isOutgoing */),
|
||||
());
|
||||
TEST(!test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, false /* forward */),
|
||||
false /* isOutgoing */), ());
|
||||
false /* isOutgoing */),
|
||||
());
|
||||
}
|
||||
|
||||
template <typename CrossMwmId>
|
||||
@@ -135,13 +145,17 @@ void TestTwoWayExit(CrossMwmId const & crossMwmId)
|
||||
TEST_EQUAL(test.connector.GetNumEnters(), 1, ());
|
||||
TEST_EQUAL(test.connector.GetNumExits(), 1, ());
|
||||
TEST(test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, true /* forward */),
|
||||
true /* isOutgoing */), ());
|
||||
true /* isOutgoing */),
|
||||
());
|
||||
TEST(!test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, true /* forward */),
|
||||
false /* isOutgoing */), ());
|
||||
false /* isOutgoing */),
|
||||
());
|
||||
TEST(!test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, false /* forward */),
|
||||
true /* isOutgoing */), ());
|
||||
true /* isOutgoing */),
|
||||
());
|
||||
TEST(test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, false /* forward */),
|
||||
false /* isOutgoing */), ());
|
||||
false /* isOutgoing */),
|
||||
());
|
||||
}
|
||||
|
||||
template <typename CrossMwmId>
|
||||
@@ -190,12 +204,10 @@ void TestSerialization(CrossMwmConnectorBuilderEx<CrossMwmId> & builder)
|
||||
TEST(test.connector.HasWeights(), ());
|
||||
|
||||
TestOutgoingEdges(test.connector, Segment(kTestMwmId, 10, 1, true /* forward */),
|
||||
{{Segment(kTestMwmId, 20, 2, false /* forward */),
|
||||
RouteWeight::FromCrossMwmWeight(kEdgesWeight)}});
|
||||
{{Segment(kTestMwmId, 20, 2, false /* forward */), RouteWeight::FromCrossMwmWeight(kEdgesWeight)}});
|
||||
|
||||
TestOutgoingEdges(test.connector, Segment(kTestMwmId, 20, 2, true /* forward */),
|
||||
{{Segment(kTestMwmId, 20, 2, false /* forward */),
|
||||
RouteWeight::FromCrossMwmWeight(kEdgesWeight)}});
|
||||
{{Segment(kTestMwmId, 20, 2, false /* forward */), RouteWeight::FromCrossMwmWeight(kEdgesWeight)}});
|
||||
}
|
||||
|
||||
void GetCrossMwmId(uint32_t i, base::GeoObjectId & id)
|
||||
@@ -213,7 +225,7 @@ void TestWeightsSerialization()
|
||||
{
|
||||
size_t constexpr kNumTransitions = 3;
|
||||
uint32_t constexpr segmentIdx = 1;
|
||||
double const weights[] = { 4.0, 20.0, connector::kNoRoute, 12.0, connector::kNoRoute, 40.0, 48.0, 24.0, 12.0 };
|
||||
double const weights[] = {4.0, 20.0, connector::kNoRoute, 12.0, connector::kNoRoute, 40.0, 48.0, 24.0, 12.0};
|
||||
TEST_EQUAL(std::size(weights), kNumTransitions * kNumTransitions, ());
|
||||
|
||||
std::map<std::pair<Segment, Segment>, double> expectedWeights;
|
||||
@@ -221,7 +233,7 @@ void TestWeightsSerialization()
|
||||
vector<uint8_t> buffer;
|
||||
{
|
||||
CrossMwmConnectorBuilderEx<CrossMwmId> builder;
|
||||
for (uint32_t featureId : { 2, 0, 1 }) // reshuffled
|
||||
for (uint32_t featureId : {2, 0, 1}) // reshuffled
|
||||
{
|
||||
CrossMwmId id;
|
||||
GetCrossMwmId(featureId, id);
|
||||
@@ -320,8 +332,8 @@ UNIT_TEST(CMWMC_Serialization)
|
||||
{
|
||||
CrossMwmConnectorBuilderEx<TransitId> builder;
|
||||
// osmId featureId, segmentIdx, roadMask, oneWayMask, forwardIsEnter
|
||||
builder.AddTransition(TransitId(1ULL /* stop 1 id */, 2ULL /* stop 2 id */, 1ULL /* line id */),
|
||||
10, 1, kCarMask, kCarMask, true);
|
||||
builder.AddTransition(TransitId(1ULL /* stop 1 id */, 2ULL /* stop 2 id */, 1ULL /* line id */), 10, 1, kCarMask,
|
||||
kCarMask, true);
|
||||
builder.AddTransition(TransitId(1ULL, 3ULL, 1ULL), 20, 2, kCarMask, 0, true);
|
||||
builder.AddTransition(TransitId(1ULL, 3ULL, 2ULL), 30, 3, kPedestrianMask, kCarMask, true);
|
||||
TestSerialization(builder);
|
||||
@@ -333,4 +345,4 @@ UNIT_TEST(CMWMC_WeightsSerialization)
|
||||
TestWeightsSerialization<base::GeoObjectId>();
|
||||
TestWeightsSerialization<TransitId>();
|
||||
}
|
||||
} // namespace cross_mwm_connector_test
|
||||
} // namespace cross_mwm_connector_test
|
||||
|
||||
Reference in New Issue
Block a user