[3677] Whitespace cleanup, one method moved .h -> .cc

diff --git a/src/lib/dhcpsrv/tests/Makefile.am b/src/lib/dhcpsrv/tests/Makefile.am
index 160ec24e632701e2ad8010d1223c1688fe68075e..2eb5b468076b3c19d7d2bf88c784ad0475071ced 100644 (file)
--- a/src/lib/dhcpsrv/tests/Makefile.am
+++ b/src/lib/dhcpsrv/tests/Makefile.am
@@ -17,7 +17,7 @@ AM_CXXFLAGS += $(WARNING_NO_MISSING_FIELD_INITIALIZERS_CFLAG)
 CLEANFILES = *.gcno *.gcda
 
 TESTS_ENVIRONMENT = \
-       $(LIBTOOL) --mode=execute $(VALGRIND_COMMAND)
+        $(LIBTOOL) --mode=execute $(VALGRIND_COMMAND)
 
 TESTS =
 if HAVE_GTEST

diff --git a/src/lib/dhcpsrv/tests/alloc_engine_utils.cc b/src/lib/dhcpsrv/tests/alloc_engine_utils.cc
index 168567280072884e8814283766e492709dc4162f..f7ea40052fd3dc75d860dcc966e75f968d2d24de 100644 (file)
--- a/src/lib/dhcpsrv/tests/alloc_engine_utils.cc
+++ b/src/lib/dhcpsrv/tests/alloc_engine_utils.cc
@@ -59,6 +59,24 @@ AllocEngine6Test::AllocEngine6Test() {
     factory_.create("type=memfile universe=6 persist=false");
 }
 
+void
+AllocEngine6Test::initSubnet(const asiolink::IOAddress& subnet,
+                    const asiolink::IOAddress& pool_start,
+                    const asiolink::IOAddress& pool_end) {
+    CfgMgr& cfg_mgr = CfgMgr::instance();
+
+    subnet_ = Subnet6Ptr(new Subnet6(subnet, 56, 1, 2, 3, 4));
+    pool_ = Pool6Ptr(new Pool6(Lease::TYPE_NA, pool_start, pool_end));
+
+    subnet_->addPool(pool_);
+
+    pd_pool_ = Pool6Ptr(new Pool6(Lease::TYPE_PD, subnet, 56, 64));
+    subnet_->addPool(pd_pool_);
+
+    cfg_mgr.getStagingCfg()->getCfgSubnets6()->add(subnet_);
+    cfg_mgr.commit();
+}
+
 Lease6Collection
 AllocEngine6Test::allocateTest(AllocEngine& engine, const Pool6Ptr& pool,
                                const asiolink::IOAddress& hint, bool fake,
@@ -88,7 +106,7 @@ AllocEngine6Test::allocateTest(AllocEngine& engine, const Pool6Ptr& pool,
             if (!from_mgr) {
                 return (leases);
             }
-            
+
             // Now check that the lease in LeaseMgr has the same parameters
             detailCompareLease(*it, from_mgr);
         } else {
@@ -102,7 +120,7 @@ AllocEngine6Test::allocateTest(AllocEngine& engine, const Pool6Ptr& pool,
             }
         }
     }
-    
+
     return (leases);
 }
 
@@ -126,7 +144,7 @@ AllocEngine6Test::simpleAlloc6Test(const Pool6Ptr& pool, const IOAddress& hint,
                                     false, false, "", fake);
 
     EXPECT_NO_THROW(lease = expectOneLease(engine->allocateLeases6(ctx)));
-    
+
     // Check that we got a lease
     EXPECT_TRUE(lease);
     if (!lease) {
@@ -213,7 +231,7 @@ AllocEngine6Test::allocWithUsedHintTest(Lease::Type type, IOAddress used_addr,
     Lease6Ptr used(new Lease6(type, used_addr,
                               duid2, 1, 2, 3, 4, now, subnet_->getID()));
     ASSERT_TRUE(LeaseMgrFactory::instance().addLease(used));
-    
+
     // Another client comes in and request an address that is in pool, but
     // unfortunately it is used already. The same address must not be allocated
     // twice.
@@ -221,10 +239,10 @@ AllocEngine6Test::allocWithUsedHintTest(Lease::Type type, IOAddress used_addr,
     AllocEngine::ClientContext6 ctx(subnet_, duid_, iaid_, requested, type,
                                     false, false, "", false);
     EXPECT_NO_THROW(lease = expectOneLease(engine->allocateLeases6(ctx)));
-    
+
     // Check that we got a lease
     ASSERT_TRUE(lease);
-        
+
     // Allocated address must be different
     EXPECT_NE(used_addr, lease->addr_);
 
@@ -280,7 +298,7 @@ void
 AllocEngine4Test::initSubnet(const asiolink::IOAddress& pool_start,
                              const asiolink::IOAddress& pool_end) {
     CfgMgr& cfg_mgr = CfgMgr::instance();
-    
+
     subnet_ = Subnet4Ptr(new Subnet4(IOAddress("192.0.2.0"), 24, 1, 2, 3));
     pool_ = Pool4Ptr(new Pool4(pool_start, pool_end));
     subnet_->addPool(pool_);

diff --git a/src/lib/dhcpsrv/tests/alloc_engine_utils.h b/src/lib/dhcpsrv/tests/alloc_engine_utils.h
index 82d62a398e7eefbf82d6f2acfd6c986e090d0347..ba556a63fe056de72803ce1a1f62fcb6f9f08119 100644 (file)
--- a/src/lib/dhcpsrv/tests/alloc_engine_utils.h
+++ b/src/lib/dhcpsrv/tests/alloc_engine_utils.h
@@ -28,9 +28,9 @@ namespace dhcp {
 namespace test {
 
 /// @file   alloc_engine_utils.h
-/// 
+///
 /// @brief This is a header file for all Allocation Engine tests.
-/// 
+///
 /// There used to be one, huge (over 3kloc) alloc_engine_unittest.cc. It is now
 /// split into serveral smaller files:
 /// alloc_engine_utils.h - contains test class definitions (this file)
@@ -93,21 +93,7 @@ public:
     /// @param pool_end Last address in the address pool.
     void initSubnet(const asiolink::IOAddress& subnet,
                     const asiolink::IOAddress& pool_start,
-                    const asiolink::IOAddress& pool_end) {
-        CfgMgr& cfg_mgr = CfgMgr::instance();
-
-        subnet_ = Subnet6Ptr(new Subnet6(subnet, 56, 1, 2, 3, 4));
-        pool_ = Pool6Ptr(new Pool6(Lease::TYPE_NA, pool_start, pool_end));
-
-        subnet_->addPool(pool_);
-
-        pd_pool_ = Pool6Ptr(new Pool6(Lease::TYPE_PD, subnet, 56, 64));
-        subnet_->addPool(pd_pool_);
-
-        cfg_mgr.getStagingCfg()->getCfgSubnets6()->add(subnet_);
-        cfg_mgr.commit();
-
-    }
+                    const asiolink::IOAddress& pool_end);
 
     /// @brief Initializes FQDN data for a test.
     ///