X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F016_class_errors_and_edge_cases.t;h=256d058254db2732d4191838bbcc04f81b399096;hb=61e7fef0bd8227073ed006ebfe59db3297a27afb;hp=a14113369a25d45b66ddba9b0e207bfd55ad96b6;hpb=6d5355c3845e060d269b664be7b4284c606691b8;p=gitmo%2FClass-MOP.git

diff --git a/t/016_class_errors_and_edge_cases.t b/t/016_class_errors_and_edge_cases.t
index a141133..256d058 100644
--- a/t/016_class_errors_and_edge_cases.t
+++ b/t/016_class_errors_and_edge_cases.t
@@ -1,14 +1,10 @@
-#!/usr/bin/perl
-
 use strict;
 use warnings;
 
-use Test::More tests => 52;
+use Test::More tests => 48;
 use Test::Exception;
 
-BEGIN {
-    use_ok('Class::MOP');
-}
+use Class::MOP;
 
 {
     dies_ok {
@@ -183,78 +179,66 @@ BEGIN {
 
 {
     dies_ok {
-        Class::MOP::Class->add_package_variable();
-    } '... add_package_variable dies as expected';
+        Class::MOP::Class->add_package_symbol();
+    } '... add_package_symbol dies as expected';
     
     dies_ok {
-        Class::MOP::Class->add_package_variable('');
-    } '... add_package_variable dies as expected';
+        Class::MOP::Class->add_package_symbol('');
+    } '... add_package_symbol dies as expected';
     
     dies_ok {
-        Class::MOP::Class->add_package_variable('foo');
-    } '... add_package_variable dies as expected';  
+        Class::MOP::Class->add_package_symbol('foo');
+    } '... add_package_symbol dies as expected';  
     
     dies_ok {
-        Class::MOP::Class->add_package_variable('&foo');
-    } '... add_package_variable dies as expected';      
+        Class::MOP::Class->add_package_symbol('&foo');
+    } '... add_package_symbol dies as expected';      
     
 #    throws_ok {
-#        Class::MOP::Class->meta->add_package_variable('@-');
+#        Class::MOP::Class->meta->add_package_symbol('@-');
 #    } qr/^Could not create package variable \(\@\-\) because/, 
-#      '... add_package_variable dies as expected';    
+#      '... add_package_symbol dies as expected';    
 }
 
 {
     dies_ok {
-        Class::MOP::Class->has_package_variable();
-    } '... has_package_variable dies as expected';
-
-    dies_ok {
-        Class::MOP::Class->has_package_variable('');
-    } '... has_package_variable dies as expected';
+        Class::MOP::Class->has_package_symbol();
+    } '... has_package_symbol dies as expected';
 
     dies_ok {
-        Class::MOP::Class->has_package_variable('foo');
-    } '... has_package_variable dies as expected';  
+        Class::MOP::Class->has_package_symbol('');
+    } '... has_package_symbol dies as expected';
 
     dies_ok {
-        Class::MOP::Class->has_package_variable('&foo');
-    } '... has_package_variable dies as expected';    
+        Class::MOP::Class->has_package_symbol('foo');
+    } '... has_package_symbol dies as expected';  
 }
 
 {
     dies_ok {
-        Class::MOP::Class->get_package_variable();
-    } '... get_package_variable dies as expected';
+        Class::MOP::Class->get_package_symbol();
+    } '... get_package_symbol dies as expected';
 
     dies_ok {
-        Class::MOP::Class->get_package_variable('');
-    } '... get_package_variable dies as expected';
+        Class::MOP::Class->get_package_symbol('');
+    } '... get_package_symbol dies as expected';
 
     dies_ok {
-        Class::MOP::Class->get_package_variable('foo');
-    } '... get_package_variable dies as expected';  
-
-    dies_ok {
-        Class::MOP::Class->get_package_variable('&foo');
-    } '... get_package_variable dies as expected';    
+        Class::MOP::Class->get_package_symbol('foo');
+    } '... get_package_symbol dies as expected';   
 }
 
 {
     dies_ok {
-        Class::MOP::Class->remove_package_variable();
-    } '... remove_package_variable dies as expected';
-
-    dies_ok {
-        Class::MOP::Class->remove_package_variable('');
-    } '... remove_package_variable dies as expected';
+        Class::MOP::Class->remove_package_symbol();
+    } '... remove_package_symbol dies as expected';
 
     dies_ok {
-        Class::MOP::Class->remove_package_variable('foo');
-    } '... remove_package_variable dies as expected';  
+        Class::MOP::Class->remove_package_symbol('');
+    } '... remove_package_symbol dies as expected';
 
     dies_ok {
-        Class::MOP::Class->remove_package_variable('&foo');
-    } '... remove_package_variable dies as expected';    
+        Class::MOP::Class->remove_package_symbol('foo');
+    } '... remove_package_symbol dies as expected';  
 }