Changeset 22749 for t

Timestamp:

10/25/08 11:19:58 (3 months ago)

Author:

moritz

Message:

[t] some cleanups, moved oo/attributes/class.t to spec, and cleaned up.

Location:

t

Files:

• oo/methods/class.t (modified) (1 diff)
• spec/S12-attributes/class2.t (moved) (moved from t/oo/attributes/class.t) (1 diff)

t/oo/methods/class.t

@@ -24 +24 @@
     # NOTE:
     # this dies for the wrong reason actually
+    #?pugs todo 'class methods'
     dies_ok {
         $val = $foo.bar(42);
-    }, '... class methods should not work for instances', :todo<feature>;
+    }, '... class methods should not work for instances';
 }

t/spec/S12-attributes/class2.t

@@ -12 +12 @@
 #L<S12/Class methods/metaclass method always delegated>
 
-plan 17;
+plan 14;
 
-ok eval('class Foo { our $.bar = 23; our $.yada is rw = 13; }; 1'), 'class attributes are parsed';
+class Foo {
+    our $.bar = 23;
+    our $.yada is rw = 13;
+} 
 
 my $test = 0;
-ok eval('$test = Foo.bar'), 'accessors for class attributes work';
+ok $test = Foo.bar, 'accessors for class attributes work';
 is $test, 23, 'class attributes really work';
 
-ok eval('class Baz is Foo {}; 1'), 'inheriting class attributes parsed';
+class Baz is Foo {};
 
 my $test2 = 0;
-ok eval('$test2 = Baz.bar'), 'inherited class attribute accessors work';
+lives_ok { $test2 = Baz.bar }, 'inherited class attribute accessors work';
 is $test2, 23, 'inherited class attributes really work';
 
 my $test3 = 0;
-ok eval('Baz.yada = 42; $test3 = Baz.yada'), 'inherited rw class attribute accessors work';
+lives_ok { Baz.yada = 42; $test3 = Baz.yada }, 'inherited rw class attribute accessors work';
 is $test3, 42, 'inherited rw class attributes really work';
 
-ok eval('class Quux is Foo { has $.bar = 17; }; 1'),
-    'overriding with instance method allowed';
+class Quux is Foo { has $.bar = 17; };
+
 my $test4 = 0;
-ok eval('$test4 = Quux.new()'),
+#?pugs 99 todo 'class attributes'
+lives_ok { $test4 = Quux.new() },
     'Can instantiate with overridden instance method';
 is $test4.bar, 17, 'Instance call gets instance attribute, not class attribute';
 my $test5 = 0;
-ok eval('$test5 = Quux.bar'), 'class attribute still accessible via class name', :todo<feature>;
-is $test5, 23, 'class attribute really works, even when overridden', :todo<feature>;
+lives_ok {$test5 = Quux.bar}, 'class attribute still accessible via class name';
+is $test5, 23, 'class attribute really works, even when overridden';
 my $test6 = 0;
-ok eval('$test6 = Quux.^bar'), 'class attribute accessible via ^name', :todo<feature>;
-is $test6, 23, 'class attribute via ^name really works', :todo<feature>;
+lives_ok { $test6 = Quux.^bar}, 'class attribute accessible via ^name';
+is $test6, 23, 'class attribute via ^name really works';
 my $test7 = 0;
-ok eval('$test7 = $test4.^bar'),
+lives_ok {$test7 = $test4.^bar},
     'class attribute accessible via ^name called on instance', :todo<feature>;
 is $test7, 23, 'class attribute via $obj.^name really works', :todo<feature>;
+
+# vim: ft=perl6