First working version of DOM like Canvas event handling

[simgear.git] / simgear / nasal / cppbind / cppbind_test.cxx

diff --git a/simgear/nasal/cppbind/cppbind_test.cxx b/simgear/nasal/cppbind/cppbind_test.cxx
index 0f0caedf5d148ad5a6bef84425e8f9b6da561f12..47a437bcb01aa8dbd8f06240875df38422dbff38 100644 (file)
--- a/simgear/nasal/cppbind/cppbind_test.cxx
+++ b/simgear/nasal/cppbind/cppbind_test.cxx
@@ -17,6 +17,9 @@ struct Base
 {
   naRef member(const nasal::CallContext&) { return naNil(); }
   virtual ~Base(){};
+
+  std::string getString() const { return ""; }
+  void setString(const std::string&) {}
 };
 struct Derived:
   public Base
@@ -96,7 +99,8 @@ int main(int argc, char* argv[])
   mod.set("parent", hash);
 
   Ghost<Base>::init("Base")
-    .method<&Base::member>("member");
+    .method<&Base::member>("member")
+    .member("str", &Base::getString, &Base::setString);
   Ghost<Derived>::init("Derived")
     .bases<Base>()
     .member("x", &Derived::getX, &Derived::setX)
@@ -153,13 +157,20 @@ int main(int argc, char* argv[])
   obj.set("parents", parents);
   VERIFY( Ghost<BasePtr>::fromNasal(c, obj.get_naRef()) == d3 );
 
+  // Check recursive parents (aka parent-of-parent)
+  std::vector<naRef> parents2;
+  parents2.push_back(obj.get_naRef());
+  Hash derived_obj(c);
+  derived_obj.set("parents", parents2);
+  VERIFY( Ghost<BasePtr>::fromNasal(c, derived_obj.get_naRef()) == d3 );
+
   naRef args[] = {
     to_nasal(c, std::string("test-arg"))
   };
   CallContext cc(c, sizeof(args)/sizeof(args[0]), args);
-  VERIFY( cc.require<std::string>(0) == "test-arg" );
-  VERIFY( cc.get<std::string>(0) == "test-arg" );
-  VERIFY( cc.get<std::string>(1) == "" );
+  VERIFY( cc.requireArg<std::string>(0) == "test-arg" );
+  VERIFY( cc.getArg<std::string>(0) == "test-arg" );
+  VERIFY( cc.getArg<std::string>(1) == "" );
 
   // TODO actually do something with the ghosts...