Rev 299: Added AllTests junit TestSuite in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/devel

[Monty Taylor]

At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/devel

------------------------------------------------------------
revno: 299
revision-id: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: devel
timestamp: Mon 2007-11-26 00:35:15 -0800
message:
  Added AllTests junit TestSuite
  Changed java/Makefile.am to split MGM/J and NDB/J
  Cleaned up printed output during Java build process.
added:
  java/testsuite/ndbj/AllTests.java alltests.java-20071126082920-iw0ffw8pv58uorrj-1
modified:
  java/Makefile.am               makefile.am-20070415032352-9dpe6aurqcnuwcrd-1
=== added file 'java/testsuite/ndbj/AllTests.java'
--- a/java/testsuite/ndbj/AllTests.java	1970-01-01 00:00:00 +0000
+++ b/java/testsuite/ndbj/AllTests.java	2007-11-26 08:35:15 +0000
@@ -0,0 +1,38 @@
+package testsuite.ndbj;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllTests {
+
+	public static Test suite() {
+		TestSuite suite = new TestSuite("Test for testsuite.ndbj");
+		//$JUnit-BEGIN$
+		suite.addTestSuite(NdbOperationByteLongTest.class);
+		suite.addTestSuite(NdbOperationMultiPartPrimaryKeyTest.class);
+		suite.addTestSuite(NdbOperationsFailedTest.class);
+		suite.addTestSuite(SelectCountTest.class);
+		suite.addTestSuite(Latin1InsertReadTest.class);
+		suite.addTestSuite(ImmediatePollTimeoutTest.class);
+		suite.addTestSuite(OrderedIndexScanTest.class);
+		suite.addTestSuite(NdbTest.class);
+		suite.addTestSuite(NullSetTest.class);
+		suite.addTestSuite(OutOfConnectionProblemTest.class);
+		suite.addTestSuite(NdbScanTest.class);
+		suite.addTestSuite(QuickAsyncTest.class);
+		suite.addTestSuite(BasicTest.class);
+		suite.addTestSuite(MultiPartPrimaryKeyStringTest.class);
+		suite.addTestSuite(QuickBFTest.class);
+		suite.addTestSuite(NdbOperationIDTest.class);
+		suite.addTestSuite(InsertRetryTest.class);
+		suite.addTestSuite(Utf8InsertReadTest.class);
+		suite.addTestSuite(NdbOperationTest.class);
+		suite.addTestSuite(NdbBlobTest.class);
+		suite.addTestSuite(NdbScanFilterTest.class);
+		suite.addTestSuite(NdbIndexScanOperationUtf8Latin1Test.class);
+		suite.addTestSuite(MultipleAsyncTest.class);
+		//$JUnit-END$
+		return suite;
+	}
+
+}

=== modified file 'java/Makefile.am'
--- a/java/Makefile.am	2007-11-22 18:13:59 +0000
+++ b/java/Makefile.am	2007-11-26 08:35:15 +0000
@@ -57,7 +57,7 @@
 BUILT_SOURCES = $(NDBAPI_BUILT_SRC) $(MGMAPI_BUILT_SRC)
 NDBAPI_SWIG_SRC = ${srcdir}/ndbj.i $(SWIG_NDB_SOURCES)
 MGMAPI_SWIG_SRC = ${srcdir}/mgmj.i $(SWIG_MGM_SOURCES)
-CLEANFILES = $(BUILT_SOURCES) ${builddir}/*class ${builddir}/*log ${builddir}/ndbj.jar
${builddir}/ndbj.h ${builddir}/mgmj.h ${package_builddir}/ndbj/*class
${package_builddir}/mgmj/*class testsuite/*class testsuite/ndbj/*class 
${package_builddir}/ndbj/*Ref.java ${package_builddir}/examples
+CLEANFILES = $(BUILT_SOURCES) ${builddir}/*class ${builddir}/*log ${builddir}/ndbj.jar
${builddir}/mgmj.jar ${builddir}/ndbj.h ${builddir}/mgmj.h
${package_builddir}/ndbj/*class ${package_builddir}/mgmj/*class testsuite/*class
testsuite/ndbj/*class  ${package_builddir}/ndbj/*Ref.java ${package_builddir}/examples
 
 MGMAPI_JAVA_SRC = ${package_srcdir}/mgmj/MgmApiException.java 
 NDBAPI_JAVA_SRC = $(package_srcdir)/ndbj/BaseCallback.java \
@@ -119,6 +119,7 @@
 	${srcdir}/testsuite/BaseNdbjTestCase.java \
 	${srcdir}/testsuite/BaseTestCase.java \
 	${srcdir}/testsuite/TestCallback.java \
+	${srcdir}/testsuite/ndbj/AllTests.java \
 	${srcdir}/testsuite/ndbj/BasicTest.java \
 	${srcdir}/testsuite/ndbj/ImmediatePollTimeoutTest.java \
 	${srcdir}/testsuite/ndbj/InsertRetryTest.java \
@@ -201,6 +202,7 @@
 	${builddir}/testsuite/BaseNdbjTestCase.class \
 	${builddir}/testsuite/BaseTestCase.class \
 	${builddir}/testsuite/TestCallback.class \
+	${builddir}/testsuite/ndbj/AllTests.class \
 	${builddir}/testsuite/ndbj/BasicTest.class \
 	${builddir}/testsuite/ndbj/ImmediatePollTimeoutTest.class \
 	${builddir}/testsuite/ndbj/InsertRetryTest.class \
@@ -285,7 +287,7 @@
 nodist_libmgmj_la_SOURCES = mgmj.cxx 
 libmgmj_la_CPPFLAGS = $(JAVA_CXXFLAGS) $(PTHREAD_CFLAGS) -fPIC
 
-all-local: ndbj.jar 
+all-local: ndbj.jar  mgmj.jar
 
 clean-local:
 	@rm -f swig-stamp
@@ -313,7 +315,17 @@
 	$(SWIG) -java -outdir ${builddir}/${package_namespace}/$(*F) -package `echo
${package_namespace}/$(*F) | sed 's,/,.,g'` -I$(SWIG_DIR) -I${srcdir}/swig
$(MYSQL_INCLUDES) $(DEFAULT_INCLUDES) -o $@ $<
 
 # $(NDBAPI_JAVA_CLASSES) $(MGMAPI_JAVA_CLASSES)
-ndbj.jar: libndbj.la libmgmj.la $(NDBAPI_JAVA_SRC) $(MGMAPI_JAVA_SRC) $(NDBAPI_BUILT_J)
$(MGMAPI_BUILT_J)
-	$(JAVAC) -classpath
$(srcdir):$(srcdir)/lib/mysql-connector-java-5.0.4-bin.jar:$(srcdir)/lib/junit.jar
-sourcepath $(srcdir):$(builddir) -d $(builddir)  $(NDBAPI_JAVA_SRC) $(MGMAPI_JAVA_SRC)
$(NDBAPI_BUILT_J) $(MGMAPI_BUILT_J)
-	$(JAR) cvf $@ $(NDBAPI_JAVA_CLASSES) $(MGMAPI_JAVA_CLASSES)
#$(package_builddir)/ndbj/*class 
-
+mgmj.jar: libmgmj.la $(MGMAPI_JAVA_SRC) $(MGMAPI_BUILT_J)
+	@echo "Building MGM/J java files"
+	@$(JAVAC) -classpath
$(srcdir):$(srcdir)/lib/mysql-connector-java-5.0.4-bin.jar:$(srcdir)/lib/junit.jar
-sourcepath $(srcdir):$(builddir) -d $(builddir)  $(MGMAPI_JAVA_SRC) $(MGMAPI_BUILT_J)
+	@echo "Building mgmj.jar"
+	@$(JAR) cf $@ $(MGMAPI_JAVA_CLASSES) 
+
+ndbj.jar: libndbj.la $(NDBAPI_JAVA_SRC) $(NDBAPI_BUILT_J)
+	@echo "Building NDB/J java files"
+	@$(JAVAC) -classpath
$(srcdir):$(srcdir)/lib/mysql-connector-java-5.0.4-bin.jar:$(srcdir)/lib/junit.jar
-sourcepath $(srcdir):$(builddir) -d $(builddir)  $(NDBAPI_JAVA_SRC) $(NDBAPI_BUILT_J) 
+	@echo "Building ndbj.jar"
+	@$(JAR) cf $@ $(NDBAPI_JAVA_CLASSES)
+
+check-local: all-am
+	$(JAVA) -Djava.library.path=$(builddir)/.libs 
-Dcom.mysql.jdbc.testsuite.url=jdbc:mysql://localhost/test -classpath
$(builddir):$(builddir)/lib/mysql-connector-java-5.0.4-bin.jar:$(builddir)/lib/junit.jar 
junit.textui.TestRunner testsuite.ndbj.AllTests