Changeset 1400

Timestamp:

Aug 7, 2008, 2:20:39 PM (13 years ago)

Author:

Peter

Message:

why repeating when we can loop

File:

• trunk/test/iterator_test.cc (modified) (1 diff)

trunk/test/iterator_test.cc

@@ -198 +198 @@
   std::vector<std::string> vec(m.size());
   std::copy(first_iterator, first_iterator_end, vec.begin());
-  if (!suite.add(vec[0]=="April"))
-    suite.err() << "Error: vec[0] = " << vec[0] << " expected April\n";
-  if (!suite.add(vec[1]=="July"))
-    suite.err() << "Error: vec[1] = " << vec[1] << " expected July\n";
-  if (!suite.add(vec[2]=="June"))
-    suite.err() << "Error: vec[2] = " << vec[2] << " expected June\n";
-  if (!suite.add(vec[3]=="September"))
-    suite.err() << "Error: vec[3] = " << vec[3] << " expected September\n";
+  std::vector<std::string> correct;
+  correct.push_back("April");
+  correct.push_back("July");
+  correct.push_back("June");
+  correct.push_back("September");
+  for (size_t i=0; i<vec.size(); ++i)
+    if (!suite.add(vec[i]==correct[i]))
+      suite.err() << "Error: vec[" << i << "] = " << vec[i] 
+                  << " expected " << correct[i] << "\n";
 
   std::vector<std::string> vec2(m.size());