Author: bryanduxbury
Date: Thu Jan 29 01:21:20 2009
New Revision: 738695
URL: http://svn.apache.org/viewvc?rev=738695&view=rev
Log:
THRIFT-166. java: Java tests should be in lib/java/test/
THRIFT-221. java: Make java build classpath more dynamic and configurable
This issue moves all the tests from test/java to lib/java/test/src and combines
the build files. In addition, rather than continue on with the same busted
approach to finding dependent jars for the tests, THRIFT-221 has been
implemented, allowing the user to specify a .thrift-build.properties file in
their home directory that contains additional classpath entries.
As a result of this patch, "make check" does not currently work as it is
expected to. This will be resolved in a follow-up commit.
Added:
incubator/thrift/trunk/lib/java/test/
incubator/thrift/trunk/lib/java/test/TestClient
- copied unchanged from r736738,
incubator/thrift/trunk/test/java/TestClient
incubator/thrift/trunk/lib/java/test/TestNonblockingServer
- copied unchanged from r736738,
incubator/thrift/trunk/test/java/TestNonblockingServer
incubator/thrift/trunk/lib/java/test/TestServer
- copied unchanged from r736738,
incubator/thrift/trunk/test/java/TestServer
incubator/thrift/trunk/lib/java/test/org/
incubator/thrift/trunk/lib/java/test/org/apache/
incubator/thrift/trunk/lib/java/test/org/apache/thrift/
incubator/thrift/trunk/lib/java/test/org/apache/thrift/test/
incubator/thrift/trunk/lib/java/test/org/apache/thrift/test/DeepCopyTest.java
- copied unchanged from r736738,
incubator/thrift/trunk/test/java/src/DeepCopyTest.java
incubator/thrift/trunk/lib/java/test/org/apache/thrift/test/EqualityTest.java
- copied unchanged from r736738,
incubator/thrift/trunk/test/java/src/EqualityTest.java
incubator/thrift/trunk/lib/java/test/org/apache/thrift/test/IdentityTest.java
- copied unchanged from r736738,
incubator/thrift/trunk/test/java/src/IdentityTest.java
incubator/thrift/trunk/lib/java/test/org/apache/thrift/test/JSONProtoTest.java
- copied unchanged from r736738,
incubator/thrift/trunk/test/java/src/JSONProtoTest.java
incubator/thrift/trunk/lib/java/test/org/apache/thrift/test/JavaBeansTest.java
- copied unchanged from r736738,
incubator/thrift/trunk/test/java/src/JavaBeansTest.java
incubator/thrift/trunk/lib/java/test/org/apache/thrift/test/OverloadNonblockingServer.java
- copied unchanged from r736738,
incubator/thrift/trunk/test/java/src/OverloadNonblockingServer.java
incubator/thrift/trunk/lib/java/test/org/apache/thrift/test/TestClient.java
- copied unchanged from r736738,
incubator/thrift/trunk/test/java/src/TestClient.java
incubator/thrift/trunk/lib/java/test/org/apache/thrift/test/TestNonblockingServer.java
- copied unchanged from r736738,
incubator/thrift/trunk/test/java/src/TestNonblockingServer.java
incubator/thrift/trunk/lib/java/test/org/apache/thrift/test/TestServer.java
- copied unchanged from r736738,
incubator/thrift/trunk/test/java/src/TestServer.java
incubator/thrift/trunk/lib/java/test/org/apache/thrift/test/ToStringTest.java
- copied unchanged from r736738,
incubator/thrift/trunk/test/java/src/ToStringTest.java
Removed:
incubator/thrift/trunk/test/java/TestClient
incubator/thrift/trunk/test/java/TestNonblockingServer
incubator/thrift/trunk/test/java/TestServer
incubator/thrift/trunk/test/java/build.xml
incubator/thrift/trunk/test/java/src/
Modified:
incubator/thrift/trunk/aclocal/ax_java.m4
incubator/thrift/trunk/lib/java/ (props changed)
incubator/thrift/trunk/lib/java/build.xml
Modified: incubator/thrift/trunk/aclocal/ax_java.m4
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/aclocal/ax_java.m4?rev=738695&r1=738694&r2=738695&view=diff
==============================================================================
--- incubator/thrift/trunk/aclocal/ax_java.m4 (original)
+++ incubator/thrift/trunk/aclocal/ax_java.m4 Thu Jan 29 01:21:20 2009
@@ -32,7 +32,7 @@
dnl with some compilers like guavac).
AC_DEFUN([AX_PROG_JAVAC],[
-test -z "$JAVAC" && AC_CHECK_PROGS(JAVAC, "gcj -C" guavac jikes javac)
+test -z "$JAVAC" && AC_CHECK_PROGS(JAVAC, "gcj -C" guavac javac)
test -z "$JAVAC" && AC_MSG_ERROR([no acceptable Java compiler found in \$PATH])
AX_PROG_JAVAC_WORKS
])
Propchange: incubator/thrift/trunk/lib/java/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jan 29 01:21:20 2009
@@ -1,4 +1,5 @@
-Makefile
-Makefile.in
+gen-java
+gen-javabean
build
-libthrift.jar
+*.jar
+Makefile*
Modified: incubator/thrift/trunk/lib/java/build.xml
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/build.xml?rev=738695&r1=738694&r2=738695&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/java/build.xml (original)
+++ incubator/thrift/trunk/lib/java/build.xml Thu Jan 29 01:21:20 2009
@@ -2,13 +2,25 @@
<description>Thrift Build File</description>
+ <property name="gen" location="gen-java" />
+ <property name="genbean" location="gen-javabean" />
+
<property name="src" location="src" />
<property name="build" location="build" />
<property name="install.path" value="/usr/local/lib" />
+ <property name="src.test" location="test" />
+ <property name="build.test" location="${build}/test" />
+
+ <property name="test.thrift.home" location="../../test"/>
+ <property file="${user.home}/.thrift-build.properties" />
+
+ <property name="cpath" location="libthrift.jar:${thrift.extra.cpath}" />
+
<target name="init">
<tstamp />
<mkdir dir="${build}"/>
+ <mkdir dir="${build.test}" />
</target>
<target name="compile" depends="init">
@@ -27,7 +39,46 @@
<target name="clean">
<delete dir="${build}" />
+ <delete dir="${gen}"/>
+ <delete dir="${genbean}"/>
<delete file="libthrift.jar" />
</target>
+ <target name="compile-test" description="Build the test suite classes"
depends="generate,dist">
+ <javac debug="true" srcdir="${gen}" destdir="${build.test}"
classpath="${cpath}" />
+ <javac debug="true" srcdir="${genbean}" destdir="${build.test}"
classpath="${cpath}" />
+ <javac debug="true" srcdir="${src.test}" destdir="${build.test}"
classpath="${cpath}:${gen}" />
+ </target>
+
+ <target name="test" description="Run the full test suite"
depends="compile-test">
+ <java classname="org.apache.thrift.test.JSONProtoTest"
+ classpath="${cpath}:${build.test}" failonerror="true" />
+ <java classname="org.apache.thrift.test.IdentityTest"
+ classpath="${cpath}:${build.test}" failonerror="true" />
+ <java classname="org.apache.thrift.test.EqualityTest"
+ classpath="${cpath}:${build.test}" failonerror="true" />
+ <java classname="org.apache.thrift.test.ToStringTest"
+ classpath="${cpath}:${build.test}" failonerror="true" />
+ <java classname="org.apache.thrift.test.DeepCopyTest"
+ classpath="${cpath}:${build.test}" failonerror="true" />
+ <java classname="org.apache.thrift.test.JavaBeansTest"
+ classpath="${cpath}:${build.test}" failonerror="true" />
+ </target>
+
+ <target name="generate">
+ <exec executable="../../compiler/cpp/thrift">
+ <arg line="--gen java:hashcode ${test.thrift.home}/ThriftTest.thrift" />
+ </exec>
+ <exec executable="../../compiler/cpp/thrift">
+ <arg line="--gen java:hashcode
${test.thrift.home}/DebugProtoTest.thrift" />
+ </exec>
+ <exec executable="../../compiler/cpp/thrift">
+ <arg line="--gen java:hashcode
${test.thrift.home}/OptionalRequiredTest.thrift" />
+ </exec>
+ <exec executable="../../compiler/cpp/thrift">
+ <arg line="--gen java:beans,nocamel
${test.thrift.home}/JavaBeansTest.thrift" />
+ </exec>
+ </target>
+
+
</project>
