Commit 3630e247 authored by Clinton Stimpson's avatar Clinton Stimpson
Browse files

ENH:  Move code around and use VTK's XML api to read XML test files.
      No more conditional for building with desktop light edition of Qt.
parent f748d220
PROJECT(QtTesting)
SET(QT_TESTING_WITH_XML ON)
# if Qt has XML module
IF(QT_EDITION_DESKTOPLIGHT)
SET(QT_TESTING_WITH_XML OFF)
ENDIF(QT_EDITION_DESKTOPLIGHT)
IF(QT_TESTING_WITH_PYTHON)
INCLUDE(${VTK_CMAKE_DIR}/FindPythonLibs.cmake)
......@@ -39,21 +33,6 @@ IF(QT_TESTING_WITH_PYTHON)
)
ENDIF(QT_TESTING_WITH_PYTHON)
IF(QT_TESTING_WITH_XML)
SET(XML_MOCS
pqXMLEventObserver.h
)
SET(XML_SRCS
pqXMLEventObserver.cxx
pqXMLEventObserver.h
pqXMLEventSource.cxx
pqXMLEventSource.h
)
ENDIF(QT_TESTING_WITH_XML)
INCLUDE_DIRECTORIES(
${QtTesting_BINARY_DIR}
${QtTesting_SOURCE_DIR}
......@@ -86,7 +65,6 @@ QT4_WRAP_CPP(MOC_BUILT_SOURCES
pqTabBarEventTranslator.h
pqWidgetEventTranslator.h
${PYTHON_MOCS}
${XML_MOCS}
)
SET_DIRECTORY_PROPERTIES(PROPERTIES INCLUDE_DIRECTORIES "${include_dirs_tmp}")
......@@ -158,7 +136,6 @@ ADD_LIBRARY(QtTesting
${MOC_BUILT_SOURCES}
${UI_BUILT_SOURCES}
${PYTHON_SRCS}
${XML_SRCS}
)
SOURCE_GROUP("Generated" FILES
......
......@@ -35,10 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#cmakedefine QTTESTING_BUILD_SHARED_LIBS
#cmakedefine QT_TESTING_WITH_XML
#cmakedefine QT_TESTING_WITH_PYTHON
#endif // _QtTestingConfigure_h
......@@ -40,11 +40,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "pqRecordEventsDialog.h"
#include "QtTestingConfigure.h"
#ifdef QT_TESTING_WITH_XML
#include "pqXMLEventSource.h"
#include "pqXMLEventObserver.h"
#endif
#ifdef QT_TESTING_WITH_PYTHON
#include "pqPythonEventSource.h"
#include "pqPythonEventObserver.h"
......@@ -69,12 +64,6 @@ pqTestUtility::pqTestUtility(QObject* p) :
this->Translator.addDefaultWidgetEventTranslators();
this->Player.addDefaultWidgetEventPlayers();
#ifdef QT_TESTING_WITH_XML
// add an XML source
this->addEventSource("xml", new pqXMLEventSource(this));
this->addEventObserver("xml", new pqXMLEventObserver(this));
#endif
#ifdef QT_TESTING_WITH_PYTHON
// add a python event source
this->addEventSource("py", new pqPythonEventSource(this));
......
/*=========================================================================
Program: ParaView
Module: pqXMLEventObserver.cxx
Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc.
All rights reserved.
ParaView is a free software; you can redistribute it and/or modify it
under the terms of the ParaView license version 1.1.
See License_v1.1.txt for the full ParaView license.
A copy of this license can be obtained by contacting
Kitware Inc.
28 Corporate Drive
Clifton Park, NY 12065
USA
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
=========================================================================*/
#include "pqXMLEventObserver.h"
#include <QTextStream>
/// Escapes strings so they can be embedded in an XML document
static const QString textToXML(const QString& string)
{
QString result = string;
result.replace("&", "&amp;");
result.replace("<", "&lt;");
result.replace(">", "&gt;");
result.replace("'", "&apos;");
result.replace("\"", "&quot;");
return result;
}
////////////////////////////////////////////////////////////////////////////////////
// pqXMLEventObserver
pqXMLEventObserver::pqXMLEventObserver(QObject* p)
: pqEventObserver(p)
{
}
pqXMLEventObserver::~pqXMLEventObserver()
{
}
void pqXMLEventObserver::setStream(QTextStream* stream)
{
if(this->Stream)
{
*this->Stream << "</pqevents>\n";
}
pqEventObserver::setStream(stream);
if(this->Stream)
{
*this->Stream << "<?xml version=\"1.0\" ?>\n";
*this->Stream << "<pqevents>\n";
}
}
void pqXMLEventObserver::onRecordEvent(
const QString& Widget,
const QString& Command,
const QString& Arguments)
{
if(this->Stream)
{
*this->Stream
<< " <pqevent "
<< "object=\"" << textToXML(Widget).toAscii().data() << "\" "
<< "command=\"" << textToXML(Command).toAscii().data() << "\" "
<< "arguments=\"" << textToXML(Arguments).toAscii().data() << "\" "
<< "/>\n";
}
}
/*=========================================================================
Program: ParaView
Module: pqXMLEventObserver.h
Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc.
All rights reserved.
ParaView is a free software; you can redistribute it and/or modify it
under the terms of the ParaView license version 1.1.
See License_v1.1.txt for the full ParaView license.
A copy of this license can be obtained by contacting
Kitware Inc.
28 Corporate Drive
Clifton Park, NY 12065
USA
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
=========================================================================*/
#ifndef _pqXMLEventObserver_h
#define _pqXMLEventObserver_h
#include "pqEventObserver.h"
/**
Observes high-level ParaView events, and serializes them to a stream as XML
for possible playback (as a test-case, demo, tutorial, etc). To use,
connect the onRecordEvent() slot to the pqEventTranslator::recordEvent()
signal.
\note Output is sent to the stream from this object's destructor, so you
must ensure that it goes out of scope before trying to playback the stream.
\sa pqEventTranslator, pqStdoutEventObserver, pqXMLEventSource.
*/
class pqXMLEventObserver : public pqEventObserver
{
Q_OBJECT
public:
pqXMLEventObserver(QObject* p);
~pqXMLEventObserver();
virtual void setStream(QTextStream* stream);
public slots:
void onRecordEvent(
const QString& Widget,
const QString& Command,
const QString& Arguments);
private:
};
#endif // !_pqXMLEventObserver_h
/*=========================================================================
Program: ParaView
Module: pqXMLEventSource.cxx
Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc.
All rights reserved.
ParaView is a free software; you can redistribute it and/or modify it
under the terms of the ParaView license version 1.1.
See License_v1.1.txt for the full ParaView license.
A copy of this license can be obtained by contacting
Kitware Inc.
28 Corporate Drive
Clifton Park, NY 12065
USA
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
=========================================================================*/
#include "pqXMLEventSource.h"
#include <QDomDocument>
#include <QFile>
#include <QtDebug>
///////////////////////////////////////////////////////////////////////////
// pqXMLEventSource::pqImplementation
class pqXMLEventSource::pqImplementation
{
public:
QDomDocument Document;
QDomNode CurrentEvent;
};
///////////////////////////////////////////////////////////////////////////////////////////
// pqXMLEventSource
pqXMLEventSource::pqXMLEventSource(QObject* p) :
pqEventSource(p),
Implementation(new pqImplementation())
{
}
pqXMLEventSource::~pqXMLEventSource()
{
delete this->Implementation;
}
void pqXMLEventSource::setContent(const QString& path)
{
QFile file(path);
if(!this->Implementation->Document.setContent(&file, false))
{
qCritical() << "Error parsing " << path << ": not a valid XML document";
return;
}
QDomElement xml_events = this->Implementation->Document.documentElement();
if(xml_events.nodeName() != "pqevents")
{
qCritical() << path<< " is not an XML test case document";
return;
}
this->Implementation->CurrentEvent = xml_events.firstChild();
}
int pqXMLEventSource::getNextEvent(
QString& object,
QString& command,
QString& arguments)
{
if(this->Implementation->CurrentEvent.isNull())
return DONE;
if(!this->Implementation->CurrentEvent.isElement())
return FAILURE;
if(this->Implementation->CurrentEvent.nodeName() != "pqevent")
return FAILURE;
object = this->Implementation->CurrentEvent.toElement().attribute("object");
command = this->Implementation->CurrentEvent.toElement().attribute("command");
arguments = this->Implementation->CurrentEvent.toElement().attribute("arguments");
this->Implementation->CurrentEvent =
this->Implementation->CurrentEvent.nextSibling();
return SUCCESS;
}
/*=========================================================================
Program: ParaView
Module: pqXMLEventSource.h
Copyright (c) 2005,2006 Sandia Corporation, Kitware Inc.
All rights reserved.
ParaView is a free software; you can redistribute it and/or modify it
under the terms of the ParaView license version 1.1.
See License_v1.1.txt for the full ParaView license.
A copy of this license can be obtained by contacting
Kitware Inc.
28 Corporate Drive
Clifton Park, NY 12065
USA
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
=========================================================================*/
#ifndef _pqXMLEventSource_h
#define _pqXMLEventSource_h
#include "pqEventSource.h"
class QString;
/** Concrete implementation of pqEventSource that retrieves events recorded
by pqXMLEventObserver */
class QTTESTING_EXPORT pqXMLEventSource :
public pqEventSource
{
public:
pqXMLEventSource(QObject* p = 0);
~pqXMLEventSource();
virtual void setContent(const QString& path);
virtual int getNextEvent(
QString& object,
QString& command,
QString& arguments);
private:
class pqImplementation;
pqImplementation* const Implementation;
};
#endif // !_pqXMLEventSource_h
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment