3 files changed, 24 insertions, 7 deletions
diff --git a/tests/auto/xmlpatternsxqts/test/tst_suitetest.cpp b/tests/auto/xmlpatternsxqts/test/tst_suitetest.cpp
index 5d61436..0f44058 100644
--- a/tests/auto/xmlpatternsxqts/test/tst_suitetest.cpp
+++ b/tests/auto/xmlpatternsxqts/test/tst_suitetest.cpp
@@ -55,11 +55,11 @@
 
 using namespace QPatternistSDK;
 
-tst_SuiteTest::tst_SuiteTest(const bool isXSLT,
+tst_SuiteTest::tst_SuiteTest(const SuiteType suiteType,
                              const bool alwaysRun) : m_existingBaseline(inputFile(QLatin1String("Baseline.xml")))
                                                    , m_candidateBaseline(inputFile(QLatin1String("CandidateBaseline.xml")))
                                                    , m_abortRun(!alwaysRun && !QFile::exists(QLatin1String("runTests")))
-                                                   , m_isXSLT(isXSLT)
+                                                   , m_suiteType(suiteType)
 {
 }
 
@@ -86,7 +86,16 @@ void tst_SuiteTest::runTestSuite() const
     QString errMsg;
     const QFileInfo fi(m_catalogPath);
     const QUrl catalogPath(QUrl::fromLocalFile(fi.absoluteFilePath()));
-    TestSuite *const ts = TestSuite::openCatalog(catalogPath, errMsg, true, m_isXSLT);
+
+    TestSuite::SuiteType suiteType;
+    switch (m_suiteType) {
+        case XQuerySuite: suiteType = TestSuite::XQuerySuite;
+        case XsltSuite: suiteType = TestSuite::XsltSuite;
+        case XsdSuite: suiteType = TestSuite::XsdSuite;
+        default: break;
+    }
+
+    TestSuite *const ts = TestSuite::openCatalog(catalogPath, errMsg, true, suiteType);
 
     QVERIFY2(ts, qPrintable(QString::fromLatin1("Failed to open the catalog, maybe it doesn't exist or is broken: %1").arg(errMsg)));
 
diff --git a/tests/auto/xmlpatternsxqts/test/tst_suitetest.h b/tests/auto/xmlpatternsxqts/test/tst_suitetest.h
index effa887..fdf82d5 100644
--- a/tests/auto/xmlpatternsxqts/test/tst_suitetest.h
+++ b/tests/auto/xmlpatternsxqts/test/tst_suitetest.h
@@ -50,13 +50,21 @@
  \class tst_SuiteTest
  \internal
  \since 4.5
- \brief Base class for tst_XmlPatternsXQTS and tst_XmlPatternsXSLTS.
+ \brief Base class for tst_XmlPatternsXQTS, tst_XmlPatternsXSLTS and tst_XmlPatternsXSDTS.
  */
 class tst_SuiteTest : public QObject
                     , private TestFundament
 {
     Q_OBJECT
 
+public:
+    enum SuiteType
+    {
+        XQuerySuite,
+        XsltSuite,
+        XsdSuite
+    };
+
 protected:
     /**
      * @p isXSLT is @c true if the catalog opened is an
@@ -65,7 +73,7 @@ protected:
      * @p alwaysRun is @c true if the test should always be run,
      * regardless of if the file runTests exists.
      */
-    tst_SuiteTest(const bool isXSLT,
+    tst_SuiteTest(SuiteType type,
                   const bool alwaysRun = false);
 
     /**
@@ -91,7 +99,7 @@ private:
     const QString   m_existingBaseline;
     const QString   m_candidateBaseline;
     const bool      m_abortRun;
-    const bool      m_isXSLT;
+    const SuiteType m_suiteType;
 };
 
 #endif
diff --git a/tests/auto/xmlpatternsxqts/test/tst_xmlpatternsxqts.cpp b/tests/auto/xmlpatternsxqts/test/tst_xmlpatternsxqts.cpp
index 6330784..4154b16 100644
--- a/tests/auto/xmlpatternsxqts/test/tst_xmlpatternsxqts.cpp
+++ b/tests/auto/xmlpatternsxqts/test/tst_xmlpatternsxqts.cpp
@@ -61,7 +61,7 @@ public:
     virtual void catalogPath(QString &write) const;
 };
 
-tst_XmlPatternsXQTS::tst_XmlPatternsXQTS() : tst_SuiteTest(false)
+tst_XmlPatternsXQTS::tst_XmlPatternsXQTS() : tst_SuiteTest(tst_SuiteTest::XQuerySuite)
 {
 }