Changeset 1877

Timestamp:

Mar 21, 2009, 5:40:44 AM (15 years ago)

Author:

Peter

Message:

moving tests for iterator features from iterator_test.cc to class test::Suite so they can be utilized in several places.

Location:

trunk/test

Files:

• Suite.h (modified) (3 diffs)
• iterator_test.cc (modified) (7 diffs)

trunk/test/Suite.h

@@ -6 +6 @@
 /*
   Copyright (C) 2008 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2009 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -104 +105 @@
      */
     int return_value(void) const;
+
+    template<typename TrivialIterator>
+    void test_trivial_iterator(const TrivialIterator&);
+    
+    template<typename InputIterator>
+    void test_input_iterator(InputIterator&);
+    
+    template<typename OutputIterator>
+    void test_output_iterator(OutputIterator&);
+  
+    template<typename ForwardIterator>
+    void test_forward_iterator(ForwardIterator);
+    
+    template<typename BidirectionalIterator>
+    void test_bidirectional_iterator(BidirectionalIterator);
+    
+    template<typename RandomAccessIterator>
+    void test_random_access_iterator(RandomAccessIterator);
 
     /**
@@ -195 +214 @@
   }
 
+  template<typename TrivialIterator>
+  void Suite::test_trivial_iterator(const TrivialIterator& iter)
+  {
+    err() << "  testing Trivial features" << std::endl;
+    typename std::iterator_traits<TrivialIterator>::value_type tmp = *iter;
+    add(tmp==*iter);
+  }
+  
+  template<typename InputIterator>
+  void Suite::test_input_iterator(InputIterator& iter)
+  {
+    test_trivial_iterator(iter);
+    err() << "  testing Input features" << std::endl;
+    // just to check compilation
+    if (false) {
+      ++iter;
+      iter++;
+    }
+  }
+  
+  template<typename OutputIterator>
+  void Suite::test_output_iterator(OutputIterator& iter)
+  {
+    test_trivial_iterator(iter);
+    err() << "  testing Output features" << std::endl;
+  }
+  
+  template<typename ForwardIterator>
+  void Suite::test_forward_iterator(ForwardIterator iter)
+  {
+    test_output_iterator(iter);
+    test_input_iterator(iter);
+    err() << "  testing Forward features" << std::endl;
+    
+    typename std::iterator_traits<ForwardIterator>::value_type tmp = *iter;
+    // testing multiple traversing is possible and does not change the data
+    ForwardIterator iter1 = iter;
+    ++iter1;
+    add(iter!=iter1);
+    ForwardIterator iter2 = iter;
+    ++iter2;
+    add(tmp==*iter);
+  }
+  
+  template<typename BidirectionalIterator>
+  void Suite::test_bidirectional_iterator(BidirectionalIterator iter)
+  {
+    test_forward_iterator(iter);
+    bool ok_cached = ok();
+    err() << "  testing Bidirectional features" << std::endl;
+    const BidirectionalIterator i = iter;
+    BidirectionalIterator tmp = iter--;
+    add(tmp==i);
+    ++iter;
+    tmp = --iter;
+    if (!add(tmp==iter))
+      err() << "operator-- failed" << std::endl;
+    add(++tmp==i);
+    if (ok_cached && !ok())
+      err() << "failed" << std::endl;
+  }
+
+  template<typename RandomAccessIterator>
+  void Suite::test_random_access_iterator(RandomAccessIterator iter)
+  {
+    test_bidirectional_iterator(iter);
+    err() << "  testing RandomAccess features" << std::endl;
+    bool ok_cached = ok();
+    RandomAccessIterator iter2 = iter;
+    iter2 += 1;
+    iter2 -= 1;
+    RandomAccessIterator& iter3 = (iter2 += 1);
+    RandomAccessIterator& iter4 = (iter3 -= 1);
+    if (!add(iter2 == iter4))
+      err() << "operator-(int) failed" << std::endl;
+    add(++iter2 == iter3);
+    
+    RandomAccessIterator iter5 = iter + 0;
+    RandomAccessIterator iter6 = 0 + iter;
+    add(iter6 == iter5);
+    
+    RandomAccessIterator iter7 = iter - 0;
+    add(iter7 == iter);
+    add(iter7 - iter == 0);
+    add(! (iter7<iter));
+    
+    typename RandomAccessIterator::value_type tmp = iter[0];
+    typename RandomAccessIterator::value_type tmp2 = *iter;
+    tmp = tmp; // avoid compiler warning
+    if (!add(tmp == tmp2))
+      err() << "operator[] failed" << std::endl;
+    if (!add(iter[0] == *iter))
+      err() << "operator[] failed" << std::endl;
+    if (ok_cached && !ok())
+      err() << "failed" << std::endl;
+  }
+
 }}}
 

trunk/test/iterator_test.cc

@@ -60 +60 @@
 void test_boost_util(test::Suite&);
 
-template<typename TrivialIterator>
-void test_trivial_iterator(const TrivialIterator&, test::Suite&);
-
-template<typename InputIterator>
-void test_input_iterator(InputIterator&, test::Suite&);
-
-template<typename OutputIterator>
-void test_output_iterator(OutputIterator&, test::Suite&);
-
-template<typename ForwardIterator>
-void test_forward_iterator(ForwardIterator, test::Suite&);
-
-template<typename BidirectionalIterator>
-void test_bidirectional_iterator(BidirectionalIterator, test::Suite&);
-
-template<typename RandomAccessIterator>
-void test_random_access_iterator(RandomAccessIterator, test::Suite&);
-
 void test_stride_iterator(test::Suite& suite);
 void test_weighted_iterator(test::Suite& suite);
@@ -115 +97 @@
   classifier::DataLookup1D lookup(vec);
   utility::Vector::iterator begin=vec.begin();
-  test_random_access_iterator(begin, suite);
+  suite.test_random_access_iterator(begin);
   // test iterator to const_iterator conversion
   utility::Vector::const_iterator ci = vec.begin();
-  test_random_access_iterator(ci, suite);
+  suite.test_random_access_iterator(ci);
   ci = begin;
   if (begin!=ci)
@@ -131 +113 @@
   classifier::DataLookup1D::const_iterator lbegin=lookup.begin();
   classifier::DataLookup1D::const_iterator lend=lookup.end();
-  test_random_access_iterator(lbegin, suite);
+  suite.test_random_access_iterator(lbegin);
   
   suite.err() << "copy from DataLookup1D to Vector" << std::endl;
@@ -162 +144 @@
   utility::DataIterator<classifier::DataLookupWeighted1D::const_iterator> 
     data_iter(aw2.begin());
-  test_random_access_iterator(data_iter, suite);
-  test_random_access_iterator(weight_iterator(aw2.begin()), suite);
+  suite.test_random_access_iterator(data_iter);
+  suite.test_random_access_iterator(weight_iterator(aw2.begin()));
   suite.add(*data_iter == 1.0);
   suite.add(*data_iterator(aw2.begin()) == 1.0);
@@ -295 +277 @@
 }
 
-template<typename TrivialIterator>
-void test_trivial_iterator(const TrivialIterator& iter, test::Suite& suite)
-{
-  suite.err() << "  testing Trivial features" << std::endl;
-  typename std::iterator_traits<TrivialIterator>::value_type tmp = *iter;
-  suite.add(tmp==*iter);
-}
-
-template<typename InputIterator>
-void test_input_iterator(InputIterator& iter, test::Suite& suite)
-{
-  test_trivial_iterator(iter, suite);
-  suite.err() << "  testing Input features" << std::endl;
-  // just to check compilation
-  if (false) {
-    ++iter;
-    iter++;
-  }
-}
-
-template<typename OutputIterator>
-void test_output_iterator(OutputIterator& iter, test::Suite& suite)
-{
-  test_trivial_iterator(iter, suite);
-  suite.err() << "  testing Output features" << std::endl;
-}
-
-template<typename ForwardIterator>
-void test_forward_iterator(ForwardIterator iter, test::Suite& suite)
-{
-  test_output_iterator(iter, suite);
-  test_input_iterator(iter, suite);
-  suite.err() << "  testing Forward features" << std::endl;
-
-  typename std::iterator_traits<ForwardIterator>::value_type tmp = *iter;
-  // testing multiple traversing is possible and does not change the data
-  ForwardIterator iter1 = iter;
-  ++iter1;
-  suite.add(iter!=iter1);
-  ForwardIterator iter2 = iter;
-  ++iter2;
-  suite.add(tmp==*iter);
-
-}
-
-template<typename BidirectionalIterator>
-void test_bidirectional_iterator(BidirectionalIterator iter, test::Suite& suite)
-{
-  test_forward_iterator(iter, suite);
-  bool ok_cached = suite.ok();
-  suite.err() << "  testing Bidirectional features" << std::endl;
-  const BidirectionalIterator i = iter;
-  BidirectionalIterator tmp = iter--;
-  suite.add(tmp==i);
-  ++iter;
-  tmp = --iter;
-  if (!suite.add(tmp==iter))
-    suite.err() << "operator-- failed" << std::endl;
-  suite.add(++tmp==i);
-  if (ok_cached && !suite.ok())
-    suite.err() << "failed" << std::endl;
-}
-
-template<typename RandomAccessIterator>
-void test_random_access_iterator(RandomAccessIterator iter, test::Suite& suite)
-{
-  test_bidirectional_iterator(iter, suite);
-  suite.err() << "  testing RandomAccess features" << std::endl;
-  bool ok_cached = suite.ok();
-  RandomAccessIterator iter2 = iter;
-  iter2 += 1;
-  iter2 -= 1;
-  RandomAccessIterator& iter3 = (iter2 += 1);
-  RandomAccessIterator& iter4 = (iter3 -= 1);
-  if (!suite.add(iter2 == iter4))
-    suite.err() << "operator-(int) failed" << std::endl;
-  suite.add(++iter2 == iter3);
-  
-  RandomAccessIterator iter5 = iter + 0;
-  RandomAccessIterator iter6 = 0 + iter;
-  suite.add(iter6 == iter5);
-
-  RandomAccessIterator iter7 = iter - 0;
-  suite.add(iter7 == iter);
-  suite.add(iter7 - iter == 0);
-  suite.add(! (iter7<iter));
-
-  typename RandomAccessIterator::value_type tmp = iter[0];
-  typename RandomAccessIterator::value_type tmp2 = *iter;
-  tmp = tmp; // avoid compiler warning
-  if (!suite.add(tmp == tmp2))
-    suite.err() << "operator[] failed" << std::endl;
-  if (!suite.add(iter[0] == *iter))
-    suite.err() << "operator[] failed" << std::endl;
-  if (ok_cached && !suite.ok())
-    suite.err() << "failed" << std::endl;
-}
-
 void test_stride_iterator(test::Suite& suite)
 {
@@ -425 +309 @@
   utility::DataWeight tmp = *iter;
 
-  test_bidirectional_iterator(iter, suite);
-  test_random_access_iterator(iter, suite);
+  suite.test_bidirectional_iterator(iter);
+  suite.test_random_access_iterator(iter);
   std::vector<double> data(vec.size());
   std::vector<double> weight(vec.size());
@@ -471 +355 @@
 {
   classifier::MatrixLookup ml(10, 10);
-  test_random_access_iterator(ml.begin(), suite);
+  suite.test_random_access_iterator(ml.begin());
   std::vector<double> vec(ml.rows()*ml.columns());
   std::copy(ml.begin(), ml.end(), vec.begin());