Merge 1f5b9e1 into 8fed560

src/gui/mainwindow/mainwindow.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1440</width>
-    <height>720</height>
+    <width>1247</width>
+    <height>691</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -21,6 +21,12 @@
    <layout class="QGridLayout" name="gridLayout_2">
     <item row="0" column="0">
      <widget class="QStackedWidget" name="stackedWidget">
+      <property name="minimumSize">
+       <size>
+        <width>300</width>
+        <height>0</height>
+       </size>
+      </property>
       <property name="currentIndex">
        <number>2</number>
       </property>
@@ -462,7 +468,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>1440</width>
+     <width>1247</width>
      <height>20</height>
     </rect>
    </property>
@@ -536,7 +542,7 @@
   <widget class="QDockWidget" name="dockCustomerData">
    <property name="minimumSize">
     <size>
-     <width>270</width>
+     <width>250</width>
      <height>70</height>
     </size>
    </property>

src/utils/directories.cpp

@@ -16,7 +16,6 @@ throw(Exceptions::FileException*)
                         directory.currentPath(),
                         1.1);
         }
-
     }
     directory.setPath(path + "/" + folder);
     return path + "/" + folder;

tests/models/contributorylisttest.cpp

@@ -163,3 +163,25 @@ void ContributoryListTest::getQuantityOfProjectTest()
 
 }
 
+void ContributoryListTest::testMonthQuantity()
+{
+    Project* p = new Project(4);
+    Contributory c;
+    c.setQuantity(40);
+    c.setUnit(Unit(MONTH));
+    c.setProject(p);
+
+    QVERIFY(c.getUnit() == Unit(MONTH));
+}
+
+void ContributoryListTest::testDifferentUnit()
+{
+    Project* p = new Project(4);
+    Contributory c;
+    c.setQuantity(40);
+    c.setUnit(Unit(MONTH));
+    c.setProject(p);
+
+    QCOMPARE(true, c.getUnit() != Unit(HOUR));
+}
+

tests/models/contributorylisttest.h

@@ -19,6 +19,9 @@ private slots:
 
     void getQuantityTest();
     void getQuantityOfProjectTest();
+
+    void testMonthQuantity();
+    void testDifferentUnit();
 private:
     void setup();
 

tests/models/searchtest.cpp

@@ -144,6 +144,36 @@ void searchTest::searchBillOrQuoteNumber()
     }
 }
 
+void searchTest::searchGetTests()
+{
+    _search.setText("test");
+    QVERIFY(_search.getText() == "test");
+
+    _search.setSearchInBillsQuotes(true);
+    QCOMPARE(true, _search.getSearchInBillsQuotes());
+    _search.setSearchInCompanies(true);
+    QCOMPARE(true, _search.getSearchInCompanies());
+    _search.setSearchInContributories(true);
+    QCOMPARE(true, _search.searchInContributories());
+    _search.setSearchInProjects(true);
+    QCOMPARE(true, _search.getSearchInProjects());
+    _search.setSearchInReferentLastname(true);
+    QCOMPARE(true, _search.getSearchInReferentLastname());
+
+    _search.setSearchInBillsQuotes(false);
+    QCOMPARE(false, _search.getSearchInBillsQuotes());
+    _search.setSearchInCompanies(false);
+    QCOMPARE(false, _search.getSearchInCompanies());
+    _search.setSearchInContributories(false);
+    QCOMPARE(false, _search.searchInContributories());
+    _search.setSearchInProjects(false);
+    QCOMPARE(false, _search.getSearchInProjects());
+    _search.setSearchInReferentLastname(false);
+    QCOMPARE(false, _search.getSearchInReferentLastname());
+
+
+}
+
 void searchTest::searchWithoutFilters()
 {
     _search.setGroupFilter(true);

tests/models/searchtest.h

@@ -24,6 +24,7 @@ private slots:
     void searchContributoryDescription();
     void searchBillOrQuoteTitle();
     void searchBillOrQuoteNumber();
+    void searchGetTests();
 private:
     Search _search;
 };

tests/tests.pro

@@ -38,7 +38,8 @@ database/customerdatabasetest.h \
     models/contributorylisttest.h \
     utils/pointerstest.h \
     models/statisticmodeltest.h \
-    utils/hierarchicalsystemtest.h
+    utils/hierarchicalsystemtest.h \
+    utils/directoriestests.h
 
 SOURCES += \
     #QTestRunner/main.cpp \
@@ -64,7 +65,8 @@ database/customerdatabasetest.cpp \
     main.cpp \
     utils/pointerstest.cpp \
     models/statisticmodeltest.cpp \
-    utils/hierarchicalsystemtest.cpp
+    utils/hierarchicalsystemtest.cpp \
+    utils/directoriestests.cpp
 
 RESOURCES += \
     test.qrc

tests/utils/directoriestests.cpp

@@ -0,0 +1,55 @@
+#include "directoriestests.h"
+#include "exceptions/fileexception.h"
+#include <QException>
+
+DirectoriesTests::DirectoriesTests()
+{
+
+}
+
+DirectoriesTests::~DirectoriesTests()
+{
+
+}
+
+void DirectoriesTests::validDirectoriesTest() {
+    Models::User user(1);
+    QString path;
+    QString folder;
+    QDir directory;
+    path = user.getWorkspacePath();
+    folder = user.getWorkspaceName();
+    directory.setPath(path);
+    path = Utils::Directories::makeDirectory(directory, path, folder);
+    QVERIFY("/home/florent/Documents/FactDev" == path);
+}
+
+void DirectoriesTests::invalidDirectoriesTest() {
+    Models::User user(1);
+    QString path;
+    QString path2;
+    QString folder;
+    QDir directory;
+    path = user.getWorkspacePath();
+    folder = "/./";
+    directory.setPath(path);
+    try {
+        path2 = Utils::Directories::makeDirectory(directory, path, folder);
+        if ( (path + "/" + folder) == path2) {
+            throw new Exceptions::FileException(
+                        "Impossible de créer le répertoire de travail",
+                        "makeDirectory::" + path + "/" + folder,
+                        directory.currentPath(),
+                        1.1);
+        }
+        QFAIL("Exception not thrown");
+    } catch (Exceptions::FileException*) {
+        QVERIFY(true);
+    } catch (const std::exception& e) {
+        QVERIFY(true);
+    }
+
+
+
+}
+

tests/utils/directoriestests.h

@@ -0,0 +1,20 @@
+#ifndef DIRECTORIESTESTS_H
+#define DIRECTORIESTESTS_H
+#include "QTestRunner/testrunner.h"
+#include "models/user.h"
+#include "utils/directories.h"
+
+class DirectoriesTests : public QObject
+{
+    Q_OBJECT
+public:
+    DirectoriesTests();
+    ~DirectoriesTests();
+private slots:
+    void validDirectoriesTest();
+    void invalidDirectoriesTest();
+};
+
+DECLARE_TEST(DirectoriesTests)
+
+#endif // DIRECTORIESTESTS_H