add test for QgsFilePickerWidget

qgis · Jan 13, 2016 · 488b41f · 488b41f
1 parent cc9f000
commit 488b41f
Show file tree

Hide file tree

Showing 5 changed files with 101 additions and 4 deletions.
diff --git a/src/gui/editorwidgets/qgsexternalresourcewidgetwrapper.cpp b/src/gui/editorwidgets/qgsexternalresourcewidgetwrapper.cpp
@@ -82,6 +82,7 @@ void QgsExternalResourceWidgetWrapper::initWidget( QWidget* editor )
 
   if ( mQgsWidget )
   {
+    mQgsWidget->filePickerwidget()->setStorageMode( QgsFilePickerWidget::File );
     if ( config().contains( "UseLink" ) )
     {
       mQgsWidget->filePickerwidget()->setUseLink( config( "UseLink" ).toBool() );

diff --git a/src/gui/qgsfilepickerwidget.cpp b/src/gui/qgsfilepickerwidget.cpp
@@ -249,12 +249,17 @@ QString QgsFilePickerWidget::relativePath( QString filePath, bool removeRelative
   {
     RelativePath = QDir::toNativeSeparators( QDir::cleanPath( mDefaultRoot ) );
   }
+
   if ( !RelativePath.isEmpty() )
   {
     if ( removeRelative )
+    {
       return QDir::cleanPath( QDir( RelativePath ).relativeFilePath( filePath ) );
+    }
     else
+    {
       return QDir::cleanPath( QDir( RelativePath ).filePath( filePath ) );
+    }
   }
 
   return filePath;

diff --git a/src/gui/qgsfilepickerwidget.h b/src/gui/qgsfilepickerwidget.h
@@ -122,6 +122,8 @@ class GUI_EXPORT QgsFilePickerWidget : public QWidget
 
     //! Returns a filePath with relative path options applied (or not) !
     QString relativePath( QString filePath, bool removeRelative ) const;
+
+    friend class TestQgsFilePickerWidget;
 };
 
 #endif // QGSFILEPICKERWIDGET_H
diff --git a/tests/src/gui/CMakeLists.txt b/tests/src/gui/CMakeLists.txt
@@ -121,12 +121,14 @@ ADD_QGIS_TEST(zoomtest testqgsmaptoolzoom.cpp)
 #ADD_EXECUTABLE(qgis_rendererv2gui ${rendererv2gui_SRCS} ${rendererv2gui_MOC_SRCS})
 
 #ADD_QGIS_TEST(histogramtest testqgsrasterhistogram.cpp)
+ADD_QGIS_TEST(doublespinbox testqgsdoublespinbox.cpp)
+ADD_QGIS_TEST(dualviewtest testqgsdualview.cpp )
+ADD_QGIS_TEST(filepickerwidget testqgsfilepickerwidget.cpp )
+ADD_QGIS_TEST(mapcanvastest testqgsmapcanvas.cpp )
 ADD_QGIS_TEST(projectionissues testprojectionissues.cpp)
 ADD_QGIS_TEST(qgsguitest testqgsgui.cpp)
+ADD_QGIS_TEST(rubberbandtest testqgsrubberband.cpp )
 ADD_QGIS_TEST(scalecombobox testqgsscalecombobox.cpp)
-ADD_QGIS_TEST(dualviewtest testqgsdualview.cpp )
-ADD_QGIS_TEST(doublespinbox testqgsdoublespinbox.cpp)
 ADD_QGIS_TEST(spinbox testqgsspinbox.cpp)
-ADD_QGIS_TEST(rubberbandtest testqgsrubberband.cpp )
-ADD_QGIS_TEST(mapcanvastest testqgsmapcanvas.cpp )
+
 
diff --git a/tests/src/gui/testqgsfilepickerwidget.cpp b/tests/src/gui/testqgsfilepickerwidget.cpp
@@ -0,0 +1,87 @@
+/***************************************************************************
+    testqgsdoublespinbox.cpp
+     --------------------------------------
+    Date                 : December 2014
+    Copyright            : (C) 2014 Nyall Dawson
+    Email                : nyall dot dawson at gmail dot com
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+
+#include <QtTest/QtTest>
+
+#include "qgsfilepickerwidget.h"
+
+class TestQgsFilePickerWidget: public QObject
+{
+    Q_OBJECT
+  private slots:
+    void initTestCase(); // will be called before the first testfunction is executed.
+    void cleanupTestCase(); // will be called after the last testfunction was executed.
+    void init(); // will be called before each testfunction is executed.
+    void cleanup(); // will be called after every testfunction.
+
+    void relativePath();
+    void toUrl();
+
+};
+
+void TestQgsFilePickerWidget::initTestCase()
+{
+
+}
+
+void TestQgsFilePickerWidget::cleanupTestCase()
+{
+}
+
+void TestQgsFilePickerWidget::init()
+{
+}
+
+void TestQgsFilePickerWidget::cleanup()
+{
+}
+
+void TestQgsFilePickerWidget::relativePath()
+{
+  QgsFilePickerWidget* w = new QgsFilePickerWidget();
+  w->setDefaultRoot( "/home/test" );
+  w->setRelativeStorage( QgsFilePickerWidget::Absolute );
+  QCOMPARE( w->relativePath( "/home/test2/file1.ext", true ), QString( "/home/test2/file1.ext" ) );
+  QCOMPARE( w->relativePath( "/home/test2/file2.ext", false ), QString( "/home/test2/file2.ext" ) );
+  w->setRelativeStorage( QgsFilePickerWidget::RelativeDefaultPath );
+  QCOMPARE( w->relativePath( "/home/test2/file3.ext", true ), QString( "../test2/file3.ext" ) );
+  QCOMPARE( w->relativePath( "../test2/file4.ext", true ), QString( "../test2/file4.ext" ) );
+  QCOMPARE( w->relativePath( "/home/test2/file5.ext", false ), QString( "/home/test2/file5.ext" ) );
+  QCOMPARE( w->relativePath( "../test2/file6.ext", false ), QString( "/home/test2/file6.ext" ) );
+}
+
+void TestQgsFilePickerWidget::toUrl()
+{
+  QgsFilePickerWidget* w = new QgsFilePickerWidget();
+  w->setDefaultRoot( "/home/test" );
+  w->setRelativeStorage( QgsFilePickerWidget::Absolute );
+  w->setFullUrl( true );
+  QCOMPARE( w->toUrl( "/home/test2/file1.ext" ), QString( "<a href=\"file:///home/test2/file1.ext\">/home/test2/file1.ext</a>" ) );
+  w->setFullUrl( false );
+  QCOMPARE( w->toUrl( "/home/test2/file2.ext" ), QString( "<a href=\"file:///home/test2/file2.ext\">file2.ext</a>" ) );
+  w->setRelativeStorage( QgsFilePickerWidget::RelativeDefaultPath );
+  w->setFullUrl( true );
+  QCOMPARE( w->toUrl( "/home/test2/file3.ext" ), QString( "<a href=\"file:///home/test2/file3.ext\">/home/test2/file3.ext</a>" ) );
+  QCOMPARE( w->toUrl( "../test2/file4.ext" ), QString( "<a href=\"file:///home/test2/file4.ext\">../test2/file4.ext</a>" ) );
+  w->setFullUrl( false );
+  QCOMPARE( w->toUrl( "/home/test2/file5.ext" ), QString( "<a href=\"file:///home/test2/file5.ext\">file5.ext</a>" ) );
+  QCOMPARE( w->toUrl( "../test2/file6.ext" ), QString( "<a href=\"file:///home/test2/file6.ext\">file6.ext</a>" ) );
+}
+
+
+
+QTEST_MAIN( TestQgsFilePickerWidget )
+#include "testqgsfilepickerwidget.moc"