X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F012_package_variables.t;h=95098989328746487ec2ea1f7c5105935ac3ec07;hb=7202116b012d65b1c71d42819a0d2aa2ec5d3bd1;hp=def46f56f1afc0a94879002328a6e9f282f50914;hpb=58d75218075c1c4d117151122e54eced58f233c1;p=gitmo%2FClass-MOP.git

diff --git a/t/012_package_variables.t b/t/012_package_variables.t
index def46f5..9509898 100644
--- a/t/012_package_variables.t
+++ b/t/012_package_variables.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 33;
+use Test::More tests => 87;
 use Test::Exception;
 
 BEGIN {
@@ -15,6 +15,16 @@ BEGIN {
     use metaclass;
 }
 
+=pod
+
+This is the same test as 080_meta_package.t just here 
+we call all the methods through Class::MOP::Class.
+
+=cut
+
+# ----------------------------------------------------------------------
+## tests adding a HASH
+
 ok(!defined($Foo::{foo}), '... the %foo slot has not been created yet');
 ok(!Foo->meta->has_package_symbol('%foo'), '... the meta agrees');
 
@@ -22,9 +32,17 @@ lives_ok {
     Foo->meta->add_package_symbol('%foo' => { one => 1 });
 } '... created %Foo::foo successfully';
 
+# ... scalar should NOT be created here 
+
+ok(!Foo->meta->has_package_symbol('$foo'), '... SCALAR shouldnt have been created too');
+ok(!Foo->meta->has_package_symbol('@foo'), '... ARRAY shouldnt have been created too');
+ok(!Foo->meta->has_package_symbol('&foo'), '... CODE shouldnt have been created too');
+
 ok(defined($Foo::{foo}), '... the %foo slot was created successfully');
 ok(Foo->meta->has_package_symbol('%foo'), '... the meta agrees');
 
+# check the value ...
+
 {
     no strict 'refs';
     ok(exists ${'Foo::foo'}{one}, '... our %foo was initialized correctly');
@@ -34,6 +52,8 @@ ok(Foo->meta->has_package_symbol('%foo'), '... the meta agrees');
 my $foo = Foo->meta->get_package_symbol('%foo');
 is_deeply({ one => 1 }, $foo, '... got the right package variable back');
 
+# ... make sure changes propogate up
+
 $foo->{two} = 2;
 
 {
@@ -44,6 +64,9 @@ $foo->{two} = 2;
     is(${'Foo::foo'}{two}, 2, '... our %foo was updated correctly');    
 }
 
+# ----------------------------------------------------------------------
+## test adding an ARRAY
+
 ok(!defined($Foo::{bar}), '... the @bar slot has not been created yet');
 
 lives_ok {
@@ -51,6 +74,15 @@ lives_ok {
 } '... created @Foo::bar successfully';
 
 ok(defined($Foo::{bar}), '... the @bar slot was created successfully');
+ok(Foo->meta->has_package_symbol('@bar'), '... the meta agrees');
+
+# ... why does this not work ... 
+
+ok(!Foo->meta->has_package_symbol('$bar'), '... SCALAR shouldnt have been created too');
+ok(!Foo->meta->has_package_symbol('%bar'), '... HASH shouldnt have been created too');
+ok(!Foo->meta->has_package_symbol('&bar'), '... CODE shouldnt have been created too');
+
+# check the value itself
 
 {
     no strict 'refs';
@@ -58,44 +90,147 @@ ok(defined($Foo::{bar}), '... the @bar slot was created successfully');
     is(${'Foo::bar'}[1], 2, '... our @bar was initialized correctly');
 }
 
-# now without initial value
+# ----------------------------------------------------------------------
+## test adding a SCALAR
 
-ok(!defined($Foo::{baz}), '... the %baz slot has not been created yet');
+ok(!defined($Foo::{baz}), '... the $baz slot has not been created yet');
 
 lives_ok {
-    Foo->meta->add_package_symbol('%baz');
-} '... created %Foo::baz successfully';
+    Foo->meta->add_package_symbol('$baz' => 10);
+} '... created $Foo::baz successfully';
 
-ok(defined($Foo::{baz}), '... the %baz slot was created successfully');
+ok(defined($Foo::{baz}), '... the $baz slot was created successfully');
+ok(Foo->meta->has_package_symbol('$baz'), '... the meta agrees');
+
+ok(!Foo->meta->has_package_symbol('@baz'), '... ARRAY shouldnt have been created too');
+ok(!Foo->meta->has_package_symbol('%baz'), '... HASH shouldnt have been created too');
+ok(!Foo->meta->has_package_symbol('&baz'), '... CODE shouldnt have been created too');
+
+is(${Foo->meta->get_package_symbol('$baz')}, 10, '... got the right value back');   
 
 {
     no strict 'refs';
-    ${'Foo::baz'}{one} = 1;
+    ${'Foo::baz'} = 1;
 
-    ok(exists ${'Foo::baz'}{one}, '... our %baz was initialized correctly');
-    is(${'Foo::baz'}{one}, 1, '... our %baz was initialized correctly');
+    is(${'Foo::baz'}, 1, '... our $baz was assigned to correctly');
+    is(${Foo->meta->get_package_symbol('$baz')}, 1, '... the meta agrees');    
 }
 
-ok(!defined($Foo::{bling}), '... the @bling slot has not been created yet');
+# ----------------------------------------------------------------------
+## test adding a CODE
+
+ok(!defined($Foo::{funk}), '... the &funk slot has not been created yet');
+
+lives_ok {
+    Foo->meta->add_package_symbol('&funk' => sub { "Foo::funk" });
+} '... created &Foo::funk successfully';
+
+ok(defined($Foo::{funk}), '... the &funk slot was created successfully');
+ok(Foo->meta->has_package_symbol('&funk'), '... the meta agrees');
+
+ok(!Foo->meta->has_package_symbol('$funk'), '... SCALAR shouldnt have been created too');
+ok(!Foo->meta->has_package_symbol('@funk'), '... ARRAY shouldnt have been created too');
+ok(!Foo->meta->has_package_symbol('%funk'), '... HASH shouldnt have been created too');
+
+{
+    no strict 'refs';
+    ok(defined &{'Foo::funk'}, '... our &funk exists');
+}
+
+is(Foo->funk(), 'Foo::funk', '... got the right value from the function');
+
+# ----------------------------------------------------------------------
+## test multiple slots in the glob
+
+my $ARRAY = [ 1, 2, 3 ];
+my $CODE = sub { "Foo::foo" };
+
+lives_ok {
+    Foo->meta->add_package_symbol('@foo' => $ARRAY);
+} '... created @Foo::foo successfully';
+
+ok(Foo->meta->has_package_symbol('@foo'), '... the @foo slot was added successfully');
+is(Foo->meta->get_package_symbol('@foo'), $ARRAY, '... got the right values for @Foo::foo');
 
 lives_ok {
-    Foo->meta->add_package_symbol('@bling');
-} '... created @Foo::bling successfully';
+    Foo->meta->add_package_symbol('&foo' => $CODE);
+} '... created &Foo::foo successfully';
 
-ok(defined($Foo::{bling}), '... the @bling slot was created successfully');
+ok(Foo->meta->has_package_symbol('&foo'), '... the meta agrees');
+is(Foo->meta->get_package_symbol('&foo'), $CODE, '... got the right value for &Foo::foo');
+
+lives_ok {
+    Foo->meta->add_package_symbol('$foo' => 'Foo::foo');
+} '... created $Foo::foo successfully';
+
+ok(Foo->meta->has_package_symbol('$foo'), '... the meta agrees');
+my $SCALAR = Foo->meta->get_package_symbol('$foo');
+is($$SCALAR, 'Foo::foo', '... got the right scalar value back');
 
 {
     no strict 'refs';
-    is(scalar @{'Foo::bling'}, 0, '... our @bling was initialized correctly');
-    ${'Foo::bling'}[1] = 2;
-    is(${'Foo::bling'}[1], 2, '... our @bling was assigned too correctly');
+    is(${'Foo::foo'}, 'Foo::foo', '... got the right value from the scalar');
 }
 
 lives_ok {
     Foo->meta->remove_package_symbol('%foo');
 } '... removed %Foo::foo successfully';
 
-ok(Foo->meta->has_package_symbol('%foo'), '... the %foo slot was removed successfully');
+ok(!Foo->meta->has_package_symbol('%foo'), '... the %foo slot was removed successfully');
+ok(Foo->meta->has_package_symbol('@foo'), '... the @foo slot still exists');
+ok(Foo->meta->has_package_symbol('&foo'), '... the &foo slot still exists');
+ok(Foo->meta->has_package_symbol('$foo'), '... the $foo slot still exists');
+
+is(Foo->meta->get_package_symbol('@foo'), $ARRAY, '... got the right values for @Foo::foo');
+is(Foo->meta->get_package_symbol('&foo'), $CODE, '... got the right value for &Foo::foo');
+is(Foo->meta->get_package_symbol('$foo'), $SCALAR, '... got the right value for $Foo::foo');
+
+{
+    no strict 'refs';
+    ok(!defined(*{"Foo::foo"}{HASH}), '... the %foo slot has been removed successfully');
+    ok(defined(*{"Foo::foo"}{ARRAY}), '... the @foo slot has NOT been removed');   
+    ok(defined(*{"Foo::foo"}{CODE}), '... the &foo slot has NOT been removed');   
+    ok(defined(${"Foo::foo"}), '... the $foo slot has NOT been removed');            
+}
+
+lives_ok {
+    Foo->meta->remove_package_symbol('&foo');
+} '... removed &Foo::foo successfully';
+
+ok(!Foo->meta->has_package_symbol('&foo'), '... the &foo slot no longer exists');
+
+ok(Foo->meta->has_package_symbol('@foo'), '... the @foo slot still exists');
+ok(Foo->meta->has_package_symbol('$foo'), '... the $foo slot still exists');
+
+is(Foo->meta->get_package_symbol('@foo'), $ARRAY, '... got the right values for @Foo::foo');
+is(Foo->meta->get_package_symbol('$foo'), $SCALAR, '... got the right value for $Foo::foo');
+
+{
+    no strict 'refs';
+    ok(!defined(*{"Foo::foo"}{HASH}), '... the %foo slot has been removed successfully');    
+    ok(!defined(*{"Foo::foo"}{CODE}), '... the &foo slot has now been removed');       
+    ok(defined(*{"Foo::foo"}{ARRAY}), '... the @foo slot has NOT been removed');   
+    ok(defined(${"Foo::foo"}), '... the $foo slot has NOT been removed');            
+}
+
+lives_ok {
+    Foo->meta->remove_package_symbol('$foo');
+} '... removed $Foo::foo successfully';
+
+ok(!Foo->meta->has_package_symbol('$foo'), '... the $foo slot no longer exists');
+
+ok(Foo->meta->has_package_symbol('@foo'), '... the @foo slot still exists');
+
+is(Foo->meta->get_package_symbol('@foo'), $ARRAY, '... got the right values for @Foo::foo');
+
+{
+    no strict 'refs';
+    ok(!defined(*{"Foo::foo"}{HASH}), '... the %foo slot has been removed successfully');    
+    ok(!defined(*{"Foo::foo"}{CODE}), '... the &foo slot has now been removed');   
+    ok(!defined(${"Foo::foo"}), '... the $foo slot has now been removed');                           
+    ok(defined(*{"Foo::foo"}{ARRAY}), '... the @foo slot has NOT been removed');    
+}
+
 
 # check some errors
 
@@ -114,8 +249,3 @@ dies_ok {
 dies_ok {
     Foo->meta->has_package_symbol('bar');
 } '... no sigil for bar';
-
-
-#dies_ok {
-#    Foo->meta->get_package_symbol('@.....bar');
-#} '... could not fetch variable';