more tests for TCs

diff --git a/Moose.xs b/Moose.xs
index ea5f161..d9fad80 100644 (file)
--- a/Moose.xs
+++ b/Moose.xs
@@ -400,7 +400,7 @@ STATIC bool check_type_constraint(pTHX_ tc_kind kind, TC_CHECK tc_check, SV *typ
             return check_sv_type(tc_check.type, sv);
             break;
         case tc_stash:
-            return check_class(aTHX_ tc_check.stash, sv);
+            return check_sv_class(aTHX_ tc_check.stash, sv);
             break;
         case tc_fptr:
             return tc_check.fptr(aTHX_ type_constraint, sv);

diff --git a/t/700_xs/001_basic.t b/t/700_xs/001_basic.t
index 9e0048b..91882d7 100644 (file)
--- a/t/700_xs/001_basic.t
+++ b/t/700_xs/001_basic.t
@@ -107,12 +107,15 @@ ok( defined &Moose::XS::new_predicate );
     has i => ( isa => "Int", is => "rw" );
     has s => ( isa => "Str", is => "rw" );
     has a => ( isa => "ArrayRef", is => "rw" );
+    has o => ( isa => "Object", is => "rw" );
+    has f => ( isa => "Foo", is => "rw" );
+    has c => ( isa => "ClassName", is => "rw" );
 
-    # FIXME Regexp, Class, ClassName, Object, parametrized, filehandle
+    # FIXME Regexp, ScalarRef, parametrized, filehandle
 }
 
 {
-    my ( $x, $y, $z, $ref, $a, $s, $i ) = map { Foo->meta->get_attribute($_) } qw(x y z ref a s i);
+    my ( $x, $y, $z, $ref, $a, $s, $i, $o, $f, $c ) = map { Foo->meta->get_attribute($_) } qw(x y z ref a s i o f c);
     $x->Moose::XS::new_accessor("Foo::x");
     $x->Moose::XS::new_predicate("Foo::has_x");
     $y->Moose::XS::new_getter("Foo::y");
@@ -122,6 +125,9 @@ ok( defined &Moose::XS::new_predicate );
     $a->Moose::XS::new_accessor("Foo::a");
     $s->Moose::XS::new_accessor("Foo::s");
     $i->Moose::XS::new_accessor("Foo::i");
+    $o->Moose::XS::new_accessor("Foo::o");
+    $f->Moose::XS::new_accessor("Foo::f");
+    $c->Moose::XS::new_accessor("Foo::c");
 }
 
 
@@ -171,10 +177,16 @@ is( $foo->ref(), undef );
 ok( !eval { $foo->a("not a ref"); 1 } );
 ok( !eval { $foo->i(1.3); 1 } );
 ok( !eval { $foo->s(undef); 1 } );
+ok( !eval { $foo->o({}); 1 } );
+ok( !eval { $foo->f(bless {}, "Bar"); 1 } );
+ok( !eval { $foo->c("Horse"); 1 } );
 
 ok( eval { $foo->a([]); 1 } );
 ok( eval { $foo->i(3); 1 } );
 ok( eval { $foo->s("foo"); 1 } );
+ok( eval { $foo->o(bless {}, "Bar"); 1 } );
+ok( eval { $foo->f(Foo->new); 1 } );
+ok( eval { $foo->c("Foo"); 1 } );
 
 use Data::Dumper;
 warn Dumper($foo);