From: Stevan Little <stevan.little@iinteractive.com>
Date: Thu, 10 Aug 2006 19:35:49 +0000 (+0000)
Subject: cleanup and more tests;
X-Git-Tag: 0_33~11^2~2
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=c46b802b9f10829ddce24dbf3fb81d5319f8be8f;p=gitmo%2FClass-MOP.git

cleanup and more tests;
---

diff --git a/lib/Class/MOP/Package.pm b/lib/Class/MOP/Package.pm
index 87b4216..2911d2e 100644
--- a/lib/Class/MOP/Package.pm
+++ b/lib/Class/MOP/Package.pm
@@ -6,7 +6,6 @@ use warnings;
 
 use Scalar::Util 'blessed';
 use Carp         'confess';
-use Symbol       'gensym';
 
 our $VERSION = '0.02';
 
@@ -70,17 +69,26 @@ sub namespace { $_[0]->{'%:namespace'} }
 
 # Class attributes
 
+# ... these functions have to touch the symbol table itself,.. yuk
+
 sub add_package_symbol {
     my ($self, $variable, $initial_value) = @_;
 
     my ($name, $sigil, $type) = $self->_deconstruct_variable_name($variable); 
 
-
     no strict 'refs';
     no warnings 'redefine', 'misc';
-    *{$self->name . '::' . $name} = $initial_value;    
+    *{$self->name . '::' . $name} = ref $initial_value ? $initial_value : \$initial_value;    
+}
+
+sub remove_package_glob {
+    my ($self, $name) = @_;
+    no strict 'refs';        
+    delete ${$self->name . '::'}{$name};     
 }
 
+# ... these functions deal with stuff on the namespace level
+
 sub has_package_symbol {
     my ($self, $variable) = @_;
 
@@ -105,34 +113,41 @@ sub remove_package_symbol {
 
     my ($name, $sigil, $type) = $self->_deconstruct_variable_name($variable); 
 
-    no strict 'refs';
+    # FIXME:
+    # no doubt this is grossly inefficient and 
+    # could be done much easier and faster in XS
+
+    my ($scalar, $array, $hash, $code);
     if ($type eq 'SCALAR') {
-        undef ${$self->name . '::' . $name};    
+        $array  = $self->get_package_symbol('@' . $name) if $self->has_package_symbol('@' . $name);
+        $hash   = $self->get_package_symbol('%' . $name) if $self->has_package_symbol('%' . $name);     
+        $code   = $self->get_package_symbol('&' . $name) if $self->has_package_symbol('&' . $name);     
     }
     elsif ($type eq 'ARRAY') {
-        undef @{$self->name . '::' . $name};    
+        $scalar = $self->get_package_symbol('$' . $name) if $self->has_package_symbol('$' . $name);
+        $hash   = $self->get_package_symbol('%' . $name) if $self->has_package_symbol('%' . $name);     
+        $code   = $self->get_package_symbol('&' . $name) if $self->has_package_symbol('&' . $name);
     }
     elsif ($type eq 'HASH') {
-        undef %{$self->name . '::' . $name};    
+        $scalar = $self->get_package_symbol('$' . $name) if $self->has_package_symbol('$' . $name);
+        $array  = $self->get_package_symbol('@' . $name) if $self->has_package_symbol('@' . $name);        
+        $code   = $self->get_package_symbol('&' . $name) if $self->has_package_symbol('&' . $name);      
     }
     elsif ($type eq 'CODE') {
-        # FIXME:
-        # this is crap, it is probably much 
-        # easier to write this in XS.
-        my ($scalar, @array, %hash);
-        $scalar = ${$self->name . '::' . $name} if defined *{$self->namespace->{$name}}{SCALAR};
-        @array  = @{$self->name . '::' . $name} if defined *{$self->namespace->{$name}}{ARRAY};
-        %hash   = %{$self->name . '::' . $name} if defined *{$self->namespace->{$name}}{HASH};
-        
-        delete ${$self->name . '::'}{$name};
-        
-        ${$self->name . '::' . $name} = $scalar if defined $scalar;
-        @{$self->name . '::' . $name} = @array  if scalar  @array;
-        %{$self->name . '::' . $name} = %hash   if keys    %hash;            
+        $scalar = $self->get_package_symbol('$' . $name) if $self->has_package_symbol('$' . $name);
+        $array  = $self->get_package_symbol('@' . $name) if $self->has_package_symbol('@' . $name);        
+        $hash   = $self->get_package_symbol('%' . $name) if $self->has_package_symbol('%' . $name);        
     }    
     else {
         confess "This should never ever ever happen";
     }
+        
+    $self->remove_package_glob($name);
+    
+    $self->add_package_symbol(('$' . $name) => $scalar) if defined $scalar;      
+    $self->add_package_symbol(('@' . $name) => $array)  if defined $array;    
+    $self->add_package_symbol(('%' . $name) => $hash)   if defined $hash;
+    $self->add_package_symbol(('&' . $name) => $code)   if defined $code;            
 }
 
 sub list_all_package_symbols {
@@ -174,6 +189,8 @@ Class::MOP::Package - Package Meta Object
 
 =item B<remove_package_symbol>
 
+=item B<remove_package_glob>
+
 =item B<list_all_package_symbols>
 
 =back
diff --git a/t/010_self_introspection.t b/t/010_self_introspection.t
index 437e73f..ee87164 100644
--- a/t/010_self_introspection.t
+++ b/t/010_self_introspection.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 179;
+use Test::More tests => 181;
 use Test::Exception;
 
 BEGIN {
@@ -35,7 +35,8 @@ my @class_mop_package_methods = qw(
     name
     namespace
     
-    add_package_symbol get_package_symbol has_package_symbol remove_package_symbol list_all_package_symbols    
+    add_package_symbol get_package_symbol has_package_symbol remove_package_symbol 
+    list_all_package_symbols remove_package_glob
     
     _deconstruct_variable_name
 );
diff --git a/t/012_package_variables.t b/t/012_package_variables.t
index def46f5..7544d98 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 => 80;
 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,129 @@ 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(defined($Foo::{baz}), '... the %baz slot was created successfully');
+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('@bling');
-} '... created @Foo::bling successfully';
+    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(defined($Foo::{bling}), '... the @bling slot was created successfully');
+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';
-    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');
+    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('&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');
+
+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(${'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"}{SCALAR}), '... 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"}{SCALAR}), '... the $foo slot has NOT been removed');            
+}
+
 
 # check some errors
 
@@ -114,8 +231,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';
diff --git a/t/080_meta_package.t b/t/080_meta_package.t
index e398741..547ddda 100644
--- a/t/080_meta_package.t
+++ b/t/080_meta_package.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 43;
+use Test::More tests => 80;
 use Test::Exception;
 
 BEGIN {
@@ -17,6 +17,9 @@ BEGIN {
     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');
 
@@ -24,24 +27,16 @@ 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 +47,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 +59,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 +69,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 +85,130 @@ 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(defined($Foo::{baz}), '... the %baz slot was created successfully');
+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;
+
+    is(${'Foo::baz'}, 1, '... our $baz was assigned to correctly');
+    is(${Foo->meta->get_package_symbol('$baz')}, 1, '... the meta agrees');    
+}
+
+# ----------------------------------------------------------------------
+## 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(exists ${'Foo::baz'}{one}, '... our %baz was initialized correctly');
-    is(${'Foo::baz'}{one}, 1, '... our %baz was initialized correctly');
+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');
 }
 
-ok(!defined($Foo::{bling}), '... the @bling slot has not been created yet');
+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('&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');
 
 lives_ok {
-    Foo->meta->add_package_symbol('@bling');
-} '... created @Foo::bling successfully';
+    Foo->meta->add_package_symbol('$foo' => 'Foo::foo');
+} '... created $Foo::foo successfully';
 
-ok(defined($Foo::{bling}), '... the @bling slot was created 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"}{SCALAR}), '... 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"}{SCALAR}), '... the $foo slot has NOT been removed');            
+}
+
+
 # check some errors
 
 dies_ok {