X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F080_meta_package.t;h=a82ff273c7a22f31b4f2b0c152ea1a0dd07a0d77;hb=d5f6699d736fb63d5c072400969e366edabe8efd;hp=e3987417ed76e2c3f0d25ac09d7b2ede00b4ad8d;hpb=c20522bd825495befde91f3201a71909d80dd31c;p=gitmo%2FClass-MOP.git

diff --git a/t/080_meta_package.t b/t/080_meta_package.t
index e398741..a82ff27 100644
--- a/t/080_meta_package.t
+++ b/t/080_meta_package.t
@@ -1,47 +1,45 @@
-#!/usr/bin/perl
-
 use strict;
 use warnings;
 
-use Test::More tests => 43;
+use Test::More tests => 97;
 use Test::Exception;
 
-BEGIN {
-    use_ok('Class::MOP');        
-    use_ok('Class::MOP::Package');            
-}
+use Class::MOP;
+use Class::MOP::Package;
+
+
+dies_ok { Class::MOP::Package->get_all_package_symbols } q{... can't call get_all_package_symbols() as a class method};
+dies_ok { Class::MOP::Package->name } q{... can't call name() as a class method};
 
 {
     package Foo;
+
+    use constant SOME_CONSTANT => 1;
     
     sub meta { Class::MOP::Package->initialize('Foo') }
 }
 
+# ----------------------------------------------------------------------
+## 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');
+ok(!defined($Foo::{foo}), '... checking doesn\' vivify');
 
 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');
 
-{
-    no strict 'refs';
-    ok(defined(*{"Foo::foo"}{HASH}), '... the %foo (HASH) slot was created successfully');
-
-    ok(!defined(*{"Foo::foo"}{SCALAR}), '... but the $foo slot was not created');
-    ok(!Foo->meta->has_package_symbol('$foo'), '... and the meta agrees');    
-
-    ok(!defined(*{"Foo::foo"}{ARRAY}),  '... but the @foo slot was not created');
-    ok(!Foo->meta->has_package_symbol('@foo'), '... and the meta agrees');    
-
-    ok(!defined(*{"Foo::foo"}{CODE}),   '... but the &foo slot was not created');
-    ok(!Foo->meta->has_package_symbol('&foo'), '... and the meta agrees');    
-}
+# check the value ...
 
 {
     no strict 'refs';
@@ -52,6 +50,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;
 
 {
@@ -62,6 +62,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 {
@@ -69,6 +72,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';
@@ -76,50 +88,194 @@ 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(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');
 
-ok(defined($Foo::{baz}), '... the %baz slot was created successfully');
+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(Foo->meta->has_package_symbol('&foo'), '... the meta agrees');
+is(Foo->meta->get_package_symbol('&foo'), $CODE, '... got the right value for &Foo::foo');
 
-ok(defined($Foo::{bling}), '... the @bling slot was created successfully');
+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');    
 }
 
+# get_all_package_symbols
+
+{
+    my $syms = Foo->meta->get_all_package_symbols;
+    is_deeply(
+        [ sort keys %{ $syms } ],
+        [ sort Foo->meta->list_all_package_symbols ],
+        '... the fetched symbols are the same as the listed ones'
+    ); 
+}
+
+{
+    my $syms = Foo->meta->get_all_package_symbols('CODE');
+
+    is_deeply(
+        [ sort keys %{ $syms } ],
+        [ sort Foo->meta->list_all_package_symbols('CODE') ],
+        '... the fetched symbols are the same as the listed ones'
+    );
+    
+    foreach my $symbol (keys %{ $syms }) {
+        is($syms->{$symbol}, Foo->meta->get_package_symbol('&' . $symbol), '... got the right symbol');
+    } 
+}
+
+{
+    Foo->meta->add_package_symbol('%zork');
+
+    my $syms = Foo->meta->get_all_package_symbols('HASH');
+
+    is_deeply(
+        [ sort keys %{ $syms } ],
+        [ sort Foo->meta->list_all_package_symbols('HASH') ],
+        '... the fetched symbols are the same as the listed ones'
+    );
+
+    foreach my $symbol (keys %{ $syms }) {
+        is($syms->{$symbol}, Foo->meta->get_package_symbol('%' . $symbol), '... got the right symbol');
+    }
+
+    no warnings 'once';
+    is_deeply(
+        $syms,
+        { zork => \%Foo::zork },
+        "got the right ones",
+    );
+}
 # check some errors
 
 dies_ok {