axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hawk...@apache.org
Subject cvs commit: ws-axis/c/tests/auto_build/testcases/output AxisBench.cpp.out SimpleArrayDoc.cpp.out CalculatorDoc.cpp.out MathOpsDoc.cpp.out FaultMappingDoc.cpp.out ExceptionTestDoc.cpp.out
Date Mon, 31 Jan 2005 16:38:18 GMT
hawkeye     2005/01/31 08:38:18

  Modified:    c/tests/auto_build/testcases/client/cpp MathOpsDocClient.cpp
                        FaultMappingDocClient.cpp CalculatorDocClient.cpp
                        SimpleArrayDocClient.cpp AxisBenchClient.cpp
                        ExceptionTestDocClient.cpp
               c/tests/auto_build/testcases/output AxisBench.cpp.out
                        SimpleArrayDoc.cpp.out CalculatorDoc.cpp.out
                        MathOpsDoc.cpp.out FaultMappingDoc.cpp.out
                        ExceptionTestDoc.cpp.out
  Log:
  Tests now have a end of test marker on cout. also made tests that used printf no use cout
  
  Revision  Changes    Path
  1.6       +8 -7      ws-axis/c/tests/auto_build/testcases/client/cpp/MathOpsDocClient.cpp
  
  Index: MathOpsDocClient.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/MathOpsDocClient.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MathOpsDocClient.cpp	24 Nov 2004 13:25:19 -0000	1.5
  +++ MathOpsDocClient.cpp	31 Jan 2005 16:38:18 -0000	1.6
  @@ -1,6 +1,7 @@
   #include "MathOps.hpp"
   #include <axis/AxisException.hpp>
   #include <ctype.h>
  +#include <iostream>
   
   void PrintUsage();
   bool IsNumber(const char* p);
  @@ -16,7 +17,6 @@
   	const char* p2 = 0;
   	int i1=0, i2=0;
   	int iResult;
  -	char* pcDetail;
   
   	url = argv[1];
   
  @@ -32,33 +32,34 @@
   		if (strcmp(op, "div") == 0)
   		{
   			iResult = ws.div(i1, i2);		
  -			printf("Result is:%d\n", iResult);
  +			cout << "Result is:" << iResult << endl;
   		}
   		else 
   		{
  -			printf("Invalid operation %s\n\n", op);
  +			cout << "Invalid operation "<< op<< endl<<endl;
   			PrintUsage();
   		}
   	}
   	catch(AxisException& e)
   	{
  -	    printf("%s\n", e.what());
  +	    cout << e.what()<<endl;
   	}
   	catch(exception& e)
   	{
  -	    printf("Unknown exception has occured\n");
  +	    cout << "Unknown exception has occured" << e.what() << endl;
   	}
   	catch(...)
   	{
  -	    printf("Unspecified exception has occured\n");
  +	    cout << "Unspecified exception has occured" << endl;
   	}
  +	cout << "---------------------- TEST COMPLETE -----------------------------"<<
endl;
   	
   	return 0;
   }
   
   void PrintUsage()
   {
  -	printf("Usage :\n MathOps <url>\n\n");
  +	cout << "Usage :\n MathOps <url>"<<endl<<endl;
   	exit(1);
   }
   
  
  
  
  1.11      +2 -0      ws-axis/c/tests/auto_build/testcases/client/cpp/FaultMappingDocClient.cpp
  
  Index: FaultMappingDocClient.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/FaultMappingDocClient.cpp,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- FaultMappingDocClient.cpp	13 Jan 2005 09:01:41 -0000	1.10
  +++ FaultMappingDocClient.cpp	31 Jan 2005 16:38:18 -0000	1.11
  @@ -91,6 +91,8 @@
   	{
   		cout << "Invalid operation " << op << endl;
   	}
  +	cout << "---------------------- TEST COMPLETE -----------------------------"<<
endl;
  +	
   	return 0;
   }
   
  
  
  
  1.6       +7 -4      ws-axis/c/tests/auto_build/testcases/client/cpp/CalculatorDocClient.cpp
  
  Index: CalculatorDocClient.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/CalculatorDocClient.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CalculatorDocClient.cpp	29 Nov 2004 12:39:31 -0000	1.5
  +++ CalculatorDocClient.cpp	31 Jan 2005 16:38:18 -0000	1.6
  @@ -1,6 +1,7 @@
   #include "Calculator.hpp"
   #include <axis/AxisException.hpp>
   #include <ctype.h>
  +#include <iostream>
   
   void PrintUsage();
   bool IsNumber(const char* p);
  @@ -27,21 +28,23 @@
   		if (strcmp(op, "add") == 0)
   		{
   			iResult = ws.add(i1, i2);
  -			printf("%d\n", iResult);
  +			cout << iResult << endl;
   		}
   	}
   	catch(AxisException& e)
   	{
  -	    printf("Exception : %s\n", e.what());
  +	    cout << "Exception : " << e.what() << endl;
   	}
   	catch(exception& e)
   	{
  -	    printf("Unknown exception has occured\n" );
  +	    cout << "Unknown exception has occured" << endl;
   	}
   	catch(...)
   	{
  -	    printf("Unknown exception has occured\n" );
  +	    cout << "Unknown exception has occured" << endl;
   	}
  +  cout<< "---------------------- TEST COMPLETE -----------------------------"<<
endl;
  +	
   	return 0;
   }
   
  
  
  
  1.6       +8 -6      ws-axis/c/tests/auto_build/testcases/client/cpp/SimpleArrayDocClient.cpp
  
  Index: SimpleArrayDocClient.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/SimpleArrayDocClient.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SimpleArrayDocClient.cpp	29 Nov 2004 12:39:31 -0000	1.5
  +++ SimpleArrayDocClient.cpp	31 Jan 2005 16:38:18 -0000	1.6
  @@ -5,6 +5,7 @@
   
   #include "ArrayTestPortType.hpp"
   #include <axis/AxisException.hpp>
  +#include <iostream>
   
   #define ARRAYSIZE 2
   
  @@ -29,23 +30,24 @@
   		{
   			arrin.intItem.m_Array[x] = x;
   		}
  -		printf("invoking echoIntArray...\n");
  +		cout << "invoking echoIntArray..."<<endl;
   		if (ws.echoIntArray(&arrin)->intItem.m_Array != NULL)
  -			printf("successful \n");
  +			cout << "successful "<<endl;
   		else
  -			printf("failed \n");		
  +			cout << "failed "<<endl;		
   	}
   	catch(AxisException& e)
   	{
  -	    printf("Exception : %s\n", e.what());
  +	    cout << "Exception : "<< e.what()<<endl;
   	}
   	catch(exception& e)
   	{
  -	    printf("Unknown exception has occured\n");
  +	    cout << "Unknown exception has occured"<<endl;
   	}
   	catch(...)
   	{
  -	    printf("Unknown exception has occured\n");
  +	    cout << "Unknown exception has occured"<<endl;
   	}
  +	cout << "---------------------- TEST COMPLETE -----------------------------"<<
endl;
   	return 0;
   }
  
  
  
  1.17      +23 -10    ws-axis/c/tests/auto_build/testcases/client/cpp/AxisBenchClient.cpp
  
  Index: AxisBenchClient.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/AxisBenchClient.cpp,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- AxisBenchClient.cpp	18 Jan 2005 14:21:05 -0000	1.16
  +++ AxisBenchClient.cpp	31 Jan 2005 16:38:18 -0000	1.17
  @@ -172,7 +172,8 @@
   
         cout << "Input Count : " << input->count << endl;
         cout << "Count : " << output->count << endl;
  -      for ( ; i < output->count ; i++ ) {
  +      for ( ; i < output->count ; i++ ) 
  +      {
   		  if( output->infos.m_Array[i] != (BenchBasicDataType *) 0xcdcdcdcd)
   		  {
   			  cout << " ----------------------------------------------" << endl;
  @@ -206,8 +207,8 @@
   				cout << " HexBinaryType " << output->infos.m_Array[i]->HexBinary.__ptr
<< endl;
   			  }
   		  }
  +		  returnValue=0;
         }
  -      returnValue = 0; // Success
       }
   
       if(verbose) {
  @@ -227,16 +228,28 @@
     }
   
     // Samisa: make sure we clean up memory allocated
  -  delete ws; 
  -  for (int i = 0; i < input->infos.m_Size; i++)
  -      delete (BenchBasicDataType*)(input->infos.m_Array[i]);
  -  delete input;
  -  if (output)
  +  try
     {
  -    for (int i = 0; i < output->infos.m_Size; i++)
  -      delete (BenchBasicDataType*)(output->infos.m_Array[i]);
  -    delete output;
  +	  delete ws; 
  +	  for (int i = 0; i < input->infos.m_Size; i++)
  +	      delete (BenchBasicDataType*)(input->infos.m_Array[i]);
  +	  delete input;
  +	  if (output)
  +	  {
  +	    for (int i = 0; i < output->infos.m_Size; i++)
  +	      delete (BenchBasicDataType*)(output->infos.m_Array[i]);
  +	    delete output;
  +	  }
     }
  +  catch(exception& exception)
  +  {
  +  	cout << "Exception on clean up: " << exception.what()<<endl;
  +  }
  +  catch(...)
  +  {
  +  	cout << "Unknown exception on clean up: " << endl;
  +  }
  +  cout << "---------------------- TEST COMPLETE -----------------------------"<<
endl;
     return returnValue;
   
   }
  
  
  
  1.7       +10 -8     ws-axis/c/tests/auto_build/testcases/client/cpp/ExceptionTestDocClient.cpp
  
  Index: ExceptionTestDocClient.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/ExceptionTestDocClient.cpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ExceptionTestDocClient.cpp	24 Nov 2004 13:25:19 -0000	1.6
  +++ ExceptionTestDocClient.cpp	31 Jan 2005 16:38:18 -0000	1.7
  @@ -1,6 +1,7 @@
   #include "MathOps.hpp"
   #include <axis/AxisException.hpp>
   #include <ctype.h>
  +#include <iostream>
   
   void PrintUsage();
   bool IsNumber(const char* p);
  @@ -70,8 +71,8 @@
   			      * should be returned to the user.
   			      */
   			    /*sprintf(endpoint, "http://%s:%s/", server, port);*/
  -			    printf("This test has been temporarily terminated" \
  -			    " due to an unresolved bug\n");
  +			    cout << "This test has been temporarily terminated"  
  +			    << " due to an unresolved bug"<< endl;
   			    exit(0); /* This is temporary code*/
   			    break;
   
  @@ -84,33 +85,34 @@
   			    break;
   		 
   		       default:
  -			    printf("Invalid option for the last parameter\n\n");
  +			    cout << "Invalid option for the last parameter"<<endl<<endl;
   			    return 0;
   		    }
   		    //sprintf(endpoint, "http://%s:%s/axis/MathOps", server, port);
   		    MathOps ws(endpoint);
   		    iResult = ws.div(i1, i2);		
  -		    printf("Result is:%d\n", iResult);
  +		    cout << "Result is:" << iResult << endl;
   		}
   		catch(AxisException& e)
   		{
  -		    printf("AxisException has occured: %s\n", e.what());
  +		    cout << "AxisException has occured: " << e.what()<<endl;
   		}
   		catch(exception& e)
   		{
  -		    printf("Unknown exception has occured\n");
  +		    cout << "Unknown exception has occured"<< endl;
   		}
   		catch(...)
   		{
  -		    printf("Unspecified exception has occured\n");
  +		    cout << "Unspecified exception has occured" << endl;
   		}
   	    }
   	}
   	else 
   	{
  -		printf("Invalid operation %s\n\n", op);
  +		cout << "Invalid operation " << op <<endl<<endl;
   		PrintUsage();
   	}
  +	cout << "---------------------- TEST COMPLETE -----------------------------" <<
endl;
   	return 0;
   }
   
  
  
  
  1.5       +1 -0      ws-axis/c/tests/auto_build/testcases/output/AxisBench.cpp.out
  
  Index: AxisBench.cpp.out
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/output/AxisBench.cpp.out,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AxisBench.cpp.out	17 Nov 2004 14:28:45 -0000	1.4
  +++ AxisBench.cpp.out	31 Jan 2005 16:38:18 -0000	1.5
  @@ -1898,3 +1898,4 @@
    Base64BinaryType AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
    HexBinaryType 99
    HexBinaryType AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
  +---------------------- TEST COMPLETE -----------------------------
  \ No newline at end of file
  
  
  
  1.3       +1 -0      ws-axis/c/tests/auto_build/testcases/output/SimpleArrayDoc.cpp.out
  
  Index: SimpleArrayDoc.cpp.out
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/output/SimpleArrayDoc.cpp.out,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SimpleArrayDoc.cpp.out	20 Oct 2004 15:06:42 -0000	1.2
  +++ SimpleArrayDoc.cpp.out	31 Jan 2005 16:38:18 -0000	1.3
  @@ -1,2 +1,3 @@
   invoking echoIntArray...
   successful 
  +---------------------- TEST COMPLETE -----------------------------
  
  
  
  1.3       +1 -0      ws-axis/c/tests/auto_build/testcases/output/CalculatorDoc.cpp.out
  
  Index: CalculatorDoc.cpp.out
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/output/CalculatorDoc.cpp.out,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CalculatorDoc.cpp.out	20 Oct 2004 15:06:42 -0000	1.2
  +++ CalculatorDoc.cpp.out	31 Jan 2005 16:38:18 -0000	1.3
  @@ -1 +1,2 @@
   5
  +---------------------- TEST COMPLETE -----------------------------
  
  
  
  1.2       +1 -0      ws-axis/c/tests/auto_build/testcases/output/MathOpsDoc.cpp.out
  
  Index: MathOpsDoc.cpp.out
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/output/MathOpsDoc.cpp.out,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MathOpsDoc.cpp.out	5 Oct 2004 15:50:42 -0000	1.1
  +++ MathOpsDoc.cpp.out	31 Jan 2005 16:38:18 -0000	1.2
  @@ -1 +1,2 @@
   Result is:2
  +---------------------- TEST COMPLETE -----------------------------
  
  
  
  1.3       +1 -0      ws-axis/c/tests/auto_build/testcases/output/FaultMappingDoc.cpp.out
  
  Index: FaultMappingDoc.cpp.out
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/output/FaultMappingDoc.cpp.out,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FaultMappingDoc.cpp.out	14 Nov 2004 20:03:49 -0000	1.2
  +++ FaultMappingDoc.cpp.out	31 Jan 2005 16:38:18 -0000	1.3
  @@ -10,3 +10,4 @@
   3
   Trying to div 10 by -5
   MathOpsService_AxisClientException: OutOfBoundStruct Fault: "Out of bounds exception",
2, "This bounds exception is a forced exception"
  +---------------------- TEST COMPLETE -----------------------------
  \ No newline at end of file
  
  
  
  1.5       +1 -0      ws-axis/c/tests/auto_build/testcases/output/ExceptionTestDoc.cpp.out
  
  Index: ExceptionTestDoc.cpp.out
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/output/ExceptionTestDoc.cpp.out,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ExceptionTestDoc.cpp.out	25 Jan 2005 19:05:07 -0000	1.4
  +++ ExceptionTestDoc.cpp.out	31 Jan 2005 16:38:18 -0000	1.5
  @@ -1,3 +1,4 @@
   Result is:2
   AxisException has occured: HTTPTransportException:HTTP transport error Not Found
   AxisException has occured: HTTPTransportException:HTTP transport error Not Found
  +---------------------- TEST COMPLETE -----------------------------
  
  
  

Mime
View raw message