[svn:parrot] r47760 - trunk/t/pmc

[NotFound at svn.parrot.org]

Author: NotFound
Date: Tue Jun 22 16:51:30 2010
New Revision: 47760
URL: https://trac.parrot.org/parrot/changeset/47760

Log:
clean OrderedHashIterator tests and add some more

Modified:
   trunk/t/pmc/orderedhashiterator.t

Modified: trunk/t/pmc/orderedhashiterator.t
==============================================================================
--- trunk/t/pmc/orderedhashiterator.t	Tue Jun 22 15:31:33 2010	(r47759)
+++ trunk/t/pmc/orderedhashiterator.t	Tue Jun 22 16:51:30 2010	(r47760)
@@ -20,25 +20,46 @@
 .sub 'main'
     .include 'test_more.pir'
 
-    plan(2)
+    plan(3)
 
-    # Just test that we can't create OrderedHashIterator directly
-    $I0 = 1
+    'test_init'()
+    'test_bad_type'()
+.end
+
+.sub 'test_init'
+    .local pmc oh, it
+    .local int i, i2
+    # We can't create OrderedHashIterator directly
+    i = 1
     push_eh fail
-    $P0 = new ['OrderedHashIterator']
-    $I0 = 0
+    oh = new ['OrderedHashIterator']
+    i = 0
   fail:
     pop_eh
-    ok($I0, "Can't create OrderedHashIterator directly")
-
-    $P0 = new ['OrderedHash']
-    $P1 = iter $P0
-    $I0 = isa $P1, 'Iterator'
-    ok($I0, 'OrderedHashIterator has proper type')
-
+    ok(i, "Can't create OrderedHashIterator directly")
 
+    oh = new ['OrderedHash']
+    it = iter oh
+    sweep 1 # Make sure the mark vtable is covered
+    i = isa it, 'Iterator'
+    i2 = isa it, 'OrderedHashIterator'
+    add i, i2
+    is(i, 2, 'OrderedHashIterator has proper type')
 .end
 
+.sub 'test_bad_type'
+    .local pmc oh, it
+    .local int i
+    oh = new ['OrderedHash']
+    it = iter oh
+    i = 1
+    push_eh catch
+    it = 9999 # Let's hope it will never be a valid iteration type
+    i = 0
+  catch:
+    pop_eh
+    ok(i, 'invalid iteration type throws')
+.end
 
 # Local Variables:
 #   mode: pir