Messy commit. Testing suff and some improvements to how data is shown.
This commit is contained in:
parent
bebb3391c3
commit
3a13b7ffb4
59 changed files with 2045 additions and 716 deletions
73
tests/PgsqlTests/.gitignore
vendored
Normal file
73
tests/PgsqlTests/.gitignore
vendored
Normal file
|
|
@ -0,0 +1,73 @@
|
|||
# This file is used to ignore files which are generated
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
*~
|
||||
*.autosave
|
||||
*.a
|
||||
*.core
|
||||
*.moc
|
||||
*.o
|
||||
*.obj
|
||||
*.orig
|
||||
*.rej
|
||||
*.so
|
||||
*.so.*
|
||||
*_pch.h.cpp
|
||||
*_resource.rc
|
||||
*.qm
|
||||
.#*
|
||||
*.*#
|
||||
core
|
||||
!core/
|
||||
tags
|
||||
.DS_Store
|
||||
.directory
|
||||
*.debug
|
||||
Makefile*
|
||||
*.prl
|
||||
*.app
|
||||
moc_*.cpp
|
||||
ui_*.h
|
||||
qrc_*.cpp
|
||||
Thumbs.db
|
||||
*.res
|
||||
*.rc
|
||||
/.qmake.cache
|
||||
/.qmake.stash
|
||||
|
||||
# qtcreator generated files
|
||||
*.pro.user*
|
||||
|
||||
# xemacs temporary files
|
||||
*.flc
|
||||
|
||||
# Vim temporary files
|
||||
.*.swp
|
||||
|
||||
# Visual Studio generated files
|
||||
*.ib_pdb_index
|
||||
*.idb
|
||||
*.ilk
|
||||
*.pdb
|
||||
*.sln
|
||||
*.suo
|
||||
*.vcproj
|
||||
*vcproj.*.*.user
|
||||
*.ncb
|
||||
*.sdf
|
||||
*.opensdf
|
||||
*.vcxproj
|
||||
*vcxproj.*
|
||||
|
||||
# MinGW generated files
|
||||
*.Debug
|
||||
*.Release
|
||||
|
||||
# Python byte code
|
||||
*.pyc
|
||||
|
||||
# Binaries
|
||||
# --------
|
||||
*.dll
|
||||
*.exe
|
||||
|
||||
43
tests/PgsqlTests/PgsqlTests.pro
Normal file
43
tests/PgsqlTests/PgsqlTests.pro
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
include(gtest_dependency.pri)
|
||||
|
||||
TEMPLATE = app
|
||||
CONFIG += console c++11
|
||||
CONFIG -= app_bundle
|
||||
CONFIG += thread
|
||||
CONFIG += qt
|
||||
|
||||
QT += core
|
||||
|
||||
INCLUDEPATH += C:\prog\include C:\Prog\include\pgsql
|
||||
|
||||
HEADERS +=
|
||||
|
||||
SOURCES += main.cpp \
|
||||
tst_Value.cpp
|
||||
|
||||
|
||||
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../pgsql/release/ -lpgsql
|
||||
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../pgsql/debug/ -lpgsql
|
||||
else:unix: LIBS += -L$$OUT_PWD/../../pgsql/ -lpgsql
|
||||
|
||||
INCLUDEPATH += $$PWD/../../pgsql
|
||||
DEPENDPATH += $$PWD/../../pgsql
|
||||
|
||||
win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../pgsql/release/libpgsql.a
|
||||
else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../pgsql/debug/libpgsql.a
|
||||
else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../pgsql/release/pgsql.lib
|
||||
else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../pgsql/debug/pgsql.lib
|
||||
else:unix: PRE_TARGETDEPS += $$OUT_PWD/../../pgsql/libpgsql.a
|
||||
|
||||
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../mygtestutils/release/ -lmygtestutils
|
||||
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../mygtestutils/debug/ -lmygtestutils
|
||||
else:unix:!macx: LIBS += -L$$OUT_PWD/../mygtestutils/ -lmygtestutils
|
||||
|
||||
INCLUDEPATH += $$PWD/../mygtestutils
|
||||
DEPENDPATH += $$PWD/../mygtestutils
|
||||
|
||||
win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../mygtestutils/release/libmygtestutils.a
|
||||
else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../mygtestutils/debug/libmygtestutils.a
|
||||
else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../mygtestutils/release/mygtestutils.lib
|
||||
else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../mygtestutils/debug/mygtestutils.lib
|
||||
else:unix:!macx: PRE_TARGETDEPS += $$OUT_PWD/../mygtestutils/libmygtestutils.a
|
||||
29
tests/PgsqlTests/gtest_dependency.pri
Normal file
29
tests/PgsqlTests/gtest_dependency.pri
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
isEmpty(GOOGLETEST_DIR):GOOGLETEST_DIR=$$(GOOGLETEST_DIR)
|
||||
|
||||
isEmpty(GOOGLETEST_DIR) {
|
||||
warning("Using googletest src dir specified at Qt Creator wizard")
|
||||
message("set GOOGLETEST_DIR as environment variable or qmake variable to get rid of this message")
|
||||
GOOGLETEST_DIR = C:/Prog/googletest
|
||||
}
|
||||
|
||||
!isEmpty(GOOGLETEST_DIR): {
|
||||
GTEST_SRCDIR = $$GOOGLETEST_DIR/googletest
|
||||
GMOCK_SRCDIR = $$GOOGLETEST_DIR/googlemock
|
||||
}
|
||||
|
||||
requires(exists($$GTEST_SRCDIR):exists($$GMOCK_SRCDIR))
|
||||
|
||||
!exists($$GOOGLETEST_DIR):message("No googletest src dir found - set GOOGLETEST_DIR to enable.")
|
||||
|
||||
DEFINES += \
|
||||
GTEST_LANG_CXX11
|
||||
|
||||
INCLUDEPATH *= \
|
||||
$$GTEST_SRCDIR \
|
||||
$$GTEST_SRCDIR/include \
|
||||
$$GMOCK_SRCDIR \
|
||||
$$GMOCK_SRCDIR/include
|
||||
|
||||
SOURCES += \
|
||||
$$GTEST_SRCDIR/src/gtest-all.cc \
|
||||
$$GMOCK_SRCDIR/src/gmock-all.cc
|
||||
7
tests/PgsqlTests/main.cpp
Normal file
7
tests/PgsqlTests/main.cpp
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
#include <gtest/gtest.h>
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
::testing::InitGoogleTest(&argc, argv);
|
||||
return RUN_ALL_TESTS();
|
||||
}
|
||||
66
tests/PgsqlTests/tst_Value.cpp
Normal file
66
tests/PgsqlTests/tst_Value.cpp
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
#include <gtest/gtest.h>
|
||||
#include <gmock/gmock-matchers.h>
|
||||
#include "Pgsql_Value.h"
|
||||
#include "PrintTo_Qt.h"
|
||||
|
||||
using namespace testing;
|
||||
using namespace Pgsql;
|
||||
|
||||
TEST(Pgsql_Value, test_int4)
|
||||
{
|
||||
Pgsql::Value v("1", INT4OID);
|
||||
int i = (int)v;
|
||||
ASSERT_EQ(i, 1);
|
||||
}
|
||||
|
||||
TEST(Pgsql_Value, test_QDateTime)
|
||||
{
|
||||
Pgsql::Value v("2017-10-22 12:34:56", TIMESTAMPTZOID);
|
||||
QDateTime dt = (QDateTime)v;
|
||||
ASSERT_EQ(dt, QDateTime(QDate(2017, 10, 22), QTime(12, 34, 56)));
|
||||
}
|
||||
|
||||
|
||||
TEST(Pgsql_Value, test_QDateTime_2)
|
||||
{
|
||||
Pgsql::Value v("2017-12-01 09:38:17.339817+02", TIMESTAMPTZOID);
|
||||
QDateTime dt = (QDateTime)v;
|
||||
QDateTime exp(QDate(2017, 12, 1), QTime(9, 38, 17, 340),
|
||||
Qt::OffsetFromUTC, 2*3600);
|
||||
ASSERT_EQ(dt, exp);
|
||||
}
|
||||
|
||||
TEST(Pgsql_Value, test_QDate)
|
||||
{
|
||||
Pgsql::Value v("2017-10-22", DATEOID);
|
||||
QDate d = v;
|
||||
ASSERT_EQ(d, QDate(2017, 10, 22));
|
||||
}
|
||||
|
||||
TEST(Pgsql_Value, test_QTime)
|
||||
{
|
||||
Pgsql::Value v("12:34:56", TIMEOID);
|
||||
QTime t = v;
|
||||
ASSERT_EQ(t, QTime(12, 34, 56));
|
||||
}
|
||||
|
||||
TEST(Pgsql_Value, test_QTimeMS)
|
||||
{
|
||||
Pgsql::Value v("09:38:17.339817+02", TIMETZOID);
|
||||
QTime t = v;
|
||||
ASSERT_EQ(t, QTime(9, 38, 17, 340));
|
||||
}
|
||||
|
||||
|
||||
|
||||
TEST(Pgsql_Value, isString_int4)
|
||||
{
|
||||
Pgsql::Value v("1", INT4OID);
|
||||
ASSERT_EQ(v.isString(), false);
|
||||
}
|
||||
|
||||
TEST(Pgsql_Value, isString_varchar)
|
||||
{
|
||||
Pgsql::Value v("1", VARCHAROID);
|
||||
ASSERT_EQ(v.isString(), true);
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue