From: Tomek Mrugalski Date: Mon, 23 Jul 2018 14:04:55 +0000 (+0200) Subject: [github88] Wrapped too long lines. X-Git-Tag: ha_phase2~43 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66602af46b1a7d9f4197b1f285c928bd9f80ba2b;p=thirdparty%2Fkea.git [github88] Wrapped too long lines. --- diff --git a/src/lib/dhcpsrv/tests/cql_host_data_source_unittest.cc b/src/lib/dhcpsrv/tests/cql_host_data_source_unittest.cc index 2c657f0ccf..17362bdbcb 100644 --- a/src/lib/dhcpsrv/tests/cql_host_data_source_unittest.cc +++ b/src/lib/dhcpsrv/tests/cql_host_data_source_unittest.cc @@ -585,7 +585,8 @@ TEST_F(CqlHostDataSourceTest, testAddRollback) { destroyCqlSchema(false, true); // Create a host with a reservation. - HostPtr host = HostDataSourceUtils::initializeHost6("2001:db8:1::1", Host::IDENT_HWADDR, false, "key##1"); + HostPtr host = HostDataSourceUtils::initializeHost6("2001:db8:1::1", + Host::IDENT_HWADDR, false, "key##1"); // Let's assign some DHCPv4 subnet to the host, because we will use the // DHCPv4 subnet to try to retrieve the host after failed insertion. host->setIPv4SubnetID(SubnetID(4)); diff --git a/src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc b/src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc index 6d787f9a08..bcb7570a14 100644 --- a/src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc +++ b/src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc @@ -571,7 +571,8 @@ TEST_F(PgSqlHostDataSourceTest, testAddRollback) { << " drop command failed :" << PQerrorMessage(conn); // Create a host with a reservation. - HostPtr host = HostDataSourceUtils::initializeHost6("2001:db8:1::1", Host::IDENT_HWADDR, false, "randomKey"); + HostPtr host = HostDataSourceUtils::initializeHost6("2001:db8:1::1", + Host::IDENT_HWADDR, false, "randomKey"); // Let's assign some DHCPv4 subnet to the host, because we will use the // DHCPv4 subnet to try to retrieve the host after failed insertion. host->setIPv4SubnetID(SubnetID(4)); diff --git a/src/lib/dhcpsrv/testutils/generic_host_data_source_unittest.cc b/src/lib/dhcpsrv/testutils/generic_host_data_source_unittest.cc index 22044afc0b..0ff489e052 100644 --- a/src/lib/dhcpsrv/testutils/generic_host_data_source_unittest.cc +++ b/src/lib/dhcpsrv/testutils/generic_host_data_source_unittest.cc @@ -706,7 +706,8 @@ GenericHostDataSourceTest::testSubnetId6(int subnets, Host::IdentifierType id) { for (int i = 0; i < subnets; ++i) { // Last boolean value set to false indicates that the same identifier // must be used for each generated host. - host = HostDataSourceUtils::initializeHost6(current_address.toText(), id, true, false, ""); + host = HostDataSourceUtils::initializeHost6(current_address.toText(), + id, true, false, ""); host->setIPv4SubnetID(i + 1000); host->setIPv6SubnetID(i + 1000); @@ -951,8 +952,10 @@ GenericHostDataSourceTest::testMultipleReservationsDifferentOrder() { ASSERT_TRUE(hdsptr_); uint8_t len = 128; - HostPtr host1 = HostDataSourceUtils::initializeHost6("2001:db8::1", Host::IDENT_DUID, false, "key##1"); - HostPtr host2 = HostDataSourceUtils::initializeHost6("2001:db8::1", Host::IDENT_DUID, false, "key##1"); + HostPtr host1 = HostDataSourceUtils::initializeHost6("2001:db8::1", + Host::IDENT_DUID, false, "key##1"); + HostPtr host2 = HostDataSourceUtils::initializeHost6("2001:db8::1", + Host::IDENT_DUID, false, "key##1"); // Add some reservations IPv6Resrv resv1(IPv6Resrv::TYPE_NA, IOAddress("2001:db8::6"), len); @@ -1250,7 +1253,8 @@ GenericHostDataSourceTest::stressTest(unsigned int nOfHosts /* = 0xfffdU */) { ss >> n_host; const std::string prefix = std::string("2001:db8::") + n_host; - hosts.push_back(HostDataSourceUtils::initializeHost6(prefix, Host::IDENT_HWADDR, false, "key##1")); + hosts.push_back(HostDataSourceUtils::initializeHost6(prefix, + Host::IDENT_HWADDR, false, "key##1")); IPv6ResrvRange range = hosts.back()->getIPv6Reservations(); ASSERT_EQ(1, std::distance(range.first, range.second)); @@ -1415,7 +1419,8 @@ void GenericHostDataSourceTest::testDeleteById6() { ASSERT_TRUE(hdsptr_); // Let's create a v6 host... - HostPtr host1 = HostDataSourceUtils::initializeHost6("2001:db8::1", Host::IDENT_DUID, false, "key##1"); + HostPtr host1 = HostDataSourceUtils::initializeHost6("2001:db8::1", + Host::IDENT_DUID, false, "key##1"); SubnetID subnet1 = host1->getIPv6SubnetID(); // ... and add it to the data source. diff --git a/src/lib/dhcpsrv/testutils/host_data_source_utils.h b/src/lib/dhcpsrv/testutils/host_data_source_utils.h index a252eeb0dc..c10f2de57e 100644 --- a/src/lib/dhcpsrv/testutils/host_data_source_utils.h +++ b/src/lib/dhcpsrv/testutils/host_data_source_utils.h @@ -39,7 +39,8 @@ public: /// /// @return generated Host object static HostPtr initializeHost6(std::string address, Host::IdentifierType id, - bool prefix, bool new_identifier = true, const std::string key = ""); + bool prefix, bool new_identifier = true, + const std::string key = ""); /// @brief Generates a hardware address in text version. ///