X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Faccessors_xs.t;h=fdd251ea645be6c4ba5e5e5c062834759e78ca38;hb=cfed50f29bcf6d80bb6e72146c5a051a3f36f656;hp=672dafd4db5cac51f1934f4660f267e61c7705da;hpb=8ef9b3ff970550236c6846c7d446e3bf09ae0a66;p=p5sagit%2FClass-Accessor-Grouped.git

diff --git a/t/accessors_xs.t b/t/accessors_xs.t
index 672dafd..fdd251e 100644
--- a/t/accessors_xs.t
+++ b/t/accessors_xs.t
@@ -2,12 +2,38 @@ 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';
 
-use AccessorGroups ();
- 
-plan skip_all => 'Class::XSAccessor not available'
-    unless Class::Accessor::Grouped::_hasXS();
+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 $@;
+}
 
-require( catfile($Bin, 'accessors.t') );
+# 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);
+
+    delete $INC{$_} for (
+      qw/AccessorGroups.pm AccessorGroupsRO.pm AccessorGroupsSubclass.pm AccessorGroupsWO.pm/,
+      File::Spec::Unix->catfile ($tfn),
+    );
+
+    local $SIG{__WARN__} = sub { warn @_ unless $_[0] =~ /subroutine .+ redefined/i };
+
+    do($tfn);
+
+  } for (1 .. 2);
+}
+
+done_testing;