jython-checkins — For Jython checkin messages

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

[<otm...@us...>]

Revision: 5450
          http://jython.svn.sourceforge.net/jython/?rev=5450&view=rev
Author:   otmarhumbel
Date:     2008-10-16 22:20:26 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
target java specification version is 1.5

Modified Paths:
--------------
    trunk/installer/src/java/org/python/util/install/Installation.java
    trunk/installer/test/java/org/python/util/install/InstallationTest.java

Modified: trunk/installer/src/java/org/python/util/install/Installation.java
===================================================================
--- trunk/installer/src/java/org/python/util/install/Installation.java	2008-10-16 22:15:33 UTC (rev 5449)
+++ trunk/installer/src/java/org/python/util/install/Installation.java	2008-10-16 22:20:26 UTC (rev 5450)
@@ -101,7 +101,7 @@
         }
         boolean valid = true;
         if (major == 1) {
-            if (minor < 2) {
+            if (minor < 5) {
                 valid = false;
             }
         }

Modified: trunk/installer/test/java/org/python/util/install/InstallationTest.java
===================================================================
--- trunk/installer/test/java/org/python/util/install/InstallationTest.java	2008-10-16 22:15:33 UTC (rev 5449)
+++ trunk/installer/test/java/org/python/util/install/InstallationTest.java	2008-10-16 22:20:26 UTC (rev 5450)
@@ -58,11 +58,11 @@
         javaVersionInfo.setSpecificationVersion("1.1.9");
         assertFalse(Installation.isValidJava(javaVersionInfo));
         javaVersionInfo.setSpecificationVersion("1.2");
-        assertTrue(Installation.isValidJava(javaVersionInfo));
+        assertFalse(Installation.isValidJava(javaVersionInfo));
         javaVersionInfo.setSpecificationVersion("1.3");
-        assertTrue(Installation.isValidJava(javaVersionInfo));
+        assertFalse(Installation.isValidJava(javaVersionInfo));
         javaVersionInfo.setSpecificationVersion("1.4");
-        assertTrue(Installation.isValidJava(javaVersionInfo));
+        assertFalse(Installation.isValidJava(javaVersionInfo));
         javaVersionInfo.setSpecificationVersion("1.5");
         assertTrue(Installation.isValidJava(javaVersionInfo));
         javaVersionInfo.setSpecificationVersion("1.6");


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

[Jython-checkins] SF.net SVN: jython:[5449] trunk/installer/src/java/org/python/util/install/ Installation.java

[<otm...@us...>]

Revision: 5449
          http://jython.svn.sourceforge.net/jython/?rev=5449&view=rev
Author:   otmarhumbel
Date:     2008-10-16 22:15:33 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
making verbose mode a bit more verbose

Modified Paths:
--------------
    trunk/installer/src/java/org/python/util/install/Installation.java

Modified: trunk/installer/src/java/org/python/util/install/Installation.java
===================================================================
--- trunk/installer/src/java/org/python/util/install/Installation.java	2008-10-16 21:21:08 UTC (rev 5448)
+++ trunk/installer/src/java/org/python/util/install/Installation.java	2008-10-16 22:15:33 UTC (rev 5449)
@@ -93,15 +93,15 @@
         int major = 0;
         int minor = 0;
         StringTokenizer tokenizer = new StringTokenizer(specificationVersion, ".");
-        if( tokenizer.hasMoreTokens()) {
+        if (tokenizer.hasMoreTokens()) {
             major = Integer.valueOf(tokenizer.nextToken()).intValue();
         }
         if (tokenizer.hasMoreTokens()) {
             minor = Integer.valueOf(tokenizer.nextToken()).intValue();
         }
         boolean valid = true;
-        if( major == 1) {
-            if( minor < 2) {
+        if (major == 1) {
+            if (minor < 2) {
                 valid = false;
             }
         }
@@ -266,13 +266,27 @@
     }
 
     public static boolean isGuiAllowed() {
+        boolean verbose = isVerbose();
+        if (verbose) {
+            ConsoleInstaller.message("checking gui availability");
+        }
         if (Boolean.getBoolean(HEADLESS_PROPERTY_NAME)) {
             return false;
         }
         try {
+            if (verbose) {
+                ConsoleInstaller.message("trying to get the graphics environment");
+            }
             GraphicsEnvironment.getLocalGraphicsEnvironment();
+            if (verbose) {
+                ConsoleInstaller.message("got the graphics environment!");
+            }
             return true;
         } catch (Throwable t) {
+            if (verbose) {
+                ConsoleInstaller.message("got the following exception:");
+                t.printStackTrace();
+            }
             return false;
         }
     }
@@ -299,13 +313,21 @@
      */
     private static void internalMain(String[] args, Autotest autotest, Tunnel tunnel) {
         try {
+            boolean earlyVerbose = InstallerCommandLine.hasVerboseOptionInArgs(args);
+            if (earlyVerbose) {
+                ConsoleInstaller.message("reading jar info");
+            }
             JarInfo jarInfo = new JarInfo();
             InstallerCommandLine commandLine = new InstallerCommandLine(jarInfo);
             if (!commandLine.setArgs(args) || commandLine.hasHelpOption()) {
                 commandLine.printHelp();
                 System.exit(1);
             } else {
+                _verbose = commandLine.hasVerboseOption();
                 if (commandLine.hasAutotestOption()) {
+                    if (isVerbose()) {
+                        ConsoleInstaller.message("running autotests");
+                    }
                     _isAutotesting = true;
                     InstallationDriver autotestDriver = new InstallationDriver(commandLine);
                     autotestDriver.drive(); // ! reentrant into internalMain()
@@ -313,10 +335,10 @@
                     ConsoleInstaller.message("\ncongratulations - autotests complete !");
                     System.exit(0);
                 }
-                if (commandLine.hasVerboseOption()) {
-                    _verbose = true;
-                }
                 if (!useGui(commandLine)) {
+                    if (isVerbose()) {
+                        ConsoleInstaller.message("using the console installer");
+                    }
                     ConsoleInstaller consoleInstaller = new ConsoleInstaller(commandLine, jarInfo);
                     consoleInstaller.setTunnel(tunnel);
                     consoleInstaller.install();
@@ -324,6 +346,9 @@
                         System.exit(0);
                     }
                 } else {
+                    if (isVerbose()) {
+                        ConsoleInstaller.message("using the gui installer");
+                    }
                     new FrameInstaller(commandLine, jarInfo, autotest);
                 }
             }


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

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

[<otm...@us...>]

Revision: 5448
          http://jython.svn.sourceforge.net/jython/?rev=5448&view=rev
Author:   otmarhumbel
Date:     2008-10-16 21:21:08 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
added prescan of arguments

Modified Paths:
--------------
    trunk/installer/src/java/org/python/util/install/InstallerCommandLine.java
    trunk/installer/test/java/org/python/util/install/InstallerCommandLineTest.java

Modified: trunk/installer/src/java/org/python/util/install/InstallerCommandLine.java
===================================================================
--- trunk/installer/src/java/org/python/util/install/InstallerCommandLine.java	2008-10-16 21:15:59 UTC (rev 5447)
+++ trunk/installer/src/java/org/python/util/install/InstallerCommandLine.java	2008-10-16 21:21:08 UTC (rev 5448)
@@ -30,8 +30,8 @@
     private static final String SILENT_LONG = "silent";
     private static final String SILENT_DESC = "silent installation (without user interaction)";
 
-    private static final String VERBOSE_SHORT = "v";
-    private static final String VERBOSE_LONG = "verbose";
+    protected static final String VERBOSE_SHORT = "v";
+    protected static final String VERBOSE_LONG = "verbose";
     private static final String VERBOSE_DESC = "print more output during the installation\n"
             + "(also valid in GUI and autotest mode)";
 
@@ -123,6 +123,22 @@
     }
 
     /**
+     * Pre-scan of the arguments to detect a verbose flag
+     * @param args 
+     * @return <code>true</code> if there is a verbose option
+     */
+    public static final boolean hasVerboseOptionInArgs(String[] args) {
+        String shortVerbose = "-".concat(VERBOSE_SHORT);
+        String longVerbose = "--".concat(VERBOSE_LONG);
+        for (String arg : args) {
+            if (shortVerbose.equals(arg) || longVerbose.equals(arg)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
      * constructor intended for JUnit tests only.
      */
     public InstallerCommandLine() {

Modified: trunk/installer/test/java/org/python/util/install/InstallerCommandLineTest.java
===================================================================
--- trunk/installer/test/java/org/python/util/install/InstallerCommandLineTest.java	2008-10-16 21:15:59 UTC (rev 5447)
+++ trunk/installer/test/java/org/python/util/install/InstallerCommandLineTest.java	2008-10-16 21:21:08 UTC (rev 5448)
@@ -511,4 +511,27 @@
         commandLine.printHelp();
     }
 
+    public void testHasVerboseOptionInArgs() {
+        String[] args = new String[0];
+        assertFalse(InstallerCommandLine.hasVerboseOptionInArgs(args));
+
+        args = new String[] {"a", "b", "c"};
+        assertFalse(InstallerCommandLine.hasVerboseOptionInArgs(args));
+ 
+        args = new String[] {"a", InstallerCommandLine.VERBOSE_SHORT, "c"};
+        assertFalse(InstallerCommandLine.hasVerboseOptionInArgs(args));
+        
+        args = new String[] {"a", "-" + InstallerCommandLine.VERBOSE_SHORT, "c"};
+        assertTrue(InstallerCommandLine.hasVerboseOptionInArgs(args));
+        
+        args = new String[] {"a", InstallerCommandLine.VERBOSE_LONG, "c"};
+        assertFalse(InstallerCommandLine.hasVerboseOptionInArgs(args));
+        
+        args = new String[] {"a", "-" + InstallerCommandLine.VERBOSE_LONG, "c"};
+        assertFalse(InstallerCommandLine.hasVerboseOptionInArgs(args));
+        
+        args = new String[] {"a", "--" + InstallerCommandLine.VERBOSE_LONG, "c"};
+        assertTrue(InstallerCommandLine.hasVerboseOptionInArgs(args));
+    }
+    
 }


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

[Jython-checkins] SF.net SVN: jython:[5447] trunk/jython/src/org/python/core/Py.java

[<fwi...@us...>]

Revision: 5447
          http://jython.svn.sourceforge.net/jython/?rev=5447&view=rev
Author:   fwierzbicki
Date:     2008-10-16 21:15:59 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
put in null guard for cflags call.  cflags can definitely be null at this
point in the code.

Modified Paths:
--------------
    trunk/jython/src/org/python/core/Py.java

Modified: trunk/jython/src/org/python/core/Py.java
===================================================================
--- trunk/jython/src/org/python/core/Py.java	2008-10-16 20:59:53 UTC (rev 5446)
+++ trunk/jython/src/org/python/core/Py.java	2008-10-16 21:15:59 UTC (rev 5447)
@@ -1697,7 +1697,7 @@
         }
         
         byte[] bytes;
-        if (cflags.dont_imply_dedent) {
+        if (cflags != null && cflags.dont_imply_dedent) {
             bytes = StringUtil.toBytes(data + "\n");
         } else {
             bytes = StringUtil.toBytes(data + "\n\n");


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

[Jython-checkins] SF.net SVN: jython:[5446] trunk/jython/Lib/test/test_java_integration.py

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

Revision: 5446
          http://jython.svn.sourceforge.net/jython/?rev=5446&view=rev
Author:   cgroves
Date:     2008-10-16 20:59:53 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
Use assertRaises instead of
try: 
  code
except ExpectedException:
  pass
else:
  self.fail

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

Modified: trunk/jython/Lib/test/test_java_integration.py
===================================================================
--- trunk/jython/Lib/test/test_java_integration.py	2008-10-16 20:36:11 UTC (rev 5445)
+++ trunk/jython/Lib/test/test_java_integration.py	2008-10-16 20:59:53 UTC (rev 5446)
@@ -130,10 +130,7 @@
         self.assertRaises(TypeError, A)
         
     def test_no_public_constructors(self):
-        try:
-           Math() 
-        except TypeError, e:
-            self.assert_("no public constructors for" in str(e))
+        self.assertRaises(TypeError, Math)
 
 class PyObjectCmpTest(unittest.TestCase):
 
@@ -150,21 +147,12 @@
     def test_io_errors(self):
         "Check that IOException isn't mangled into an IOError"
         from java.io import UnsupportedEncodingException
-        try:
-            x = OutputStreamWriter(System.out, "garbage")
-        except UnsupportedEncodingException:
-            pass
-        else:
-            self.fail("Should have raised java.io.UnsupportedEncodingException")
+        self.assertRaises(UnsupportedEncodingException, OutputStreamWriter, 
+                System.out, "garbage")
     
     def test_fileio_error(self):
-        from java.io import FileInputStream, IOException
-        try:
-            stream = FileInputStream("garbage")
-        except IOException:
-            pass
-        else:
-            self.fail("Should raise java.io.IOException")
+        from java.io import FileInputStream, FileNotFoundException
+        self.assertRaises(FileNotFoundException, FileInputStream, "garbage")
 
 class VectorTest(unittest.TestCase):
 
@@ -329,11 +317,8 @@
 class ImportTest(unittest.TestCase):
     
     def test_bad_input_exception(self):
-        try:
-            __import__('')
-        except ValueError, e:
-            self.assert_("Empty module name" in str(e))
-        
+        self.assertRaises(ValueError, __import__, '')
+
 class ButtonTest(unittest.TestCase):
 
     def test_setLabel(self):
@@ -402,12 +387,7 @@
     def test_string_not_iterable(self):
         from java import lang
         x = lang.String('test')
-        try:
-            list(x)
-        except TypeError:
-            pass
-        else:
-            self.fail("Should have raised TypeError")
+        self.assertRaises(TypeError, list, x)
 
 def test_main():
     test_support.run_unittest(AbstractOnSyspathTest,


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

[Jython-checkins] SF.net SVN: jython:[5445] trunk/installer/test/java/org/python/util/install /StartScriptGeneratorTest.java

[<otm...@us...>]

Revision: 5445
          http://jython.svn.sourceforge.net/jython/?rev=5445&view=rev
Author:   otmarhumbel
Date:     2008-10-16 20:36:11 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
reflect the latest change to jython.bat

Modified Paths:
--------------
    trunk/installer/test/java/org/python/util/install/StartScriptGeneratorTest.java

Modified: trunk/installer/test/java/org/python/util/install/StartScriptGeneratorTest.java
===================================================================
--- trunk/installer/test/java/org/python/util/install/StartScriptGeneratorTest.java	2008-10-16 20:34:32 UTC (rev 5444)
+++ trunk/installer/test/java/org/python/util/install/StartScriptGeneratorTest.java	2008-10-16 20:36:11 UTC (rev 5445)
@@ -82,7 +82,7 @@
         String winScript = _generator.getJythonScript(StartScriptGenerator.WINDOWS_FLAVOUR);
         assertTrue(winScript.startsWith(start));
         assertTrue(winScript.length() > 3500);
-        assertTrue(winScript.indexOf("if not [%JAVA_HOME%] == []") > start.length());
+        assertTrue(winScript.indexOf("if not \"%_TRIMMED_JAVA_HOME%\"==\"\"") > start.length());
         assertTrue(winScript.indexOf("-Dpython.home=") > start.length());
         assertTrue(winScript.indexOf("-Dpython.executable=") > start.length());
     }


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

[Jython-checkins] SF.net SVN: jython:[5444] trunk/jython/Lib/test/test_java_integration.py

[<fwi...@us...>]

Revision: 5444
          http://jython.svn.sourceforge.net/jython/?rev=5444&view=rev
Author:   fwierzbicki
Date:     2008-10-16 20:34:32 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
better name for test method.

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

Modified: trunk/jython/Lib/test/test_java_integration.py
===================================================================
--- trunk/jython/Lib/test/test_java_integration.py	2008-10-16 20:32:40 UTC (rev 5443)
+++ trunk/jython/Lib/test/test_java_integration.py	2008-10-16 20:34:32 UTC (rev 5444)
@@ -399,7 +399,7 @@
 
 class JavaStringTest(unittest.TestCase):
     
-    def test_override(self):
+    def test_string_not_iterable(self):
         from java import lang
         x = lang.String('test')
         try:


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

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

[<fwi...@us...>]

Revision: 5443
          http://jython.svn.sourceforge.net/jython/?rev=5443&view=rev
Author:   fwierzbicki
Date:     2008-10-16 20:32:40 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
moved test136 to test_java_integration.py

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

Removed Paths:
-------------
    trunk/jython/bugtests/test136.py

Modified: trunk/jython/Lib/test/test_java_integration.py
===================================================================
--- trunk/jython/Lib/test/test_java_integration.py	2008-10-16 20:24:04 UTC (rev 5442)
+++ trunk/jython/Lib/test/test_java_integration.py	2008-10-16 20:32:40 UTC (rev 5443)
@@ -397,6 +397,17 @@
 
         self.assertEquals(s, "Foo!!!", "toString not overridden in interface")
 
+class JavaStringTest(unittest.TestCase):
+    
+    def test_override(self):
+        from java import lang
+        x = lang.String('test')
+        try:
+            list(x)
+        except TypeError:
+            pass
+        else:
+            self.fail("Should have raised TypeError")
 
 def test_main():
     test_support.run_unittest(AbstractOnSyspathTest,
@@ -416,7 +427,9 @@
                               TreePathTest,
                               BigDecimalTest,
                               MethodInvTest,
-                              InterfaceTest)
+                              InterfaceTest,
+                              JavaStringTest,
+                              )
 
 if __name__ == "__main__":
     test_main()

Deleted: trunk/jython/bugtests/test136.py
===================================================================
--- trunk/jython/bugtests/test136.py	2008-10-16 20:24:04 UTC (rev 5442)
+++ trunk/jython/bugtests/test136.py	2008-10-16 20:32:40 UTC (rev 5443)
@@ -1,19 +0,0 @@
-"""
-
-"""
-
-import support
-
-import java 
-
-x = java.lang.String('test')
-
-try:
-    list(x)
-except AttributeError, e:
-    support.compare(e, "__len__")
-except TypeError, e:
-    # Changed to a TypeError in 2.2
-    support.compare(e, "iteration over non-sequence")
-else:
-    raise support.TestError("Should raise a AttributeError on __len__")


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

[Jython-checkins] SF.net SVN: jython:[5442] trunk/jython/bugtests/test135.py

[<fwi...@us...>]

Revision: 5442
          http://jython.svn.sourceforge.net/jython/?rev=5442&view=rev
Author:   fwierzbicki
Date:     2008-10-16 20:24:04 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
This really just tests that copy.copy exists.  We run the real test_copy and
so have no need for this test.

Removed Paths:
-------------
    trunk/jython/bugtests/test135.py

Deleted: trunk/jython/bugtests/test135.py
===================================================================
--- trunk/jython/bugtests/test135.py	2008-10-16 20:22:15 UTC (rev 5441)
+++ trunk/jython/bugtests/test135.py	2008-10-16 20:24:04 UTC (rev 5442)
@@ -1,16 +0,0 @@
-"""
-
-"""
-
-import support
-
-class A:
-   pass
-
-a = A()
-import copy
-b = copy.copy(a)
-#print b
-#print a
-
-#raise support.TestError("" + `x`)


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

[Jython-checkins] SF.net SVN: jython:[5441] trunk/jython/bugtests/test134.py

[<fwi...@us...>]

Revision: 5441
          http://jython.svn.sourceforge.net/jython/?rev=5441&view=rev
Author:   fwierzbicki
Date:     2008-10-16 20:22:15 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
test_glob thoroughly tests glob.

Removed Paths:
-------------
    trunk/jython/bugtests/test134.py

Deleted: trunk/jython/bugtests/test134.py
===================================================================
--- trunk/jython/bugtests/test134.py	2008-10-16 20:19:50 UTC (rev 5440)
+++ trunk/jython/bugtests/test134.py	2008-10-16 20:22:15 UTC (rev 5441)
@@ -1,11 +0,0 @@
-"""
-
-"""
-
-import support
-
-import glob
-l = glob.glob('*')
-
-if l[0][:2] == "//":
-   raise support.TestError("cwd files should not start with //")


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

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

[<fwi...@us...>]

Revision: 5440
          http://jython.svn.sourceforge.net/jython/?rev=5440&view=rev
Author:   fwierzbicki
Date:     2008-10-16 20:19:50 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
moved test131 into test_java_integration

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

Removed Paths:
-------------
    trunk/jython/bugtests/test131.py

Modified: trunk/jython/Lib/test/test_java_integration.py
===================================================================
--- trunk/jython/Lib/test/test_java_integration.py	2008-10-16 18:58:39 UTC (rev 5439)
+++ trunk/jython/Lib/test/test_java_integration.py	2008-10-16 20:19:50 UTC (rev 5440)
@@ -7,8 +7,8 @@
 from java.awt import (Dimension, Component, Rectangle, Button, Color,
                       HeadlessException)
 from java.util import Vector, Hashtable
-from java.io import (FileOutputStream, FileWriter, OutputStreamWriter,
-                     UnsupportedEncodingException)
+from java.io import FileOutputStream, FileWriter, OutputStreamWriter
+                     
 from java.lang import Runnable, Thread, ThreadGroup, System, Runtime, Math, Byte
 from javax.swing.tree import TreePath
 from java.math import BigDecimal
@@ -149,12 +149,22 @@
 
     def test_io_errors(self):
         "Check that IOException isn't mangled into an IOError"
+        from java.io import UnsupportedEncodingException
         try:
-           x = OutputStreamWriter(System.out, "garbage")
+            x = OutputStreamWriter(System.out, "garbage")
         except UnsupportedEncodingException:
-           pass
+            pass
         else:
-           raise self.fail("Should have raised java.io.UnsupportedEncodingException")
+            self.fail("Should have raised java.io.UnsupportedEncodingException")
+    
+    def test_fileio_error(self):
+        from java.io import FileInputStream, IOException
+        try:
+            stream = FileInputStream("garbage")
+        except IOException:
+            pass
+        else:
+            self.fail("Should raise java.io.IOException")
 
 class VectorTest(unittest.TestCase):
 

Deleted: trunk/jython/bugtests/test131.py
===================================================================
--- trunk/jython/bugtests/test131.py	2008-10-16 18:58:39 UTC (rev 5439)
+++ trunk/jython/bugtests/test131.py	2008-10-16 20:19:50 UTC (rev 5440)
@@ -1,14 +0,0 @@
-"""
-"""
-
-import java 
-import support
-
-try:
-  stream = java.io.FileInputStream("missing")
-except java.io.IOException, ioexc:
-  #support.compare(ioexc.message, "cannot find")
-  # this message is not portable across underlying operating systems
-  pass
-else:
-  raise support.TestError("Should raise a IOException")


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

[Jython-checkins] SF.net SVN: jython:[5439] trunk/jython/bugtests/test133.py

[<fwi...@us...>]

Revision: 5439
          http://jython.svn.sourceforge.net/jython/?rev=5439&view=rev
Author:   fwierzbicki
Date:     2008-10-16 18:58:39 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
This is well tested in test_hexoct.py

Removed Paths:
-------------
    trunk/jython/bugtests/test133.py

Deleted: trunk/jython/bugtests/test133.py
===================================================================
--- trunk/jython/bugtests/test133.py	2008-10-16 18:56:04 UTC (rev 5438)
+++ trunk/jython/bugtests/test133.py	2008-10-16 18:58:39 UTC (rev 5439)
@@ -1,20 +0,0 @@
-"""
-Test some hex conversions.
-"""
-
-import support
-
-support.compare('%x' % -1, "ffffffff")
-
-support.compare(str(hex(-1l)), "-0x1L")
-
-if int("0", 16) != 0:
-    raise support.TestError("Should return 0")
-
-#Test removed. %x can handle longs in 2.0
-#try:
-#    print '%x' % 0x100000000L
-#except OverflowError, e:
-#    support.compare(e, "long int too long")
-#else:
-#    raise support.TestError("Should raise a OverflowException")


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

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

[<fwi...@us...>]

Revision: 5438
          http://jython.svn.sourceforge.net/jython/?rev=5438&view=rev
Author:   fwierzbicki
Date:     2008-10-16 18:56:04 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
moved test130 to test_cmp_jy.

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

Removed Paths:
-------------
    trunk/jython/bugtests/test130.py

Modified: trunk/jython/Lib/test/test_cmp_jy.py
===================================================================
--- trunk/jython/Lib/test/test_cmp_jy.py	2008-10-16 17:51:59 UTC (rev 5437)
+++ trunk/jython/Lib/test/test_cmp_jy.py	2008-10-16 18:56:04 UTC (rev 5438)
@@ -21,8 +21,23 @@
         self.assertNotEqual(Test(0), 'foo')
         self.assertTrue('foo' in [Test(12), 'foo'])
 
+class IntStrCmp(unittest.TestCase):
+    def testIntStrCompares(self):
+        assert not (-1 > 'a')
+        assert (-1 < 'a')
+        assert not (4 > 'a')
+        assert (4 < 'a')
+        assert not (-2 > 'a')
+        assert (-2 < 'a')
+        assert not (-1 == 'a')
+
+
 def test_main():
-    test_support.run_unittest(UnicodeDerivedCmp, LongDerivedCmp)
+    test_support.run_unittest(
+            UnicodeDerivedCmp,
+            LongDerivedCmp,
+            IntStrCmp,
+            )
 
 if __name__ == '__main__':
     test_main()

Deleted: trunk/jython/bugtests/test130.py
===================================================================
--- trunk/jython/bugtests/test130.py	2008-10-16 17:51:59 UTC (rev 5437)
+++ trunk/jython/bugtests/test130.py	2008-10-16 18:56:04 UTC (rev 5438)
@@ -1,22 +0,0 @@
-"""
-Comparing ints and strings
-"""
-
-import support
-
-if -1 > 'a':
-    raise support.TestError("-1 > 'a'")
-if not -1 < 'a':
-    raise support.TestError("-1 < 'a'")
-if 4 > 'a':
-    raise support.TestError("4 > 'a'")
-if not 4 < 'a':
-    raise support.TestError("4 < 'a'")
-if -2 > 'a':
-    raise support.TestError("-2 > 'a'")
-if not -2 < 'a':
-    raise support.TestError("-2 < 'a'")
-if -1 == 'a':
-    raise support.TestError("-1 == 'a'")
-
-


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

[Jython-checkins] SF.net SVN: jython:[5437] trunk/jython/bugtests/test128.py

[<fwi...@us...>]

Revision: 5437
          http://jython.svn.sourceforge.net/jython/?rev=5437&view=rev
Author:   fwierzbicki
Date:     2008-10-16 17:51:59 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
Covered in test_jy_internals already.

Removed Paths:
-------------
    trunk/jython/bugtests/test128.py

Deleted: trunk/jython/bugtests/test128.py
===================================================================
--- trunk/jython/bugtests/test128.py	2008-10-16 17:50:37 UTC (rev 5436)
+++ trunk/jython/bugtests/test128.py	2008-10-16 17:51:59 UTC (rev 5437)
@@ -1,23 +0,0 @@
-"""
-Check a manually created PyModule, with unwanted hack.
-"""
-
-import support
-import org, sys
-
-s = """
-def foo():
-        return "foo bar zot"
-"""
-name = "test128m"
-
-mod = org.python.core.PyModule("test128m", {})
-#mod = org.python.core.PyInstance.__tojava__(mod, org.python.core.PyModule)
-                
-code = compile(s, "test128m.py", "exec" )
-exec s in mod.__dict__, mod.__dict__
-
-sys.modules["test128m"] = mod
-import test128m
-
-support.compare(test128m.foo(), "foo bar zot")


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

[Jython-checkins] SF.net SVN: jython:[5436] trunk/jython/bugtests/test127.py

[<fwi...@us...>]

Revision: 5436
          http://jython.svn.sourceforge.net/jython/?rev=5436&view=rev
Author:   fwierzbicki
Date:     2008-10-16 17:50:37 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
This test is already covered by a test in test_jy_internals.

Removed Paths:
-------------
    trunk/jython/bugtests/test127.py

Deleted: trunk/jython/bugtests/test127.py
===================================================================
--- trunk/jython/bugtests/test127.py	2008-10-16 17:48:56 UTC (rev 5435)
+++ trunk/jython/bugtests/test127.py	2008-10-16 17:50:37 UTC (rev 5436)
@@ -1,24 +0,0 @@
-"""
-Check a manually created PyModule.
-"""
-
-import support
-import org, sys
-
-s = """
-def foo():
-        pass
-"""
-name = "test127m"
-
-mod = org.python.core.PyModule("test127m", {})
-#mod = org.python.core.PyInstance.__tojava__(mod, org.python.core.PyModule)
-                
-code = compile(s, "test127m.py", "exec" )
-exec s in mod.__dict__, mod.__dict__
-
-sys.modules["test127m"] = mod
-import test127m
-
-test127m.foo()
-


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

[Jython-checkins] SF.net SVN: jython:[5435] trunk/jython/bugtests/test126.py

[<fwi...@us...>]

Revision: 5435
          http://jython.svn.sourceforge.net/jython/?rev=5435&view=rev
Author:   fwierzbicki
Date:     2008-10-16 17:48:56 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
Very basic test of assert that is no longer needed as assert is well tested.

Removed Paths:
-------------
    trunk/jython/bugtests/test126.py

Deleted: trunk/jython/bugtests/test126.py
===================================================================
--- trunk/jython/bugtests/test126.py	2008-10-16 17:48:03 UTC (rev 5434)
+++ trunk/jython/bugtests/test126.py	2008-10-16 17:48:56 UTC (rev 5435)
@@ -1,14 +0,0 @@
-"""
-
-"""
-
-import support
-
-assert(1)
-
-try:
-    assert(0)
-except AssertionError, e:
-    pass
-else:
-    raise support.TestError("Should raise an assert")


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

[Jython-checkins] SF.net SVN: jython:[5434] trunk/jython/bugtests/test125.py

[<fwi...@us...>]

Revision: 5434
          http://jython.svn.sourceforge.net/jython/?rev=5434&view=rev
Author:   fwierzbicki
Date:     2008-10-16 17:48:03 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
The reload builtin is tested in a number of places in the unit tests, so this
basic test of it can be deleted.

Removed Paths:
-------------
    trunk/jython/bugtests/test125.py

Deleted: trunk/jython/bugtests/test125.py
===================================================================
--- trunk/jython/bugtests/test125.py	2008-10-16 16:54:06 UTC (rev 5433)
+++ trunk/jython/bugtests/test125.py	2008-10-16 17:48:03 UTC (rev 5434)
@@ -1,38 +0,0 @@
-"""
-Check reload of module.
-"""
-
-import support
-
-src = """
-def fun2():
-    return %s
-"""
-
-def mk(v):
-    f = open("test125m.py", "w")
-    f.write(src % v)
-    f.close()
-
-
-mk("1")
-
-import test125m
-from test125m import fun2
-support.compare(fun2(), "1")
-
-import time
-time.sleep(2)
-
-mk("2")
-
-reload(test125m)
-
-support.compare(fun2(), "1")
-
-from test125m import fun2
-
-support.compare(fun2(), "2")
-
-support.compare(test125m.fun2(), "2")
-


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

[Jython-checkins] SF.net SVN: jython:[5433] trunk/jython/Lib/test/test_dict_jy.py

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

Revision: 5433
          http://jython.svn.sourceforge.net/jython/?rev=5433&view=rev
Author:   pjenvey
Date:     2008-10-16 16:54:06 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
typo

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

Modified: trunk/jython/Lib/test/test_dict_jy.py
===================================================================
--- trunk/jython/Lib/test/test_dict_jy.py	2008-10-16 16:18:04 UTC (rev 5432)
+++ trunk/jython/Lib/test/test_dict_jy.py	2008-10-16 16:54:06 UTC (rev 5433)
@@ -25,7 +25,7 @@
 
     def testUnhashableKeys(self):
         try:
-            a = {1:2}
+            a = {[1]:2}
         except TypeError:
             pass
         else:


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

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

[<fwi...@us...>]

Revision: 5432
          http://jython.svn.sourceforge.net/jython/?rev=5432&view=rev
Author:   fwierzbicki
Date:     2008-10-16 16:18:04 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
move test124 to test_jy_internals.

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

Removed Paths:
-------------
    trunk/jython/bugtests/test124.py

Modified: trunk/jython/Lib/test/test_jy_internals.py
===================================================================
--- trunk/jython/Lib/test/test_jy_internals.py	2008-10-16 16:13:52 UTC (rev 5431)
+++ trunk/jython/Lib/test/test_jy_internals.py	2008-10-16 16:18:04 UTC (rev 5432)
@@ -226,6 +226,17 @@
         foo()
         Bar().baz()
 
+class ModuleTest(unittest.TestCase):
+    def test_create_module(self):
+        from org.python.core import PyModule, PyInstance
+        test = PyModule("test", {})
+        exec "a = 2" in test.__dict__
+        self.assertEquals(len(test.__dict__), 3)
+
+        #test = PyInstance.__tojava__(test, PyModule)
+        exec "b = 3" in test.__dict__
+        self.assertEquals(len(test.__dict__), 4)
+
 def test_main():
     test_suite = unittest.TestSuite()
     test_loader = unittest.TestLoader()
@@ -237,6 +248,7 @@
     suite_add(DatetimeTypeMappingTest)
     suite_add(IdTest)
     suite_add(FrameTest)
+    suite_add(ModuleTest)
     run_suite(test_suite)
 
 if __name__ == "__main__":

Deleted: trunk/jython/bugtests/test124.py
===================================================================
--- trunk/jython/bugtests/test124.py	2008-10-16 16:13:52 UTC (rev 5431)
+++ trunk/jython/bugtests/test124.py	2008-10-16 16:18:04 UTC (rev 5432)
@@ -1,14 +0,0 @@
-"""
-Create a new Module.
-"""
-
-import support
-
-from org.python.core import PyModule, PyInstance
-test = PyModule("test", {})
-exec "a = 2" in test.__dict__
-support.compare(len(test.__dict__), "3")
-
-#test = PyInstance.__tojava__(test, PyModule)
-exec "b = 3" in test.__dict__
-support.compare(len(test.__dict__), "4")


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

[Jython-checkins] SF.net SVN: jython:[5431] trunk/jython/bugtests/test049p/

[<fwi...@us...>]

Revision: 5431
          http://jython.svn.sourceforge.net/jython/?rev=5431&view=rev
Author:   fwierzbicki
Date:     2008-10-16 16:13:52 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
Leftover for long-gone test049.

Removed Paths:
-------------
    trunk/jython/bugtests/test049p/


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

[Jython-checkins] SF.net SVN: jython:[5430] trunk/jython/bugtests/test118.py

[<fwi...@us...>]

Revision: 5430
          http://jython.svn.sourceforge.net/jython/?rev=5430&view=rev
Author:   fwierzbicki
Date:     2008-10-16 14:36:02 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
basic test of int subclasses which is well covered by current tests.

Removed Paths:
-------------
    trunk/jython/bugtests/test118.py

Deleted: trunk/jython/bugtests/test118.py
===================================================================
--- trunk/jython/bugtests/test118.py	2008-10-16 14:34:25 UTC (rev 5429)
+++ trunk/jython/bugtests/test118.py	2008-10-16 14:36:02 UTC (rev 5430)
@@ -1,19 +0,0 @@
-"""
-Subclassing PyInteger
-"""
-
-import support
-
-IntegerType = type(1)
-class SpecialInt (IntegerType):
-    def __init__(self, n):  IntegerType.__init__(self, n)
-    def double(self):  return self*2
-
-si = SpecialInt(12)
-
-#print str(si)
-support.compare(si, '12')
-support.compare(si + 1, '13')
-support.compare(si + si, '24')
-support.compare(3 + si, '15')
-


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

[Jython-checkins] SF.net SVN: jython:[5429] trunk/jython/bugtests/test115.py

[<fwi...@us...>]

Revision: 5429
          http://jython.svn.sourceforge.net/jython/?rev=5429&view=rev
Author:   fwierzbicki
Date:     2008-10-16 14:34:25 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
This test doesn't make much sense.

Removed Paths:
-------------
    trunk/jython/bugtests/test115.py

Deleted: trunk/jython/bugtests/test115.py
===================================================================
--- trunk/jython/bugtests/test115.py	2008-10-16 14:33:33 UTC (rev 5428)
+++ trunk/jython/bugtests/test115.py	2008-10-16 14:34:25 UTC (rev 5429)
@@ -1,7 +0,0 @@
-"""
-Subclass an exception.
-"""
-
-import support
-
-class Foo(IOError):  pass
\ No newline at end of file


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

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

[<fwi...@us...>]

Revision: 5428
          http://jython.svn.sourceforge.net/jython/?rev=5428&view=rev
Author:   fwierzbicki
Date:     2008-10-16 14:33:33 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
Basic slice ops that are already well tested.

Removed Paths:
-------------
    trunk/jython/bugtests/test112.py
    trunk/jython/bugtests/test113.py

Deleted: trunk/jython/bugtests/test112.py
===================================================================
--- trunk/jython/bugtests/test112.py	2008-10-16 14:31:14 UTC (rev 5427)
+++ trunk/jython/bugtests/test112.py	2008-10-16 14:33:33 UTC (rev 5428)
@@ -1,8 +0,0 @@
-"""
-Check slice [::-1]
-"""
-
-import support
-
-if 'abcdef'[::-1] != 'fedcba':
-    raise support.TestError("slice [::-1] failed")

Deleted: trunk/jython/bugtests/test113.py
===================================================================
--- trunk/jython/bugtests/test113.py	2008-10-16 14:31:14 UTC (rev 5427)
+++ trunk/jython/bugtests/test113.py	2008-10-16 14:33:33 UTC (rev 5428)
@@ -1,9 +0,0 @@
-"""
-Check slice [-1:1:-1].
-"""
-
-import support
-
-if 'abcde'[-1:1:-1] != 'edc':
-    raise support.TestError("slice [-1:1:-1] failed %s" % 'abcde'[-1:1:-1])
-


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

[Jython-checkins] SF.net SVN: jython:[5427] trunk/jython/bugtests/test111.py

[<fwi...@us...>]

Revision: 5427
          http://jython.svn.sourceforge.net/jython/?rev=5427&view=rev
Author:   fwierzbicki
Date:     2008-10-16 14:31:14 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
Pretty much just a test for lists being disallowed as a key which is already in
the unit tests.

Removed Paths:
-------------
    trunk/jython/bugtests/test111.py

Deleted: trunk/jython/bugtests/test111.py
===================================================================
--- trunk/jython/bugtests/test111.py	2008-10-16 14:29:48 UTC (rev 5426)
+++ trunk/jython/bugtests/test111.py	2008-10-16 14:31:14 UTC (rev 5427)
@@ -1,16 +0,0 @@
-"""
-Check id() contra cmp()
-"""
-
-import support
-
-try:
-    a={[1,2]:3}
-    if not a.has_key([1,2]):
-        raise support.TestError("Lists hash inconsistently")
-except TypeError, e:
-    pass
-else:
-    raise support.TestError("Should raise a TypeError")
-    
-


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

[Jython-checkins] SF.net SVN: jython:[5426] trunk/jython/bugtests/test110.py

[<fwi...@us...>]

Revision: 5426
          http://jython.svn.sourceforge.net/jython/?rev=5426&view=rev
Author:   fwierzbicki
Date:     2008-10-16 14:29:48 +0000 (Thu, 16 Oct 2008)

Log Message:
-----------
Basic dict functionality that is well tested in the unit tests.

Removed Paths:
-------------
    trunk/jython/bugtests/test110.py

Deleted: trunk/jython/bugtests/test110.py
===================================================================
--- trunk/jython/bugtests/test110.py	2008-10-16 14:27:55 UTC (rev 5425)
+++ trunk/jython/bugtests/test110.py	2008-10-16 14:29:48 UTC (rev 5426)
@@ -1,10 +0,0 @@
-"""
-Check "in" on a dict.
-"""
-
-import support
-
-if 1 in {2:2, 3:3}:
-    raise support.TestError("in keyword an a dict should work")
-if 2 not in {2:2, 3:3}:
-    raise support.TestError("in keyword an a dict should work")


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