Index: sal/test/teststring.cxx
===================================================================
RCS file: /cvs/oo/porting/sal/test/teststring.cxx,v
retrieving revision 1.3
diff -u -r1.3 teststring.cxx
--- sal/test/teststring.cxx	2001/03/16 15:39:06	1.3
+++ sal/test/teststring.cxx	2001/07/18 23:24:50
@@ -141,17 +141,17 @@
 #endif
     
 	OString s7("HaLLo");
-	s7 = s7.toLowerCase();
+	s7 = s7.toAsciiLowerCase();
 	TEST_ENSHURE( s7 == "hallo", "test_OString error 19");	
-	s7 = s7.toUpperCase();
+	s7 = s7.toAsciiUpperCase();
 	TEST_ENSHURE( s7 == "HALLO", "test_OString error 20");	
 
 	OString s8("HaLLo ICH BIn eIn StRiNg");
-	s7 = s8.toLowerCase();
+	s7 = s8.toAsciiLowerCase();
 
-	TEST_ENSHURE( s8.equalsIgnoreCase(s7), "test_OString error 21");	
+	TEST_ENSHURE( s8.equalsIgnoreAsciiCase(s7), "test_OString error 21");	
 	
-	s8 = s7.toUpperCase();
+	s8 = s7.toAsciiUpperCase();
 	TEST_ENSHURE( s8 == "HALLO ICH BIN EIN STRING", "test_OString error 22");	
 
 	s7 = "          ";
@@ -179,40 +179,40 @@
 
 	s8 = s8.replace('l', 'r');
 	TEST_ENSHURE( s8 == "Harro", "test_OString error 33");	
-	TEST_ENSHURE( s8.len() == 5, "test_OString error 34");	
+	TEST_ENSHURE( s8.getLength() == 5, "test_OString error 34");	
 	
 	//       "Ich bin ein String mit einem A und C und vielen m, m, m, m"
 	//		  |	   |	|	 |	  |	   |	|	 |	  |	   |	|	 |
 	//index	  0	   5	10	 15	  20   25	30	 35	  40   45	50	 55
 	s8 = "Ich bin ein String mit einem A und C und vielen m, m, m, m";
-	TEST_ENSHURE( s8.search('I') == 0, "test_OString error 35");	
-	TEST_ENSHURE( s8.search('A') == 29, "test_OString error 36");	
+	TEST_ENSHURE( s8.indexOf('I') == 0, "test_OString error 35");	
+	TEST_ENSHURE( s8.indexOf('A') == 29, "test_OString error 36");	
 	s7 = "A und C";
-	TEST_ENSHURE( s8.search(s7) == 29, "test_OString error 37");	
-	TEST_ENSHURE( s8.search("mit einem A") == 19, "test_OString error 38");	
+	TEST_ENSHURE( s8.indexOf(s7) == 29, "test_OString error 37");	
+	TEST_ENSHURE( s8.indexOf("mit einem A") == 19, "test_OString error 38");	
 
 	s8 = "||token1|token2|token3||token4|token5||";
-	TEST_ENSHURE( s8.getTokenCount('|') == 10, "test_OString error 39a");	
-	TEST_ENSHURE( s8.getToken(10,'|') == "", "test_OString error 40a");	
+	//TEST_ENSHURE( s8.getTokenCount('|') == 10, "test_OString error 39a");	
+	TEST_ENSHURE( s8.getToken(10,'|',0) == "", "test_OString error 40a");	
 
 	s8 = "token1";
-	TEST_ENSHURE( s8.getTokenCount('|') == 1, "test_OString error 39b");	
-	TEST_ENSHURE( s8.getToken(0,'|') == "token1", "test_OString error 40b");	
-	TEST_ENSHURE( s8.getToken(-1,'|') == "", "test_OString error 40c");	
-	TEST_ENSHURE( s8.getToken(1,'|') == "", "test_OString error 40d");	
+	//TEST_ENSHURE( s8.getTokenCount('|') == 1, "test_OString error 39b");	
+	TEST_ENSHURE( s8.getToken(0,'|',0) == "token1", "test_OString error 40b");	
+	TEST_ENSHURE( s8.getToken(-1,'|',0) == "", "test_OString error 40c");	
+	TEST_ENSHURE( s8.getToken(1,'|',0) == "", "test_OString error 40d");	
 
 	s8 = "|hallo1|hallo2|hallo3|hallo4|hallo5|hallo6|hallo7|hallo8|";
-	TEST_ENSHURE( s8.getTokenCount('|') == 10, "test_OString error 39");	
-	TEST_ENSHURE( s8.getToken(3,'|') == "hallo3", "test_OString error 40");	
+	//TEST_ENSHURE( s8.getTokenCount('|') == 10, "test_OString error 39");	
+	TEST_ENSHURE( s8.getToken(3,'|',0) == "hallo3", "test_OString error 40");	
 
 	char* Tokens[10] = { "", "hallo1", "hallo2", "hallo3", "hallo4",
 						 "hallo5", "hallo6", "hallo7", "hallo8", "" };
 	
-	for (sal_Int32 i = 0; i < s8.getTokenCount('|'); i++)
+/*	for (sal_Int32 i = 0; i < s8.getTokenCount('|'); i++)
 	{
-		TEST_ENSHURE( s8.getToken(i,'|') == Tokens[i], "test_OString error 40e");	
+		TEST_ENSHURE( s8.getToken(i,'|',0) == Tokens[i], "test_OString error 40e");	
 	}
-
+*/
 	s7 = "";
 	s7 += s8;
 	TEST_ENSHURE( s7 == s8, "test_OString error 41");