Skip to content

R
riscv-gcc-1
Commit 53723190 by Paolo Carlini Committed by Paolo Carlini
Options

2002-03-15 Paolo Carlini <pcarlini@unitus.it> 

        * testsuite/22_locale/collate_members_char.cc
	(test01): compare the result of collate::compare with
	that of collate::transform + string::compare, not with
	that of collate::transform + collate::compare.
	(test01): values returned by collate::compare are
	normalized, therefore test against +-1.
	* testsuite/22_locale/collate_members_wchar_t.cc: Ditto.

From-SVN: r50808
parent 190f4916
Showing with 40 additions and 30 deletions
libstdc++-v3/ChangeLog
2002-03-15 Paolo Carlini <pcarlini@unitus.it>
* testsuite/22_locale/collate_members_char.cc
(test01): compare the result of collate::compare with
that of collate::transform + string::compare, not with
that of collate::transform + collate::compare.
(test01): values returned by collate::compare are
normalized, therefore test against +-1.
* testsuite/22_locale/collate_members_wchar_t.cc: Ditto.
2002-03-12 Loren Rittle <ljrittle@acm.org> 2002-03-12 Loren Rittle <ljrittle@acm.org>
reported by Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de> reported by Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de>
......
libstdc++-v3/testsuite/22_locale/collate_members_char.cc
...@@ -60,18 +60,18 @@ void test01() ...@@ -60,18 +60,18 @@ void test01()
int i1; int i1;
int size1 = strlen(strlit1) - 1; int size1 = strlen(strlit1) - 1;
i1 = coll_c.compare(strlit1, strlit1 + size1, strlit1, strlit1 + 7); i1 = coll_c.compare(strlit1, strlit1 + size1, strlit1, strlit1 + 7);
VERIFY ( i1 > 0 ); VERIFY ( i1 == 1 );
i1 = coll_c.compare(strlit1, strlit1 + 7, strlit1, strlit1 + size1); i1 = coll_c.compare(strlit1, strlit1 + 7, strlit1, strlit1 + size1);
VERIFY ( i1 < 0 ); VERIFY ( i1 == -1 );
i1 = coll_c.compare(strlit1, strlit1 + 7, strlit1, strlit1 + 7); i1 = coll_c.compare(strlit1, strlit1 + 7, strlit1, strlit1 + 7);
VERIFY ( i1 == 0 ); VERIFY ( i1 == 0 );
int i2; int i2;
int size2 = strlen(strlit2) - 1; int size2 = strlen(strlit2) - 1;
i2 = coll_c.compare(strlit2, strlit2 + size2, strlit2, strlit2 + 13); i2 = coll_c.compare(strlit2, strlit2 + size2, strlit2, strlit2 + 13);
VERIFY ( i2 > 0 ); VERIFY ( i2 == 1 );
i2 = coll_c.compare(strlit2, strlit2 + 13, strlit2, strlit2 + size2); i2 = coll_c.compare(strlit2, strlit2 + 13, strlit2, strlit2 + size2);
VERIFY ( i2 < 0 ); VERIFY ( i2 == -1 );
i2 = coll_c.compare(strlit2, strlit2 + size2, strlit2, strlit2 + size2); i2 = coll_c.compare(strlit2, strlit2 + size2, strlit2, strlit2 + size2);
VERIFY ( i2 == 0 ); VERIFY ( i2 == 0 );
...@@ -86,10 +86,10 @@ void test01() ...@@ -86,10 +86,10 @@ void test01()
string str1 = coll_c.transform(strlit1, strlit1 + size1); string str1 = coll_c.transform(strlit1, strlit1 + size1);
string str2 = coll_c.transform(strlit2, strlit2 + size2); string str2 = coll_c.transform(strlit2, strlit2 + size2);
i1 = coll_c.compare(str1.c_str(), str1.c_str() + size1, i1 = str1.compare(str2);
str2.c_str(), str2.c_str() + size2);
i2 = coll_c.compare(strlit1, strlit1 + size1, strlit2, strlit2 + size2); i2 = coll_c.compare(strlit1, strlit1 + size1, strlit2, strlit2 + size2);
VERIFY(i1 == i2); VERIFY ( i2 == 1 );
VERIFY ( i1 * i2 > 0 );
// Check German "de_DE" locale. // Check German "de_DE" locale.
const char* strlit3 = "uglein Augment"; // "C" == "Augment uglein" const char* strlit3 = "uglein Augment"; // "C" == "Augment uglein"
...@@ -97,20 +97,20 @@ void test01() ...@@ -97,20 +97,20 @@ void test01()
int size3 = strlen(strlit3) - 1; int size3 = strlen(strlit3) - 1;
i1 = coll_de.compare(strlit3, strlit3 + size3, strlit3, strlit3 + 7); i1 = coll_de.compare(strlit3, strlit3 + size3, strlit3, strlit3 + 7);
VERIFY ( i1 > 0 ); VERIFY ( i1 == 1 );
i1 = coll_de.compare(strlit3, strlit3 + 7, strlit3, strlit3 + size1); i1 = coll_de.compare(strlit3, strlit3 + 7, strlit3, strlit3 + size1);
VERIFY ( i1 < 0 ); VERIFY ( i1 == -1 );
i1 = coll_de.compare(strlit3, strlit3 + 7, strlit3, strlit3 + 7); i1 = coll_de.compare(strlit3, strlit3 + 7, strlit3, strlit3 + 7);
VERIFY ( i1 == 0 ); VERIFY ( i1 == 0 );
i1 = coll_de.compare(strlit3, strlit3 + 6, strlit3 + 8, strlit3 + 14); i1 = coll_de.compare(strlit3, strlit3 + 6, strlit3 + 8, strlit3 + 14);
VERIFY ( i1 < 0 ); VERIFY ( i1 == -1 );
int size4 = strlen(strlit4) - 1; int size4 = strlen(strlit4) - 1;
i2 = coll_de.compare(strlit4, strlit4 + size4, strlit4, strlit4 + 13); i2 = coll_de.compare(strlit4, strlit4 + size4, strlit4, strlit4 + 13);
VERIFY ( i2 > 0 ); VERIFY ( i2 == 1 );
i2 = coll_de.compare(strlit4, strlit4 + 13, strlit4, strlit4 + size4); i2 = coll_de.compare(strlit4, strlit4 + 13, strlit4, strlit4 + size4);
VERIFY ( i2 < 0 ); VERIFY ( i2 == -1 );
i2 = coll_de.compare(strlit4, strlit4 + size4, strlit4, strlit4 + size4); i2 = coll_de.compare(strlit4, strlit4 + size4, strlit4, strlit4 + size4);
VERIFY ( i2 == 0 ); VERIFY ( i2 == 0 );
...@@ -123,10 +123,10 @@ void test01() ...@@ -123,10 +123,10 @@ void test01()
string str3 = coll_de.transform(strlit3, strlit3 + size3); string str3 = coll_de.transform(strlit3, strlit3 + size3);
string str4 = coll_de.transform(strlit4, strlit4 + size4); string str4 = coll_de.transform(strlit4, strlit4 + size4);
i1 = coll_de.compare(str3.c_str(), str3.c_str() + size3, i1 = str3.compare(str4);
str4.c_str(), str4.c_str() + size4);
i2 = coll_de.compare(strlit3, strlit3 + size3, strlit4, strlit4 + size4); i2 = coll_de.compare(strlit3, strlit3 + size3, strlit4, strlit4 + size4);
VERIFY(i1 == i2); VERIFY ( i2 == -1 );
VERIFY ( i1 * i2 > 0 );
} }
// libstdc++/5280 // libstdc++/5280
......
libstdc++-v3/testsuite/22_locale/collate_members_wchar_t.cc
...@@ -60,18 +60,18 @@ void test01() ...@@ -60,18 +60,18 @@ void test01()
int i1; int i1;
int size1 = char_traits<wchar_t>::length(strlit1) - 1; int size1 = char_traits<wchar_t>::length(strlit1) - 1;
i1 = coll_c.compare(strlit1, strlit1 + size1, strlit1, strlit1 + 7); i1 = coll_c.compare(strlit1, strlit1 + size1, strlit1, strlit1 + 7);
VERIFY ( i1 > 0 ); VERIFY ( i1 == 1 );
i1 = coll_c.compare(strlit1, strlit1 + 7, strlit1, strlit1 + size1); i1 = coll_c.compare(strlit1, strlit1 + 7, strlit1, strlit1 + size1);
VERIFY ( i1 < 0 ); VERIFY ( i1 == -1 );
i1 = coll_c.compare(strlit1, strlit1 + 7, strlit1, strlit1 + 7); i1 = coll_c.compare(strlit1, strlit1 + 7, strlit1, strlit1 + 7);
VERIFY ( i1 == 0 ); VERIFY ( i1 == 0 );
int i2; int i2;
int size2 = char_traits<wchar_t>::length(strlit2) - 1; int size2 = char_traits<wchar_t>::length(strlit2) - 1;
i2 = coll_c.compare(strlit2, strlit2 + size2, strlit2, strlit2 + 13); i2 = coll_c.compare(strlit2, strlit2 + size2, strlit2, strlit2 + 13);
VERIFY ( i2 > 0 ); VERIFY ( i2 == 1 );
i2 = coll_c.compare(strlit2, strlit2 + 13, strlit2, strlit2 + size2); i2 = coll_c.compare(strlit2, strlit2 + 13, strlit2, strlit2 + size2);
VERIFY ( i2 < 0 ); VERIFY ( i2 == -1 );
i2 = coll_c.compare(strlit2, strlit2 + size2, strlit2, strlit2 + size2); i2 = coll_c.compare(strlit2, strlit2 + size2, strlit2, strlit2 + size2);
VERIFY ( i2 == 0 ); VERIFY ( i2 == 0 );
...@@ -86,10 +86,10 @@ void test01() ...@@ -86,10 +86,10 @@ void test01()
wstring str1 = coll_c.transform(strlit1, strlit1 + size1); wstring str1 = coll_c.transform(strlit1, strlit1 + size1);
wstring str2 = coll_c.transform(strlit2, strlit2 + size2); wstring str2 = coll_c.transform(strlit2, strlit2 + size2);
i1 = coll_c.compare(str1.c_str(), str1.c_str() + size1, i1 = str1.compare(str2);
str2.c_str(), str2.c_str() + size2);
i2 = coll_c.compare(strlit1, strlit1 + size1, strlit2, strlit2 + size2); i2 = coll_c.compare(strlit1, strlit1 + size1, strlit2, strlit2 + size2);
VERIFY(i1 == i2); VERIFY ( i2 == 1 );
VERIFY ( i1 * i2 > 0 );
// Check German "de_DE" locale. // Check German "de_DE" locale.
const wchar_t* strlit3 = L"uglein Augment"; // "C" == "Augment uglein" const wchar_t* strlit3 = L"uglein Augment"; // "C" == "Augment uglein"
...@@ -97,20 +97,20 @@ void test01() ...@@ -97,20 +97,20 @@ void test01()
int size3 = char_traits<wchar_t>::length(strlit3) - 1; int size3 = char_traits<wchar_t>::length(strlit3) - 1;
i1 = coll_de.compare(strlit3, strlit3 + size3, strlit3, strlit3 + 7); i1 = coll_de.compare(strlit3, strlit3 + size3, strlit3, strlit3 + 7);
VERIFY ( i1 > 0 ); VERIFY ( i1 == 1 );
i1 = coll_de.compare(strlit3, strlit3 + 7, strlit3, strlit3 + size1); i1 = coll_de.compare(strlit3, strlit3 + 7, strlit3, strlit3 + size1);
VERIFY ( i1 < 0 ); VERIFY ( i1 == -1 );
i1 = coll_de.compare(strlit3, strlit3 + 7, strlit3, strlit3 + 7); i1 = coll_de.compare(strlit3, strlit3 + 7, strlit3, strlit3 + 7);
VERIFY ( i1 == 0 ); VERIFY ( i1 == 0 );
i1 = coll_de.compare(strlit3, strlit3 + 6, strlit3 + 8, strlit3 + 14); i1 = coll_de.compare(strlit3, strlit3 + 6, strlit3 + 8, strlit3 + 14);
VERIFY ( i1 < 0 ); VERIFY ( i1 == -1 );
int size4 = char_traits<wchar_t>::length(strlit4) - 1; int size4 = char_traits<wchar_t>::length(strlit4) - 1;
i2 = coll_de.compare(strlit4, strlit4 + size4, strlit4, strlit4 + 13); i2 = coll_de.compare(strlit4, strlit4 + size4, strlit4, strlit4 + 13);
VERIFY ( i2 > 0 ); VERIFY ( i2 == 1 );
i2 = coll_de.compare(strlit4, strlit4 + 13, strlit4, strlit4 + size4); i2 = coll_de.compare(strlit4, strlit4 + 13, strlit4, strlit4 + size4);
VERIFY ( i2 < 0 ); VERIFY ( i2 == -1 );
i2 = coll_de.compare(strlit4, strlit4 + size4, strlit4, strlit4 + size4); i2 = coll_de.compare(strlit4, strlit4 + size4, strlit4, strlit4 + size4);
VERIFY ( i2 == 0 ); VERIFY ( i2 == 0 );
...@@ -123,10 +123,10 @@ void test01() ...@@ -123,10 +123,10 @@ void test01()
wstring str3 = coll_de.transform(strlit3, strlit3 + size3); wstring str3 = coll_de.transform(strlit3, strlit3 + size3);
wstring str4 = coll_de.transform(strlit4, strlit4 + size4); wstring str4 = coll_de.transform(strlit4, strlit4 + size4);
i1 = coll_de.compare(str3.c_str(), str3.c_str() + size3, i1 = str3.compare(str4);
str4.c_str(), str4.c_str() + size4);
i2 = coll_de.compare(strlit3, strlit3 + size3, strlit4, strlit4 + size4); i2 = coll_de.compare(strlit3, strlit3 + size3, strlit4, strlit4 + size4);
VERIFY(i1 == i2); VERIFY ( i2 == -1 );
VERIFY ( i1 * i2 > 0 );
} }
// libstdc++/5280 // libstdc++/5280
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment