From: <fwi...@us...> - 2009-09-09 17:47:47
|
Revision: 6778 http://jython.svn.sourceforge.net/jython/?rev=6778&view=rev Author: fwierzbicki Date: 2009-09-09 17:47:39 +0000 (Wed, 09 Sep 2009) Log Message: ----------- Give tests non-stupid names. Modified Paths: -------------- trunk/jython/tests/java/org/python/core/PyListTest.java trunk/jython/tests/java/org/python/core/PyTupleTest.java Modified: trunk/jython/tests/java/org/python/core/PyListTest.java =================================================================== --- trunk/jython/tests/java/org/python/core/PyListTest.java 2009-09-09 17:35:38 UTC (rev 6777) +++ trunk/jython/tests/java/org/python/core/PyListTest.java 2009-09-09 17:47:39 UTC (rev 6778) @@ -17,7 +17,7 @@ // Test for http://bugs.jython.org/issue1419 // "Bug in PyTuple.indexOf and PyList.indexOf" - public void testFoo() { + public void testIndexOf() { PyList p = new PyList(); p.add("foo"); p.add("bar"); Modified: trunk/jython/tests/java/org/python/core/PyTupleTest.java =================================================================== --- trunk/jython/tests/java/org/python/core/PyTupleTest.java 2009-09-09 17:35:38 UTC (rev 6777) +++ trunk/jython/tests/java/org/python/core/PyTupleTest.java 2009-09-09 17:47:39 UTC (rev 6778) @@ -17,9 +17,10 @@ // Test for http://bugs.jython.org/issue1419 // "Bug in PyTuple.indexOf and PyTuple.indexOf" - public void testFoo() { + public void testIndexOf() { PyTuple p = new PyTuple(new PyString("foo"), new PyString("bar")); assertEquals(0, p.indexOf("foo")); assertEquals(1, p.indexOf("bar")); } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fwi...@us...> - 2009-09-09 17:59:13
|
Revision: 6779 http://jython.svn.sourceforge.net/jython/?rev=6779&view=rev Author: fwierzbicki Date: 2009-09-09 17:59:05 +0000 (Wed, 09 Sep 2009) Log Message: ----------- Also test the toArray() bugs fixed by Andrea's patch applied by Tobias. Modified Paths: -------------- trunk/jython/tests/java/org/python/core/PyListTest.java trunk/jython/tests/java/org/python/core/PyTupleTest.java Modified: trunk/jython/tests/java/org/python/core/PyListTest.java =================================================================== --- trunk/jython/tests/java/org/python/core/PyListTest.java 2009-09-09 17:47:39 UTC (rev 6778) +++ trunk/jython/tests/java/org/python/core/PyListTest.java 2009-09-09 17:59:05 UTC (rev 6779) @@ -7,21 +7,34 @@ */ public class PyListTest extends TestCase { + private PyList p = null; + @Override protected void setUp() throws Exception { + p = new PyList(); + p.add("foo"); + p.add("bar"); } @Override protected void tearDown() throws Exception { + p = null; } // Test for http://bugs.jython.org/issue1419 // "Bug in PyTuple.indexOf and PyList.indexOf" public void testIndexOf() { - PyList p = new PyList(); - p.add("foo"); - p.add("bar"); assertEquals(0, p.indexOf("foo")); assertEquals(1, p.indexOf("bar")); } + + public void testToArray() { + // In Jython 2.5.0 if an array was passed into toArray() that was + // too short, an Object[] was always returned instead of an array + // of the proper type. + Object[] test = new String[1]; + String[] s = (String[])p.toArray(test); + assertEquals(s[0], "foo"); + assertEquals(s[1], "bar"); + } } Modified: trunk/jython/tests/java/org/python/core/PyTupleTest.java =================================================================== --- trunk/jython/tests/java/org/python/core/PyTupleTest.java 2009-09-09 17:47:39 UTC (rev 6778) +++ trunk/jython/tests/java/org/python/core/PyTupleTest.java 2009-09-09 17:59:05 UTC (rev 6779) @@ -7,12 +7,16 @@ */ public class PyTupleTest extends TestCase { + private PyTuple p = null; + @Override protected void setUp() throws Exception { + p = new PyTuple(new PyString("foo"), new PyString("bar")); } @Override protected void tearDown() throws Exception { + p = null; } // Test for http://bugs.jython.org/issue1419 @@ -22,5 +26,14 @@ assertEquals(0, p.indexOf("foo")); assertEquals(1, p.indexOf("bar")); } - + + public void testToArray() { + // In Jython 2.5.0 if an array was passed into toArray() that was + // too short, an Object[] was always returned instead of an array + // of the proper type. + Object[] test = new String[1]; + String[] s = (String[])p.toArray(test); + assertEquals(s[0], "foo"); + assertEquals(s[1], "bar"); + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |