You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by da...@apache.org on 2005/01/12 06:50:25 UTC
cvs commit: ws-axis/c/tests/unit_tests/cppunit/transport/axis2 Axis2TransportTest.hpp
damitha 2005/01/11 21:50:24
Modified: c configure.ac
c/tests Makefile.am
c/tests/unit_tests/cppunit Makefile.am README
runCppUnitTests.cpp
c/tests/unit_tests/cppunit/transport/axis2
Axis2TransportTest.hpp
Log:
Earlier cppunit install folder is given using environment variable.
Revision Changes Path
1.65 +34 -0 ws-axis/c/configure.ac
Index: configure.ac
===================================================================
RCS file: /home/cvs/ws-axis/c/configure.ac,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- configure.ac 5 Jan 2005 03:11:58 -0000 1.64
+++ configure.ac 12 Jan 2005 05:50:23 -0000 1.65
@@ -111,6 +111,35 @@
TESTCASESBUILD=""
)
+AC_MSG_CHECKING(whether to build cppunit tests.)
+AC_ARG_WITH(cppunit,
+[ --with-cppunit[=PATH] build cppunit tests.],
+[ case "$withval" in
+ no)
+ AC_MSG_RESULT(no)
+ CPPUNITBUILD=""
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+ dnl test whether testcases build enabled
+ if test tests != "$TESTCASESBUILD"; then
+ AC_MSG_ERROR("Tetcases are not enabled. stop")
+ fi
+ dnl test for cppunit directory
+ if test -d $withval; then
+ cppunitinc="-I$withval/include"
+ cppunitlib="-L$withval/lib -lcppunit -ldl"
+ echo "$cppunitinc"
+ else
+ AC_MSG_ERROR(could not find cppunit. stop)
+ fi
+ CPPUNITBUILD="unit_tests"
+
+ ;;
+ esac ],
+ AC_MSG_RESULT(no)
+)
+
AC_MSG_CHECKING(whether to build samples)
AC_ARG_ENABLE(samples, [ --enable-samples build samples. default=yes],
[ case "${enableval}" in
@@ -174,6 +203,8 @@
APACHEINC=$apacheinc
XERCESCINC=$xercescinc
XERCESCLIB=$xercesclib
+CPPUNITINC=$cppunitinc
+CPPUNITLIB=$cppunitlib
EXPATINC=$expatinc
EXPATLIB=$expatlib
SSLINC=$sslinc
@@ -183,6 +214,8 @@
AC_SUBST(APACHEINC)
AC_SUBST(XERCESCINC)
AC_SUBST(XERCESCLIB)
+AC_SUBST(CPPUNITINC)
+AC_SUBST(CPPUNITLIB)
AC_SUBST(EXPATINC)
AC_SUBST(EXPATLIB)
AC_SUBST(SSLINC)
@@ -193,6 +226,7 @@
AC_SUBST(APACHEBUILD)
AC_SUBST(LINKCLIENTLIB)
AC_SUBST(TESTCASESBUILD)
+AC_SUBST(CPPUNITBUILD)
AC_SUBST(SAMPLESBUILD)
AC_SUBST(LIBWWWBUILD)
AC_SUBST(TSPPBUILD)
1.4 +1 -1 ws-axis/c/tests/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am 31 Dec 2004 08:24:55 -0000 1.3
+++ Makefile.am 12 Jan 2005 05:50:24 -0000 1.4
@@ -1 +1 @@
-SUBDIRS = client server unit_tests
+SUBDIRS = client server @CPPUNITBUILD@
1.3 +2 -3 ws-axis/c/tests/unit_tests/cppunit/Makefile.am
Index: Makefile.am
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/unit_tests/cppunit/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am 31 Dec 2004 12:11:26 -0000 1.2
+++ Makefile.am 12 Jan 2005 05:50:24 -0000 1.3
@@ -1,7 +1,6 @@
bin_PROGRAMS = runtestsuite
-#SUBDIRS = transport
AM_CPPFLAGS = $(CPPFLAGS)
runtestsuite_SOURCES = runCppUnitTests.cpp
-runtestsuite_LDADD = $(LDFLAGS) ../../../src/transport/axis2/libaxis2_transport.la -L${CPPUNIT_HOME}/lib -lcppunit -ldl
+runtestsuite_LDADD = $(LDFLAGS) ../../../src/transport/axis2/libaxis2_transport.la @CPPUNITLIB@
-INCLUDES = -I$(AXISCPP_HOME)/include -I${CPPUNIT_HOME}/include
+INCLUDES = -I$(AXISCPP_HOME)/include @CPPUNITINC@
1.2 +1 -1 ws-axis/c/tests/unit_tests/cppunit/README
Index: README
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/unit_tests/cppunit/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README 7 Jan 2005 05:23:57 -0000 1.1
+++ README 12 Jan 2005 05:50:24 -0000 1.2
@@ -1,5 +1,5 @@
To run cppunit tests you need to install cppunit in your matchine
-I installed cppunit-1.8.0.tar.gz
+I installed cppunit-1.10.2.tar.gz
Then create CPPUNIT_HOME environment variable pointing to your installation location
When you configure, by default testcases are not added to the build.
So to build testcases and cpp unit tests you need to add the configure option
1.2 +3 -3 ws-axis/c/tests/unit_tests/cppunit/runCppUnitTests.cpp
Index: runCppUnitTests.cpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/unit_tests/cppunit/runCppUnitTests.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- runCppUnitTests.cpp 31 Dec 2004 08:24:55 -0000 1.1
+++ runCppUnitTests.cpp 12 Jan 2005 05:50:24 -0000 1.2
@@ -1,10 +1,10 @@
#include <cppunit/Asserter.h>
#include <cppunit/CompilerOutputter.h>
#include <cppunit/config-auto.h>
-#include <cppunit/config-bcb5.h>
+//#include <cppunit/config-bcb5.h>
//config-msvc6.h
#include <cppunit/Exception.h>
-#include <cppunit/NotEqualException.h>
+//#include <cppunit/NotEqualException.h>
#include <cppunit/Outputter.h>
#include <cppunit/Portability.h>
#include <cppunit/SourceLine.h>
@@ -18,7 +18,7 @@
#include <cppunit/TestListener.h>
#include <cppunit/TestResultCollector.h>
#include <cppunit/TestResult.h>
-#include <cppunit/TestSucessListener.h>
+#include <cppunit/TestSuccessListener.h>
#include <cppunit/TestSuite.h>
#include <cppunit/TextOutputter.h>
#include <cppunit/TextTestProgressListener.h>
1.4 +3 -3 ws-axis/c/tests/unit_tests/cppunit/transport/axis2/Axis2TransportTest.hpp
Index: Axis2TransportTest.hpp
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/unit_tests/cppunit/transport/axis2/Axis2TransportTest.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Axis2TransportTest.hpp 31 Dec 2004 10:43:36 -0000 1.3
+++ Axis2TransportTest.hpp 12 Jan 2005 05:50:24 -0000 1.4
@@ -1,10 +1,10 @@
#include <cppunit/Asserter.h>
#include <cppunit/CompilerOutputter.h>
#include <cppunit/config-auto.h>
-#include <cppunit/config-bcb5.h>
+//#include <cppunit/config-bcb5.h>
//config-msvc6.h
#include <cppunit/Exception.h>
-#include <cppunit/NotEqualException.h>
+//#include <cppunit/NotEqualException.h>
#include <cppunit/Outputter.h>
#include <cppunit/Portability.h>
#include <cppunit/SourceLine.h>
@@ -18,7 +18,7 @@
#include <cppunit/TestListener.h>
#include <cppunit/TestResultCollector.h>
#include <cppunit/TestResult.h>
-#include <cppunit/TestSucessListener.h>
+#include <cppunit/TestSuccessListener.h>
#include <cppunit/TestSuite.h>
#include <cppunit/TextOutputter.h>
#include <cppunit/TextTestProgressListener.h>
Re: cvs commit: ws-axis/c/tests/unit_tests/cppunit/transport/axis2 Axis2TransportTest.hpp
Posted by Samisa Abeysinghe <sa...@gmail.com>.
Hi Damitha,
What is the differance between this and the ant test framework.
I think that we have tests covering transport alredy in ant
framework. If you want more tests in this space, would it not be
better to include them in ant framewrok itself - as it is being widely
used at the moment.
Thanks,
Samisa...
On 12 Jan 2005 05:50:25 -0000, damitha@apache.org <da...@apache.org> wrote:
> damitha 2005/01/11 21:50:24
>
> Modified: c configure.ac
> c/tests Makefile.am
> c/tests/unit_tests/cppunit Makefile.am README
> runCppUnitTests.cpp
> c/tests/unit_tests/cppunit/transport/axis2
> Axis2TransportTest.hpp
> Log:
> Earlier cppunit install folder is given using environment variable.
>
> Revision Changes Path
> 1.65 +34 -0 ws-axis/c/configure.ac
>
> Index: configure.ac
> ===================================================================
> RCS file: /home/cvs/ws-axis/c/configure.ac,v
> retrieving revision 1.64
> retrieving revision 1.65
> diff -u -r1.64 -r1.65
> --- configure.ac 5 Jan 2005 03:11:58 -0000 1.64
> +++ configure.ac 12 Jan 2005 05:50:23 -0000 1.65
> @@ -111,6 +111,35 @@
> TESTCASESBUILD=""
> )
>
> +AC_MSG_CHECKING(whether to build cppunit tests.)
> +AC_ARG_WITH(cppunit,
> +[ --with-cppunit[=PATH] build cppunit tests.],
> +[ case "$withval" in
> + no)
> + AC_MSG_RESULT(no)
> + CPPUNITBUILD=""
> + ;;
> + *)
> + AC_MSG_RESULT(yes)
> + dnl test whether testcases build enabled
> + if test tests != "$TESTCASESBUILD"; then
> + AC_MSG_ERROR("Tetcases are not enabled. stop")
> + fi
> + dnl test for cppunit directory
> + if test -d $withval; then
> + cppunitinc="-I$withval/include"
> + cppunitlib="-L$withval/lib -lcppunit -ldl"
> + echo "$cppunitinc"
> + else
> + AC_MSG_ERROR(could not find cppunit. stop)
> + fi
> + CPPUNITBUILD="unit_tests"
> +
> + ;;
> + esac ],
> + AC_MSG_RESULT(no)
> +)
> +
> AC_MSG_CHECKING(whether to build samples)
> AC_ARG_ENABLE(samples, [ --enable-samples build samples. default=yes],
> [ case "${enableval}" in
> @@ -174,6 +203,8 @@
> APACHEINC=$apacheinc
> XERCESCINC=$xercescinc
> XERCESCLIB=$xercesclib
> +CPPUNITINC=$cppunitinc
> +CPPUNITLIB=$cppunitlib
> EXPATINC=$expatinc
> EXPATLIB=$expatlib
> SSLINC=$sslinc
> @@ -183,6 +214,8 @@
> AC_SUBST(APACHEINC)
> AC_SUBST(XERCESCINC)
> AC_SUBST(XERCESCLIB)
> +AC_SUBST(CPPUNITINC)
> +AC_SUBST(CPPUNITLIB)
> AC_SUBST(EXPATINC)
> AC_SUBST(EXPATLIB)
> AC_SUBST(SSLINC)
> @@ -193,6 +226,7 @@
> AC_SUBST(APACHEBUILD)
> AC_SUBST(LINKCLIENTLIB)
> AC_SUBST(TESTCASESBUILD)
> +AC_SUBST(CPPUNITBUILD)
> AC_SUBST(SAMPLESBUILD)
> AC_SUBST(LIBWWWBUILD)
> AC_SUBST(TSPPBUILD)
>
> 1.4 +1 -1 ws-axis/c/tests/Makefile.am
>
> Index: Makefile.am
> ===================================================================
> RCS file: /home/cvs/ws-axis/c/tests/Makefile.am,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -r1.3 -r1.4
> --- Makefile.am 31 Dec 2004 08:24:55 -0000 1.3
> +++ Makefile.am 12 Jan 2005 05:50:24 -0000 1.4
> @@ -1 +1 @@
> -SUBDIRS = client server unit_tests
> +SUBDIRS = client server @CPPUNITBUILD@
>
> 1.3 +2 -3 ws-axis/c/tests/unit_tests/cppunit/Makefile.am
>
> Index: Makefile.am
> ===================================================================
> RCS file: /home/cvs/ws-axis/c/tests/unit_tests/cppunit/Makefile.am,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -r1.2 -r1.3
> --- Makefile.am 31 Dec 2004 12:11:26 -0000 1.2
> +++ Makefile.am 12 Jan 2005 05:50:24 -0000 1.3
> @@ -1,7 +1,6 @@
> bin_PROGRAMS = runtestsuite
> -#SUBDIRS = transport
> AM_CPPFLAGS = $(CPPFLAGS)
> runtestsuite_SOURCES = runCppUnitTests.cpp
> -runtestsuite_LDADD = $(LDFLAGS) ../../../src/transport/axis2/libaxis2_transport.la -L${CPPUNIT_HOME}/lib -lcppunit -ldl
> +runtestsuite_LDADD = $(LDFLAGS) ../../../src/transport/axis2/libaxis2_transport.la @CPPUNITLIB@
>
> -INCLUDES = -I$(AXISCPP_HOME)/include -I${CPPUNIT_HOME}/include
> +INCLUDES = -I$(AXISCPP_HOME)/include @CPPUNITINC@
>
> 1.2 +1 -1 ws-axis/c/tests/unit_tests/cppunit/README
>
> Index: README
> ===================================================================
> RCS file: /home/cvs/ws-axis/c/tests/unit_tests/cppunit/README,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- README 7 Jan 2005 05:23:57 -0000 1.1
> +++ README 12 Jan 2005 05:50:24 -0000 1.2
> @@ -1,5 +1,5 @@
> To run cppunit tests you need to install cppunit in your matchine
> -I installed cppunit-1.8.0.tar.gz
> +I installed cppunit-1.10.2.tar.gz
> Then create CPPUNIT_HOME environment variable pointing to your installation location
> When you configure, by default testcases are not added to the build.
> So to build testcases and cpp unit tests you need to add the configure option
>
> 1.2 +3 -3 ws-axis/c/tests/unit_tests/cppunit/runCppUnitTests.cpp
>
> Index: runCppUnitTests.cpp
> ===================================================================
> RCS file: /home/cvs/ws-axis/c/tests/unit_tests/cppunit/runCppUnitTests.cpp,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- runCppUnitTests.cpp 31 Dec 2004 08:24:55 -0000 1.1
> +++ runCppUnitTests.cpp 12 Jan 2005 05:50:24 -0000 1.2
> @@ -1,10 +1,10 @@
> #include <cppunit/Asserter.h>
> #include <cppunit/CompilerOutputter.h>
> #include <cppunit/config-auto.h>
> -#include <cppunit/config-bcb5.h>
> +//#include <cppunit/config-bcb5.h>
> //config-msvc6.h
> #include <cppunit/Exception.h>
> -#include <cppunit/NotEqualException.h>
> +//#include <cppunit/NotEqualException.h>
> #include <cppunit/Outputter.h>
> #include <cppunit/Portability.h>
> #include <cppunit/SourceLine.h>
> @@ -18,7 +18,7 @@
> #include <cppunit/TestListener.h>
> #include <cppunit/TestResultCollector.h>
> #include <cppunit/TestResult.h>
> -#include <cppunit/TestSucessListener.h>
> +#include <cppunit/TestSuccessListener.h>
> #include <cppunit/TestSuite.h>
> #include <cppunit/TextOutputter.h>
> #include <cppunit/TextTestProgressListener.h>
>
> 1.4 +3 -3 ws-axis/c/tests/unit_tests/cppunit/transport/axis2/Axis2TransportTest.hpp
>
> Index: Axis2TransportTest.hpp
> ===================================================================
> RCS file: /home/cvs/ws-axis/c/tests/unit_tests/cppunit/transport/axis2/Axis2TransportTest.hpp,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -r1.3 -r1.4
> --- Axis2TransportTest.hpp 31 Dec 2004 10:43:36 -0000 1.3
> +++ Axis2TransportTest.hpp 12 Jan 2005 05:50:24 -0000 1.4
> @@ -1,10 +1,10 @@
> #include <cppunit/Asserter.h>
> #include <cppunit/CompilerOutputter.h>
> #include <cppunit/config-auto.h>
> -#include <cppunit/config-bcb5.h>
> +//#include <cppunit/config-bcb5.h>
> //config-msvc6.h
> #include <cppunit/Exception.h>
> -#include <cppunit/NotEqualException.h>
> +//#include <cppunit/NotEqualException.h>
> #include <cppunit/Outputter.h>
> #include <cppunit/Portability.h>
> #include <cppunit/SourceLine.h>
> @@ -18,7 +18,7 @@
> #include <cppunit/TestListener.h>
> #include <cppunit/TestResultCollector.h>
> #include <cppunit/TestResult.h>
> -#include <cppunit/TestSucessListener.h>
> +#include <cppunit/TestSuccessListener.h>
> #include <cppunit/TestSuite.h>
> #include <cppunit/TextOutputter.h>
> #include <cppunit/TextTestProgressListener.h>
>
>