diff --git a/test/tst_benckmark/tst_benchmark.cpp b/test/tst_benckmark/tst_benchmark.cpp index 2618f14..759b9b7 100644 --- a/test/tst_benckmark/tst_benchmark.cpp +++ b/test/tst_benckmark/tst_benchmark.cpp @@ -4,7 +4,7 @@ #include "consts.h" -#include "maintest.h" +#include "tst_benchmark.h" #include "query.h" #include "tableset.h" #include "tablemodel.h" diff --git a/test/tst_benckmark/maintest.h b/test/tst_benckmark/tst_benchmark.h similarity index 100% rename from test/tst_benckmark/maintest.h rename to test/tst_benckmark/tst_benchmark.h diff --git a/test/tst_benckmark/tst_benckmark.pro b/test/tst_benckmark/tst_benckmark.pro index 104ecda..48bd4f5 100644 --- a/test/tst_benckmark/tst_benckmark.pro +++ b/test/tst_benckmark/tst_benckmark.pro @@ -16,12 +16,12 @@ SOURCES += \ tst_benchmark.cpp HEADERS += \ - maintest.h \ ../common/consts.h \ ../common/comment.h \ ../common/post.h \ ../common/user.h \ ../common/weblogdatabase.h \ - ../common/score.h + ../common/score.h \ + tst_benchmark.h include($$PWD/../../ci-test-init.pri) diff --git a/test/tst_phrases/tst_phrases.cpp b/test/tst_phrases/tst_phrases.cpp index 4455330..d319c58 100644 --- a/test/tst_phrases/tst_phrases.cpp +++ b/test/tst_phrases/tst_phrases.cpp @@ -6,16 +6,16 @@ using namespace Nut; -MainTest::MainTest(QObject *parent) : QObject(parent) +PhrasesTest::PhrasesTest(QObject *parent) : QObject(parent) { } -void MainTest::initTestCase() +void PhrasesTest::initTestCase() { } -void MainTest::no1() +void PhrasesTest::no1() { FieldPhrase id("main", "id"); FieldPhrase name("main", "name"); @@ -24,7 +24,7 @@ void MainTest::no1() auto w = (id == 4 && name == "hi"); } -void MainTest::numeric() +void PhrasesTest::numeric() { FieldPhrase n("main", "int"); FieldPhrase f("main", "float"); @@ -55,7 +55,7 @@ void MainTest::numeric() auto p27 = n | f; } -void MainTest::string() +void PhrasesTest::string() { FieldPhrase str("main", "string"); @@ -66,7 +66,7 @@ void MainTest::string() auto p5 = str != "hi" && str.like("%s"); } -void MainTest::boolean() +void PhrasesTest::boolean() { FieldPhrase b("main", "bool"); @@ -79,7 +79,7 @@ void MainTest::boolean() QTEST_ASSERT(p3.data); } -void MainTest::datetime() +void PhrasesTest::datetime() { FieldPhrase time("main", "time"); FieldPhrase date("main", "date"); @@ -102,7 +102,7 @@ void MainTest::datetime() // QTEST_ASSERT(!pi2.data); } -void MainTest::extra() +void PhrasesTest::extra() { FieldPhrase url("main", "url"); @@ -110,7 +110,7 @@ void MainTest::extra() auto p2 = url == "http://google.com"; } -void MainTest::mix() +void PhrasesTest::mix() { FieldPhrase id("", ""); FieldPhrase name("", ""); @@ -126,29 +126,29 @@ void MainTest::mix() order_by(id | !name); } -void MainTest::select(const PhraseList &ph) +void PhrasesTest::select(const PhraseList &ph) { QTEST_ASSERT(ph.data.count()); } -void MainTest::where(const ConditionalPhrase &ph) +void PhrasesTest::where(const ConditionalPhrase &ph) { QTEST_ASSERT(ph.data); } -void MainTest::update(const AssignmentPhraseList &p) +void PhrasesTest::update(const AssignmentPhraseList &p) { QTEST_ASSERT(p.data.count()); } -void MainTest::insert(const AssignmentPhraseList &p) +void PhrasesTest::insert(const AssignmentPhraseList &p) { QTEST_ASSERT(p.data.count()); } -void MainTest::order_by(const PhraseList &ph) +void PhrasesTest::order_by(const PhraseList &ph) { QTEST_ASSERT(ph.data.count()); } -QTEST_MAIN(MainTest) +QTEST_MAIN(PhrasesTest) diff --git a/test/tst_phrases/tst_phrases.h b/test/tst_phrases/tst_phrases.h index 308fa85..fe0c825 100644 --- a/test/tst_phrases/tst_phrases.h +++ b/test/tst_phrases/tst_phrases.h @@ -12,12 +12,12 @@ class PhraseList; class AssignmentPhraseList; class ConditionalPhrase; } -class MainTest : public QObject +class PhrasesTest : public QObject { Q_OBJECT public: - explicit MainTest(QObject *parent = nullptr); + explicit PhrasesTest(QObject *parent = nullptr); signals: