From 2d654f7fa71f1c9a914cf4ccbf17f923fab6ab0c Mon Sep 17 00:00:00 2001
From: dellaert <dellaert@cc.gatech.edu>
Date: Fri, 14 Nov 2014 01:12:43 +0100
Subject: [PATCH] Fixed some wrap unit tests that were left by the wayside

---
 wrap/Method.h                           | 4 ++++
 wrap/StaticMethod.h                     | 4 ++++
 wrap/tests/expected2/MyTemplatePoint2.m | 4 ++--
 wrap/tests/expected2/MyTemplatePoint3.m | 4 ++--
 wrap/tests/testClass.cpp                | 4 ++--
 wrap/tests/testMethod.cpp               | 6 ++----
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/wrap/Method.h b/wrap/Method.h
index d097cc322..13847700d 100644
--- a/wrap/Method.h
+++ b/wrap/Method.h
@@ -36,6 +36,10 @@ public:
       StaticMethod(verbose), is_const_(false) {
   }
 
+  Method(const std::string& name, bool verbose = true) :
+    StaticMethod(name,verbose), is_const_(false) {
+  }
+
   virtual bool isStatic() const {
     return false;
   }
diff --git a/wrap/StaticMethod.h b/wrap/StaticMethod.h
index 0aed83677..4a6fedbfc 100644
--- a/wrap/StaticMethod.h
+++ b/wrap/StaticMethod.h
@@ -33,6 +33,10 @@ struct StaticMethod: public Function, public SignatureOverloads {
       Function(verbosity) {
   }
 
+  StaticMethod(const std::string& name, bool verbose = true) :
+    Function(name,verbose) {
+  }
+
   virtual bool isStatic() const {
     return true;
   }
diff --git a/wrap/tests/expected2/MyTemplatePoint2.m b/wrap/tests/expected2/MyTemplatePoint2.m
index 57a7bfd66..5f1c69480 100644
--- a/wrap/tests/expected2/MyTemplatePoint2.m
+++ b/wrap/tests/expected2/MyTemplatePoint2.m
@@ -12,8 +12,8 @@
 %return_T(Point2 value) : returns gtsam::Point2
 %return_Tptr(Point2 value) : returns gtsam::Point2
 %return_ptrs(Point2 p1, Point2 p2) : returns pair< gtsam::Point2, gtsam::Point2 >
-%templatedMethod(Point2 t) : returns void
-%templatedMethod(Point3 t) : returns void
+%templatedMethodPoint2(Point2 t) : returns void
+%templatedMethodPoint3(Point3 t) : returns void
 %
 classdef MyTemplatePoint2 < MyBase
   properties
diff --git a/wrap/tests/expected2/MyTemplatePoint3.m b/wrap/tests/expected2/MyTemplatePoint3.m
index a585bee6e..848e224fd 100644
--- a/wrap/tests/expected2/MyTemplatePoint3.m
+++ b/wrap/tests/expected2/MyTemplatePoint3.m
@@ -12,8 +12,8 @@
 %return_T(Point3 value) : returns gtsam::Point3
 %return_Tptr(Point3 value) : returns gtsam::Point3
 %return_ptrs(Point3 p1, Point3 p2) : returns pair< gtsam::Point3, gtsam::Point3 >
-%templatedMethod(Point2 t) : returns void
-%templatedMethod(Point3 t) : returns void
+%templatedMethodPoint2(Point2 t) : returns void
+%templatedMethodPoint3(Point3 t) : returns void
 %
 classdef MyTemplatePoint3 < MyBase
   properties
diff --git a/wrap/tests/testClass.cpp b/wrap/tests/testClass.cpp
index 775181bcc..d68daf4ba 100644
--- a/wrap/tests/testClass.cpp
+++ b/wrap/tests/testClass.cpp
@@ -46,12 +46,12 @@ TEST( Class, OverloadingMethod ) {
   EXPECT_LONGS_EQUAL(1, cls.nrMethods());
   EXPECT(cls.exists(name));
   Method& method = cls.method(name);
-  EXPECT_LONGS_EQUAL(1, method.returnVals.size());
+  EXPECT_LONGS_EQUAL(1, method.nrOverloads());
 
   cls.addMethod(verbose, is_const, name, args, retVal, templateArgName,
       templateArgValues);
   EXPECT_LONGS_EQUAL(1, cls.nrMethods());
-  EXPECT_LONGS_EQUAL(2, method.returnVals.size());
+  EXPECT_LONGS_EQUAL(2, method.nrOverloads());
 }
 
 /* ************************************************************************* */
diff --git a/wrap/tests/testMethod.cpp b/wrap/tests/testMethod.cpp
index d27b89644..4067f3d85 100644
--- a/wrap/tests/testMethod.cpp
+++ b/wrap/tests/testMethod.cpp
@@ -32,14 +32,12 @@ TEST( Method, Constructor ) {
 /* ************************************************************************* */
 // addOverload
 TEST( Method, addOverload ) {
-  Method method;
-  method.name = "myName";
+  Method method("myName");
   bool verbose = true, is_const = true;
   ArgumentList args;
   const ReturnValue retVal(ReturnType("return_type"));
   method.addOverload(verbose, is_const, "myName", args, retVal);
-  EXPECT_LONGS_EQUAL(1,method.argLists.size());
-  EXPECT_LONGS_EQUAL(1,method.returnVals.size());
+  EXPECT_LONGS_EQUAL(1,method.nrOverloads());
 }
 
 /* ************************************************************************* */