INTEGRATION: CWS fwk79 (1.2.44); FILE MERGED

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

3 files changed, 16 insertions, 16 deletions

diff --git a/package/qa/ofopxmlstorages/Test01.java b/package/qa/ofopxmlstorages/Test01.java
index 0fe4c6a0aeec..abb73c3fc48b 100644
--- a/package/qa/ofopxmlstorages/Test01.java
+++ b/package/qa/ofopxmlstorages/Test01.java
@@ -34,20 +34,20 @@ public class Test01 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/Test02.java b/package/qa/ofopxmlstorages/Test02.java
index 43930c92b96f..4ba7892b8295 100644
--- a/package/qa/ofopxmlstorages/Test02.java
+++ b/package/qa/ofopxmlstorages/Test02.java
@@ -38,10 +38,10 @@ public class Test02 implements StorageTest {
                 { { new StringPair( "Id", "Num1" ) },
                   { new StringPair( "Target", "TargetURLValue" ), new StringPair( "Id", "Num6" ) },
                   { new StringPair( "Target", "" ), new StringPair( "Id", "Num7" ) },
-                  { new StringPair( "Id", "Num2" ), new StringPair( "TargetType", "Internal" ), new StringPair( "Type", "unknown" ), new StringPair( "Target", "URL value" ) },
-                  { new StringPair( "Id", "Num3" ), new StringPair( "TargetType", "Internal" ), new StringPair( "Type", "unknown" ), new StringPair( "Target", "URL value" ) },
-                  { new StringPair( "Id", "Num4" ), new StringPair( "TargetType", "Internal" ), 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", "Internal" ), new StringPair( "Type", "unknown" ), new StringPair( "Target", "URL value" ) },
+                  { new StringPair( "Id", "Num3" ), new StringPair( "TargetMode", "Internal" ), new StringPair( "Type", "unknown" ), new StringPair( "Target", "URL value" ) },
+                  { new StringPair( "Id", "Num4" ), new StringPair( "TargetMode", "Internal" ), 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" ) }
                 };
 
 
diff --git a/package/qa/ofopxmlstorages/Test03.java b/package/qa/ofopxmlstorages/Test03.java
index 36aa06297031..e3424c9106f2 100644
--- a/package/qa/ofopxmlstorages/Test03.java
+++ b/package/qa/ofopxmlstorages/Test03.java
@@ -37,10 +37,10 @@ public class Test03 implements StorageTest {
                 { { new StringPair( "Id", "Num1" ) },
                   { new StringPair( "Target", "TargetURLValue" ), new StringPair( "Id", "Num6" ) },
                   { new StringPair( "Target", "" ), new StringPair( "Id", "Num7" ) },
-                  { new StringPair( "Id", "Num2" ), new StringPair( "TargetType", "Internal" ), new StringPair( "Type", "unknown" ), new StringPair( "Target", "URL value" ) },
-                  { new StringPair( "Id", "Num3" ), new StringPair( "TargetType", "Internal" ), new StringPair( "Type", "unknown" ), new StringPair( "Target", "URL value" ) },
-                  { new StringPair( "Id", "Num4" ), new StringPair( "TargetType", "Internal" ), 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", "Internal" ), new StringPair( "Type", "unknown" ), new StringPair( "Target", "URL value" ) },
+                  { new StringPair( "Id", "Num3" ), new StringPair( "TargetMode", "Internal" ), new StringPair( "Type", "unknown" ), new StringPair( "Target", "URL value" ) },
+                  { new StringPair( "Id", "Num4" ), new StringPair( "TargetMode", "Internal" ), 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" ) }
                 };
 
             // create temporary storage based on arbitrary medium