From 6489d7bad433652fb100e852ce0f653b5fb89af0 Mon Sep 17 00:00:00 2001
From: Hamed Masafi <hamed.masafi@gmail.com>
Date: Tue, 26 Feb 2019 23:38:31 +0330
Subject: [PATCH] another test for travis

---
 src/phrases/abstractfieldphrase.cpp |  2 +-
 src/phrases/abstractfieldphrase.h   |  2 +-
 test/common/nut-lib.pri             |  3 +--
 test/tst_phrases/tst_phrases.cpp    | 16 ++++++++++------
 test/tst_phrases/tst_phrases.h      |  1 +
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/phrases/abstractfieldphrase.cpp b/src/phrases/abstractfieldphrase.cpp
index c52b931..263b8e5 100644
--- a/src/phrases/abstractfieldphrase.cpp
+++ b/src/phrases/abstractfieldphrase.cpp
@@ -89,7 +89,7 @@ AbstractFieldPhraseOperatorField(<=, PhraseData::LessEqual)
 AbstractFieldPhraseOperatorField(> , PhraseData::Greater)
 AbstractFieldPhraseOperatorField(>=, PhraseData::GreaterEqual)
 
-AbstractFieldPhrase AbstractFieldPhrase::operator !()
+AbstractFieldPhrase AbstractFieldPhrase::operator ~()
 {
     AbstractFieldPhrase f(data->className, data->fieldName);
     f.data->isNot = !data->isNot;
diff --git a/src/phrases/abstractfieldphrase.h b/src/phrases/abstractfieldphrase.h
index 72b18d4..0078fe6 100644
--- a/src/phrases/abstractfieldphrase.h
+++ b/src/phrases/abstractfieldphrase.h
@@ -56,7 +56,7 @@ public:
     ConditionalPhrase operator <=(const AbstractFieldPhrase &other);
     ConditionalPhrase operator >=(const AbstractFieldPhrase &other);
 
-    AbstractFieldPhrase operator !();
+    AbstractFieldPhrase operator ~();
     AssignmentPhrase operator =(const QVariant &other);
     AssignmentPhrase operator =(const ConditionalPhrase &other);
     AssignmentPhrase operator <<(const QVariant &other);
diff --git a/test/common/nut-lib.pri b/test/common/nut-lib.pri
index d7bae5a..af4f957 100644
--- a/test/common/nut-lib.pri
+++ b/test/common/nut-lib.pri
@@ -3,8 +3,7 @@ win32 {
     CONFIG(debug,debug|release):   LIBDIR = $$absolute_path($$OUT_PWD/../../src/debug)
     CONFIG(release,debug|release): LIBDIR = $$absolute_path($$OUT_PWD/../../src/release)
 } else {
-    CONFIG(debug,debug|release):   LIBDIR = $$absolute_path($$OUT_PWD/../../debug)
-    CONFIG(release,debug|release): LIBDIR = $$absolute_path($$OUT_PWD/../../release)
+    LIBDIR = $$absolute_path($$OUT_PWD/../../src)
 }
 LIBS += -L$$LIBDIR -lnut
 
diff --git a/test/tst_phrases/tst_phrases.cpp b/test/tst_phrases/tst_phrases.cpp
index ba5e0d2..e1ebd69 100644
--- a/test/tst_phrases/tst_phrases.cpp
+++ b/test/tst_phrases/tst_phrases.cpp
@@ -117,29 +117,33 @@ void MainTest::mix()
     FieldPhrase<QString> lastName("", "");
     FieldPhrase<QDate> birthDate("", "");
 
+    select(id);
     select(id | name | lastName);
-//    update((name = "john") | (lastName = "snow"));
-
+    update((name = "john") & (lastName = "snow"));
+    insert(id = 0);
+    insert((id = 4) & (name = "john"));
+    order_by(id);
+    order_by(id | ~name);
 }
 
 void MainTest::select(const PhraseList &ph)
 {
-
+    QTEST_ASSERT(ph.data.count());
 }
 
 void MainTest::where(const ConditionalPhrase &ph)
 {
-
+    QTEST_ASSERT(ph.data);
 }
 
 void MainTest::update(const AssignmentPhraseList &p)
 {
-
+    QTEST_ASSERT(p.data.count());
 }
 
 void MainTest::insert(const AssignmentPhraseList &p)
 {
-
+    QTEST_ASSERT(p.data.count());
 }
 
 void MainTest::order_by(const PhraseList &ph)
diff --git a/test/tst_phrases/tst_phrases.h b/test/tst_phrases/tst_phrases.h
index 017cc55..308fa85 100644
--- a/test/tst_phrases/tst_phrases.h
+++ b/test/tst_phrases/tst_phrases.h
@@ -30,6 +30,7 @@ private slots:
     void boolean();
     void datetime();
     void extra();
+    void mix();
 
 private:
     void select(const Nut::PhraseList &ph);