X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F001_basic.t;h=2a2f94ec9f27567629a3203fc89d300c9de8dae3;hb=f085ee4d571b470f4dc4874dfaae7f2f542d6eba;hp=6c1c1fa4e1fd0b814267f4dab93b1fb8fba9c3a2;hpb=adbe3e57810b57a425b78c327cc08ec3ab602a97;p=gitmo%2FMooseX-Getopt.git

diff --git a/t/001_basic.t b/t/001_basic.t
index 6c1c1fa..2a2f94e 100644
--- a/t/001_basic.t
+++ b/t/001_basic.t
@@ -1,9 +1,9 @@
-#!/usr/bin/perl
-
 use strict;
 use warnings;
 
-use Test::More tests => 69;
+use Test::More tests => 70;
+use Test::Moose;
+use Test::NoWarnings 1.04 ':early';
 
 BEGIN {
     use_ok('MooseX::Getopt');
@@ -12,11 +12,11 @@ BEGIN {
 {
     package App;
     use Moose;
-    
+
     with 'MooseX::Getopt';
 
     has 'data' => (
-        metaclass => 'MooseX::Getopt::Meta::Attribute',        
+        metaclass => 'Getopt',
         is        => 'ro',
         isa       => 'Str',
         default   => 'file.dat',
@@ -24,7 +24,7 @@ BEGIN {
     );
 
     has 'cow' => (
-        metaclass   => 'Getopt',        
+        metaclass   => 'Getopt',
         is          => 'ro',
         isa         => 'Str',
         default     => 'moo',
@@ -32,7 +32,7 @@ BEGIN {
     );
 
     has 'horse' => (
-        metaclass   => 'MooseX::Getopt::Meta::Attribute',        
+        traits      => ['Getopt'],
         is          => 'ro',
         isa         => 'Str',
         default     => 'bray',
@@ -48,15 +48,15 @@ BEGIN {
 
     has 'verbose' => (
         is     => 'ro',
-        isa    => 'Bool',       
+        isa    => 'Bool',
     );
-    
+
     has 'libs' => (
         is      => 'ro',
         isa     => 'ArrayRef',
         default => sub { [] },
-    ); 
-    
+    );
+
     has 'details' => (
         is      => 'ro',
         isa     => 'HashRef',
@@ -70,21 +70,27 @@ BEGIN {
     );
 
     has '_private_stuff_cmdline' => (
-        metaclass => 'MooseX::Getopt::Meta::Attribute',        
+        traits    => ['Getopt'],
         is        => 'ro',
         isa       => 'Int',
         default   => 832,
         cmd_flag  => 'p',
     );
-  
 }
 
 foreach my $attr_name (qw(data cow horse _private_stuff_cmdline)) {
     my $attr = App->meta->get_attribute($attr_name);
     isa_ok($attr, 'Moose::Meta::Attribute');
-    isa_ok($attr, 'MooseX::Getopt::Meta::Attribute');
+    if ($attr_name eq 'data' or $attr_name eq 'cow')
+    {
+        isa_ok($attr, 'MooseX::Getopt::Meta::Attribute');
+    }
+    else
+    {
+        does_ok($attr, 'MooseX::Getopt::Meta::Attribute::Trait');
+    }
     can_ok($attr, 'cmd_flag');
-    can_ok($attr, 'cmd_aliases');    
+    can_ok($attr, 'cmd_aliases');
 }
 
 {
@@ -94,10 +100,10 @@ foreach my $attr_name (qw(data cow horse _private_stuff_cmdline)) {
     isa_ok($app, 'App');
 
     ok(!$app->verbose, '... verbosity is off as expected');
-    is($app->length, 24, '... length is 24 as expected');    
-    is($app->data, 'file.dat', '... data is file.dat as expected');        
-    is_deeply($app->libs, [], '... libs is [] as expected'); 
-    is_deeply($app->details, {}, '... details is {} as expected');           
+    is($app->length, 24, '... length is 24 as expected');
+    is($app->data, 'file.dat', '... data is file.dat as expected');
+    is_deeply($app->libs, [], '... libs is [] as expected');
+    is_deeply($app->details, {}, '... details is {} as expected');
 }
 
 {
@@ -107,10 +113,10 @@ foreach my $attr_name (qw(data cow horse _private_stuff_cmdline)) {
     isa_ok($app, 'App');
 
     ok($app->verbose, '... verbosity is turned on as expected');
-    is($app->length, 50, '... length is 50 as expected');    
-    is($app->data, 'file.dat', '... data is file.dat as expected'); 
-    is_deeply($app->libs, [], '... libs is [] as expected');  
-    is_deeply($app->details, {}, '... details is {} as expected');                            
+    is($app->length, 50, '... length is 50 as expected');
+    is($app->data, 'file.dat', '... data is file.dat as expected');
+    is_deeply($app->libs, [], '... libs is [] as expected');
+    is_deeply($app->details, {}, '... details is {} as expected');
 }
 
 {
@@ -120,10 +126,10 @@ foreach my $attr_name (qw(data cow horse _private_stuff_cmdline)) {
     isa_ok($app, 'App');
 
     ok($app->verbose, '... verbosity is turned on as expected');
-    is($app->length, 24, '... length is 24 as expected');    
-    is($app->data, 'foo.txt', '... data is foo.txt as expected'); 
-    is_deeply($app->libs, [], '... libs is [] as expected');    
-    is_deeply($app->details, {}, '... details is {} as expected');                             
+    is($app->length, 24, '... length is 24 as expected');
+    is($app->data, 'foo.txt', '... data is foo.txt as expected');
+    is_deeply($app->libs, [], '... libs is [] as expected');
+    is_deeply($app->details, {}, '... details is {} as expected');
 }
 
 {
@@ -133,12 +139,12 @@ foreach my $attr_name (qw(data cow horse _private_stuff_cmdline)) {
     isa_ok($app, 'App');
 
     ok($app->verbose, '... verbosity is turned on as expected');
-    is($app->length, 24, '... length is 24 as expected');    
-    is($app->data, 'file.dat', '... data is foo.txt as expected'); 
-    is_deeply($app->libs, 
-    ['libs/', 'includes/lib'], 
-    '... libs is [libs/, includes/lib] as expected');   
-    is_deeply($app->details, {}, '... details is {} as expected');                              
+    is($app->length, 24, '... length is 24 as expected');
+    is($app->data, 'file.dat', '... data is foo.txt as expected');
+    is_deeply($app->libs,
+    ['libs/', 'includes/lib'],
+    '... libs is [libs/, includes/lib] as expected');
+    is_deeply($app->details, {}, '... details is {} as expected');
 }
 
 {
@@ -148,12 +154,12 @@ foreach my $attr_name (qw(data cow horse _private_stuff_cmdline)) {
     isa_ok($app, 'App');
 
     ok(!$app->verbose, '... verbosity is turned on as expected');
-    is($app->length, 24, '... length is 24 as expected');    
-    is($app->data, 'file.dat', '... data is foo.txt as expected'); 
-    is_deeply($app->libs, [], '... libs is [] as expected');    
-    is_deeply($app->details, 
-    { os => 'mac', name => 'foo' }, 
-    '... details is { os => mac, name => foo } as expected');                              
+    is($app->length, 24, '... length is 24 as expected');
+    is($app->data, 'file.dat', '... data is foo.txt as expected');
+    is_deeply($app->libs, [], '... libs is [] as expected');
+    is_deeply($app->details,
+    { os => 'mac', name => 'foo' },
+    '... details is { os => mac, name => foo } as expected');
 }
 
 {
@@ -164,10 +170,10 @@ foreach my $attr_name (qw(data cow horse _private_stuff_cmdline)) {
     isa_ok($app, 'App');
 
     ok(!$app->verbose, '... verbosity is turned off as expected');
-    is($app->length, 24, '... length is 24 as expected');    
-    is($app->data, 'file.dat', '... file is file.dat as expected');   
-    is_deeply($app->libs, [], '... libs is [] as expected');                
-    is_deeply($app->details, {}, '... details is {} as expected');               
+    is($app->length, 24, '... length is 24 as expected');
+    is($app->data, 'file.dat', '... file is file.dat as expected');
+    is_deeply($app->libs, [], '... libs is [] as expected');
+    is_deeply($app->details, {}, '... details is {} as expected');
 }
 
 # Test cmd_alias without cmd_flag