From 3df3652b826c2bd33f361e61851d2369ec844a4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartins@fdi.ucm.es>
Date: Fri, 11 Jun 2010 20:13:41 +0200
Subject: [PATCH] feature #192: tests fixed for new VM sql schema.

---
 src/vm/test/VirtualMachinePoolTest.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/vm/test/VirtualMachinePoolTest.cc b/src/vm/test/VirtualMachinePoolTest.cc
index f575b70fe6..8638732e6f 100644
--- a/src/vm/test/VirtualMachinePoolTest.cc
+++ b/src/vm/test/VirtualMachinePoolTest.cc
@@ -48,21 +48,21 @@ const string xmls[] =
     "<VM><ID>0</ID><UID>123</UID><NAME>VM one</NAME><LAST_POLL>0</LAST_POLL><ST"
     "ATE>1</STATE><LCM_STATE>0</LCM_STATE><STIME>0000000000</STIME><ETIME>0</ET"
     "IME><DEPLOY_ID></DEPLOY_ID><MEMORY>0</MEMORY><CPU>0</CPU><NET_TX>0</NET_TX"
-    "><NET_RX>0</NET_RX><TEMPLATE><CPU><![CDATA[1]]></CPU><MEMORY><![CDATA[128]"
+    "><NET_RX>0</NET_RX><LAST_SEQ>-1</LAST_SEQ><TEMPLATE><CPU><![CDATA[1]]></CPU><MEMORY><![CDATA[128]"
     "]></MEMORY><NAME><![CDATA[VM one]]></NAME><VMID><![CDATA[0]]></VMID>"
     "</TEMPLATE></VM>",
 
     "<VM><ID>1</ID><UID>261</UID><NAME>Second VM</NAME><LAST_POLL>0</LAST_POLL>"
     "<STATE>1</STATE><LCM_STATE>0</LCM_STATE><STIME>0000000000</STIME><ETIME>0<"
     "/ETIME><DEPLOY_ID></DEPLOY_ID><MEMORY>0</MEMORY><CPU>0</CPU><NET_TX>0</NET"
-    "_TX><NET_RX>0</NET_RX><TEMPLATE><CPU><![CDATA[2]]></CPU><MEMORY>"
+    "_TX><NET_RX>0</NET_RX><LAST_SEQ>-1</LAST_SEQ><TEMPLATE><CPU><![CDATA[2]]></CPU><MEMORY>"
     "<![CDATA[256]]></MEMORY><NAME><![CDATA[Second VM]]></NAME><VMID>"
     "<![CDATA[1]]></VMID></TEMPLATE></VM>",
 
     "<VM><ID>0</ID><UID>123</UID><NAME>VM one</NAME><LAST_POLL>0</LAST_POLL><ST"
     "ATE>1</STATE><LCM_STATE>0</LCM_STATE><STIME>0000000000</STIME><ETIME>0</ET"
     "IME><DEPLOY_ID></DEPLOY_ID><MEMORY>0</MEMORY><CPU>0</CPU><NET_TX>0</NET_TX"
-    "><NET_RX>0</NET_RX><TEMPLATE><CPU>1</CPU><MEMORY>1024</MEMORY><NAME>VM one"
+    "><NET_RX>0</NET_RX><LAST_SEQ>-1</LAST_SEQ><TEMPLATE><CPU>1</CPU><MEMORY>1024</MEMORY><NAME>VM one"
     "</NAME><VMID>0</VMID></TEMPLATE></VM>"
 };
 
@@ -162,7 +162,7 @@ protected:
         // Get the xml and replace the STIME to 0, so we can compare it
         ((VirtualMachine*)obj)->to_xml(xml_str);
         xml_str.replace( xml_str.find("<STIME>")+7, 10, replacement);
-
+//cout << endl << xml_str << endl;
         CPPUNIT_ASSERT( ((VirtualMachine*)obj)->get_name() == names[index] );
         CPPUNIT_ASSERT( xml_str == xmls[index]);
     };
@@ -258,7 +258,7 @@ public:
     };
 
     void dump()
-    {        
+    {
         VirtualMachinePool * vmp = static_cast<VirtualMachinePool*>(pool);
 
         set_up_user_pool();
@@ -271,7 +271,7 @@ public:
 
         rc = vmp->dump(oss, "");
         CPPUNIT_ASSERT(rc == 0);
-
+cout << endl << oss.str() << endl;
         string result = oss.str();
         result.replace(152, 10, replacement);
         result.replace(426, 10, replacement);