Fix ton of buggery with defer-immutable accessor shim

[p5sagit/Class-Accessor-Grouped.git] / t / accessors_xs.t

diff --git a/t/accessors_xs.t b/t/accessors_xs.t
index fdd251e..edb5b48 100644 (file)
--- a/t/accessors_xs.t
+++ b/t/accessors_xs.t
@@ -7,27 +7,37 @@ use Test::More;
 use lib 't/lib';
 
 BEGIN {
-    require Class::Accessor::Grouped;
-    my $xsa_ver = $Class::Accessor::Grouped::__minimum_xsa_version;
-    eval {
-        require Class::XSAccessor;
-        Class::XSAccessor->VERSION ($xsa_ver);
-    };
-    plan skip_all => "Class::XSAccessor >= $xsa_ver not available"
-      if $@;
+  plan skip_all => "Sub::Name not available"
+    unless eval { require Sub::Name };
+
+  require Class::Accessor::Grouped;
+
+  my $xsa_ver = $Class::Accessor::Grouped::__minimum_xsa_version;
+  eval {
+    require Class::XSAccessor;
+    Class::XSAccessor->VERSION ($xsa_ver);
+  };
+  plan skip_all => "Class::XSAccessor >= $xsa_ver not available"
+    if $@;
 }
 
 # rerun the regular 3 tests under XSAccessor
 $Class::Accessor::Grouped::USE_XS = 1;
-for my $tname (qw/accessors.t accessors_ro.t accessors_wo.t/) {
+for my $tname (qw/accessors.t accessors_ro.t accessors_wo.t clean_namespace.t/) {
 
   subtest "$tname with USE_XS (pass $_)" => sub {
     my $tfn = catfile($Bin, $tname);
 
-    delete $INC{$_} for (
-      qw/AccessorGroups.pm AccessorGroupsRO.pm AccessorGroupsSubclass.pm AccessorGroupsWO.pm/,
+    for (
+      qw|AccessorGroups.pm AccessorGroups/BeenThereDoneThat.pm AccessorGroupsRO.pm AccessorGroupsSubclass.pm AccessorGroupsParent.pm AccessorGroupsWO.pm|,
       File::Spec::Unix->catfile ($tfn),
-    );
+    ) {
+      delete $INC{$_};
+      no strict 'refs';
+      if (my ($mod) = $_ =~ /(.+)\.pm$/ ) {
+        %{"${mod}::"} = ();
+      }
+    }
 
     local $SIG{__WARN__} = sub { warn @_ unless $_[0] =~ /subroutine .+ redefined/i };