[Libreoffice-commits] cppunit.git: configure.ac examples/qt examples/ReadMe.txt include/cppunit INSTALL-WIN32.txt Makefile.am NEWS src/qttestrunner
Markus Mohrhard
markus.mohrhard at googlemail.com
Thu Apr 13 00:58:25 UTC 2017
INSTALL-WIN32.txt | 2
Makefile.am | 1
NEWS | 4
configure.ac | 1
examples/ReadMe.txt | 1
examples/qt/ExampleTestCases.cpp | 42 -
examples/qt/ExampleTestCases.h | 38 -
examples/qt/Main.cpp | 19
examples/qt/make_example | 10
examples/qt/make_example.bat | 7
examples/qt/qt_example.pro | 96 --
examples/qt/qt_example.sln | 29
examples/qt/qt_example.vcproj | 164 ----
examples/qt/qt_example_dll.vcproj | 164 ----
examples/qt/run.bat | 2
include/cppunit/ui/Makefile.am | 2
include/cppunit/ui/qt/Config.h | 21
include/cppunit/ui/qt/Makefile.am | 6
include/cppunit/ui/qt/QtTestRunner.h | 85 --
include/cppunit/ui/qt/TestRunner.h | 11
src/qttestrunner/MostRecentTests.cpp | 68 -
src/qttestrunner/MostRecentTests.h | 62 -
src/qttestrunner/QtTestRunner.cpp | 70 --
src/qttestrunner/TestBrowserDlgImpl.cpp | 83 --
src/qttestrunner/TestBrowserDlgImpl.h | 32
src/qttestrunner/TestFailureInfo.cpp | 21
src/qttestrunner/TestFailureInfo.h | 43 -
src/qttestrunner/TestFailureListViewItem.cpp | 29
src/qttestrunner/TestFailureListViewItem.h | 48 -
src/qttestrunner/TestListViewItem.cpp | 27
src/qttestrunner/TestListViewItem.h | 43 -
src/qttestrunner/TestRunnerDlgImpl.cpp | 260 -------
src/qttestrunner/TestRunnerDlgImpl.h | 58 -
src/qttestrunner/TestRunnerFailureEvent.cpp | 28
src/qttestrunner/TestRunnerFailureEvent.h | 48 -
src/qttestrunner/TestRunnerModel.cpp | 221 ------
src/qttestrunner/TestRunnerModel.h | 154 ----
src/qttestrunner/TestRunnerModelThreadInterface.cpp | 8
src/qttestrunner/TestRunnerModelThreadInterface.h | 35 -
src/qttestrunner/TestRunnerTestCaseRunEvent.cpp | 26
src/qttestrunner/TestRunnerTestCaseRunEvent.h | 45 -
src/qttestrunner/TestRunnerThread.cpp | 38 -
src/qttestrunner/TestRunnerThread.h | 55 -
src/qttestrunner/TestRunnerThreadEvent.cpp | 19
src/qttestrunner/TestRunnerThreadEvent.h | 37 -
src/qttestrunner/TestRunnerThreadFinishedEvent.cpp | 25
src/qttestrunner/TestRunnerThreadFinishedEvent.h | 42 -
src/qttestrunner/make_lib | 10
src/qttestrunner/make_lib.bat | 7
src/qttestrunner/qttestrunnerlib.pro | 149 ----
src/qttestrunner/testbrowserdlg.ui | 148 ----
src/qttestrunner/testrunnerdlg.ui | 687 --------------------
52 files changed, 5 insertions(+), 3326 deletions(-)
New commits:
commit dad270be0b9b1d10b2aeb8960603a06677b75b2b
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Thu Apr 13 02:57:18 2017 +0200
remove the qt test runner that depends on ancient qt
diff --git a/INSTALL-WIN32.txt b/INSTALL-WIN32.txt
index 0f78d29..76c5e46 100644
--- a/INSTALL-WIN32.txt
+++ b/INSTALL-WIN32.txt
@@ -114,8 +114,6 @@ cppunit_dll.dll : CppUnit dynamic library (DLL) "Multithreaded DLL"
cppunit_dll.lib : CppUnit dynamic import library "Multithreaded DLL"
cppunitd_dll.dll : CppUnit dynamic library (DLL) "Debug Multithreaded DLL"
cppunitd_dll.lib : CppUnit dynamic import library "Debug Multithreaded DLL"
-qttestrunner.dll : QT TestRunner dynamic library (DLL) "Multithreaded DLL"
-qttestrunner.lib : QT TestRunner import library "Multithreaded DLL"
testrunner.dll : MFC TestRunner dynamic library (DLL) "Multithreaded DLL"
testrunner.lib : MFC TestRunner import library "Multithreaded DLL"
testrunnerd.dll : MFC TestRunner dynamic library (DLL) "Debug Multithreaded DLL"
diff --git a/Makefile.am b/Makefile.am
index aa33e15..fc5a645 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,7 +42,6 @@ m4internal = \
unusedfolders = \
src/msvc6 \
- src/qttestrunner \
include/msvc6
EXTRA_DIST = \
diff --git a/NEWS b/NEWS
index eee1a75..a59dd83 100644
--- a/NEWS
+++ b/NEWS
@@ -26,6 +26,10 @@
* Test Plug-in Runner:
- Fixed crash on Win64 in test runner (fdo#81433)
+* Removed features
+
+ - QT test runner
+
New in CppUnit 1.13.2:
---------------------
diff --git a/configure.ac b/configure.ac
index 14d8c01..e7b4617 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,7 +131,6 @@ AC_CONFIG_FILES([
include/cppunit/tools/Makefile
include/cppunit/ui/Makefile
include/cppunit/ui/mfc/Makefile
- include/cppunit/ui/qt/Makefile
include/cppunit/ui/text/Makefile
doc/Makefile
doc/Doxyfile
diff --git a/examples/ReadMe.txt b/examples/ReadMe.txt
index 1c2f576..83c69d0 100644
--- a/examples/ReadMe.txt
+++ b/examples/ReadMe.txt
@@ -19,4 +19,3 @@ a flattened format (using TestPath).
msvc6/: VC++ specific examples.
HostApp/: Like 'simple' but use the MFC TestRunner.
-qt/: QT specific examples.
diff --git a/examples/qt/ExampleTestCases.cpp b/examples/qt/ExampleTestCases.cpp
deleted file mode 100644
index 457e4d4..0000000
--- a/examples/qt/ExampleTestCases.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "ExampleTestCases.h"
-#include <memory>
-
-CPPUNIT_TEST_SUITE_REGISTRATION( ExampleTestCases );
-
-void ExampleTestCases::example ()
-{
- CPPUNIT_ASSERT_DOUBLES_EQUAL (1.0, 1.1, 0.05);
- CPPUNIT_ASSERT (1 == 0);
- CPPUNIT_ASSERT (1 == 1);
-}
-
-void ExampleTestCases::anotherExample ()
-{
- CPPUNIT_ASSERT (1 == 2);
-}
-
-void ExampleTestCases::setUp ()
-{
- m_value1 = 2.0;
- m_value2 = 3.0;
-}
-
-void ExampleTestCases::testAdd ()
-{
- double result = m_value1 + m_value2;
- CPPUNIT_ASSERT (result == 6.0);
-}
-
-void ExampleTestCases::testEquals ()
-{
- std::unique_ptr<long> l1 (new long (12));
- std::unique_ptr<long> l2 (new long (12));
-
- CPPUNIT_ASSERT_EQUAL (12, 12);
- CPPUNIT_ASSERT_EQUAL (12L, 12L);
- CPPUNIT_ASSERT_EQUAL (*l1, *l2);
-
- CPPUNIT_ASSERT (12L == 12L);
- CPPUNIT_ASSERT_EQUAL (12, 13);
- CPPUNIT_ASSERT_DOUBLES_EQUAL (12.0, 11.99, 0.5);
-}
diff --git a/examples/qt/ExampleTestCases.h b/examples/qt/ExampleTestCases.h
deleted file mode 100644
index 4c40b8e..0000000
--- a/examples/qt/ExampleTestCases.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef CPP_UNIT_EXAMPLETESTCASES_H
-#define CPP_UNIT_EXAMPLETESTCASES_H
-
-#include <cppunit/TestFixture.h>
-#include <cppunit/extensions/HelperMacros.h>
-
-/*
- * A test case that is designed to produce
- * example errors and failures.
- *
- */
-
-class ExampleTestCases : public CPPUNIT_NS::TestFixture
-{
- CPPUNIT_TEST_SUITE( ExampleTestCases );
- CPPUNIT_TEST( example );
- CPPUNIT_TEST( anotherExample );
- CPPUNIT_TEST( testAdd );
- CPPUNIT_TEST( testEquals );
- CPPUNIT_TEST_SUITE_END();
-
-protected:
-
- double m_value1;
- double m_value2;
-public:
-
- void setUp ();
-
-protected:
-
- void example ();
- void anotherExample ();
- void testAdd ();
- void testEquals ();
-};
-
-#endif
diff --git a/examples/qt/Main.cpp b/examples/qt/Main.cpp
deleted file mode 100644
index e650040..0000000
--- a/examples/qt/Main.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <qapplication.h>
-#include <cppunit/ui/qt/TestRunner.h>
-#include <cppunit/extensions/TestFactoryRegistry.h>
-
-
-int main( int argc, char** argv )
-{
- QApplication app( argc, argv );
-
- //CPPUNIT_NS::QtUi::TestRunner runner;
-
- CPPUNIT_NS::QtTestRunner runner;
-
- runner.addTest( CPPUNIT_NS::TestFactoryRegistry::getRegistry().makeTest() );
- runner.run( true );
-
- return 0;
-}
-
diff --git a/examples/qt/make_example b/examples/qt/make_example
deleted file mode 100644
index b89989f..0000000
--- a/examples/qt/make_example
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/tcsh
-###########################################################################
-# FILE: make_example
-# PURPOSE: Create Makefile from project file and then make QtTestRunner
-# example.
-###########################################################################
-
-qmake qt_example.pro
-make distclean
-make
diff --git a/examples/qt/make_example.bat b/examples/qt/make_example.bat
deleted file mode 100644
index fd3f943..0000000
--- a/examples/qt/make_example.bat
+++ /dev/null
@@ -1,7 +0,0 @@
- at REM make_example.bat
- at REM
- at REM Create Makefile from project file and then make QtTestRunner example.
-
-qmake qt_example.pro
-nmake distclean
-nmake
diff --git a/examples/qt/qt_example.pro b/examples/qt/qt_example.pro
deleted file mode 100644
index c93f76e..0000000
--- a/examples/qt/qt_example.pro
+++ /dev/null
@@ -1,96 +0,0 @@
-#----------------------------------------------------------------------
-# File: qt_example.pro
-# Purpose: qmake config file for the QtTestRunner example.
-# The program is built with the QtTestRunner debug staticlib.
-# Set the CONFIG variable accordingly to build it differently.
-#----------------------------------------------------------------------
-
-TEMPLATE = app
-LANGUAGE = C++
-TARGET = qt_example
-
-# Get rid of possibly predefined options
-
-CONFIG -= debug
-CONFIG -= release
-
-CONFIG += qt warn_on debug use_static
-
-#CONFIG += qt warn_on release use_static
-#CONFIG += qt warn_on debug use_dll
-#CONFIG += qt warn_on release use_dll
-
-
-CPPUNIT_LIB_DIR = ../../lib # Location of libraries
-
-
-#----------------------------------------------------------------------
-# MS Windows
-#----------------------------------------------------------------------
-
-win32 {
- # Suppress program database creation (should better be done
- # in the qmake spec file)
- QMAKE_CXXFLAGS_DEBUG += /Z7
- QMAKE_CXXFLAGS_DEBUG -= -Gm
- QMAKE_CXXFLAGS_DEBUG -= -Zi
-}
-
-win32 {
- use_dll {
- DEFINES += QTTESTRUNNER_DLL
- debug {
- OBJECTS_DIR = DebugDLL
- LIBS += $${CPPUNIT_LIB_DIR}\cppunitd_dll.lib
- LIBS += $${CPPUNIT_LIB_DIR}\qttestrunnerd_dll.lib
- }
- release {
- OBJECTS_DIR = ReleaseDLL
- LIBS += $${CPPUNIT_LIB_DIR}\cppunit_dll.lib
- LIBS += $${CPPUNIT_LIB_DIR}\qttestrunner_dll.lib
- }
- }
- use_static {
- debug {
- OBJECTS_DIR = Debug
- LIBS += $${CPPUNIT_LIB_DIR}\cppunitd.lib
- LIBS += $${CPPUNIT_LIB_DIR}\qttestrunnerd.lib
- }
- release {
- OBJECTS_DIR = Release
- LIBS += $${CPPUNIT_LIB_DIR}\cppunit.lib
- LIBS += $${CPPUNIT_LIB_DIR}\qttestrunner.lib
- }
- }
- DESTDIR = $${OBJECTS_DIR}
-}
-
-#----------------------------------------------------------------------
-# Linux/Unix
-#----------------------------------------------------------------------
-
-unix {
- debug {
- OBJECTS_DIR = .obj_debug
- use_static: LIBS += -L$${CPPUNIT_LIB_DIR} -lqttestrunnerd
- use_dll: LIBS += -L$${CPPUNIT_LIB_DIR} -lqttestrunnerd_shared
- LIBS += -L$${CPPUNIT_LIB_DIR} -lcppunit
- }
- release {
- OBJECTS_DIR = .obj_release
- use_static: LIBS += -L$${CPPUNIT_LIB_DIR} -lqttestrunner
- use_dll: LIBS += -L$${CPPUNIT_LIB_DIR} -lqttestrunner_shared
- LIBS += -L$${CPPUNIT_LIB_DIR} -lcppunit
- }
-}
-
-#----------------------------------------------------------------------
-
-HEADERS = \
- ExampleTestCases.h
-
-SOURCES = \
- ExampleTestCases.cpp \
- Main.cpp
-
-INCLUDEPATH += . ../../include
diff --git a/examples/qt/qt_example.sln b/examples/qt/qt_example.sln
deleted file mode 100644
index 0817992..0000000
--- a/examples/qt/qt_example.sln
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qt_example", "qt_example.vcproj", "{84D9CB1F-5FD9-4794-BF6F-58DB10CCB8FD}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleUnitTest_with_DLL", "qt_example_dll.vcproj", "{44077776-21C3-4271-A74A-1ED1CDA862A4}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfiguration) = preSolution
- Debug = Debug
- Release = Release
- EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {84D9CB1F-5FD9-4794-BF6F-58DB10CCB8FD}.Debug.ActiveCfg = Debug|Win32
- {84D9CB1F-5FD9-4794-BF6F-58DB10CCB8FD}.Debug.Build.0 = Debug|Win32
- {84D9CB1F-5FD9-4794-BF6F-58DB10CCB8FD}.Release.ActiveCfg = Release|Win32
- {84D9CB1F-5FD9-4794-BF6F-58DB10CCB8FD}.Release.Build.0 = Release|Win32
- {44077776-21C3-4271-A74A-1ED1CDA862A4}.Debug.ActiveCfg = Debug|Win32
- {44077776-21C3-4271-A74A-1ED1CDA862A4}.Debug.Build.0 = Debug|Win32
- {44077776-21C3-4271-A74A-1ED1CDA862A4}.Release.ActiveCfg = Release|Win32
- {44077776-21C3-4271-A74A-1ED1CDA862A4}.Release.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
- EndGlobalSection
-EndGlobal
diff --git a/examples/qt/qt_example.vcproj b/examples/qt/qt_example.vcproj
deleted file mode 100644
index ef747af..0000000
--- a/examples/qt/qt_example.vcproj
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="qt_example"
- ProjectGUID="{84D9CB1F-5FD9-4794-BF6F-58DB10CCB8FD}"
- SccProjectName=""
- SccLocalPath="">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\Release"
- IntermediateDirectory=".\Release"
- ConfigurationType="1"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\include;$(QTDIR)\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- StringPooling="TRUE"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="TRUE"
- RuntimeTypeInfo="TRUE"
- PrecompiledHeaderFile=""
- AssemblerListingLocation=".\Release/"
- ObjectFile=".\Release/"
- ProgramDataBaseFileName=".\Release/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="cppunit.lib qttestrunner.lib qt-mt335.lib odbc32.lib odbccp32.lib"
- OutputFile=".\Release\qt_example.exe"
- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- AdditionalLibraryDirectories="..\..\lib,$(QTDIR)\lib"
- IgnoreDefaultLibraryNames="libc"
- ProgramDatabaseFile=""
- SubSystem="1"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Release/SampleUnitTest.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="2055"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\Debug"
- IntermediateDirectory=".\Debug"
- ConfigurationType="1"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\include;$(QTDIR)\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- BasicRuntimeChecks="0"
- RuntimeLibrary="3"
- RuntimeTypeInfo="TRUE"
- PrecompiledHeaderFile=""
- AssemblerListingLocation=".\Debug/"
- ObjectFile=".\Debug/"
- ProgramDataBaseFileName=".\Debug/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="3"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="cppunitd.lib qttestrunnerd.lib qt-mt335.lib odbc32.lib odbccp32.lib"
- OutputFile=".\Debug\qt_example.exe"
- LinkIncremental="0"
- SuppressStartupBanner="TRUE"
- AdditionalLibraryDirectories="..\..\lib,$(QTDIR)\lib"
- IgnoreDefaultLibraryNames="libc,libcd,msvcrt"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\Debug\qt_example.pdb"
- SubSystem="1"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Debug/SampleUnitTest.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="2055"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
- <File
- RelativePath=".\ExampleTestCases.cpp">
- </File>
- <File
- RelativePath=".\Main.cpp">
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl">
- <File
- RelativePath=".\ExampleTestCases.h">
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/examples/qt/qt_example_dll.vcproj b/examples/qt/qt_example_dll.vcproj
deleted file mode 100644
index ea02f90..0000000
--- a/examples/qt/qt_example_dll.vcproj
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="7.10"
- Name="qt_example_dll"
- ProjectGUID="{44077776-21C3-4271-A74A-1ED1CDA862A4}"
- SccProjectName=""
- SccLocalPath="">
- <Platforms>
- <Platform
- Name="Win32"/>
- </Platforms>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\ReleaseDLL"
- IntermediateDirectory=".\ReleaseDLL"
- ConfigurationType="1"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\include;$(QTDIR)\include"
- PreprocessorDefinitions="QTTESTRUNNER_DLL;WIN32;NDEBUG;_CONSOLE"
- StringPooling="TRUE"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="TRUE"
- RuntimeTypeInfo="TRUE"
- PrecompiledHeaderFile=""
- AssemblerListingLocation=".\ReleaseDLL/"
- ObjectFile=".\ReleaseDLL/"
- ProgramDataBaseFileName=".\ReleaseDLL/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="cppunit_dll.lib qttestrunner_dll.lib qt-mt335.lib odbc32.lib odbccp32.lib"
- OutputFile=".\ReleaseDLL\qt_example.exe"
- LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- AdditionalLibraryDirectories="..\..\lib;$(QTDIR)\lib"
- IgnoreDefaultLibraryNames="libc"
- ProgramDatabaseFile=""
- SubSystem="1"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Release/SampleUnitTest.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="2055"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory=".\DebugDLL"
- IntermediateDirectory=".\DebugDLL"
- ConfigurationType="1"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
- CharacterSet="2">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="..\..\include;$(QTDIR)\include"
- PreprocessorDefinitions="QTTESTRUNNER_DLL;WIN32;_DEBUG;_CONSOLE"
- BasicRuntimeChecks="0"
- RuntimeLibrary="3"
- RuntimeTypeInfo="TRUE"
- PrecompiledHeaderFile=""
- AssemblerListingLocation=".\DebugDLL/"
- ObjectFile=".\DebugDLL/"
- ProgramDataBaseFileName=".\DebugDLL/"
- WarningLevel="3"
- SuppressStartupBanner="TRUE"
- DebugInformationFormat="3"
- CompileAs="0"/>
- <Tool
- Name="VCCustomBuildTool"/>
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="cppunitd_dll.lib qttestrunnerd_dll.lib qt-mt335.lib odbc32.lib odbccp32.lib"
- OutputFile=".\DebugDLL\qt_example.exe"
- LinkIncremental="0"
- SuppressStartupBanner="TRUE"
- AdditionalLibraryDirectories="..\..\lib;$(QTDIR)\lib"
- IgnoreDefaultLibraryNames="libc,libcd,msvcrt"
- GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\DebugDLL\qt_example.pdb"
- SubSystem="1"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Debug/SampleUnitTest.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"/>
- <Tool
- Name="VCPreBuildEventTool"/>
- <Tool
- Name="VCPreLinkEventTool"/>
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="2055"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
- <File
- RelativePath=".\ExampleTestCases.cpp">
- </File>
- <File
- RelativePath=".\Main.cpp">
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl">
- <File
- RelativePath=".\ExampleTestCases.h">
- </File>
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/examples/qt/run.bat b/examples/qt/run.bat
deleted file mode 100755
index eaab68e..0000000
--- a/examples/qt/run.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-SET PATH=%PATH%;..\..\lib
-Debug\qt_example.exe
diff --git a/include/cppunit/ui/Makefile.am b/include/cppunit/ui/Makefile.am
index 1b9f08e..24cd2a5 100644
--- a/include/cppunit/ui/Makefile.am
+++ b/include/cppunit/ui/Makefile.am
@@ -1 +1 @@
-SUBDIRS = text mfc qt
+SUBDIRS = text mfc
diff --git a/include/cppunit/ui/qt/Config.h b/include/cppunit/ui/qt/Config.h
deleted file mode 100644
index beaf9ad..0000000
--- a/include/cppunit/ui/qt/Config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef CPPUNIT_QTUI_CONFIG_H
-#define CPPUNIT_QTUI_CONFIG_H
-
-/*! Macro to export symbol to DLL with VC++.
- *
- * - QTTESTRUNNER_DLL_BUILD must be defined when building the DLL.
- * - QTTESTRUNNER_DLL must be defined if linking against the DLL.
- * - If none of the above are defined then you are building or linking against
- * the static library.
- */
-
-#if defined( QTTESTRUNNER_DLL_BUILD )
-# define QTTESTRUNNER_API __declspec(dllexport)
-#elif defined ( QTTESTRUNNER_DLL )
-# define QTTESTRUNNER_API __declspec(dllimport)
-#else
-# define QTTESTRUNNER_API
-#endif
-
-
-#endif // CPPUNIT_QTUI_CONFIG_H
diff --git a/include/cppunit/ui/qt/Makefile.am b/include/cppunit/ui/qt/Makefile.am
deleted file mode 100644
index 7d4fb46..0000000
--- a/include/cppunit/ui/qt/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-libcppunitincludedir = $(includedir)/cppunit/ui/qt
-
-libcppunitinclude_HEADERS = \
- TestRunner.h \
- QtTestRunner.h \
- Config.h
diff --git a/include/cppunit/ui/qt/QtTestRunner.h b/include/cppunit/ui/qt/QtTestRunner.h
deleted file mode 100644
index 3ae602f..0000000
--- a/include/cppunit/ui/qt/QtTestRunner.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// //////////////////////////////////////////////////////////////////////////
-// Header file TestRunner.h for class TestRunner
-// (c)Copyright 2000, Baptiste Lepilleur.
-// Created: 2001/09/19
-// //////////////////////////////////////////////////////////////////////////
-#ifndef CPPUNIT_QTUI_QTTESTRUNNER_H
-#define CPPUNIT_QTUI_QTTESTRUNNER_H
-
-#include <vector>
-#include "Config.h"
-
-CPPUNIT_NS_BEGIN
-
-
- class Test;
- class TestSuite;
-
-
-/*!
- * \brief QT test runner.
- * \ingroup ExecutingTest
- *
- * Here is an example of usage:
- * \code
- * #include <cppunit/extensions/TestFactoryRegistry.h>
- * #include <cppunit/ui/qt/TestRunner.h>
- *
- * [...]
- *
- * void
- * QDepWindow::runTests()
- * {
- * CppUnit::QtUi::TestRunner runner;
- * runner.addTest( CppUnit::TestFactoryRegistry::getRegistry().makeTest() );
- * runner.run( true );
- * }
- * \endcode
- *
- */
-class QTTESTRUNNER_API QtTestRunner
-{
-public:
- /*! Constructs a TestRunner object.
- */
- QtTestRunner();
-
- /*! Destructor.
- */
- virtual ~QtTestRunner();
-
- void run( bool autoRun =false );
-
- void addTest( Test *test );
-
-private:
- /// Prevents the use of the copy constructor.
- QtTestRunner( const QtTestRunner © );
-
- /// Prevents the use of the copy operator.
- void operator =( const QtTestRunner © );
-
- Test *getRootTest();
-
-private:
- typedef std::vector<Test *> Tests;
- Tests *_tests;
-
- TestSuite *_suite;
-};
-
-
-#if CPPUNIT_HAVE_NAMESPACES
- namespace QtUi
- {
- /*! Qt TestRunner (DEPRECATED).
- * \deprecated Use CppUnit::QtTestRunner instead.
- */
- typedef CPPUNIT_NS::QtTestRunner TestRunner;
- }
-#endif
-
-
-CPPUNIT_NS_END
-
-#endif // CPPUNIT_QTUI_QTTESTRUNNER_H
diff --git a/include/cppunit/ui/qt/TestRunner.h b/include/cppunit/ui/qt/TestRunner.h
deleted file mode 100644
index 9c53e4b..0000000
--- a/include/cppunit/ui/qt/TestRunner.h
+++ /dev/null
@@ -1,11 +0,0 @@
-// //////////////////////////////////////////////////////////////////////////
-// Header file TestRunner.h for class TestRunner
-// (c)Copyright 2000, Baptiste Lepilleur.
-// Created: 2001/09/19
-// //////////////////////////////////////////////////////////////////////////
-#ifndef CPPUNIT_QTUI_TESTRUNNER_H
-#define CPPUNIT_QTUI_TESTRUNNER_H
-
-#include <cppunit/ui/qt/QtTestRunner.h>
-
-#endif // CPPUNIT_QTUI_TESTRUNNER_H
diff --git a/src/qttestrunner/MostRecentTests.cpp b/src/qttestrunner/MostRecentTests.cpp
deleted file mode 100644
index e286ed1..0000000
--- a/src/qttestrunner/MostRecentTests.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-// //////////////////////////////////////////////////////////////////////////
-// Implementation file MostRecentTests.cpp for class MostRecentTests
-// (c)Copyright 2000, Baptiste Lepilleur.
-// Created: 2001/09/20
-// //////////////////////////////////////////////////////////////////////////
-
-#include "MostRecentTests.h"
-
-
-MostRecentTests::MostRecentTests()
-{
-}
-
-
-MostRecentTests::~MostRecentTests()
-{
-}
-
-
-void
-MostRecentTests::setTestToRun( CPPUNIT_NS::Test *test )
-{
- m_tests.removeRef( test );
- m_tests.prepend( test );
-
- const int maxRecentTest = 20;
- if ( m_tests.count() > maxRecentTest )
- m_tests.remove( maxRecentTest );
-
- emit listChanged();
- emit testToRunChanged( testToRun() );
-}
-
-
-CPPUNIT_NS::Test *
-MostRecentTests::testToRun()
-{
- return testAt( 0 );
-}
-
-
-void
-MostRecentTests::selectTestToRun( int index )
-{
- if ( index < testCount() )
- setTestToRun( testAt( index ) );
-}
-
-
-int
-MostRecentTests::testCount()
-{
- return m_tests.count();
-}
-
-
-QString
-MostRecentTests::testNameAt( int index )
-{
- return QString::fromLatin1( testAt( index )->getName().c_str() );
-}
-
-
-CPPUNIT_NS::Test *
-MostRecentTests::testAt( int index )
-{
- return m_tests.at( index );
-}
diff --git a/src/qttestrunner/MostRecentTests.h b/src/qttestrunner/MostRecentTests.h
deleted file mode 100644
index ebd95fc..0000000
--- a/src/qttestrunner/MostRecentTests.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// //////////////////////////////////////////////////////////////////////////
-// Header file MostRecentTests.h for class MostRecentTests
-// (c)Copyright 2000, Baptiste Lepilleur.
-// Created: 2001/09/20
-// //////////////////////////////////////////////////////////////////////////
-#ifndef MOSTRECENTTESTS_H
-#define MOSTRECENTTESTS_H
-
-#include <cppunit/Test.h>
-#include <qstring.h>
-#include <qptrlist.h>
-#include <qobject.h>
-
-
-/*! \class MostRecentTests
- * \brief This class represents the list of the recent tests.
- */
-class MostRecentTests : public QObject
-{
- Q_OBJECT
-public:
- /*! Constructs a MostRecentTests object.
- */
- MostRecentTests();
-
- /*! Destructor.
- */
- virtual ~MostRecentTests();
-
- void setTestToRun( CPPUNIT_NS::Test *test );
- CPPUNIT_NS::Test *testToRun();
-
- int testCount();
- QString testNameAt( int index );
- CPPUNIT_NS::Test *testAt( int index );
-
-signals:
- void listChanged();
- void testToRunChanged( CPPUNIT_NS::Test *testToRun );
-
-public slots:
- void selectTestToRun( int index );
-
-private:
- /// Prevents the use of the copy constructor.
- MostRecentTests( const MostRecentTests © );
-
- /// Prevents the use of the copy operator.
- void operator =( const MostRecentTests © );
-
-private:
- QList<CPPUNIT_NS::Test> m_tests;
-};
-
-
-
-// Inlines methods for MostRecentTests:
-// ------------------------------------
-
-
-
-#endif // MOSTRECENTTESTS_H
diff --git a/src/qttestrunner/QtTestRunner.cpp b/src/qttestrunner/QtTestRunner.cpp
deleted file mode 100644
index 9f203cd..0000000
--- a/src/qttestrunner/QtTestRunner.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-// //////////////////////////////////////////////////////////////////////////
-// Implementation file QtTestRunner.cpp for class QtTestRunner
-// (c)Copyright 2000, Baptiste Lepilleur.
-// Created: 2001/09/19
-// //////////////////////////////////////////////////////////////////////////
-
-#include <qapplication.h>
-#include <cppunit/TestSuite.h>
-#include <cppunit/ui/qt/QtTestRunner.h>
-#include "TestRunnerDlgImpl.h"
-#include "TestRunnerModel.h"
-
-
-CPPUNIT_NS_BEGIN
-
-QtTestRunner::QtTestRunner() :
- _suite( new CPPUNIT_NS::TestSuite( "All Tests" ) ),
- _tests( new Tests() )
-{
-}
-
-
-QtTestRunner::~QtTestRunner()
-{
- delete _suite;
-
- Tests::iterator it = _tests->begin();
- while ( it != _tests->end() )
- delete *it++;
-
- delete _tests;
-}
-
-
-Test *
-QtTestRunner::getRootTest()
-{
- if ( _tests->size() != 1 )
- {
- Tests::iterator it = _tests->begin();
- while ( it != _tests->end() )
- _suite->addTest( *it++ );
- _tests->clear();
- return _suite;
- }
- return (*_tests)[0];
-}
-
-
-void
-QtTestRunner::run( bool autoRun )
-{
- TestRunnerDlg *dlg = new TestRunnerDlg( qApp->mainWidget(),
- "QtTestRunner",
- TRUE );
- dlg->setModel( new TestRunnerModel( getRootTest() ),
- autoRun );
- dlg->exec();
- delete dlg;
-}
-
-
-void
-QtTestRunner::addTest( CPPUNIT_NS::Test *test )
-{
- _tests->push_back( test );
-}
-
-
-CPPUNIT_NS_END
diff --git a/src/qttestrunner/TestBrowserDlgImpl.cpp b/src/qttestrunner/TestBrowserDlgImpl.cpp
deleted file mode 100644
index cef7c52..0000000
--- a/src/qttestrunner/TestBrowserDlgImpl.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-#include <cppunit/Test.h>
-#include <qlistview.h>
-#include <qmessagebox.h>
-#include "TestBrowserDlgImpl.h"
-#include "TestListViewItem.h"
-
-
-/*
- * Constructs a TestBrowser which is a child of 'parent', with the
- * name 'name' and widget flags set to 'f'
- *
- * The dialog will by default be modeless, unless you set 'modal' to
- * TRUE to construct a modal dialog.
- */
-TestBrowser::TestBrowser( QWidget* parent, const char* name, bool modal, WFlags fl )
- : TestBrowserBase( parent, name, modal, fl ),
- _selectedTest( NULL )
-{
- _listTests->setRootIsDecorated( TRUE );
-}
-
-/*
- * Destroys the object and frees any allocated resources
- */
-TestBrowser::~TestBrowser()
-{
- // no need to delete child widgets, Qt does it all for us
-}
-
-
-void
-TestBrowser::setRootTest( CPPUNIT_NS::Test *rootTest )
-{
- QListViewItem *dummyRoot = new QListViewItem( _listTests );
-
- insertItemFor( rootTest, dummyRoot );
-
- dummyRoot->firstChild()->moveItem( dummyRoot );
- delete dummyRoot;
-
- _listTests->firstChild()->setOpen( TRUE );
- _listTests->triggerUpdate();
-}
-
-
-void
-TestBrowser::insertItemFor( CPPUNIT_NS::Test *test,
- QListViewItem *parentItem )
-{
- QListViewItem *item = new TestListViewItem( test, parentItem );
- QString testName = QString::fromLatin1( test->getName().c_str() );
- item->setText( 0, testName );
- if ( test->getChildTestCount() > 0 || // suite with test
- test->countTestCases() == 0 ) // empty suite
- {
- for ( int index =0; index < test->getChildTestCount(); ++index )
- insertItemFor( test->getChildTestAt( index ), item );
- }
-}
-
-
-CPPUNIT_NS::Test *
-TestBrowser::selectedTest()
-{
- return _selectedTest;
-}
-
-
-void
-TestBrowser::accept()
-{
- TestListViewItem *item = (TestListViewItem *)_listTests->selectedItem();
- if ( item == NULL )
- {
- QMessageBox::information( this, tr("Selected test"),
- tr( "You must select a test." ) );
- return;
- }
-
- _selectedTest = item->test();
-
- TestBrowserBase::accept();
-}
diff --git a/src/qttestrunner/TestBrowserDlgImpl.h b/src/qttestrunner/TestBrowserDlgImpl.h
deleted file mode 100644
index d4c113a..0000000
--- a/src/qttestrunner/TestBrowserDlgImpl.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef TESTBROWSER_H
-#define TESTBROWSER_H
-
-#include <cppunit/Test.h>
-#include "testbrowserdlg.h"
-
-class QListViewItem;
-
-class TestBrowser : public TestBrowserBase
-{
- Q_OBJECT
-
-public:
- TestBrowser( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
- ~TestBrowser();
-
- void setRootTest( CPPUNIT_NS::Test *rootTest );
-
- CPPUNIT_NS::Test *selectedTest();
-
-protected slots:
- void accept();
-
-private:
- void insertItemFor( CPPUNIT_NS::Test *test,
- QListViewItem *parentItem );
-
-private:
- CPPUNIT_NS::Test *_selectedTest;
-};
-
-#endif // TESTBROWSER_H
diff --git a/src/qttestrunner/TestFailureInfo.cpp b/src/qttestrunner/TestFailureInfo.cpp
deleted file mode 100644
index 54c5b1d..0000000
--- a/src/qttestrunner/TestFailureInfo.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-// //////////////////////////////////////////////////////////////////////////
-// Implementation file TestFailureInfo.cpp for class TestFailureInfo
-// (c)Copyright 2000, Baptiste Lepilleur.
-// Created: 2001/09/20
-// //////////////////////////////////////////////////////////////////////////
-
-#include "TestFailureInfo.h"
-#include <cppunit/Exception.h>
-
-
-TestFailureInfo::TestFailureInfo( CPPUNIT_NS::Test *failedTest,
- CPPUNIT_NS::Exception *thrownException,
- bool isError ) :
- CPPUNIT_NS::TestFailure( failedTest, thrownException->clone(), isError )
-{
-}
-
-
-TestFailureInfo::~TestFailureInfo()
-{
-}
diff --git a/src/qttestrunner/TestFailureInfo.h b/src/qttestrunner/TestFailureInfo.h
deleted file mode 100644
index 64a2ceb..0000000
--- a/src/qttestrunner/TestFailureInfo.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// //////////////////////////////////////////////////////////////////////////
-// Header file TestFailureInfo.h for class TestFailureInfo
-// (c)Copyright 2000, Baptiste Lepilleur.
-// Created: 2001/09/20
-// //////////////////////////////////////////////////////////////////////////
-#ifndef TESTFAILUREINFO_H
-#define TESTFAILUREINFO_H
-
-#include <cppunit/TestFailure.h>
-
-
-/*! \class TestFailureInfo
- * \brief This class represents a test failure.
- */
-class TestFailureInfo : public CPPUNIT_NS::TestFailure
-{
-public:
- /*! Constructs a TestFailureInfo object.
- */
- TestFailureInfo( CPPUNIT_NS::Test *failedTest,
- CPPUNIT_NS::Exception *thrownException,
- bool isError );
-
- /*! Destructor.
- */
- virtual ~TestFailureInfo();
-
-private:
- /// Prevents the use of the copy constructor.
- TestFailureInfo( const TestFailureInfo © );
-
- /// Prevents the use of the copy operator.
- void operator =( const TestFailureInfo © );
-};
-
-
-
-// Inlines methods for TestFailureInfo:
-// ------------------------------------
-
-
-
-#endif // TESTFAILUREINFO_H
diff --git a/src/qttestrunner/TestFailureListViewItem.cpp b/src/qttestrunner/TestFailureListViewItem.cpp
deleted file mode 100644
index 387818f..0000000
--- a/src/qttestrunner/TestFailureListViewItem.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-// //////////////////////////////////////////////////////////////////////////
-// Implementation file TestFailureListViewItem.cpp for class TestFailureListViewItem
-// (c)Copyright 2000, Baptiste Lepilleur.
-// Created: 2001/09/20
-// //////////////////////////////////////////////////////////////////////////
-
-#include "TestFailureListViewItem.h"
-
-
-TestFailureListViewItem::TestFailureListViewItem(
- TestFailureInfo *failure,
- QListView *parent ) :
- QListViewItem( parent ),
- _failure( failure )
-{
- setMultiLinesEnabled (true);
-}
-
-
-TestFailureListViewItem::~TestFailureListViewItem()
-{
-}
-
-
-TestFailureInfo *
-TestFailureListViewItem::failure()
-{
- return _failure;
-}
diff --git a/src/qttestrunner/TestFailureListViewItem.h b/src/qttestrunner/TestFailureListViewItem.h
deleted file mode 100644
index 97d3716..0000000
--- a/src/qttestrunner/TestFailureListViewItem.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// //////////////////////////////////////////////////////////////////////////
-// Header file TestFailureListViewItem.h for class TestFailureListViewItem
-// (c)Copyright 2000, Baptiste Lepilleur.
-// Created: 2001/09/20
-// //////////////////////////////////////////////////////////////////////////
-#ifndef TESTFAILURELISTVIEWITEM_H
-#define TESTFAILURELISTVIEWITEM_H
-
-#include <qlistview.h>
-class TestFailureInfo;
-
-
-/*! \class TestFailureListViewItem
- * \brief This class represents a test failure item.
- */
-class TestFailureListViewItem : public QListViewItem
-{
-public:
- /*! Constructs a TestFailureListViewItem object.
- */
- TestFailureListViewItem( TestFailureInfo *failure,
- QListView *parent );
-
- /*! Destructor.
- */
- virtual ~TestFailureListViewItem();
-
- TestFailureInfo *failure();
-
-private:
- /// Prevents the use of the copy constructor.
- TestFailureListViewItem( const TestFailureListViewItem © );
-
- /// Prevents the use of the copy operator.
- void operator =( const TestFailureListViewItem © );
-
-private:
- TestFailureInfo *_failure;
-};
-
-
-
-// Inlines methods for TestFailureListViewItem:
-// --------------------------------------------
-
-
-
-#endif // TESTFAILURELISTVIEWITEM_H
diff --git a/src/qttestrunner/TestListViewItem.cpp b/src/qttestrunner/TestListViewItem.cpp
deleted file mode 100644
index b4032dc..0000000
--- a/src/qttestrunner/TestListViewItem.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// //////////////////////////////////////////////////////////////////////////
-// Implementation file TestListViewItem.cpp for class TestListViewItem
-// (c)Copyright 2000, Baptiste Lepilleur.
-// Created: 2001/09/19
-// //////////////////////////////////////////////////////////////////////////
-
-#include "TestListViewItem.h"
-
-
-TestListViewItem::TestListViewItem( CPPUNIT_NS::Test *test,
- QListViewItem *parent ) :
- QListViewItem( parent ),
- _test( test )
-{
-}
-
-
-TestListViewItem::~TestListViewItem()
-{
-}
-
-
-CPPUNIT_NS::Test *
-TestListViewItem::test() const
-{
- return _test;
-}
diff --git a/src/qttestrunner/TestListViewItem.h b/src/qttestrunner/TestListViewItem.h
deleted file mode 100644
index 4032f68..0000000
--- a/src/qttestrunner/TestListViewItem.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// //////////////////////////////////////////////////////////////////////////
-// Header file TestListViewItem.h for class TestListViewItem
-// (c)Copyright 2000, Baptiste Lepilleur.
-// Created: 2001/09/19
-// //////////////////////////////////////////////////////////////////////////
-#ifndef TESTLISTVIEWITEM_H
-#define TESTLISTVIEWITEM_H
-
-#include <qlistview.h>
-#include <cppunit/Test.h>
-
-
-/*! \class TestListViewItem
- * \brief This class represents an list item pointing to a Test.
- */
-class TestListViewItem : public QListViewItem
-{
-public:
- /*! Constructs a TestListViewItem object.
- */
- TestListViewItem( CPPUNIT_NS::Test *test,
- QListViewItem *parent );
-
- /*! Destructor.
- */
- virtual ~TestListViewItem();
-
- CPPUNIT_NS::Test *test() const;
-
-private:
- /// Prevents the use of the copy constructor.
- TestListViewItem( const TestListViewItem © );
-
- /// Prevents the use of the copy operator.
- void operator =( const TestListViewItem © );
-
-private:
- CPPUNIT_NS::Test *_test;
-};
-
-
-
-#endif // TESTLISTVIEWITEM_H
diff --git a/src/qttestrunner/TestRunnerDlgImpl.cpp b/src/qttestrunner/TestRunnerDlgImpl.cpp
deleted file mode 100644
index c1c8534..0000000
--- a/src/qttestrunner/TestRunnerDlgImpl.cpp
+++ /dev/null
@@ -1,260 +0,0 @@
-#include <qcombobox.h>
-#include <qgroupbox.h>
-#include <qlabel.h>
-#include <qlistview.h>
-#include <qmultilineedit.h>
-#include <qprogressbar.h>
-#include <qpushbutton.h>
-#include <cppunit/Exception.h>
-#include "TestRunnerDlgImpl.h"
-#include "TestBrowserDlgImpl.h"
-#include "MostRecentTests.h"
-#include "TestRunnerModel.h"
-#include "TestFailureListViewItem.h"
-
-
-/*
- * Constructs a TestRunnerDlg which is a child of 'parent', with the
- * name 'name' and widget flags set to 'f'
- *
- * The dialog will by default be modeless, unless you set 'modal' to
- * TRUE to construct a modal dialog.
- */
-TestRunnerDlg::TestRunnerDlg( QWidget* parent, const char* name, bool modal, WFlags fl )
- : TestRunnerDlgBase( parent, name, modal, fl ),
- _model( NULL ),
- _recentTests( new MostRecentTests() )
-{
-}
-
-
-/*
- * Destroys the object and frees any allocated resources
- */
-TestRunnerDlg::~TestRunnerDlg()
-{
- delete _model;
- delete _recentTests;
-}
-
-
-void
-TestRunnerDlg::setModel( TestRunnerModel *model,
- bool autorunTest )
-{
- delete _model;
-
- _model = model;
-
- // update combo when recent list change
- connect( _recentTests, SIGNAL( listChanged() ),
- SLOT( refreshRecentTests() ) );
-
- // make selected test in combo the "most recent"
- connect( _comboTest, SIGNAL( activated(int) ),
- _recentTests, SLOT( selectTestToRun(int) ) );
-
- // refresh the test report counters when a test is selected
- connect( _recentTests, SIGNAL( testToRunChanged(CPPUNIT_NS::Test *) ),
- _model, SLOT( resetTestReportCounterFor(CPPUNIT_NS::Test *) ) );
-
- // refresh progress bar
- connect( _model, SIGNAL( numberOfTestCaseChanged(int) ),
- _progressRun, SLOT( setTotalSteps(int) ) );
- connect( _model, SIGNAL( numberOfTestCaseRunChanged(int) ),
- _progressRun, SLOT( setProgress(int) ) );
-
- // refresh test report counters
- connect( _model, SIGNAL( numberOfTestCaseChanged( int ) ),
- SLOT( setNumberOfTestCase( int ) ) );
- connect( _model, SIGNAL( numberOfTestCaseRunChanged( int ) ),
- SLOT( setNumberOfTestCaseRun( int ) ) );
- connect( _model, SIGNAL( numberOfTestCaseFailureChanged( int ) ),
- SLOT( setNumberOfTestCaseFailure( int ) ) );
-
- // clear failure list
- connect( _model, SIGNAL( failuresCleared() ),
- SLOT( clearTestFailureList() ) );
-
- // clear failure detail list
- connect( _model, SIGNAL( failuresCleared() ),
- SLOT( clearFailureDetail() ) );
-
- // add failure to failure list
- connect( _model, SIGNAL( failureAdded(TestFailureInfo *) ),
- SLOT( reportFailure(TestFailureInfo*) ) );
-
- // show detail on failure selection
- connect( _listFailures, SIGNAL( selectionChanged(QListViewItem*) ),
- SLOT( showFailureDetailAt(QListViewItem*) ) );
-
- // disable button when running test
- connect( _model, SIGNAL( testRunStarted( CPPUNIT_NS::Test *, CPPUNIT_NS::TestResult *) ),
- SLOT( beRunningTest() ) );
-
- // enable button when finished running test
- connect( _model, SIGNAL( testRunFinished() ),
- SLOT( beCanRunTest() ) );
-
- _recentTests->setTestToRun( model->rootTest() );
- beCanRunTest();
-
- if ( autorunTest )
- runTest();
-}
-
-
-void
-TestRunnerDlg::browseForTest()
-{
- TestBrowser *dlg = new TestBrowser( this,
- "Test Browser",
- TRUE );
- dlg->setRootTest( _model->rootTest() );
-
- if ( dlg->exec() )
- _recentTests->setTestToRun( dlg->selectedTest() );
-
- delete dlg;
-}
-
-
-void
-TestRunnerDlg::runTest()
-{
- CPPUNIT_NS::Test *testToRun = _recentTests->testToRun();
- if ( testToRun == NULL )
- return;
- _model->runTest( testToRun );
-}
-
-
-void
-TestRunnerDlg::stopTest()
-{
- _model->stopRunningTest();
- if ( _model->isTestRunning() )
- beStoppingTest();
-}
-
-
-void
-TestRunnerDlg::clearTestFailureList()
-{
- _listFailures->clear();
-}
-
-
-void
-TestRunnerDlg::refreshRecentTests()
-{
- _comboTest->clear();
- for ( int index =0; index < _recentTests->testCount(); ++index )
- _comboTest->insertItem( _recentTests->testNameAt( index ) );
-}
-
-
-void
-TestRunnerDlg::setNumberOfTestCase( int numberOfTestCase )
-{
- _labelTestCaseCount->setText( QString::number( numberOfTestCase ) );
-}
-
-
-void
-TestRunnerDlg::setNumberOfTestCaseRun( int numberOfRun )
-{
- _labelTestRunCount->setText( QString::number( numberOfRun ) );
-}
-
-
-void
-TestRunnerDlg::setNumberOfTestCaseFailure( int numberOfFailure )
-{
- _labelFailureCount->setText( QString::number( numberOfFailure ) );
-}
-
-
-void
-TestRunnerDlg::reportFailure( TestFailureInfo *failure )
-{
- QListViewItem *item = new TestFailureListViewItem( failure,
- _listFailures );
- item->setText( indexType,
- failure->isError() ? tr("Error") : tr("Failure") );
- std::string failedtestName = failure->failedTestName().c_str();
- item->setText( indexTestName, QString::fromLatin1( failedtestName.c_str() ) );
-
- CPPUNIT_NS::Exception *thrownException = failure->thrownException();
-//2.0 item->setText( indexMessage, thrownException->what() );
- item->setText( indexMessage, QString(thrownException->what()).stripWhiteSpace() );
- item->setText( indexFilename, failure->sourceLine().fileName().c_str() );
- item->setText( indexLineNumber,
- QString::number( failure->sourceLine().lineNumber() ) );
-
- _listFailures->insertItem( item );
- _listFailures->triggerUpdate();
-
- if ( _listFailures->childCount() == 1 )
- _listFailures->setSelected( item, TRUE );
-}
-
-
-void
-TestRunnerDlg::showFailureDetailAt( QListViewItem *selection )
-{
- TestFailureInfo *failure = ((TestFailureListViewItem*)selection)->failure();
-
- QString title = tr("Failure detail for: ");
- title += QString::fromLatin1( failure->failedTestName().c_str() );
- _groupFailureDetail->setTitle( title );
-
- QString location( failure->sourceLine().fileName().c_str() );
- location += " (" +
- QString::number( failure->sourceLine().lineNumber() ) +
- ")";
- _labelFailureLocation->setText( location );
-
- _editFailureMessage->setText( failure->thrownException()->what() );
-}
-
-
-void
-TestRunnerDlg::clearFailureDetail()
-{
- _groupFailureDetail->setTitle( tr("Failure detail for:...") );
- _labelFailureLocation->setText( QString::null );
- _editFailureMessage->setText( QString::null );
-}
-
-
-void
-TestRunnerDlg::beCanRunTest()
-{
- _buttonRunTest->setEnabled( true );
- _buttonBrowse->setEnabled( true );
- _comboTest->setEnabled( true );
- _buttonStop->setDisabled( true );
- _buttonStop->setText( tr("Stop") );
- _buttonClose->setEnabled( true );
-}
-
-
-void
-TestRunnerDlg::beRunningTest()
-{
- _buttonRunTest->setDisabled( true );
- _buttonBrowse->setDisabled( true );
- _comboTest->setDisabled( true );
- _buttonStop->setEnabled( true );
- _buttonStop->setText( tr("Stop") );
- _buttonClose->setDisabled( true );
-}
-
-
-void
-TestRunnerDlg::beStoppingTest()
-{
- _buttonStop->setDisabled( true );
- _buttonStop->setText( tr("Stopping") );
-}
diff --git a/src/qttestrunner/TestRunnerDlgImpl.h b/src/qttestrunner/TestRunnerDlgImpl.h
deleted file mode 100644
index a3befc6..0000000
--- a/src/qttestrunner/TestRunnerDlgImpl.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef TESTRUNNERDLG_H
-#define TESTRUNNERDLG_H
-
-#include "testrunnerdlg.h"
-#include <cppunit/Test.h>
-class TestRunnerModel;
-class MostRecentTests;
-class TestFailureInfo;
-class QListViewItem;
-
-class TestRunnerDlg : public TestRunnerDlgBase
-{
- Q_OBJECT
-
-public:
- TestRunnerDlg( QWidget* parent = 0,
- const char* name = 0,
- bool modal = FALSE,
- WFlags fl = 0 );
- ~TestRunnerDlg();
-
- void setModel( TestRunnerModel *model,
- bool autorunTest );
-
-public slots:
- void refreshRecentTests();
-
-protected slots:
- void browseForTest();
- void runTest();
- void stopTest();
- void setNumberOfTestCase( int numberOfTestCase );
- void setNumberOfTestCaseRun( int numberOfRun );
- void setNumberOfTestCaseFailure( int numberOfFailure );
- void clearTestFailureList();
- void clearFailureDetail();
- void reportFailure( TestFailureInfo *failure );
- void showFailureDetailAt( QListViewItem *selection );
- void beCanRunTest();
- void beRunningTest();
- void beStoppingTest();
-
-private:
-
- enum Columns
- {
- indexType =0,
- indexTestName,
- indexMessage,
- indexFilename,
- indexLineNumber
- };
-
- TestRunnerModel *_model;
- MostRecentTests *_recentTests;
-};
-
-#endif // TESTRUNNERDLG_H
diff --git a/src/qttestrunner/TestRunnerFailureEvent.cpp b/src/qttestrunner/TestRunnerFailureEvent.cpp
deleted file mode 100644
index bceb2f6..0000000
--- a/src/qttestrunner/TestRunnerFailureEvent.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-// //////////////////////////////////////////////////////////////////////////
-// Implementation file TestRunnerFailureEvent.cpp for class TestRunnerFailureEvent
-// (c)Copyright 2000, Baptiste Lepilleur.
-// Created: 2001/09/22
-// //////////////////////////////////////////////////////////////////////////
-
-#include "TestRunnerFailureEvent.h"
-#include "TestRunnerModelThreadInterface.h"
-
-
-TestRunnerFailureEvent::TestRunnerFailureEvent( TestFailureInfo *failure,
- int numberOfFailure ) :
- _failure( failure ),
- _numberOfFailure( numberOfFailure )
-{
-}
-
-
-TestRunnerFailureEvent::~TestRunnerFailureEvent()
-{
-}
-
-
-void
-TestRunnerFailureEvent::process( TestRunnerModelThreadInterface *target )
-{
- target->eventNewFailure( _failure, _numberOfFailure );
-}
diff --git a/src/qttestrunner/TestRunnerFailureEvent.h b/src/qttestrunner/TestRunnerFailureEvent.h
deleted file mode 100644
index fa6fef0..0000000
--- a/src/qttestrunner/TestRunnerFailureEvent.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// //////////////////////////////////////////////////////////////////////////
-// Header file TestRunnerFailureEvent.h for class TestRunnerFailureEvent
-// (c)Copyright 2000, Baptiste Lepilleur.
-// Created: 2001/09/22
-// //////////////////////////////////////////////////////////////////////////
-#ifndef TESTRUNNERFAILUREEVENT_H
-#define TESTRUNNERFAILUREEVENT_H
-
-#include "TestRunnerThreadEvent.h"
-class TestFailureInfo;
-
-
-/*! \class TestRunnerFailureEvent
- * \brief This class represents a new TestCase failure event.
- */
-class TestRunnerFailureEvent : public TestRunnerThreadEvent
-{
-public:
- /*! Constructs a TestRunnerFailureEvent object.
- */
- TestRunnerFailureEvent( TestFailureInfo *failure,
- int numberOfFailure );
-
- /// Destructor.
- virtual ~TestRunnerFailureEvent();
-
-private:
- /// Prevents the use of the copy constructor.
- TestRunnerFailureEvent( const TestRunnerFailureEvent © );
-
- /// Prevents the use of the copy operator.
- void operator =( const TestRunnerFailureEvent © );
-
- void process( TestRunnerModelThreadInterface *target );
-
-private:
- TestFailureInfo *_failure;
- int _numberOfFailure;
-};
-
-
-
-// Inlines methods for TestRunnerFailureEvent:
-// -------------------------------------------
-
-
-
-#endif // TESTRUNNERFAILUREEVENT_H
diff --git a/src/qttestrunner/TestRunnerModel.cpp b/src/qttestrunner/TestRunnerModel.cpp
deleted file mode 100644
index b224a34..0000000
--- a/src/qttestrunner/TestRunnerModel.cpp
+++ /dev/null
@@ -1,221 +0,0 @@
-// //////////////////////////////////////////////////////////////////////////
-// Implementation file TestRunnerModel.cpp for class TestRunnerModel
-// (c)Copyright 2000, Baptiste Lepilleur.
-// Created: 2001/09/20
-// //////////////////////////////////////////////////////////////////////////
-
-#include <cppunit/TestResult.h>
-#include "TestRunnerFailureEvent.h"
-#include "TestRunnerModel.h"
-#include "TestRunnerTestCaseRunEvent.h"
-#include "TestRunnerThread.h"
-#include "TestRunnerThreadFinishedEvent.h"
-
-
-TestRunnerModel::TestRunnerModel( CPPUNIT_NS::Test *rootTest ) :
- _rootTest( rootTest ),
- _runnerThread( NULL ),
- _result( NULL )
-{
-}
-
-
-TestRunnerModel::~TestRunnerModel()
-{
- delete _runnerThread;
-}
-
-
-CPPUNIT_NS::Test *
-TestRunnerModel::rootTest()
-{
- return _rootTest;
-}
-
-
-void
-TestRunnerModel::resetTestReportCounterFor( CPPUNIT_NS::Test *testToRun )
-{
- if ( isTestRunning() )
- return;
-
- {
- LockGuard guard( _lock );
- _numberOfTestCase = testToRun->countTestCases();
- _numberOfTestCaseRun =0;
- _numberOfTestCaseFailure =0;
- _failures.clear();
- }
- emit failuresCleared();
-
- emit numberOfTestCaseChanged( _numberOfTestCase );
- emit numberOfTestCaseRunChanged( _numberOfTestCaseRun );
- emit numberOfTestCaseFailureChanged( _numberOfTestCaseFailure );
-}
-
-
-int
-TestRunnerModel::numberOfTestCase()
-{
- LockGuard guard( _lock );
- return _numberOfTestCase;
-}
-
-
-int
-TestRunnerModel::numberOfTestCaseFailure()
-{
- LockGuard guard( _lock );
- return _numberOfTestCaseFailure;
-}
-
-
-int
-TestRunnerModel::numberOfTestCaseRun()
-{
- LockGuard guard( _lock );
- return _numberOfTestCaseRun;
-}
-
-
-TestFailureInfo *
-TestRunnerModel::failureAt( int index )
-{
- LockGuard guard( _lock );
- return _failures.at( index );
-}
-
-
-void
-TestRunnerModel::runTest( CPPUNIT_NS::Test *testToRun )
-{
- if ( isTestRunning() )
- return;
-
- resetTestReportCounterFor( testToRun );
-
- {
- LockGuard guard( _lock );
- delete _result;
- _result = new CPPUNIT_NS::TestResult();
- _result->addListener( this );
- }
-
- emit testRunStarted( testToRun, _result );
-
- LockGuard guard( _lock );
- _runnerThread = new TestRunnerThread( testToRun,
- _result,
- this,
- new TestRunnerThreadFinishedEvent() );
-}
-
-
-bool
-TestRunnerModel::isTestRunning()
-{
- LockGuard guard( _lock );
- return _runnerThread != NULL && _runnerThread->running();
-}
-
-
-void
-TestRunnerModel::stopRunningTest()
-{
- {
- LockGuard guard( _lock );
- if ( _result == NULL )
- return;
- }
- if ( isTestRunning() )
- {
- LockGuard guard( _lock );
- _result->stop();
- }
-}
-
-
-// Called from the TestRunnerThread.
-void
-TestRunnerModel::startTest( CPPUNIT_NS::Test * /*test*/ )
-{
-}
-
-
-// Called from the TestRunnerThread.
-void
-TestRunnerModel::addFailure( const CPPUNIT_NS::TestFailure &failure )
-{
- addFailureInfo( new TestFailureInfo( failure.failedTest(),
- failure.thrownException(),
- failure.isError() ) );
-}
-
-
-// Called from the TestRunnerThread.
-void
-TestRunnerModel::endTest( CPPUNIT_NS::Test * /*test*/ )
-{
- int numberOfTestCaseRun;
- {
- LockGuard guard( _lock );
- numberOfTestCaseRun = ++_numberOfTestCaseRun;
- }
-
- // emit signal asynchronously
- QThread::postEvent( this,
- new TestRunnerTestCaseRunEvent( numberOfTestCaseRun ) );
-}
-
-
-// Called from the TestRunnerThread.
-void
-TestRunnerModel::addFailureInfo( TestFailureInfo *failure )
-{
- int numberOfTestCaseFailure;
- {
- LockGuard guard( _lock );
- _failures.append( failure );
- numberOfTestCaseFailure = ++_numberOfTestCaseFailure;
- }
-
- // emit signals asynchronously
- QThread::postEvent( this,
- new TestRunnerFailureEvent( failure,
- numberOfTestCaseFailure ) );
-}
-
-
-bool
-TestRunnerModel::event( QEvent *event )
-{
- if ( event->type() != QEvent::User )
- return false;
-
- TestRunnerThreadEvent *threadEvent = (TestRunnerThreadEvent *)event;
- threadEvent->process( this );
- return true;
-}
-
-
-void
-TestRunnerModel::eventNewFailure( TestFailureInfo *failure,
- int numberOfFailure )
-{
- emit numberOfTestCaseFailureChanged( numberOfFailure );
- emit failureAdded( failure );
-}
-
-
-void
-TestRunnerModel::eventNumberOfTestRunChanged( int numberOfRun )
-{
- emit numberOfTestCaseRunChanged( numberOfRun );
-}
-
-
-void
-TestRunnerModel::eventTestRunnerThreadFinished()
-{
- emit testRunFinished();
-}
diff --git a/src/qttestrunner/TestRunnerModel.h b/src/qttestrunner/TestRunnerModel.h
deleted file mode 100644
index ebd3a57..0000000
--- a/src/qttestrunner/TestRunnerModel.h
+++ /dev/null
@@ -1,154 +0,0 @@
-// //////////////////////////////////////////////////////////////////////////
-// Header file TestRunnerModel.h for class TestRunnerModel
-// (c)Copyright 2000, Baptiste Lepilleur.
-// Created: 2001/09/20
-// //////////////////////////////////////////////////////////////////////////
-#ifndef TESTRUNNERMODEL_H
-#define TESTRUNNERMODEL_H
-
-#include <cppunit/Test.h>
-#include <cppunit/TestListener.h>
-#include <qptrlist.h>
-#include <qobject.h>
-#include <qthread.h>
-#include "TestFailureInfo.h"
-#include "TestRunnerModelThreadInterface.h"
-class TestRunnerThread;
-
-/*! \class TestRunnerModel
- * \brief This class represents the model for the TestRunner.
- *
- * Warning: methods that override CppUnit::TestListener are called
- * from the TestRunner thread !
- *
- * Warning: _lock is not recursive. Might want to introduce Doug Lea
- * Thread Interface pattern for methods used while locked (isTestRunning()).
- *
- * Refactoring note: a large part of this object actually duplicate
- * TestResult.
- */
-class TestRunnerModel : public QObject,
- private CPPUNIT_NS::TestListener,
- private TestRunnerModelThreadInterface
-{
- Q_OBJECT
-public:
- /*! Constructs a TestRunnerModel object.
- */
- TestRunnerModel( CPPUNIT_NS::Test *rootTest );
-
- /*! Destructor.
- */
- virtual ~TestRunnerModel();
-
- CPPUNIT_NS::Test *rootTest();
-
- int numberOfTestCase();
- int numberOfTestCaseFailure();
- int numberOfTestCaseRun();
-
- TestFailureInfo *failureAt( int index );
-
-
- bool isTestRunning();
-
-signals:
- void numberOfTestCaseChanged( int numberOfTestCase );
- void numberOfTestCaseRunChanged( int numberOfRun );
- void numberOfTestCaseFailureChanged( int numberOfFailure );
- void failureAdded( TestFailureInfo *failure );
- void failuresCleared();
- void testRunStarted( CPPUNIT_NS::Test *runningTest,
- CPPUNIT_NS::TestResult *result );
- void testRunFinished();
-
-public slots:
- void resetTestReportCounterFor( CPPUNIT_NS::Test *testToRun );
-
- /*! Request to run the specified test.
- * Returns immedialty. If a test is already running, then
- * the run request is ignored.
- */
- void runTest( CPPUNIT_NS::Test *testToRun );
-
- /*! Request to stop running test.
- * This methods returns immediately. testRunFinished() signal
- * should be used to now when the test actually stopped running.
- */
- void stopRunningTest();
-
-private:
- /// Prevents the use of the copy constructor.
- TestRunnerModel( const TestRunnerModel © );
-
- /// Prevents the use of the copy operator.
- void operator =( const TestRunnerModel © );
-
- /// Called from the TestRunnerThread.
- void startTest( CPPUNIT_NS::Test *test );
-
- /// Called from the TestRunnerThread.
- void addFailure( const CPPUNIT_NS::TestFailure &failure );
-
- /// Called from the TestRunnerThread.
- void endTest( CPPUNIT_NS::Test *test );
-
- /// Called from the TestRunnerThread.
- void addFailureInfo( TestFailureInfo *failure );
-
- bool event( QEvent *event );
-
- /*! Emits new failure signals.
- * Called by the TestRunnerThreadEvent from the GUI thread to
- * emit the following signals:
- * - numberOfTestCaseFailureChanged()
- * - failureAdded()
- */
- void eventNewFailure( TestFailureInfo *failure,
- int numberOfFailure );
-
- /*! Emits numberOfTestCaseRunChanged() signal.
- * Called by the TestRunnerThreadEvent from the GUI thread to
- * emit the numberOfTestCaseRunChanged() signal.
- */
- void eventNumberOfTestRunChanged( int numberOfRun );
-
- void eventTestRunnerThreadFinished();
-
-private:
- class LockGuard
- {
- public:
- LockGuard( QMutex &mutex ) : _mutex( mutex )
- {
- _mutex.lock();
- }
-
- ~LockGuard()
- {
- _mutex.unlock();
- }
-
- private:
- QMutex &_mutex;
- };
-
-
- QMutex _lock;
- CPPUNIT_NS::Test *_rootTest;
- int _numberOfTestCase;
- int _numberOfTestCaseRun;
- int _numberOfTestCaseFailure;
- QList<TestFailureInfo> _failures;
- TestRunnerThread *_runnerThread;
- CPPUNIT_NS::TestResult *_result;
-};
-
-
-
-// Inlines methods for TestRunnerModel:
-// ------------------------------------
-
-
-
-#endif // TESTRUNNERMODEL_H
diff --git a/src/qttestrunner/TestRunnerModelThreadInterface.cpp b/src/qttestrunner/TestRunnerModelThreadInterface.cpp
deleted file mode 100644
index 3196054..0000000
--- a/src/qttestrunner/TestRunnerModelThreadInterface.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// //////////////////////////////////////////////////////////////////////////
-// Implementation file TestRunnerModelThreadInterface.cpp for class TestRunnerModelThreadInterface
-// (c)Copyright 2000, Baptiste Lepilleur.
-// Created: 2001/09/21
-// //////////////////////////////////////////////////////////////////////////
-
-#include "TestRunnerModelThreadInterface.h"
-
diff --git a/src/qttestrunner/TestRunnerModelThreadInterface.h b/src/qttestrunner/TestRunnerModelThreadInterface.h
deleted file mode 100644
index 6a663a5..0000000
--- a/src/qttestrunner/TestRunnerModelThreadInterface.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// //////////////////////////////////////////////////////////////////////////
-// Header file TestRunnerModelThreadInterface.h for class TestRunnerModelThreadInterface
-// (c)Copyright 2000, Baptiste Lepilleur.
-// Created: 2001/09/21
-// //////////////////////////////////////////////////////////////////////////
-#ifndef TESTRUNNERMODELTHREADINTERFACE_H
-#define TESTRUNNERMODELTHREADINTERFACE_H
-
-class TestFailureInfo;
-
-/*! \class TestRunnerModelThreadInterface
- * \brief This class represents the interface used to process gui thread event.
- */
-class TestRunnerModelThreadInterface
-{
-public:
- /// Destructor.
- virtual ~TestRunnerModelThreadInterface() {}
-
- virtual void eventNewFailure( TestFailureInfo *failure,
- int numberOfFailure ) =0;
-
- virtual void eventNumberOfTestRunChanged( int numberOfRun ) =0;
-
- virtual void eventTestRunnerThreadFinished() =0;
-};
-
-
-
-// Inlines methods for TestRunnerModelThreadInterface:
-// ---------------------------------------------------
-
-
-
-#endif // TESTRUNNERMODELTHREADINTERFACE_H
diff --git a/src/qttestrunner/TestRunnerTestCaseRunEvent.cpp b/src/qttestrunner/TestRunnerTestCaseRunEvent.cpp
deleted file mode 100644
index 177b358..0000000
--- a/src/qttestrunner/TestRunnerTestCaseRunEvent.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-// //////////////////////////////////////////////////////////////////////////
-// Implementation file TestRunnerTestCaseRunEvent.cpp for class TestRunnerTestCaseRunEvent
-// (c)Copyright 2000, Baptiste Lepilleur.
-// Created: 2001/09/22
-// //////////////////////////////////////////////////////////////////////////
-
-#include "TestRunnerModelThreadInterface.h"
-#include "TestRunnerTestCaseRunEvent.h"
-
-
-TestRunnerTestCaseRunEvent::TestRunnerTestCaseRunEvent( int numberOfRun ) :
- _numberOfRun( numberOfRun )
-{
-}
-
-
-TestRunnerTestCaseRunEvent::~TestRunnerTestCaseRunEvent()
-{
-}
-
-
-void
-TestRunnerTestCaseRunEvent::process( TestRunnerModelThreadInterface *target )
-{
- target->eventNumberOfTestRunChanged( _numberOfRun );
-}
diff --git a/src/qttestrunner/TestRunnerTestCaseRunEvent.h b/src/qttestrunner/TestRunnerTestCaseRunEvent.h
deleted file mode 100644
index bd2c635..0000000
--- a/src/qttestrunner/TestRunnerTestCaseRunEvent.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// //////////////////////////////////////////////////////////////////////////
-// Header file TestRunnerTestCaseRunEvent.h for class TestRunnerTestCaseRunEvent
-// (c)Copyright 2000, Baptiste Lepilleur.
-// Created: 2001/09/22
-// //////////////////////////////////////////////////////////////////////////
-#ifndef TESTRUNNERTESTCASERUNEVENT_H
-#define TESTRUNNERTESTCASERUNEVENT_H
-
-#include "TestRunnerThreadEvent.h"
-
-
-/*! \class TestRunnerTestCaseRunEvent
- * \brief This class represents a new TestCase run event.
- */
-class TestRunnerTestCaseRunEvent : public TestRunnerThreadEvent
-{
-public:
- /*! Constructs a TestRunnerTestCaseRunEvent object.
- */
- TestRunnerTestCaseRunEvent( int numberOfRun );
-
- /// Destructor.
- virtual ~TestRunnerTestCaseRunEvent();
-
-private:
- /// Prevents the use of the copy constructor.
- TestRunnerTestCaseRunEvent( const TestRunnerTestCaseRunEvent © );
-
- /// Prevents the use of the copy operator.
- void operator =( const TestRunnerTestCaseRunEvent © );
-
- void process( TestRunnerModelThreadInterface *target );
-
-private:
- int _numberOfRun;
-};
-
-
-
-// Inlines methods for TestRunnerTestCaseRunEvent:
-// -----------------------------------------------
-
-
-
-#endif // TESTRUNNERTESTCASERUNEVENT_H
diff --git a/src/qttestrunner/TestRunnerThread.cpp b/src/qttestrunner/TestRunnerThread.cpp
deleted file mode 100644
index cc45526..0000000
--- a/src/qttestrunner/TestRunnerThread.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-// //////////////////////////////////////////////////////////////////////////
-// Implementation file TestRunnerThread.cpp for class TestRunnerThread
-// (c)Copyright 2000, Baptiste Lepilleur.
-// Created: 2001/09/22
-// //////////////////////////////////////////////////////////////////////////
-
-#include "TestRunnerThread.h"
-#include "TestRunnerThreadFinishedEvent.h"
-
-
-TestRunnerThread::TestRunnerThread( CPPUNIT_NS::Test *testToRun,
- CPPUNIT_NS::TestResult *result,
- QObject *eventTarget,
- TestRunnerThreadFinishedEvent *finishedEvent ) :
- _testToRun( testToRun ),
- _result( result ),
- _eventTarget( eventTarget ),
- _finishedEvent( finishedEvent )
-{
- start();
-}
-
-
-TestRunnerThread::~TestRunnerThread()
-{
-}
-
-
-void
-TestRunnerThread::run()
-{
- _testToRun->run( _result );
-
- // Signal TestRunnerModel GUI thread
- QThread::postEvent( _eventTarget, _finishedEvent );
- _eventTarget = NULL;
- _finishedEvent = NULL;
-}
diff --git a/src/qttestrunner/TestRunnerThread.h b/src/qttestrunner/TestRunnerThread.h
deleted file mode 100644
index 54cb4f1..0000000
--- a/src/qttestrunner/TestRunnerThread.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// //////////////////////////////////////////////////////////////////////////
-// Header file TestRunnerThread.h for class TestRunnerThread
-// (c)Copyright 2000, Baptiste Lepilleur.
-// Created: 2001/09/22
-// //////////////////////////////////////////////////////////////////////////
-#ifndef TESTRUNNERTHREAD_H
-#define TESTRUNNERTHREAD_H
-
-#include <qthread.h>
-#include <cppunit/Test.h>
-#include <cppunit/TestResult.h>
-class QObject;
-class TestRunnerThreadFinishedEvent;
-
-
-/*! \class TestRunnerThread
- * \brief This class represents the thread used to run TestCase.
- */
-class TestRunnerThread : public QThread
-{
-public:
- /*! Constructs a TestRunnerThread object.
- */
- TestRunnerThread( CPPUNIT_NS::Test *testToRun,
- CPPUNIT_NS::TestResult *result,
- QObject *eventTarget,
- TestRunnerThreadFinishedEvent *finishedEvent );
-
- /// Destructor.
- virtual ~TestRunnerThread();
-
-private:
- /// Prevents the use of the copy constructor.
- TestRunnerThread( const TestRunnerThread © );
-
- /// Prevents the use of the copy operator.
- void operator =( const TestRunnerThread © );
-
- void run();
-
-private:
- CPPUNIT_NS::Test *_testToRun;
- CPPUNIT_NS::TestResult *_result;
- QObject *_eventTarget;
- TestRunnerThreadFinishedEvent *_finishedEvent;
-};
-
-
-
-// Inlines methods for TestRunnerThread:
-// -------------------------------------
-
-
-
-#endif // TESTRUNNERTHREAD_H
diff --git a/src/qttestrunner/TestRunnerThreadEvent.cpp b/src/qttestrunner/TestRunnerThreadEvent.cpp
deleted file mode 100644
index 17be770..0000000
--- a/src/qttestrunner/TestRunnerThreadEvent.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// //////////////////////////////////////////////////////////////////////////
-// Implementation file TestRunnerThreadEvent.cpp for class TestRunnerThreadEvent
-// (c)Copyright 2000, Baptiste Lepilleur.
-// Created: 2001/09/21
-// //////////////////////////////////////////////////////////////////////////
-
-#include "TestRunnerThreadEvent.h"
-
-
-TestRunnerThreadEvent::TestRunnerThreadEvent() :
- QCustomEvent( User )
-{
-}
-
-
-TestRunnerThreadEvent::~TestRunnerThreadEvent()
-{
-}
-
diff --git a/src/qttestrunner/TestRunnerThreadEvent.h b/src/qttestrunner/TestRunnerThreadEvent.h
deleted file mode 100644
index 32389bd..0000000
--- a/src/qttestrunner/TestRunnerThreadEvent.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// //////////////////////////////////////////////////////////////////////////
-// Header file TestRunnerThreadEvent.h for class TestRunnerThreadEvent
-// (c)Copyright 2000, Baptiste Lepilleur.
-// Created: 2001/09/21
-// //////////////////////////////////////////////////////////////////////////
-#ifndef TESTRUNNERTHREADEVENT_H
-#define TESTRUNNERTHREADEVENT_H
-
-#include <qevent.h>
-class TestRunnerModelThreadInterface;
-
-/*! \class TestRunnerThreadEvent
- * \brief This class represents an event send by the test runner thread.
- */
-class TestRunnerThreadEvent : public QCustomEvent
-{
-public:
- /*! Constructs a TestRunnerThreadEvent object.
- */
- TestRunnerThreadEvent();
-
- /// Destructor.
- virtual ~TestRunnerThreadEvent();
-
- virtual void process( TestRunnerModelThreadInterface *target ) =0;
-
-private:
- /// Prevents the use of the copy constructor.
- TestRunnerThreadEvent( const TestRunnerThreadEvent © );
-
- /// Prevents the use of the copy operator.
- void operator =( const TestRunnerThreadEvent © );
-};
-
-
-
-#endif // TESTRUNNERTHREADEVENT_H
diff --git a/src/qttestrunner/TestRunnerThreadFinishedEvent.cpp b/src/qttestrunner/TestRunnerThreadFinishedEvent.cpp
deleted file mode 100644
index 5c2f2ba..0000000
--- a/src/qttestrunner/TestRunnerThreadFinishedEvent.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-// //////////////////////////////////////////////////////////////////////////
-// Implementation file TestRunnerThreadFinishedEvent.cpp for class TestRunnerThreadFinishedEvent
-// (c)Copyright 2000, Baptiste Lepilleur.
-// Created: 2001/09/22
-// //////////////////////////////////////////////////////////////////////////
-
-#include "TestRunnerThreadFinishedEvent.h"
-#include "TestRunnerModelThreadInterface.h"
-
-
-TestRunnerThreadFinishedEvent::TestRunnerThreadFinishedEvent()
-{
-}
-
-
-TestRunnerThreadFinishedEvent::~TestRunnerThreadFinishedEvent()
-{
-}
-
-
-void
-TestRunnerThreadFinishedEvent::process( TestRunnerModelThreadInterface *target )
-{
- target->eventTestRunnerThreadFinished();
-}
diff --git a/src/qttestrunner/TestRunnerThreadFinishedEvent.h b/src/qttestrunner/TestRunnerThreadFinishedEvent.h
deleted file mode 100644
index b390e7a..0000000
--- a/src/qttestrunner/TestRunnerThreadFinishedEvent.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// //////////////////////////////////////////////////////////////////////////
-// Header file TestRunnerThreadFinishedEvent.h for class TestRunnerThreadFinishedEvent
-// (c)Copyright 2000, Baptiste Lepilleur.
-// Created: 2001/09/22
-// //////////////////////////////////////////////////////////////////////////
-#ifndef TESTRUNNERTHREADFINISHEDEVENT_H
-#define TESTRUNNERTHREADFINISHEDEVENT_H
-
-#include "TestRunnerThreadEvent.h"
-
-
-/*! \class TestRunnerThreadFinishedEvent
- * \brief This class represents an event indicating that the TestRunnerThread finished.
- */
-class TestRunnerThreadFinishedEvent : public TestRunnerThreadEvent
-{
-public:
- /*! Constructs a TestRunnerThreadFinishedEvent object.
- */
- TestRunnerThreadFinishedEvent();
-
- /// Destructor.
- virtual ~TestRunnerThreadFinishedEvent();
-
- void process( TestRunnerModelThreadInterface *target );
-
-private:
- /// Prevents the use of the copy constructor.
- TestRunnerThreadFinishedEvent( const TestRunnerThreadFinishedEvent © );
-
- /// Prevents the use of the copy operator.
- void operator =( const TestRunnerThreadFinishedEvent © );
-};
-
-
-
-// Inlines methods for TestRunnerThreadFinishedEvent:
-// --------------------------------------------------
-
-
-
-#endif // TESTRUNNERTHREADFINISHEDEVENT_H
diff --git a/src/qttestrunner/make_lib b/src/qttestrunner/make_lib
deleted file mode 100644
index 2e7cb43..0000000
--- a/src/qttestrunner/make_lib
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/tcsh
-###########################################################################
-# FILE: make_lib
-# PURPOSE: Create Makefile from project file and then make QtTestRunner
-# library.
-###########################################################################
-
-qmake qttestrunnerlib.pro
-make distclean
-make
diff --git a/src/qttestrunner/make_lib.bat b/src/qttestrunner/make_lib.bat
deleted file mode 100644
index 2952a01..0000000
--- a/src/qttestrunner/make_lib.bat
+++ /dev/null
@@ -1,7 +0,0 @@
- at REM make_lib.bat
- at REM
- at REM Create Makefile from project file and then make QtTestRunner library.
-
-qmake qttestrunnerlib.pro
-nmake distclean
-nmake
diff --git a/src/qttestrunner/qttestrunnerlib.pro b/src/qttestrunner/qttestrunnerlib.pro
deleted file mode 100644
index 18870ee..0000000
--- a/src/qttestrunner/qttestrunnerlib.pro
+++ /dev/null
@@ -1,149 +0,0 @@
-#----------------------------------------------------------------------
-# File: qttestrunnerlib.pro
-# Purpose: qmake config file for the QtTestRunner library.
-# The library is built as debug staticlib. Set the CONFIG
-# variable accordingly to build it differently.
-#----------------------------------------------------------------------
-
-TEMPLATE = lib
-LANGUAGE = C++
-
-# Get rid of possibly predefined options
-
-CONFIG -= debug
-CONFIG -= release
-CONFIG -= dll
-CONFIG -= staticlib
-
-CONFIG += qt warn_on debug staticlib
-
-#CONFIG += qt warn_on release staticlib
-#CONFIG += qt warn_on debug dll
-#CONFIG += qt warn_on release dll
-
-
-QTRUNNER_LIB = qttestrunner # Name of the library
-
-
-#----------------------------------------------------------------------
-# MS Windows
-#----------------------------------------------------------------------
-
-win32 {
- # Suppress program database creation (should better be done
- # in the qmake spec file)
- QMAKE_CXXFLAGS_DEBUG += /Z7
- QMAKE_CXXFLAGS_DEBUG -= -Gm
- QMAKE_CXXFLAGS_DEBUG -= -Zi
-}
-
-win32 {
- MOC_DIR = tmp\moc
- UI_DIR = tmp\moc
- dll {
- DEFINES += QTTESTRUNNER_DLL_BUILD
- DLLDESTDIR = ..\..\lib
- debug {
- TARGET = $${QTRUNNER_LIB}d_dll
- QTRUNNER_IMPORTLIB = $${QTRUNNER_LIB}d_dll.lib
- OBJECTS_DIR = DebugDLL
- LIBS += ..\..\lib\cppunitd_dll.lib
- }
- release {
- TARGET = $${QTRUNNER_LIB}_dll
- QTRUNNER_IMPORTLIB = $${QTRUNNER_LIB}_dll.lib
- OBJECTS_DIR = ReleaseDLL
- LIBS += ..\..\lib\cppunit_dll.lib
- }
- DESTDIR = $${OBJECTS_DIR}
- QMAKE_CLEAN += $${QTRUNNER_IMPORTLIB}
-
- # Also copy the import library after build of the DLL
- QTRUNNER_IMPORTLIB = $${DESTDIR}-SEP-$${QTRUNNER_IMPORTLIB}
- QTRUNNER_IMPORTLIB ~= s/-SEP-/\/
- QMAKE_POST_LINK = copy $${QTRUNNER_IMPORTLIB} $${DLLDESTDIR}
- }
- staticlib {
- DESTDIR = ..\..\lib
- debug {
- TARGET = $${QTRUNNER_LIB}d
- OBJECTS_DIR = Debug
- }
- release {
- TARGET = $${QTRUNNER_LIB}
- OBJECTS_DIR = Release
- }
- }
-}
-
-#----------------------------------------------------------------------
-# Linux/Unix
-#----------------------------------------------------------------------
-
-unix {
- MOC_DIR = .moc
- UI_DIR = .moc
- DESTDIR = ../../lib
- dll {
- debug {
- TARGET = $${QTRUNNER_LIB}d_shared
- OBJECTS_DIR = .obj_debug_shared
- LIBS += -L../../lib -lcppunit
- }
- release {
- TARGET = $${QTRUNNER_LIB}_shared
- OBJECTS_DIR = .obj_release_shared
- LIBS += -L../../lib -lcppunit
- }
- }
- staticlib {
- debug {
- TARGET = $${QTRUNNER_LIB}d
- OBJECTS_DIR = .obj_debug
- }
- release {
- TARGET = $${QTRUNNER_LIB}
- OBJECTS_DIR = .obj_release
- }
- }
-}
-
-#----------------------------------------------------------------------
-
-HEADERS = \
- MostRecentTests.h \
- TestBrowserDlgImpl.h \
- TestFailureInfo.h \
- TestFailureListViewItem.h \
- TestListViewItem.h \
- TestRunnerDlgImpl.h \
- TestRunnerFailureEvent.h \
- TestRunnerModel.h \
- TestRunnerModelThreadInterface.h \
- TestRunnerTestCaseRunEvent.h \
- TestRunnerThread.h \
- TestRunnerThreadEvent.h \
- TestRunnerThreadFinishedEvent.h \
- ../../include/cppunit/ui/qt/TestRunner.h
-
-SOURCES = \
- MostRecentTests.cpp \
- TestBrowserDlgImpl.cpp \
- TestFailureInfo.cpp \
- TestFailureListViewItem.cpp \
- TestListViewItem.cpp \
- QtTestRunner.cpp \
- TestRunnerDlgImpl.cpp \
- TestRunnerFailureEvent.cpp \
- TestRunnerModel.cpp \
- TestRunnerModelThreadInterface.cpp \
- TestRunnerTestCaseRunEvent.cpp \
- TestRunnerThread.cpp \
- TestRunnerThreadEvent.cpp \
- TestRunnerThreadFinishedEvent.cpp
-
-INTERFACES = \
- testbrowserdlg.ui \
- testrunnerdlg.ui
-
-INCLUDEPATH += . ../../include
diff --git a/src/qttestrunner/testbrowserdlg.ui b/src/qttestrunner/testbrowserdlg.ui
deleted file mode 100644
index 4daedf8..0000000
--- a/src/qttestrunner/testbrowserdlg.ui
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE UI><UI>
-<class>TestBrowserBase</class>
-<widget>
- <class>QDialog</class>
- <property stdset="1">
- <name>name</name>
- <cstring>TestBrowserBase</cstring>
- </property>
- <property>
- <name>geometry</name>
- <rect>
- <x>0</x>
- <y>0</y>
- <width>352</width>
- <height>292</height>
- </rect>
- </property>
- <property>
- <name>caption</name>
- <string>TestBrowser</string>
- </property>
- <property>
- <name>sizeGripEnabled</name>
- <bool>true</bool>
- </property>
- <hbox>
- <property>
- <name>margin</name>
- <number>11</number>
- </property>
- <property>
- <name>spacing</name>
- <number>6</number>
- </property>
- <widget>
- <class>QListView</class>
- <column>
- <property>
- <name>text</name>
- <string>Test Name</string>
- </property>
- <property>
- <name>clickable</name>
- <bool>true</bool>
- </property>
- <property>
- <name>resizeable</name>
- <bool>true</bool>
- </property>
- </column>
- <property stdset="1">
- <name>name</name>
- <cstring>_listTests</cstring>
- </property>
- </widget>
- <widget>
- <class>QLayoutWidget</class>
- <property stdset="1">
- <name>name</name>
- <cstring>Layout6</cstring>
- </property>
- <vbox>
- <property>
- <name>margin</name>
- <number>0</number>
- </property>
- <property>
- <name>spacing</name>
- <number>6</number>
- </property>
- <widget>
- <class>QPushButton</class>
- <property stdset="1">
- <name>name</name>
- <cstring>buttonOk</cstring>
- </property>
- <property>
- <name>caption</name>
- <string></string>
- </property>
- <property>
- <name>text</name>
- <string>&Select</string>
- </property>
- <property>
- <name>autoDefault</name>
- <bool>true</bool>
- </property>
- <property>
- <name>default</name>
- <bool>true</bool>
- </property>
- </widget>
- <widget>
- <class>QPushButton</class>
- <property stdset="1">
- <name>name</name>
- <cstring>buttonCancel</cstring>
- </property>
- <property>
- <name>text</name>
- <string>&Cancel</string>
- </property>
- <property>
- <name>autoDefault</name>
- <bool>true</bool>
- </property>
- </widget>
- <spacer>
- <property>
- <name>name</name>
- <cstring>Spacer2</cstring>
- </property>
- <property>
- <name>orientation</name>
- <enum>Vertical</enum>
- </property>
- <property>
- <name>sizeType</name>
- <enum>Expanding</enum>
- </property>
- <property>
- <name>sizeHint</name>
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </vbox>
- </widget>
- </hbox>
-</widget>
-<connections>
- <connection>
- <sender>buttonOk</sender>
- <signal>clicked()</signal>
- <receiver>TestBrowserBase</receiver>
- <slot>accept()</slot>
- </connection>
- <connection>
- <sender>buttonCancel</sender>
- <signal>clicked()</signal>
- <receiver>TestBrowserBase</receiver>
- <slot>reject()</slot>
- </connection>
-</connections>
-</UI>
diff --git a/src/qttestrunner/testrunnerdlg.ui b/src/qttestrunner/testrunnerdlg.ui
deleted file mode 100644
index 9727fb1..0000000
--- a/src/qttestrunner/testrunnerdlg.ui
+++ /dev/null
@@ -1,687 +0,0 @@
-<!DOCTYPE UI><UI>
-<class>TestRunnerDlgBase</class>
-<widget>
- <class>QDialog</class>
- <property stdset="1">
- <name>name</name>
- <cstring>TestRunnerDlgBase</cstring>
- </property>
- <property>
- <name>geometry</name>
- <rect>
- <x>0</x>
- <y>0</y>
- <width>429</width>
- <height>370</height>
- </rect>
- </property>
- <property>
- <name>caption</name>
- <string>Qt Test Runner</string>
- </property>
- <property>
- <name>sizeGripEnabled</name>
- <bool>true</bool>
- </property>
- <vbox>
- <property>
- <name>margin</name>
- <number>11</number>
- </property>
- <property>
- <name>spacing</name>
- <number>6</number>
- </property>
- <widget>
- <class>QLayoutWidget</class>
- <property stdset="1">
- <name>name</name>
- <cstring>Layout25</cstring>
- </property>
- <hbox>
- <property>
- <name>margin</name>
- <number>0</number>
- </property>
- <property>
- <name>spacing</name>
- <number>6</number>
- </property>
- <widget>
- <class>QLayoutWidget</class>
- <property stdset="1">
- <name>name</name>
- <cstring>Layout24</cstring>
- </property>
- <vbox>
- <property>
- <name>margin</name>
- <number>0</number>
- </property>
- <property>
- <name>spacing</name>
- <number>6</number>
- </property>
- <widget>
- <class>QComboBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>_comboTest</cstring>
- </property>
- <property>
- <name>enabled</name>
- <bool>true</bool>
- </property>
- <property>
- <name>sizePolicy</name>
- <sizepolicy>
- <hsizetype>3</hsizetype>
- <vsizetype>0</vsizetype>
- </sizepolicy>
- </property>
- <property>
- <name>autoResize</name>
- <bool>false</bool>
- </property>
- </widget>
- <spacer>
- <property>
- <name>name</name>
- <cstring>Spacer27</cstring>
- </property>
- <property>
- <name>orientation</name>
- <enum>Vertical</enum>
- </property>
- <property>
- <name>sizeType</name>
- <enum>Expanding</enum>
- </property>
- <property>
- <name>sizeHint</name>
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- <widget>
- <class>QLayoutWidget</class>
- <property stdset="1">
- <name>name</name>
- <cstring>Layout9</cstring>
- </property>
- <hbox>
- <property>
- <name>margin</name>
- <number>0</number>
- </property>
- <property>
- <name>spacing</name>
- <number>6</number>
- </property>
- <widget>
- <class>QLayoutWidget</class>
- <property stdset="1">
- <name>name</name>
- <cstring>Layout8</cstring>
- </property>
- <hbox>
- <property>
- <name>margin</name>
- <number>0</number>
- </property>
- <property>
- <name>spacing</name>
- <number>6</number>
- </property>
- <widget>
- <class>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>TextLabel2</cstring>
- </property>
- <property>
- <name>text</name>
- <string>TestCases:</string>
- </property>
- </widget>
- <widget>
- <class>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>_labelTestCaseCount</cstring>
- </property>
- <property>
- <name>text</name>
- <string>999999</string>
- </property>
- </widget>
- </hbox>
- </widget>
- <spacer>
- <property>
- <name>name</name>
- <cstring>Spacer3</cstring>
- </property>
- <property>
- <name>orientation</name>
- <enum>Horizontal</enum>
- </property>
- <property>
- <name>sizeType</name>
- <enum>Fixed</enum>
- </property>
- <property>
- <name>sizeHint</name>
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- <widget>
- <class>QLayoutWidget</class>
- <property stdset="1">
- <name>name</name>
- <cstring>Layout7</cstring>
- </property>
- <hbox>
- <property>
- <name>margin</name>
- <number>0</number>
- </property>
- <property>
- <name>spacing</name>
- <number>6</number>
- </property>
- <widget>
- <class>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>TextLabel2_2</cstring>
- </property>
- <property>
- <name>text</name>
- <string>Run:</string>
- </property>
- </widget>
- <widget>
- <class>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>_labelTestRunCount</cstring>
- </property>
- <property>
- <name>text</name>
- <string>999999</string>
- </property>
- </widget>
- </hbox>
- </widget>
- <spacer>
- <property>
- <name>name</name>
- <cstring>Spacer4</cstring>
- </property>
- <property>
- <name>orientation</name>
- <enum>Horizontal</enum>
- </property>
- <property>
- <name>sizeType</name>
- <enum>Fixed</enum>
- </property>
- <property>
- <name>sizeHint</name>
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- <widget>
- <class>QLayoutWidget</class>
- <property stdset="1">
- <name>name</name>
- <cstring>Layout6</cstring>
- </property>
- <hbox>
- <property>
- <name>margin</name>
- <number>0</number>
- </property>
- <property>
- <name>spacing</name>
- <number>6</number>
- </property>
- <widget>
- <class>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>TextLabel1</cstring>
- </property>
- <property>
- <name>text</name>
- <string>Failure:</string>
- </property>
- </widget>
- <widget>
- <class>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>_labelFailureCount</cstring>
- </property>
- <property>
- <name>text</name>
- <string>999999</string>
- </property>
- </widget>
- </hbox>
- </widget>
- <spacer>
- <property>
- <name>name</name>
- <cstring>Spacer5</cstring>
- </property>
- <property>
- <name>orientation</name>
- <enum>Horizontal</enum>
- </property>
- <property>
- <name>sizeType</name>
- <enum>Expanding</enum>
- </property>
- <property>
- <name>sizeHint</name>
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </hbox>
- </widget>
- <widget>
- <class>QProgressBar</class>
- <property stdset="1">
- <name>name</name>
- <cstring>_progressRun</cstring>
- </property>
- </widget>
- </vbox>
- </widget>
- <widget>
- <class>QLayoutWidget</class>
- <property stdset="1">
- <name>name</name>
- <cstring>Layout18</cstring>
- </property>
- <vbox>
- <property>
- <name>margin</name>
- <number>0</number>
- </property>
- <property>
- <name>spacing</name>
- <number>6</number>
- </property>
- <widget>
- <class>QPushButton</class>
- <property stdset="1">
- <name>name</name>
- <cstring>_buttonBrowse</cstring>
- </property>
- <property>
- <name>text</name>
- <string>&Browse...</string>
- </property>
- </widget>
- <widget>
- <class>QPushButton</class>
- <property stdset="1">
- <name>name</name>
- <cstring>_buttonRunTest</cstring>
- </property>
- <property>
- <name>text</name>
- <string>Run &Test</string>
- </property>
- <property>
- <name>accel</name>
- <number>276824148</number>
- </property>
- </widget>
- <widget>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list