Thread: [Kdevcppunit-commits] kdevcppunit/src/tests Makefile.am,1.1.1.1,1.2 dummy_test.cpp,1.4,1.5 kcppunit_

Update of /cvsroot/kdevcppunit/kdevcppunit/src/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7455/src/tests

Modified Files:
	Makefile.am dummy_test.cpp kcppunit_test.cpp 
Removed Files:
	KCppUnitListener.cpp KCppUnitListener.h 
Log Message:
restructured file tree

Index: dummy_test.cpp
===================================================================
RCS file: /cvsroot/kdevcppunit/kdevcppunit/src/tests/dummy_test.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dummy_test.cpp	9 Feb 2005 22:24:02 -0000	1.4
--- dummy_test.cpp	20 Feb 2005 17:26:23 -0000	1.5
***************
*** 1,4 ****
  /** @file
!     @brief
  
   $Id$
--- 1,4 ----
  /** @file
!     @brief Dummy-Tests to produce some testing output
  
   $Id$
***************
*** 28,38 ****
   ***************************************************************************/
  
! #include "kcppunit_test.h" // allways first
! 
! #ifndef HAVE_CPPUNIT
! 
! # warning CppUnit not available at compile time
! 
! #else
  
  #include <cppunit/extensions/HelperMacros.h>
--- 28,32 ----
   ***************************************************************************/
  
! #include "kcppunit_test.h" // always first
  
  #include <cppunit/extensions/HelperMacros.h>
***************
*** 73,76 ****
  }
  
- 
- #endif // HAVE_CPPUNIT
--- 67,68 ----

--- KCppUnitListener.h DELETED ---

Index: kcppunit_test.cpp
===================================================================
RCS file: /cvsroot/kdevcppunit/kdevcppunit/src/tests/kcppunit_test.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** kcppunit_test.cpp	9 Feb 2005 22:24:02 -0000	1.4
--- kcppunit_test.cpp	20 Feb 2005 17:26:23 -0000	1.5
***************
*** 28,37 ****
   ***************************************************************************/
  
! #include "kcppunit_test.h" // allways first
  
  #include <iostream>
  
- #ifdef HAVE_CPPUNIT
- 
  #include <ctime>
  
--- 28,35 ----
   ***************************************************************************/
  
! #include "kcppunit_test.h" // always first
  
  #include <iostream>
  
  #include <ctime>
  
***************
*** 40,52 ****
  #include <cppunit/ui/text/TestRunner.h>
  
- #include "KCppUnitListener.h"
- 
- #endif
- 
  
  int main(int argc, char **argv)
  {
    int ret = 1;
- #ifdef HAVE_CPPUNIT
    CppUnit::TextUi::TestRunner runner;
    CppUnit::TestFactory &registry = CppUnit::TestFactoryRegistry::getRegistry();
--- 38,45 ----
***************
*** 55,74 ****
    std::cout << "starting tests..\n"
              << "Options\n"
-             << "  --kdevcppunit-output  output for KDevCppUnit\n"
              << "\n";
  
-   for (int i = 1; i < argc; ++i)
-   {
-     if (strcmp (argv[i], "--kdevcppunit-output") == 0)
-       runner.eventManager().addListener(new KCppUnitListener());
-   }
- 
    ret = runner.run() ? 0 : 1;
    std::cout << "Result: " << ret << std::endl;
- #else
-   std::cout << "CppUnit was not available at compile time!\n";
-   std::cout << "No unit tests are performed.\n";
-   ret = 1;
- #endif
    return ret;
  }
--- 48,55 ----

Index: Makefile.am
===================================================================
RCS file: /cvsroot/kdevcppunit/kdevcppunit/src/tests/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.am	15 Nov 2004 20:54:40 -0000	1.1.1.1
--- Makefile.am	20 Feb 2005 17:26:23 -0000	1.2
***************
*** 7,11 ****
  TESTS = $(check_PROGRAMS)
  kcppunit_test_LDFLAGS = $(all_libraries) $(CPPUNITLIB) $(MOCKPPLIB)
! kcppunit_test_SOURCES = kcppunit_test.cpp dummy_test.cpp KCppUnitListener.cpp
  
! AM_CXXFLAGS = -w -fexceptions
--- 7,11 ----
  TESTS = $(check_PROGRAMS)
  kcppunit_test_LDFLAGS = $(all_libraries) $(CPPUNITLIB) $(MOCKPPLIB)
! kcppunit_test_SOURCES = kcppunit_test.cpp dummy_test.cpp
  
! kcppunit_test_LDADD = -ldl

--- KCppUnitListener.cpp DELETED ---