X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Faccessors_xs.t;h=c7f9de4502b74c8658927297cf91d0d4bcd5e126;hb=e6f2993f0eaf4c08632889be16acd8dada42fb6c;hp=68091a24d77e3472002bc8b8039c537f7c91033e;hpb=9540f4e48444e779e875f193db7cf234c3cd8b40;p=p5sagit%2FClass-Accessor-Grouped.git

diff --git a/t/accessors_xs.t b/t/accessors_xs.t
index 68091a2..c7f9de4 100644
--- a/t/accessors_xs.t
+++ b/t/accessors_xs.t
@@ -2,17 +2,44 @@ use strict;
 use warnings;
 use FindBin qw($Bin);
 use File::Spec::Functions;
+use File::Spec::Unix (); # need this for %INC munging
 use Test::More;
 use lib 't/lib';
 
 BEGIN {
-    # Enable XSAccessor check
-    $Class::Accessor::Grouped::hasXS = undef;
-    
-    require AccessorGroups;
+    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 => 'Class::XSAccessor not available'
-    unless Class::Accessor::Grouped::_hasXS();
 
-require( catfile($Bin, 'accessors.t') );
\ No newline at end of file
+# 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/) {
+
+  subtest "$tname with USE_XS (pass $_)" => sub {
+    my $tfn = catfile($Bin, $tname);
+
+    for (
+      qw|AccessorGroups.pm AccessorGroups/BeenThereDoneThat.pm AccessorGroupsRO.pm AccessorGroupsSubclass.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 };
+
+    do($tfn);
+
+  } for (1 .. 2);
+}
+
+done_testing;