X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMooseX-Types-Common.git;a=blobdiff_plain;f=t%2F01-string.t;fp=t%2F01-string.t;h=63f2298f0938940fe5a322f783f813bbefaed9e8;hp=bbf5c8315ff63e06523f06fc4abca680ad123770;hb=8ee1241a181bcd531400ffe4ffc7a142e9d4c6dc;hpb=265ef5df0696361005a544c60a3dfb2671eec479

diff --git a/t/01-string.t b/t/01-string.t
index bbf5c83..63f2298 100644
--- a/t/01-string.t
+++ b/t/01-string.t
@@ -1,80 +1,62 @@
 use strict;
 use warnings FATAL => 'all';
 use Test::More tests => 33;
-use Test::Fatal;
 
-{
-  package FooTest;
-  use Moose;
-  use MooseX::Types::Common::String (
-    qw(SimpleStr
-       NonEmptySimpleStr
-       LowerCaseSimpleStr
-       UpperCaseSimpleStr
-       Password
-       StrongPassword
-       NonEmptyStr
-       LowerCaseStr
-       UpperCaseStr
-       NumericCode
-	),
-  );
-
-  has simplestr => ( is => 'rw', isa => SimpleStr );
-  has nestr => ( is => 'rw', isa => NonEmptyStr );
-  has nesimplestr => ( is => 'rw', isa => NonEmptySimpleStr );
-  has lcsimplestr => ( is => 'rw', isa => LowerCaseSimpleStr );
-  has ucsimplestr => ( is => 'rw', isa => UpperCaseSimpleStr );
-  has password => ( is => 'rw', isa => Password );
-  has strongpassword => ( is => 'rw', isa => StrongPassword );
-  has lowercasestr => ( is => 'rw', isa => LowerCaseStr );
-  has uppercasestr => ( is => 'rw', isa => UpperCaseStr );
-  has numericcode => ( is => 'rw', isa => NumericCode );
-}
-
-my $ins = FooTest->new;
+use MooseX::Types::Common::String qw(
+    SimpleStr
+    NonEmptySimpleStr
+    LowerCaseSimpleStr
+    UpperCaseSimpleStr
+    Password
+    StrongPassword
+    NonEmptyStr
+    LowerCaseStr
+    UpperCaseStr
+    NumericCode
+);
 
 # TODO: need to check both the inlined and non-inlined versions!
 
-is(exception { $ins->simplestr('') }, undef, 'SimpleStr');
-is(exception { $ins->simplestr('good string') }, undef, 'SimpleStr 2');
-isnt(exception { $ins->simplestr("bad\nstring") }, 'SimpleStr 3');
-isnt(exception { $ins->simplestr(join('', ("long string" x 25))) }, undef, 'SimpleStr 4');
+ok(is_SimpleStr(''), 'SimpleStr');
+ok(is_SimpleStr('a string'), 'SimpleStr 2');
+ok(!is_SimpleStr("another\nstring"), 'SimpleStr 3');
+ok(!is_SimpleStr(join('', ("long string" x 25))), 'SimpleStr 4');
+
+ok(!is_NonEmptyStr(''), 'NonEmptyStr');
+ok(is_NonEmptyStr('a string'), 'NonEmptyStr 2');
+ok(is_NonEmptyStr("another string"), 'NonEmptyStr 3');
+ok(is_NonEmptyStr(join('', ("long string" x 25))), 'NonEmptyStr 4');
 
-isnt(exception { $ins->nestr('') }, undef, 'NonEmptyStr');
-is(exception { $ins->nestr('good string') }, undef, 'NonEmptyStr 2');
-is(exception { $ins->nestr("bad\nstring") }, undef, 'NonEmptyStr 3');
-is(exception { $ins->nestr(join('', ("long string" x 25))) }, undef, 'NonEmptyStr 4');
+ok(is_NonEmptySimpleStr('good str'), 'NonEmptySimplrStr');
+ok(!is_NonEmptySimpleStr(''), 'NonEmptyStr 2');
 
-is(exception { $ins->nesimplestr('good str') }, undef, 'NonEmptySimplrStr');
-isnt(exception { $ins->nesimplestr('') }, undef, 'NonEmptyStr 2');
+ok(!is_Password('no'), 'Password');
+ok(is_Password('okay'), 'Password 2');
 
-isnt(exception { $ins->password('no') }, undef, 'Password');
-is(exception { $ins->password('okay') }, undef, 'Password 2');
+ok(!is_StrongPassword('notokay'), 'StrongPassword');
+ok(is_StrongPassword('83773r_ch01c3'), 'StrongPassword 2');
 
-isnt(exception { $ins->strongpassword('notokay') }, undef, 'StrongPassword');
-is(exception { $ins->strongpassword('83773r_ch01c3') }, undef, 'StrongPassword 2');
+ok(!is_LowerCaseSimpleStr('NOTOK'), 'LowerCaseSimpleStr');
+ok(is_LowerCaseSimpleStr('ok'), 'LowerCaseSimpleStr 2');
+ok(!is_LowerCaseSimpleStr('NOTOK_123`"'), 'LowerCaseSimpleStr 3');
+ok(is_LowerCaseSimpleStr('ok_123`"'), 'LowerCaseSimpleStr 4');
 
-isnt(exception { $ins->lcsimplestr('NOTOK') }, undef, 'LowerCaseSimpleStr');
-is(exception { $ins->lcsimplestr('ok') }, undef, 'LowerCaseSimpleStr 2');
-isnt(exception { $ins->lcsimplestr('NOTOK_123`"') }, undef, 'LowerCaseSimpleStr 3');
-is(exception { $ins->lcsimplestr('ok_123`"') }, undef, 'LowerCaseSimpleStr 4');
+ok(!is_UpperCaseSimpleStr('notok'), 'UpperCaseSimpleStr');
+ok(is_UpperCaseSimpleStr('OK'), 'UpperCaseSimpleStr 2');
+ok(!is_UpperCaseSimpleStr('notok_123`"'), 'UpperCaseSimpleStr 3');
+ok(is_UpperCaseSimpleStr('OK_123`"'), 'UpperCaseSimpleStr 4');
 
-isnt(exception { $ins->ucsimplestr('notok') }, undef, 'UpperCaseSimpleStr');
-is(exception { $ins->ucsimplestr('OK') }, undef, 'UpperCaseSimpleStr 2');
-isnt(exception { $ins->ucsimplestr('notok_123`"') }, undef, 'UpperCaseSimpleStr 3');
-is(exception { $ins->ucsimplestr('OK_123`"') }, undef, 'UpperCaseSimpleStr 4');
+ok(!is_LowerCaseStr('NOTOK'), 'LowerCaseStr');
+ok(is_LowerCaseStr("ok\nok"), 'LowerCaseStr 2');
+ok(!is_LowerCaseStr('NOTOK_123`"'), 'LowerCaseStr 3');
+ok(is_LowerCaseStr("ok\n_123`'"), 'LowerCaseStr 4');
 
-isnt(exception { $ins->lowercasestr('NOTOK') }, undef, 'LowerCaseStr');
-is(exception { $ins->lowercasestr("ok\nok") }, undef, 'LowerCaseStr 2');
-isnt(exception { $ins->lowercasestr('NOTOK_123`"') }, undef, 'LowerCaseStr 3');
-is(exception { $ins->lowercasestr("ok\n_123`'") }, undef, 'LowerCaseStr 4');
+ok(!is_UpperCaseStr('notok'), 'UpperCaseStr');
+ok(is_UpperCaseStr("OK\nOK"), 'UpperCaseStr 2');
+ok(!is_UpperCaseStr('notok_123`"'), 'UpperCaseStr 3');
+ok(is_UpperCaseStr("OK\n_123`'"), 'UpperCaseStr 4');
 
-isnt(exception { $ins->uppercasestr('notok') }, undef, 'UpperCaseStr');
-is(exception { $ins->uppercasestr("OK\nOK") }, undef, 'UpperCaseStr 2');
-isnt(exception { $ins->uppercasestr('notok_123`"') }, undef, 'UpperCaseStr 3');
-is(exception { $ins->uppercasestr("OK\n_123`'") }, undef, 'UpperCaseStr 4');
+ok(is_NumericCode('032'),  'NumericCode lives');
+ok(!is_NumericCode('abc'),  'NumericCode dies' );
+ok(!is_NumericCode('x18'),  'mixed NumericCode dies');
 
-is(   exception { $ins->numericcode('032') }, undef,  'NumericCode lives');
-isnt( exception { $ins->numericcode('abc') }, undef,  'NumericCode dies' );
-isnt( exception { $ins->numericcode('x18') }, undef,  'mixed NumericCode dies');