--- a/icu/internaltests/ucnv_getMaxCharSize.c	Thu Nov 04 09:46:19 2010 +0100
+++ b/icu/internaltests/ucnv_getMaxCharSize.c	Mon Nov 08 11:35:41 2010 +0100
@@ -71,17 +71,17 @@
     	printf("ucnv_getMaxCharSize() for ISO-2022-KR returned %d -- failed.\n", i);
     if (convto) ucnv_close(convto);
 
-    printf("\nChecking ucnv_getMaxCharSize() return value of ISO-2022 conversion:\n");
-    convto = ucnv_open("ISO-2022", &err);
+    printf("\nChecking ucnv_getMaxCharSize() return value of ISO-2022-CN conversion:\n");
+    convto = ucnv_open("ISO-2022-CN", &err);
     if (U_FAILURE(err)) {
-	fprintf(stderr, "ucnv_open on ISO-2022 error - exiting.\n");
+	fprintf(stderr, "ucnv_open on ISO-2022-CN error - exiting.\n");
 	exit(-1);
     }
 
     i = ucnv_getMaxCharSize(convto);
-    if (i == 9)
-    	printf("ucnv_getMaxCharSize() for ISO-2022 returned %d -- success.\n", i);
+    if (i == 8)
+    	printf("ucnv_getMaxCharSize() for ISO-2022-CN returned %d -- success.\n", i);
     else
-    	printf("ucnv_getMaxCharSize() for ISO-2022 returned %d -- failed.\n", i);
+    	printf("ucnv_getMaxCharSize() for ISO-2022-CN returned %d -- failed.\n", i);
     if (convto) ucnv_close(convto);
 }

--- a/icu/internaltests/ucnv_toUChars.c	Thu Nov 04 09:46:19 2010 +0100
+++ b/icu/internaltests/ucnv_toUChars.c	Mon Nov 08 11:35:41 2010 +0100
@@ -38,6 +38,10 @@
 		exit (-1);
 	}
 
+	#the default behaviour changed to replace invalid bytes with a replacement character.
+	#disable callback:
+	ucnv_setToUCallBack(ucnv, UCNV_TO_U_CALLBACK_STOP, NULL, NULL, NULL, &err);
+
 	count = ucnv_toUChars(ucnv, t, 100, "mp NaKn>NaKn|Mqr'NaKo:r'Piano Rec", 40, &err);
 
 	printf("Conversion finished with count: %d, err: 0x%x\n", count, err);