[Piklab-svn] SF.net SVN: piklab:[2969] trunk/piklab_kde4

[<az...@us...>]

Revision: 2969
          http://piklab.svn.sourceforge.net/piklab/?rev=2969&view=rev
Author:   azhyd
Date:     2012-10-16 04:22:22 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
more work on test

Modified Paths:
--------------
    trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp
    trunk/piklab_kde4/src/piklab-test/gui/build_check.h
    trunk/piklab_kde4/test/sdcc/usart_lib/usart_lib.piklab

Modified: trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp
===================================================================
--- trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp	2012-10-16 04:15:18 UTC (rev 2968)
+++ trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp	2012-10-16 04:22:22 UTC (rev 2969)
@@ -55,17 +55,16 @@
   for (uint i = 0; DATA[index].extensions[i] != NULL; ++i) {
     _extensions.append(DATA[index].extensions[i]);
   }
+  _testDir = PURL::currentDirectory().down("../../../../test/" + _dir + "/" + _project);
+  if (!_testDir.exists()) {
+    _testDir = PURL::currentDirectory().down("../../../test/" + _dir + "/" + _project);
+  }
   return true;
 }
 
-PURL::Directory BuildCheck::testDir() const
-{
-  return PURL::currentDirectory().down("../../../../test/" + _dir + "/" + _project);
-}
-
 PURL::Url BuildCheck::getUrl(const QString& filename) const
 {
-  return PURL::Url(testDir(), filename);
+  return PURL::Url(_testDir, filename);
 }
 
 void BuildCheck::checkFilesExist(bool exists) const
@@ -73,16 +72,16 @@
   for (QStringList::const_iterator it = _sources.begin(); it != _sources.end(); ++it) {
     for (QStringList::const_iterator it2 = _objExtensions.begin(); it2 != _objExtensions.end(); ++it2) {
       if (!exists) {
-        PURL::Url url = PURL::Url(testDir(), *it).toExtension(*it2);
+        PURL::Url url = PURL::Url(_testDir, *it).toExtension(*it2);
         QVERIFY2(url.exists() == exists, url.pretty().latin1());
       }
       QString filename = PURL::Url(PURL::Directory(), *it).filename();
-      PURL::Url url = PURL::Url(testDir(), filename).toExtension(*it2);
+      PURL::Url url = PURL::Url(_testDir, filename).toExtension(*it2);
       QVERIFY2(url.exists() == exists, url.pretty().latin1());
     }
   }
   for (QStringList::const_iterator it = _incFiles.begin(); it != _incFiles.end(); ++it) {
-    PURL::Url url = PURL::Url(testDir(), *it);
+    PURL::Url url = PURL::Url(_testDir, *it);
     QVERIFY2(url.exists(), url.pretty().latin1());
   }
   for (QStringList::const_iterator it = _extensions.begin(); it != _extensions.end(); ++it) {
@@ -102,7 +101,7 @@
 {
   closeProject();
   closeAllEditors();
-  QVERIFY(testDir().exists());
+  QVERIFY(_testDir.exists());
   PURL::Url url = getUrl(_project).toFileType(_projType);
   QVERIFY(url.exists());
   QVERIFY(MainWindow::self().openProject(url));

Modified: trunk/piklab_kde4/src/piklab-test/gui/build_check.h
===================================================================
--- trunk/piklab_kde4/src/piklab-test/gui/build_check.h	2012-10-16 04:15:18 UTC (rev 2968)
+++ trunk/piklab_kde4/src/piklab-test/gui/build_check.h	2012-10-16 04:22:22 UTC (rev 2969)
@@ -30,13 +30,13 @@
   private:
     QString _dir;
     QString _project;
+    PURL::Directory _testDir;
     PURL::FileType _projType;
     QStringList _sources;
     QStringList _incFiles;
     QStringList _objExtensions;
     QStringList _extensions;
 
-    PURL::Directory testDir() const;
     PURL::Url getUrl(const QString& filename) const;
     void checkFilesExist(bool exists) const;
     void closeProject();

Modified: trunk/piklab_kde4/test/sdcc/usart_lib/usart_lib.piklab
===================================================================
--- trunk/piklab_kde4/test/sdcc/usart_lib/usart_lib.piklab	2012-10-16 04:15:18 UTC (rev 2968)
+++ trunk/piklab_kde4/test/sdcc/usart_lib/usart_lib.piklab	2012-10-16 04:22:22 UTC (rev 2969)
@@ -9,6 +9,9 @@
     <description/>
     <version>0.1</version>
     <output_type>library</output_type>
+    <opened_files>
+      <item>usart_test.c</item>
+    </opened_files>
   </general>
   <compiler>
     <has_custom_arguments>false</has_custom_arguments>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.