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

[<cg...@us...>]

Revision: 5752
          http://jython.svn.sourceforge.net/jython/?rev=5752&view=rev
Author:   cgroves
Date:     2008-12-13 07:33:55 +0000 (Sat, 13 Dec 2008)

Log Message:
-----------
Move test087 into test_java_integration, and test088 and test090 are tested by test_java_integration and test_imp_jy respectively

Modified Paths:
--------------
    trunk/jython/Lib/test/test_java_integration.py

Removed Paths:
-------------
    trunk/jython/bugtests/classes/test090j.java
    trunk/jython/bugtests/test087.py
    trunk/jython/bugtests/test087m.py
    trunk/jython/bugtests/test088.py
    trunk/jython/bugtests/test088p/
    trunk/jython/bugtests/test090.py

Modified: trunk/jython/Lib/test/test_java_integration.py
===================================================================
--- trunk/jython/Lib/test/test_java_integration.py	2008-12-12 15:46:58 UTC (rev 5751)
+++ trunk/jython/Lib/test/test_java_integration.py	2008-12-13 07:33:55 UTC (rev 5752)
@@ -99,6 +99,16 @@
                 return 'name'
         self.assertEquals('name', String.valueOf(A()))
 
+    def test_multiple_inheritance_prohibited(self):
+        try:
+            class MultiJava(Dimension, Color):
+                pass
+            self.fail("Shouldn't be able to subclass more than one concrete java class")
+        except TypeError:
+            pass
+
+
+
 class SysIntegrationTest(unittest.TestCase):
     def test_stdout_outputstream(self):
         out = FileOutputStream(test_support.TESTFN)

Deleted: trunk/jython/bugtests/classes/test090j.java
===================================================================
--- trunk/jython/bugtests/classes/test090j.java	2008-12-12 15:46:58 UTC (rev 5751)
+++ trunk/jython/bugtests/classes/test090j.java	2008-12-13 07:33:55 UTC (rev 5752)
@@ -1,16 +0,0 @@
-
-public class test090j {
-  public test090j() {
-  }
-  public int barTimesTwo(Bar bar) {
-    return (2*bar.n);
-  }
-  public static class Bar {
-    public Bar() {
-    }
-    public Bar(int n) {
-      this.n = n;
-    }
-    public int n;
-  }
-}
\ No newline at end of file

Deleted: trunk/jython/bugtests/test087.py
===================================================================
--- trunk/jython/bugtests/test087.py	2008-12-12 15:46:58 UTC (rev 5751)
+++ trunk/jython/bugtests/test087.py	2008-12-13 07:33:55 UTC (rev 5752)
@@ -1,12 +0,0 @@
-"""
-Test multiple inheritance of 2 java classes
-"""
-
-import support
-
-try:
-    import test087m
-except TypeError, e:
-    support.compare(e, "multiple inheritance")
-else:
-    raise support.TestError("multiple inheritance should fail")

Deleted: trunk/jython/bugtests/test087m.py
===================================================================
--- trunk/jython/bugtests/test087m.py	2008-12-12 15:46:58 UTC (rev 5751)
+++ trunk/jython/bugtests/test087m.py	2008-12-13 07:33:55 UTC (rev 5752)
@@ -1,10 +0,0 @@
-"""
-Test multiple inheritance of 2 java classes
-"""
-
-import support
-
-import java
-class T(java.awt.Panel, java.awt.event.MouseAdapter):
-    def __init__(self):
-	pass

Deleted: trunk/jython/bugtests/test088.py
===================================================================
--- trunk/jython/bugtests/test088.py	2008-12-12 15:46:58 UTC (rev 5751)
+++ trunk/jython/bugtests/test088.py	2008-12-13 07:33:55 UTC (rev 5752)
@@ -1,10 +0,0 @@
-"""
-Check namespace of code running in a module __init__.py
-"""
-
-import support
-
-import test088p
-
-r = test088p.foobase.doit()
-support.compare(r, "Done")

Deleted: trunk/jython/bugtests/test090.py
===================================================================
--- trunk/jython/bugtests/test090.py	2008-12-12 15:46:58 UTC (rev 5751)
+++ trunk/jython/bugtests/test090.py	2008-12-13 07:33:55 UTC (rev 5752)
@@ -1,16 +0,0 @@
-"""
-Access to innerclasses
-"""
-
-import support
-
-support.compileJava("classes/test090j.java")
-
-import test090j
-
-foo = test090j()
-bar = test090j.Bar()
-bar.n = 10
-r = foo.barTimesTwo(bar)
-
-support.compare(r, "20")


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