Changeset 1490 for trunk/test/iterator_test.cc

Timestamp:

Sep 12, 2008, 12:10:26 AM (14 years ago)

Author:

Peter

Message:

fixes #440

The bug was introduced in trunk after 0.4 release, so it has never
seen daylight.

File:

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

trunk/test/iterator_test.cc

@@ -32 +32 @@
 #include "yat/utility/stl_utility.h"
 #include "yat/utility/Vector.h"
+#include "yat/utility/VectorView.h"
+#include "yat/utility/VectorConstView.h"
 #include "yat/utility/WeightIterator.h"
 
@@ -72 +74 @@
 void test_random_access_iterator(RandomAccessIterator, test::Suite&);
 
+void test_stride_iterator(test::Suite& suite);
+
 int main(int argc, char* argv[])
 {  
@@ -77 +81 @@
   suite.err() << "testing iterator" << std::endl;
 
+  test_stride_iterator(suite);
   old_main(suite);
   test_boost_util(suite);
@@ -111 +116 @@
     suite.add(false);
 
+  suite.err() << "sorting...";
   utility::Vector::iterator end=vec.end();
   std::sort(begin, end);
+  suite.err() << " sorting done\n";
 
   suite.err() << "testing classifier::DataLookup1D::const_iterator" << std::endl;
@@ -371 +378 @@
   if (ok_cached && !suite.ok())
     suite.err() << "failed" << std::endl;
-  
-
-}
+}
+
+void test_stride_iterator(test::Suite& suite)
+{
+  suite.err() << "testing StrideIterator" << std::endl;
+  using utility::Vector;
+  Vector a(10);
+  // stride 2
+  utility::VectorConstView b(a, 0, 5, 2);
+  if (!suite.add(b.end()-b.begin()==5))
+    suite.err() << "ERROR: StrideIterator::operator- returned: " 
+                << b.end()-b.begin() 
+                << " expected 5\n";
+  utility::VectorView c(a, 0, 3, 2);
+  Vector::iterator begin = c.begin();
+  Vector::iterator end = c.end();
+  Vector::const_iterator cbegin = begin;
+  Vector::const_iterator cend = end;
+
+  if (!suite.add(c.size()==3))
+    suite.err() << "c.size() incorrect" << std::endl;
+  if (!suite.add(cend-cbegin == 3))
+    suite.err() << "cend-cbegin failed\n"; 
+}