summaryrefslogtreecommitdiff
path: root/i/marvin/src
diff options
context:
space:
mode:
authorschodet2006-02-11 14:30:13 +0000
committerschodet2006-02-11 14:30:13 +0000
commit16ac59fb02448900914ab2309ca3e9925174a8c3 (patch)
treeda9cadb29aa5e4090aa2b9271a2a93f4d42341d1 /i/marvin/src
parent37634082be3a5bff40da1571870cdc19ca25eb82 (diff)
Ajout de tester, un début de classe de test.
Diffstat (limited to 'i/marvin/src')
-rw-r--r--i/marvin/src/Makefile.defs1
-rw-r--r--i/marvin/src/tester/Makefile.defs7
-rw-r--r--i/marvin/src/tester/test_tester.cc106
-rw-r--r--i/marvin/src/tester/tester.cc67
-rw-r--r--i/marvin/src/tester/tester.hh72
-rw-r--r--i/marvin/src/tester/tester.tcc137
6 files changed, 390 insertions, 0 deletions
diff --git a/i/marvin/src/Makefile.defs b/i/marvin/src/Makefile.defs
index 2f226d3..3f569e6 100644
--- a/i/marvin/src/Makefile.defs
+++ b/i/marvin/src/Makefile.defs
@@ -23,6 +23,7 @@ CXXFLAGS += -fmessage-length=0
# Attention, il y a un problme de dpendences dans l'ordre des SUBDIRS
# cause de la gnration des rgles.
SUBDIRS = utils utils/meta \
+ tester \
log serial timer \
config data scheduler \
proto asserv\
diff --git a/i/marvin/src/tester/Makefile.defs b/i/marvin/src/tester/Makefile.defs
new file mode 100644
index 0000000..834cae6
--- /dev/null
+++ b/i/marvin/src/tester/Makefile.defs
@@ -0,0 +1,7 @@
+PROGRAMS += test_tester
+
+tester_OBJECTS = tester.o
+
+test_tester_OBJECTS = test_tester.o $(tester_OBJECTS) $(utils_OBJECTS)
+
+test_tester: $(test_tester_OBJECTS)
diff --git a/i/marvin/src/tester/test_tester.cc b/i/marvin/src/tester/test_tester.cc
new file mode 100644
index 0000000..285093f
--- /dev/null
+++ b/i/marvin/src/tester/test_tester.cc
@@ -0,0 +1,106 @@
+// test_tester.cc
+// marvin - programme du robot 2006. {{{
+//
+// Copyright (C) 2006 Nicolas Schodet
+//
+// Robot APB Team/Efrei 2006.
+// Web: http://assos.efrei.fr/robot/
+// Email: robot AT efrei DOT fr
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// }}}
+#include "tester.hh"
+
+#include <iostream>
+#include <algorithm>
+#include <iterator>
+
+class TestTester
+{
+ Tester t;
+ public:
+ bool funcA (const Tester::Args &a)
+ {
+ std::cout << " a " << a << std::endl;
+ return true;
+ }
+ bool funcB (void)
+ {
+ std::cout << " b ( )" << std::endl;
+ return true;
+ }
+ bool funcC (int i)
+ {
+ std::cout << " c ( " << i << " )" << std::endl;
+ return true;
+ }
+ bool funcD (const std::string &s)
+ {
+ std::cout << " d ( " << s << " )" << std::endl;
+ return true;
+ }
+ bool funcE (int i, const std::string &s, double d)
+ {
+ std::cout << " e ( " << i << ' ' << s << ' ' << d << " )" << std::endl;
+ return true;
+ }
+ void call (const std::string &s, const Tester::Args &a)
+ {
+ try
+ {
+ std::cout << "call " << s << ' ' << a << std::endl;
+ t.call (s, a);
+ }
+ catch (const std::exception &e)
+ {
+ // Do not use std::cerr as there should be only normal errors.
+ std::cout << ' ' << e.what () << std::endl;
+ }
+ }
+ int main (void)
+ {
+ Tester::Args a[4];
+ // Add functions.
+ t.add ("a", Tester::memFunc (*this, &TestTester::funcA));
+ t.add ("b", Tester::memFunc (*this, &TestTester::funcB));
+ t.add ("c", Tester::memFunc (*this, &TestTester::funcC));
+ t.add ("d", Tester::memFunc (*this, &TestTester::funcD));
+ t.add ("e", Tester::memFunc (*this, &TestTester::funcE));
+ // Make argument lists.
+ a[1].push_back (any (71117));
+ a[2].push_back (any (std::string ("robert")));
+ a[3].push_back (any (42));
+ a[3].push_back (any (std::string ("merguez")));
+ a[3].push_back (any (51.1664));
+ // Call all those wonderful functions.
+ call ("unknown", a[0]);
+ for (unsigned int i = 0; i < sizeof (a) / sizeof (a[0]); ++i)
+ {
+ call ("a", a[i]);
+ call ("b", a[i]);
+ call ("c", a[i]);
+ call ("d", a[i]);
+ call ("e", a[i]);
+ }
+ return 0;
+ }
+};
+
+int main (void)
+{
+ TestTester tt;
+ return tt.main ();
+}
diff --git a/i/marvin/src/tester/tester.cc b/i/marvin/src/tester/tester.cc
new file mode 100644
index 0000000..ba4ff40
--- /dev/null
+++ b/i/marvin/src/tester/tester.cc
@@ -0,0 +1,67 @@
+// tester.cc
+// marvin - programme du robot 2006. {{{
+//
+// Copyright (C) 2006 Nicolas Schodet
+//
+// Robot APB Team/Efrei 2006.
+// Web: http://assos.efrei.fr/robot/
+// Email: robot AT efrei DOT fr
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// }}}
+#include "tester.hh"
+
+/// Destructor.
+Tester::~Tester (void)
+{
+ for (Funcs::iterator i = funcs_.begin (); i != funcs_.end (); ++i)
+ {
+ delete i->second;
+ }
+}
+
+/// Add a test function, Tester owns f.
+void
+Tester::add (const std::string &s, Func *f)
+{
+ if (!funcs_.insert (Funcs::value_type (s, f)).second)
+ {
+ // Tester owns f, therefore, f must be deleted.
+ delete f;
+ throw std::runtime_error ("function \'" + s
+ + "\' inserted two times");
+ }
+}
+
+/// Call a test function by name.
+bool
+Tester::call (const std::string &s, const Args &a) const
+{
+ Funcs::const_iterator i;
+ i = funcs_.find (s);
+ if (i == funcs_.end ())
+ throw std::runtime_error ("function \'" + s + "\' does not exist");
+ try
+ {
+ return (*i->second) (a);
+ }
+ catch (const std::exception &e)
+ {
+ throw std::runtime_error ("while calling \'" + s + "\', "
+ + e.what ());
+ }
+}
+
diff --git a/i/marvin/src/tester/tester.hh b/i/marvin/src/tester/tester.hh
new file mode 100644
index 0000000..15ad9dc
--- /dev/null
+++ b/i/marvin/src/tester/tester.hh
@@ -0,0 +1,72 @@
+#ifndef tester_hh
+#define tester_hh
+// tester.hh
+// marvin - programme du robot 2006. {{{
+//
+// Copyright (C) 2006 Nicolas Schodet
+//
+// Robot APB Team/Efrei 2006.
+// Web: http://assos.efrei.fr/robot/
+// Email: robot AT efrei DOT fr
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// }}}
+#include "utils/any.hh"
+
+#include <map>
+
+class Tester
+{
+ public:
+ /// Test function argument.
+ typedef any Arg;
+ /// Test function argument list.
+ typedef std::list<Arg> Args;
+ /// Test functions must inherit from this type.
+ class Func
+ {
+ public:
+ /// Mandatory virtual destructor.
+ virtual ~Func (void)
+ { }
+ /// Called on function invocation, getting the argument list and
+ /// returning true on success.
+ virtual bool operator() (const Args &) = 0;
+ };
+ private:
+ /// Func class construction helper.
+ template<class T, typename F>
+ class MemFunc;
+ private:
+ /// Type of the private function map.
+ typedef std::map<std::string, Func *> Funcs;
+ /// The function map itself.
+ Funcs funcs_;
+ public:
+ /// Destructor.
+ ~Tester (void);
+ /// Add a test function, Tester owns f.
+ void add (const std::string &s, Func *f);
+ /// Call a test function by name.
+ bool call (const std::string &s, const Args &a) const;
+ /// Take all the template sophistications out of the programmer hands.
+ template<class T, typename F>
+ static Func *memFunc (T &i, F f);
+};
+
+#include "tester.tcc"
+
+#endif // tester_hh
diff --git a/i/marvin/src/tester/tester.tcc b/i/marvin/src/tester/tester.tcc
new file mode 100644
index 0000000..56d066b
--- /dev/null
+++ b/i/marvin/src/tester/tester.tcc
@@ -0,0 +1,137 @@
+#ifndef tester_tcc
+#define tester_tcc
+// tester.tcc
+// marvin - programme du robot 2006. {{{
+//
+// Copyright (C) 2006 Nicolas Schodet
+//
+// Robot APB Team/Efrei 2006.
+// Web: http://assos.efrei.fr/robot/
+// Email: robot AT efrei DOT fr
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// }}}
+#include "utils/meta/remove_reference.hh"
+
+#include <stdexcept>
+
+/// Func class construction helper.
+template<class T, typename F>
+class Tester::MemFunc
+{
+};
+
+/// Partially specialised for member functions taking an argument list.
+template<class T>
+class Tester::MemFunc<T, bool (T::*) (const Tester::Args &)> : public Func
+{
+ T &i_;
+ typedef bool (T::*F) (const Tester::Args &);
+ F f_;
+ public:
+ MemFunc (T &i, F f) : i_ (i), f_ (f) { }
+ bool operator() (const Args &a)
+ {
+ return (i_.*f_) (a);
+ }
+};
+
+/// Partially specialised for member functions taking no argument.
+template<class T>
+class Tester::MemFunc<T, bool (T::*) (void)> : public Func
+{
+ T &i_;
+ typedef bool (T::*F) (void);
+ F f_;
+ public:
+ MemFunc (T &i, F f) : i_ (i), f_ (f) { }
+ bool operator() (const Args &a)
+ {
+ if (!a.empty ())
+ throw std::runtime_error ("no argument expected");
+ return (i_.*f_) ();
+ }
+};
+
+/// Partially specialised for member functions taking one argument.
+template<class T, typename A1>
+class Tester::MemFunc<T, bool (T::*) (A1)> : public Func
+{
+ T &i_;
+ typedef bool (T::*F) (A1);
+ F f_;
+ public:
+ MemFunc (T &i, F f) : i_ (i), f_ (f) { }
+ bool operator() (const Args &a)
+ {
+ Args::const_iterator i = a.begin ();
+ if (a.size () != 1)
+ throw std::runtime_error ("one argument expected");
+ A1 a1 = any_cast<typename meta::removeReference<A1>::type> (*i);
+ return (i_.*f_) (a1);
+ }
+};
+
+/// Partially specialised for member functions taking two argument.
+template<class T, typename A1, typename A2>
+class Tester::MemFunc<T, bool (T::*) (A1, A2)> : public Func
+{
+ T &i_;
+ typedef bool (T::*F) (A1, A2);
+ F f_;
+ public:
+ MemFunc (T &i, F f) : i_ (i), f_ (f) { }
+ bool operator() (const Args &a)
+ {
+ Args::const_iterator i = a.begin ();
+ if (a.size () != 2)
+ throw std::runtime_error ("two argument expected");
+ A1 a1 = any_cast<typename meta::removeReference<A1>::type> (*i);
+ A2 a2 = any_cast<typename meta::removeReference<A2>::type> (*++i);
+ return (i_.*f_) (a1, a2);
+ }
+};
+
+/// Partially specialised for member functions taking three argument.
+template<class T, typename A1, typename A2, typename A3>
+class Tester::MemFunc<T, bool (T::*) (A1, A2, A3)> : public Func
+{
+ T &i_;
+ typedef bool (T::*F) (A1, A2, A3);
+ F f_;
+ public:
+ MemFunc (T &i, F f) : i_ (i), f_ (f) { }
+ bool operator() (const Args &a)
+ {
+ Args::const_iterator i = a.begin ();
+ if (a.size () != 3)
+ throw std::runtime_error ("three argument expected");
+ A1 a1 = any_cast<typename meta::removeReference<A1>::type> (*i);
+ A2 a2 = any_cast<typename meta::removeReference<A2>::type> (*++i);
+ A3 a3 = any_cast<typename meta::removeReference<A3>::type> (*++i);
+ return (i_.*f_) (a1, a2, a3);
+ }
+};
+
+/// Take all the template sophistications out of the programmer hands.
+template<class T, typename F>
+Tester::Func *
+Tester::memFunc (T &i, F f)
+{
+ return new MemFunc<T, F> (i, f);
+}
+
+#endif // tester_tcc