INTEGRATION: CWS fwk79 (1.2.44); FILE MERGED

2007/12/05 12:31:13 mav 1.2.44.1: #i84234# adjust the tests

6 files changed, 36 insertions, 36 deletions

diff --git a/package/qa/ofopxmlstorages/Test04.java b/package/qa/ofopxmlstorages/Test04.java
index f8a902d6e..5188b32b0 100644
--- a/package/qa/ofopxmlstorages/Test04.java
+++ b/package/qa/ofopxmlstorages/Test04.java
@@ -37,20 +37,20 @@ public class Test04 implements StorageTest {
             { { new StringPair( "Id", "Num1" ) },
               { new StringPair( "Target", "TargetURLValue1" ), new StringPair( "Id", "Num6" ) },
               { new StringPair( "Target", "" ), new StringPair( "Id", "Num7" ) },
-              { new StringPair( "Id", "Num2" ), new StringPair( "TargetType", "Internal1" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value 1" ) },
-              { new StringPair( "Id", "Num3" ), new StringPair( "TargetType", "Internal1" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value 1" ) },
-              { new StringPair( "Id", "Num4" ), new StringPair( "TargetType", "Internal1" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value 1" ) },
-              { new StringPair( "Id", "Num5" ), new StringPair( "TargetType", "" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value1" ) }
+              { new StringPair( "Id", "Num2" ), new StringPair( "TargetMode", "Internal1" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value 1" ) },
+              { new StringPair( "Id", "Num3" ), new StringPair( "TargetMode", "Internal1" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value 1" ) },
+              { new StringPair( "Id", "Num4" ), new StringPair( "TargetMode", "Internal1" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value 1" ) },
+              { new StringPair( "Id", "Num5" ), new StringPair( "TargetMode", "" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value1" ) }
             };
 
         StringPair[][] aRelations2 =
             { { new StringPair( "Id", "Num1" ) },
               { new StringPair( "Target", "TargetURLValue2" ), new StringPair( "Id", "Num6" ) },
               { new StringPair( "Target", "" ), new StringPair( "Id", "Num7" ) },
-              { new StringPair( "Id", "Num2" ), new StringPair( "TargetType", "Internal2" ), new StringPair( "Type", "unknown2" ), new StringPair( "Target", "URL value 2" ) },
-              { new StringPair( "Id", "Num3" ), new StringPair( "TargetType", "Internal2" ), new StringPair( "Type", "unknown2" ), new StringPair( "Target", "URL value 2" ) },
-              { new StringPair( "Id", "Num4" ), new StringPair( "TargetType", "Internal2" ), new StringPair( "Type", "unknown" ), new StringPair( "Target", "URL value" ) },
-              { new StringPair( "Id", "Num5" ), new StringPair( "TargetType", "" ), new StringPair( "Type", "unknown" ), new StringPair( "Target", "URL value" ) }
+              { new StringPair( "Id", "Num2" ), new StringPair( "TargetMode", "Internal2" ), new StringPair( "Type", "unknown2" ), new StringPair( "Target", "URL value 2" ) },
+              { new StringPair( "Id", "Num3" ), new StringPair( "TargetMode", "Internal2" ), new StringPair( "Type", "unknown2" ), new StringPair( "Target", "URL value 2" ) },
+              { new StringPair( "Id", "Num4" ), new StringPair( "TargetMode", "Internal2" ), new StringPair( "Type", "unknown" ), new StringPair( "Target", "URL value" ) },
+              { new StringPair( "Id", "Num5" ), new StringPair( "TargetMode", "" ), new StringPair( "Type", "unknown" ), new StringPair( "Target", "URL value" ) }
             };
 
         try
diff --git a/package/qa/ofopxmlstorages/Test05.java b/package/qa/ofopxmlstorages/Test05.java
index 97472b57f..971c0338b 100644
--- a/package/qa/ofopxmlstorages/Test05.java
+++ b/package/qa/ofopxmlstorages/Test05.java
@@ -35,20 +35,20 @@ public class Test05 implements StorageTest {
             { { new StringPair( "Id", "Num1" ) },
               { new StringPair( "Target", "TargetURLValue1" ), new StringPair( "Id", "Num6" ) },
               { new StringPair( "Target", "" ), new StringPair( "Id", "Num7" ) },
-              { new StringPair( "Id", "Num2" ), new StringPair( "TargetType", "Internal1" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value 1" ) },
-              { new StringPair( "Id", "Num3" ), new StringPair( "TargetType", "Internal1" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value 1" ) },
-              { new StringPair( "Id", "Num4" ), new StringPair( "TargetType", "Internal1" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value 1" ) },
-              { new StringPair( "Id", "Num5" ), new StringPair( "TargetType", "" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value1" ) }
+              { new StringPair( "Id", "Num2" ), new StringPair( "TargetMode", "Internal1" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value 1" ) },
+              { new StringPair( "Id", "Num3" ), new StringPair( "TargetMode", "Internal1" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value 1" ) },
+              { new StringPair( "Id", "Num4" ), new StringPair( "TargetMode", "Internal1" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value 1" ) },
+              { new StringPair( "Id", "Num5" ), new StringPair( "TargetMode", "" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value1" ) }
             };
 
         StringPair[][] aRelations2 =
             { { new StringPair( "Id", "Num1" ) },
               { new StringPair( "Target", "TargetURLValue2" ), new StringPair( "Id", "Num6" ) },
               { new StringPair( "Target", "" ), new StringPair( "Id", "Num7" ) },
-              { new StringPair( "Id", "Num2" ), new StringPair( "TargetType", "Internal2" ), new StringPair( "Type", "unknown2" ), new StringPair( "Target", "URL value 2" ) },
-              { new StringPair( "Id", "Num3" ), new StringPair( "TargetType", "Internal2" ), new StringPair( "Type", "unknown2" ), new StringPair( "Target", "URL value 2" ) },
-              { new StringPair( "Id", "Num4" ), new StringPair( "TargetType", "Internal2" ), new StringPair( "Type", "unknown" ), new StringPair( "Target", "URL value" ) },
-              { new StringPair( "Id", "Num5" ), new StringPair( "TargetType", "" ), new StringPair( "Type", "unknown" ), new StringPair( "Target", "URL value" ) }
+              { new StringPair( "Id", "Num2" ), new StringPair( "TargetMode", "Internal2" ), new StringPair( "Type", "unknown2" ), new StringPair( "Target", "URL value 2" ) },
+              { new StringPair( "Id", "Num3" ), new StringPair( "TargetMode", "Internal2" ), new StringPair( "Type", "unknown2" ), new StringPair( "Target", "URL value 2" ) },
+              { new StringPair( "Id", "Num4" ), new StringPair( "TargetMode", "Internal2" ), new StringPair( "Type", "unknown" ), new StringPair( "Target", "URL value" ) },
+              { new StringPair( "Id", "Num5" ), new StringPair( "TargetMode", "" ), new StringPair( "Type", "unknown" ), new StringPair( "Target", "URL value" ) }
             };
 
         try
diff --git a/package/qa/ofopxmlstorages/Test07.java b/package/qa/ofopxmlstorages/Test07.java
index aa2890287..5499281c5 100644
--- a/package/qa/ofopxmlstorages/Test07.java
+++ b/package/qa/ofopxmlstorages/Test07.java
@@ -36,20 +36,20 @@ public class Test07 implements StorageTest {
             { { new StringPair( "Id", "Num1" ) },
               { new StringPair( "Target", "TargetURLValue1" ), new StringPair( "Id", "Num6" ) },
               { new StringPair( "Target", "" ), new StringPair( "Id", "Num7" ) },
-              { new StringPair( "Id", "Num2" ), new StringPair( "TargetType", "Internal1" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value 1" ) },
-              { new StringPair( "Id", "Num3" ), new StringPair( "TargetType", "Internal1" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value 1" ) },
-              { new StringPair( "Id", "Num4" ), new StringPair( "TargetType", "Internal1" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value 1" ) },
-              { new StringPair( "Id", "Num5" ), new StringPair( "TargetType", "" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value1" ) }
+              { new StringPair( "Id", "Num2" ), new StringPair( "TargetMode", "Internal1" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value 1" ) },
+              { new StringPair( "Id", "Num3" ), new StringPair( "TargetMode", "Internal1" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value 1" ) },
+              { new StringPair( "Id", "Num4" ), new StringPair( "TargetMode", "Internal1" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value 1" ) },
+              { new StringPair( "Id", "Num5" ), new StringPair( "TargetMode", "" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value1" ) }
             };
 
         StringPair[][] aRelations2 =
             { { new StringPair( "Id", "Num1" ) },
               { new StringPair( "Target", "TargetURLValue2" ), new StringPair( "Id", "Num6" ) },
               { new StringPair( "Target", "" ), new StringPair( "Id", "Num7" ) },
-              { new StringPair( "Id", "Num2" ), new StringPair( "TargetType", "Internal2" ), new StringPair( "Type", "unknown2" ), new StringPair( "Target", "URL value 2" ) },
-              { new StringPair( "Id", "Num3" ), new StringPair( "TargetType", "Internal2" ), new StringPair( "Type", "unknown2" ), new StringPair( "Target", "URL value 2" ) },
-              { new StringPair( "Id", "Num4" ), new StringPair( "TargetType", "Internal2" ), new StringPair( "Type", "unknown" ), new StringPair( "Target", "URL value" ) },
-              { new StringPair( "Id", "Num5" ), new StringPair( "TargetType", "" ), new StringPair( "Type", "unknown" ), new StringPair( "Target", "URL value" ) }
+              { new StringPair( "Id", "Num2" ), new StringPair( "TargetMode", "Internal2" ), new StringPair( "Type", "unknown2" ), new StringPair( "Target", "URL value 2" ) },
+              { new StringPair( "Id", "Num3" ), new StringPair( "TargetMode", "Internal2" ), new StringPair( "Type", "unknown2" ), new StringPair( "Target", "URL value 2" ) },
+              { new StringPair( "Id", "Num4" ), new StringPair( "TargetMode", "Internal2" ), new StringPair( "Type", "unknown" ), new StringPair( "Target", "URL value" ) },
+              { new StringPair( "Id", "Num5" ), new StringPair( "TargetMode", "" ), new StringPair( "Type", "unknown" ), new StringPair( "Target", "URL value" ) }
             };
 
         try
diff --git a/package/qa/ofopxmlstorages/Test08.java b/package/qa/ofopxmlstorages/Test08.java
index ce9a2e5ad..ab7f9b14b 100644
--- a/package/qa/ofopxmlstorages/Test08.java
+++ b/package/qa/ofopxmlstorages/Test08.java
@@ -36,10 +36,10 @@ public class Test08 implements StorageTest {
             { { new StringPair( "Id", "Num1" ) },
               { new StringPair( "Target", "TargetURLValue1" ), new StringPair( "Id", "Num6" ) },
               { new StringPair( "Target", "" ), new StringPair( "Id", "Num7" ) },
-              { new StringPair( "Id", "Num2" ), new StringPair( "TargetType", "Internal1" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value 1" ) },
-              { new StringPair( "Id", "Num3" ), new StringPair( "TargetType", "Internal1" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value 1" ) },
-              { new StringPair( "Id", "Num4" ), new StringPair( "TargetType", "Internal1" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value 1" ) },
-              { new StringPair( "Id", "Num5" ), new StringPair( "TargetType", "" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value1" ) }
+              { new StringPair( "Id", "Num2" ), new StringPair( "TargetMode", "Internal1" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value 1" ) },
+              { new StringPair( "Id", "Num3" ), new StringPair( "TargetMode", "Internal1" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value 1" ) },
+              { new StringPair( "Id", "Num4" ), new StringPair( "TargetMode", "Internal1" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value 1" ) },
+              { new StringPair( "Id", "Num5" ), new StringPair( "TargetMode", "" ), new StringPair( "Type", "unknown1" ), new StringPair( "Target", "URL value1" ) }
             };
 
         try
diff --git a/package/qa/storages/Test13.java b/package/qa/storages/Test13.java
index e771db884..2dffe52ca 100644
--- a/package/qa/storages/Test13.java
+++ b/package/qa/storages/Test13.java
@@ -117,10 +117,10 @@ public class Test13 implements StorageTest {
             if ( !m_aTestHelper.checkStorageProperties( xTempFileStorage, "MediaType3", true, ElementModes.WRITE ) )
                 return false;
 
-            if ( !m_aTestHelper.checkStreamH( xTempFileStorage, aSubStream1Path, "MediaType1", pBytes1 ) )
+            if ( !m_aTestHelper.checkStreamH( xTempFileStorage, aSubStream1Path, "MediaType1", true, pBytes1 ) )
                 return false;
 
-            if ( !m_aTestHelper.checkStreamH( xTempFileStorage, aSubStream2Path, "MediaType2", pBytes2 ) )
+            if ( !m_aTestHelper.checkStreamH( xTempFileStorage, aSubStream2Path, "MediaType2", false, pBytes2 ) )
                 return false;
 
             if ( !m_aTestHelper.cantOpenStreamH( xTempFileStorage, aSubStream3Path, ElementModes.READ ) )
@@ -162,11 +162,11 @@ public class Test13 implements StorageTest {
             if ( !m_aTestHelper.checkStorageProperties( xResultStorage, "MediaType3", true, ElementModes.READ ) )
                 return false;
 
-            if ( !m_aTestHelper.checkStreamH( xResultStorage, aSubStream1Path, "MediaType3", pBytes2 ) )
+            if ( !m_aTestHelper.checkStreamH( xResultStorage, aSubStream1Path, "MediaType3", true, pBytes2 ) )
                 return false;
 
             // the following stream was not commited last time, so the last change must be lost
-            if ( !m_aTestHelper.checkStreamH( xResultStorage, aSubStream2Path, "MediaType2", pBytes2 ) )
+            if ( !m_aTestHelper.checkStreamH( xResultStorage, aSubStream2Path, "MediaType2", false, pBytes2 ) )
                 return false;
 
             // dispose used storages to free resources
diff --git a/package/qa/storages/Test15.java b/package/qa/storages/Test15.java
index cffe77701..ca89cfa19 100644
--- a/package/qa/storages/Test15.java
+++ b/package/qa/storages/Test15.java
@@ -169,10 +169,10 @@ public class Test15 implements StorageTest {
             if ( !m_aTestHelper.checkEncrStreamH( xTempFileStorage, aSubStream1Path, "MediaType1", pBytes1, sPass1 ) )
                 return false;
 
-            if ( !m_aTestHelper.checkStreamH( xTempFileStorage, aSubStream2Path, "MediaType2", pBytes2 ) )
+            if ( !m_aTestHelper.checkStreamH( xTempFileStorage, aSubStream2Path, "MediaType2", true, pBytes2 ) )
                 return false;
 
-            if ( !m_aTestHelper.checkStreamH( xTempFileStorage, aSubStream3Path, "MediaType3", pBytes2 ) )
+            if ( !m_aTestHelper.checkStreamH( xTempFileStorage, aSubStream3Path, "MediaType3", true, pBytes2 ) )
                 return false;
 
             if ( !m_aTestHelper.cantOpenEncrStreamH( xTempFileStorage, aSubStream4Path, ElementModes.READ, sPass1 ) )
@@ -242,10 +242,10 @@ public class Test15 implements StorageTest {
             if ( !m_aTestHelper.checkStorageProperties( xResultStorage, "MediaType3", true, ElementModes.READ ) )
                 return false;
 
-            if ( !m_aTestHelper.checkStreamH( xResultStorage, aSubStream1Path, "MediaType4", pBytes2 ) )
+            if ( !m_aTestHelper.checkStreamH( xResultStorage, aSubStream1Path, "MediaType4", true, pBytes2 ) )
                 return false;
 
-            if ( !m_aTestHelper.checkStreamH( xResultStorage, aSubStream2Path, "MediaType5", pBytes1 ) )
+            if ( !m_aTestHelper.checkStreamH( xResultStorage, aSubStream2Path, "MediaType5", true, pBytes1 ) )
                 return false;
 
             if ( !m_aTestHelper.checkEncrStreamH( xResultStorage, aSubStream3Path, "MediaType3", pBytes2, sPass2 ) )