diff -r ed3155dbd163 -r 74f0b3eb154c xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblocksbincont.cpp
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblocksbincont.cpp	Mon May 03 14:14:40 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblocksbincont.cpp	Wed Jun 23 20:27:15 2010 +0530
@@ -22,8 +22,9 @@
 #include <StifParser.h>
 #include <Stiftestinterface.h>
 
-#include <XmlEngBinaryContainer.h>
-#include <XmlEngFileContainer.h>
+#include <xml/dom/xmlengbinarycontainer.h>
+#include <xml/dom/xmlengfilecontainer.h>
+
 #include "xmlengtesterdef.h"
 
 #include <InetProtTextUtils.h>
@@ -494,7 +495,7 @@
     _LIT(KBinaryError,"BinaryContainer Error GetList..");
     _LIT(KEndParsing,"Checking BinaryContainer GetList end.");
     TBufC8<100> cid(_L8("123456789@123456789") );
-    _LIT(KInputFile1,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
+    _LIT(KInputFile1,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
      HBufC8* str1=ReadFileL(KInputFile1);
     CleanupStack::PushL(str1);
 
@@ -576,7 +577,7 @@
     _LIT(KBinaryError,"BinaryContainer Error GetList..");
     _LIT(KEndParsing,"Checking BinaryContainer GetList end.");
     TBufC8<100> cid(_L8("123456789@123456789") );
-    _LIT(KInputFile1,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
+    _LIT(KInputFile1,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
      HBufC8* str1=ReadFileL(KInputFile1);
     CleanupStack::PushL(str1);
 
@@ -618,9 +619,9 @@
     _LIT(KEndParsing,"Checking BinaryContainer end.");
     TBufC8<100> cid(_L8("123456789@123456789") );
     TBufC8<100> cid2(_L8("22222222@123456789") );
-    _LIT(KInputFile1,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
-    _LIT(KInputFile2,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
-    _LIT(KInputFile3,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
+    _LIT(KInputFile1,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
+    _LIT(KInputFile2,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
+    _LIT(KInputFile3,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
 
     HBufC8* str1=ReadFileL(KInputFile1);
     CleanupStack::PushL(str1);
@@ -704,9 +705,9 @@
     TBufC8<100> cid1(_L8("11111111@123456789") );
     TBufC8<100> cid2(_L8("22222222@123456789") );
     TBufC8<100> cid3(_L8("33333333@123456789") );
-    _LIT(KInputFile1,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
-    _LIT(KInputFile2,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
-    _LIT(KInputFile3,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
+    _LIT(KInputFile1,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
+    _LIT(KInputFile2,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
+    _LIT(KInputFile3,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
   
     HBufC8* str1=ReadFileL(KInputFile1);
     CleanupStack::PushL(str1);
@@ -792,9 +793,9 @@
     TBufC8<100> cid1(_L8("11111111@123456789") );
     TBufC8<100> cid2(_L8("22222222@123456789") );
     TBufC8<100> cid3(_L8("33333333@123456789") );
-    _LIT(KInputFile1,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
-    _LIT(KInputFile2,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
-    _LIT(KInputFile3,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
+    _LIT(KInputFile1,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
+    _LIT(KInputFile2,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
+    _LIT(KInputFile3,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
   
     HBufC8* str1=ReadFileL(KInputFile1);
     CleanupStack::PushL(str1);
@@ -879,9 +880,9 @@
     TBufC8<100> cid1(_L8("11111111@123456789") );
     TBufC8<100> cid2(_L8("22222222@123456789") );
     TBufC8<100> cid3(_L8("33333333@123456789") );
-    _LIT(KInputFile1,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
-    _LIT(KInputFile2,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
-    _LIT(KInputFile3,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
+    _LIT(KInputFile1,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
+    _LIT(KInputFile2,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
+    _LIT(KInputFile3,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
   
     HBufC8* str1=ReadFileL(KInputFile1);
     CleanupStack::PushL(str1);
@@ -955,9 +956,9 @@
     TBufC8<100> cid1(_L8("11111111@123456789") );
     TBufC8<100> cid2(_L8("22222222@123456789") );
     TBufC8<100> cid3(_L8("33333333@123456789") );
-    _LIT(KInputFile1,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
-    _LIT(KInputFile2,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
-    _LIT(KInputFile3,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
+    _LIT(KInputFile1,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
+    _LIT(KInputFile2,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
+    _LIT(KInputFile3,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
   
     HBufC8* str1=ReadFileL(KInputFile1);
     CleanupStack::PushL(str1);
@@ -1035,9 +1036,9 @@
     TBufC8<100> cid1(_L8("11111111@123456789") );
     TBufC8<100> cid2(_L8("22222222@123456789") );
     TBufC8<100> cid3(_L8("33333333@123456789") );
-    _LIT(KInputFile1,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
-    _LIT(KInputFile2,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
-    _LIT(KInputFile3,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
+    _LIT(KInputFile1,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
+    _LIT(KInputFile2,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
+    _LIT(KInputFile3,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
   
     HBufC8* str1=ReadFileL(KInputFile1);
     CleanupStack::PushL(str1);
@@ -1135,9 +1136,9 @@
     TBufC8<100> cid1(_L8("11111111@123456789") );
     TBufC8<100> cid2(_L8("22222222@123456789") );
     TBufC8<100> cid3(_L8("33333333@123456789") );
-    _LIT(KInputFile1,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
-    _LIT(KInputFile2,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
-    _LIT(KInputFile3,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
+    _LIT(KInputFile1,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
+    _LIT(KInputFile2,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
+    _LIT(KInputFile3,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
   
     HBufC8* str1=ReadFileL(KInputFile1);
     CleanupStack::PushL(str1);
@@ -1254,9 +1255,9 @@
     TBufC8<100> cid1(_L8("11111111@123456789") );
     TBufC8<100> cid2(_L8("22222222@123456789") );
     TBufC8<100> cid3(_L8("33333333@123456789") );
-    _LIT(KInputFile1,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
-    _LIT(KInputFile2,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
-    _LIT(KInputFile3,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
+    _LIT(KInputFile1,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
+    _LIT(KInputFile2,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
+    _LIT(KInputFile3,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
   
     HBufC8* str1=ReadFileL(KInputFile1);
     CleanupStack::PushL(str1);
@@ -1363,9 +1364,9 @@
     TBufC8<100> cid1(_L8("11111111@123456789") );
     TBufC8<100> cid2(_L8("22222222@123456789") );
     TBufC8<100> cid3(_L8("33333333@123456789") );
-    _LIT(KInputFile1,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
-    _LIT(KInputFile2,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
-    _LIT(KInputFile3,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
+    _LIT(KInputFile1,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
+    _LIT(KInputFile2,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
+    _LIT(KInputFile3,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
   
     HBufC8* str1=ReadFileL(KInputFile1);
     CleanupStack::PushL(str1);
@@ -1468,9 +1469,9 @@
     TBufC8<100> cid1(_L8("11111111@123456789") );
     TBufC8<100> cid2(_L8("22222222@123456789") );
     TBufC8<100> cid3(_L8("33333333@123456789") );
-    _LIT(KInputFile1,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
-    _LIT(KInputFile2,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
-    _LIT(KInputFile3,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
+    _LIT(KInputFile1,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
+    _LIT(KInputFile2,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
+    _LIT(KInputFile3,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
   
     HBufC8* str1=ReadFileL(KInputFile1);
     CleanupStack::PushL(str1);
@@ -1597,9 +1598,9 @@
     TBufC8<100> cid1(_L8("11111111@123456789") );
     TBufC8<100> cid2(_L8("22222222@123456789") );
     TBufC8<100> cid3(_L8("33333333@123456789") );
-    _LIT(KInputFile1,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
-    _LIT(KInputFile2,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
-    _LIT(KInputFile3,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
+    _LIT(KInputFile1,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
+    _LIT(KInputFile2,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
+    _LIT(KInputFile3,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
   
     HBufC8* str1=ReadFileL(KInputFile1);
     CleanupStack::PushL(str1);
@@ -1704,9 +1705,9 @@
     TBufC8<100> cid1(_L8("11111111@123456789") );
     TBufC8<100> cid2(_L8("22222222@123456789") );
     TBufC8<100> cid3(_L8("33333333@123456789") );
-    _LIT(KInputFile1,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
-    _LIT(KInputFile2,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
-    _LIT(KInputFile3,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
+    _LIT(KInputFile1,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
+    _LIT(KInputFile2,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
+    _LIT(KInputFile3,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
   
     HBufC8* str1=ReadFileL(KInputFile1);
     CleanupStack::PushL(str1);
@@ -1779,9 +1780,9 @@
     TBufC8<100> cid1(_L8("11111111@123456789") );
     TBufC8<100> cid2(_L8("22222222@123456789") );
     TBufC8<100> cid3(_L8("33333333@123456789") );
-    _LIT(KInputFile1,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
-    _LIT(KInputFile2,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
-    _LIT(KInputFile3,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
+    _LIT(KInputFile1,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
+    _LIT(KInputFile2,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
+    _LIT(KInputFile3,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
   
     HBufC8* str1=ReadFileL(KInputFile1);
     CleanupStack::PushL(str1);
@@ -1906,9 +1907,9 @@
     TBufC8<100> cid1(_L8("11111111@123456789") );
     TBufC8<100> cid2(_L8("22222222@123456789") );
     TBufC8<100> cid3(_L8("33333333@123456789") );
-    _LIT(KInputFile1,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
-    _LIT(KInputFile2,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
-    _LIT(KInputFile3,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
+    _LIT(KInputFile1,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
+    _LIT(KInputFile2,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
+    _LIT(KInputFile3,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
   
     HBufC8* str1=ReadFileL(KInputFile1);
     CleanupStack::PushL(str1);
@@ -2062,9 +2063,9 @@
     TBufC8<100> cid1(_L8("11111111@123456789") );
     TBufC8<100> cid2(_L8("22222222@123456789") );
     TBufC8<100> cid3(_L8("33333333@123456789") );
-    _LIT(KInputFile1,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
-    _LIT(KInputFile2,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
-    _LIT(KInputFile3,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
+    _LIT(KInputFile1,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
+    _LIT(KInputFile2,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
+    _LIT(KInputFile3,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
   
     HBufC8* str1=ReadFileL(KInputFile1);
     CleanupStack::PushL(str1);
@@ -2193,9 +2194,9 @@
     TBufC8<100> cid1(_L8("11111111@123456789") );
     TBufC8<100> cid2(_L8("22222222@123456789") );
     TBufC8<100> cid3(_L8("33333333@123456789") );
-    _LIT(KInputFile1,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
-    _LIT(KInputFile2,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
-    _LIT(KInputFile3,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
+    _LIT(KInputFile1,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
+    _LIT(KInputFile2,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
+    _LIT(KInputFile3,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
   
     HBufC8* str1=ReadFileL(KInputFile1);
     CleanupStack::PushL(str1);
@@ -2323,9 +2324,9 @@
     TBufC8<100> cid1(_L8("11111111@123456789") );
     TBufC8<100> cid2(_L8("22222222@123456789") );
     TBufC8<100> cid3(_L8("33333333@123456789") );
-    _LIT(KInputFile1,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
-    _LIT(KInputFile2,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
-    _LIT(KInputFile3,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
+    _LIT(KInputFile1,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
+    _LIT(KInputFile2,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
+    _LIT(KInputFile3,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
   
     HBufC8* str1=ReadFileL(KInputFile1);
     CleanupStack::PushL(str1);
@@ -2456,9 +2457,9 @@
     TBufC8<100> cid1(_L8("11111111@123456789") );
     TBufC8<100> cid2(_L8("22222222@123456789") );
     TBufC8<100> cid3(_L8("33333333@123456789") );
-    _LIT(KInputFile1,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
-    _LIT(KInputFile2,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
-    _LIT(KInputFile3,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
+    _LIT(KInputFile1,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
+    _LIT(KInputFile2,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
+    _LIT(KInputFile3,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
   
     HBufC8* str1=ReadFileL(KInputFile1);
     CleanupStack::PushL(str1);
@@ -2588,9 +2589,9 @@
     TBufC8<100> cid1(_L8("11111111@123456789") );
     TBufC8<100> cid2(_L8("22222222@123456789") );
     TBufC8<100> cid3(_L8("33333333@123456789") );
-    _LIT(KInputFile1,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
-    _LIT(KInputFile2,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
-    _LIT(KInputFile3,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
+    _LIT(KInputFile1,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
+    _LIT(KInputFile2,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
+    _LIT(KInputFile3,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
   
     HBufC8* str1=ReadFileL(KInputFile1);
     CleanupStack::PushL(str1);
@@ -2720,9 +2721,9 @@
     TBufC8<100> cid1(_L8("11111111@123456789") );
     TBufC8<100> cid2(_L8("22222222@123456789") );
     TBufC8<100> cid3(_L8("33333333@123456789") );
-    _LIT(KInputFile1,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
-    _LIT(KInputFile2,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
-    _LIT(KInputFile3,"E:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
+    _LIT(KInputFile1,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.jpg");
+    _LIT(KInputFile2,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\icon.gif");
+    _LIT(KInputFile3,"f:\\testing\\data\\xmleng\\efute\\input\\filecontainer\\test.doc");
   
     HBufC8* str1=ReadFileL(KInputFile1);
     CleanupStack::PushL(str1);