[pypy-svn] r55201 - pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test

[cfbolz at codespeak.net]

Author: cfbolz
Date: Sun May 25 11:07:34 2008
New Revision: 55201

Modified:
   pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_interpreter.py
   pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_model.py
   pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_primitives.py
Log:
more of those


Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_interpreter.py
==============================================================================
--- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_interpreter.py	(original)
+++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_interpreter.py	Sun May 25 11:07:34 2008
@@ -353,7 +353,7 @@
         interp.step)
     w_fakeinst = interp.s_active_context().pop()
     assert interp.s_active_context().stack() == []
-    assert w_fakeinst.getclass() == w_fakeclass
+    assert w_fakeinst.getclass().is_same_object(w_fakeclass)
     assert w_fakeinst.size() == 1
     
 def test_bytecodePrimNewWithArg():
@@ -368,7 +368,7 @@
         interp.step)
     w_fakeinst = interp.s_active_context().pop()
     assert interp.s_active_context().stack() == []
-    assert w_fakeinst.getclass() == w_fakeclass
+    assert w_fakeinst.getclass().is_same_object(w_fakeclass)
     assert w_fakeinst.size() == 3
  
 def test_bytecodePrimSize():

Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_model.py
==============================================================================
--- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_model.py	(original)
+++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_model.py	Sun May 25 11:07:34 2008
@@ -16,14 +16,14 @@
     w_mycls = mockclass(0)
     w_myinstance = w_mycls.as_class_get_shadow().new()
     assert isinstance(w_myinstance, model.W_PointersObject)
-    assert w_myinstance.getclass() is w_mycls
+    assert w_myinstance.getclass().is_same_object(w_mycls)
     assert w_myinstance.shadow_of_my_class() is w_mycls.as_class_get_shadow()
 
 def test_new_namedvars():
     w_mycls = mockclass(3)
     w_myinstance = w_mycls.as_class_get_shadow().new()
     assert isinstance(w_myinstance, model.W_PointersObject)
-    assert w_myinstance.getclass() is w_mycls
+    assert w_myinstance.getclass().is_same_object(w_mycls)
     assert w_myinstance.fetch(0) is objtable.w_nil
     py.test.raises(IndexError, lambda: w_myinstance.fetch(3))
     w_myinstance.store(1, w_myinstance)
@@ -32,7 +32,7 @@
 def test_bytes_object():
     w_class = mockclass(0, format=shadow.BYTES)
     w_bytes = w_class.as_class_get_shadow().new(20)
-    assert w_bytes.getclass() is w_class
+    assert w_bytes.getclass().is_same_object(w_class)
     assert w_bytes.size() == 20
     assert w_class.as_class_get_shadow().instsize() == 0
     assert w_bytes.getchar(3) == "\x00"
@@ -44,7 +44,7 @@
 def test_word_object():
     w_class = mockclass(0, format=shadow.WORDS)
     w_bytes = w_class.as_class_get_shadow().new(20)
-    assert w_bytes.getclass() is w_class
+    assert w_bytes.getclass().is_same_object(w_class)
     assert w_bytes.size() == 20
     assert w_class.as_class_get_shadow().instsize() == 0
     assert w_bytes.getword(3) == 0
@@ -181,8 +181,8 @@
     assert w_a.gethash() == hashb
     assert w_b.gethash() == hasha
 
-    assert w_a.getclass() is w_clsb
-    assert w_b.getclass() is w_clsa
+    assert w_a.getclass().is_same_object(w_clsb)
+    assert w_b.getclass().is_same_object(w_clsa)
 
     assert w_b.fetch(0) is w_b
     assert w_a.fetch(1) is w_a

Modified: pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_primitives.py
==============================================================================
--- pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_primitives.py	(original)
+++ pypy/branch/smalltalk-shadow-changes/pypy/lang/smalltalk/test/test_primitives.py	Sun May 25 11:07:34 2008
@@ -246,14 +246,14 @@
 def test_new():
     w_Object = classtable.classtable['w_Object']
     w_res = prim(primitives.NEW, [w_Object])
-    assert w_res.getclass() is w_Object
+    assert w_res.getclass().is_same_object(w_Object)
     
 def test_invalid_new():
     prim_fails(primitives.NEW, [classtable.w_String])
 
 def test_new_with_arg():
     w_res = prim(primitives.NEW_WITH_ARG, [classtable.w_String, 20])
-    assert w_res.getclass() == classtable.w_String
+    assert w_res.getclass().is_same_object(classtable.w_String)
     assert w_res.size() == 20    
 
 def test_invalid_new_with_arg():