Update the changes to the array tests (that I committed yesterday) to use the test_comparison routines that I committed last week. NFC.

llvm-svn: 338797

1 files changed, 8 insertions, 55 deletions

diff --git a/libcxx/test/std/containers/sequences/array/compare.pass.cpp b/libcxx/test/std/containers/sequences/array/compare.pass.cpp
index f3e72b79fa0..5d2bdc50f26 100644
--- a/libcxx/test/std/containers/sequences/array/compare.pass.cpp
+++ b/libcxx/test/std/containers/sequences/array/compare.pass.cpp
@@ -23,59 +23,12 @@
 #include <cassert>
 
 #include "test_macros.h"
+#include "test_comparisons.h"
 
 // std::array is explicitly allowed to be initialized with A a = { init-list };.
 // Disable the missing braces warning for this reason.
 #include "disable_missing_braces_warning.h"
 
-template <class Array>
-void test_compare(const Array& LHS, const Array& RHS) {
-  typedef std::vector<typename Array::value_type> Vector;
-  const Vector LHSV(LHS.begin(), LHS.end());
-  const Vector RHSV(RHS.begin(), RHS.end());
-  assert((LHS == RHS) == (LHSV == RHSV));
-  assert((LHS != RHS) == (LHSV != RHSV));
-  assert((LHS < RHS) == (LHSV < RHSV));
-  assert((LHS <= RHS) == (LHSV <= RHSV));
-  assert((LHS > RHS) == (LHSV > RHSV));
-  assert((LHS >= RHS) == (LHSV >= RHSV));
-}
-
-#if TEST_STD_VER > 17
-template <class Array>
-constexpr bool constexpr_compare(const Array &lhs, const Array &rhs, bool isEqual, bool isLess)
-{
-  if (isEqual)
-  {
-    if (!(lhs == rhs)) return false;
-    if ( (lhs != rhs)) return false;
-    if ( (lhs  < rhs)) return false;
-    if (!(lhs <= rhs)) return false;
-    if ( (lhs  > rhs)) return false;
-    if (!(lhs >= rhs)) return false;
-  }
-  else if (isLess)
-  {
-    if ( (lhs == rhs)) return false;
-    if (!(lhs != rhs)) return false;
-    if (!(lhs  < rhs)) return false;
-    if (!(lhs <= rhs)) return false;
-    if ( (lhs  > rhs)) return false;
-    if ( (lhs >= rhs)) return false;
-  }
-  else // greater
-  {
-    if ( (lhs == rhs)) return false;
-    if (!(lhs != rhs)) return false;
-    if ( (lhs  < rhs)) return false;
-    if ( (lhs <= rhs)) return false;
-    if (!(lhs  > rhs)) return false;
-    if (!(lhs >= rhs)) return false;
-  }
-  return true;  
-}
-#endif
-
 int main()
 {
   {
@@ -85,25 +38,25 @@ int main()
     C c2 = {1, 2, 3};
     C c3 = {3, 2, 1};
     C c4 = {1, 2, 1};
-    test_compare(c1, c2);
-    test_compare(c1, c3);
-    test_compare(c1, c4);
+    assert(testComparisons6(c1, c2, true, false));
+    assert(testComparisons6(c1, c3, false, true));
+    assert(testComparisons6(c1, c4, false, false));
   }
   {
     typedef int T;
     typedef std::array<T, 0> C;
     C c1 = {};
     C c2 = {};
-    test_compare(c1, c2);
+    assert(testComparisons6(c1, c2, true, false));
   }
 
 #if TEST_STD_VER > 17
   {
   constexpr std::array<int, 3> a1 = {1, 2, 3};
   constexpr std::array<int, 3> a2 = {2, 3, 4};
-  static_assert(constexpr_compare(a1, a1, true, false), "");
-  static_assert(constexpr_compare(a1, a2, false, true), "");
-  static_assert(constexpr_compare(a2, a1, false, false), "");
+  static_assert(testComparisons6(a1, a1, true, false), "");
+  static_assert(testComparisons6(a1, a2, false, true), "");
+  static_assert(testComparisons6(a2, a1, false, false), "");
   }
 #endif
 }