[Jython-checkins] SF.net SVN: jython:[5619] trunk/jython

[<pj...@us...>]

Revision: 5619
          http://jython.svn.sourceforge.net/jython/?rev=5619&view=rev
Author:   pjenvey
Date:     2008-11-23 20:58:25 +0000 (Sun, 23 Nov 2008)

Log Message:
-----------
fix bit rot in the Expose javatests:
ensure we setType new descriptors, init sys when needed, fix null method docs
(use "" instead)

Modified Paths:
--------------
    trunk/jython/src/org/python/expose/generate/InstanceMethodExposer.java
    trunk/jython/tests/java/org/python/expose/generate/DescriptorExposerTest.java
    trunk/jython/tests/java/org/python/expose/generate/ExposedTypeProcessorTest.java

Modified: trunk/jython/src/org/python/expose/generate/InstanceMethodExposer.java
===================================================================
--- trunk/jython/src/org/python/expose/generate/InstanceMethodExposer.java	2008-11-23 19:35:19 UTC (rev 5618)
+++ trunk/jython/src/org/python/expose/generate/InstanceMethodExposer.java	2008-11-23 20:58:25 UTC (rev 5619)
@@ -28,7 +28,7 @@
              new String[0],
              new String[0],
              MethodType.DEFAULT,
-             null);
+             "");
     }
 
     public InstanceMethodExposer(Type onType,

Modified: trunk/jython/tests/java/org/python/expose/generate/DescriptorExposerTest.java
===================================================================
--- trunk/jython/tests/java/org/python/expose/generate/DescriptorExposerTest.java	2008-11-23 19:35:19 UTC (rev 5618)
+++ trunk/jython/tests/java/org/python/expose/generate/DescriptorExposerTest.java	2008-11-23 20:58:25 UTC (rev 5619)
@@ -33,7 +33,9 @@
         DescriptorExposer de = new DescriptorExposer(ASM_TYPE, name);
         setup.setup(de);
         Class descriptor = de.load(new BytecodeLoader.Loader());
-        return (PyDataDescr)descriptor.newInstance();
+        PyDataDescr descr = (PyDataDescr)descriptor.newInstance();
+        descr.setType(PY_TYPE);
+        return descr;
     }
 
     public PyDataDescr makeDescriptor(DescSetup setup) throws Exception {

Modified: trunk/jython/tests/java/org/python/expose/generate/ExposedTypeProcessorTest.java
===================================================================
--- trunk/jython/tests/java/org/python/expose/generate/ExposedTypeProcessorTest.java	2008-11-23 19:35:19 UTC (rev 5618)
+++ trunk/jython/tests/java/org/python/expose/generate/ExposedTypeProcessorTest.java	2008-11-23 20:58:25 UTC (rev 5619)
@@ -11,7 +11,7 @@
 import org.python.core.PyObject;
 import org.python.core.PyType;
 
-public class ExposedTypeProcessorTest extends TestCase {
+public class ExposedTypeProcessorTest extends InterpTestCase {
 
     public void testDetectType() throws Exception {
         InputStream in = getClass().getClassLoader()
@@ -41,6 +41,7 @@
         PyBuiltinCallable bound = func.bind(simp);
         bound.__call__();
         PyDataDescr desc = (PyDataDescr)tostringDesc.newInstance();
+        desc.setType(simp.getType());
         assertEquals(doctoredSimple.getField("toStringVal").get(simp),
                      desc.__get__(simp, PyType.fromClass(doctoredSimple)).toString());
     }


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