Return-Path: 
 <stdcxx-commits-return-650-apmail-incubator-stdcxx-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-stdcxx-commits-archive@www.apache.org
Received: (qmail 90088 invoked from network); 3 May 2006 08:33:02 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 3 May 2006 08:33:02 -0000
Received: (qmail 48295 invoked by uid 500); 3 May 2006 08:32:38 -0000
Delivered-To: apmail-incubator-stdcxx-commits-archive@incubator.apache.org
Received: (qmail 48274 invoked by uid 500); 3 May 2006 08:32:38 -0000
Mailing-List: contact stdcxx-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:stdcxx-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:stdcxx-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:stdcxx-commits@incubator.apache.org>
List-Id: <stdcxx-commits.incubator.apache.org>
Reply-To: stdcxx-dev@incubator.apache.org
Delivered-To: mailing list stdcxx-commits@incubator.apache.org
Received: (qmail 48256 invoked by uid 99); 3 May 2006 08:32:38 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 May 2006 01:32:38 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Wed, 03 May 2006 01:32:37 -0700
Received: (qmail 89783 invoked by uid 65534); 3 May 2006 08:32:16 -0000
Message-ID: <20060503083216.89780.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r399201 - in /incubator/stdcxx/trunk/tests/strings:
 21.string.append.cpp 21.string.assign.cpp 21.string.insert.cpp
 21.string.op.plus.equal.cpp 21.string.replace.cpp
Date: Wed, 03 May 2006 08:32:15 -0000
To: stdcxx-commits@incubator.apache.org
From: antonp@apache.org
X-Mailer: svnmailer-1.0.8
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: antonp
Date: Wed May  3 01:32:13 2006
New Revision: 399201

URL: http://svn.apache.org/viewcvs?rev=399201&view=rev
Log:
2006-05-03  Anton Pevtsov  <antonp@moscow.vdiweb.com>

	* 21.string.append.cpp (get_calls): Moved to rw_char.h
	* 21.string.assign.cpp (test_assign): Added verification
	that Traits::length() is used.
	* 21.string.insert.cpp: Same
	* 21.string.op.plus.equal.cpp: Same
	* 21.string.replace.cpp: Same

Modified:
    incubator/stdcxx/trunk/tests/strings/21.string.append.cpp
    incubator/stdcxx/trunk/tests/strings/21.string.assign.cpp
    incubator/stdcxx/trunk/tests/strings/21.string.insert.cpp
    incubator/stdcxx/trunk/tests/strings/21.string.op.plus.equal.cpp
    incubator/stdcxx/trunk/tests/strings/21.string.replace.cpp

Modified: incubator/stdcxx/trunk/tests/strings/21.string.append.cpp
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/tests/strings/21.string.append.cpp?rev=399201&r1=399200&r2=399201&view=diff
==============================================================================
--- incubator/stdcxx/trunk/tests/strings/21.string.append.cpp (original)
+++ incubator/stdcxx/trunk/tests/strings/21.string.append.cpp Wed May  3 01:32:13 2006
@@ -392,20 +392,6 @@
 
 /**************************************************************************/
 
-template <class charT>
-std::size_t* get_calls (std::char_traits<charT>*, charT*)
-{
-    return 0;
-}
-
-template <class charT>
-std::size_t* get_calls (UserTraits<charT>*, charT*)
-{
-    return UserTraits<charT>::n_calls_;
-}
-
-/**************************************************************************/
-
 template <class charT, class Traits, class Iterator>
 void test_append_range (charT          *wstr,
                         charT          *wsrc,
@@ -527,8 +513,9 @@
 
     std::size_t total_length_calls = 0;
     std::size_t n_length_calls = 0;
-    std::size_t* rg_calls = get_calls ((typename TestString::traits_type*)0, 
-                                       (typename TestString::value_type*)0);
+    std::size_t* rg_calls = 
+        rw_get_call_counters ((typename TestString::traits_type*)0, 
+                              (typename TestString::value_type*)0);
     if (rg_calls)
         total_length_calls = rg_calls[UTMemFun::length];
 

Modified: incubator/stdcxx/trunk/tests/strings/21.string.assign.cpp
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/tests/strings/21.string.assign.cpp?rev=399201&r1=399200&r2=399201&view=diff
==============================================================================
--- incubator/stdcxx/trunk/tests/strings/21.string.assign.cpp (original)
+++ incubator/stdcxx/trunk/tests/strings/21.string.assign.cpp Wed May  3 01:32:13 2006
@@ -483,6 +483,8 @@
     typedef typename TestString::iterator                StringIter;
     typedef typename TestString::const_iterator          ConstStringIter;
 
+    typedef typename UserTraits<charT>::MemFun UTMemFun;
+
     static charT wstr [LLEN];
     static charT wsrc [LLEN];
 
@@ -510,6 +512,14 @@
     const charT* const arg_ptr = tcase.arg ? wsrc : s_str.c_str ();
     const TestString&  arg_str = tcase.arg ? s_arg : s_str;
 
+    std::size_t total_length_calls = 0;
+    std::size_t n_length_calls = 0;
+    std::size_t* rg_calls = 
+        rw_get_call_counters ((typename TestString::traits_type*)0, 
+                              (typename TestString::value_type*)0);
+    if (rg_calls)
+        total_length_calls = rg_calls[UTMemFun::length];
+
 #ifndef _RWSTD_NO_REPLACEABLE_NEW_DELETE
 
     rwt_free_store* const pst = rwt_get_free_store (0);
@@ -555,6 +565,8 @@
             case Assign (ptr): {
                 const TestString& s_res = s_str.assign (arg_ptr);
                 res_off = &s_res - &s_str;
+                if (rg_calls)
+                    n_length_calls = rg_calls[UTMemFun::length];
                 break;
             }
 
@@ -615,6 +627,13 @@
                            __LINE__, int (tcase.nres), tcase.res,
                            int (sizeof (charT)), int (s_str.size ()), 
                            s_str.c_str (), match);
+            }
+
+            // verify that Traits::length was used
+            if (Assign (ptr) == which && rg_calls) {
+                rw_assert (n_length_calls - total_length_calls > 0, 
+                           0, tcase.line, "line %d. %{$FUNCALL} doesn't "
+                           "use traits::length()", __LINE__);
             }
         }
 

Modified: incubator/stdcxx/trunk/tests/strings/21.string.insert.cpp
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/tests/strings/21.string.insert.cpp?rev=399201&r1=399200&r2=399201&view=diff
==============================================================================
--- incubator/stdcxx/trunk/tests/strings/21.string.insert.cpp (original)
+++ incubator/stdcxx/trunk/tests/strings/21.string.insert.cpp Wed May  3 01:32:13 2006
@@ -564,6 +564,8 @@
     typedef typename TestString::iterator                StringIter;
     typedef typename TestString::const_iterator          ConstStringIter;
 
+    typedef typename UserTraits<charT>::MemFun UTMemFun;
+
     const bool use_iters = (Insert (val) <= which);
 
     static charT wstr [LLEN];
@@ -593,6 +595,14 @@
     const TestString&  arg_str = tcase.arg ? s_arg : s_str;
     const charT        arg_val = make_char (char (tcase.val), (charT*)0);
 
+    std::size_t total_length_calls = 0;
+    std::size_t n_length_calls = 0;
+    std::size_t* rg_calls = 
+        rw_get_call_counters ((typename TestString::traits_type*)0, 
+                              (typename TestString::value_type*)0);
+    if (rg_calls)
+        total_length_calls = rg_calls[UTMemFun::length];
+
 #ifndef _RWSTD_NO_REPLACEABLE_NEW_DELETE
 
     rwt_free_store* const pst = rwt_get_free_store (0);
@@ -635,6 +645,8 @@
             case Insert (size_ptr): {
                 const TestString& s_res = s_str.insert (tcase.off, arg_ptr);
                 res_off = &s_res - &s_str;
+                if (rg_calls)
+                    n_length_calls = rg_calls[UTMemFun::length];
                 break;
             }
 
@@ -711,6 +723,13 @@
                            __LINE__, int (tcase.nres), tcase.res,
                            int (sizeof (charT)), int (s_str.size ()),
                            s_str.c_str (), match);
+            }
+
+            // verify that Traits::length was used
+            if (Insert (size_ptr) == which && rg_calls) {
+                rw_assert (n_length_calls - total_length_calls > 0, 
+                           0, tcase.line, "line %d. %{$FUNCALL} doesn't "
+                           "use traits::length()", __LINE__);
             }
         }
 

Modified: incubator/stdcxx/trunk/tests/strings/21.string.op.plus.equal.cpp
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/tests/strings/21.string.op.plus.equal.cpp?rev=399201&r1=399200&r2=399201&view=diff
==============================================================================
--- incubator/stdcxx/trunk/tests/strings/21.string.op.plus.equal.cpp (original)
+++ incubator/stdcxx/trunk/tests/strings/21.string.op.plus.equal.cpp Wed May  3 01:32:13 2006
@@ -226,6 +226,8 @@
     typedef typename TestString::iterator                StringIter;
     typedef typename TestString::const_iterator          ConstStringIter;
 
+    typedef typename UserTraits<charT>::MemFun UTMemFun;
+
     static charT wstr [LLEN];
     static charT warg [LLEN];
 
@@ -246,6 +248,14 @@
     const TestString&  arg_str = tcase.arg ? s_arg : s_str;
     const charT        arg_val = make_char (char (tcase.val), (charT*)0);
 
+    std::size_t total_length_calls = 0;
+    std::size_t n_length_calls = 0;
+    std::size_t* rg_calls = 
+        rw_get_call_counters ((typename TestString::traits_type*)0, 
+                              (typename TestString::value_type*)0);
+    if (rg_calls)
+        total_length_calls = rg_calls[UTMemFun::length];
+
 #ifndef _RWSTD_NO_REPLACEABLE_NEW_DELETE
 
     rwt_free_store* const pst = rwt_get_free_store (0);
@@ -289,6 +299,8 @@
             case OpPlusEq (ptr): {
                 const TestString& s_res = s_str += arg_ptr;
                 res_off = &s_res - &s_str;
+                if (rg_calls)
+                    n_length_calls = rg_calls[UTMemFun::length];
                 break;
             }
 
@@ -335,6 +347,13 @@
                            __LINE__, int (tcase.nres), tcase.res,
                            int (sizeof (charT)), int (s_str.size ()),
                            s_str.c_str (), match);
+            }
+
+            // verify that Traits::length was used
+            if (OpPlusEq (ptr) == which && rg_calls) {
+                rw_assert (n_length_calls - total_length_calls > 0, 
+                           0, tcase.line, "line %d. %{$FUNCALL} doesn't "
+                           "use traits::length()", __LINE__);
             }
         }
 

Modified: incubator/stdcxx/trunk/tests/strings/21.string.replace.cpp
URL: http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/tests/strings/21.string.replace.cpp?rev=399201&r1=399200&r2=399201&view=diff
==============================================================================
--- incubator/stdcxx/trunk/tests/strings/21.string.replace.cpp (original)
+++ incubator/stdcxx/trunk/tests/strings/21.string.replace.cpp Wed May  3 01:32:13 2006
@@ -684,6 +684,8 @@
     typedef typename TestString::iterator                StringIter;
     typedef typename TestString::const_iterator          ConstStringIter;
 
+    typedef typename UserTraits<charT>::MemFun UTMemFun;
+
     const bool use_iters = Replace (iter_iter_ptr) <= which;
 
     static charT wstr [LLEN];
@@ -722,6 +724,14 @@
     const TestString&  arg_str = tcase.arg ? s_arg : s_str;
     const charT        arg_val = make_char (char (tcase.val), (charT*)0);
 
+    std::size_t total_length_calls = 0;
+    std::size_t n_length_calls = 0;
+    std::size_t* rg_calls = 
+        rw_get_call_counters ((typename TestString::traits_type*)0, 
+                              (typename TestString::value_type*)0);
+    if (rg_calls)
+        total_length_calls = rg_calls[UTMemFun::length];
+
 #ifndef _RWSTD_NO_REPLACEABLE_NEW_DELETE
 
     rwt_free_store* const pst = rwt_get_free_store (0);
@@ -770,6 +780,8 @@
                 const TestString& s_res = 
                     s_str.replace (tcase.off, tcase.size, arg_ptr);
                 res_off = &s_res - &s_str;
+                if (rg_calls)
+                    n_length_calls = rg_calls[UTMemFun::length];
                 break;
             }
 
@@ -806,6 +818,8 @@
                 const TestString& s_res = 
                     s_str.replace (it_first, it_last, arg_ptr);
                 res_off = &s_res - &s_str;
+                if (rg_calls)
+                    n_length_calls = rg_calls[UTMemFun::length];
                 break;
             }
 
@@ -861,6 +875,16 @@
                            __LINE__, int (tcase.nres), tcase.res,
                            int (sizeof (charT)), int (s_str.size ()),
                            s_str.c_str (), match);
+            }
+
+            // verify that Traits::length was used
+            const bool verify_length_using = Replace (size_size_ptr) == which 
+                                          || Replace (iter_iter_ptr) == which;
+
+            if (verify_length_using && rg_calls) {
+                rw_assert (n_length_calls - total_length_calls > 0, 
+                           0, tcase.line, "line %d. %{$FUNCALL} doesn't "
+                           "use traits::length()", __LINE__);
             }
         }