[svn:parrot] r43399 - branches/tt389_fix/t/oo

[chromatic at svn.parrot.org]

Author: chromatic
Date: Wed Jan  6 21:44:29 2010
New Revision: 43399
URL: https://trac.parrot.org/parrot/changeset/43399

Log:
[t] Fixed test not to grab methods from the namespace directly, as they aren't
there anymore (TT #389).

Modified:
   branches/tt389_fix/t/oo/mro-c3.t

Modified: branches/tt389_fix/t/oo/mro-c3.t
==============================================================================
--- branches/tt389_fix/t/oo/mro-c3.t	Wed Jan  6 21:44:26 2010	(r43398)
+++ branches/tt389_fix/t/oo/mro-c3.t	Wed Jan  6 21:44:29 2010	(r43399)
@@ -1,5 +1,5 @@
 #! parrot
-# Copyright (C) 2007, Parrot Foundation.
+# Copyright (C) 2007-2010, Parrot Foundation.
 # $Id$
 
 =head1 NAME
@@ -16,16 +16,7 @@
 
 =cut
 
-.sub main :main
-    .include 'test_more.pir'
-
-    plan(12)
-
-    single_parent()
-    grandparent()
-    multiple_inheritance()
-    diamond_inheritance()
-.end
+.namespace [ 'Methods' ]
 
 .sub method_A :method
     .return('Method from A')
@@ -43,17 +34,34 @@
     .return('Method from D')
 .end
 
+.namespace []
+
+.sub main :main
+    .include 'test_more.pir'
+
+    plan(12)
+    $P0 = newclass [ 'Methods' ]
+
+    single_parent()
+    grandparent()
+    multiple_inheritance()
+    diamond_inheritance()
+.end
+
 .sub single_parent
-    .local pmc A, B
+    .local pmc A, B, M, methods
+
+    M       = get_class [ 'Methods' ]
+    methods = M.'methods'()
 
-    A = new 'Class'
-    $P0 = get_global 'method_A'
+    A   = new 'Class'
+    $P0 = methods['method_A']
     A.'add_method'('foo', $P0)
     A.'add_method'('bar', $P0)
 
-    B = new 'Class'
+    B   = new 'Class'
+    $P0 = methods['method_B']
     B.'add_parent'(A)
-    $P0 = get_global 'method_B'
     B.'add_method'('foo', $P0)
 
     $P0 = B.'new'()
@@ -64,23 +72,26 @@
 .end
 
 .sub grandparent
-    .local pmc A, B, C
+    .local pmc A, B, C, M, methods
 
-    A = new 'Class'
-    $P0 = get_global 'method_A'
+    M       = get_class [ 'Methods' ]
+    methods = M.'methods'()
+
+    A   = new 'Class'
+    $P0 = methods['method_A']
     A.'add_method'('foo', $P0)
     A.'add_method'('bar', $P0)
     A.'add_method'('baz', $P0)
 
-    B = new 'Class'
+    B   = new 'Class'
+    $P0 = methods['method_B']
     B.'add_parent'(A)
-    $P0 = get_global 'method_B'
     B.'add_method'('foo', $P0)
     B.'add_method'('bar', $P0)
 
-    C = new 'Class'
+    C   = new 'Class'
+    $P0 = methods['method_C']
     C.'add_parent'(B)
-    $P0 = get_global 'method_C'
     C.'add_method'('foo', $P0)
 
     $P0 = C.'new'()
@@ -93,25 +104,28 @@
 .end
 
 .sub multiple_inheritance
-    .local pmc A, B, C
- 
-    A = newclass 'MIA'
-    $P0 = get_global 'method_A'
+    .local pmc A, B, C, M, methods
+
+    M       = get_class ['Methods']
+    methods = M.'methods'()
+
+    A   = newclass 'MIA'
+    $P0 = methods['method_A']
     A.'add_method'('foo', $P0)
     A.'add_method'('bar', $P0)
     A.'add_method'('baz', $P0)
- 
-    B = newclass 'MIB'
-    $P0 = get_global 'method_B'
+
+    B   = newclass 'MIB'
+    $P0 = methods['method_B']
     B.'add_method'('foo', $P0)
     B.'add_method'('bar', $P0)
- 
-    C = newclass 'MIC'
+
+    C   = newclass 'MIC'
+    $P0 = methods['method_C']
     C.'add_parent'(B)
     C.'add_parent'(A)
-    $P0 = get_global 'method_C'
     C.'add_method'('foo', $P0)
- 
+
     $P0 = C.'new'()
     $S0 = $P0.'foo'()
     $S1 = $P0.'bar'()
@@ -122,32 +136,35 @@
 .end
 
 .sub diamond_inheritance
-    .local pmc A, B, C, D
+    .local pmc A, B, C, D, M, methods
+
+    M       = get_class ['Methods']
+    methods = M.'methods'()
 
-    A = newclass 'DIA'
-    $P0 = get_global 'method_A'
+    A   = newclass 'DIA'
+    $P0 = methods['method_A']
     A.'add_method'('foo', $P0)
     A.'add_method'('bar', $P0)
     A.'add_method'('baz', $P0)
     A.'add_method'('wag', $P0)
 
-    B = newclass 'DIB'
+    B   = newclass 'DIB'
+    $P0 = methods['method_B']
     B.'add_parent'(A)
-    $P0 = get_global 'method_B'
     B.'add_method'('foo', $P0)
     B.'add_method'('bar', $P0)
     B.'add_method'('baz', $P0)
 
-    C = newclass 'DIC'
+    C   = newclass 'DIC'
+    $P0 = methods['method_C']
     C.'add_parent'(A)
-    $P0 = get_global 'method_C'
     C.'add_method'('foo', $P0)
     C.'add_method'('bar', $P0)
 
-    D = newclass 'DID'
+    D   = newclass 'DID'
+    $P0 = methods['method_D']
     D.'add_parent'(C)
     D.'add_parent'(B)
-    $P0 = get_global 'method_D'
     D.'add_method'('foo', $P0)
 
     $P0 = D.'new'()