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 wh...@apache.org on 2005/07/08 23:31:24 UTC
cvs commit: ws-axis/c/tests/auto_build/testcases/tests CalculatorDocC.xml
whitlock 2005/07/08 14:31:24
Modified: c/build buildTest.xml
c/tests/auto_build/testcases unitTest.list
Added: c/tests/auto_build/testcases/client/c CalculatorDocClient.c
c/tests/auto_build/testcases/tests CalculatorDocC.xml
Log:
AXISCPP-445 Add in Calculator C test
Revision Changes Path
1.12 +19 -6 ws-axis/c/build/buildTest.xml
Index: buildTest.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build/buildTest.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- buildTest.xml 8 Jun 2005 15:52:07 -0000 1.11
+++ buildTest.xml 8 Jul 2005 21:31:23 -0000 1.12
@@ -12,9 +12,22 @@
<condition property="generated.lang" value="c++">
<equals arg1="${test.clientLang}" arg2="cpp"/>
</condition>
+ <condition property="generated.lang.allheaders" value="*.hpp">
+ <equals arg1="${test.clientLang}" arg2="cpp"/>
+ </condition>
+ <condition property="clientLibraryName.lang" value="${clientLibraryName}">
+ <equals arg1="${test.clientLang}" arg2="cpp"/>
+ </condition>
+
<condition property="generated.lang" value="c">
<equals arg1="${test.clientLang}" arg2="c"/>
</condition>
+ <condition property="generated.lang.allheaders" value="*.h">
+ <equals arg1="${test.clientLang}" arg2="c"/>
+ </condition>
+ <condition property="clientLibraryName.lang" value="${cClientLibraryName}">
+ <equals arg1="${test.clientLang}" arg2="c"/>
+ </condition>
</target>
<!--
@@ -54,8 +67,8 @@
<target name="copyDynamicClient" if="test.dynamicCode">
<copy todir="${test.directory}">
<fileset dir="${dir.autotests}/dynamic/${test.dynamicCodeDirectory}">
- <include name="*.cpp"/>
- <include name="*.hpp"/>
+ <include name="*.${test.clientLang}"/>
+ <include name="${generated.lang.allheaders}"/>
</fileset>
</copy>
</target>
@@ -89,11 +102,11 @@
<linker refid="LinuxLinker"/>
<linker refid="AIXExecutableLinker"/>
<linker extends="OS400ExecutableLinker">
- <linkerarg location="end" value="${dir.lib}/lib${clientLibraryName}.so"/>
+ <linkerarg location="end" value="${dir.lib}/lib${clientLibraryName.lang}.so"/>
</linker>
<!-- Axis Client .lib file location, or UNIX shared object -->
- <libset dir="${dir.lib}" libs="${clientLibraryName}" unless="os400"/>
+ <libset dir="${dir.lib}" libs="${clientLibraryName.lang}" unless="os400"/>
<!-- Files to be compiled -->
<includepath path="${dir.include}"/>
<fileset dir="${test.directory}">
@@ -117,10 +130,10 @@
<linker refid="LinuxLinker"/>
<linker refid="AIXExecutableLinker"/>
<linker extends="OS400ExecutableLinker">
- <linkerarg location="end" value="${dir.lib}/lib${clientLibraryName}.so"/>
+ <linkerarg location="end" value="${dir.lib}/lib${clientLibraryName.lang}.so"/>
</linker>
<!-- Axis Client .lib file location, or UNIX shared object -->
- <libset dir="${dir.lib}" libs="${clientLibraryName}" unless="os400"/>
+ <libset dir="${dir.lib}" libs="${clientLibraryName.lang}" unless="os400"/>
<libset dir="${test.directory}" libs="${libraryName}" unless="os400"/>
<!-- Files to be compiled -->
<includepath path="${dir.include}"/>
1.21 +1 -0 ws-axis/c/tests/auto_build/testcases/unitTest.list
Index: unitTest.list
===================================================================
RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/unitTest.list,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- unitTest.list 8 Jul 2005 08:50:17 -0000 1.20
+++ unitTest.list 8 Jul 2005 21:31:24 -0000 1.21
@@ -1,5 +1,6 @@
Attachment1.xml
AxisBench.xml
+CalculatorDocC.xml
CombinedAll.xml
CombinedChoice.xml
ComplexLists.xml
1.1 ws-axis/c/tests/auto_build/testcases/client/c/CalculatorDocClient.c
Index: CalculatorDocClient.c
===================================================================
// Copyright 2003-2004 The Apache Software Foundation.
// (c) Copyright IBM Corp. 2004, 2005 All Rights Reserved
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include "Calculator.h"
#include <stdio.h>
int main(int argc, char ** argv) {
AXISCHANDLE stub;
int ret = 0;
char *uri = "http://localhost:80/axis/Calculator";
if (argc>1)
uri = argv[1];
stub = get_Calculator_stub(uri);
ret = add(stub,3,2);
printf("%i\n",ret);
printf("---------------------- TEST COMPLETE -----------------------------\n");
}
1.1 ws-axis/c/tests/auto_build/testcases/tests/CalculatorDocC.xml
Index: CalculatorDocC.xml
===================================================================
<test>
<name>CalculatorDocC</name>
<description>CalculatorDoc</description>
<clientLang>c</clientLang>
<clientCode>CalculatorDocClient.c</clientCode>
<wsdl>CalculatorDoc.wsdl</wsdl>
<expected>
<output>
CalculatorDoc.cpp.out
</output>
<serverResponse>
CalculatorDoc_ServerResponse.expected
</serverResponse>
</expected>
<endpoint>http://localhost:80/axis/CalculatorDoc</endpoint>
</test>