Do not save the execution report of each plugin

The __coveragescanner_register_library handles it automatically now.
steveire · Nov 1, 2011 · 3416831 · 3416831
1 parent 4ff9b6d
commit 3416831
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 58 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -274,7 +274,7 @@ if (CMAKE_BUILD_TYPE MATCHES TestCocoon)
 
   set(testcocoon_ARGS ${testcocoon_ARGS}
     COMMAND ${TESTCOCOON_CMCSEXEIMPORT_EXECUTABLE}
-    -m unittests.csmes -t "\"target\"" -p
+    -m unittests.csmes -t "\"--unnamed--\"" -p
     merge -e "${coverageDir}/coverage.csexe"
   )
 

diff --git a/templates/tests/coverageobject.cpp b/templates/tests/coverageobject.cpp
@@ -32,8 +32,6 @@ void CoverageObject::saveCoverageData()
 {
 #ifdef __COVERAGESCANNER__
   QString test_name;
-  test_name=QString::fromAscii("core/");
-
   test_name += generateTestName();
 
   __coveragescanner_testname(test_name.toStdString().c_str());
@@ -47,63 +45,10 @@ void CoverageObject::saveCoverageData()
 #endif
 }
 
-void CoverageObject::saveCoverageData(const QString &plg)
-{
-#ifdef __COVERAGESCANNER__
-  if (QFile::exists(plg))
-  {
-    QFileInfo plgInfo(plg);
-    QString test_name = plgInfo.baseName() + QString::fromAscii("/") + generateTestName();
-    QLibrary lib(plg);
-    typedef void (*_coveragescanner_save)();
-    typedef void (*_coveragescanner_clear)();
-    typedef void (*_coveragescanner_testname)(const char*);
-    typedef void (*_coveragescanner_teststate)(const char*);
-    _coveragescanner_save coveragescanner_save=(_coveragescanner_save)lib.resolve("__coveragescanner_save");
-    _coveragescanner_testname coveragescanner_testname=(_coveragescanner_testname)lib.resolve("__coveragescanner_testname");
-    _coveragescanner_teststate coveragescanner_teststate=(_coveragescanner_teststate)lib.resolve("__coveragescanner_teststate");
-    _coveragescanner_clear coveragescanner_clear=(_coveragescanner_clear)lib.resolve("__coveragescanner_clear");
-
-    if (coveragescanner_testname)
-      coveragescanner_testname(test_name.toStdString().c_str());
-    else
-      qDebug() << "Plugin "<<plg<< ": __coveragescanner_testname() symbol not existing";
-    if (coveragescanner_teststate)
-    {
-      if (QTest::currentTestFailed())
-        coveragescanner_teststate("FAILED");
-      else
-        coveragescanner_teststate("PASSED") ;
-    }
-    else
-      qDebug() << "Plugin "<<plg<< ": __coveragescanner_teststate() symbol not existing";
-
-    if (coveragescanner_save)
-      coveragescanner_save();
-    else
-      qDebug() << "Plugin "<<plg<< ": __coveragescanner_save() symbol not existing";
-
-    if (coveragescanner_clear)
-      coveragescanner_clear();
-    else
-      qDebug() << "Plugin "<<plg<< ": __coveragescanner_clear() symbol not existing";
-  }
-  else
-    qDebug() << "Plugin "<<plg<< " is not existing";
-#else
-  Q_UNUSED(plg);
-#endif
-}
-
 void CoverageObject::cleanup()
 {
   cleanupTest();
   saveCoverageData();
-
-  saveCoverageData(QString::fromAscii(GRANTLEE_PLUGIN_PATH "/grantlee/0.2/grantlee_defaulttags.so"));
-  saveCoverageData(QString::fromAscii(GRANTLEE_PLUGIN_PATH "/grantlee/0.2/grantlee_defaultfilters.so"));
-  saveCoverageData(QString::fromAscii(GRANTLEE_PLUGIN_PATH "/grantlee/0.2/grantlee_loadertags.so"));
-  saveCoverageData(QString::fromAscii(GRANTLEE_PLUGIN_PATH "/grantlee/0.2/grantlee_i18ntags.so"));
 }
 
 #include "coverageobject.moc"
diff --git a/templates/tests/coverageobject.h b/templates/tests/coverageobject.h
@@ -12,7 +12,6 @@ class CoverageObject : public QObject
     void init() ;
     void cleanup();
   private:
-    void saveCoverageData(const QString &plg);
     void saveCoverageData();
     QString generateTestName() const;
 };

diff --git a/textdocument/tests/coverageobject.cpp b/textdocument/tests/coverageobject.cpp
@@ -15,7 +15,7 @@ void CoverageObject::cleanup()
 {
   cleanupTest();
 #ifdef __COVERAGESCANNER__
-  QString test_name=QString::fromAscii("unittest/");
+  QString test_name;
   test_name+=QString::fromAscii(metaObject()->className());
   test_name+=QString::fromAscii("/");
   test_name+=QString::fromAscii(QTest::currentTestFunction());