Update of /cvsroot/mockpp/mockpp/3party/ministl/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30919/3party/ministl/tests
Modified Files:
Makefile.am ministl_test.cpp
Log Message:
ministl basically working
Index: Makefile.am
===================================================================
RCS file: /cvsroot/mockpp/mockpp/3party/ministl/tests/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am 30 Nov 2005 21:46:34 -0000 1.2
+++ Makefile.am 1 Dec 2005 18:15:08 -0000 1.3
@@ -3,13 +3,17 @@
CLEANFILES = *.~* *.~~* *~
-check_PROGRAMS = ministl_test
-
# ministl_test_LDFLAGS =
ministl_test_SOURCES = ministl_test.cpp
ministl_test_LDADD = -lstdc++
+if BUILTIN_MINISTL
+
+TESTS = $(check_PROGRAMS)
+
+check_PROGRAMS = ministl_test
+endif
Index: ministl_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/3party/ministl/tests/ministl_test.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ministl_test.cpp 30 Nov 2005 21:46:34 -0000 1.2
+++ ministl_test.cpp 1 Dec 2005 18:15:08 -0000 1.3
@@ -27,14 +27,12 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
***************************************************************************/
-#include <new>
-
-#include <mockpp/mockpp.h> // always first
#include <ministl/vector>
#include <ministl/vector.h>
#include <ministl/map>
#include <ministl/map.h>
+#include <ministl/multimap>
#include <ministl/pair>
#include <ministl/pair.h>
#include <ministl/set>
@@ -49,20 +47,101 @@
//#include <ministl/bool.h>
#include <ministl/ministl.h>
#include <ministl/simplevec.h>
+#include <ministl/raw_iterator.h>
+#include <ministl/reverse_iterator.h>
-int main(int /*argc*/, char** /*argv*/)
+#include <iostream>
+
+bool map_test()
+{
+ ministl::map<int, unsigned> mm;
+ ministl::pair<int, unsigned> p(11, 22u);
+ mm.insert(ministl::make_pair(11, 22u));
+ mm.insert(p);
+ mm.insert(p);
+
+ if (mm.size() != 1)
+ return 1;
+
+ return 0;
+}
+
+
+bool multimap_test()
+{
+ 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));
+
+ // lower_bound
+ // upper_bound
+/*
+ if (mm.size() != 3) // @todo
+ return 1;
+*/
+ return 0;
+}
+
+
+bool vector_test()
{
ministl::vector<unsigned> vv;
vv.push_back(1u);
+ vv.push_back(2u);
+ vv.push_back(3u);
- ministl::map<unsigned, signed> mm;
-// mm.insert(ministl::make_pair(1u, 2));
+ std::cout << "Start iter-test:\n";
- ministl::pair<int, double> pp(1, 1.1);
+ ministl::vector<unsigned>::iterator fit = vv.begin();
+ if (*fit != 1)
+ return 1;
- ministl::set<double, int> ss;
-// ss.insert(ministl::make_pair(1u, 2));
+ while (fit != vv.end())
+ std::cout << "fit++ " << *fit++ << std::endl;
+
+ fit = vv.end();
+ if (*(fit-1) != 3)
+ return 1;
+
+ while (fit != vv.begin())
+ std::cout << "fit-- " << *--fit << std::endl;
+
+ std::cout << "reverse iter-test:\n";
+
+ ministl::vector<unsigned>::reverse_iterator rit = vv.rbegin();
+ if (*rit != 3)
+ return 1;
+
+ while (rit != vv.rend())
+ std::cout << "rit++ " << *rit++ << std::endl;
+
+ rit = vv.rend();
+ if (*(rit-1) != 1)
+ return 1;
+
+ while (rit != vv.rbegin())
+ std::cout << "rit-- " << *--rit << std::endl;
+
+ std::cout << "Ende iter-test: \n";
return 0;
}
+
+int main(int /*argc*/, char** /*argv*/)
+{
+ unsigned ret = 0;
+
+ ret |= vector_test();
+ ret |= multimap_test();
+ ret |= map_test();
+
+ ministl::pair<int, double> pp(1, 1.1);
+
+ ministl::set<int> ss;
+ ss.insert(2);
+
+ return ret;
+}
+
|
