1 files changed, 51 insertions, 0 deletions
diff --git a/test/containers.cc b/test/containers.cc
index 993a299d..af317d7e 100644
--- a/test/containers.cc
+++ b/test/containers.cc
@@ -4,6 +4,16 @@
 using namespace lout::object;
 using namespace lout::container::typed;
 
+class ReverseComparator: public Comparator
+{
+private:
+   Comparator *reversed;
+
+public:
+   ReverseComparator (Comparator *reversed) { this->reversed = reversed; }
+   int compare(Object *o1, Object *o2) { return - reversed->compare (o1, o2); }
+};
+
 void testHashSet ()
 {
    puts ("--- testHashSet ---");
@@ -38,6 +48,8 @@ void testHashTable ()
 
 void testVector1 ()
 {
+   ReverseComparator reverse (&standardComparator);
+
    puts ("--- testVector (1) ---");
 
    Vector<String> v (true, 1);
@@ -47,6 +59,9 @@ void testVector1 ()
    v.put (new String ("three"));
    puts (v.toString());
 
+   v.sort (&reverse);
+   puts (v.toString());
+
    v.sort ();
    puts (v.toString());
 }
@@ -95,12 +110,48 @@ void testVector2 ()
    }
 }
 
+void testVector3 ()
+{
+   // Regression test: resulted once incorrently (0, 2, 3), should
+   // result in (1, 2, 3).
+
+   puts ("--- testVector (3) ---");
+
+   Vector<String> v (true, 1);
+   String k ("omega");
+
+   v.put (new String ("alpha"));
+   printf ("   -> %d\n", v.bsearch (&k, false));
+   v.put (new String ("beta"));
+   printf ("   -> %d\n", v.bsearch (&k, false));
+   v.put (new String ("gamma"));
+   printf ("   -> %d\n", v.bsearch (&k, false));
+}
+
+void testStackAsQueue ()
+{
+   puts ("--- testStackAsQueue ---");
+
+   Stack<Integer> s (true);
+
+   for (int i = 1; i <= 10; i++)
+      s.pushUnder (new Integer (i));
+
+   while (s.size () > 0) {
+      Integer *i = s.getTop ();
+      printf ("%d\n", i->getValue ());
+      s.pop ();
+   }
+}
+
 int main (int argc, char *argv[])
 {
    testHashSet ();
    testHashTable ();
    testVector1 ();
    testVector2 ();
+   testVector3 ();
+   testStackAsQueue ();
 
    return 0;
 }