From 31be0a20007bc896d1dd9329e0563fa4549c77d6 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Sun, 26 Feb 2012 22:08:27 +0100 Subject: [PATCH] feature #1112: Fix compilation of unit tests --- src/lcm/test/LifeCycleManagerTest.cc | 23 +++++++++++------------ src/vm/test/VirtualMachinePoolTest.cc | 12 +++++------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/src/lcm/test/LifeCycleManagerTest.cc b/src/lcm/test/LifeCycleManagerTest.cc index ce1166c8bd..03fd372352 100644 --- a/src/lcm/test/LifeCycleManagerTest.cc +++ b/src/lcm/test/LifeCycleManagerTest.cc @@ -48,7 +48,6 @@ static int hid = 123; static string hostname = "test_hostname"; static string vmm_mad = "vmm_mad"; static string vnm_mad = "vnm_mad"; -static string vmdir = "vmdir"; class LifeCycleManagerTest : public OneUnitTest { @@ -225,7 +224,7 @@ private: vm->lock(); - vm->add_history(hid,hostname,vmdir,vmm_mad,vnm_mad); + vm->add_history(hid,hostname,vmm_mad,vnm_mad); rc = vmpool->update_history(vm); CPPUNIT_ASSERT( rc == 0 ); @@ -489,7 +488,7 @@ public: { vm = allocate_running(0); - vm->add_history(hid,hostname,vmdir,vmm_mad,vnm_mad); + vm->add_history(hid,hostname,vmm_mad,vnm_mad); rc = vmpool->update_history(vm); CPPUNIT_ASSERT( rc == 0 ); @@ -573,7 +572,7 @@ public: { vm = allocate_running(0); - vm->add_history(hid,hostname,vmdir,vmm_mad,vnm_mad); + vm->add_history(hid,hostname,vmm_mad,vnm_mad); rc = vmpool->update_history(vm); CPPUNIT_ASSERT( rc == 0 ); @@ -594,7 +593,7 @@ public: { vm = allocate_running(0); - vm->add_history(hid,hostname,vmdir,vmm_mad,vnm_mad); + vm->add_history(hid,hostname,vmm_mad,vnm_mad); rc = vmpool->update_history(vm); CPPUNIT_ASSERT( rc == 0 ); @@ -615,7 +614,7 @@ public: { vm = allocate_running(0); - vm->add_history(hid,hostname,vmdir,vmm_mad,vnm_mad); + vm->add_history(hid,hostname,vmm_mad,vnm_mad); rc = vmpool->update_history(vm); CPPUNIT_ASSERT( rc == 0 ); @@ -637,7 +636,7 @@ public: { vm = allocate_running(0); - vm->add_history(hid,hostname,vmdir,vmm_mad,vnm_mad); + vm->add_history(hid,hostname,vmm_mad,vnm_mad); rc = vmpool->update_history(vm); CPPUNIT_ASSERT( rc == 0 ); @@ -661,7 +660,7 @@ public: { vm = allocate_running(0); - vm->add_history(hid,hostname,vmdir,vmm_mad,vnm_mad); + vm->add_history(hid,hostname,vmm_mad,vnm_mad); rc = vmpool->update_history(vm); CPPUNIT_ASSERT( rc == 0 ); @@ -685,7 +684,7 @@ public: { vm = allocate_running(0); - vm->add_history(hid,hostname,vmdir,vmm_mad,vnm_mad); + vm->add_history(hid,hostname,vmm_mad,vnm_mad); rc = vmpool->update_history(vm); CPPUNIT_ASSERT( rc == 0 ); @@ -749,7 +748,7 @@ public: { vm = allocate_running(0); - vm->add_history(hid,hostname,vmdir,vmm_mad,vnm_mad); + vm->add_history(hid,hostname,vmm_mad,vnm_mad); rc = vmpool->update_history(vm); CPPUNIT_ASSERT( rc == 0 ); @@ -772,7 +771,7 @@ public: { vm = allocate_running(0); - vm->add_history(hid,hostname,vmdir,vmm_mad,vnm_mad); + vm->add_history(hid,hostname,vmm_mad,vnm_mad); rc = vmpool->update_history(vm); CPPUNIT_ASSERT( rc == 0 ); @@ -795,7 +794,7 @@ public: { vm = allocate_running(0); - vm->add_history(hid,hostname,vmdir,vmm_mad,vnm_mad); + vm->add_history(hid,hostname,vmm_mad,vnm_mad); rc = vmpool->update_history(vm); CPPUNIT_ASSERT( rc == 0 ); diff --git a/src/vm/test/VirtualMachinePoolTest.cc b/src/vm/test/VirtualMachinePoolTest.cc index 4febff2e81..3a0ac90c90 100644 --- a/src/vm/test/VirtualMachinePoolTest.cc +++ b/src/vm/test/VirtualMachinePoolTest.cc @@ -298,7 +298,6 @@ public: VirtualMachine* vm; string hostnames[] = {"A_hostname", "B_hostname", "C_hostname"}; - string vm_dirs[] = {"A_vm_dir", "B_vm_dir", "C_vm_dir"}; string vmm_mads[] = {"A_vmm_mad", "B_vmm_mad", "C_vmm_mad"}; string vnm_mads[] = {"A_vnm_mad", "B_vnm_mad", "C_vnm_mad"}; @@ -322,7 +321,7 @@ public: CPPUNIT_ASSERT( vm != 0 ); // Add a history item - vm->add_history(0, hostnames[0], vm_dirs[0], vmm_mads[0], vnm_mads[0]); + vm->add_history(0, hostnames[0], vmm_mads[0], vnm_mads[0]); rc = vmp->update(vm); CPPUNIT_ASSERT( rc == 0 ); @@ -340,7 +339,7 @@ public: CPPUNIT_ASSERT( vm != 0 ); // Add a history item - vm->add_history(1, hostnames[1], vm_dirs[1], vmm_mads[1], vnm_mads[1]); + vm->add_history(1, hostnames[1], vmm_mads[1], vnm_mads[1]); rc = vmp->update(vm); CPPUNIT_ASSERT( rc == 0 ); @@ -349,7 +348,7 @@ public: CPPUNIT_ASSERT( rc == 0 ); // Add another history item - vm->add_history(2, hostnames[2], vm_dirs[2], vmm_mads[2], vnm_mads[2]); + vm->add_history(2, hostnames[2], vmm_mads[2], vnm_mads[2]); rc = vmp->update(vm); CPPUNIT_ASSERT( rc == 0 ); @@ -404,7 +403,6 @@ public: string hostname = "hostname"; string new_hostname = "new_hostname"; - string vm_dir = "vm_dir"; string vmm_mad = "vm_mad"; string vnm_mad = "vn_mad"; @@ -416,7 +414,7 @@ public: CPPUNIT_ASSERT( vm != 0 ); // Add a history item - vm->add_history(0, hostname, vm_dir, vmm_mad, vnm_mad); + vm->add_history(0, hostname, vmm_mad, vnm_mad); rc = vmp->update(vm); CPPUNIT_ASSERT( rc == 0 ); @@ -424,7 +422,7 @@ public: rc = vmp->update_history(vm); CPPUNIT_ASSERT( rc == 0 ); - vm->add_history(0, new_hostname, vm_dir, vmm_mad, vnm_mad); + vm->add_history(0, new_hostname, vmm_mad, vnm_mad); rc = vmp->update(vm); CPPUNIT_ASSERT( rc == 0 );