Changeset 2070

Timestamp:

Sep 23, 2009, 10:38:58 PM (14 years ago)

Author:

Peter

Message:

fixing iterator_test that failed due to problem iterating backward from a map::begin()

Location:

trunk/test

Files:

• Suite.h (modified) (1 diff)
• iterator_test.cc (modified) (3 diffs)

trunk/test/Suite.h

@@ -268 +268 @@
     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);
+    BidirectionalIterator tmp = iter++;
+    if (!add(tmp==i)) {
+      err() << "iter++ does not return iter\n";
+    }
+    if (!add(++tmp==iter)) {
+      err() << "++iter failed\n";
+    }
+    if (!add(--tmp==i)) {
+      err() << "--iter failed\n";
+    }
+    tmp = iter--;
+    if (!add(--tmp==iter))
+      err() << "iter-- failed" << std::endl;
     if (ok_cached && !ok())
       err() << "failed" << std::endl;

trunk/test/iterator_test.cc

@@ -74 +74 @@
   test_stride_iterator(suite);
   old_main(suite);
+  suite.out() << "testing boost_util\n";
   test_boost_util(suite);
+  suite.out() << "testing pair_second_iterator\n";
   test_pair_second_iterator(suite);
+  suite.out() << "testing weighted iterator\n";
   test_weighted_iterator(suite);
   return suite.return_value();
@@ -148 +151 @@
   utility::DataIterator<classifier::DataLookupWeighted1D::const_iterator> 
     data_iter(aw2.begin());
+  suite.out() << "testing data_iter\n";
   suite.test_random_access_iterator(data_iter);
+  suite.out() << "testing weight_iter\n";
   suite.test_random_access_iterator(weight_iterator(aw2.begin()));
   suite.add(*data_iter == 1.0);
@@ -163 +168 @@
 
   // testing constness conversion
+  suite.out() << "testing const conversion\n";
   std::vector<double>::const_iterator c_iter(stl_vec.begin());
   std::vector<double>::iterator iter(stl_vec.begin());