mockpp-commits

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/3party/ministl/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21140/3party/ministl/tests

Modified Files:
	ministl_test.cpp 
Log Message:
ministl fully working

Index: ministl_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/3party/ministl/tests/ministl_test.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ministl_test.cpp	1 Dec 2005 18:15:08 -0000	1.3
+++ ministl_test.cpp	1 Dec 2005 19:43:03 -0000	1.4
@@ -54,6 +54,8 @@
 
 bool map_test()
 {
+  std::cout << "Start map iter-test: \n";
+
   ministl::map<int, unsigned> mm;
   ministl::pair<int, unsigned> p(11, 22u);
   mm.insert(ministl::make_pair(11, 22u));
@@ -63,23 +65,59 @@
   if (mm.size() != 1)
     return 1;
 
+  mm.insert(ministl::make_pair(111, 222u));
+  mm.insert(ministl::make_pair(1111, 2222u));
+
+  ministl::map<int, unsigned>::iterator fit = mm.begin();
+  while (fit != mm.end())
+  {
+    std::cout << "fit++ " << (*fit).first
+              << " " << (*fit).second << std::endl;
+    ++fit;
+  }
+
+  std::cout << "End map iter-test: \n";
+
   return 0;
 }
 
 
 bool multimap_test()
 {
+  std::cout << "Start multimap iter-test: \n";
+
   ministl::multimap<unsigned, signed> mm;
-  mm.insert(ministl::make_pair(1u, 2));
-  mm.insert(ministl::make_pair(1u, 2));
-  mm.insert(ministl::make_pair<unsigned, signed>(1u, 2));
+  mm.insert(ministl::make_pair(3u, 2));
+  mm.insert(ministl::make_pair(10u, 2));
+  mm.insert(ministl::make_pair(1u, 22));
+  mm.insert(ministl::make_pair(10u, 22));
+  mm.insert(ministl::make_pair<unsigned, signed>(1u, 222));
+  mm.insert(ministl::make_pair(2u, 22));
 
   // lower_bound
   // upper_bound
-/*
-  if (mm.size() != 3)   // @todo
+
+  if (mm.size() != 6)
     return 1;
-*/
+
+  ministl::multimap<unsigned, signed>::iterator fit = mm.begin();
+  if ((*fit++).first != 1) return 1;
+  if ((*fit++).first != 1) return 1;
+  if ((*fit++).first != 2) return 1;
+  if ((*fit++).first != 3) return 1;
+  if ((*fit++).first != 10) return 1;
+  if ((*fit++).first != 10) return 1;
+
+  fit = mm.begin();
+  while (fit != mm.end())
+  {
+    std::cout << "fit++ " << (*fit).first
+              << " " << (*fit).second << std::endl;
+    ++fit;
+  }
+
+  std::cout << "End multimap iter-test: \n";
+
   return 0;
 }
 
@@ -91,7 +129,7 @@
   vv.push_back(2u);
   vv.push_back(3u);
 
-  std::cout << "Start iter-test:\n";
+  std::cout << "Start vector iter-test:\n";
 
   ministl::vector<unsigned>::iterator fit = vv.begin();
   if (*fit != 1)
@@ -123,7 +161,7 @@
   while (rit != vv.rbegin())
     std::cout << "rit-- " << *--rit << std::endl;
 
-  std::cout << "Ende iter-test: \n";
+  std::cout << "End vector iter-test: \n";
 
   return 0;
 }