[Jython-checkins] jython (merge default -> default): Merge to default.
frank.wierzbicki
jython-checkins at python.org
Tue Oct 9 00:17:00 CEST 2012
http://hg.python.org/jython/rev/19e37832c394
changeset: 6872:19e37832c394
parent: 6869:85d67280589c
parent: 6871:b20247a5cf4b
user: Frank Wierzbicki <fwierzbicki at gmail.com>
date: Mon Oct 08 15:15:45 2012 -0700
summary:
Merge to default.
files:
.classpath | 2 +-
.idea/libraries/extlibs.xml | 4 +-
.idea/libraries/extlibs2.xml | 4 +-
build.xml | 2 +-
extlibs/junit-3.8.2.jar | Bin
extlibs/junit-4.10.jar | Bin
tests/java/org/python/compiler/JavaMakerSmokeTest.java | 69 ++++++++++
7 files changed, 75 insertions(+), 6 deletions(-)
diff --git a/.classpath b/.classpath
--- a/.classpath
+++ b/.classpath
@@ -8,7 +8,7 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
<classpathentry kind="lib" path="extlibs/jline-0.9.95-SNAPSHOT.jar"/>
- <classpathentry kind="lib" path="extlibs/junit-3.8.2.jar"/>
+ <classpathentry kind="lib" path="extlibs/junit-4.10.jar"/>
<classpathentry kind="lib" path="extlibs/libreadline-java-0.8.jar"/>
<classpathentry kind="lib" path="extlibs/mysql-connector-java-5.1.6.jar"/>
<classpathentry kind="lib" path="extlibs/postgresql-8.3-603.jdbc4.jar"/>
diff --git a/.idea/libraries/extlibs.xml b/.idea/libraries/extlibs.xml
--- a/.idea/libraries/extlibs.xml
+++ b/.idea/libraries/extlibs.xml
@@ -36,7 +36,7 @@
<root url="jar://$PROJECT_DIR$/extlibs/jffi-x86_64-FreeBSD.jar!/" />
<root url="jar://$PROJECT_DIR$/extlibs/postgresql-8.3-603.jdbc4.jar!/" />
<root url="jar://$PROJECT_DIR$/extlibs/jffi-sparc-SunOS.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/junit-3.8.2.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/junit-4.10.jar!/" />
<root url="jar://$PROJECT_DIR$/extlibs/guava-11.0.2.jar!/" />
<root url="jar://$PROJECT_DIR$/extlibs/asm-4.0.jar!/" />
<root url="jar://$PROJECT_DIR$/extlibs/asm-commons-4.0.jar!/" />
@@ -45,4 +45,4 @@
<JAVADOC />
<SOURCES />
</library>
-</component>
\ No newline at end of file
+</component>
diff --git a/.idea/libraries/extlibs2.xml b/.idea/libraries/extlibs2.xml
--- a/.idea/libraries/extlibs2.xml
+++ b/.idea/libraries/extlibs2.xml
@@ -39,10 +39,10 @@
<root url="jar://$PROJECT_DIR$/extlibs/jffi-x86_64-FreeBSD.jar!/" />
<root url="jar://$PROJECT_DIR$/extlibs/postgresql-8.3-603.jdbc4.jar!/" />
<root url="jar://$PROJECT_DIR$/extlibs/jffi-sparc-SunOS.jar!/" />
- <root url="jar://$PROJECT_DIR$/extlibs/junit-3.8.2.jar!/" />
+ <root url="jar://$PROJECT_DIR$/extlibs/junit-4.10.jar!/" />
<root url="jar://$PROJECT_DIR$/extlibs/guava-11.0.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
-</component>
\ No newline at end of file
+</component>
diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -232,7 +232,7 @@
<path refid="main.classpath"/>
<pathelement path="${extlibs.dir}/asm-commons-4.0.jar" />
<pathelement path="${extlibs.dir}/asm-util-4.0.jar" />
- <pathelement path="${extlibs.dir}/junit-3.8.2.jar" />
+ <pathelement path="${extlibs.dir}/junit-4.10.jar" />
<pathelement path="${exposed.dir}" />
<pathelement path="${compile.dir}" />
<pathelement path="${cpptasks.jar.dir}" />
diff --git a/extlibs/junit-3.8.2.jar b/extlibs/junit-3.8.2.jar
deleted file mode 100644
Binary file extlibs/junit-3.8.2.jar has changed
diff --git a/extlibs/junit-4.10.jar b/extlibs/junit-4.10.jar
new file mode 100644
index 0000000000000000000000000000000000000000..bf5c0b9c6ad26f515407effa28232a3e05200868
GIT binary patch
[stripped]
diff --git a/tests/java/org/python/compiler/JavaMakerSmokeTest.java b/tests/java/org/python/compiler/JavaMakerSmokeTest.java
new file mode 100644
--- /dev/null
+++ b/tests/java/org/python/compiler/JavaMakerSmokeTest.java
@@ -0,0 +1,69 @@
+package org.python.compiler;
+
+/**
+ * Some JavaMaker smoke tests
+ */
+
+import java.lang.reflect.Array;
+import java.util.Properties;
+
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import org.python.core.PySystemState;
+import org.python.util.PythonInterpreter;
+
+
+public class JavaMakerSmokeTest {
+
+ public PythonInterpreter interp;
+ public Class<?> proxyClass;
+
+ @Before
+ public void setUp() throws Exception {
+ Properties props = new Properties(System.getProperties());
+ props.setProperty(PySystemState.PYTHON_CACHEDIR_SKIP, "true");
+ PySystemState.initialize(props, null);
+ interp = new PythonInterpreter();
+
+ String input = new String();
+ input += "import java.io.ByteArrayInputStream\n";
+ input += "import java.lang.String\n";
+ input += "import org.python.core.Options\n";
+ input += "org.python.core.Options.proxyDebugDirectory = 'build/classes'\n";
+ input += "class ProxyTest(java.io.ByteArrayInputStream):\n";
+ input += " def somemethod(self): pass\n";
+ input += "ProxyTest(java.lang.String('teststr').getBytes())\n";
+ interp.exec(input);
+
+ proxyClass = Class.forName("org.python.proxies.__main__$ProxyTest$0");
+ }
+
+ @Test
+ public void constructors() throws Exception {
+ proxyClass.getConstructor(Array.newInstance(Byte.TYPE, 0).getClass());
+ proxyClass.getConstructor(Array.newInstance(Byte.TYPE, 0).getClass(), Integer.TYPE, Integer.TYPE);
+ }
+
+ @Test
+
+ public void methods() throws Exception {
+ proxyClass.getMethod("classDictInit", org.python.core.PyObject.class);
+ proxyClass.getMethod("close");
+ }
+
+ @Test
+
+ public void annotations() throws Exception {
+ proxyClass.getAnnotation(org.python.compiler.APIVersion.class);
+ proxyClass.getAnnotation(org.python.compiler.MTime.class);
+ }
+
+ @Test
+ public void interfaces() throws Exception {
+ Class<?>[] interfaces = new Class<?>[]{org.python.core.PyProxy.class,
+ org.python.core.ClassDictInit.class};
+ assertArrayEquals(interfaces, proxyClass.getInterfaces());
+ }
+}
--
Repository URL: http://hg.python.org/jython
More information about the Jython-checkins
mailing list