Update attributes introspection test to latest spec; fudge :tree test…

…s for Rakudo.

S12-introspection/attributes.t

@@ -25,40 +25,42 @@ class C is B {
 my @attrs = C.^attributes();
 is +@attrs, 3, 'attribute introspection gave correct number of elements';
 
-is @attrs[0].name,         '$!c', 'first attribute had correct name';
-is ~@attrs[0].type,        ~Mu,   'first attribute had correct type';
-is @attrs[0].has-accessor, True,  'first attribute has an accessor';
-ok !@attrs[0].build,              'first attribute has no build value';
-ok @attrs[0].rw,                  'first attribute is rw';
-ok !@attrs[0].readonly,           'first attribute is not readonly';
-
-is @attrs[1].name,         '$!b', 'second attribute had correct name';
-is @attrs[1].type,         Int,   'second attribute had correct type';
-is @attrs[1].has-accessor, False, 'second attribute has no accessor';
-ok @attrs[1].build ~~ Code,       'second attribute has build block';
+is @attrs[0].name,         '$!c',  'first attribute had correct name';
+is @attrs[0].type.gist,    'Mu()', 'first attribute had correct type';
+is @attrs[0].has-accessor, True,   'first attribute has an accessor';
+ok !@attrs[0].build,               'first attribute has no build value';
+ok @attrs[0].rw,                   'first attribute is rw';
+ok !@attrs[0].readonly,            'first attribute is not readonly';
+
+is @attrs[1].name,         '$!b',   'second attribute had correct name';
+is @attrs[1].type.gist,    'Int()', 'second attribute had correct type';
+is @attrs[1].has-accessor, False,   'second attribute has no accessor';
+ok @attrs[1].build ~~ Code,         'second attribute has build block';
 is @attrs[1].build().(C, $_), 42,
                               'second attribute build block gives expected value';
 
-is @attrs[2].name,         '$!a', 'third attribute had correct name';
-is @attrs[2].type,         Str,   'third attribute had correct type';
-is @attrs[2].has-accessor, True,  'third attribute has an accessor';
-ok @attrs[2].build ~~ Code,       'third attribute has build block';
+is @attrs[2].name,         '$!a',   'third attribute had correct name';
+is @attrs[2].type.gist,    'Str()', 'third attribute had correct type';
+is @attrs[2].has-accessor, True,    'third attribute has an accessor';
+ok @attrs[2].build ~~ Code,         'third attribute has build block';
 is @attrs[2].build().(C, $_), "dnes je horuci a potrebujem pivo",
-                                  'third attribute build block gives expected value';
-ok !@attrs[2].rw,             'third attribute is not rw';
-ok @attrs[2].readonly,        'third attribute is readonly';
+                                    'third attribute build block gives expected value';
+ok !@attrs[2].rw,                   'third attribute is not rw';
+ok @attrs[2].readonly,              'third attribute is readonly';
 
 @attrs = C.^attributes(:local);
 is +@attrs,        1,     'attribute introspection with :local gave just attribute in base class';
 is @attrs[0].name, '$!c', 'get correct attribute with introspection';
 
-
-@attrs = C.^attributes(:tree);
-is +@attrs, 2,                  'attribute introspection with :tree gives right number of elements';
-is @attrs[0].name, '$!c',       'first element is attribute desriptor';
-ok @attrs[1] ~~ Array,          'second element is array';
-is @attrs[1][0].name, '$!b',    'can look into second element array to find next attribute';
-is @attrs[1][1][0].name, '$!a', 'can look deeper to find attribute beyond that';
+#?rakudo skip ':tree not implemented for .^attributes'
+{
+    @attrs = C.^attributes(:tree);
+    is +@attrs, 2,                  'attribute introspection with :tree gives right number of elements';
+    is @attrs[0].name, '$!c',       'first element is attribute desriptor';
+    ok @attrs[1] ~~ Array,          'second element is array';
+    is @attrs[1][0].name, '$!b',    'can look into second element array to find next attribute';
+    is @attrs[1][1][0].name, '$!a', 'can look deeper to find attribute beyond that';
+}
 
 {
     my $x = A.new(a => 'abc');