X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F001_basic.t;h=f8d51cff81e690e1f909fe24889b85b10f4c398b;hb=d68e679f65ab5ec22bf60c1f5797722186978efc;hp=4fcfb5dbf3cdd09596c03874c8de103113c55e11;hpb=c13295c80061a10bc2612b024bfdb52687d3a3b0;p=gitmo%2FMooseX-MetaDescription.git

diff --git a/t/001_basic.t b/t/001_basic.t
index 4fcfb5d..f8d51cf 100644
--- a/t/001_basic.t
+++ b/t/001_basic.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More no_plan => 1;
+use Test::More 'no_plan';
 use Test::Exception;
 
 BEGIN {
@@ -12,11 +12,13 @@ BEGIN {
 
 {
     package Foo;
-    use metaclass 'MooseX::MetaDescription::Meta::Class';
+    use metaclass 'MooseX::MetaDescription::Meta::Class' => (
+        description => {
+            'Hello' => 'World'
+        }
+    );
     use Moose;
     
-    __PACKAGE__->meta->description->{'Hello'} = 'World';
-    
     has 'bar' => (
         metaclass   => 'MooseX::MetaDescription::Meta::Attribute',
         is          => 'ro',
@@ -29,7 +31,7 @@ BEGIN {
     );
     
     has 'baz' => (
-        traits      => [ 'MooseX::MetaDescription::Meta::Attribute::Trait' ],
+        traits      => [ 'MooseX::MetaDescription::Meta::Trait' ],
         is          => 'ro',
         isa         => 'Str',   
         default     => sub { 'Foo::baz' },
@@ -43,13 +45,17 @@ BEGIN {
 # check the meta-desc
 
 my $foo_class = Foo->meta;
-is($foo_class->metadescription->class, $foo_class, '... got the circular ref');
+isa_ok($foo_class, 'MooseX::MetaDescription::Meta::Class');
+isa_ok($foo_class->metadescription, 'MooseX::MetaDescription::Description');
+is($foo_class->metadescription->descriptor, $foo_class, '... got the circular ref');
 
 my $bar_attr = Foo->meta->get_attribute('bar');
-is($bar_attr->metadescription->attribute, $bar_attr, '... got the circular ref');
+isa_ok($bar_attr->metadescription, 'MooseX::MetaDescription::Description');
+is($bar_attr->metadescription->descriptor, $bar_attr, '... got the circular ref');
 
 my $baz_attr = Foo->meta->get_attribute('baz');
-is($baz_attr->metadescription->attribute, $baz_attr, '... got the circular ref');
+isa_ok($baz_attr->metadescription, 'MooseX::MetaDescription::Description');
+is($baz_attr->metadescription->descriptor, $baz_attr, '... got the circular ref');
 
 # check the actual descs