You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ro...@apache.org on 2004/04/29 07:20:20 UTC

cvs commit: ws-axis/c/src/unit_tests/cppunit/client ClientMain.cpp CallTestCase.h CallTestCase.cpp

roshan      2004/04/28 22:20:19

  Modified:    c/src/unit_tests/cppunit/client ClientMain.cpp
                        CallTestCase.h CallTestCase.cpp
  Log:
  Applied Coding Conventions
  
  Revision  Changes    Path
  1.2       +38 -24    ws-axis/c/src/unit_tests/cppunit/client/ClientMain.cpp
  
  Index: ClientMain.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/unit_tests/cppunit/client/ClientMain.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ClientMain.cpp	28 Jan 2004 11:51:33 -0000	1.1
  +++ ClientMain.cpp	29 Apr 2004 05:20:19 -0000	1.2
  @@ -1,3 +1,19 @@
  +/*
  + *   Copyright 2003-2004 The Apache Software Foundation.
  + *
  + *   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 "cppunit\ui\text\TestRunner.h"
   #include "axis/test_cases/cppunit/client/CallTestCase.h"
   
  @@ -5,46 +21,44 @@
   using namespace CppUnit::TextUi;
   
   int main(int argc, char* argv[])
  - {
  -
  -	TestRunner runner;
  -
  -	runner.addTest(CallTestCase::suite());
  -	runner.run("CallTestCase");
  +{
   
  +    TestRunner runner;
   
  +    runner.addTest(CallTestCase::suite());
  +    runner.run("CallTestCase");
   
  +/*
  +    //runner.addTest(TypeMappingTestCase::suite());
  +    //runner.run("TypeMappingTestCase");
   
  -	//runner.addTest(TypeMappingTestCase::suite());
  -	//runner.run("TypeMappingTestCase");
   
  -
  -	//runner.addTest(AxisUtilsTestCase::suite());
  -	//runner.run("AxisUtilsTestCase");
  +    //runner.addTest(AxisUtilsTestCase::suite());
  +    //runner.run("AxisUtilsTestCase");
   
   ////////////// Runner for AxisArrayBeanTest //////////////////
  -	//runner.addTest(ArrayBeanTestCase::suite());
  -	//runner.run("ArrayBeanTestCase");
  +    //runner.addTest(ArrayBeanTestCase::suite());
  +    //runner.run("ArrayBeanTestCase");
   
   
   ///////////// Runner for AxisConfigTestCase  /////////////////
  -	//runner.addTest(AxisConfigTestCase::suite());
  -	//runner.run("AxisConfigTestCase");
  +    //runner.addTest(AxisConfigTestCase::suite());
  +    //runner.run("AxisConfigTestCase");
   
   /////////////  OK Runner for BasicTypeSerializer ////////////////
   
  -	//runner.addTest(BasicTypeSerializerTest::suite());
  -	//runner.run("BasicTypeSerializerTest");
  +    //runner.addTest(BasicTypeSerializerTest::suite());
  +    //runner.run("BasicTypeSerializerTest");
   
   ///////////// Runner for AxisSocketUtilsTestCase /////////////
  -	//runner.addTest(AxisSocketUtilsTestCase::suite());
  -	//runner.run("AxisSocketUtilsTestCase");
  -	
  +    //runner.addTest(AxisSocketUtilsTestCase::suite());
  +    //runner.run("AxisSocketUtilsTestCase");
  +    
   ////////////// OK Runner for ParamTestCase /////////////////
   
  -	//runner.addTest(ParamTestCase::suite());
  -	//runner.run("ParamTestCase");
  -
  +    //runner.addTest(ParamTestCase::suite());
  +    //runner.run("ParamTestCase");
  +*/
   
  -	return 0;
  +    return 0;
   }
  
  
  
  1.3       +29 -15    ws-axis/c/src/unit_tests/cppunit/client/CallTestCase.h
  
  Index: CallTestCase.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/unit_tests/cppunit/client/CallTestCase.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CallTestCase.h	26 Apr 2004 04:04:38 -0000	1.2
  +++ CallTestCase.h	29 Apr 2004 05:20:19 -0000	1.3
  @@ -1,9 +1,23 @@
  -// allTestCase.h: interface for the CallTestCase class.
  -//
  -//////////////////////////////////////////////////////////////////////
  +/*
  + *   Copyright 2003-2004 The Apache Software Foundation.
  + *
  + *   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.
  + */
   
  -#if !defined(AFX_ALLTESTCASE_H__2F6B4B2E_EACB_4F61_93ED_AEB3DE5943DD__OF_AXIS_INCLUDED_)
  -#define AFX_ALLTESTCASE_H__2F6B4B2E_EACB_4F61_93ED_AEB3DE5943DD__OF_AXIS_INCLUDED_
  +/* allTestCase.h: interface for the CallTestCase class. */
  +
  +#if !defined(AXIS_ALLTESTCASE_H__OF_AXIS_INCLUDED_)
  +#define AXIS_ALLTESTCASE_H__OF_AXIS_INCLUDED_
   
   #include "cppunit\TestCase.h"
   #include "cppunit\TestSuite.h"
  @@ -21,17 +35,17 @@
   class CallTestCase  : public TestCase
   {
   private:
  -	Call* pCall;
  -	//SoapDeSerializer* pSoap;
  +    Call* pCall;
  +    /* SoapDeSerializer* pSoap; */
   public:
  -	void testGetElementAsInt();
  -	
  -	void tearDown();
  -	void setUp();
  -	CallTestCase();
  -	virtual ~CallTestCase();
  -	static Test* suite();
  +    void testGetElementAsInt();
  +    
  +    void tearDown();
  +    void setUp();
  +    CallTestCase();
  +    virtual ~CallTestCase();
  +    static Test* suite();
   
   };
   
  -#endif // !defined(AFX_ALLTESTCASE_H__2F6B4B2E_EACB_4F61_93ED_AEB3DE5943DD__OF_AXIS_INCLUDED_)
  +#endif
  
  
  
  1.2       +30 -18    ws-axis/c/src/unit_tests/cppunit/client/CallTestCase.cpp
  
  Index: CallTestCase.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/unit_tests/cppunit/client/CallTestCase.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CallTestCase.cpp	28 Jan 2004 11:51:33 -0000	1.1
  +++ CallTestCase.cpp	29 Apr 2004 05:20:19 -0000	1.2
  @@ -1,12 +1,24 @@
  -// allTestCase.cpp: implementation of the CallTestCase class.
  -//
  -//////////////////////////////////////////////////////////////////////
  +/*
  + *   Copyright 2003-2004 The Apache Software Foundation.
  + *
  + *   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.
  + */
  +
  +/*  allTestCase.cpp: implementation of the CallTestCase class. */
  +
   
   #include "axis/test_cases/cppunit/client/CallTestCase.h"
   
  -//////////////////////////////////////////////////////////////////////
  -// Construction/Destruction
  -//////////////////////////////////////////////////////////////////////
   
   CallTestCase::CallTestCase()
   {
  @@ -20,41 +32,41 @@
   
   void CallTestCase::setUp()
   {
  -	pCall = new Call();
  -//	pSoap = new SoapDeSerializer();
  +    pCall = new Call();
  +/*    pSoap = new SoapDeSerializer(); */
   
   
   }
   
   void CallTestCase::tearDown()
   {
  -	delete pCall;
  -	pCall = NULL;
  +    delete pCall;
  +    pCall = NULL;
   
   }
   
   
   Test* CallTestCase::suite()
   {
  -	TestSuite* testSuite = new TestSuite("CallTestCase");
  +    TestSuite* testSuite = new TestSuite("CallTestCase");
   
  -	testSuite->addTest (new TestCaller <CallTestCase>
  +    testSuite->addTest (new TestCaller <CallTestCase>
         ("testGetElementAsInt", &CallTestCase::testGetElementAsInt));
   
  -	return testSuite;
  +    return testSuite;
   
   }
   
   void CallTestCase::testGetElementAsInt()
   {
  -	int ExpectedInt = 10;
  +    int ExpectedInt = 10;
    
  -	const AxisChar* myString ="TestString";
  -	const AxisChar* myString1 ="Test";
  +    const AxisChar* myString ="TestString";
  +    const AxisChar* myString1 ="Test";
   
   
  -	int iResult = pCall->GetElementAsInt(myString, myString1);
  +    int iResult = pCall->GetElementAsInt(myString, myString1);
   
   
  -	CPPUNIT_ASSERT_EQUAL(ExpectedInt, iResult);
  +    CPPUNIT_ASSERT_EQUAL(ExpectedInt, iResult);
   }