From 89214766d8e3e7b8dd749a1fa18a5b9727f5010d Mon Sep 17 00:00:00 2001
From: Unit 193 <unit193@ubuntu.com>
Date: Sun, 14 Dec 2014 08:24:26 -0500
Subject: Imported Upstream version 3.0.0

---
 SQLiteStudio3/Tests/ParserTest/tst_parsertest.cpp | 8 ++++++++
 SQLiteStudio3/Tests/TestUtils/TestUtils.pro       | 1 +
 SQLiteStudio3/Tests/testdirs.pri                  | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'SQLiteStudio3/Tests')

diff --git a/SQLiteStudio3/Tests/ParserTest/tst_parsertest.cpp b/SQLiteStudio3/Tests/ParserTest/tst_parsertest.cpp
index 5eb96a8..b34f11e 100644
--- a/SQLiteStudio3/Tests/ParserTest/tst_parsertest.cpp
+++ b/SQLiteStudio3/Tests/ParserTest/tst_parsertest.cpp
@@ -35,6 +35,7 @@ class ParserTest : public QObject
         void testInsertError();
         void testExpr();
         void testCommentBeginMultiline();
+        void testBetween();
         void initTestCase();
         void cleanupTestCase();
 };
@@ -338,6 +339,13 @@ void ParserTest::testCommentBeginMultiline()
     QVERIFY(tokens[0]->type == Token::COMMENT);
 }
 
+void ParserTest::testBetween()
+{
+    QString sql = "SELECT * FROM test WHERE a BETWEEN 1 and 2";
+    bool res = parser3->parse(sql);
+    QVERIFY(res);
+}
+
 void ParserTest::initTestCase()
 {
     initKeywords();
diff --git a/SQLiteStudio3/Tests/TestUtils/TestUtils.pro b/SQLiteStudio3/Tests/TestUtils/TestUtils.pro
index 26600e1..f448ccb 100644
--- a/SQLiteStudio3/Tests/TestUtils/TestUtils.pro
+++ b/SQLiteStudio3/Tests/TestUtils/TestUtils.pro
@@ -47,6 +47,7 @@ unix:!symbian {
 }
 
 LIBS += -lcoreSQLiteStudio -lsqlite3
+LIBS -= -lTestUtils
 
 OTHER_FILES += \
     test_common.pri
diff --git a/SQLiteStudio3/Tests/testdirs.pri b/SQLiteStudio3/Tests/testdirs.pri
index 7e35f8d..131bd4d 100644
--- a/SQLiteStudio3/Tests/testdirs.pri
+++ b/SQLiteStudio3/Tests/testdirs.pri
@@ -1,4 +1,4 @@
-LIBS += -L$$PWD/../output/SQLiteStudio
+LIBS += -L$$PWD/../$$OUTPUT_DIR_NAME/SQLiteStudio
 
 INCLUDEPATH += $$PWD/TestUtils
 DEPENDPATH += $$PWD/TestUtils
-- 
cgit v1.2.3