Turn the CXSA error TODOs into hard skips

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

diff --git a/t/accessors_ro.t b/t/accessors_ro.t
index 6834fb9..33d3f38 100644 (file)
--- a/t/accessors_ro.t
+++ b/t/accessors_ro.t
@@ -1,8 +1,8 @@
-use Test::More tests => 48;
+use Test::More;
 use Test::Exception;
 use strict;
 use warnings;
-use Config;
+no warnings 'once';
 use lib 't/lib';
 
 # we test the pure-perl versions only, but allow overrides
@@ -52,6 +52,10 @@ my $test_accessors = {
   lr2name => {
     custom_field => "lr2'field",
   },
+  fieldname_torture => {
+    custom_field => join ('', map { chr($_) } (0..255) ),
+    is_xs => $use_xs,
+  },
 };
 
 for my $name (sort keys %$test_accessors) {
@@ -76,18 +80,15 @@ for my $name (sort keys %$test_accessors) {
 
   my $ro_regex = $test_accessors->{$name}{is_xs}
     ? qr/Usage\:.+$name.*\(self\)/
-    : qr/cannot alter the value of '\Q$field\E'/
+    : qr/$name(:?_accessor)?\Q' cannot alter its value (read-only attribute of class AccessorGroupsRO)/
   ;
 
-  {
-    local $TODO = "Class::XSAccessor emits broken error messages on 5.10 or -DDEBUGGING 5.8"
-      if (
-        $test_accessors->{$name}{is_xs}
-          and
-        $] < '5.011'
-          and
-        ( $] > '5.009' or $Config{config_args} =~ /DEBUGGING/ )
-      );
+  SKIP: {
+    skip "Class::XSAccessor emits broken error messages on 5.10 and earlier", 1 if (
+      $test_accessors->{$name}{is_xs}
+        and
+      $] < '5.011'
+    );
 
     # die on set via name/alias
     throws_ok {
@@ -104,5 +105,4 @@ for my $name (sort keys %$test_accessors) {
   is($obj->$alias, 'a');
 };
 
-#important
-1;
+done_testing unless $::SUBTESTING;