[PATCH] min/max testcase improvements

[ncm-nospam@cantrip.org]

I found the attached patch in my tree, evidently from last summer,
against libstdc++-v3/testsuite/25_algorithms/min_max.cc.  It tests 
std::min and std::max much more thoroughly.  

I haven't run it against any recent build, but it's very simple.  
Caveat bozo.

Nathan Myers
ncm-nospam@cantrip.org
-------------- next part --------------
Index: min_max.cc
===================================================================
RCS file: /cvsroot/gcc/gcc/libstdc++-v3/testsuite/25_algorithms/min_max.cc,v
retrieving revision 1.4
diff -c -r1.4 min_max.cc
*** min_max.cc	7 Aug 2001 03:38:32 -0000	1.4
--- min_max.cc	4 Feb 2003 18:15:58 -0000
***************
*** 19,39 ****
  // USA.
  
  #include <algorithm>
  #include <testsuite_hooks.h>
  
  void test01()
  {
    bool test = true;
    const int& x = std::max(1, 2);
!   const int& y = std::max(3, 4);
    VERIFY( x == 2 );
    VERIFY( y == 4 );
  
    const int& z = std::min(1, 2);
!   const int& w = std::min(3, 4);
    VERIFY( z == 1 );
    VERIFY( w == 3 );
  
  #ifdef DEBUG_ASSERT
    assert(test);
  #endif
--- 19,149 ----
  // USA.
  
  #include <algorithm>
+ #include <functional>
  #include <testsuite_hooks.h>
  
  void test01()
  {
    bool test = true;
+ 
    const int& x = std::max(1, 2);
!   const int& y = std::max(4, 3);
    VERIFY( x == 2 );
    VERIFY( y == 4 );
  
+   const int& xc = std::max(1, 2, std::greater<int>());
+   const int& yc = std::max(4, 3, std::greater<int>());
+   VERIFY( xc == 1 );
+   VERIFY( yc == 3 );
+ 
    const int& z = std::min(1, 2);
!   const int& w = std::min(4, 3);
    VERIFY( z == 1 );
    VERIFY( w == 3 );
  
+   const int& zc = std::min(1, 2, std::greater<int>());
+   const int& wc = std::min(4, 3, std::greater<int>());
+   VERIFY( zc == 2 );
+   VERIFY( wc == 4 );
+ 
+ #ifdef DEBUG_ASSERT
+   assert(test);
+ #endif
+ }
+ 
+ template <typename T> struct A { static const T a = T(3); };
+ // note: no definition supplied for A<>::a, deliberately.
+ 
+ void test02()
+ {
+   bool test = true;
+ 
+   VERIFY( 2 == std::min(A<int>::a, 2) );
+   VERIFY( 3 == std::min(A<int>::a, 4) );
+ 
+   VERIFY( 2u == std::min(A<unsigned int>::a, 2u) );
+   VERIFY( 3u == std::min(A<unsigned int>::a, 4u) );
+ 
+   VERIFY( 2l == std::min(A<long>::a, 2l) );
+   VERIFY( 3l == std::min(A<long>::a, 4l) );
+ 
+   VERIFY( 2ul == std::min(A<unsigned long>::a, 2ul) );
+   VERIFY( 3ul == std::min(A<unsigned long>::a, 4ul) );
+ 
+ #ifdef _GLIBCPP_USE_LONG_LONG
+   VERIFY( 2ll == std::min(A<long long>::a, 2ll) );
+   VERIFY( 3ll == std::min(A<long long>::a, 4ll) );
+ 
+   VERIFY( 2ull == std::min(A<unsigned long long>::a, 2ull) );
+   VERIFY( 3ull == std::min(A<unsigned long long>::a, 4ull) );
+ #endif
+ 
+   VERIFY( short(2) == std::min(A<short>::a, short(2)) );
+   VERIFY( short(3) == std::min(A<short>::a, short(4)) );
+ 
+   VERIFY( (unsigned short)2 == std::min(A<unsigned short>::a, (unsigned short)2) );
+   VERIFY( (unsigned short)3 == std::min(A<unsigned short>::a, (unsigned short)4) );
+ 
+   VERIFY( (char)2 == std::min(A<char>::a, (char)2) );
+   VERIFY( (char)3 == std::min(A<char>::a, (char)4) );
+ 
+   VERIFY( (signed char)2 == std::min(A<signed char>::a, (signed char)2) );
+   VERIFY( (signed char)3 == std::min(A<signed char>::a, (signed char)4) );
+ 
+   VERIFY( (unsigned char)2 == std::min(A<unsigned char>::a, (unsigned char)2) );
+   VERIFY( (unsigned char)3 == std::min(A<unsigned char>::a, (unsigned char)4) );
+ 
+   VERIFY( (wchar_t)2 == std::min(A<wchar_t>::a, (wchar_t)2) );
+   VERIFY( (wchar_t)3 == std::min(A<wchar_t>::a, (wchar_t)4) );
+ 
+   VERIFY( 2.0 == std::min(A<double>::a, 2.0) );
+   VERIFY( 3.0 == std::min(A<double>::a, 4.0) );
+ 
+   VERIFY( float(2) == std::min(A<float>::a, float(2)) );
+   VERIFY( float(3) == std::min(A<float>::a, float(4)) );
+ 
+   VERIFY( (long double)2 == std::min(A<long double>::a, (long double)2) );
+   VERIFY( (long double)3 == std::min(A<long double>::a, (long double)4) );
+ 
+ 
+   VERIFY( 3 == std::max(A<int>::a, 2) );
+   VERIFY( 4 == std::max(A<int>::a, 4) );
+ 
+   VERIFY( 3u == std::max(A<unsigned int>::a, 2u) );
+   VERIFY( 4u == std::max(A<unsigned int>::a, 4u) );
+ 
+   VERIFY( 3l == std::max(A<long>::a, 2l) );
+   VERIFY( 4l == std::max(A<long>::a, 4l) );
+ 
+   VERIFY( 3ul == std::max(A<unsigned long>::a, 2ul) );
+   VERIFY( 4ul == std::max(A<unsigned long>::a, 4ul) );
+ 
+ #ifdef _GLIBCPP_USE_LONG_LONG
+   VERIFY( 3ll == std::max(A<long long>::a, 2ll) );
+   VERIFY( 4ll == std::max(A<long long>::a, 4ll) );
+ 
+   VERIFY( 3ull == std::max(A<unsigned long long>::a, 2ull) );
+   VERIFY( 4ull == std::max(A<unsigned long long>::a, 4ull) );
+ #endif
+ 
+   VERIFY( short(3) == std::max(A<short>::a, short(2)) );
+   VERIFY( short(4) == std::max(A<short>::a, short(4)) );
+ 
+   VERIFY( (unsigned short)3 == std::max(A<unsigned short>::a, (unsigned short)2) );
+   VERIFY( (unsigned short)4 == std::max(A<unsigned short>::a, (unsigned short)4) );
+ 
+   VERIFY( (char)3 == std::max(A<char>::a, (char)2) );
+   VERIFY( (char)4 == std::max(A<char>::a, (char)4) );
+ 
+   VERIFY( (signed char)3 == std::max(A<signed char>::a, (signed char)2) );
+   VERIFY( (signed char)4 == std::max(A<signed char>::a, (signed char)4) );
+ 
+   VERIFY( (unsigned char)3 == std::max(A<unsigned char>::a, (unsigned char)2) );
+   VERIFY( (unsigned char)4 == std::max(A<unsigned char>::a, (unsigned char)4) );
+ 
+   VERIFY( (wchar_t)3 == std::max(A<wchar_t>::a, (wchar_t)2) );
+   VERIFY( (wchar_t)4 == std::max(A<wchar_t>::a, (wchar_t)4) );
+ 
  #ifdef DEBUG_ASSERT
    assert(test);
  #endif
***************
*** 42,46 ****
--- 152,157 ----
  int main()
  {
    test01();
+   test02();
    return 0;
  }