numpunct_members_char.cc (test01): Remove redundant sanity checks.

2001-09-20  Benjamin Kosnik  <bkoz@redhat.com>

	* testsuite/22_locale/numpunct_members_char.cc (test01): Remove
	redundant sanity checks.
	* testsuite/22_locale/money_put_members_wchar_t.cc (test01): Same.
	(test02): Same.
	* testsuite/22_locale/money_put_members_char.cc (test01): Same.
	(test02): Same.
	* testsuite/22_locale/moneypunct_members_wchar_t.cc (test01): Same.
	* testsuite/22_locale/moneypunct_members_char.cc (test01): Same.
	* testsuite/22_locale/money_get_members_wchar_t.cc (test01): Same.
	(test02): Same.
	* testsuite/22_locale/money_get_members_char.cc (test01): Same.
	(test02): Same.

From-SVN: r45703

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 762b18eb409b82d99699e1b90684ee5218ef9081..45145d05c66089889d10a01428e14bdc94e2c79e 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,18 @@
+2001-09-20  Benjamin Kosnik  <bkoz@redhat.com>
+
+       * testsuite/22_locale/numpunct_members_char.cc (test01): Remove
+       redundant sanity checks.
+       * testsuite/22_locale/money_put_members_wchar_t.cc (test01): Same.
+       (test02): Same.
+       * testsuite/22_locale/money_put_members_char.cc (test01): Same.
+       (test02): Same.
+       * testsuite/22_locale/moneypunct_members_wchar_t.cc (test01): Same.
+       * testsuite/22_locale/moneypunct_members_char.cc (test01): Same.
+       * testsuite/22_locale/money_get_members_wchar_t.cc (test01): Same.
+       (test02): Same.
+       * testsuite/22_locale/money_get_members_char.cc (test01): Same.
+       (test02): Same.
+
 2001-09-19  Benjamin Kosnik  <bkoz@redhat.com>
 
        Implement std::time_put.

diff --git a/libstdc++-v3/testsuite/22_locale/money_get_members_char.cc b/libstdc++-v3/testsuite/22_locale/money_get_members_char.cc
index a3e8ad670e97cb909626d1c51aa65828406e346f..86d59e8ea00de356e19ac5558e50606e8ffda6ea 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/money_get_members_char.cc
+++ b/libstdc++-v3/testsuite/22_locale/money_get_members_char.cc
@@ -36,24 +36,13 @@ void test01()
   typedef istreambuf_iterator<char> iterator_type;
 
   bool test = true;
-  string str;
 
   // basic construction
   locale loc_c = locale::classic();
-  str = loc_c.name();
-
   locale loc_hk("en_HK");
-  str = loc_hk.name();
-  VERIFY( loc_c != loc_hk );
-
   locale loc_fr("fr_FR@euro");
-  str = loc_fr.name();
-  VERIFY( loc_c != loc_fr );
-
   locale loc_de("de_DE");
-  str = loc_de.name();
   VERIFY( loc_c != loc_de );
-
   VERIFY( loc_hk != loc_fr );
   VERIFY( loc_hk != loc_de );
   VERIFY( loc_de != loc_fr );
@@ -192,24 +181,13 @@ void test02()
   typedef istreambuf_iterator<char> iterator_type;
 
   bool test = true;
-  string str;
 
   // basic construction
   locale loc_c = locale::classic();
-  str = loc_c.name();
-
   locale loc_hk("en_HK");
-  str = loc_hk.name();
-  VERIFY( loc_c != loc_hk );
-
   locale loc_fr("fr_FR@euro");
-  str = loc_fr.name();
-  VERIFY( loc_c != loc_fr );
-
   locale loc_de("de_DE");
-  str = loc_de.name();
   VERIFY( loc_c != loc_de );
-
   VERIFY( loc_hk != loc_fr );
   VERIFY( loc_hk != loc_de );
   VERIFY( loc_de != loc_fr );

diff --git a/libstdc++-v3/testsuite/22_locale/money_get_members_wchar_t.cc b/libstdc++-v3/testsuite/22_locale/money_get_members_wchar_t.cc
index da8fdfdc06f089624dea2685a861b079378734d0..9426c97ef4e2881f6bae00d9db62f7c63420170c 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/money_get_members_wchar_t.cc
+++ b/libstdc++-v3/testsuite/22_locale/money_get_members_wchar_t.cc
@@ -37,24 +37,13 @@ void test01()
   typedef istreambuf_iterator<wchar_t> iterator_type;
 
   bool test = true;
-  string str;
 
   // basic construction
   locale loc_c = locale::classic();
-  str = loc_c.name();
-
   locale loc_hk("en_HK");
-  str = loc_hk.name();
-  VERIFY( loc_c != loc_hk );
-
   locale loc_fr("fr_FR@euro");
-  str = loc_fr.name();
-  VERIFY( loc_c != loc_fr );
-
   locale loc_de("de_DE");
-  str = loc_de.name();
   VERIFY( loc_c != loc_de );
-
   VERIFY( loc_hk != loc_fr );
   VERIFY( loc_hk != loc_de );
   VERIFY( loc_de != loc_fr );
@@ -194,24 +183,13 @@ void test02()
   typedef istreambuf_iterator<wchar_t> iterator_type;
 
   bool test = true;
-  string str;
 
   // basic construction
   locale loc_c = locale::classic();
-  str = loc_c.name();
-
   locale loc_hk("en_HK");
-  str = loc_hk.name();
-  VERIFY( loc_c != loc_hk );
-
   locale loc_fr("fr_FR@euro");
-  str = loc_fr.name();
-  VERIFY( loc_c != loc_fr );
-
   locale loc_de("de_DE");
-  str = loc_de.name();
   VERIFY( loc_c != loc_de );
-
   VERIFY( loc_hk != loc_fr );
   VERIFY( loc_hk != loc_de );
   VERIFY( loc_de != loc_fr );

diff --git a/libstdc++-v3/testsuite/22_locale/money_put_members_char.cc b/libstdc++-v3/testsuite/22_locale/money_put_members_char.cc
index b6bc9a9d231ff3460d6f7dd86cd64dcd2dde7235..c0f8d1eb24377c1754657f57b53a832ce6ba2178 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/money_put_members_char.cc
+++ b/libstdc++-v3/testsuite/22_locale/money_put_members_char.cc
@@ -36,24 +36,13 @@ void test01()
   typedef ostreambuf_iterator<char> iterator_type;
 
   bool test = true;
-  string str;
 
   // basic construction
   locale loc_c = locale::classic();
-  str = loc_c.name();
-
   locale loc_hk("en_HK");
-  str = loc_hk.name();
-  VERIFY( loc_c != loc_hk );
-
   locale loc_fr("fr_FR@euro");
-  str = loc_fr.name();
-  VERIFY( loc_c != loc_fr );
-
   locale loc_de("de_DE");
-  str = loc_de.name();
   VERIFY( loc_c != loc_de );
-
   VERIFY( loc_hk != loc_fr );
   VERIFY( loc_hk != loc_de );
   VERIFY( loc_de != loc_fr );
@@ -181,24 +170,13 @@ void test02()
   typedef ostreambuf_iterator<char> iterator_type;
 
   bool test = true;
-  string str;
 
   // basic construction
   locale loc_c = locale::classic();
-  str = loc_c.name();
-
   locale loc_hk("en_HK");
-  str = loc_hk.name();
-  VERIFY( loc_c != loc_hk );
-
   locale loc_fr("fr_FR@euro");
-  str = loc_fr.name();
-  VERIFY( loc_c != loc_fr );
-
   locale loc_de("de_DE");
-  str = loc_de.name();
   VERIFY( loc_c != loc_de );
-
   VERIFY( loc_hk != loc_fr );
   VERIFY( loc_hk != loc_de );
   VERIFY( loc_de != loc_fr );

diff --git a/libstdc++-v3/testsuite/22_locale/money_put_members_wchar_t.cc b/libstdc++-v3/testsuite/22_locale/money_put_members_wchar_t.cc
index 6ff9f6fea597a651b0d82692c8e13ab5e535b797..b592e4f24eb8edba92ab34921ef93e9876b6fb5e 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/money_put_members_wchar_t.cc
+++ b/libstdc++-v3/testsuite/22_locale/money_put_members_wchar_t.cc
@@ -37,24 +37,13 @@ void test01()
   typedef ostreambuf_iterator<wchar_t> iterator_type;
 
   bool test = true;
-  string str;
 
   // basic construction
   locale loc_c = locale::classic();
-  str = loc_c.name();
-
   locale loc_hk("en_HK");
-  str = loc_hk.name();
-  VERIFY( loc_c != loc_hk );
-
   locale loc_fr("fr_FR@euro");
-  str = loc_fr.name();
-  VERIFY( loc_c != loc_fr );
-
   locale loc_de("de_DE");
-  str = loc_de.name();
   VERIFY( loc_c != loc_de );
-
   VERIFY( loc_hk != loc_fr );
   VERIFY( loc_hk != loc_de );
   VERIFY( loc_de != loc_fr );
@@ -181,24 +170,13 @@ void test02()
   typedef ostreambuf_iterator<wchar_t> iterator_type;
 
   bool test = true;
-  string str;
 
   // basic construction
   locale loc_c = locale::classic();
-  str = loc_c.name();
-
   locale loc_hk("en_HK");
-  str = loc_hk.name();
-  VERIFY( loc_c != loc_hk );
-
   locale loc_fr("fr_FR@euro");
-  str = loc_fr.name();
-  VERIFY( loc_c != loc_fr );
-
   locale loc_de("de_DE");
-  str = loc_de.name();
   VERIFY( loc_c != loc_de );
-
   VERIFY( loc_hk != loc_fr );
   VERIFY( loc_hk != loc_de );
   VERIFY( loc_de != loc_fr );

diff --git a/libstdc++-v3/testsuite/22_locale/moneypunct_members_char.cc b/libstdc++-v3/testsuite/22_locale/moneypunct_members_char.cc
index cfc91649a8ac11680693201838131c6b73df8bbc..97cf3340da60184a7fee19d58136277de98d3ab9 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/moneypunct_members_char.cc
+++ b/libstdc++-v3/testsuite/22_locale/moneypunct_members_char.cc
@@ -33,24 +33,13 @@ void test01()
   typedef money_base::pattern pattern;
 
   bool test = true;
-  string str;
 
   // basic construction
   locale loc_c = locale::classic();
-  str = loc_c.name();
-
   locale loc_us("en_US");
-  str = loc_us.name();
-  VERIFY( loc_c != loc_us );
-
   locale loc_fr("fr_FR");
-  str = loc_fr.name();
-  VERIFY( loc_c != loc_fr );
-
   locale loc_de("de_DE");
-  str = loc_de.name();
   VERIFY( loc_c != loc_de );
-
   VERIFY( loc_us != loc_fr );
   VERIFY( loc_us != loc_de );
   VERIFY( loc_de != loc_fr );

diff --git a/libstdc++-v3/testsuite/22_locale/moneypunct_members_wchar_t.cc b/libstdc++-v3/testsuite/22_locale/moneypunct_members_wchar_t.cc
index 01b8d282111ef5b765be45343e9af703f346e14d..7470a58c00267182eb2fc2dd92cd171d445c21b6 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/moneypunct_members_wchar_t.cc
+++ b/libstdc++-v3/testsuite/22_locale/moneypunct_members_wchar_t.cc
@@ -34,24 +34,13 @@ void test01()
   typedef money_base::pattern pattern;
 
   bool test = true;
-  string str;
 
   // basic construction
   locale loc_c = locale::classic();
-  str = loc_c.name();
-
   locale loc_us("en_US");
-  str = loc_us.name();
-  VERIFY( loc_c != loc_us );
-
   locale loc_fr("fr_FR");
-  str = loc_fr.name();
-  VERIFY( loc_c != loc_fr );
-
   locale loc_de("de_DE");
-  str = loc_de.name();
   VERIFY( loc_c != loc_de );
-
   VERIFY( loc_us != loc_fr );
   VERIFY( loc_us != loc_de );
   VERIFY( loc_de != loc_fr );

diff --git a/libstdc++-v3/testsuite/22_locale/numpunct_members_char.cc b/libstdc++-v3/testsuite/22_locale/numpunct_members_char.cc
index e562f76fe814c9bda0ecd8bd6c85fd91d9fbdd60..0527c99e1cffe7361803eada5d09255f38548ab8 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/numpunct_members_char.cc
+++ b/libstdc++-v3/testsuite/22_locale/numpunct_members_char.cc
@@ -31,24 +31,13 @@ void test01()
   using namespace std;
   
   bool test = true;
-  string str;
 
   // basic construction
   locale loc_c = locale::classic();
-  str = loc_c.name();
-
   locale loc_us("en_US");
-  str = loc_us.name();
-  VERIFY( loc_c != loc_us );
-
   locale loc_fr("fr_FR");
-  str = loc_fr.name();
-  VERIFY( loc_c != loc_fr );
-
   locale loc_de("de_DE");
-  str = loc_de.name();
   VERIFY( loc_c != loc_de );
-
   VERIFY( loc_us != loc_fr );
   VERIFY( loc_us != loc_de );
   VERIFY( loc_de != loc_fr );