Jython

Revision: 2765
Author:   fwierzbicki
Date:     2006-05-26 19:17:42 -0700 (Fri, 26 May 2006)
ViewCVS:  http://svn.sourceforge.net/jython/?rev=2765&view=rev

Log Message:
-----------
More pickle work.

Modified Paths:
--------------
    trunk/jython/Lib/test/test_descrtut.py
    trunk/jython/Lib/test/test_subclasses.py
    trunk/jython/src/org/python/core/PyInteger.java
    trunk/jython/src/org/python/core/PyObject.java
    trunk/jython/src/org/python/core/PyObjectDerived.java
    trunk/jython/src/org/python/core/PyString.java
    trunk/jython/src/org/python/core/PyStringDerived.java
Modified: trunk/jython/Lib/test/test_descrtut.py
===================================================================
--- trunk/jython/Lib/test/test_descrtut.py	2006-05-27 00:05:23 UTC (rev 2764)
+++ trunk/jython/Lib/test/test_descrtut.py	2006-05-27 02:17:42 UTC (rev 2765)
@@ -202,6 +202,7 @@
      '__new__',
      '__nonzero__',
      '__radd__',
+     '__reduce__',
      '__repr__',
      '__rmul__',
      '__setattr__',

Modified: trunk/jython/Lib/test/test_subclasses.py
===================================================================
--- trunk/jython/Lib/test/test_subclasses.py	2006-05-27 00:05:23 UTC (rev 2764)
+++ trunk/jython/Lib/test/test_subclasses.py	2006-05-27 02:17:42 UTC (rev 2765)
@@ -1,5 +1,53 @@
 import test_support, unittest
+import pickle
+    
+#myint and its test taken from pickletester, the other "my" classes and tests
+#      are based on it.
+class myint(int):
+    def __init__(self, x):
+        self.str = str(x)
 
+class mystr(str):
+    def __init__(self, x):
+        self.str = str(x)
+
+class myobject(object):
+    def __init__(self, x):
+        self.str = str(x)
+
+class myint(int):
+    def __init__(self, x):
+        self.str = str(x)
+
+class myint(int):
+    def __init__(self, x):
+        self.str = str(x)
+
+class myint(int):
+    def __init__(self, x):
+        self.str = str(x)
+
+class myint(int):
+    def __init__(self, x):
+        self.str = str(x)
+
+class myint(int):
+    def __init__(self, x):
+        self.str = str(x)
+
+class myint(int):
+    def __init__(self, x):
+        self.str = str(x)
+
+class myint(int):
+    def __init__(self, x):
+        self.str = str(x)
+
+class myint(int):
+    def __init__(self, x):
+        self.str = str(x)
+
+
 class TestSubclasses(unittest.TestCase):
 
     def test_float(self):
@@ -128,12 +176,17 @@
         self.assertEqual(SubSubStrSpam().eggs(), "I am eggs.")
         self.assertEqual(SubSubStrSpam2().eggs(), "I am eggs.")
 
+    def picklecheck(self, picklee):
+        s = pickle.dumps(picklee)
+        y = pickle.loads(s)
+        self.assertEqual(picklee, y)
+ 
     def test_pickle_builtins(self):
-       class myint(int):
-            def __init__(self, x):
-                self.str = str(x)
+        #ignores cPickle for now.
 
- 
+        self.picklecheck(myint(4))
+        self.picklecheck(mystr('x'))
+  
 def test_suite():
     allsuites = [unittest.makeSuite(klass, 'test')
                  for klass in (TestSubclasses,

Modified: trunk/jython/src/org/python/core/PyInteger.java
===================================================================
--- trunk/jython/src/org/python/core/PyInteger.java	2006-05-27 00:05:23 UTC (rev 2764)
+++ trunk/jython/src/org/python/core/PyInteger.java	2006-05-27 02:17:42 UTC (rev 2765)
@@ -1820,7 +1820,7 @@
         return int___reduce__();
     }
 
-    public PyObject int___reduce__() {
+    final PyObject int___reduce__() {
         return new PyTuple(new PyObject[]{
             getType(),
             new PyTuple(new PyObject[]{

Modified: trunk/jython/src/org/python/core/PyObject.java
===================================================================
--- trunk/jython/src/org/python/core/PyObject.java	2006-05-27 00:05:23 UTC (rev 2764)
+++ trunk/jython/src/org/python/core/PyObject.java	2006-05-27 02:17:42 UTC (rev 2765)
@@ -19,6 +19,34 @@
     public static void typeSetup(PyObject dict,PyType.Newstyle marker) {
         dict.__setitem__("__class__",new PyGetSetDescr("__class__",PyObject.class,"getType",null));
         dict.__setitem__("__doc__",new PyGetSetDescr("__doc__",PyObject.class,"getDoc",null));
+        class exposed___reduce__ extends PyBuiltinFunctionNarrow {
+
+            private PyObject self;
+
+            public PyObject getSelf() {
+                return self;
+            }
+
+            exposed___reduce__(PyObject self,PyBuiltinFunction.Info info) {
+                super(info);
+                this.self=self;
+            }
+
+            public PyBuiltinFunction makeBound(PyObject self) {
+                return new exposed___reduce__((PyObject)self,info);
+            }
+
+            public PyObject __call__() {
+                return self.object___reduce__();
+            }
+
+            public PyObject inst_call(PyObject gself) {
+                PyObject self=(PyObject)gself;
+                return self.object___reduce__();
+            }
+
+        }
+        dict.__setitem__("__reduce__",new PyMethodDescr("__reduce__",PyObject.class,0,0,new exposed___reduce__(null,null)));
         class exposed___str__ extends PyBuiltinFunctionNarrow {
 
             private PyObject self;
@@ -2882,6 +2910,27 @@
         noAttributeError(name);
     }
 
+    /**
+     * Used for pickling.
+     *
+     * @return a tuple of (class, tuple)
+     */
+    public PyObject __reduce__() {
+        return object___reduce__();
+    }
+
+    final PyObject object___reduce__() {
+        PyTuple newargs = __getnewargs__();
+        return new PyTuple(new PyObject[]{
+            getType(), newargs
+        });
+    }
+
+    public PyTuple __getnewargs__() {
+        //default is empty tuple
+        return new PyTuple();
+    }
+
     /* arguments' conversion helpers */
 
     public static class ConversionException extends Exception {

Modified: trunk/jython/src/org/python/core/PyObjectDerived.java
===================================================================
--- trunk/jython/src/org/python/core/PyObjectDerived.java	2006-05-27 00:05:23 UTC (rev 2764)
+++ trunk/jython/src/org/python/core/PyObjectDerived.java	2006-05-27 02:17:42 UTC (rev 2765)
@@ -41,20 +41,6 @@
         return super.__repr__();
     }
 
-    public PyUnicode __unicode__() {
-        PyType self_type=getType();
-        PyObject impl=self_type.lookup("__unicode__");
-        if (impl!=null) {
-            PyObject res=impl.__get__(this,self_type).__call__();
-            if (res instanceof PyUnicode)
-                return(PyUnicode)res;
-            if (res instanceof PyString)
-                return new PyUnicode((PyString)res);
-            throw Py.TypeError("__unicode__"+" should return a "+"unicode");
-        }
-        return super.__unicode__();
-    }
-
     public PyString __hex__() {
         PyType self_type=getType();
         PyObject impl=self_type.lookup("__hex__");
@@ -84,8 +70,8 @@
         PyObject impl=self_type.lookup("__int__");
         if (impl!=null) {
             PyObject res=impl.__get__(this,self_type).__call__();
-            if (res instanceof PyInteger)
-                return(PyInteger)res;
+            if (res instanceof PyObject)
+                return(PyObject)res;
             throw Py.TypeError("__int__"+" should return a "+"int");
         }
         return super.__int__();
@@ -159,6 +145,14 @@
         return super.__invert__();
     }
 
+    public PyObject __reduce__() {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__reduce__");
+        if (impl!=null)
+            return impl.__get__(this,self_type).__call__();
+        return super.__reduce__();
+    }
+
     public PyObject __add__(PyObject other) {
         PyType self_type=getType();
         PyObject impl=self_type.lookup("__add__");
@@ -697,6 +691,20 @@
         return super.hashCode();
     }
 
+    public PyUnicode __unicode__() {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__unicode__");
+        if (impl!=null) {
+            PyObject res=impl.__get__(this,self_type).__call__();
+            if (res instanceof PyUnicode)
+                return(PyUnicode)res;
+            if (res instanceof PyString)
+                return new PyUnicode((PyString)res);
+            throw Py.TypeError("__unicode__"+" should return a "+"unicode");
+        }
+        return super.__unicode__();
+    }
+
     public int __cmp__(PyObject other) {
         PyType self_type=getType();
         PyObject impl=self_type.lookup("__cmp__");
@@ -792,6 +800,35 @@
         super.__setitem__(key,value);
     }
 
+    public PyObject __getitem__(PyObject key) { // ???
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getitem__");
+        if (impl!=null) {
+            try {
+                return impl.__get__(this,self_type).__call__(key);
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        }
+        return super.__getitem__(key);
+    }
+
+    public PyObject __getslice__(PyObject start,PyObject stop,PyObject step) { // ???
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getslice__");
+        if (impl!=null)
+            try {
+                return impl.__get__(this,self_type).__call__(start,stop);
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        return super.__getslice__(start,stop,step);
+    }
+
     public void __delitem__(PyObject key) { // ???
         PyType self_type=getType();
         PyObject impl=self_type.lookup("__delitem__");

Modified: trunk/jython/src/org/python/core/PyString.java
===================================================================
--- trunk/jython/src/org/python/core/PyString.java	2006-05-27 00:05:23 UTC (rev 2764)
+++ trunk/jython/src/org/python/core/PyString.java	2006-05-27 02:17:42 UTC (rev 2765)
@@ -192,6 +192,34 @@
 
         }
         dict.__setitem__("__mul__",new PyMethodDescr("__mul__",PyString.class,1,1,new exposed___mul__(null,null)));
+        class exposed___reduce__ extends PyBuiltinFunctionNarrow {
+
+            private PyString self;
+
+            public PyObject getSelf() {
+                return self;
+            }
+
+            exposed___reduce__(PyString self,PyBuiltinFunction.Info info) {
+                super(info);
+                this.self=self;
+            }
+
+            public PyBuiltinFunction makeBound(PyObject self) {
+                return new exposed___reduce__((PyString)self,info);
+            }
+
+            public PyObject __call__() {
+                return self.str___reduce__();
+            }
+
+            public PyObject inst_call(PyObject gself) {
+                PyString self=(PyString)gself;
+                return self.str___reduce__();
+            }
+
+        }
+        dict.__setitem__("__reduce__",new PyMethodDescr("__reduce__",PyString.class,0,0,new exposed___reduce__(null,null)));
         class exposed___rmul__ extends PyBuiltinFunctionNarrow {
 
             private PyString self;
@@ -1435,8 +1463,9 @@
             }
 
             public PyObject __call__(PyObject arg0) {
-                String result = self.str_join(arg0);
-                if (self instanceof PyUnicode || arg0 instanceof PyUnicode) {
+                String result=self.str_join(arg0);
+                //XXX: do we really need to check self?
+                if (self instanceof PyUnicode||arg0 instanceof PyUnicode) {
                     return new PyUnicode(result);
                 } else {
                     return new PyString(result);
@@ -1445,8 +1474,9 @@
 
             public PyObject inst_call(PyObject gself,PyObject arg0) {
                 PyString self=(PyString)gself;
-                String result = self.str_join(arg0);
-                if (self instanceof PyUnicode || arg0 instanceof PyUnicode) {
+                String result=self.str_join(arg0);
+                //XXX: do we really need to check self?
+                if (self instanceof PyUnicode||arg0 instanceof PyUnicode) {
                     return new PyUnicode(result);
                 } else {
                     return new PyString(result);
@@ -2622,10 +2652,12 @@
         }
         dict.__setitem__("zfill",new PyMethodDescr("zfill",PyString.class,1,1,new exposed_zfill(null,null)));
         dict.__setitem__("__new__",new PyNewWrapper(PyString.class,"__new__",-1,-1) {
-            public PyObject new_impl(boolean init, PyType subtype, PyObject[] args, String[] keywords) {
-                return str_new(this, init, subtype, args, keywords);
-            }
-        });
+
+                                                                                        public PyObject new_impl(boolean init,PyType subtype,PyObject[]args,String[]keywords) {
+                                                                                            return str_new(this,init,subtype,args,keywords);
+                                                                                        }
+
+                                                                                    });
     }
     //~ END GENERATED REGION -- DO NOT EDIT SEE gexpose.py
 
@@ -3141,6 +3173,26 @@
         else return null;
     }
 
+    /**
+     * Used for pickling.
+     *
+     * @return a tuple of (class, tuple)
+     */
+    public PyObject __reduce__() {
+        return str___reduce__();
+    }
+
+    final PyObject str___reduce__() {
+        return object___reduce__();
+    }
+
+    public PyTuple __getnewargs__() {
+        return new PyTuple(new PyObject[]{
+            new PyString(str_toString())
+            }
+        );
+    }
+
     //XXX: PyUnicode?
     public PyObject __mod__(PyObject other) {
         StringFormatter fmt = new StringFormatter(string);

Modified: trunk/jython/src/org/python/core/PyStringDerived.java
===================================================================
--- trunk/jython/src/org/python/core/PyStringDerived.java	2006-05-27 00:05:23 UTC (rev 2764)
+++ trunk/jython/src/org/python/core/PyStringDerived.java	2006-05-27 02:17:42 UTC (rev 2765)
@@ -12,9 +12,8 @@
         return dict;
     }
 
-    //Modified by hand to pass string value.
-    public PyStringDerived(PyType subtype, String string) {
-        super(subtype, string);
+    public PyStringDerived(PyType subtype,String v) {
+        super(subtype,v);
         dict=subtype.instDict();
     }
 
@@ -146,6 +145,14 @@
         return super.__invert__();
     }
 
+    public PyObject __reduce__() {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__reduce__");
+        if (impl!=null)
+            return impl.__get__(this,self_type).__call__();
+        return super.__reduce__();
+    }
+
     public PyObject __add__(PyObject other) {
         PyType self_type=getType();
         PyObject impl=self_type.lookup("__add__");
@@ -684,6 +691,20 @@
         return super.hashCode();
     }
 
+    public PyUnicode __unicode__() {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__unicode__");
+        if (impl!=null) {
+            PyObject res=impl.__get__(this,self_type).__call__();
+            if (res instanceof PyUnicode)
+                return(PyUnicode)res;
+            if (res instanceof PyString)
+                return new PyUnicode((PyString)res);
+            throw Py.TypeError("__unicode__"+" should return a "+"unicode");
+        }
+        return super.__unicode__();
+    }
+
     public int __cmp__(PyObject other) {
         PyType self_type=getType();
         PyObject impl=self_type.lookup("__cmp__");
@@ -779,6 +800,35 @@
         super.__setitem__(key,value);
     }
 
+    public PyObject __getitem__(PyObject key) { // ???
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getitem__");
+        if (impl!=null) {
+            try {
+                return impl.__get__(this,self_type).__call__(key);
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        }
+        return super.__getitem__(key);
+    }
+
+    public PyObject __getslice__(PyObject start,PyObject stop,PyObject step) { // ???
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getslice__");
+        if (impl!=null)
+            try {
+                return impl.__get__(this,self_type).__call__(start,stop);
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        return super.__getslice__(start,stop,step);
+    }
+
     public void __delitem__(PyObject key) { // ???
         PyType self_type=getType();
         PyObject impl=self_type.lookup("__delitem__");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2767
Author:   fwierzbicki
Date:     2006-05-26 20:54:50 -0700 (Fri, 26 May 2006)
ViewCVS:  http://svn.sourceforge.net/jython/?rev=2767&view=rev

Log Message:
-----------
more pickle work -- mainly added __reduce__ to tuple and cleaned up int.

Modified Paths:
--------------
    trunk/jython/Lib/test/test_subclasses.py
    trunk/jython/src/org/python/core/PyInteger.java
    trunk/jython/src/org/python/core/PyTuple.java
    trunk/jython/src/org/python/core/PyTupleDerived.java
Modified: trunk/jython/Lib/test/test_subclasses.py
===================================================================
--- trunk/jython/Lib/test/test_subclasses.py	2006-05-27 02:22:32 UTC (rev 2766)
+++ trunk/jython/Lib/test/test_subclasses.py	2006-05-27 03:54:50 UTC (rev 2767)
@@ -11,7 +11,7 @@
     def __init__(self, x):
         self.str = str(x)
 
-class myobject(object):
+class mytuple(tuple):
     def __init__(self, x):
         self.str = str(x)
 
@@ -186,6 +186,7 @@
 
         self.picklecheck(myint(4))
         self.picklecheck(mystr('x'))
+        self.picklecheck(mytuple([1,2]))
   
 def test_suite():
     allsuites = [unittest.makeSuite(klass, 'test')

Modified: trunk/jython/src/org/python/core/PyInteger.java
===================================================================
--- trunk/jython/src/org/python/core/PyInteger.java	2006-05-27 02:22:32 UTC (rev 2766)
+++ trunk/jython/src/org/python/core/PyInteger.java	2006-05-27 03:54:50 UTC (rev 2767)
@@ -1824,7 +1824,7 @@
         return new PyTuple(new PyObject[]{
             getType(),
             new PyTuple(new PyObject[]{
-                new PyString(int_toString())
+                new PyInteger(getValue())
             })
         });
     }

Modified: trunk/jython/src/org/python/core/PyTuple.java
===================================================================
--- trunk/jython/src/org/python/core/PyTuple.java	2006-05-27 02:22:32 UTC (rev 2766)
+++ trunk/jython/src/org/python/core/PyTuple.java	2006-05-27 03:54:50 UTC (rev 2767)
@@ -110,7 +110,7 @@
 
             public PyObject __call__(PyObject arg0) {
                 return Py.newBoolean(self.tuple___contains__(arg0));
-             }
+            }
 
             public PyObject inst_call(PyObject gself,PyObject arg0) {
                 PyTuple self=(PyTuple)gself;
@@ -175,6 +175,34 @@
 
         }
         dict.__setitem__("__add__",new PyMethodDescr("__add__",PyTuple.class,1,1,new exposed___add__(null,null)));
+        class exposed___reduce__ extends PyBuiltinFunctionNarrow {
+
+            private PyTuple self;
+
+            public PyObject getSelf() {
+                return self;
+            }
+
+            exposed___reduce__(PyTuple self,PyBuiltinFunction.Info info) {
+                super(info);
+                this.self=self;
+            }
+
+            public PyBuiltinFunction makeBound(PyObject self) {
+                return new exposed___reduce__((PyTuple)self,info);
+            }
+
+            public PyObject __call__() {
+                return self.tuple___reduce__();
+            }
+
+            public PyObject inst_call(PyObject gself) {
+                PyTuple self=(PyTuple)gself;
+                return self.tuple___reduce__();
+            }
+
+        }
+        dict.__setitem__("__reduce__",new PyMethodDescr("__reduce__",PyTuple.class,0,0,new exposed___reduce__(null,null)));
         class exposed___mul__ extends PyBuiltinFunctionNarrow {
 
             private PyTuple self;
@@ -288,10 +316,12 @@
         }
         dict.__setitem__("__repr__",new PyMethodDescr("__repr__",PyTuple.class,0,0,new exposed___repr__(null,null)));
         dict.__setitem__("__new__",new PyNewWrapper(PyTuple.class,"__new__",-1,-1) {
-                public PyObject new_impl(boolean init,PyType subtype,PyObject[]args,String[]keywords) {
-                    return tuple_new(this,init,subtype,args,keywords);
-                }
-            });
+
+                                                                                       public PyObject new_impl(boolean init,PyType subtype,PyObject[]args,String[]keywords) {
+                                                                                           return tuple_new(this,init,subtype,args,keywords);
+                                                                                       }
+
+                                                                                   });
     }
     //~ END GENERATED REGION -- DO NOT EDIT SEE gexpose.py
 
@@ -429,6 +459,28 @@
         return repeat(count);
     }
 
+    /**
+     * Used for pickling.
+     *
+     * @return a tuple of (class, tuple)
+     */
+    public PyObject __reduce__() {
+        return tuple___reduce__();
+    }
+
+    final PyObject tuple___reduce__() {
+        PyTuple newargs = __getnewargs__();
+        return new PyTuple(new PyObject[]{
+            getType(), newargs
+        });
+    }
+
+    public PyTuple __getnewargs__() {
+        return new PyTuple(new PyObject[]
+            {new PyList(list.getArray())}
+        );
+    }
+
     public int hashCode() {
         return tuple_hashCode();
     }

Modified: trunk/jython/src/org/python/core/PyTupleDerived.java
===================================================================
--- trunk/jython/src/org/python/core/PyTupleDerived.java	2006-05-27 02:22:32 UTC (rev 2766)
+++ trunk/jython/src/org/python/core/PyTupleDerived.java	2006-05-27 03:54:50 UTC (rev 2767)
@@ -12,8 +12,8 @@
         return dict;
     }
 
-    public PyTupleDerived(PyType subtype, PyObject[] elements) {
-        super(subtype, elements);
+    public PyTupleDerived(PyType subtype,PyObject[]elements) {
+        super(subtype,elements);
         dict=subtype.instDict();
     }
 
@@ -145,6 +145,14 @@
         return super.__invert__();
     }
 
+    public PyObject __reduce__() {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__reduce__");
+        if (impl!=null)
+            return impl.__get__(this,self_type).__call__();
+        return super.__reduce__();
+    }
+
     public PyObject __add__(PyObject other) {
         PyType self_type=getType();
         PyObject impl=self_type.lookup("__add__");
@@ -683,6 +691,20 @@
         return super.hashCode();
     }
 
+    public PyUnicode __unicode__() {
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__unicode__");
+        if (impl!=null) {
+            PyObject res=impl.__get__(this,self_type).__call__();
+            if (res instanceof PyUnicode)
+                return(PyUnicode)res;
+            if (res instanceof PyString)
+                return new PyUnicode((PyString)res);
+            throw Py.TypeError("__unicode__"+" should return a "+"unicode");
+        }
+        return super.__unicode__();
+    }
+
     public int __cmp__(PyObject other) {
         PyType self_type=getType();
         PyObject impl=self_type.lookup("__cmp__");
@@ -778,6 +800,35 @@
         super.__setitem__(key,value);
     }
 
+    public PyObject __getitem__(PyObject key) { // ???
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getitem__");
+        if (impl!=null) {
+            try {
+                return impl.__get__(this,self_type).__call__(key);
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        }
+        return super.__getitem__(key);
+    }
+
+    public PyObject __getslice__(PyObject start,PyObject stop,PyObject step) { // ???
+        PyType self_type=getType();
+        PyObject impl=self_type.lookup("__getslice__");
+        if (impl!=null)
+            try {
+                return impl.__get__(this,self_type).__call__(start,stop);
+            } catch (PyException exc) {
+                if (Py.matchException(exc,Py.LookupError))
+                    return null;
+                throw exc;
+            }
+        return super.__getslice__(start,stop,step);
+    }
+
     public void __delitem__(PyObject key) { // ???
         PyType self_type=getType();
         PyObject impl=self_type.lookup("__delitem__");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2810
Author:   fwierzbicki
Date:     2006-06-09 08:54:19 -0700 (Fri, 09 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/jython/?rev=2810&view=rev

Log Message:
-----------
Added load_source to the imp module, removed tests for unimplemented parts of inspect.py.

Modified Paths:
--------------
    trunk/jython/src/org/python/modules/imp.java

Added Paths:
-----------
    trunk/jython/Lib/test/test_inspect.py
Added: trunk/jython/Lib/test/test_inspect.py
===================================================================
--- trunk/jython/Lib/test/test_inspect.py	                        (rev 0)
+++ trunk/jython/Lib/test/test_inspect.py	2006-06-09 15:54:19 UTC (rev 2810)
@@ -0,0 +1,372 @@
+#FIXME: removed all of the tests that don't really apply to Jython's version of
+#       inspect.py.  However, some of the missing functionality in inspect
+#       is implementable -- so check back here if that is done.
+source = '''# line 1
+'A module docstring.'
+
+import sys, inspect
+# line 5
+
+# line 7
+def spam(a, b, c, d=3, (e, (f,))=(4, (5,)), *g, **h):
+    eggs(b + d, c + f)
+
+# line 11
+def eggs(x, y):
+    "A docstring."
+    global fr, st
+    fr = inspect.currentframe()
+    st = inspect.stack()
+    p = x
+    q = y / 0
+
+# line 20
+class StupidGit:
+    """A longer,
+
+    indented
+
+    docstring."""
+# line 27
+
+    def abuse(self, a, b, c):
+        """Another
+
+\tdocstring
+
+        containing
+
+\ttabs
+\t
+        """
+        self.argue(a, b, c)
+# line 40
+    def argue(self, a, b, c):
+        try:
+            spam(a, b, c)
+        except:
+            self.ex = sys.exc_info()
+            #self.tr = inspect.trace()
+
+# line 48
+class MalodorousPervert(StupidGit):
+    pass
+
+class ParrotDroppings:
+    pass
+
+class FesteringGob(MalodorousPervert, ParrotDroppings):
+    pass
+'''
+
+# Functions tested in this suite:
+# ismodule, isclass, ismethod, isfunction, istraceback, isframe, iscode,
+# isbuiltin, isroutine, getmembers, getdoc, getfile, getmodule,
+# getsourcefile, getcomments, getsource, getclasstree, getargspec,
+# getargvalues, formatargspec, formatargvalues, currentframe, stack, trace
+
+from test_support import TestFailed, TESTFN
+import sys, imp, os, string
+
+def test(assertion, message, *args):
+    if not assertion:
+        raise TestFailed, message % args
+
+import inspect
+
+file = open(TESTFN, 'w')
+file.write(source)
+file.close()
+
+# Note that load_source creates file TESTFN+'c' or TESTFN+'o'.
+mod = imp.load_source('testmod', TESTFN)
+files_to_clean_up = [TESTFN, TESTFN + 'c', TESTFN + 'o']
+
+def istest(func, exp):
+    obj = eval(exp)
+    test(func(obj), '%s(%s)' % (func.__name__, exp))
+    for other in [#inspect.isbuiltin,
+                  inspect.isclass,
+                  #inspect.iscode,
+                  #inspect.isframe,
+                  inspect.isfunction,
+                  inspect.ismethod,
+                  inspect.ismodule,
+                  #inspect.istraceback
+                 ]:
+        if other is not func:
+            test(not other(obj), 'not %s(%s)' % (other.__name__, exp))
+
+git = mod.StupidGit()
+try:
+    1/0
+except:
+    tb = sys.exc_traceback
+
+#istest(inspect.isbuiltin, 'sys.exit')
+#istest(inspect.isbuiltin, '[].append')
+istest(inspect.isclass, 'mod.StupidGit')
+#istest(inspect.iscode, 'mod.spam.func_code')
+#istest(inspect.isframe, 'tb.tb_frame')
+istest(inspect.isfunction, 'mod.spam')
+istest(inspect.ismethod, 'mod.StupidGit.abuse')
+istest(inspect.ismethod, 'git.argue')
+istest(inspect.ismodule, 'mod')
+#istest(inspect.istraceback, 'tb')
+#test(inspect.isroutine(mod.spam), 'isroutine(mod.spam)')
+#test(inspect.isroutine([].count), 'isroutine([].count)')
+
+#classes = inspect.getmembers(mod, inspect.isclass)
+#test(classes ==
+#     [('FesteringGob', mod.FesteringGob),
+#      ('MalodorousPervert', mod.MalodorousPervert),
+#      ('ParrotDroppings', mod.ParrotDroppings),
+#      ('StupidGit', mod.StupidGit)], 'class list')
+#tree = inspect.getclasstree(map(lambda x: x[1], classes), 1)
+#test(tree ==
+#     [(mod.ParrotDroppings, ()),
+#      (mod.StupidGit, ()),
+#      [(mod.MalodorousPervert, (mod.StupidGit,)),
+#       [(mod.FesteringGob, (mod.MalodorousPervert, mod.ParrotDroppings))
+#       ]
+#      ]
+#     ], 'class tree')
+
+#functions = inspect.getmembers(mod, inspect.isfunction)
+#test(functions == [('eggs', mod.eggs), ('spam', mod.spam)], 'function list')
+
+#test(inspect.getdoc(mod) == 'A module docstring.', 'getdoc(mod)')
+#test(inspect.getcomments(mod) == '# line 1\n', 'getcomments(mod)')
+#test(inspect.getmodule(mod.StupidGit) == mod, 'getmodule(mod.StupidGit)')
+#test(inspect.getfile(mod.StupidGit) == TESTFN, 'getfile(mod.StupidGit)')
+#test(inspect.getsourcefile(mod.spam) == TESTFN, 'getsourcefile(mod.spam)')
+#test(inspect.getsourcefile(git.abuse) == TESTFN, 'getsourcefile(git.abuse)')
+
+def sourcerange(top, bottom):
+    lines = string.split(source, '\n')
+    return string.join(lines[top-1:bottom], '\n') + '\n'
+
+#test(inspect.getsource(git.abuse) == sourcerange(29, 39),
+#     'getsource(git.abuse)')
+#test(inspect.getsource(mod.StupidGit) == sourcerange(21, 46),
+#     'getsource(mod.StupidGit)')
+#test(inspect.getdoc(mod.StupidGit) ==
+#     'A longer,\n\nindented\n\ndocstring.', 'getdoc(mod.StupidGit)')
+#test(inspect.getdoc(git.abuse) ==
+#     'Another\n\ndocstring\n\ncontaining\n\ntabs\n\n', 'getdoc(git.abuse)')
+#test(inspect.getcomments(mod.StupidGit) == '# line 20\n',
+#     'getcomments(mod.StupidGit)')
+
+#args, varargs, varkw, defaults = inspect.getargspec(mod.eggs)
+#test(args == ['x', 'y'], 'mod.eggs args')
+#test(varargs == None, 'mod.eggs varargs')
+#test(varkw == None, 'mod.eggs varkw')
+#test(defaults == None, 'mod.eggs defaults')
+#test(inspect.formatargspec(args, varargs, varkw, defaults) ==
+#     '(x, y)', 'mod.eggs formatted argspec')
+#args, varargs, varkw, defaults = inspect.getargspec(mod.spam)
+#test(args == ['a', 'b', 'c', 'd', ['e', ['f']]], 'mod.spam args')
+#test(varargs == 'g', 'mod.spam varargs')
+#test(varkw == 'h', 'mod.spam varkw')
+#test(defaults == (3, (4, (5,))), 'mod.spam defaults')
+#test(inspect.formatargspec(args, varargs, varkw, defaults) ==
+#     '(a, b, c, d=3, (e, (f,))=(4, (5,)), *g, **h)',
+#     'mod.spam formatted argspec')
+
+git.abuse(7, 8, 9)
+
+#istest(inspect.istraceback, 'git.ex[2]')
+#istest(inspect.isframe, 'mod.fr')
+
+#test(len(git.tr) == 3, 'trace() length')
+#test(git.tr[0][1:] == (TESTFN, 46, 'argue',
+#                       ['            self.tr = inspect.trace()\n'], 0),
+#     'trace() row 2')
+#test(git.tr[1][1:] == (TESTFN, 9, 'spam', ['    eggs(b + d, c + f)\n'], 0),
+#     'trace() row 2')
+#test(git.tr[2][1:] == (TESTFN, 18, 'eggs', ['    q = y / 0\n'], 0),
+#     'trace() row 3')
+
+#test(len(mod.st) >= 5, 'stack() length')
+#test(mod.st[0][1:] ==
+#     (TESTFN, 16, 'eggs', ['    st = inspect.stack()\n'], 0),
+#     'stack() row 1')
+#test(mod.st[1][1:] ==
+#     (TESTFN, 9, 'spam', ['    eggs(b + d, c + f)\n'], 0),
+#     'stack() row 2')
+#test(mod.st[2][1:] ==
+#     (TESTFN, 43, 'argue', ['            spam(a, b, c)\n'], 0),
+#     'stack() row 3')
+#test(mod.st[3][1:] ==
+#     (TESTFN, 39, 'abuse', ['        self.argue(a, b, c)\n'], 0),
+#     'stack() row 4')
+
+#args, varargs, varkw, locals = inspect.getargvalues(mod.fr)
+#test(args == ['x', 'y'], 'mod.fr args')
+#test(varargs == None, 'mod.fr varargs')
+#test(varkw == None, 'mod.fr varkw')
+#test(locals == {'x': 11, 'p': 11, 'y': 14}, 'mod.fr locals')
+#test(inspect.formatargvalues(args, varargs, varkw, locals) ==
+#     '(x=11, y=14)', 'mod.fr formatted argvalues')
+
+#args, varargs, varkw, locals = inspect.getargvalues(mod.fr.f_back)
+#test(args == ['a', 'b', 'c', 'd', ['e', ['f']]], 'mod.fr.f_back args')
+#test(varargs == 'g', 'mod.fr.f_back varargs')
+#test(varkw == 'h', 'mod.fr.f_back varkw')
+#test(inspect.formatargvalues(args, varargs, varkw, locals) ==
+#     '(a=7, b=8, c=9, d=3, (e=4, (f=5,)), *g=(), **h={})',
+#     'mod.fr.f_back formatted argvalues')
+
+for fname in files_to_clean_up:
+    try:
+        os.unlink(fname)
+    except:
+        pass
+
+# Test classic-class method resolution order.
+class A:    pass
+class B(A): pass
+class C(A): pass
+class D(B, C): pass
+
+expected = (D, B, A, C)
+#got = inspect.getmro(D)
+#test(expected == got, "expected %r mro, got %r", expected, got)
+
+# The same w/ new-class MRO.
+class A(object):    pass
+class B(A): pass
+class C(A): pass
+class D(B, C): pass
+
+expected = (D, B, C, A, object)
+#got = inspect.getmro(D)
+#test(expected == got, "expected %r mro, got %r", expected, got)
+
+# Test classify_class_attrs.
+def attrs_wo_objs(cls):
+    return [t[:3] for t in inspect.classify_class_attrs(cls)]
+
+class A:
+    def s(): pass
+    s = staticmethod(s)
+
+    def c(cls): pass
+    c = classmethod(c)
+
+    def getp(self): pass
+    p = property(getp)
+
+    def m(self): pass
+
+    def m1(self): pass
+
+    datablob = '1'
+
+#attrs = attrs_wo_objs(A)
+#test(('s', 'static method', A) in attrs, 'missing static method')
+#test(('c', 'class method', A) in attrs, 'missing class method')
+#test(('p', 'property', A) in attrs, 'missing property')
+#test(('m', 'method', A) in attrs, 'missing plain method')
+#test(('m1', 'method', A) in attrs, 'missing plain method')
+#test(('datablob', 'data', A) in attrs, 'missing data')
+
+#class B(A):
+#    def m(self): pass
+
+#attrs = attrs_wo_objs(B)
+#test(('s', 'static method', A) in attrs, 'missing static method')
+#test(('c', 'class method', A) in attrs, 'missing class method')
+#test(('p', 'property', A) in attrs, 'missing property')
+#test(('m', 'method', B) in attrs, 'missing plain method')
+#test(('m1', 'method', A) in attrs, 'missing plain method')
+#test(('datablob', 'data', A) in attrs, 'missing data')
+
+
+#class C(A):
+#    def m(self): pass
+#    def c(self): pass
+
+#attrs = attrs_wo_objs(C)
+#test(('s', 'static method', A) in attrs, 'missing static method')
+#test(('c', 'method', C) in attrs, 'missing plain method')
+#test(('p', 'property', A) in attrs, 'missing property')
+#test(('m', 'method', C) in attrs, 'missing plain method')
+#test(('m1', 'method', A) in attrs, 'missing plain method')
+#test(('datablob', 'data', A) in attrs, 'missing data')
+
+#class D(B, C):
+#    def m1(self): pass
+
+#attrs = attrs_wo_objs(D)
+#test(('s', 'static method', A) in attrs, 'missing static method')
+#test(('c', 'class method', A) in attrs, 'missing class method')
+#test(('p', 'property', A) in attrs, 'missing property')
+#test(('m', 'method', B) in attrs, 'missing plain method')
+#test(('m1', 'method', D) in attrs, 'missing plain method')
+#test(('datablob', 'data', A) in attrs, 'missing data')
+
+# Repeat all that, but w/ new-style classes.
+
+#class A(object):
+
+#    def s(): pass
+#    s = staticmethod(s)
+
+#    def c(cls): pass
+#    c = classmethod(c)
+
+#    def getp(self): pass
+#    p = property(getp)
+
+#    def m(self): pass
+
+#    def m1(self): pass
+
+#    datablob = '1'
+
+#attrs = attrs_wo_objs(A)
+#test(('s', 'static method', A) in attrs, 'missing static method')
+#test(('c', 'class method', A) in attrs, 'missing class method')
+#test(('p', 'property', A) in attrs, 'missing property')
+#test(('m', 'method', A) in attrs, 'missing plain method')
+#test(('m1', 'method', A) in attrs, 'missing plain method')
+#test(('datablob', 'data', A) in attrs, 'missing data')
+
+#class B(A):
+
+#    def m(self): pass
+
+#attrs = attrs_wo_objs(B)
+#test(('s', 'static method', A) in attrs, 'missing static method')
+#test(('c', 'class method', A) in attrs, 'missing class method')
+#test(('p', 'property', A) in attrs, 'missing property')
+#test(('m', 'method', B) in attrs, 'missing plain method')
+#test(('m1', 'method', A) in attrs, 'missing plain method')
+#test(('datablob', 'data', A) in attrs, 'missing data')
+
+
+#class C(A):
+
+#    def m(self): pass
+#    def c(self): pass
+
+#attrs = attrs_wo_objs(C)
+#test(('s', 'static method', A) in attrs, 'missing static method')
+#test(('c', 'method', C) in attrs, 'missing plain method')
+#test(('p', 'property', A) in attrs, 'missing property')
+#test(('m', 'method', C) in attrs, 'missing plain method')
+#test(('m1', 'method', A) in attrs, 'missing plain method')
+#test(('datablob', 'data', A) in attrs, 'missing data')
+
+#class D(B, C):
+
+#    def m1(self): pass
+
+#attrs = attrs_wo_objs(D)
+#test(('s', 'static method', A) in attrs, 'missing static method')
+#test(('c', 'method', C) in attrs, 'missing plain method')
+#test(('p', 'property', A) in attrs, 'missing property')
+#test(('m', 'method', B) in attrs, 'missing plain method')
+#test(('m1', 'method', D) in attrs, 'missing plain method')
+#test(('datablob', 'data', A) in attrs, 'missing data')

Modified: trunk/jython/src/org/python/modules/imp.java
===================================================================
--- trunk/jython/src/org/python/modules/imp.java	2006-06-09 15:14:53 UTC (rev 2809)
+++ trunk/jython/src/org/python/modules/imp.java	2006-06-09 15:54:19 UTC (rev 2810)
@@ -130,6 +130,21 @@
         return find_module(name, null);
     }
 
+    public static PyObject load_source(String modname, String filename) {
+        PyObject mod = Py.None;
+        //XXX: bufsize is ignored in PyFile now, but look 3rd arg if this ever changes.
+        PyFile file = new PyFile(filename, "r", 1024);
+        Object o = file.__tojava__(InputStream.class);
+        if (o == Py.NoConversion) {
+            throw Py.TypeError("must be a file-like object");
+        }
+        mod = org.python.core.imp.loadFromSource(
+             modname.intern(), (InputStream)o, filename.toString());
+        PyObject modules = Py.getSystemState().modules;
+        modules.__setitem__(modname.intern(), mod);
+        return mod;
+    }
+
     public static PyObject find_module(String name, PyObject path) {
         if (path == null || path == Py.None) {
             path = Py.getSystemState().path;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3063
          http://svn.sourceforge.net/jython/?rev=3063&view=rev
Author:   cgroves
Date:     2007-01-23 22:14:18 -0800 (Tue, 23 Jan 2007)

Log Message:
-----------
add underlying_system to test_support to allow os checking on jython and cpython to work in a similar fashion(at least on the major platforms), and use that in test_mhlib to skip the test under windows on jython too

Modified Paths:
--------------
    trunk/jython/Lib/test/test_mhlib.py
    trunk/jython/Lib/test/test_support.py

Modified: trunk/jython/Lib/test/test_mhlib.py
===================================================================
--- trunk/jython/Lib/test/test_mhlib.py	2007-01-24 05:34:58 UTC (rev 3062)
+++ trunk/jython/Lib/test/test_mhlib.py	2007-01-24 06:14:18 UTC (rev 3063)
@@ -7,13 +7,15 @@
 ###      mhlib.  It should.
 
 import unittest
-from test.test_support import run_unittest, TESTFN, TestSkipped
+from test.test_support import run_unittest, TESTFN, TestSkipped, underlying_system
 import os, StringIO
 import sys
 import mhlib
 
-if (sys.platform.startswith("win") or sys.platform=="riscos" or
-      sys.platform.startswith("atheos")):
+
+
+if (underlying_system.startswith("win") or underlying_system=="riscos" or
+      underlying_system.startswith("atheos")):
     # mhlib.updateline() renames a file to the name of a file that already
     # exists.  That causes a reasonable OS <wink> to complain in test_sequence
     # here, like the "OSError: [Errno 17] File exists" raised on Windows.
@@ -21,7 +23,7 @@
     # link counts, and that causes test_listfolders() here to get back
     # an empty list from its call of listallfolders().
     # The other tests here pass on Windows.
-    raise TestSkipped("skipped on %s -- " % sys.platform +
+    raise TestSkipped("skipped on %s -- " % underlying_system +
                       "too many Unix assumptions")
 
 _mhroot = TESTFN+"_MH"

Modified: trunk/jython/Lib/test/test_support.py
===================================================================
--- trunk/jython/Lib/test/test_support.py	2007-01-24 05:34:58 UTC (rev 3062)
+++ trunk/jython/Lib/test/test_support.py	2007-01-24 06:14:18 UTC (rev 3063)
@@ -80,6 +80,11 @@
 
 is_jython = sys.platform.startswith('java')
 
+underlying_system = sys.platform
+if is_jython:
+    import java.lang.System
+    underlying_system = java.lang.System.getProperty('os.name').lower()
+
 import os
 # Filename used for testing
 if os.name == 'java':


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3351
          http://svn.sourceforge.net/jython/?rev=3351&view=rev
Author:   cgroves
Date:     2007-07-22 23:20:50 -0700 (Sun, 22 Jul 2007)

Log Message:
-----------
Use test_support to run tests so regrtest picks them up

Modified Paths:
--------------
    trunk/jython/Lib/test/test_select.py
    trunk/jython/Lib/test/test_select_new.py
    trunk/jython/Lib/test/test_socket.py

Modified: trunk/jython/Lib/test/test_select.py
===================================================================
--- trunk/jython/Lib/test/test_select.py	2007-07-23 05:35:41 UTC (rev 3350)
+++ trunk/jython/Lib/test/test_select.py	2007-07-23 06:20:50 UTC (rev 3351)
@@ -13,6 +13,7 @@
 
 import os
 import sys
+import test_support
 import unittest
 
 class SelectWrapper:
@@ -221,9 +222,7 @@
     if sys.platform[:4] != 'java':
         tests.append(TestPipes)
     suites = [unittest.makeSuite(klass, 'test') for klass in tests]
-    main_suite = unittest.TestSuite(suites)
-    runner = unittest.TextTestRunner(verbosity=100)
-    runner.run(main_suite)
+    test_support.run_suite(unittest.TestSuite(suites))
 
 if __name__ == "__main__":
     test_main()

Modified: trunk/jython/Lib/test/test_select_new.py
===================================================================
--- trunk/jython/Lib/test/test_select_new.py	2007-07-23 05:35:41 UTC (rev 3350)
+++ trunk/jython/Lib/test/test_select_new.py	2007-07-23 06:20:50 UTC (rev 3351)
@@ -4,6 +4,7 @@
 
 import sys
 import time
+import test_support
 import unittest
 
 import socket
@@ -272,5 +273,8 @@
         TestSelect.handler_socket.close()
         TestSelect.server_socket.close()
 
+def test_main():
+    test_support.run_unittest(TestSelect)    
+
 if __name__ == "__main__":
-    unittest.main()
+    test_main()

Modified: trunk/jython/Lib/test/test_socket.py
===================================================================
--- trunk/jython/Lib/test/test_socket.py	2007-07-23 05:35:41 UTC (rev 3350)
+++ trunk/jython/Lib/test/test_socket.py	2007-07-23 06:20:50 UTC (rev 3351)
@@ -5,7 +5,7 @@
 """
 
 import unittest
-#from test import test_support
+import test_support
 
 import errno
 import socket
@@ -1122,10 +1122,7 @@
     if sys.platform[:4] == 'java':
         tests.append(TestJythonExceptions)
     suites = [unittest.makeSuite(klass, 'test') for klass in tests]
-    main_suite = unittest.TestSuite(suites)
-    runner = unittest.TextTestRunner(verbosity=100)
-    runner.run(main_suite)
-    # unittest.run_unittest(*tests)
+    test_support.run_suite(unittest.TestSuite(suites))
 
 if __name__ == "__main__":
     test_main()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3459
          http://jython.svn.sourceforge.net/jython/?rev=3459&view=rev
Author:   pjenvey
Date:     2007-08-30 22:23:25 -0700 (Thu, 30 Aug 2007)

Log Message:
-----------
list tests from Python 2.4.4

Added Paths:
-----------
    trunk/jython/Lib/test/list_tests.py
    trunk/jython/Lib/test/seq_tests.py
    trunk/jython/Lib/test/test_list.py

Added: trunk/jython/Lib/test/list_tests.py
===================================================================
--- trunk/jython/Lib/test/list_tests.py	                        (rev 0)
+++ trunk/jython/Lib/test/list_tests.py	2007-08-31 05:23:25 UTC (rev 3459)
@@ -0,0 +1,506 @@
+# From Python 2.4.4
+"""
+Tests common to list and UserList.UserList
+"""
+
+import sys
+import os
+
+import unittest
+from test import test_support, seq_tests
+
+class CommonTest(seq_tests.CommonTest):
+
+    def test_init(self):
+        # Iterable arg is optional
+        self.assertEqual(self.type2test([]), self.type2test())
+
+        # Init clears previous values
+        a = self.type2test([1, 2, 3])
+        a.__init__()
+        self.assertEqual(a, self.type2test([]))
+
+        # Init overwrites previous values
+        a = self.type2test([1, 2, 3])
+        a.__init__([4, 5, 6])
+        self.assertEqual(a, self.type2test([4, 5, 6]))
+
+        # Mutables always return a new object
+        b = self.type2test(a)
+        self.assertNotEqual(id(a), id(b))
+        self.assertEqual(a, b)
+
+    def test_repr(self):
+        l0 = []
+        l2 = [0, 1, 2]
+        a0 = self.type2test(l0)
+        a2 = self.type2test(l2)
+
+        self.assertEqual(str(a0), str(l0))
+        self.assertEqual(repr(a0), repr(l0))
+        self.assertEqual(`a2`, `l2`)
+        self.assertEqual(str(a2), "[0, 1, 2]")
+        self.assertEqual(repr(a2), "[0, 1, 2]")
+
+        a2.append(a2)
+        a2.append(3)
+        self.assertEqual(str(a2), "[0, 1, 2, [...], 3]")
+        self.assertEqual(repr(a2), "[0, 1, 2, [...], 3]")
+
+    def test_print(self):
+        d = self.type2test(xrange(200))
+        d.append(d)
+        d.extend(xrange(200,400))
+        d.append(d)
+        d.append(400)
+        try:
+            fo = open(test_support.TESTFN, "wb")
+            print >> fo, d,
+            fo.close()
+            fo = open(test_support.TESTFN, "rb")
+            self.assertEqual(fo.read(), repr(d))
+        finally:
+            fo.close()
+            os.remove(test_support.TESTFN)
+
+    def test_set_subscript(self):
+        a = self.type2test(range(20))
+        self.assertRaises(ValueError, a.__setitem__, slice(0, 10, 0), [1,2,3])
+        self.assertRaises(TypeError, a.__setitem__, slice(0, 10), 1)
+        self.assertRaises(ValueError, a.__setitem__, slice(0, 10, 2), [1,2])
+        self.assertRaises(TypeError, a.__getitem__, 'x', 1)
+        a[slice(2,10,3)] = [1,2,3]
+        self.assertEqual(a, self.type2test([0, 1, 1, 3, 4, 2, 6, 7, 3,
+                                            9, 10, 11, 12, 13, 14, 15,
+                                            16, 17, 18, 19]))
+
+    def test_reversed(self):
+        a = self.type2test(range(20))
+        r = reversed(a)
+        self.assertEqual(list(r), self.type2test(range(19, -1, -1)))
+        self.assertRaises(StopIteration, r.next)
+        self.assertEqual(list(reversed(self.type2test())),
+                         self.type2test())
+
+    def test_setitem(self):
+        a = self.type2test([0, 1])
+        a[0] = 0
+        a[1] = 100
+        self.assertEqual(a, self.type2test([0, 100]))
+        a[-1] = 200
+        self.assertEqual(a, self.type2test([0, 200]))
+        a[-2] = 100
+        self.assertEqual(a, self.type2test([100, 200]))
+        self.assertRaises(IndexError, a.__setitem__, -3, 200)
+        self.assertRaises(IndexError, a.__setitem__, 2, 200)
+
+        a = self.type2test([])
+        self.assertRaises(IndexError, a.__setitem__, 0, 200)
+        self.assertRaises(IndexError, a.__setitem__, -1, 200)
+        self.assertRaises(TypeError, a.__setitem__)
+
+        a = self.type2test([0,1,2,3,4])
+        a[0L] = 1
+        a[1L] = 2
+        a[2L] = 3
+        self.assertEqual(a, self.type2test([1,2,3,3,4]))
+        a[0] = 5
+        a[1] = 6
+        a[2] = 7
+        self.assertEqual(a, self.type2test([5,6,7,3,4]))
+        a[-2L] = 88
+        a[-1L] = 99
+        self.assertEqual(a, self.type2test([5,6,7,88,99]))
+        a[-2] = 8
+        a[-1] = 9
+        self.assertEqual(a, self.type2test([5,6,7,8,9]))
+
+    def test_delitem(self):
+        a = self.type2test([0, 1])
+        del a[1]
+        self.assertEqual(a, [0])
+        del a[0]
+        self.assertEqual(a, [])
+
+        a = self.type2test([0, 1])
+        del a[-2]
+        self.assertEqual(a, [1])
+        del a[-1]
+        self.assertEqual(a, [])
+
+        a = self.type2test([0, 1])
+        self.assertRaises(IndexError, a.__delitem__, -3)
+        self.assertRaises(IndexError, a.__delitem__, 2)
+
+        a = self.type2test([])
+        self.assertRaises(IndexError, a.__delitem__, 0)
+
+        self.assertRaises(TypeError, a.__delitem__)
+
+    def test_setslice(self):
+        l = [0, 1]
+        a = self.type2test(l)
+
+        for i in range(-3, 4):
+            a[:i] = l[:i]
+            self.assertEqual(a, l)
+            a2 = a[:]
+            a2[:i] = a[:i]
+            self.assertEqual(a2, a)
+            a[i:] = l[i:]
+            self.assertEqual(a, l)
+            a2 = a[:]
+            a2[i:] = a[i:]
+            self.assertEqual(a2, a)
+            for j in range(-3, 4):
+                a[i:j] = l[i:j]
+                self.assertEqual(a, l)
+                a2 = a[:]
+                a2[i:j] = a[i:j]
+                self.assertEqual(a2, a)
+
+        aa2 = a2[:]
+        aa2[:0] = [-2, -1]
+        self.assertEqual(aa2, [-2, -1, 0, 1])
+        aa2[0:] = []
+        self.assertEqual(aa2, [])
+
+        a = self.type2test([1, 2, 3, 4, 5])
+        a[:-1] = a
+        self.assertEqual(a, self.type2test([1, 2, 3, 4, 5, 5]))
+        a = self.type2test([1, 2, 3, 4, 5])
+        a[1:] = a
+        self.assertEqual(a, self.type2test([1, 1, 2, 3, 4, 5]))
+        a = self.type2test([1, 2, 3, 4, 5])
+        a[1:-1] = a
+        self.assertEqual(a, self.type2test([1, 1, 2, 3, 4, 5, 5]))
+
+        a = self.type2test([])
+        a[:] = tuple(range(10))
+        self.assertEqual(a, self.type2test(range(10)))
+
+        self.assertRaises(TypeError, a.__setslice__, 0, 1, 5)
+
+        self.assertRaises(TypeError, a.__setslice__)
+
+    def test_delslice(self):
+        a = self.type2test([0, 1])
+        del a[1:2]
+        del a[0:1]
+        self.assertEqual(a, self.type2test([]))
+
+        a = self.type2test([0, 1])
+        del a[1L:2L]
+        del a[0L:1L]
+        self.assertEqual(a, self.type2test([]))
+
+        a = self.type2test([0, 1])
+        del a[-2:-1]
+        self.assertEqual(a, self.type2test([1]))
+
+        a = self.type2test([0, 1])
+        del a[-2L:-1L]
+        self.assertEqual(a, self.type2test([1]))
+
+        a = self.type2test([0, 1])
+        del a[1:]
+        del a[:1]
+        self.assertEqual(a, self.type2test([]))
+
+        a = self.type2test([0, 1])
+        del a[1L:]
+        del a[:1L]
+        self.assertEqual(a, self.type2test([]))
+
+        a = self.type2test([0, 1])
+        del a[-1:]
+        self.assertEqual(a, self.type2test([0]))
+
+        a = self.type2test([0, 1])
+        del a[-1L:]
+        self.assertEqual(a, self.type2test([0]))
+
+        a = self.type2test([0, 1])
+        del a[:]
+        self.assertEqual(a, self.type2test([]))
+
+    def test_append(self):
+        a = self.type2test([])
+        a.append(0)
+        a.append(1)
+        a.append(2)
+        self.assertEqual(a, self.type2test([0, 1, 2]))
+
+        self.assertRaises(TypeError, a.append)
+
+    def test_extend(self):
+        a1 = self.type2test([0])
+        a2 = self.type2test((0, 1))
+        a = a1[:]
+        a.extend(a2)
+        self.assertEqual(a, a1 + a2)
+
+        a.extend(self.type2test([]))
+        self.assertEqual(a, a1 + a2)
+
+        a.extend(a)
+        self.assertEqual(a, self.type2test([0, 0, 1, 0, 0, 1]))
+
+        a = self.type2test("spam")
+        a.extend("eggs")
+        self.assertEqual(a, list("spameggs"))
+
+        self.assertRaises(TypeError, a.extend, None)
+
+        self.assertRaises(TypeError, a.extend)
+
+    def test_insert(self):
+        a = self.type2test([0, 1, 2])
+        a.insert(0, -2)
+        a.insert(1, -1)
+        a.insert(2, 0)
+        self.assertEqual(a, [-2, -1, 0, 0, 1, 2])
+
+        b = a[:]
+        b.insert(-2, "foo")
+        b.insert(-200, "left")
+        b.insert(200, "right")
+        self.assertEqual(b, self.type2test(["left",-2,-1,0,0,"foo",1,2,"right"]))
+
+        self.assertRaises(TypeError, a.insert)
+
+    def test_pop(self):
+        from decimal import Decimal
+        a = self.type2test([-1, 0, 1])
+        a.pop()
+        self.assertEqual(a, [-1, 0])
+        a.pop(0)
+        self.assertEqual(a, [0])
+        self.assertRaises(IndexError, a.pop, 5)
+        a.pop(0)
+        self.assertEqual(a, [])
+        self.assertRaises(IndexError, a.pop)
+        self.assertRaises(TypeError, a.pop, 42, 42)
+        a = self.type2test([0, 10, 20, 30, 40])
+        self.assertEqual(a.pop(Decimal(2)), 20)
+        self.assertRaises(IndexError, a.pop, Decimal(25))
+
+    def test_remove(self):
+        a = self.type2test([0, 0, 1])
+        a.remove(1)
+        self.assertEqual(a, [0, 0])
+        a.remove(0)
+        self.assertEqual(a, [0])
+        a.remove(0)
+        self.assertEqual(a, [])
+
+        self.assertRaises(ValueError, a.remove, 0)
+
+        self.assertRaises(TypeError, a.remove)
+
+        class BadExc(Exception):
+            pass
+
+        class BadCmp:
+            def __eq__(self, other):
+                if other == 2:
+                    raise BadExc()
+                return False
+
+        a = self.type2test([0, 1, 2, 3])
+        self.assertRaises(BadExc, a.remove, BadCmp())
+
+    def test_count(self):
+        a = self.type2test([0, 1, 2])*3
+        self.assertEqual(a.count(0), 3)
+        self.assertEqual(a.count(1), 3)
+        self.assertEqual(a.count(3), 0)
+
+        self.assertRaises(TypeError, a.count)
+
+        class BadExc(Exception):
+            pass
+
+        class BadCmp:
+            def __eq__(self, other):
+                if other == 2:
+                    raise BadExc()
+                return False
+
+        self.assertRaises(BadExc, a.count, BadCmp())
+
+    def test_index(self):
+        u = self.type2test([0, 1])
+        self.assertEqual(u.index(0), 0)
+        self.assertEqual(u.index(1), 1)
+        self.assertRaises(ValueError, u.index, 2)
+
+        u = self.type2test([-2, -1, 0, 0, 1, 2])
+        self.assertEqual(u.count(0), 2)
+        self.assertEqual(u.index(0), 2)
+        self.assertEqual(u.index(0, 2), 2)
+        self.assertEqual(u.index(-2, -10), 0)
+        self.assertEqual(u.index(0, 3), 3)
+        self.assertEqual(u.index(0, 3, 4), 3)
+        self.assertRaises(ValueError, u.index, 2, 0, -10)
+
+        self.assertRaises(TypeError, u.index)
+
+        class BadExc(Exception):
+            pass
+
+        class BadCmp:
+            def __eq__(self, other):
+                if other == 2:
+                    raise BadExc()
+                return False
+
+        a = self.type2test([0, 1, 2, 3])
+        self.assertRaises(BadExc, a.index, BadCmp())
+
+        a = self.type2test([-2, -1, 0, 0, 1, 2])
+        self.assertEqual(a.index(0), 2)
+        self.assertEqual(a.index(0, 2), 2)
+        self.assertEqual(a.index(0, -4), 2)
+        self.assertEqual(a.index(-2, -10), 0)
+        self.assertEqual(a.index(0, 3), 3)
+        self.assertEqual(a.index(0, -3), 3)
+        self.assertEqual(a.index(0, 3, 4), 3)
+        self.assertEqual(a.index(0, -3, -2), 3)
+        self.assertEqual(a.index(0, -4*sys.maxint, 4*sys.maxint), 2)
+        self.assertRaises(ValueError, a.index, 0, 4*sys.maxint,-4*sys.maxint)
+        self.assertRaises(ValueError, a.index, 2, 0, -10)
+        a.remove(0)
+        self.assertRaises(ValueError, a.index, 2, 0, 4)
+        self.assertEqual(a, self.type2test([-2, -1, 0, 1, 2]))
+
+        # Test modifying the list during index's iteration
+        class EvilCmp:
+            def __init__(self, victim):
+                self.victim = victim
+            def __eq__(self, other):
+                del self.victim[:]
+                return False
+        a = self.type2test()
+        a[:] = [EvilCmp(a) for _ in xrange(100)]
+        # This used to seg fault before patch #1005778
+        self.assertRaises(ValueError, a.index, None)
+
+    def test_reverse(self):
+        u = self.type2test([-2, -1, 0, 1, 2])
+        u2 = u[:]
+        u.reverse()
+        self.assertEqual(u, [2, 1, 0, -1, -2])
+        u.reverse()
+        self.assertEqual(u, u2)
+
+        self.assertRaises(TypeError, u.reverse, 42)
+
+    def test_sort(self):
+        u = self.type2test([1, 0])
+        u.sort()
+        self.assertEqual(u, [0, 1])
+
+        u = self.type2test([2,1,0,-1,-2])
+        u.sort()
+        self.assertEqual(u, self.type2test([-2,-1,0,1,2]))
+
+        self.assertRaises(TypeError, u.sort, 42, 42)
+
+        def revcmp(a, b):
+            return cmp(b, a)
+        u.sort(revcmp)
+        self.assertEqual(u, self.type2test([2,1,0,-1,-2]))
+
+        # The following dumps core in unpatched Python 1.5:
+        def myComparison(x,y):
+            return cmp(x%3, y%7)
+        z = self.type2test(range(12))
+        z.sort(myComparison)
+
+        self.assertRaises(TypeError, z.sort, 2)
+
+        def selfmodifyingComparison(x,y):
+            z.append(1)
+            return cmp(x, y)
+        self.assertRaises(ValueError, z.sort, selfmodifyingComparison)
+
+        self.assertRaises(TypeError, z.sort, lambda x, y: 's')
+
+        self.assertRaises(TypeError, z.sort, 42, 42, 42, 42)
+
+    def test_slice(self):
+        u = self.type2test("spam")
+        u[:2] = "h"
+        self.assertEqual(u, list("ham"))
+
+    def test_iadd(self):
+        super(CommonTest, self).test_iadd()
+        u = self.type2test([0, 1])
+        u2 = u
+        u += [2, 3]
+        self.assert_(u is u2)
+
+        u = self.type2test("spam")
+        u += "eggs"
+        self.assertEqual(u, self.type2test("spameggs"))
+
+        self.assertRaises(TypeError, u.__iadd__, None)
+
+    def test_imul(self):
+        u = self.type2test([0, 1])
+        u *= 3
+        self.assertEqual(u, self.type2test([0, 1, 0, 1, 0, 1]))
+        u *= 0
+        self.assertEqual(u, self.type2test([]))
+        s = self.type2test([])
+        oldid = id(s)
+        s *= 10
+        self.assertEqual(id(s), oldid)
+
+    def test_extendedslicing(self):
+        #  subscript
+        a = self.type2test([0,1,2,3,4])
+
+        #  deletion
+        del a[::2]
+        self.assertEqual(a, self.type2test([1,3]))
+        a = self.type2test(range(5))
+        del a[1::2]
+        self.assertEqual(a, self.type2test([0,2,4]))
+        a = self.type2test(range(5))
+        del a[1::-2]
+        self.assertEqual(a, self.type2test([0,2,3,4]))
+        a = self.type2test(range(10))
+        del a[::1000]
+        self.assertEqual(a, self.type2test([1, 2, 3, 4, 5, 6, 7, 8, 9]))
+        #  assignment
+        a = self.type2test(range(10))
+        a[::2] = [-1]*5
+        self.assertEqual(a, self.type2test([-1, 1, -1, 3, -1, 5, -1, 7, -1, 9]))
+        a = self.type2test(range(10))
+        a[::-4] = [10]*3
+        self.assertEqual(a, self.type2test([0, 10, 2, 3, 4, 10, 6, 7, 8 ,10]))
+        a = self.type2test(range(4))
+        a[::-1] = a
+        self.assertEqual(a, self.type2test([3, 2, 1, 0]))
+        a = self.type2test(range(10))
+        b = a[:]
+        c = a[:]
+        a[2:3] = self.type2test(["two", "elements"])
+        b[slice(2,3)] = self.type2test(["two", "elements"])
+        c[2:3:] = self.type2test(["two", "elements"])
+        self.assertEqual(a, b)
+        self.assertEqual(a, c)
+        a = self.type2test(range(10))
+        a[::2] = tuple(range(5))
+        self.assertEqual(a, self.type2test([0, 1, 1, 3, 2, 5, 3, 7, 4, 9]))
+
+    def test_constructor_exception_handling(self):
+        # Bug #1242657
+        class F(object):
+            def __iter__(self):
+                yield 23
+            def __len__(self):
+                raise KeyboardInterrupt
+        self.assertRaises(KeyboardInterrupt, list, F())


Property changes on: trunk/jython/Lib/test/list_tests.py
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/jython/Lib/test/seq_tests.py
===================================================================
--- trunk/jython/Lib/test/seq_tests.py	                        (rev 0)
+++ trunk/jython/Lib/test/seq_tests.py	2007-08-31 05:23:25 UTC (rev 3459)
@@ -0,0 +1,207 @@
+# From Python 2.4.4
+"""
+Tests common to tuple, list and UserList.UserList
+"""
+
+import unittest
+from test import test_support
+
+class CommonTest(unittest.TestCase):
+    # The type to be tested
+    type2test = None
+
+    def test_constructors(self):
+        l0 = []
+        l1 = [0]
+        l2 = [0, 1]
+
+        u = self.type2test()
+        u0 = self.type2test(l0)
+        u1 = self.type2test(l1)
+        u2 = self.type2test(l2)
+
+        uu = self.type2test(u)
+        uu0 = self.type2test(u0)
+        uu1 = self.type2test(u1)
+        uu2 = self.type2test(u2)
+
+        v = self.type2test(tuple(u))
+        class OtherSeq:
+            def __init__(self, initseq):
+                self.__data = initseq
+            def __len__(self):
+                return len(self.__data)
+            def __getitem__(self, i):
+                return self.__data[i]
+        s = OtherSeq(u0)
+        v0 = self.type2test(s)
+        self.assertEqual(len(v0), len(s))
+
+        s = "this is also a sequence"
+        vv = self.type2test(s)
+        self.assertEqual(len(vv), len(s))
+
+    def test_truth(self):
+        self.assert_(not self.type2test())
+        self.assert_(self.type2test([42]))
+
+    def test_getitem(self):
+        u = self.type2test([0, 1, 2, 3, 4])
+        for i in xrange(len(u)):
+            self.assertEqual(u[i], i)
+            self.assertEqual(u[long(i)], i)
+        for i in xrange(-len(u), -1):
+            self.assertEqual(u[i], len(u)+i)
+            self.assertEqual(u[long(i)], len(u)+i)
+        self.assertRaises(IndexError, u.__getitem__, -len(u)-1)
+        self.assertRaises(IndexError, u.__getitem__, len(u))
+        self.assertRaises(ValueError, u.__getitem__, slice(0,10,0))
+
+        u = self.type2test()
+        self.assertRaises(IndexError, u.__getitem__, 0)
+        self.assertRaises(IndexError, u.__getitem__, -1)
+
+        self.assertRaises(TypeError, u.__getitem__)
+
+        a = self.type2test([10, 11])
+        self.assertEqual(a[0], 10)
+        self.assertEqual(a[1], 11)
+        self.assertEqual(a[-2], 10)
+        self.assertEqual(a[-1], 11)
+        self.assertRaises(IndexError, a.__getitem__, -3)
+        self.assertRaises(IndexError, a.__getitem__, 3)
+
+    def test_getslice(self):
+        l = [0, 1, 2, 3, 4]
+        u = self.type2test(l)
+
+        self.assertEqual(u[0:0], self.type2test())
+        self.assertEqual(u[1:2], self.type2test([1]))
+        self.assertEqual(u[-2:-1], self.type2test([3]))
+        self.assertEqual(u[-1000:1000], u)
+        self.assertEqual(u[1000:-1000], self.type2test([]))
+        self.assertEqual(u[:], u)
+        self.assertEqual(u[1:None], self.type2test([1, 2, 3, 4]))
+        self.assertEqual(u[None:3], self.type2test([0, 1, 2]))
+
+        # Extended slices
+        self.assertEqual(u[::], u)
+        self.assertEqual(u[::2], self.type2test([0, 2, 4]))
+        self.assertEqual(u[1::2], self.type2test([1, 3]))
+        self.assertEqual(u[::-1], self.type2test([4, 3, 2, 1, 0]))
+        self.assertEqual(u[::-2], self.type2test([4, 2, 0]))
+        self.assertEqual(u[3::-2], self.type2test([3, 1]))
+        self.assertEqual(u[3:3:-2], self.type2test([]))
+        self.assertEqual(u[3:2:-2], self.type2test([3]))
+        self.assertEqual(u[3:1:-2], self.type2test([3]))
+        self.assertEqual(u[3:0:-2], self.type2test([3, 1]))
+        self.assertEqual(u[::-100], self.type2test([4]))
+        self.assertEqual(u[100:-100:], self.type2test([]))
+        self.assertEqual(u[-100:100:], u)
+        self.assertEqual(u[100:-100:-1], u[::-1])
+        self.assertEqual(u[-100:100:-1], self.type2test([]))
+        self.assertEqual(u[-100L:100L:2L], self.type2test([0, 2, 4]))
+
+        # Test extreme cases with long ints
+        a = self.type2test([0,1,2,3,4])
+        self.assertEqual(a[ -pow(2,128L): 3 ], self.type2test([0,1,2]))
+        self.assertEqual(a[ 3: pow(2,145L) ], self.type2test([3,4]))
+
+        self.assertRaises(TypeError, u.__getslice__)
+
+    def test_contains(self):
+        u = self.type2test([0, 1, 2])
+        for i in u:
+            self.assert_(i in u)
+        for i in min(u)-1, max(u)+1:
+            self.assert_(i not in u)
+
+        self.assertRaises(TypeError, u.__contains__)
+
+    def test_len(self):
+        self.assertEqual(len(self.type2test()), 0)
+        self.assertEqual(len(self.type2test([])), 0)
+        self.assertEqual(len(self.type2test([0])), 1)
+        self.assertEqual(len(self.type2test([0, 1, 2])), 3)
+
+    def test_minmax(self):
+        u = self.type2test([0, 1, 2])
+        self.assertEqual(min(u), 0)
+        self.assertEqual(max(u), 2)
+
+    def test_addmul(self):
+        u1 = self.type2test([0])
+        u2 = self.type2test([0, 1])
+        self.assertEqual(u1, u1 + self.type2test())
+        self.assertEqual(u1, self.type2test() + u1)
+        self.assertEqual(u1 + self.type2test([1]), u2)
+        self.assertEqual(self.type2test([-1]) + u1, self.type2test([-1, 0]))
+        self.assertEqual(self.type2test(), u2*0)
+        self.assertEqual(self.type2test(), 0*u2)
+        self.assertEqual(self.type2test(), u2*0L)
+        self.assertEqual(self.type2test(), 0L*u2)
+        self.assertEqual(u2, u2*1)
+        self.assertEqual(u2, 1*u2)
+        self.assertEqual(u2, u2*1L)
+        self.assertEqual(u2, 1L*u2)
+        self.assertEqual(u2+u2, u2*2)
+        self.assertEqual(u2+u2, 2*u2)
+        self.assertEqual(u2+u2, u2*2L)
+        self.assertEqual(u2+u2, 2L*u2)
+        self.assertEqual(u2+u2+u2, u2*3)
+        self.assertEqual(u2+u2+u2, 3*u2)
+
+        class subclass(self.type2test):
+            pass
+        u3 = subclass([0, 1])
+        self.assertEqual(u3, u3*1)
+        self.assert_(u3 is not u3*1)
+
+    def test_iadd(self):
+        u = self.type2test([0, 1])
+        u += self.type2test()
+        self.assertEqual(u, self.type2test([0, 1]))
+        u += self.type2test([2, 3])
+        self.assertEqual(u, self.type2test([0, 1, 2, 3]))
+        u += self.type2test([4, 5])
+        self.assertEqual(u, self.type2test([0, 1, 2, 3, 4, 5]))
+
+        u = self.type2test("spam")
+        u += self.type2test("eggs")
+        self.assertEqual(u, self.type2test("spameggs"))
+
+    def test_imul(self):
+        u = self.type2test([0, 1])
+        u *= 3
+        self.assertEqual(u, self.type2test([0, 1, 0, 1, 0, 1]))
+
+    def test_getitemoverwriteiter(self):
+        # Verify that __getitem__ overrides are not recognized by __iter__
+        class T(self.type2test):
+            def __getitem__(self, key):
+                return str(key) + '!!!'
+        self.assertEqual(iter(T((1,2))).next(), 1)
+
+    def test_repeat(self):
+        for m in xrange(4):
+            s = tuple(range(m))
+            for n in xrange(-3, 5):
+                self.assertEqual(self.type2test(s*n), self.type2test(s)*n)
+            self.assertEqual(self.type2test(s)*(-4), self.type2test([]))
+            self.assertEqual(id(s), id(s*1))
+
+    def test_subscript(self):
+        a = self.type2test([10, 11])
+        self.assertEqual(a.__getitem__(0L), 10)
+        self.assertEqual(a.__getitem__(1L), 11)
+        self.assertEqual(a.__getitem__(-2L), 10)
+        self.assertEqual(a.__getitem__(-1L), 11)
+        self.assertRaises(IndexError, a.__getitem__, -3)
+        self.assertRaises(IndexError, a.__getitem__, 3)
+        self.assertEqual(a.__getitem__(slice(0,1)), self.type2test([10]))
+        self.assertEqual(a.__getitem__(slice(1,2)), self.type2test([11]))
+        self.assertEqual(a.__getitem__(slice(0,2)), self.type2test([10, 11]))
+        self.assertEqual(a.__getitem__(slice(0,3)), self.type2test([10, 11]))
+        self.assertEqual(a.__getitem__(slice(3,5)), self.type2test([]))
+        self.assertRaises(ValueError, a.__getitem__, slice(0, 10, 0))
+        self.assertRaises(TypeError, a.__getitem__, 'x')

Added: trunk/jython/Lib/test/test_list.py
===================================================================
--- trunk/jython/Lib/test/test_list.py	                        (rev 0)
+++ trunk/jython/Lib/test/test_list.py	2007-08-31 05:23:25 UTC (rev 3459)
@@ -0,0 +1,38 @@
+# From Python 2.4.4
+import unittest
+from test import test_support, list_tests
+
+class ListTest(list_tests.CommonTest):
+    type2test = list
+
+    def test_truth(self):
+        super(ListTest, self).test_truth()
+        self.assert_(not [])
+        self.assert_([42])
+
+    def test_identity(self):
+        self.assert_([] is not [])
+
+    def test_len(self):
+        super(ListTest, self).test_len()
+        self.assertEqual(len([]), 0)
+        self.assertEqual(len([0]), 1)
+        self.assertEqual(len([0, 1, 2]), 3)
+
+def test_main(verbose=None):
+    test_support.run_unittest(ListTest)
+
+    # verify reference counting
+    import sys
+    if verbose and hasattr(sys, "gettotalrefcount"):
+        import gc
+        counts = [None] * 5
+        for i in xrange(len(counts)):
+            test_support.run_unittest(ListTest)
+            gc.collect()
+            counts[i] = sys.gettotalrefcount()
+        print counts
+
+
+if __name__ == "__main__":
+    test_main(verbose=True)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3865
          http://jython.svn.sourceforge.net/jython/?rev=3865&view=rev
Author:   pjenvey
Date:     2007-12-24 20:32:59 -0800 (Mon, 24 Dec 2007)

Log Message:
-----------
fix test_tarfile failing only in the regrtest:
o always use the tempdir, even when testtar is a relative path (it is when ran
via the regrtest)
o fix the tarname() path, it was including unneeded subdirs that broke os.mkdir

Modified Paths:
--------------
    trunk/jython/Lib/test/regrtest.py
    trunk/jython/Lib/test/test_tarfile.py

Modified: trunk/jython/Lib/test/regrtest.py
===================================================================
--- trunk/jython/Lib/test/regrtest.py	2007-12-25 01:31:13 UTC (rev 3864)
+++ trunk/jython/Lib/test/regrtest.py	2007-12-25 04:32:59 UTC (rev 3865)
@@ -1008,7 +1008,6 @@
         test_sunaudiodev
         test_sundry
         test_symtable
-        test_tarfile
         test_timeout
         test_timing
         test_unicode_file

Modified: trunk/jython/Lib/test/test_tarfile.py
===================================================================
--- trunk/jython/Lib/test/test_tarfile.py	2007-12-25 01:31:13 UTC (rev 3864)
+++ trunk/jython/Lib/test/test_tarfile.py	2007-12-25 04:32:59 UTC (rev 3865)
@@ -9,6 +9,9 @@
 
 from test import test_support
 
+# From CPython 2.5.1, with a change to tarname() to use the correct
+# tempdir when the testtar path name is relative (due to regrtest)
+
 # Check for our compression modules.
 try:
     import gzip
@@ -23,7 +26,8 @@
 def path(path):
     return test_support.findfile(path)
 
-testtar = path("testtar.tar")
+tarname = "testtar.tar"
+testtar = path(tarname)
 tempdir = os.path.join(tempfile.gettempdir(), "testtar" + os.extsep + "dir")
 tempname = test_support.TESTFN
 membercount = 12
@@ -31,7 +35,7 @@
 def tarname(comp=""):
     if not comp:
         return testtar
-    return os.path.join(tempdir, "%s%s%s" % (testtar, os.extsep, comp))
+    return os.path.join(dirname(), "%s%s%s" % (tarname, os.extsep, comp))
 
 def dirname():
     if not os.path.exists(tempdir):


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3936
          http://jython.svn.sourceforge.net/jython/?rev=3936&view=rev
Author:   cgroves
Date:     2007-12-31 22:15:47 -0800 (Mon, 31 Dec 2007)

Log Message:
-----------
Delightfully we no longer need this jython specific test since we have sys.executable, so we get a jython specific version in our Lib

Modified Paths:
--------------
    trunk/jython/Lib/test/regrtest.py
    trunk/jython/Lib/test/test_atexit.py

Modified: trunk/jython/Lib/test/regrtest.py
===================================================================
--- trunk/jython/Lib/test/regrtest.py	2008-01-01 06:15:03 UTC (rev 3935)
+++ trunk/jython/Lib/test/regrtest.py	2008-01-01 06:15:47 UTC (rev 3936)
@@ -1025,7 +1025,6 @@
     'java':
     '''
     test___all__
-    test_atexit
     test_class
     test_copy
     test_cpickle

Modified: trunk/jython/Lib/test/test_atexit.py
===================================================================
--- trunk/jython/Lib/test/test_atexit.py	2008-01-01 06:15:03 UTC (rev 3935)
+++ trunk/jython/Lib/test/test_atexit.py	2008-01-01 06:15:47 UTC (rev 3936)
@@ -5,8 +5,6 @@
 import sys
 
 executable = sys.executable
-if is_jython:
-    executable = "jython"
 
 input = """\
 import atexit


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3938
          http://jython.svn.sourceforge.net/jython/?rev=3938&view=rev
Author:   cgroves
Date:     2007-12-31 22:20:20 -0800 (Mon, 31 Dec 2007)

Log Message:
-----------
It doesn't really matter that fileno is an int

Modified Paths:
--------------
    trunk/jython/Lib/test/regrtest.py
    trunk/jython/Lib/test/test_urllib.py

Modified: trunk/jython/Lib/test/regrtest.py
===================================================================
--- trunk/jython/Lib/test/regrtest.py	2008-01-01 06:19:23 UTC (rev 3937)
+++ trunk/jython/Lib/test/regrtest.py	2008-01-01 06:20:20 UTC (rev 3938)
@@ -1051,7 +1051,6 @@
     test_trace
     test_ucn
     test_unicode
-    test_urllib
     test_xpickle
     test_zipimport
     ''',

Modified: trunk/jython/Lib/test/test_urllib.py
===================================================================
--- trunk/jython/Lib/test/test_urllib.py	2008-01-01 06:19:23 UTC (rev 3937)
+++ trunk/jython/Lib/test/test_urllib.py	2008-01-01 06:20:20 UTC (rev 3938)
@@ -63,8 +63,6 @@
 
     def test_fileno(self):
         file_num = self.returned_obj.fileno()
-        self.assert_(isinstance(file_num, int),
-                     "fileno() did not return an int")
         self.assertEqual(os.read(file_num, len(self.text)), self.text,
                          "Reading on the file descriptor returned by fileno() "
                          "did not return the expected text")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4087
          http://jython.svn.sourceforge.net/jython/?rev=4087&view=rev
Author:   pjenvey
Date:     2008-01-26 11:07:20 -0800 (Sat, 26 Jan 2008)

Log Message:
-----------
mehendran's sort patches fixed these modifying comparison tests

Modified Paths:
--------------
    trunk/jython/Lib/test/list_tests.py
    trunk/jython/Lib/test/test_types.py

Modified: trunk/jython/Lib/test/list_tests.py
===================================================================
--- trunk/jython/Lib/test/list_tests.py	2008-01-26 19:01:28 UTC (rev 4086)
+++ trunk/jython/Lib/test/list_tests.py	2008-01-26 19:07:20 UTC (rev 4087)
@@ -427,8 +427,7 @@
         def selfmodifyingComparison(x,y):
             z.append(1)
             return cmp(x, y)
-        # XXX: Jython bug #1785366
-        #self.assertRaises(ValueError, z.sort, selfmodifyingComparison)
+        self.assertRaises(ValueError, z.sort, selfmodifyingComparison)
 
         self.assertRaises(TypeError, z.sort, lambda x, y: 's')
 

Modified: trunk/jython/Lib/test/test_types.py
===================================================================
--- trunk/jython/Lib/test/test_types.py	2008-01-26 19:01:28 UTC (rev 4086)
+++ trunk/jython/Lib/test/test_types.py	2008-01-26 19:07:20 UTC (rev 4087)
@@ -419,13 +419,12 @@
 except TypeError: pass
 else: raise TestFailed, 'list sort compare function is not callable'
 
-#XXX need a strategy for locking list during sort.
-#def selfmodifyingComparison(x,y):
-#    z.append(1)
-#    return cmp(x, y)
-#try: z.sort(selfmodifyingComparison)
-#except ValueError: pass
-#else: raise TestFailed, 'modifying list during sort'
+def selfmodifyingComparison(x,y):
+    z.append(1)
+    return cmp(x, y)
+try: z.sort(selfmodifyingComparison)
+except ValueError: pass
+else: raise TestFailed, 'modifying list during sort'
 
 try: z.sort(lambda x, y: 's')
 except TypeError: pass


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4338
          http://jython.svn.sourceforge.net/jython/?rev=4338&view=rev
Author:   pjenvey
Date:     2008-04-12 17:11:50 -0700 (Sat, 12 Apr 2008)

Log Message:
-----------
test_types_jy is testing classes not just types, rename to test_class_jy

Added Paths:
-----------
    trunk/jython/Lib/test/test_class_jy.py

Removed Paths:
-------------
    trunk/jython/Lib/test/test_types_jy.py

Copied: trunk/jython/Lib/test/test_class_jy.py (from rev 4332, trunk/jython/Lib/test/test_types_jy.py)
===================================================================
--- trunk/jython/Lib/test/test_class_jy.py	                        (rev 0)
+++ trunk/jython/Lib/test/test_class_jy.py	2008-04-13 00:11:50 UTC (rev 4338)
@@ -0,0 +1,173 @@
+"""Misc. class tests. These are more general class tests than CPython's
+test_class which focuses on operators.
+
+Made for Jython
+"""
+import __builtin__
+import unittest
+from test import test_support
+
+class TypesGeneralTestCase(unittest.TestCase):
+
+    TE_MSG = "can't set attributes of built-in/extension type 'str'"
+
+    def test_dunder_module(self):
+        self.assertEqual(str.__module__, '__builtin__')
+        class Foo:
+            pass
+        self.assertEqual(Foo.__module__, __name__)
+        self.assertEqual(str(Foo), '%s.Foo' % __name__)
+        self.assert_(repr(Foo).startswith('<class %s.Foo at' % __name__))
+        foo = Foo()
+        self.assert_(str(foo).startswith('<%s.Foo instance at' % __name__))
+
+        class Bar(object):
+            pass
+        self.assertEqual(Bar.__module__, __name__)
+        self.assertEqual(str(Bar), "<class '%s.Bar'>" % __name__)
+        self.assertEqual(repr(Bar), "<class '%s.Bar'>" % __name__)
+        bar = Bar()
+        self.assert_(str(bar).startswith('<%s.Bar object at' % __name__))
+
+
+    def test_builtin_attributes(self):
+        for attr, val in dict(__name__='foo', __module__='bar', __dict__={},
+                              __flags__=1, __base__=object,
+                              __bases__=(unicode, object),
+                              __mro__=(unicode, object)).iteritems():
+            try:
+                setattr(str, attr, val)
+            except TypeError, te:
+                self.assertEqual(str(te), self.TE_MSG)
+            else:
+                self.assert_(False,
+                             'setattr str.%s expected a TypeError' % attr)
+            try:
+                delattr(str, attr)
+            except TypeError, te:
+                self.assertEqual(str(te), self.TE_MSG)
+            else:
+                self.assert_(False,
+                             'delattr str.%s expected a TypeError' % attr)
+
+
+    def test_attributes(self):
+        class Foo(object):
+            pass
+
+        Foo.__name__ = 'Bar'
+        self.assertEqual(Foo.__name__, 'Bar')
+        try:
+            del Foo.__name__
+        except TypeError, te:
+            self.assertEqual(str(te), "can't delete Bar.__name__")
+        else:
+            self.assert_(False, 'Expected a TypeError')
+
+        Foo.__module__ = 'baz'
+        self.assertEqual(Foo.__module__, 'baz')
+        try:
+            del Foo.__module__
+        except TypeError, te:
+            self.assertEqual(str(te), "can't delete Bar.__module__")
+        else:
+            self.assert_(False, 'Expected a TypeError')
+
+        try:
+            Foo.__dict__ = {}
+        except AttributeError, ae:
+            self.assertEqual(str(ae),
+                             "attribute '__dict__' of 'type' objects is not "
+                             "writable")
+        else:
+            self.assert_(False, 'Expected an AttributeError')
+        try:
+            del Foo.__dict__
+        except AttributeError, ae:
+            self.assertEqual(str(ae),
+                             "attribute '__dict__' of 'type' objects is not "
+                             "writable")
+        else:
+            self.assert_(False, 'Expected an AttributeError')
+
+        for attr, val in dict(__flags__=1, __base__=object,
+                              __bases__=(unicode, object),
+                              __mro__=(unicode, object)).iteritems():
+            try:
+                setattr(str, attr, val)
+            except TypeError, te:
+                self.assertEqual(str(te), self.TE_MSG)
+            else:
+                self.assert_(False,
+                             'setattr Foo.%s expected a TypeError' % attr)
+            try:
+                delattr(str, attr)
+            except TypeError, te:
+                self.assertEqual(str(te), self.TE_MSG)
+            else:
+                self.assert_(False,
+                             'delattr Foo.%s expected a TypeError' % attr)
+
+
+class TypesNamelessModuleTestCase(unittest.TestCase):
+
+    def setUp(self):
+        global __name__
+        self.name = __name__
+        del __name__
+
+    def tearDown(self):
+        global __name__
+        __name__ = self.name
+
+    def test_nameless_module(self):
+        class Foo:
+            pass
+        self.assertEqual(Foo.__module__, '__builtin__')
+        self.assertEqual(str(Foo), '__builtin__.Foo')
+        self.assert_(repr(Foo).startswith('<class __builtin__.Foo at'))
+        foo = Foo()
+        self.assert_(str(foo).startswith('<__builtin__.Foo instance at'))
+
+        class Bar(object):
+            pass
+        self.assertEqual(Bar.__module__, '__builtin__')
+        self.assertEqual(str(Bar), "<class 'Bar'>")
+        self.assertEqual(repr(Bar), "<class 'Bar'>")
+        bar = Bar()
+        self.assert_(str(bar).startswith('<Bar '))
+        self.assert_(repr(bar).startswith('<Bar object at'))
+
+
+class BrokenNameTestCase(unittest.TestCase):
+
+    def setUp(self):
+        global __name__
+        self.name = __name__
+        self.builtin_name = __builtin__.__name__
+        del __name__
+        del __builtin__.__name__
+
+    def tearDown(self):
+        global __name__
+        __builtin__.__name__ = self.builtin_name
+        __name__ = self.name
+
+    def test_broken_name(self):
+        try:
+            class Foobar:
+                pass
+        except NameError:
+            pass
+        else:
+            self.assert_(False, "Expected a NameError")
+
+
+def test_main():
+    test_support.run_unittest(TypesGeneralTestCase,
+                              TypesNamelessModuleTestCase,
+                              BrokenNameTestCase)
+
+
+if __name__ == "__main__":
+    test_main()

Deleted: trunk/jython/Lib/test/test_types_jy.py
===================================================================
--- trunk/jython/Lib/test/test_types_jy.py	2008-04-12 21:51:42 UTC (rev 4337)
+++ trunk/jython/Lib/test/test_types_jy.py	2008-04-13 00:11:50 UTC (rev 4338)
@@ -1,172 +0,0 @@
-"""Misc. type tests (and some old style class tests too).
-
-Made for Jython
-"""
-import __builtin__
-import unittest
-from test import test_support
-
-class TypesGeneralTestCase(unittest.TestCase):
-
-    TE_MSG = "can't set attributes of built-in/extension type 'str'"
-
-    def test_dunder_module(self):
-        self.assertEqual(str.__module__, '__builtin__')
-        class Foo:
-            pass
-        self.assertEqual(Foo.__module__, __name__)
-        self.assertEqual(str(Foo), '%s.Foo' % __name__)
-        self.assert_(repr(Foo).startswith('<class %s.Foo at' % __name__))
-        foo = Foo()
-        self.assert_(str(foo).startswith('<%s.Foo instance at' % __name__))
-
-        class Bar(object):
-            pass
-        self.assertEqual(Bar.__module__, __name__)
-        self.assertEqual(str(Bar), "<class '%s.Bar'>" % __name__)
-        self.assertEqual(repr(Bar), "<class '%s.Bar'>" % __name__)
-        bar = Bar()
-        self.assert_(str(bar).startswith('<%s.Bar object at' % __name__))
-
-
-    def test_builtin_attributes(self):
-        for attr, val in dict(__name__='foo', __module__='bar', __dict__={},
-                              __flags__=1, __base__=object,
-                              __bases__=(unicode, object),
-                              __mro__=(unicode, object)).iteritems():
-            try:
-                setattr(str, attr, val)
-            except TypeError, te:
-                self.assertEqual(str(te), self.TE_MSG)
-            else:
-                self.assert_(False,
-                             'setattr str.%s expected a TypeError' % attr)
-            try:
-                delattr(str, attr)
-            except TypeError, te:
-                self.assertEqual(str(te), self.TE_MSG)
-            else:
-                self.assert_(False,
-                             'delattr str.%s expected a TypeError' % attr)
-
-
-    def test_attributes(self):
-        class Foo(object):
-            pass
-
-        Foo.__name__ = 'Bar'
-        self.assertEqual(Foo.__name__, 'Bar')
-        try:
-            del Foo.__name__
-        except TypeError, te:
-            self.assertEqual(str(te), "can't delete Bar.__name__")
-        else:
-            self.assert_(False, 'Expected a TypeError')
-
-        Foo.__module__ = 'baz'
-        self.assertEqual(Foo.__module__, 'baz')
-        try:
-            del Foo.__module__
-        except TypeError, te:
-            self.assertEqual(str(te), "can't delete Bar.__module__")
-        else:
-            self.assert_(False, 'Expected a TypeError')
-
-        try:
-            Foo.__dict__ = {}
-        except AttributeError, ae:
-            self.assertEqual(str(ae),
-                             "attribute '__dict__' of 'type' objects is not "
-                             "writable")
-        else:
-            self.assert_(False, 'Expected an AttributeError')
-        try:
-            del Foo.__dict__
-        except AttributeError, ae:
-            self.assertEqual(str(ae),
-                             "attribute '__dict__' of 'type' objects is not "
-                             "writable")
-        else:
-            self.assert_(False, 'Expected an AttributeError')
-
-        for attr, val in dict(__flags__=1, __base__=object,
-                              __bases__=(unicode, object),
-                              __mro__=(unicode, object)).iteritems():
-            try:
-                setattr(str, attr, val)
-            except TypeError, te:
-                self.assertEqual(str(te), self.TE_MSG)
-            else:
-                self.assert_(False,
-                             'setattr Foo.%s expected a TypeError' % attr)
-            try:
-                delattr(str, attr)
-            except TypeError, te:
-                self.assertEqual(str(te), self.TE_MSG)
-            else:
-                self.assert_(False,
-                             'delattr Foo.%s expected a TypeError' % attr)
-
-
-class TypesNamelessModuleTestCase(unittest.TestCase):
-
-    def setUp(self):
-        global __name__
-        self.name = __name__
-        del __name__
-
-    def tearDown(self):
-        global __name__
-        __name__ = self.name
-
-    def test_nameless_module(self):
-        class Foo:
-            pass
-        self.assertEqual(Foo.__module__, '__builtin__')
-        self.assertEqual(str(Foo), '__builtin__.Foo')
-        self.assert_(repr(Foo).startswith('<class __builtin__.Foo at'))
-        foo = Foo()
-        self.assert_(str(foo).startswith('<__builtin__.Foo instance at'))
-
-        class Bar(object):
-            pass
-        self.assertEqual(Bar.__module__, '__builtin__')
-        self.assertEqual(str(Bar), "<class 'Bar'>")
-        self.assertEqual(repr(Bar), "<class 'Bar'>")
-        bar = Bar()
-        self.assert_(str(bar).startswith('<Bar '))
-        self.assert_(repr(bar).startswith('<Bar object at'))
-
-
-class BrokenNameTestCase(unittest.TestCase):
-
-    def setUp(self):
-        global __name__
-        self.name = __name__
-        self.builtin_name = __builtin__.__name__
-        del __name__
-        del __builtin__.__name__
-
-    def tearDown(self):
-        global __name__
-        __builtin__.__name__ = self.builtin_name
-        __name__ = self.name
-
-    def test_broken_name(self):
-        try:
-            class Foobar:
-                pass
-        except NameError:
-            pass
-        else:
-            self.assert_(False, "Expected a NameError")
-
-
-def test_main():
-    test_support.run_unittest(TypesGeneralTestCase,
-                              TypesNamelessModuleTestCase,
-                              BrokenNameTestCase)
-
-
-if __name__ == "__main__":
-    test_main()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4489
          http://jython.svn.sourceforge.net/jython/?rev=4489&view=rev
Author:   pjenvey
Date:     2008-05-29 22:54:28 -0700 (Thu, 29 May 2008)

Log Message:
-----------
add a subprocess resource that's skipped by default (test_subprocess and a few
tests in test_chdir), because they take a long time

Modified Paths:
--------------
    trunk/jython/Lib/test/regrtest.py
    trunk/jython/Lib/test/test_chdir.py
    trunk/jython/Lib/test/test_subprocess.py

Modified: trunk/jython/Lib/test/regrtest.py
===================================================================
--- trunk/jython/Lib/test/regrtest.py	2008-05-30 05:50:34 UTC (rev 4488)
+++ trunk/jython/Lib/test/regrtest.py	2008-05-30 05:54:28 UTC (rev 4489)
@@ -44,6 +44,9 @@
     network -   It is okay to run tests that use external network
                 resource, e.g. testing SSL support for sockets.
 
+    subprocess  Run tests that invoke subprocesses, in particular
+                test_subprocess.
+
 To enable all resources except one, use '-uall,-<resource>'.  For
 example, to run all the tests except for the network tests, give the
 option '-uall,-network'.
@@ -179,7 +182,7 @@
 
 
 
-RESOURCE_NAMES = ['curses', 'largefile', 'network']
+RESOURCE_NAMES = ['curses', 'largefile', 'network', 'subprocess']
 
 
 def usage(code, msg=''):

Modified: trunk/jython/Lib/test/test_chdir.py
===================================================================
--- trunk/jython/Lib/test/test_chdir.py	2008-05-30 05:50:34 UTC (rev 4488)
+++ trunk/jython/Lib/test/test_chdir.py	2008-05-30 05:54:28 UTC (rev 4489)
@@ -685,7 +685,6 @@
              ImportPackageTestCase,
              ZipimportTestCase,
              PyCompileTestCase,
-             SubprocessTestCase,
              ExecfileTestCase,
              ExecfileTracebackTestCase,
              ListdirTestCase,
@@ -694,6 +693,8 @@
     if sys.platform.startswith('java'):
         tests.extend((ImportJavaClassTestCase,
                       ImportJarTestCase))
+    if test_support.is_resource_enabled('subprocess'):
+        tests.append(SubprocessTestCase)
     if WINDOWS:
         tests.append(WindowsChdirTestCase)
     test_support.run_unittest(*tests)

Modified: trunk/jython/Lib/test/test_subprocess.py
===================================================================
--- trunk/jython/Lib/test/test_subprocess.py	2008-05-30 05:50:34 UTC (rev 4488)
+++ trunk/jython/Lib/test/test_subprocess.py	2008-05-30 05:54:28 UTC (rev 4489)
@@ -410,14 +410,12 @@
     def test_no_leaking(self):
         # Make sure we leak no resources
         if not hasattr(test_support, "is_resource_enabled") \
-               or test_support.is_resource_enabled("subprocess") and \
-               not mswindows:
-            # 1026 is too much for most UNIX systems
-            max_handles = jython and 65 or 1026
-        elif jython:
-            # Spawning java processes takes a long time
-            return
+               or test_support.is_resource_enabled("subprocess") and not mswindows \
+               and not jython:
+            max_handles = 1026 # too much for most UNIX systems
         else:
+            # Settle for 65 on jython: spawning jython processes takes a
+            # long time
             max_handles = 65
         for i in range(max_handles):
             p = subprocess.Popen([sys.executable, "-c",
@@ -702,6 +700,8 @@
 
 
 def test_main():
+    # Spawning many new jython processes takes a long time
+    test_support.requires('subprocess')
     test_support.run_unittest(ProcessTestCase)
     if hasattr(test_support, "reap_children"):
         test_support.reap_children()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4503
          http://jython.svn.sourceforge.net/jython/?rev=4503&view=rev
Author:   pjenvey
Date:     2008-06-01 20:20:23 -0700 (Sun, 01 Jun 2008)

Log Message:
-----------
re-enable tests broken by #1758276 which was a while ago

Modified Paths:
--------------
    trunk/jython/Lib/test/test_bool.py
    trunk/jython/Lib/test/test_richcmp.py

Modified: trunk/jython/Lib/test/test_bool.py
===================================================================
--- trunk/jython/Lib/test/test_bool.py	2008-06-02 03:18:56 UTC (rev 4502)
+++ trunk/jython/Lib/test/test_bool.py	2008-06-02 03:20:23 UTC (rev 4503)
@@ -340,10 +340,6 @@
                 return self
         check(Baz())
 
-# Jython transition 2.3
-# boolean attribute returns int not bool
-# http://jython.org/bugs/1758276
-del BoolTest.test_fileclosed
 # StackOverflow if __nonzero__ returns self
 # http://jython.org/bugs/1758318
 del BoolTest.test_convert_to_bool

Modified: trunk/jython/Lib/test/test_richcmp.py
===================================================================
--- trunk/jython/Lib/test/test_richcmp.py	2008-06-02 03:18:56 UTC (rev 4502)
+++ trunk/jython/Lib/test/test_richcmp.py	2008-06-02 03:20:23 UTC (rev 4503)
@@ -351,11 +351,6 @@
         for op in opmap["lt"]:
             self.assertIs(op(x, y), True)
 
-# Jython transition 2.3
-# x = [42]
-# x < x returns 0 but it should return False
-# http://jython.org/bugs/1758276
-del ListTest.test_coverage
 # A circular implementation of __eq__ returns False instead of True
 # http://jython.org/bugs/1758280
 del MiscTest.test_recursion2


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4616
          http://jython.svn.sourceforge.net/jython/?rev=4616&view=rev
Author:   pjenvey
Date:     2008-06-13 15:30:01 -0700 (Fri, 13 Jun 2008)

Log Message:
-----------
move Jython's custom test_descr tests into test_descr_jy

Modified Paths:
--------------
    trunk/jython/Lib/test/test_descr.py
    trunk/jython/Lib/test/test_descr_jy.py

Modified: trunk/jython/Lib/test/test_descr.py
===================================================================
--- trunk/jython/Lib/test/test_descr.py	2008-06-13 19:43:46 UTC (rev 4615)
+++ trunk/jython/Lib/test/test_descr.py	2008-06-13 22:30:01 UTC (rev 4616)
@@ -479,18 +479,6 @@
         pass
     else:
         raise TestFailed, "should have raised OverflowError"
-    try:
-        foo = int(None)
-    except TypeError:
-        pass
-    else:
-        raise TestFailed, "should have raised TypeError"
-    try:
-        foo = C(None)
-    except TypeError:
-        pass
-    else:
-        raise TestFailed, "should have raised TypeError"
 
 def longs():
     if verbose: print "Testing long operations..."
@@ -2621,6 +2609,7 @@
     class Int(int): __slots__ = []
     cant(2, Int)
     cant(Int(), int)
+    cant(True, int)
     cant(2, bool)
     o = object()
     cant(o, type(1))
@@ -3691,55 +3680,6 @@
     vereq(E() // C(), "C.__floordiv__")
     vereq(C() // E(), "C.__floordiv__") # This one would fail
 
-def subclass_cmp_right_op():
-    if verbose:
-        print "Testing correct dispatch of subclass overloading for comp ops"
-
-    # Case 1: subclass of int
-
-    class B(int):
-        def __ge__(self, other):
-            return "B.__ge__"
-        def __le__(self, other):
-            return "B.__le__"
-
-    vereq(B(1) >= 1, "B.__ge__")
-    vereq(1 >= B(1), "B.__le__")
-
-    # Case 2: subclass of object
-
-    class C(object):
-        def __ge__(self, other):
-            return "C.__ge__"
-        def __le__(self, other):
-            return "C.__le__"
-
-    vereq(C() >= 1, "C.__ge__")
-    vereq(1 >= C(), "C.__le__")
-
-    # Case 3: subclass of new-style class; here it gets interesting
-
-    class D(C):
-        def __ge__(self, other):
-            return "D.__ge__"
-        def __le__(self, other):
-            return "D.__le__"
-
-    vereq(D() >= C(), "D.__ge__")
-    vereq(C() >= D(), "D.__le__")
-
-    # Case 4: comparison is different than other binops
-
-    class E(C):
-        pass
-
-    vereq(E.__le__, C.__le__)
-
-    vereq(E() >= 1, "C.__ge__")
-    vereq(1 >= E(), "C.__le__")
-    vereq(E() >= C(), "C.__ge__")
-    vereq(C() >= E(), "C.__le__") # different
-
 def dict_type_with_metaclass():
     if verbose:
         print "Testing type of __dict__ when __metaclass__ set..."
@@ -3909,71 +3849,6 @@
     except RuntimeError:
         pass
 
-def subclass_binop():
-    if verbose:
-        print "Testing binary ops with subclasses"
-
-    def raises(exc, expected, callable, *args):
-        try:
-            callable(*args)
-        except exc, msg:
-            if str(msg) != expected:
-                raise TestFailed, "Message %r, expected %r" % (str(msg),
-                                                               expected)
-        else:
-            raise TestFailed, "Expected %s" % exc
-
-    class B(object):
-        pass
-
-    class C(object):
-        def __radd__(self, o):
-            return '%r + C()' % (o,)
-
-        def __rmul__(self, o):
-            return '%r * C()' % (o,)
-
-    # Test strs, unicode, lists and tuples
-    mapping = []
-
-    # + binop
-    mapping.append((lambda o: 'foo' + o,
-                    TypeError, "cannot concatenate 'str' and 'B' objects",
-                    "'foo' + C()"))
-    # XXX: There's probably work to be done here besides just emulating this
-    # message
-    #mapping.append((lambda o: u'foo' + o,
-    #                TypeError,
-    #                'coercing to Unicode: need string or buffer, B found',
-    #                "u'foo' + C()"))
-    mapping.append((lambda o: u'foo' + o,
-                    TypeError, "cannot concatenate 'unicode' and 'B' objects",
-                    "u'foo' + C()"))
-    mapping.append((lambda o: [1, 2] + o,
-                    TypeError, 'can only concatenate list (not "B") to list',
-                    '[1, 2] + C()'))
-    mapping.append((lambda o: ('foo', 'bar') + o,
-                    TypeError, 'can only concatenate tuple (not "B") to tuple',
-                    "('foo', 'bar') + C()"))
-
-    # * binop
-    mapping.append((lambda o: 'foo' * o,
-                    TypeError, "can't multiply sequence by non-int of type 'B'",
-                    "'foo' * C()"))
-    mapping.append((lambda o: u'foo' * o,
-                    TypeError, "can't multiply sequence by non-int of type 'B'",
-                    "u'foo' * C()"))
-    mapping.append((lambda o: [1, 2] * o,
-                    TypeError, "can't multiply sequence by non-int of type 'B'",
-                    '[1, 2] * C()'))
-    mapping.append((lambda o: ('foo', 'bar') * o,
-                    TypeError, "can't multiply sequence by non-int of type 'B'",
-                    "('foo', 'bar') * C()"))
-
-    for func, bexc, bexc_msg, cresult in mapping:
-        raises(bexc, bexc_msg, lambda : func(B()))
-        vereq(func(C()), cresult)
-
 def test_main():
     testfuncs = [
     weakref_segfault, # Must be first, somehow
@@ -4056,14 +3931,12 @@
     test_mutable_bases_catch_mro_conflict,
     mutable_names,
     subclass_right_op,
-    subclass_cmp_right_op,
     dict_type_with_metaclass,
     meth_class_get,
     isinst_isclass,
     proxysuper,
     carloverre,
     filefault,
-    subclass_binop,
     ]
     if __name__ == '__main__':
         import sys

Modified: trunk/jython/Lib/test/test_descr_jy.py
===================================================================
--- trunk/jython/Lib/test/test_descr_jy.py	2008-06-13 19:43:46 UTC (rev 4615)
+++ trunk/jython/Lib/test/test_descr_jy.py	2008-06-13 22:30:01 UTC (rev 4616)
@@ -46,9 +46,136 @@
         self.assert_(isinstance(unbound, types.MethodType))
         self.assert_(unbound.im_self is None)
 
+    def test_ints(self):
+        class C(int):
+            pass
+        try:
+            foo = int(None)
+        except TypeError:
+            pass
+        else:
+            self.assert_(False, "should have raised TypeError")
+        try:
+            foo = C(None)
+        except TypeError:
+            pass
+        else:
+            self.assert_(False, "should have raised TypeError")
 
+class SubclassDescrTestCase(unittest.TestCase):
+
+    def test_subclass_cmp_right_op(self):
+        # Case 1: subclass of int
+
+        class B(int):
+            def __ge__(self, other):
+                return "B.__ge__"
+            def __le__(self, other):
+                return "B.__le__"
+
+        self.assertEqual(B(1) >= 1, "B.__ge__")
+        self.assertEqual(1 >= B(1), "B.__le__")
+
+        # Case 2: subclass of object
+
+        class C(object):
+            def __ge__(self, other):
+                return "C.__ge__"
+            def __le__(self, other):
+                return "C.__le__"
+
+        self.assertEqual(C() >= 1, "C.__ge__")
+        self.assertEqual(1 >= C(), "C.__le__")
+
+        # Case 3: subclass of new-style class; here it gets interesting
+
+        class D(C):
+            def __ge__(self, other):
+                return "D.__ge__"
+            def __le__(self, other):
+                return "D.__le__"
+
+        self.assertEqual(D() >= C(), "D.__ge__")
+        self.assertEqual(C() >= D(), "D.__le__")
+
+        # Case 4: comparison is different than other binops
+
+        class E(C):
+            pass
+
+        self.assertEqual(E.__le__, C.__le__)
+
+        self.assertEqual(E() >= 1, "C.__ge__")
+        self.assertEqual(1 >= E(), "C.__le__")
+        self.assertEqual(E() >= C(), "C.__ge__")
+        self.assertEqual(C() >= E(), "C.__le__") # different
+
+    def test_subclass_binop(self):
+        def raises(exc, expected, callable, *args):
+            try:
+                callable(*args)
+            except exc, msg:
+                if str(msg) != expected:
+                    self.assert_(False, "Message %r, expected %r" % (str(msg),
+                                                                     expected))
+            else:
+                self.assert_(False, "Expected %s" % exc)
+
+        class B(object):
+            pass
+
+        class C(object):
+            def __radd__(self, o):
+                return '%r + C()' % (o,)
+
+            def __rmul__(self, o):
+                return '%r * C()' % (o,)
+
+        # Test strs, unicode, lists and tuples
+        mapping = []
+        
+        # + binop
+        mapping.append((lambda o: 'foo' + o,
+                        TypeError, "cannot concatenate 'str' and 'B' objects",
+                        "'foo' + C()"))
+        # XXX: There's probably work to be done here besides just emulating this
+        # message
+        #mapping.append((lambda o: u'foo' + o,<>
+        #                TypeError,
+        #                'coercing to Unicode: need string or buffer, B found',
+        #                "u'foo' + C()"))
+        mapping.append((lambda o: u'foo' + o,
+                        TypeError, "cannot concatenate 'unicode' and 'B' objects",
+                        "u'foo' + C()"))
+        mapping.append((lambda o: [1, 2] + o,
+                        TypeError, 'can only concatenate list (not "B") to list',
+                        '[1, 2] + C()'))
+        mapping.append((lambda o: ('foo', 'bar') + o,
+                        TypeError, 'can only concatenate tuple (not "B") to tuple',
+                        "('foo', 'bar') + C()"))
+
+        # * binop
+        mapping.append((lambda o: 'foo' * o,
+                        TypeError, "can't multiply sequence by non-int of type 'B'",
+                        "'foo' * C()"))
+        mapping.append((lambda o: u'foo' * o,
+                        TypeError, "can't multiply sequence by non-int of type 'B'",
+                        "u'foo' * C()"))
+        mapping.append((lambda o: [1, 2] * o,
+                        TypeError, "can't multiply sequence by non-int of type 'B'",
+                        '[1, 2] * C()'))
+        mapping.append((lambda o: ('foo', 'bar') * o,
+                        TypeError, "can't multiply sequence by non-int of type 'B'",
+                        "('foo', 'bar') * C()"))
+
+        for func, bexc, bexc_msg, cresult in mapping:
+            raises(bexc, bexc_msg, lambda : func(B()))
+            self.assertEqual(func(C()), cresult)
+
+
 def test_main():
-    test_support.run_unittest(TestDescrTestCase)
+    test_support.run_unittest(TestDescrTestCase,
+                              SubclassDescrTestCase)
 
 if __name__ == '__main__':
     test_main()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4625
          http://jython.svn.sourceforge.net/jython/?rev=4625&view=rev
Author:   pjenvey
Date:     2008-06-14 14:19:39 -0700 (Sat, 14 Jun 2008)

Log Message:
-----------
we pass the stock test_pow now

Removed Paths:
-------------
    trunk/jython/Lib/test/output/test_pow
    trunk/jython/Lib/test/test_pow.py

Deleted: trunk/jython/Lib/test/output/test_pow
===================================================================
--- trunk/jython/Lib/test/output/test_pow	2008-06-14 20:25:11 UTC (rev 4624)
+++ trunk/jython/Lib/test/output/test_pow	2008-06-14 21:19:39 UTC (rev 4625)
@@ -1,17 +0,0 @@
-test_pow
-power (test_pow.py)
-integers
-simple identities
-cubes
-powers of two
-modpow
-longs
-simple identities
-cubes
-powers of two
-modpow
-floats
-modpow
-mixed-mode
-Validate that TypeError is thrown with 3 args if first two args aren't integers
-miscellaneous

Deleted: trunk/jython/Lib/test/test_pow.py
===================================================================
--- trunk/jython/Lib/test/test_pow.py	2008-06-14 20:25:11 UTC (rev 4624)
+++ trunk/jython/Lib/test/test_pow.py	2008-06-14 21:19:39 UTC (rev 4625)
@@ -1,107 +0,0 @@
-import sys
-from test_support import *
-
-print_test("power (test_pow.py)", 2)
-
-def powtest(type):
-    if (type!=float):
-        print_test("simple identities", 4)
-        for i in range(-1000, 1000):
-            assert type(i)**0 == 1
-            assert type(i)**1 == type(i)
-            if i > 0:
-                assert type(0)**i == type(0)
-                assert type(1)**i == type(1)
-            
-        print_test("cubes")
-        for i in range(-100, 100):
-            assert type(i)**3 == i*i*i
-    
-        print_test("powers of two")
-        pow2=1
-        for i in range(0,31):
-            assert 2**i == pow2
-            if i!=30: pow2=pow2*2
-    # modPow() has known assertion failures in all Sun 1.1 JDKs after 1.1.5.
-    # Apparently, Sun is not going to fix this for 1.1 since the bug still
-    # exists in 1.1.8 and the bug ID 4098742 is closed.
-    if sys.platform.startswith('java1.1') and type == long:
-        print_test('modpow... skipping due to JVM bugs', 4)
-        return
-    print_test("modpow", 4)
-    il, ih = -20, 20
-    jl, jh = -5,   5
-    kl, kh = -10, 10
-    compare = cmp
-    if (type==float):
-        il=1
-        compare = fcmp
-    elif (type==int):
-        jl=0
-    elif (type==long):
-        jl,jh = 0, 15
-    for i in range(il, ih+1):
-         for j in range(jl,jh+1):
-             for k in range(kl, kh+1):
-                 if (k!=0):
-                     try:
-                         assert compare(pow(type(i),j,k), type(i)**j % type(k)) == 0, '%s, %s, %s' % (i,j,k)
-                     except TypeError:
-                         if type==float:
-                             # Python 2.2 only allows 3rd arg if first 2 are integers
-                             pass
-                         else:
-                             raise
-
-print_test("integers", 3)
-powtest(int)
-print_test("longs", 3)
-powtest(long)
-print_test("floats", 3)
-powtest(float)
-
-print_test("mixed-mode", 3)
-
-assert 3**3%8 == pow(3,3,8) == 3
-assert 3**3%-8 == pow(3,3,-8) == -5
-assert 3**2%-2 == pow(3,2,-2) == -1
-assert -3**3%8 == pow(-3,3,8) == 5
-assert -3**3%-8 == pow(-3,3,-8) == -3
-assert 5**2%-8 == pow(5,2,-8) == -7
-
-assert 3L**3%8 == pow(3L,3,8) == 3L
-assert 3L**3%-8 == pow(3,3L,-8) == -5L
-assert 3L**2%-2 == pow(3,2,-2L) == -1L
-assert -3L**3%8 == pow(-3L,3,8) == 5L
-assert -3L**3%-8 == pow(-3,3L,-8) == -3L
-assert 5L**2%-8 == pow(5,2,-8L) == -7L
-
-# Python 2.2 only allows 3rd arg if first 2 are integers
-assert 3.**3%8 == pow(3.,3) % 8 == 3.
-assert 3.**3%-8 == pow(3,3.) % -8 == -5.
-assert 3.**2%-2 == pow(3,2) %-2. == -1.
-assert -3.**3%8 == pow(-3.,3) % 8 == 5.
-assert -3.**3%-8 == pow(-3,3.) % -8 == -3.
-assert 5.**2%-8 == pow(5,2) % -8. == -7.
-
-print_test( "Validate that TypeError is thrown with 3 args if first two args aren't integers" )
-import unittest
-tc = unittest.TestCase( "fail" ) # get failUnlessRaises method
-tc.failUnlessRaises( TypeError, pow, 3., 3, 8 )
-tc.failUnlessRaises( TypeError, pow, 3, 3., 8 )
-
-if sys.platform.startswith('java1.1'):
-    print_test("miscellaneous... skipping due to JVM bugs", 3)
-else:    
-    print_test("miscellaneous", 3)
-    for i in range(-10, 11):
-        for j in range(0, 6):
-            for k in range(-7, 11):
-                if (j>=0 and k!=0):
-                    o=pow(i,j) % k
-                    n=pow(i,j,k)
-                    assert o == n, 'Integer mismatch: %d, %d, %d' % (i,j,k)
-                if (j>=0 and k<>0):
-                    o=pow(long(i),j) % k
-                    n=pow(long(i),j,k)
-                    assert o == n, 'Long mismatch: %s, %s, %s' % (i,j,k)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4737
          http://jython.svn.sourceforge.net/jython/?rev=4737&view=rev
Author:   pjenvey
Date:     2008-06-23 18:53:11 -0700 (Mon, 23 Jun 2008)

Log Message:
-----------
remove a few tests that've been superseded with versions in the stdlib

Removed Paths:
-------------
    trunk/jython/Lib/test/output/test_opcodes
    trunk/jython/Lib/test/output/test_string
    trunk/jython/Lib/test/output/test_thread
    trunk/jython/Lib/test/output/test_unpack
    trunk/jython/Lib/test/test_opcodes.py
    trunk/jython/Lib/test/test_re.py
    trunk/jython/Lib/test/test_string.py
    trunk/jython/Lib/test/test_thread.py
    trunk/jython/Lib/test/test_unpack.py

Deleted: trunk/jython/Lib/test/output/test_opcodes
===================================================================
--- trunk/jython/Lib/test/output/test_opcodes	2008-06-24 01:40:29 UTC (rev 4736)
+++ trunk/jython/Lib/test/output/test_opcodes	2008-06-24 01:53:11 UTC (rev 4737)
@@ -1,4 +0,0 @@
-test_opcodes
-Opcodes (test_opcodes.py)
-try inside for loop
-raise class exceptions

Deleted: trunk/jython/Lib/test/output/test_string
===================================================================
--- trunk/jython/Lib/test/output/test_string	2008-06-24 01:40:29 UTC (rev 4736)
+++ trunk/jython/Lib/test/output/test_string	2008-06-24 01:53:11 UTC (rev 4737)
@@ -1,18 +0,0 @@
-test_string
-string (test_string.py)
-atoi
-atol
-atof
-capitalize
-find
-rfind
-lower
-upper
-split
-join
-strip
-lstrip
-rstrip
-swapcase
-replace
-count

Deleted: trunk/jython/Lib/test/output/test_thread
===================================================================
--- trunk/jython/Lib/test/output/test_thread	2008-06-24 01:40:29 UTC (rev 4736)
+++ trunk/jython/Lib/test/output/test_thread	2008-06-24 01:53:11 UTC (rev 4737)
@@ -1,4 +0,0 @@
-test_thread
-thread (test_thread.py)
-concurrent threads
-locks

Deleted: trunk/jython/Lib/test/output/test_unpack
===================================================================
--- trunk/jython/Lib/test/output/test_unpack	2008-06-24 01:40:29 UTC (rev 4736)
+++ trunk/jython/Lib/test/output/test_unpack	2008-06-24 01:53:11 UTC (rev 4737)
@@ -1,15 +0,0 @@
-test_unpack
-Sequence Unpacking (test_unpack.py)
-tuple
-list
-inline tuple
-string
-generic sequence
-failures
-non-sequence
-wrong size tuple
-wrong size list
-sequence too short
-sequence too long
-sequence too long, wrong error
-sequence too short, wrong error

Deleted: trunk/jython/Lib/test/test_opcodes.py
===================================================================
--- trunk/jython/Lib/test/test_opcodes.py	2008-06-24 01:40:29 UTC (rev 4736)
+++ trunk/jython/Lib/test/test_opcodes.py	2008-06-24 01:53:11 UTC (rev 4737)
@@ -1,65 +0,0 @@
-# Python test set -- part 2, opcodes
-
-from test_support import *
-
-
-print_test('Opcodes (test_opcodes.py)', 1)
-print_test('try inside for loop', 2)
-
-n = 0
-for i in range(10):
-        n = n+i
-        try: 1/0
-        except NameError: pass
-        except ZeroDivisionError: pass
-        except TypeError: pass
-        try: pass
-        except: pass
-        try: pass
-        finally: pass
-        n = n+i
-        
-assert n == 90, 'try inside for'
-
-print_test('raise class exceptions')
-
-class AClass: pass
-class BClass(AClass): pass
-class CClass: pass
-class DClass(AClass):
-    def __init__(self, ignore):
-        pass
-
-try: raise AClass()
-except: pass
-
-try: raise AClass()
-except AClass: pass
-
-try: raise BClass()
-except AClass: pass
-
-try: raise BClass()
-except CClass: raise TestFailed
-except: pass
-
-a = AClass()
-b = BClass()
-
-try: raise AClass, b
-except BClass, v:
-        assert v == b, 'class exceptions'
-else: raise TestFailed
-
-try: raise b
-except AClass, v:
-        assert v == b, 'class exceptions'
-
-# not enough arguments
-try:  raise BClass, a
-except TypeError: pass
-
-try:  raise DClass, a
-except DClass, v:
-    assert isinstance(v, DClass)
-

Deleted: trunk/jython/Lib/test/test_re.py
===================================================================
--- trunk/jython/Lib/test/test_re.py	2008-06-24 01:40:29 UTC (rev 4736)
+++ trunk/jython/Lib/test/test_re.py	2008-06-24 01:53:11 UTC (rev 4737)
@@ -1,304 +0,0 @@
-#!/usr/local/bin/python
-# -*- mode: python -*-
-# $Id$
-
-import sys
-sys.path=['.']+sys.path
-
-from test_support import *
-import re
-import sys, os, string #, traceback
-
-print_test('re (test_re.py)', 1)
-
-# Misc tests from Tim Peters' re.doc
-
-print_test('basic functions', 2)
-
-print_test('search', 3)
-assert re.search('x*', 'axx').span(0) == (0, 0)
-assert re.search('x*', 'axx').span() == (0, 0)
-assert re.search('x+', 'axx').span(0) == (1, 3)
-assert re.search('x+', 'axx').span() == (1, 3)
-assert re.search('x', 'aaa') == None
-
-print_test('match')
-assert re.match('a*', 'xxx').span(0) == (0, 0)
-assert re.match('a*', 'xxx').span() == (0, 0)
-assert re.match('x*', 'xxxa').span(0) == (0, 3)
-assert re.match('x*', 'xxxa').span() == (0, 3)
-assert re.match('a+', 'xxx') == None
-
-
-print_test('sub')
-assert re.sub("(?i)b+", "x", "bbbb BBBB") == 'x x'
-
-def bump_num(matchobj):
-    int_value = int(matchobj.group(0))
-    return str(int_value + 1)
-
-assert re.sub(r'\d+', bump_num, '08.2 -2 23x99y') == '9.3 -3 24x100y'
-assert re.sub(r'\d+', bump_num, '08.2 -2 23x99y', 3) == '9.3 -3 23x99y'
-
-assert re.sub('.', lambda m: r"\n", 'x') == '\\n'
-assert re.sub('.', r"\n", 'x') == '\n'
-
-s = r"\1\1"
-assert re.sub('(.)', s, 'x') == 'xx'
-assert re.sub('(.)', re.escape(s), 'x') == s
-assert re.sub('(.)', lambda m: s, 'x') == s
-
-assert re.sub('(?P<a>x)', '\g<a>\g<a>', 'xx') == 'xxxx'
-assert re.sub('(?P<a>x)', '\g<a>\g<1>', 'xx') == 'xxxx'
-assert re.sub('(?P<unk>x)', '\g<unk>\g<unk>', 'xx') == 'xxxx'
-assert re.sub('(?P<unk>x)', '\g<1>\g<1>', 'xx') == 'xxxx'
-
-assert re.sub('a', r'\t\n\v\r\f\a\b\B\Z\a\A\w\W\s\S\d\D', 'a') == '\t\n\v\r\f\a\b\\B\\Z\a\\A\\w\\W\\s\\S\\d\\D'
-assert re.sub('a', '\t\n\v\r\f\a', 'a') == '\t\n\v\r\f\a'
-assert re.sub('a', '\t\n\v\r\f\a', 'a') == (chr(9)+chr(10)+chr(11)+chr(13)+chr(12)+chr(7))
-
-assert re.sub('^\s*', 'X', 'test') == 'Xtest'
-
-assert re.sub('a', 'b', 'aaaaa') == 'bbbbb'
-assert re.sub('a', 'b', 'aaaaa', 1) == 'baaaa'
-
-
-print_test('symbolic references', 4)
-
-try:
-    re.sub('(?P<a>x)', '\g<a', 'xx')
-except re.error, reason:
-    pass
-else:
-    raise TestFailed, "symbolic reference"
-
-try:
-    re.sub('(?P<a>x)', '\g<', 'xx')
-except re.error, reason:
-    pass
-else:
-    raise TestFailed, "symbolic reference"
-
-try:
-    re.sub('(?P<a>x)', '\g', 'xx')
-except re.error, reason:
-    pass
-else:
-    raise TestFailed, "symbolic reference"
-
-try:
-    re.sub('(?P<a>x)', '\g<a a>', 'xx')
-except re.error, reason:
-    pass
-else:
-    raise TestFailed, "symbolic reference"
-
-try:
-    re.sub('(?P<a>x)', '\g<1a1>', 'xx')
-except re.error, reason:
-    pass
-else:
-    raise TestFailed, "symbolic reference"
-
-try:
-    re.sub('(?P<a>x)', '\g<ab>', 'xx')
-except (IndexError, re.error), reason:
-    pass
-else:
-    raise TestFailed, "symbolic reference"
-
-try:
-    re.sub('(?P<a>x)|(?P<b>y)', '\g<b>', 'xx')
-except re.error, reason:
-    pass
-else:
-    raise TestFailed, "symbolic reference"
-
-try:
-    re.sub('(?P<a>x)|(?P<b>y)', '\\2', 'xx')
-except re.error, reason:
-    pass
-else:
-    raise TestFailed, "symbolic reference"
-
-
-print_test('subn', 3)
-
-assert re.subn("(?i)b+", "x", "bbbb BBBB") == ('x x', 2)
-assert re.subn("b+", "x", "bbbb BBBB") == ('x BBBB', 1)
-assert re.subn("b+", "x", "xyz") == ('xyz', 0)
-assert re.subn("b*", "x", "xyz") == ('xxxyxzx', 4)
-assert re.subn("b*", "x", "xyz", 2) == ('xxxyz', 2)
-
-print_test('split')
-
-assert re.split(":", ":a:b::c") == ['', 'a', 'b', '', 'c']
-assert re.split(":*", ":a:b::c") == ['', 'a', 'b', 'c']
-assert re.split("(:*)", ":a:b::c") == ['', ':', 'a', ':', 'b', '::', 'c']
-assert re.split("(?::*)", ":a:b::c") == ['', 'a', 'b', 'c']
-assert re.split("(:)*", ":a:b::c") == ['', ':', 'a', ':', 'b', ':', 'c']
-assert re.split("([b:]+)", ":a:b::c") == ['', ':', 'a', ':b::', 'c']
-assert re.split("(b)|(:+)", ":a:b::c") == \
-       ['', None, ':', 'a', None, ':', '', 'b', None, '', None, '::', 'c']
-assert re.split("(?:b)|(?::+)", ":a:b::c") == ['', 'a', '', '', 'c']
-    
-assert re.split(":", ":a:b::c", 2) == ['', 'a', 'b::c']
-assert re.split(':', 'a:b:c:d', 2) == ['a', 'b', 'c:d']
-
-assert re.split("(:)", ":a:b::c", 2) == ['', ':', 'a', ':', 'b::c']
-assert re.split("(:*)", ":a:b::c", 2) == ['', ':', 'a', ':', 'b::c']
-
-print_test('match.groups', 2)
-
-
-# No groups at all
-m = re.match('a', 'a') ; assert m.groups() == ()
-# A single group
-m = re.match('(a)', 'a') ; assert m.groups() == ('a',)
-
-pat = re.compile('((a)|(b))(c)?')
-assert pat.match('a').groups() == ('a', 'a', None, None)
-assert pat.match('b').groups() == ('b', None, 'b', None)
-assert pat.match('ac').groups() == ('a', 'a', None, 'c')
-assert pat.match('bc').groups() == ('b', None, 'b', 'c')
-
-
-
-print_test('match.group', 2)
-
-# A single group
-m = re.match('(a)', 'a')
-assert m.group(0) == 'a' ; assert m.group(0) == 'a'
-assert m.group(1) == 'a' ; assert m.group(1, 1) == ('a', 'a')
-
-pat = re.compile('(?:(?P<a1>a)|(?P<b2>b))(?P<c3>c)?')
-assert pat.match('a').group(1, 2, 3) == ('a', None, None)
-assert pat.match('b').group('a1', 'b2', 'c3') == (None, 'b', None)
-assert pat.match('ac').group(1, 'b2', 3) == ('a', None, 'c')
-
-print_test('escape', 2)
-
-p=""
-for i in range(0, 256):
-    p = p + chr(i)
-    assert re.match(re.escape(chr(i)), chr(i)) != None
-    assert re.match(re.escape(chr(i)), chr(i)).span() == (0,1)
-
-pat=re.compile( re.escape(p) )
-assert pat.match(p) != None
-assert pat.match(p).span() == (0,256)
-
-
-#if verbose:
-#    print 'Pickling a RegexObject instance'
-
-#import pickle
-#pat = re.compile('a(?:b|(c|e){1,2}?|d)+?(.)')
-#s = pickle.dumps(pat)
-#pat = pickle.loads(s)
-
-print_test('flags', 2)
-
-assert re.I == re.IGNORECASE
-assert re.L == re.LOCALE
-assert re.M == re.MULTILINE
-assert re.S == re.DOTALL
-assert re.X == re.VERBOSE
-
-for flags in [re.I, re.M, re.X, re.S, re.L]:
-    r = re.compile('^pattern$', flags)
-
-from re_tests import *
-
-print_test("symbolic groups in regex's", 2)
-print_test("perl5-compatible regex's", 2)
-
-for t in tests:
-    sys.stdout.flush()
-    pattern=s=outcome=repl=expected=None
-    if len(t)==5:
-        pattern, s, outcome, repl, expected = t
-    elif len(t)==3:
-        pattern, s, outcome = t
-    else:
-        raise ValueError, ('Test tuples should have 3 or 5 fields',t)
-
-    try:
-        obj=re.compile(pattern)
-    except re.error:
-        if outcome==SYNTAX_ERROR: pass  # Expected a syntax error
-        else:
-            print '=== Syntax error:', t
-    except KeyboardInterrupt: raise KeyboardInterrupt
-    except:
-        print '*** Unexpected error ***', t
-        #if verbose:
-        #    traceback.print_exc(file=sys.stdout)
-    else:
-        try:
-            result=obj.search(s)
-        except (re.error), msg:
-            print '=== Unexpected exception', t, repr(msg)
-        if outcome==SYNTAX_ERROR:
-            # This should have been a syntax error; forget it.
-            pass
-        elif outcome==FAIL:
-            if result is None: pass   # No match, as expected
-            else: print '=== Succeeded incorrectly', t
-        elif outcome==SUCCEED:
-            if result is not None:
-                # Matched, as expected, so now we compute the
-                # result string and compare it to our expected result.
-                start, end = result.span(0)
-                vardict={'found': result.group(0),
-                         'groups': result.group(),
-                         'flags': result.re.flags}
-                for i in range(1, 100):
-                    try:
-                        gi = result.group(i)
-                        # Special hack because else the string concat fails:
-                        if gi is None:
-                            gi = "None"
-                    except IndexError:
-                        gi = "Error"
-                    vardict['g%d' % i] = gi
-                for i in result.re.groupindex.keys():
-                    try:
-                        gi = result.group(i)
-                        if gi is None:
-                            gi = "None"
-                    except IndexError:
-                        gi = "Error"
-                    vardict[i] = gi
-                repl=eval(repl, vardict)
-                if repl!=expected:
-                    print '=== grouping error', t,
-                    print repr(repl)+' should be '+repr(expected)
-            else:
-                print '=== Failed incorrectly', t
-                continue
-
-            # Try the match with the search area limited to the extent
-            # of the match and see if it still succeeds.  \B will
-            # break (because it won't match at the end or start of a
-            # string), so we'll ignore patterns that feature it.
-
-            if pattern[:2]!='\\B' and pattern[-2:]!='\\B':
-                obj=re.compile(pattern)
-                result=obj.search(s, result.start(0), result.end(0)+1)
-                if result==None:
-                    print '=== Failed on range-limited match', t
-
-            # Try the match with IGNORECASE enabled, and check that it
-            # still succeeds.
-            obj=re.compile(pattern, re.IGNORECASE)
-            result=obj.search(s)
-            if result==None:
-                print '=== Fails on case-insensitive match', t
-
-            # Try the match with LOCALE enabled, and check that it
-            # still succeeds.
-            obj=re.compile(pattern, re.LOCALE)
-            result=obj.search(s)
-            if result==None:
-                print '=== Fails on locale-sensitive match', t

Deleted: trunk/jython/Lib/test/test_string.py
===================================================================
--- trunk/jython/Lib/test/test_string.py	2008-06-24 01:40:29 UTC (rev 4736)
+++ trunk/jython/Lib/test/test_string.py	2008-06-24 01:53:11 UTC (rev 4737)
@@ -1,223 +0,0 @@
-from test_support import *
-import string, sys
-
-print_test('string (test_string.py)', 1)
-
-names = {}
-def test(name, input, output, *args):
-    if not names.has_key(name):
-        print_test(name, 2)
-        names[name] = 1
-
-    f = getattr(string, name)
-    try:
-        value = apply(f, (input,) + args)
-    except:
-         value = sys.exc_type
-    if verbose and value <> output:
-        print 'value=', value, ', output=', output
-    assert value == output
-
-test('atoi', " 1 ", 1)
-test('atoi', " 1x", ValueError)
-test('atoi', " x1 ", ValueError)
-test('atol', "  1  ", 1L)
-test('atol', "  1x ", ValueError)
-test('atol', "  x1 ", ValueError)
-test('atof', "  1  ", 1.0)
-#test('atof', "  1x ", ValueError)
-test('atof', "  x1 ", ValueError)
-
-test('capitalize', ' hello ', ' hello ')
-test('capitalize', 'hello ', 'Hello ')
-test('find', 'abcdefghiabc', 0, 'abc')
-test('find', 'abcdefghiabc', 9, 'abc', 1)
-test('find', 'abcdefghiabc', -1, 'def', 4)
-test('rfind', 'abcdefghiabc', 9, 'abc')
-test('lower', 'HeLLo', 'hello')
-test('upper', 'HeLLo', 'HELLO')
-
-test('split', 'this is the split function',
-     ['this', 'is', 'the', 'split', 'function'])
-test('split', 'a|b|c|d', ['a', 'b', 'c', 'd'], '|')
-test('split', 'a|b|c|d', ['a', 'b', 'c|d'], '|', 2)
-test('split', 'a b c d', ['a', 'b c d'], None, 1)
-test('split', 'a b c d', ['a', 'b', 'c d'], None, 2)
-test('split', 'a b c d', ['a', 'b', 'c', 'd'], None, 3)
-test('split', 'a b c d', ['a', 'b', 'c', 'd'], None, 4)
-test('split', 'a b c d', ['a b c d'], None, 0)
-test('split', 'a b c d', ['a', 'b', 'c', 'd'], None, -1)
-
-test('split', 'a  b  c  d', ['a', 'b', 'c  d'], None, 2)
-
-# join now works with any sequence type
-class Sequence:
-    def __init__(self): self.seq = 'wxyz'
-    def __len__(self): return len(self.seq)
-    def __getitem__(self, i): return self.seq[i]
-
-test('join', ['a', 'b', 'c', 'd'], 'a b c d')
-test('join', ('a', 'b', 'c', 'd'), 'abcd', '')
-test('join', Sequence(), 'w x y z')
-
-# try a few long ones
-longstring = "\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:x\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-x:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:xxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx:x\
-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
-xxxxxxxxxxxxxxxxxxx"
-
-assert string.join(['x' * 100] * 100, ':') == longstring
-assert string.join(('x' * 100,) * 100, ':') == longstring
-
-test('strip', '   hello   ', 'hello')
-test('lstrip', '   hello   ', 'hello   ')
-test('rstrip', '   hello   ', '   hello')
-
-test('swapcase', 'HeLLo cOmpUteRs', 'hEllO CoMPuTErS')
-
-test('replace', 'one!two!three!', 'one@...!', '!', '@', 1)
-test('replace', 'one!two!three!', 'one@...!', '!', '@', 2)
-test('replace', 'one!two!three!', 'one@...@', '!', '@', 3)
-test('replace', 'one!two!three!', 'one@...@', '!', '@', 4)
-test('replace', 'one!two!three!', 'one!two!three!', '!', '@', 0)
-test('replace', 'one!two!three!', 'one@...@', '!', '@', -1)
-test('replace', 'one!two!three!', 'one@...@', '!', '@')
-test('replace', 'one!two!three!', 'one!two!three!', 'x', '@')
-test('replace', 'one!two!three!', 'one!two!three!', 'x', '@', 2)
-
-test('count', 'aaa', 3, 'a')
-test('count', 'aaa', 2, 'a', 0, 2)
-test('count', 'ababab', 3, 'ab', 0)
-test('count', 'ababab', 2, 'ab', 0, 5)
-test('count', 'ababab', 2, 'ab', 1)
-test('count', 'ababab', 2, 'ab', 1, 6)
-test('count', 'ababab', 0, 'abc')
-test('count', 'ababab', 7, '')
-
-string.whitespace
-string.lowercase
-string.uppercase

Deleted: trunk/jython/Lib/test/test_thread.py
===================================================================
--- trunk/jython/Lib/test/test_thread.py	2008-06-24 01:40:29 UTC (rev 4736)
+++ trunk/jython/Lib/test/test_thread.py	2008-06-24 01:53:11 UTC (rev 4737)
@@ -1,116 +0,0 @@
-# Very rudimentary test of thread module
-
-# Create a bunch of threads, let each do some work, wait until all are done
-
-from test_support import *
-import whrandom
-import thread
-import time
-
-print_test('thread (test_thread.py)', 1)
-
-mutex = thread.allocate_lock()
-whmutex = thread.allocate_lock() # for calls to whrandom
-running = 0
-done = thread.allocate_lock()
-done.acquire()
-verbose = 0
-
-numtasks = 5
-
-
-def task(ident):
-        global running
-        whmutex.acquire()
-        delay = whrandom.random() * numtasks
-        whmutex.release()
-        if verbose:
-            print 'task', ident, 'will run for', round(delay, 1), 'sec'
-        time.sleep(delay)
-        if verbose:
-            print 'task', ident, 'done'
-        mutex.acquire()
-        running = running - 1
-        if running == 0:
-                done.release()
-        mutex.release()
-
-next_ident = 0
-def newtask():
-        global next_ident, running
-        mutex.acquire()
-        next_ident = next_ident + 1
-        if verbose:
-            print 'creating task', next_ident
-        thread.start_new_thread(task, (next_ident,))
-        running = running + 1
-        mutex.release()
-
-print_test('concurrent threads', 2)
-
-for i in range(numtasks):
-        newtask()
-
-done.acquire()
-
-class barrier:
-        def __init__(self, n):
-                self.n = n
-                self.waiting = 0
-                self.checkin  = thread.allocate_lock()
-                self.checkout = thread.allocate_lock()
-                self.checkout.acquire()
-
-        def enter(self):
-                checkin, checkout = self.checkin, self.checkout
-
-                checkin.acquire()
-                self.waiting = self.waiting + 1
-                if self.waiting == self.n:
-                        self.waiting = self.n - 1
-                        checkout.release()
-                        return
-                checkin.release()
-
-                checkout.acquire()
-                self.waiting = self.waiting - 1
-                if self.waiting == 0:
-                        checkin.release()
-                        return
-                checkout.release()
-
-numtrips = 3
-def task2(ident):
-        global running
-        for i in range(numtrips):
-                if ident == 0:
-                        # give it a good chance to enter the next
-                        # barrier before the others are all out
-                        # of the current one
-                        delay = 0.001
-                else:
-                        whmutex.acquire()
-                        delay = whrandom.random() * numtasks
-                        whmutex.release()
-                if verbose:
-                    print 'task', ident, 'will run for', round(delay, 1), 'sec'
-                time.sleep(delay)
-                if verbose:
-                    print 'task', ident, 'entering barrier', i
-                bar.enter()
-                if verbose:
-                    print 'task', ident, 'leaving barrier', i
-        mutex.acquire()
-        running = running - 1
-        if running == 0:
-                done.release()
-        mutex.release()
-
-print_test('locks', 2)
-if done.acquire(0):
-        raise ValueError, "'done' should have remained acquired"
-bar = barrier(numtasks)
-running = numtasks
-for i in range(numtasks):
-        thread.start_new_thread(task2, (i,))
-done.acquire()

Deleted: trunk/jython/Lib/test/test_unpack.py
===================================================================
--- trunk/jython/Lib/test/test_unpack.py	2008-06-24 01:40:29 UTC (rev 4736)
+++ trunk/jython/Lib/test/test_unpack.py	2008-06-24 01:53:11 UTC (rev 4737)
@@ -1,105 +0,0 @@
-from test_support import *
-
-print_test("Sequence Unpacking (test_unpack.py)", 2)
-
-t = (1, 2, 3)
-l = [4, 5, 6]
-
-class Seq:
-    def __getitem__(self, i):
-        if i >= 0 and i < 3: return i
-        raise IndexError
-
-a = -1
-b = -1
-c = -1
-
-# unpack tuple
-print_test("tuple", 3)
-a, b, c = t
-assert a == 1 and b == 2 and c == 3
-
-print_test("list", 3)
-a, b, c = l
-assert a == 4 and b == 5 and c == 6
-
-print_test("inline tuple")
-a, b, c = 7, 8, 9
-assert a == 7 and b == 8 and c == 9
-
-print_test("string")
-a, b, c = 'one'
-assert a == 'o' and b == 'n' and c == 'e'
-
-print_test("generic sequence")
-a, b, c = Seq()
-assert a == 0 and b == 1 and c == 2
-
-# now for some failures
-print_test("failures")
-
-print_test("non-sequence", 4)
-try:
-    a, b, c = 7
-    raise TestFailed
-except TypeError:
-    pass
-
-print_test("wrong size tuple")
-try:
-    a, b = t
-    raise TestFailed
-except ValueError:
-    pass
-    
-print_test("wrong size list")
-try:
-    a, b = l
-    raise TestFailed
-except ValueError:
-    pass
-
-
-print_test("sequence too short")
-try:
-    a, b, c, d = Seq()
-    raise TestFailed
-except ValueError:
-    pass
-
-
-print_test("sequence too long")
-try:
-    a, b = Seq()
-    raise TestFailed
-except ValueError:
-    pass
-
-
-# unpacking a sequence where the test for too long raises a different
-# kind of error
-BozoError = 'BozoError'
-
-class BadSeq:
-    def __getitem__(self, i):
-        if i >= 0 and i < 3:
-            return i
-        elif i == 3:
-            raise BozoError
-        else:
-            raise IndexError
-
-print_test("sequence too long, wrong error")
-try:
-    a, b, c, d, e = BadSeq()
-    raise TestFailed
-except BozoError:
-    pass
-
-
-print_test("sequence too short, wrong error")
-try:
-    a, b, c = BadSeq()
-    raise TestFailed
-except BozoError:
-    pass


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4738
          http://jython.svn.sourceforge.net/jython/?rev=4738&view=rev
Author:   pjenvey
Date:     2008-06-23 19:00:39 -0700 (Mon, 23 Jun 2008)

Log Message:
-----------
get rid of the old Jython test functions in test_support. only print_test was
being used and it wasn't really doing anything anyway

Modified Paths:
--------------
    trunk/jython/Lib/test/bugs/bugs100.py
    trunk/jython/Lib/test/bugs/bugs101.py
    trunk/jython/Lib/test/test_array.py
    trunk/jython/Lib/test/test_janoninner.py
    trunk/jython/Lib/test/test_javalist.py
    trunk/jython/Lib/test/test_jbasic.py
    trunk/jython/Lib/test/test_jser.py
    trunk/jython/Lib/test/test_jsubclass.py
    trunk/jython/Lib/test/test_methods.py
    trunk/jython/Lib/test/test_operations.py
    trunk/jython/Lib/test/test_support.py

Modified: trunk/jython/Lib/test/bugs/bugs100.py
===================================================================
--- trunk/jython/Lib/test/bugs/bugs100.py	2008-06-24 01:53:11 UTC (rev 4737)
+++ trunk/jython/Lib/test/bugs/bugs100.py	2008-06-24 02:00:39 UTC (rev 4738)
@@ -5,20 +5,20 @@
 sys.path.append(scriptsdir)
 from test_support import *
 
-print_test('Bug Fixes', 0)
-print_test('From 1.0.0 to 1.0.1', 1)
-print_test('Recursive assignment to list slices handled incorrectly #1', 2)
+print 'Bug Fixes'
+print 'From 1.0.0 to 1.0.1'
+print 'Recursive assignment to list slices handled incorrectly #1'
 
 x = [1,2,3,4,5]
 x[1:] = x
 assert x == [1,1,2,3,4,5]
 
-print_test('sys.platform should be javax.y.z not jdkx.y.z #4')
+print 'sys.platform should be javax.y.z not jdkx.y.z #4'
 
 import sys
 assert sys.platform[:4] == 'java'
 
-print_test('java.io.IOExceptions are mangled into IOErrors #5')
+print 'java.io.IOExceptions are mangled into IOErrors #5'
 
 from java import io, lang
 try:
@@ -34,7 +34,7 @@
     pass
 
 
-print_test('java.util.Vector\'s can\'t be used in for loops #7')
+print 'java.util.Vector\'s can\'t be used in for loops #7'
 
 from java.util import Vector
 
@@ -48,20 +48,20 @@
     sum = sum+x
 assert sum == 111
 
-print_test('Exception tuple contains nulls #8')
+print 'Exception tuple contains nulls #8'
 
 str(Exception)
 
-print_test('0.001 comes out as 0.0010 #11')
+print '0.001 comes out as 0.0010 #11'
 
 assert str(0.001) == '0.001'
 
-print_test("thread.LockType doesn't exist #12")
+print "thread.LockType doesn't exist #12"
 
 import thread
 assert hasattr(thread, 'LockType')
 
-print_test('sys.exit can only be called with an integer argument #13')
+print 'sys.exit can only be called with an integer argument #13'
 
 import sys
 try:
@@ -70,16 +70,16 @@
     # exc is an instance now
     assert str(exc) == "goodbye"
 
-print_test('"%012d" % -4 displays "0000000000-4" #15')
+print '"%012d" % -4 displays "0000000000-4" #15'
 
 assert "%012d" % -4 == "-00000000004"
 
 
-print_test('Indexing a string with starting slice larger than string length throws StringIndexOutOfBoundsException #19')
+print 'Indexing a string with starting slice larger than string length throws StringIndexOutOfBoundsException #19'
 
 assert "a"[10:] == ""
 
-print_test('Java exception thrown for non-keyword argument following keyword #20')
+print 'Java exception thrown for non-keyword argument following keyword #20'
 
 def foo(x,y=10): pass
 
@@ -89,7 +89,7 @@
 except SyntaxError:
     pass
 
-print_test('Java field names which conflict with Python reserved words are not renamed #23')
+print 'Java field names which conflict with Python reserved words are not renamed #23'
 
 # In JPython 1.1, the registry entry python.deprecated.keywordMangling sets
 # whether trailing underscore is still used to `escape' Python keywords when
@@ -97,7 +97,7 @@
 # turned to false.
 assert hasattr(lang.System, 'in_') or hasattr(lang.System, 'in')
 
-print_test('Bad input to __import__ raises a Java exception #27')
+print 'Bad input to __import__ raises a Java exception #27'
 
 try:
     __import__("")
@@ -105,11 +105,11 @@
 except ValueError:
     pass
 
-print_test('xrange implementation is broken for almost any complex case #29')
+print 'xrange implementation is broken for almost any complex case #29'
 
 assert list(xrange(10)[9:1:-1]) == [9, 8, 7, 6, 5, 4, 3, 2]
 
-print_test('Trying to assign to a method of a Java instance throws a NullPointerException #30')
+print 'Trying to assign to a method of a Java instance throws a NullPointerException #30'
 
 from java.awt import Button
 b = Button()
@@ -120,8 +120,8 @@
     pass
 
 
-print_test('From 1.0.1 to 1.0.2', 1)
-print_test('A threading test', 2)
+print 'From 1.0.1 to 1.0.2'
+print 'A threading test'
 
 from java.lang import Thread
 

Modified: trunk/jython/Lib/test/bugs/bugs101.py
===================================================================
--- trunk/jython/Lib/test/bugs/bugs101.py	2008-06-24 01:53:11 UTC (rev 4737)
+++ trunk/jython/Lib/test/bugs/bugs101.py	2008-06-24 02:00:39 UTC (rev 4738)
@@ -38,8 +38,8 @@
     'return in finally clause causes java.lang.VerifyError at compile time'
     exec code32
 
-print_test('Bug Fixes', 0)
-print_test('From 1.0.1 to 1.0.2', 1)
+print 'Bug Fixes'
+print 'From 1.0.1 to 1.0.2'
 
 items = locals().items()
 items.sort()
@@ -47,7 +47,7 @@
 errors = 0
 for name, value in items:
     if name[:4] == 'test':
-        print_test(value.__doc__+' #'+name[4:], 2)
+        print value.__doc__+' #'+name[4:]
         try:
             value()
         except:

Modified: trunk/jython/Lib/test/test_array.py
===================================================================
--- trunk/jython/Lib/test/test_array.py	2008-06-24 01:53:11 UTC (rev 4737)
+++ trunk/jython/Lib/test/test_array.py	2008-06-24 02:00:39 UTC (rev 4738)
@@ -14,7 +14,7 @@
 from java.lang.reflect import Array
 from java.util import Arrays
 
-print_test('array module (test_array.py)', 1)
+print 'array module (test_array.py)'
 
 def main():
    
@@ -58,7 +58,7 @@
    
 
 def test_java_compat():
-   print_test('array', 2)
+   print 'array'
    from java import awt
    hsb = awt.Color.RGBtoHSB(0,255,255, None)
    #print hsb
@@ -69,7 +69,7 @@
    #print hex(rgb)
    verify(rgb == 0xff00ffff, "output rgb bytes don't match input hsb floats")
    
-   print_test('zeros', 2)
+   print 'zeros'
    hsb1 = zeros('f', 3)
    awt.Color.RGBtoHSB(0,255,255, hsb1)
    #print hsb, hsb1

Modified: trunk/jython/Lib/test/test_janoninner.py
===================================================================
--- trunk/jython/Lib/test/test_janoninner.py	2008-06-24 01:53:11 UTC (rev 4737)
+++ trunk/jython/Lib/test/test_janoninner.py	2008-06-24 02:00:39 UTC (rev 4738)
@@ -3,13 +3,13 @@
 import sys
 from test_support import *
 
-print_test('Java Anonymous Inner Classes (test_janoninner.py)', 1)
+print 'Java Anonymous Inner Classes (test_janoninner.py)'
 
-print_test('importing', 2)
+print 'importing'
 import javatests.AnonInner
 
-print_test('instantiating', 2)
+print 'instantiating'
 x = javatests.AnonInner()
 
-print_test('invoking', 2)
+print 'invoking'
 assert x.doit() == 2000

Modified: trunk/jython/Lib/test/test_javalist.py
===================================================================
--- trunk/jython/Lib/test/test_javalist.py	2008-06-24 01:53:11 UTC (rev 4737)
+++ trunk/jython/Lib/test/test_javalist.py	2008-06-24 02:00:39 UTC (rev 4738)
@@ -32,22 +32,22 @@
 
 
 # these first two tests just verify that we have a good unit test
-print_test("ListTest.java driver (test_javalist.py)", 1)
-print_test("running test on ArrayList", 2)
+print "ListTest.java driver (test_javalist.py)"
+print "running test on ArrayList"
 alt = ListTest.getArrayListTest(False)
 alt.testAll()
 
-print_test("running test on ArrayList (read-only)", 2)
+print "running test on ArrayList (read-only)"
 alt = ListTest.getArrayListTest(True)
 alt.testAll()
 
 
 # Now run the critical tests
 
-print_test("running test on PyListTest", 2)       
+print "running test on PyListTest"
 plt = PyListTest()
 plt.testAll()       
 
-print_test("running test on PyTupleTest", 2)       
+print "running test on PyTupleTest"
 ptt = PyTupleTest()
-ptt.testAll()  
\ No newline at end of file
+ptt.testAll()  

Modified: trunk/jython/Lib/test/test_jbasic.py
===================================================================
--- trunk/jython/Lib/test/test_jbasic.py	2008-06-24 01:53:11 UTC (rev 4737)
+++ trunk/jython/Lib/test/test_jbasic.py	2008-06-24 02:00:39 UTC (rev 4738)
@@ -1,9 +1,9 @@
 from test_support import *
 
-print_test('Basic Java Integration (test_jbasic.py)', 1)
+print 'Basic Java Integration (test_jbasic.py)'
 
-print_test('type conversions', 2)
-print_test('numbers', 3)
+print 'type conversions'
+print 'numbers'
 
 from java.lang.Math import abs
 assert abs(-2.) == 2., 'Python float to Java double'
@@ -13,16 +13,16 @@
 try: abs(-123456789123456789123l)
 except TypeError: pass
 
-print_test('strings', 3)
+print 'strings'
 from java.lang import Integer, String
 
 assert Integer.valueOf('42') == 42, 'Python string to Java string'
 
-print_test('arrays', 3)
+print 'arrays'
 chars = ['a', 'b', 'c']
 assert String.valueOf(chars) == 'abc', 'char array'
 
-print_test('Enumerations', 3)
+print 'Enumerations'
 from java.util import Vector
 
 vec = Vector()
@@ -41,7 +41,7 @@
     expected = expected+1
 
 
-print_test('create java objects', 2)
+print 'create java objects'
 
 from java.math import BigInteger
 
@@ -49,7 +49,7 @@
 assert BigInteger([0x11, 0x11, 0x11]).intValue() == 0x111111, 'BigInteger(byte[])'
 assert BigInteger(-1, [0x11, 0x11, 0x11]).intValue() == -0x111111, 'BigInteger(int, byte[])'
 
-print_test('call static methods')
+print 'call static methods'
 s1 = String.valueOf(['1', '2', '3'])
 s2 = String.valueOf('123')
 s3 = String.valueOf(123)
@@ -57,7 +57,7 @@
 s5 = String.valueOf(['0', '1', '2', '3', 'a', 'b'], 1, 3)
 assert s1 == s2 == s3 == s4 == s5, 'String.valueOf method with different arguments'
 
-print_test('call instance methods')
+print 'call instance methods'
 s = String('hello')
 assert s.regionMatches(1, 1, 'ell', 0, 3), 'method call with boolean true'
 assert s.regionMatches(0, 1, 'ell', 0, 3), 'method call with boolean false'
@@ -68,7 +68,7 @@
 
 from java.awt import Dimension
 
-print_test('get/set fields')
+print 'get/set fields'
 d = Dimension(3,9)
 assert d.width == 3 and d.height == 9, 'getting fields'
 d.width = 42
@@ -82,7 +82,7 @@
 else:
         raise AssertionError, 'd.foo should throw type error'
 
-print_test('get/set bean properties')
+print 'get/set bean properties'
 
 from javax import swing
 b1 = swing.JButton()
@@ -90,7 +90,7 @@
 b2 = swing.JButton(label='foo')
 assert b1.label == b2.label == 'foo', 'Button label bean property'
 
-print_test('bean event properties')
+print 'bean event properties'
 # Test bean event properties - single and multiple
 flag = 0
 def testAction(event):

Modified: trunk/jython/Lib/test/test_jser.py
===================================================================
--- trunk/jython/Lib/test/test_jser.py	2008-06-24 01:53:11 UTC (rev 4737)
+++ trunk/jython/Lib/test/test_jser.py	2008-06-24 02:00:39 UTC (rev 4738)
@@ -1,6 +1,6 @@
 from test_support import *
 
-print_test('Java Serialization (test_jser.py)', 1)
+print 'Java Serialization (test_jser.py)'
 
 from java import io, awt
 import os, sys
@@ -16,22 +16,22 @@
 
 object4 = awt.Color(1,2,3)
 
-print_test('writing', 2)
+print 'writing'
 
 sername = os.path.join(sys.prefix, "test.ser")
 fout = io.ObjectOutputStream(io.FileOutputStream(sername))
-print_test('Python int', 3)
+print 'Python int'
 fout.writeObject(object1)
-print_test('Python list', 3)
+print 'Python list'
 fout.writeObject(object2)
-print_test('Python instance', 3)
+print 'Python instance'
 fout.writeObject(object3)
-print_test('Java instance', 3)
+print 'Java instance'
 fout.writeObject(object4)
 fout.close()
 
 fin     = io.ObjectInputStream(io.FileInputStream(sername))
-print_test('reading', 2)
+print 'reading'
 iobject1 = fin.readObject()
 iobject2 = fin.readObject()
 iobject3 = fin.readObject()
@@ -40,18 +40,18 @@
 
 #print iobject1, iobject2, iobject3, iobject3.__class__, iobject4
 
-print_test('Python int', 3)
+print 'Python int'
 assert iobject1 == object1
 
-print_test('Python list', 3)
+print 'Python list'
 assert iobject2 == object2
 
-print_test('Python instance', 3)
+print 'Python instance'
 assert iobject3.baz     == 99
 assert iobject3.bar() == 'bar'
 assert iobject3.__class__ == Foo
 
-print_test('Java instance', 3)
+print 'Java instance'
 assert iobject4 == object4
 
-os.remove(sername)
\ No newline at end of file
+os.remove(sername)

Modified: trunk/jython/Lib/test/test_jsubclass.py
===================================================================
--- trunk/jython/Lib/test/test_jsubclass.py	2008-06-24 01:53:11 UTC (rev 4737)
+++ trunk/jython/Lib/test/test_jsubclass.py	2008-06-24 02:00:39 UTC (rev 4738)
@@ -1,12 +1,12 @@
 from test_support import *
 
-print_test('Subclassing Java from Python (test_jsubclass.py)', 1)
+print 'Subclassing Java from Python (test_jsubclass.py)'
 
 from java.lang import Runnable, Thread
 
 # Overriding Methods
 
-print_test('override methods', 2)
+print 'override methods'
 class MyThread(Thread):
         count = 0
         def run(self):
@@ -18,7 +18,7 @@
 t1.join()
 assert t1.count == 1, 'subclassing java.lang.Thread'
 
-print_test('pass subclass back to java', 2)
+print 'pass subclass back to java'
 
 class MyRun(Runnable):
         count = 0
@@ -31,7 +31,7 @@
 t.join()
 assert run.count == 1, 'subclassing java.lang.Thread'
 
-print_test("invoke super's constructor", 2)
+print "invoke super's constructor"
 
 class MyThread(Thread):
         def __init__(self):

Modified: trunk/jython/Lib/test/test_methods.py
===================================================================
--- trunk/jython/Lib/test/test_methods.py	2008-06-24 01:53:11 UTC (rev 4737)
+++ trunk/jython/Lib/test/test_methods.py	2008-06-24 02:00:39 UTC (rev 4738)
@@ -2,7 +2,7 @@
 
 from test_support import *
 
-print_test('Bound and unbound methods (test_methods.py)', 1)
+print 'Bound and unbound methods (test_methods.py)'
 
 class A:
     def one(self): return 'one'
@@ -17,18 +17,18 @@
 b = B()
 c = C()
 
-print_test('unbound method equality', 2)
+print 'unbound method equality'
 assert A.one == B.one
 assert A.one <> C.one
 
-print_test('method attributes', 2)
+print 'method attributes'
 assert A.one.im_func == a.one.im_func
 assert a.one.im_self == a
 assert a.one.im_class == A
 assert b.one.im_self == b
 assert b.one.im_class == B
 
-print_test('unbound method invocation w/ explicit self', 2)
+print 'unbound method invocation w/ explicit self'
 assert A.one(b) == 'one'
 assert B.two(b) == 'two'
 assert B.one(b) == 'one'
@@ -48,7 +48,7 @@
 except TypeError:
     pass
 
-print_test('"unbound" methods of builtin types', 2)
+print '"unbound" methods of builtin types'
 w = [1,2,3].append
 x = [4,5,6].append
 assert w <> x

Modified: trunk/jython/Lib/test/test_operations.py
===================================================================
--- trunk/jython/Lib/test/test_operations.py	2008-06-24 01:53:11 UTC (rev 4737)
+++ trunk/jython/Lib/test/test_operations.py	2008-06-24 02:00:39 UTC (rev 4738)
@@ -2,10 +2,10 @@
 
 from test_support import *
 
-print_test('Operations (test_operations.py)', 1)
+print 'Operations (test_operations.py)'
 
-print_test('Numeric', 2)
-print_test('+', 3)
+print 'Numeric'
+print '+'
 assert 0 + 0 == 0
 assert 0 + 3 == 3
 assert 0 + 42 == 42
@@ -33,7 +33,7 @@
 assert 42L + 0L == 42L
 assert 42L + 3L == 45L
 assert 42L + 42L == 84L
-print_test('-', 3)
+print '-'
 assert 0 - 0 == 0
 assert 0 - 3 == -3
 assert 0 - 42 == -42
@@ -61,7 +61,7 @@
 assert 42L - 0L == 42L
 assert 42L - 3L == 39L
 assert 42L - 42L == 0L
-print_test('*', 3)
+print '*'
 assert 0 * 0 == 0
 assert 0 * 3 == 0
 assert 0 * 42 == 0
@@ -89,7 +89,7 @@
 assert 42L * 0L == 0L
 assert 42L * 3L == 126L
 assert 42L * 42L == 1764L
-print_test('/', 3)
+print '/'
 assert 0 / 3 == 0
 assert 0 / 42 == 0
 assert 3 / 3 == 1
@@ -108,7 +108,7 @@
 assert 3L / 42L == 0L
 assert 42L / 3L == 14L
 assert 42L / 42L == 1L
-print_test('**', 3)
+print '**'
 assert 0 ** 0 == 1
 assert 0 ** 3 == 0
 assert 0 ** 42 == 0
@@ -134,7 +134,7 @@
 assert 42L ** 0L == 1L
 assert 42L ** 3L == 74088L
 assert 42L ** 42L == 150130937545296572356771972164254457814047970568738777235893533016064L
-print_test('%', 3)
+print '%'
 assert 0 % 3 == 0
 assert 0 % 42 == 0
 assert 3 % 3 == 0
@@ -154,8 +154,8 @@
 assert 42L % 3L == 0L
 assert 42L % 42L == 0L
 
-print_test('Binary', 2)
-print_test('|', 3)
+print 'Binary'
+print '|'
 assert 0 | 0 == 0
 assert 0 | 3 == 3
 assert 0 | 42 == 42
@@ -174,7 +174,7 @@
 assert 42L | 0L == 42L
 assert 42L | 3L == 43L
 assert 42L | 42L == 42L
-print_test('^', 3)
+print '^'
 assert 0 ^ 0 == 0
 assert 0 ^ 3 == 3
 assert 0 ^ 42 == 42
@@ -193,7 +193,7 @@
 assert 42L ^ 0L == 42L
 assert 42L ^ 3L == 41L
 assert 42L ^ 42L == 0L
-print_test('&', 3)
+print '&'
 assert 0 & 0 == 0
 assert 0 & 3 == 0
 assert 0 & 42 == 0
@@ -212,7 +212,7 @@
 assert 42L & 0L == 0L
 assert 42L & 3L == 2L
 assert 42L & 42L == 42L
-print_test('<<', 3)
+print '<<'
 assert 0 << 0 == 0
 assert 0 << 3 == 0
 assert 0 << 42 == 0
@@ -231,7 +231,7 @@
 assert 42L << 0L == 42L
 assert 42L << 3L == 336L
 assert 42L << 42L == 184717953466368L
-print_test('>>', 3)
+print '>>'
 assert 0 >> 0 == 0
 assert 0 >> 3 == 0
 assert 0 >> 42 == 0
@@ -251,8 +251,8 @@
 assert 42L >> 3L == 5L
 assert 42L >> 42L == 0L
 
-print_test('Comparison', 2)
-print_test('<', 3)
+print 'Comparison'
+print '<'
 assert (0 < 0) == 0
 assert (0 < 3) == 1
 assert (0 < 42) == 1
@@ -280,7 +280,7 @@
 assert (42L < 0L) == 0
 assert (42L < 3L) == 0
 assert (42L < 42L) == 0
-print_test('>', 3)
+print '>'
 assert (0 > 0) == 0
 assert (0 > 3) == 0
 assert (0 > 42) == 0
@@ -308,7 +308,7 @@
 assert (42L > 0L) == 1
 assert (42L > 3L) == 1
 assert (42L > 42L) == 0
-print_test('==', 3)
+print '=='
 assert (0 == 0) == 1
 assert (0 == 3) == 0
 assert (0 == 42) == 0
@@ -336,7 +336,7 @@
 assert (42L == 0L) == 0
 assert (42L == 3L) == 0
 assert (42L == 42L) == 1
-print_test('<=', 3)
+print '<='
 assert (0 <= 0) == 1
 assert (0 <= 3) == 1
 assert (0 <= 42) == 1
@@ -364,7 +364,7 @@
 assert (42L <= 0L) == 0
 assert (42L <= 3L) == 0
 assert (42L <= 42L) == 1
-print_test('>=', 3)
+print '>='
 assert (0 >= 0) == 1
 assert (0 >= 3) == 0
 assert (0 >= 42) == 0
@@ -392,7 +392,7 @@
 assert (42L >= 0L) == 1
 assert (42L >= 3L) == 1
 assert (42L >= 42L) == 1
-print_test('and', 3)
+print 'and'
 assert (0 and 0) == 0
 assert (0 and 3) == 0
 assert (0 and 42) == 0
@@ -420,7 +420,7 @@
 assert (42L and 0L) == 0L
 assert (42L and 3L) == 3L
 assert (42L and 42L) == 42L
-print_test('or', 3)
+print 'or'
 assert (0 or 0) == 0
 assert (0 or 3) == 3
 assert (0 or 42) == 42
@@ -449,27 +449,27 @@
 assert (42L or 3L) == 42L
 assert (42L or 42L) == 42L
 
-print_test('Indexing', 2)
+print 'Indexing'
 lst = range(5)
 
-print_test('[i]', 3)
+print '[i]'
 assert lst[0] == 0
 assert lst[3] == 3
 lst[3] = 99 
 assert lst[3] == 99
 lst[3] = 3
 
-print_test('[i:j]', 3)
+print '[i:j]'
 assert lst[:2] == [0,1]
 assert lst[-3:] == [2,3,4]
 assert lst[2:] == [2,3,4]
 assert lst[0:2] == [0,1]
 assert lst[1:3] == [1,2]
 
-print_test('in', 3)
+print 'in'
 assert 2 in lst
 assert not (8 in lst)
 
-print_test('not in', 3)
+print 'not in'
 assert 8 not in lst
 assert not (2 not in lst)

Modified: trunk/jython/Lib/test/test_support.py
===================================================================
--- trunk/jython/Lib/test/test_support.py	2008-06-24 01:53:11 UTC (rev 4737)
+++ trunk/jython/Lib/test/test_support.py	2008-06-24 02:00:39 UTC (rev 4738)
@@ -298,50 +298,3 @@
     if verbose:
         print 'doctest (%s) ... %d tests with zero failures' % (module.__name__, t)
     return f, t
-
-#=======================================================================
-# Old Jython test functions
-# test_support.py above this line is just a copy from the current Python
-# release. Other functions needed by Jython tests go here until no longer
-# needed
-import string
-
-roman = ['i', 'ii', 'iii', 'iv', 'v', 'vi', 'vii', 'viii', 'ix', 'x', 'xi', 'xii']
-symbols = [
-        map(string.upper, roman),
-        string.uppercase,
-        range(1, 50),
-        string.lowercase,
-        roman,
-        ]
-        
-def symbol(n, level):
-        return str(symbols[level][n-1])
-
-levels = [0]*20
-currentLevel = 0
-def print_test(txt, level=-1):
-    print txt
-    return level
-        
-oldStdout = None
-
-from StringIO import StringIO
-def beginCapture():
-        global oldStdout
-        
-        if oldStdout is not None:
-                raise TestError, "Internal error"
-                
-        oldStdout = sys.stdout
-        sys.stdout = StringIO()
-        
-def endCapture():
-        global oldStdout
-        
-        txt = sys.stdout.getvalue()
-        sys.stdout = oldStdout
-        oldStdout = None
-        
-        return txt
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4780
          http://jython.svn.sourceforge.net/jython/?rev=4780&view=rev
Author:   pjenvey
Date:     2008-06-25 18:31:47 -0700 (Wed, 25 Jun 2008)

Log Message:
-----------
o move Jython specific complex tests into test_complex_jy
o test_cmath -> test_cmath_jy
o test_atexit, test_contains test_heapq are in sync with stdlib's

Added Paths:
-----------
    trunk/jython/Lib/test/test_cmath_jy.py
    trunk/jython/Lib/test/test_complex_jy.py

Removed Paths:
-------------
    trunk/jython/Lib/test/test_atexit.py
    trunk/jython/Lib/test/test_cmath.py
    trunk/jython/Lib/test/test_complex.py
    trunk/jython/Lib/test/test_contains.py
    trunk/jython/Lib/test/test_heapq.py

Deleted: trunk/jython/Lib/test/test_atexit.py
===================================================================
--- trunk/jython/Lib/test/test_atexit.py	2008-06-26 01:16:20 UTC (rev 4779)
+++ trunk/jython/Lib/test/test_atexit.py	2008-06-26 01:31:47 UTC (rev 4780)
@@ -1,64 +0,0 @@
-# Test the atexit module.
-from test.test_support import TESTFN, vereq, is_jython
-import atexit
-from os import popen, unlink
-import sys
-
-executable = sys.executable
-
-input = """\
-import atexit
-
-def handler1():
-    print "handler1"
-
-def handler2(*args, **kargs):
-    print "handler2", args, kargs
-
-atexit.register(handler1)
-atexit.register(handler2)
-atexit.register(handler2, 7, kw="abc")
-"""
-
-fname = TESTFN + ".py"
-f = file(fname, "w")
-f.write(input)
-f.close()
-
-p = popen('"%s" %s' % (executable, fname))
-output = p.read()
-p.close()
-vereq(output, """\
-handler2 (7,) {'kw': 'abc'}
-handler2 () {}
-handler1
-""")
-
-input = """\
-def direct():
-    print "direct exit"
-
-import sys
-sys.exitfunc = direct
-
-# Make sure atexit doesn't drop
-def indirect():
-    print "indirect exit"
-
-import atexit
-atexit.register(indirect)
-"""
-
-f = file(fname, "w")
-f.write(input)
-f.close()
-
-p = popen('"%s" %s' % (executable, fname))
-output = p.read()
-p.close()
-vereq(output, """\
-indirect exit
-direct exit
-""")
-
-unlink(fname)

Deleted: trunk/jython/Lib/test/test_cmath.py
===================================================================
--- trunk/jython/Lib/test/test_cmath.py	2008-06-26 01:16:20 UTC (rev 4779)
+++ trunk/jython/Lib/test/test_cmath.py	2008-06-26 01:31:47 UTC (rev 4780)
@@ -1,109 +0,0 @@
-#! /usr/bin/env python
-""" Simple test script for cmathmodule.c
-    Roger E. Masse
-"""
-import cmath
-import unittest
-from test import test_support
-from test.test_support import verbose
-
-p = cmath.pi
-e = cmath.e
-if verbose:
-    print 'PI = ', abs(p)
-    print 'E = ', abs(e)
-
-
-class CmathTestCase(unittest.TestCase):
-    def assertAlmostEqual(self, x, y, places=5, msg=None):
-        unittest.TestCase.assertAlmostEqual(self, x.real, y.real, places, msg)
-        unittest.TestCase.assertAlmostEqual(self, x.imag, y.imag, places, msg)
-
-    def test_acos(self):
-        self.assertAlmostEqual(complex(0.936812, -2.30551), 
-                               cmath.acos(complex(3, 4)))
-    
-    def test_acosh(self):
-        self.assertAlmostEqual(complex(2.30551, 0.93681), 
-                               cmath.acosh(complex(3, 4)))
-
-    def test_asin(self):
-        self.assertAlmostEqual(complex(0.633984, 2.30551), 
-                               cmath.asin(complex(3, 4)))
-
-    def test_asinh(self):
-        self.assertAlmostEqual(complex(2.29991, 0.917617), 
-                               cmath.asinh(complex(3, 4)))
-
-    def test_atan(self):
-        self.assertAlmostEqual(complex(1.44831, 0.158997), 
-                               cmath.atan(complex(3, 4)))
-
-    def test_atanh(self):
-        self.assertAlmostEqual(complex(0.11750, 1.40992), 
-                               cmath.atanh(complex(3, 4)))
-
-    def test_cos(self):
-        self.assertAlmostEqual(complex(-27.03495, -3.851153), 
-                               cmath.cos(complex(3, 4)))
-
-    def test_cosh(self):
-        self.assertAlmostEqual(complex(-6.58066, -7.58155), 
-                               cmath.cosh(complex(3, 4)))
-
-    def test_exp(self):
-        self.assertAlmostEqual(complex(-13.12878, -15.20078), 
-                               cmath.exp(complex(3, 4)))
-
-    def test_log(self):
-        self.assertAlmostEqual(complex(1.60944, 0.927295), 
-                               cmath.log(complex(3, 4)))
-
-    def test_log10(self):
-        self.assertAlmostEqual(complex(0.69897, 0.40272), 
-                               cmath.log10(complex(3, 4)))
-
-    def test_sin(self):
-        self.assertAlmostEqual(complex(3.853738, -27.01681), 
-                               cmath.sin(complex(3, 4)))
-
-    def test_sinh(self):
-        self.assertAlmostEqual(complex(-6.54812, -7.61923), 
-                               cmath.sinh(complex(3, 4)))
-
-    def test_sqrt_real_positive(self):
-        self.assertAlmostEqual(complex(2, 1),
-                               cmath.sqrt(complex(3, 4)))
-
-    def test_sqrt_real_zero(self):
-        self.assertAlmostEqual(complex(1.41421, 1.41421),
-                               cmath.sqrt(complex(0, 4)))
-    
-    def test_sqrt_real_negative(self):
-        self.assertAlmostEqual(complex(1, 2),
-                               cmath.sqrt(complex(-3, 4)))
-
-    def test_sqrt_imaginary_zero(self):
-        self.assertAlmostEqual(complex(0.0, 1.73205),
-                               cmath.sqrt(complex(-3, 0)))
-
-    def test_sqrt_imaginary_negative(self):
-        self.assertAlmostEqual(complex(1.0, -2.0),
-                               cmath.sqrt(complex(-3, -4)))
-
-    def test_tan(self):
-        self.assertAlmostEqual(complex(-0.000187346, 0.999356), 
-                               cmath.tan(complex(3, 4)))
-
-    def test_tanh(self):
-        self.assertAlmostEqual(complex(1.00071, 0.00490826), 
-                               cmath.tanh(complex(3, 4)))
-
-def test_main():
-    test_support.run_unittest(CmathTestCase)
-
-if __name__ == "__main__":
-    test_main()
-
-
-                 

Copied: trunk/jython/Lib/test/test_cmath_jy.py (from rev 4778, trunk/jython/Lib/test/test_cmath.py)
===================================================================
--- trunk/jython/Lib/test/test_cmath_jy.py	                        (rev 0)
+++ trunk/jython/Lib/test/test_cmath_jy.py	2008-06-26 01:31:47 UTC (rev 4780)
@@ -0,0 +1,109 @@
+#! /usr/bin/env python
+""" Simple test script for cmathmodule.c
+    Roger E. Masse
+"""
+import cmath
+import unittest
+from test import test_support
+from test.test_support import verbose
+
+p = cmath.pi
+e = cmath.e
+if verbose:
+    print 'PI = ', abs(p)
+    print 'E = ', abs(e)
+
+
+class CmathTestCase(unittest.TestCase):
+    def assertAlmostEqual(self, x, y, places=5, msg=None):
+        unittest.TestCase.assertAlmostEqual(self, x.real, y.real, places, msg)
+        unittest.TestCase.assertAlmostEqual(self, x.imag, y.imag, places, msg)
+
+    def test_acos(self):
+        self.assertAlmostEqual(complex(0.936812, -2.30551), 
+                               cmath.acos(complex(3, 4)))
+    
+    def test_acosh(self):
+        self.assertAlmostEqual(complex(2.30551, 0.93681), 
+                               cmath.acosh(complex(3, 4)))
+
+    def test_asin(self):
+        self.assertAlmostEqual(complex(0.633984, 2.30551), 
+                               cmath.asin(complex(3, 4)))
+
+    def test_asinh(self):
+        self.assertAlmostEqual(complex(2.29991, 0.917617), 
+                               cmath.asinh(complex(3, 4)))
+
+    def test_atan(self):
+        self.assertAlmostEqual(complex(1.44831, 0.158997), 
+                               cmath.atan(complex(3, 4)))
+
+    def test_atanh(self):
+        self.assertAlmostEqual(complex(0.11750, 1.40992), 
+                               cmath.atanh(complex(3, 4)))
+
+    def test_cos(self):
+        self.assertAlmostEqual(complex(-27.03495, -3.851153), 
+                               cmath.cos(complex(3, 4)))
+
+    def test_cosh(self):
+        self.assertAlmostEqual(complex(-6.58066, -7.58155), 
+                               cmath.cosh(complex(3, 4)))
+
+    def test_exp(self):
+        self.assertAlmostEqual(complex(-13.12878, -15.20078), 
+                               cmath.exp(complex(3, 4)))
+
+    def test_log(self):
+        self.assertAlmostEqual(complex(1.60944, 0.927295), 
+                               cmath.log(complex(3, 4)))
+
+    def test_log10(self):
+        self.assertAlmostEqual(complex(0.69897, 0.40272), 
+                               cmath.log10(complex(3, 4)))
+
+    def test_sin(self):
+        self.assertAlmostEqual(complex(3.853738, -27.01681), 
+                               cmath.sin(complex(3, 4)))
+
+    def test_sinh(self):
+        self.assertAlmostEqual(complex(-6.54812, -7.61923), 
+                               cmath.sinh(complex(3, 4)))
+
+    def test_sqrt_real_positive(self):
+        self.assertAlmostEqual(complex(2, 1),
+                               cmath.sqrt(complex(3, 4)))
+
+    def test_sqrt_real_zero(self):
+        self.assertAlmostEqual(complex(1.41421, 1.41421),
+                               cmath.sqrt(complex(0, 4)))
+    
+    def test_sqrt_real_negative(self):
+        self.assertAlmostEqual(complex(1, 2),
+                               cmath.sqrt(complex(-3, 4)))
+
+    def test_sqrt_imaginary_zero(self):
+        self.assertAlmostEqual(complex(0.0, 1.73205),
+                               cmath.sqrt(complex(-3, 0)))
+
+    def test_sqrt_imaginary_negative(self):
+        self.assertAlmostEqual(complex(1.0, -2.0),
+                               cmath.sqrt(complex(-3, -4)))
+
+    def test_tan(self):
+        self.assertAlmostEqual(complex(-0.000187346, 0.999356), 
+                               cmath.tan(complex(3, 4)))
+
+    def test_tanh(self):
+        self.assertAlmostEqual(complex(1.00071, 0.00490826), 
+                               cmath.tanh(complex(3, 4)))
+
+def test_main():
+    test_support.run_unittest(CmathTestCase)
+
+if __name__ == "__main__":
+    test_main()
+
+
+                 

Deleted: trunk/jython/Lib/test/test_complex.py
===================================================================
--- trunk/jython/Lib/test/test_complex.py	2008-06-26 01:16:20 UTC (rev 4779)
+++ trunk/jython/Lib/test/test_complex.py	2008-06-26 01:31:47 UTC (rev 4780)
@@ -1,318 +0,0 @@
-import unittest, os
-from test import test_support
-
-import warnings
-warnings.filterwarnings(
-    "ignore",
-    category=DeprecationWarning,
-    message=".*complex divmod.*are deprecated"
-)
-
-from random import random
-
-# These tests ensure that complex math does the right thing
-
-class ComplexTest(unittest.TestCase):
-
-    def assertAlmostEqual(self, a, b):
-        if isinstance(a, complex):
-            if isinstance(b, complex):
-                unittest.TestCase.assertAlmostEqual(self, a.real, b.real)
-                unittest.TestCase.assertAlmostEqual(self, a.imag, b.imag)
-            else:
-                unittest.TestCase.assertAlmostEqual(self, a.real, b)
-                unittest.TestCase.assertAlmostEqual(self, a.imag, 0.)
-        else:
-            if isinstance(b, complex):
-                unittest.TestCase.assertAlmostEqual(self, a, b.real)
-                unittest.TestCase.assertAlmostEqual(self, 0., b.imag)
-            else:
-                unittest.TestCase.assertAlmostEqual(self, a, b)
-
-    def assertCloseAbs(self, x, y, eps=1e-9):
-        """Return true iff floats x and y "are close\""""
-        # put the one with larger magnitude second
-        if abs(x) > abs(y):
-            x, y = y, x
-        if y == 0:
-            return abs(x) < eps
-        if x == 0:
-            return abs(y) < eps
-        # check that relative difference < eps
-        self.assert_(abs((x-y)/y) < eps)
-
-    def assertClose(self, x, y, eps=1e-9):
-        """Return true iff complexes x and y "are close\""""
-        self.assertCloseAbs(x.real, y.real, eps)
-        self.assertCloseAbs(x.imag, y.imag, eps)
-
-    def assertIs(self, a, b):
-        self.assert_(a is b)
-
-    def check_div(self, x, y):
-        """Compute complex z=x*y, and check that z/x==y and z/y==x."""
-        z = x * y
-        if x != 0:
-            q = z / x
-            self.assertClose(q, y)
-            q = z.__div__(x)
-            self.assertClose(q, y)
-            q = z.__truediv__(x)
-            self.assertClose(q, y)
-        if y != 0:
-            q = z / y
-            self.assertClose(q, x)
-            q = z.__div__(y)
-            self.assertClose(q, x)
-            q = z.__truediv__(y)
-            self.assertClose(q, x)
-
-    def test_div(self):
-        simple_real = [float(i) for i in xrange(-5, 6)]
-        simple_complex = [complex(x, y) for x in simple_real for y in simple_real]
-        for x in simple_complex:
-            for y in simple_complex:
-                self.check_div(x, y)
-
-        # A naive complex division algorithm (such as in 2.0) is very prone to
-        # nonsense errors for these (overflows and underflows).
-        self.check_div(complex(1e200, 1e200), 1+0j)
-        self.check_div(complex(1e-200, 1e-200), 1+0j)
-
-        # Just for fun.
-        for i in xrange(100):
-            self.check_div(complex(random(), random()),
-                           complex(random(), random()))
-
-        self.assertRaises(ZeroDivisionError, complex.__div__, 1+1j, 0+0j)
-        # FIXME: The following currently crashes on Alpha
-        # self.assertRaises(OverflowError, pow, 1e200+1j, 1e200+1j)
-
-    def test_truediv(self):
-        self.assertAlmostEqual(complex.__truediv__(2+0j, 1+1j), 1-1j)
-        self.assertRaises(ZeroDivisionError, complex.__truediv__, 1+1j, 0+0j)
-
-    def test_floordiv(self):
-        self.assertAlmostEqual(complex.__floordiv__(3+0j, 1.5+0j), 2)
-        self.assertRaises(ZeroDivisionError, complex.__floordiv__, 3+0j, 0+0j)
-
-    def test_coerce(self):
-        self.assertRaises(OverflowError, complex.__coerce__, 1+1j, 1L<<10000)
-        self.assertEqual(complex.__coerce__(1+1j, None), NotImplemented)
-        self.assertRaises(TypeError, complex.__coerce__, None, 1+2j)
-
-    def test_richcompare(self):
-        self.assertRaises(OverflowError, complex.__eq__, 1+1j, 1L<<10000)
-        self.assertEqual(complex.__lt__(1+1j, None), NotImplemented)
-        self.assertIs(complex.__eq__(1+1j, 1+1j), True)
-        self.assertIs(complex.__eq__(1+1j, 2+2j), False)
-        self.assertIs(complex.__ne__(1+1j, 1+1j), False)
-        self.assertIs(complex.__ne__(1+1j, 2+2j), True)
-        self.assertRaises(TypeError, complex.__lt__, 1+1j, 2+2j)
-        self.assertRaises(TypeError, complex.__le__, 1+1j, 2+2j)
-        self.assertRaises(TypeError, complex.__gt__, 1+1j, 2+2j)
-        self.assertRaises(TypeError, complex.__ge__, 1+1j, 2+2j)
-
-    def test_mod(self):
-        self.assertRaises(ZeroDivisionError, (1+1j).__mod__, 0+0j)
-
-        a = 3.33+4.43j
-        try:
-            a % 0
-        except ZeroDivisionError:
-            pass
-        else:
-            self.fail("modulo parama can't be 0")
-
-    def test_divmod(self):
-        self.assertRaises(ZeroDivisionError, divmod, 1+1j, 0+0j)
-
-    def test_pow(self):
-        self.assertAlmostEqual(pow(1+1j, 0+0j), 1.0)
-        self.assertAlmostEqual(pow(0+0j, 2+0j), 0.0)
-        self.assertRaises(ZeroDivisionError, pow, 0+0j, 1j)
-        self.assertAlmostEqual(pow(1j, -1), 1/1j)
-        self.assertAlmostEqual(pow(1j, 200), 1)
-        self.assertRaises(ValueError, pow, 1+1j, 1+1j, 1+1j)
-
-        a = 3.33+4.43j
-        self.assertEqual(a ** 0j, 1)
-        self.assertEqual(a ** 0.+0.j, 1)
-
-        self.assertEqual(3j ** 0j, 1)
-        self.assertEqual(3j ** 0, 1)
-
-        try:
-            0j ** a
-        except ZeroDivisionError:
-            pass
-        else:
-            self.fail("should fail 0.0 to negative or complex power")
-
-        try:
-            0j ** (3-2j)
-        except ZeroDivisionError:
-            pass
-        else:
-            self.fail("should fail 0.0 to negative or complex power")
-
-        # The following is used to exercise certain code paths
-        self.assertEqual(a ** 105, a ** 105)
-        self.assertEqual(a ** -105, a ** -105)
-        self.assertEqual(a ** -30, a ** -30)
-
-        self.assertEqual(0.0j ** 0, 1)
-
-        b = 5.1+2.3j
-        self.assertRaises(ValueError, pow, a, b, 0)
-
-    def test_boolcontext(self):
-        for i in xrange(100):
-            self.assert_(complex(random() + 1e-6, random() + 1e-6))
-        self.assert_(not complex(0.0, 0.0))
-
-    def test_conjugate(self):
-        self.assertClose(complex(5.3, 9.8).conjugate(), 5.3-9.8j)
-
-    def test_constructor(self):
-        class OS:
-            def __init__(self, value): self.value = value
-            def __complex__(self): return self.value
-        class NS(object):
-            def __init__(self, value): self.value = value
-            def __complex__(self): return self.value
-        self.assertEqual(complex(OS(1+10j)), 1+10j)
-        self.assertEqual(complex(NS(1+10j)), 1+10j)
-        self.assertRaises(TypeError, complex, OS(None))
-        self.assertRaises(TypeError, complex, NS(None))
-
-        self.assertAlmostEqual(complex("1+10j"), 1+10j)
-        self.assertAlmostEqual(complex(10), 10+0j)
-        self.assertAlmostEqual(complex(10.0), 10+0j)
-        self.assertAlmostEqual(complex(10L), 10+0j)
-        self.assertAlmostEqual(complex(10+0j), 10+0j)
-        self.assertAlmostEqual(complex(1,10), 1+10j)
-        self.assertAlmostEqual(complex(1,10L), 1+10j)
-        self.assertAlmostEqual(complex(1,10.0), 1+10j)
-        self.assertAlmostEqual(complex(1L,10), 1+10j)
-        self.assertAlmostEqual(complex(1L,10L), 1+10j)
-        self.assertAlmostEqual(complex(1L,10.0), 1+10j)
-        self.assertAlmostEqual(complex(1.0,10), 1+10j)
-        self.assertAlmostEqual(complex(1.0,10L), 1+10j)
-        self.assertAlmostEqual(complex(1.0,10.0), 1+10j)
-        self.assertAlmostEqual(complex(3.14+0j), 3.14+0j)
-        self.assertAlmostEqual(complex(3.14), 3.14+0j)
-        self.assertAlmostEqual(complex(314), 314.0+0j)
-        self.assertAlmostEqual(complex(314L), 314.0+0j)
-        self.assertAlmostEqual(complex(3.14+0j, 0j), 3.14+0j)
-        self.assertAlmostEqual(complex(3.14, 0.0), 3.14+0j)
-        self.assertAlmostEqual(complex(314, 0), 314.0+0j)
-        self.assertAlmostEqual(complex(314L, 0L), 314.0+0j)
-        self.assertAlmostEqual(complex(0j, 3.14j), -3.14+0j)
-        self.assertAlmostEqual(complex(0.0, 3.14j), -3.14+0j)
-        self.assertAlmostEqual(complex(0j, 3.14), 3.14j)
-        self.assertAlmostEqual(complex(0.0, 3.14), 3.14j)
-        self.assertAlmostEqual(complex("1"), 1+0j)
-        self.assertAlmostEqual(complex("1j"), 1j)
-        self.assertAlmostEqual(complex(),  0)
-        self.assertAlmostEqual(complex("-1"), -1)
-        self.assertAlmostEqual(complex("+1"), +1)
-
-        class complex2(complex): pass
-        self.assertAlmostEqual(complex(complex2(1+1j)), 1+1j)
-        self.assertAlmostEqual(complex(real=17, imag=23), 17+23j)
-        self.assertAlmostEqual(complex(real=17+23j), 17+23j)
-        self.assertAlmostEqual(complex(real=17+23j, imag=23), 17+46j)
-        self.assertAlmostEqual(complex(real=1+2j, imag=3+4j), -3+5j)
-
-        c = 3.14 + 1j
-        self.assert_(complex(c) is c)
-        del c
-
-        self.assertRaises(TypeError, complex, "1", "1")
-        self.assertRaises(TypeError, complex, 1, "1")
-
-        self.assertEqual(complex("  3.14+J  "), 3.14+1j)
-        if test_support.have_unicode:
-            self.assertEqual(complex(unicode("  3.14+J  ")), 3.14+1j)
-
-        # SF bug 543840:  complex(string) accepts strings with \0
-        # Fixed in 2.3.
-        self.assertRaises(ValueError, complex, '1+1j\0j')
-
-        self.assertRaises(TypeError, int, 5+3j)
-        self.assertRaises(TypeError, long, 5+3j)
-        self.assertRaises(TypeError, float, 5+3j)
-        self.assertRaises(ValueError, complex, "")
-        self.assertRaises(TypeError, complex, None)
-        self.assertRaises(ValueError, complex, "\0")
-        self.assertRaises(TypeError, complex, "1", "2")
-        self.assertRaises(TypeError, complex, "1", 42)
-        self.assertRaises(TypeError, complex, 1, "2")
-        self.assertRaises(ValueError, complex, "1+")
-        self.assertRaises(ValueError, complex, "1+1j+1j")
-        self.assertRaises(ValueError, complex, "--")
-        if test_support.have_unicode:
-            self.assertRaises(ValueError, complex, unicode("1"*500))
-            self.assertRaises(ValueError, complex, unicode("x"))
-
-        class EvilExc(Exception):
-            pass
-
-        class evilcomplex:
-            def __complex__(self):
-                raise EvilExc
-
-        self.assertRaises(EvilExc, complex, evilcomplex())
-
-        class float2:
-            def __init__(self, value):
-                self.value = value
-            def __float__(self):
-                return self.value
-
-        self.assertAlmostEqual(complex(float2(42.)), 42)
-        self.assertAlmostEqual(complex(real=float2(17.), imag=float2(23.)), 17+23j)
-        self.assertRaises(TypeError, complex, float2(None))
-
-    def test_hash(self):
-        for x in xrange(-30, 30):
-            self.assertEqual(hash(x), hash(complex(x, 0)))
-            x /= 3.0    # now check against floating point
-            self.assertEqual(hash(x), hash(complex(x, 0.)))
-
-    def test_abs(self):
-        nums = [complex(x/3., y/7.) for x in xrange(-9,9) for y in xrange(-9,9)]
-        for num in nums:
-            self.assertAlmostEqual((num.real**2 + num.imag**2)  ** 0.5, abs(num))
-
-    def test_repr(self):
-        self.assertEqual(repr(1+6j), '(1+6j)')
-
-    def test_neg(self):
-        self.assertEqual(-(1+6j), -1-6j)
-
-    def test_file(self):
-        a = 3.33+4.43j
-        b = 5.1+2.3j
-
-        fo = None
-        try:
-            fo = open(test_support.TESTFN, "wb")
-            print >>fo, a, b
-            fo.close()
-            fo = open(test_support.TESTFN, "rb")
-            self.assertEqual(fo.read(), "%s %s\n" % (a, b))
-        finally:
-            if (fo is not None) and (not fo.closed):
-                fo.close()
-            try:
-                os.remove(test_support.TESTFN)
-            except (OSError, IOError):
-                pass
-
-def test_main():
-    test_support.run_unittest(ComplexTest)
-
-if __name__ == "__main__":
-    test_main()

Added: trunk/jython/Lib/test/test_complex_jy.py
===================================================================
--- trunk/jython/Lib/test/test_complex_jy.py	                        (rev 0)
+++ trunk/jython/Lib/test/test_complex_jy.py	2008-06-26 01:31:47 UTC (rev 4780)
@@ -0,0 +1,19 @@
+"""Misc complex tests
+
+Made for Jython.
+"""
+import unittest
+from test import test_support
+
+class ComplexTest(unittest.TestCase):
+
+    def test_dunder_coerce(self):
+        self.assertEqual(complex.__coerce__(1+1j, None), NotImplemented)
+        self.assertRaises(TypeError, complex.__coerce__, None, 1+2j)
+
+
+def test_main():
+    test_support.run_unittest(ComplexTest)
+
+if __name__ == "__main__":
+    test_main()

Deleted: trunk/jython/Lib/test/test_contains.py
===================================================================
--- trunk/jython/Lib/test/test_contains.py	2008-06-26 01:16:20 UTC (rev 4779)
+++ trunk/jython/Lib/test/test_contains.py	2008-06-26 01:31:47 UTC (rev 4780)
@@ -1,133 +0,0 @@
-from test.test_support import TestFailed, have_unicode
-
-class base_set:
-
-    def __init__(self, el):
-        self.el = el
-
-class set(base_set):
-
-    def __contains__(self, el):
-        return self.el == el
-
-class seq(base_set):
-
-    def __getitem__(self, n):
-        return [self.el][n]
-
-def check(ok, *args):
-    if not ok:
-        raise TestFailed, " ".join(map(str, args))
-
-a = base_set(1)
-b = set(1)
-c = seq(1)
-
-check(1 in b, "1 not in set(1)")
-check(0 not in b, "0 in set(1)")
-check(1 in c, "1 not in seq(1)")
-check(0 not in c, "0 in seq(1)")
-
-try:
-    1 in a
-    check(0, "in base_set did not raise error")
-except TypeError:
-    pass
-
-try:
-    1 not in a
-    check(0, "not in base_set did not raise error")
-except TypeError:
-    pass
-
-# Test char in string
-
-check('c' in 'abc', "'c' not in 'abc'")
-check('d' not in 'abc', "'d' in 'abc'")
-
-check('' in '', "'' not in ''")
-check('' in 'abc', "'' not in 'abc'")
-
-try:
-    None in 'abc'
-    check(0, "None in 'abc' did not raise error")
-except TypeError:
-    pass
-
-
-if have_unicode:
-
-    # Test char in Unicode
-
-    check('c' in unicode('abc'), "'c' not in u'abc'")
-    check('d' not in unicode('abc'), "'d' in u'abc'")
-
-    check('' in unicode(''), "'' not in u''")
-    check(unicode('') in '', "u'' not in ''")
-    check(unicode('') in unicode(''), "u'' not in u''")
-    check('' in unicode('abc'), "'' not in u'abc'")
-    check(unicode('') in 'abc', "u'' not in 'abc'")
-    check(unicode('') in unicode('abc'), "u'' not in u'abc'")
-
-    try:
-        None in unicode('abc')
-        check(0, "None in u'abc' did not raise error")
-    except TypeError:
-        pass
-
-    # Test Unicode char in Unicode
-
-    check(unicode('c') in unicode('abc'), "u'c' not in u'abc'")
-    check(unicode('d') not in unicode('abc'), "u'd' in u'abc'")
-
-    # Test Unicode char in string
-
-    check(unicode('c') in 'abc', "u'c' not in 'abc'")
-    check(unicode('d') not in 'abc', "u'd' in 'abc'")
-
-# A collection of tests on builtin sequence types
-a = range(10)
-for i in a:
-    check(i in a, "%s not in %s" % (`i`, `a`))
-check(16 not in a, "16 not in %s" % `a`)
-check(a not in a, "%s not in %s" % (`a`, `a`))
-
-a = tuple(a)
-for i in a:
-    check(i in a, "%s not in %s" % (`i`, `a`))
-check(16 not in a, "16 not in %s" % `a`)
-check(a not in a, "%s not in %s" % (`a`, `a`))
-
-class Deviant1:
-    """Behaves strangely when compared
-
-    This class is designed to make sure that the contains code
-    works when the list is modified during the check.
-    """
-
-    aList = range(15)
-
-    def __cmp__(self, other):
-        if other == 12:
-            self.aList.remove(12)
-            self.aList.remove(13)
-            self.aList.remove(14)
-        return 1
-
-check(Deviant1() not in Deviant1.aList, "Deviant1 failed")
-
-class Deviant2:
-    """Behaves strangely when compared
-
-    This class raises an exception during comparison.  That in
-    turn causes the comparison to fail with a TypeError.
-    """
-
-    def __cmp__(self, other):
-        if other == 4:
-            raise RuntimeError, "gotcha"
-
-try:
-    check(Deviant2() not in a, "oops")
-except TypeError:
-    pass

Deleted: trunk/jython/Lib/test/test_heapq.py
===================================================================
--- trunk/jython/Lib/test/test_heapq.py	2008-06-26 01:16:20 UTC (rev 4779)
+++ trunk/jython/Lib/test/test_heapq.py	2008-06-26 01:31:47 UTC (rev 4780)
@@ -1,92 +0,0 @@
-"""Unittests for heapq."""
-
-from test.test_support import verify, vereq, verbose, TestFailed
-
-from heapq import heappush, heappop, heapify, heapreplace
-import random
-
-def check_invariant(heap):
-    # Check the heap invariant.
-    for pos, item in enumerate(heap):
-        if pos: # pos 0 has no parent
-            parentpos = (pos-1) >> 1
-            verify(heap[parentpos] <= item)
-
-# An iterator returning a heap's elements, smallest-first.
-class heapiter(object):
-    def __init__(self, heap):
-        self.heap = heap
-
-    def next(self):
-        try:
-            return heappop(self.heap)
-        except IndexError:
-            raise StopIteration
-
-    def __iter__(self):
-        return self
-
-def test_main():
-    # 1) Push 100 random numbers and pop them off, verifying all's OK.
-    heap = []
-    data = []
-    check_invariant(heap)
-    for i in range(256):
-        item = random.random()
-        data.append(item)
-        heappush(heap, item)
-        check_invariant(heap)
-    results = []
-    while heap:
-        item = heappop(heap)
-        check_invariant(heap)
-        results.append(item)
-    data_sorted = data[:]
-    data_sorted.sort()
-    vereq(data_sorted, results)
-    # 2) Check that the invariant holds for a sorted array
-    check_invariant(results)
-    # 3) Naive "N-best" algorithm
-    heap = []
-    for item in data:
-        heappush(heap, item)
-        if len(heap) > 10:
-            heappop(heap)
-    heap.sort()
-    vereq(heap, data_sorted[-10:])
-    # 4) Test heapify.
-    for size in range(30):
-        heap = [random.random() for dummy in range(size)]
-        heapify(heap)
-        check_invariant(heap)
-    # 5) Less-naive "N-best" algorithm, much faster (if len(data) is big
-    #    enough <wink>) than sorting all of data.  However, if we had a max
-    #    heap instead of a min heap, it could go faster still via
-    #    heapify'ing all of data (linear time), then doing 10 heappops
-    #    (10 log-time steps).
-    heap = data[:10]
-    heapify(heap)
-    for item in data[10:]:
-        if item > heap[0]:  # this gets rarer the longer we run
-            heapreplace(heap, item)
-    vereq(list(heapiter(heap)), data_sorted[-10:])
-    # 6)  Exercise everything with repeated heapsort checks
-    for trial in xrange(100):
-        size = random.randrange(50)
-        data = [random.randrange(25) for i in range(size)]
-        if trial & 1:     # Half of the time, use heapify
-            heap = data[:]
-            heapify(heap)
-        else:             # The rest of the time, use heappush
-            heap = []
-            for item in data:
-                heappush(heap,item)
-        data.sort()
-        sorted = [heappop(heap) for i in range(size)]
-        vereq(data, sorted)
-    # Make user happy
-    if verbose:
-        print "All OK"
-
-if __name__ == "__main__":
-    test_main()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.