diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2014-12-14 08:24:32 -0500 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2014-12-14 08:24:32 -0500 |
| commit | e571839e140139a6a819077e94cf8cc01c13b29f (patch) | |
| tree | 8263635257cfb5ed979a584a958103b700bf31e7 /SQLiteStudio3/Tests | |
| parent | 407eac41f46936e3f346bb5a964a682e578b4237 (diff) | |
| parent | 89214766d8e3e7b8dd749a1fa18a5b9727f5010d (diff) | |
Merge tag 'upstream/3.0.0'
Upstream version 3.0.0
# gpg: Signature made Sun 14 Dec 2014 08:24:31 AM EST using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg: aka "Unit 193 <unit193@ninthfloor.org>"
# gpg: aka "Unit 193 <unit193@ubuntu.com>"
Diffstat (limited to 'SQLiteStudio3/Tests')
| -rw-r--r-- | SQLiteStudio3/Tests/ParserTest/tst_parsertest.cpp | 8 | ||||
| -rw-r--r-- | SQLiteStudio3/Tests/TestUtils/TestUtils.pro | 1 | ||||
| -rw-r--r-- | SQLiteStudio3/Tests/testdirs.pri | 2 |
3 files changed, 10 insertions, 1 deletions
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 |