bring back wrap+modules tests. closes #52

Author: romainfrancois

inst/unitTests/cpp/wrap.cpp

@@ -224,35 +224,35 @@ SEXP map_int_vector_double(){
     return wrap( map ) ;
 }
 
-// RCPP_EXPOSED_CLASS(Foo)
-// class Foo{
-//     public: 
-//         Foo() : x(0.0){}
-//         Foo( double x_ ) : x(x_){}
-//         double get() { return x ; }
-//    private:
-//        double x ;
-// } ;
-// RCPP_MODULE(mod){
-//     class_<Foo>("Foo")
-//         .constructor<double>()
-//         .method( "get", &Foo::get )
-//     ;
-// }
-// 
-// // [[Rcpp::export]]
-// SEXP map_int_Foo(){
-//     std::map<int, Foo> map ;
-//     map[0] = Foo( 2 ) ;
-//     map[1] = Foo( 3 ) ;
-//     return wrap( map ) ;
-// }
-// 
-// // [[Rcpp::export]]
-// SEXP vector_Foo(){
-//     std::vector<Foo> vec(2) ;
-//     vec[0] = Foo( 2 ) ;
-//     vec[1] = Foo( 3 ) ;
-//     return wrap(vec) ;
-// }
+RCPP_EXPOSED_CLASS(Foo)
+class Foo{
+    public: 
+        Foo() : x(0.0){}
+        Foo( double x_ ) : x(x_){}
+        double get() { return x ; }
+   private:
+       double x ;
+} ;
+RCPP_MODULE(mod){
+    class_<Foo>("Foo")
+        .constructor<double>()
+        .method( "get", &Foo::get )
+    ;
+}
+
+// [[Rcpp::export]]
+SEXP map_int_Foo(){
+    std::map<int, Foo> map ;
+    map[0] = Foo( 2 ) ;
+    map[1] = Foo( 3 ) ;
+    return wrap( map ) ;
+}
+
+// [[Rcpp::export]]
+SEXP vector_Foo(){
+    std::vector<Foo> vec(2) ;
+    vec[0] = Foo( 2 ) ;
+    vec[1] = Foo( 3 ) ;
+    return wrap(vec) ;
+}
 

inst/unitTests/runit.wrap.R

@@ -167,21 +167,21 @@ test.wrap.map.int.vector_double <- function(){
     )    
 }
 
-# test.wrap.map.int.Foo <- function(){
-#     checkEquals( 
-#         sapply( map_int_Foo(), function(.) .$get() ), 
-#         c("0" = 2, "1" = 3 ), 
-#         msg = "std::map<int, MODULE EXPOSED CLASS >"
-#     )    
-# }
-# 
-# test.wrap.vector.Foo <- function(){
-#     checkEquals( 
-#         sapply( vector_Foo(), function(.) .$get() ), 
-#         c(2, 3), 
-#         msg = "std::vector< MODULE EXPOSED CLASS >"
-#     )    
-# }
+test.wrap.map.int.Foo <- function(){
+    checkEquals( 
+        sapply( map_int_Foo(), function(.) .$get() ), 
+        c("0" = 2, "1" = 3 ), 
+        msg = "std::map<int, MODULE EXPOSED CLASS >"
+    )    
+}
+
+test.wrap.vector.Foo <- function(){
+    checkEquals( 
+        sapply( vector_Foo(), function(.) .$get() ), 
+        c(2, 3), 
+        msg = "std::vector< MODULE EXPOSED CLASS >"
+    )    
+}
 
 }