Changeset 1477

Timestamp:

Sep 4, 2008, 9:15:47 PM (15 years ago)

Author:

Peter

Message:

adding some tests

File:

• trunk/test/iterator_test.cc (modified) (5 diffs)

trunk/test/iterator_test.cc

@@ -40 +40 @@
 #include <algorithm>
 #include <fstream>
+#include <iterator>
 #include <string>
 #include <vector>
@@ -46 +47 @@
 
 void old_main(test::Suite&);
+
+template<typename Iterator>
+void is_weighted(Iterator, test::Suite&);
+
+bool is_weighted(utility::unweighted_iterator_tag x) { return false; } 
+bool is_weighted(utility::weighted_iterator_tag x) { return true; }
+
 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&);
 
 int main(int argc, char* argv[])
@@ -58 +84 @@
 }
   
+template<typename Iterator>
+void is_weighted(Iterator i, test::Suite& suite)
+{
+  suite.err() << "testing that iterator is unweighted... ";
+  typename utility::weighted_iterator_traits<Iterator>::type tag;
+  if (is_weighted(tag))
+    suite.err() << "ok.\n";
+  else {
+    suite.err() << "failed.\n";
+    suite.add(false);
+  }
+    
+}
+
 
 void old_main(test::Suite& suite)
 {
-  suite.err() << "testing utility::vector::iterator" << std::endl;
+  suite.err() << "testing utility::Vector::iterator" << std::endl;
   utility::Vector vec(12);
   classifier::DataLookup1D lookup(vec);
   utility::Vector::iterator begin=vec.begin();
+  test_random_access_iterator(begin, suite);
   // test iterator to const_iterator conversion
   utility::Vector::const_iterator ci = vec.begin();
+  test_random_access_iterator(ci, suite);
   ci = begin;
   if (begin!=ci)
@@ -77 +119 @@
   classifier::DataLookup1D::const_iterator lbegin=lookup.begin();
   classifier::DataLookup1D::const_iterator lend=lookup.end();
+  test_random_access_iterator(lbegin, suite);
   
   suite.err() << "copy from DataLookup1D to Vector" << std::endl;
@@ -238 +281 @@
     suite.err() << "test_bool_util failed" << std::endl;
 }
+
+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));
+
+  if (!suite.add(iter[0] == *iter))
+    suite.err() << "operator[] failed" << std::endl;
+  if (ok_cached && !suite.ok())
+    suite.err() << "failed" << std::endl;
+  
+
+}