IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge Maarten Bosmans's 'memleak-fixes' into stable.

Browse Source
This commit is contained in:
John Ralls
2023-04-29 11:54:41 -07:00
parent 168765cf77 71802b5627
commit df878c6a3d
13 changed files with 109 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libgnucash/engine/kvp-value.cpp
View File

@@ -99,26 +99,6 @@ KvpValueImpl::get_type() const noexcept
return KvpValue::Type::INVALID;
}
KvpFrame *
KvpValueImpl::replace_frame_nc (KvpFrame * new_value) noexcept
{
if (datastore.type() != type_id<KvpFrame *>())
return {};
auto ret = boost::get<KvpFrame *>(datastore);
datastore = new_value;
return ret;
}
GList *
KvpValueImpl::replace_glist_nc (GList * new_value) noexcept
{
if (datastore.type() != type_id<GList *>())
return {};
auto ret = boost::get<GList *>(datastore);
datastore = new_value;
return ret;
}
struct to_string_visitor : boost::static_visitor<void>
{
std::ostringstream & output;

16
libgnucash/engine/kvp-value.hpp
View File

@@ -100,22 +100,6 @@ struct KvpValueImpl
*/
~KvpValueImpl() noexcept;
/**
* Replaces the frame within this KvpValueImpl.
*
* If this KvpValueImpl doesn't contain a KvpFrame, nullptr
* is returned. Otherwise, the old KvpFrame * is returned.
*/
KvpFrame * replace_frame_nc (KvpFrame *) noexcept;
/**
* Replaces the glist within this KvpValueImpl.
*
* If this KvpValueImpl doesn't contain a GList, nullptr
* is returned. Otherwise, the old GList * is returned.
*/
GList * replace_glist_nc (GList *) noexcept;
/**
* Adds another value to this KvpValueImpl.
*

55
libgnucash/engine/test/gtest-qofquerycore.cpp
View File

@@ -29,7 +29,19 @@
#include "../qofquerycore-p.h"
#include <gtest/gtest.h>
TEST(qof_query_construct_predicate, string)
class QofQueryCoreTest : public ::testing::Test {
protected:
QofQueryCoreTest() {
qof_query_core_init();
}
~QofQueryCoreTest() {
qof_query_core_shutdown();
}
};
TEST_F(QofQueryCoreTest, construct_predicate_string)
{
query_string_def *pdata;
pdata = (query_string_def*)qof_query_string_predicate(
@@ -43,9 +55,10 @@ TEST(qof_query_construct_predicate, string)
EXPECT_EQ (QOF_STRING_MATCH_NORMAL, pdata->options);
EXPECT_STREQ ("Test", pdata->matchstring);
EXPECT_EQ (FALSE, pdata->is_regex);
qof_query_core_predicate_free ((QofQueryPredData*) pdata);
}
TEST(qof_query_construct_predicate, date)
TEST_F(QofQueryCoreTest, construct_predicate_date)
{
query_date_def *pdata;
pdata = (query_date_def*)qof_query_date_predicate(
@@ -57,9 +70,10 @@ TEST(qof_query_construct_predicate, date)
EXPECT_EQ (QOF_COMPARE_LT, pdata->pd.how);
EXPECT_EQ (QOF_DATE_MATCH_DAY, pdata->options);
EXPECT_EQ (1524772012, pdata->date);
qof_query_core_predicate_free ((QofQueryPredData*) pdata);
}
TEST(qof_query_construct_predicate, numeric)
TEST_F(QofQueryCoreTest, construct_predicate_numeric)
{
query_numeric_def *pdata;
pdata = (query_numeric_def*)qof_query_numeric_predicate(
@@ -71,9 +85,10 @@ TEST(qof_query_construct_predicate, numeric)
EXPECT_EQ (QOF_COMPARE_LTE, pdata->pd.how);
EXPECT_EQ (QOF_NUMERIC_MATCH_CREDIT, pdata->options);
EXPECT_TRUE (gnc_numeric_eq({ 500, 100 }, pdata->amount));
qof_query_core_predicate_free ((QofQueryPredData*) pdata);
}
TEST(qof_query_construct_predicate, guid)
TEST_F(QofQueryCoreTest, construct_predicate_guid)
{
GncGUID *guid = guid_new();
GList *guidlist = g_list_prepend (NULL, guid);
@@ -86,9 +101,10 @@ TEST(qof_query_construct_predicate, guid)
EXPECT_EQ (QOF_GUID_MATCH_ANY, pdata->options);
EXPECT_TRUE (guid_equal (guid, (const GncGUID*)pdata->guids->data));
EXPECT_EQ (NULL, pdata->guids->next);
qof_query_core_predicate_free ((QofQueryPredData*) pdata);
}
TEST(qof_query_construct_predicate, int32)
TEST_F(QofQueryCoreTest, construct_predicate_int32)
{
query_int32_def *pdata;
pdata = (query_int32_def*)qof_query_int32_predicate(
@@ -98,9 +114,10 @@ TEST(qof_query_construct_predicate, int32)
EXPECT_STREQ (QOF_TYPE_INT32, pdata->pd.type_name);
EXPECT_EQ (QOF_COMPARE_EQUAL, pdata->pd.how);
EXPECT_EQ (-613, pdata->val);
qof_query_core_predicate_free ((QofQueryPredData*) pdata);
}
TEST(qof_query_construct_predicate, int64)
TEST_F(QofQueryCoreTest, query_construct_predicate_int64)
{
query_int64_def *pdata;
pdata = (query_int64_def*)qof_query_int64_predicate(
@@ -110,9 +127,10 @@ TEST(qof_query_construct_predicate, int64)
EXPECT_STREQ (QOF_TYPE_INT64, pdata->pd.type_name);
EXPECT_EQ (QOF_COMPARE_GT, pdata->pd.how);
EXPECT_EQ (1000000, pdata->val);
qof_query_core_predicate_free ((QofQueryPredData*) pdata);
}
TEST(qof_query_construct_predicate, double)
TEST_F(QofQueryCoreTest, construct_predicate_double)
{
query_double_def *pdata;
pdata = (query_double_def*)qof_query_double_predicate(
@@ -122,9 +140,10 @@ TEST(qof_query_construct_predicate, double)
EXPECT_STREQ (QOF_TYPE_DOUBLE, pdata->pd.type_name);
EXPECT_EQ (QOF_COMPARE_GTE, pdata->pd.how);
EXPECT_EQ (10.05, pdata->val);
qof_query_core_predicate_free ((QofQueryPredData*) pdata);
}
TEST(qof_query_construct_predicate, boolean)
TEST_F(QofQueryCoreTest, construct_predicate_boolean)
{
query_boolean_def *pdata;
pdata = (query_boolean_def*)qof_query_boolean_predicate(
@@ -134,9 +153,10 @@ TEST(qof_query_construct_predicate, boolean)
EXPECT_STREQ (QOF_TYPE_BOOLEAN, pdata->pd.type_name);
EXPECT_EQ (QOF_COMPARE_NEQ, pdata->pd.how);
EXPECT_EQ (TRUE, pdata->val);
qof_query_core_predicate_free ((QofQueryPredData*) pdata);
}
TEST(qof_query_construct_predicate, char)
TEST_F(QofQueryCoreTest, construct_predicate_char)
{
query_char_def *pdata;
pdata = (query_char_def*)qof_query_char_predicate(
@@ -147,11 +167,11 @@ TEST(qof_query_construct_predicate, char)
EXPECT_EQ (QOF_COMPARE_EQUAL, pdata->pd.how);
EXPECT_EQ (QOF_CHAR_MATCH_ANY, pdata->options);
EXPECT_STREQ ("Foo", pdata->char_list);
qof_query_core_predicate_free ((QofQueryPredData*) pdata);
}
TEST(qof_query_core_predicate_copy, date)
TEST_F(QofQueryCoreTest, date_predicate_copy)
{
qof_query_core_init();
query_date_def *pdata, *pdata2;
pdata = (query_date_def*)qof_query_date_predicate(
QOF_COMPARE_LT,
@@ -159,16 +179,16 @@ TEST(qof_query_core_predicate_copy, date)
1524772012
);
pdata2 = (query_date_def*) qof_query_core_predicate_copy ((QofQueryPredData*)pdata);
EXPECT_STREQ (pdata2->pd.type_name, pdata->pd.type_name);
EXPECT_EQ (pdata2->pd.how, pdata->pd.how);
EXPECT_EQ (pdata2->options, pdata->options);
EXPECT_EQ (pdata2->date, pdata->date);
qof_query_core_predicate_free ((QofQueryPredData*) pdata);
qof_query_core_predicate_free ((QofQueryPredData*) pdata2);
}
TEST(qof_query_core_predicate_get_date, date)
TEST_F(QofQueryCoreTest, date_predicate_get_date)
{
qof_query_core_init();
time64 date;
QofQueryPredData *pdata;
pdata = qof_query_date_predicate(
@@ -176,14 +196,13 @@ TEST(qof_query_core_predicate_get_date, date)
QOF_DATE_MATCH_DAY,
1524772012
);
EXPECT_TRUE (qof_query_date_predicate_get_date(pdata, &date));
EXPECT_EQ (1524772012, date);
qof_query_core_predicate_free (pdata);
}
TEST(qof_query_core_predicate_get_date, numeric)
TEST_F(QofQueryCoreTest, numeric_predicate_get_date)
{
qof_query_core_init();
time64 date;
QofQueryPredData *pdata;
pdata = qof_query_numeric_predicate(
@@ -191,6 +210,6 @@ TEST(qof_query_core_predicate_get_date, numeric)
QOF_NUMERIC_MATCH_CREDIT,
{ 1000, 100 }
);
EXPECT_FALSE (qof_query_date_predicate_get_date(pdata, &date));
qof_query_core_predicate_free (pdata);
}

3
libgnucash/engine/test/test-account-object.cpp
View File

@@ -80,8 +80,7 @@ run_test (void)
/*****/
qof_session_end (sess);
qof_session_destroy (sess);
}
int

19
libgnucash/engine/test/test-guid.cpp
View File

@@ -28,9 +28,13 @@
#include <guid.hpp>
#include <glib.h>
#include <vector>
#include <memory>
#include <config.h>
#include <ctype.h>
#include "cashobjects.h"
#include "qofid.h"
#include "test-stuff.h"
#include "test-engine-stuff.h"
#include "qof.h"
@@ -50,13 +54,17 @@ static void test_null_guid(void)
guid_free(gp);
}
static void
free_entry (QofInstance* inst, void* data)
{
g_object_unref (G_OBJECT(inst));
}
static void
run_test (void)
{
int i;
QofSession *sess;
QofBook *book;
QofInstance *ent;
QofCollection *col;
QofIdType type;
GncGUID guid;
@@ -68,12 +76,10 @@ run_test (void)
col = qof_book_get_collection (book, "asdf");
type = qof_collection_get_type (col);
for (i = 0; i < NENT; i++)
for (int i = 0; i < NENT; i++)
{
ent = static_cast<QofInstance*>(g_object_new(QOF_TYPE_INSTANCE, NULL));
guid_replace(&guid);
ent = static_cast<QofInstance*>(g_object_new(QOF_TYPE_INSTANCE,
"guid", &guid, NULL));
auto ent = QOF_INSTANCE(g_object_new(QOF_TYPE_INSTANCE, "guid", &guid, NULL));
do_test ((NULL == qof_collection_lookup_entity (col, &guid)),
"duplicate guid");
ent->e_type = type;
@@ -83,6 +89,7 @@ run_test (void)
}
/* Make valgrind happy -- destroy the session. */
qof_collection_foreach(col, free_entry, nullptr);
qof_session_destroy(sess);
}

13
libgnucash/engine/test/test-kvp-value.cpp
View File

@@ -30,19 +30,6 @@
#include <memory>
#include <gtest/gtest.h>
TEST (KvpValueTest, Replace_Frame)
{
auto f1 = new KvpFrameImpl;
std::unique_ptr<KvpValueImpl> v1 {new KvpValueImpl {f1}};
auto f2 = new KvpFrameImpl;
EXPECT_EQ (f1, v1->replace_frame_nc (f2));
v1->set (5.2);
/*f1 and f2 should be deleted now*/
f1 = new KvpFrameImpl;
EXPECT_EQ (nullptr, v1->replace_frame_nc (f1));
delete f1;
}
TEST (KvpValueTest, Equality)
{
std::unique_ptr<KvpValueImpl> v1 {new KvpValueImpl { (int64_t)1}};

4
libgnucash/engine/test/test-lots.cpp
View File

@@ -79,7 +79,7 @@ test_lot_kvp ()
g_assert_cmpstr (gnc_lot_get_notes (lot), ==, NULL);
gnc_lot_destroy (lot);
qof_session_end (sess);
qof_session_destroy (sess);
}
static void
@@ -108,7 +108,7 @@ run_test (void)
* XXX not implemented
*/
success ("automatic lot scrubbing lightly tested and seem to work");
qof_session_end (sess);
qof_session_destroy (sess);
}

9
libgnucash/engine/test/test-query.cpp
View File

@@ -36,12 +36,12 @@ test_trans_query (Transaction *trans, gpointer data)
{
QofBook *book = QOF_BOOK(data);
GList *list;
QofQuery *q;
q = make_trans_query (trans, ALL_QT);
QofQuery *q = make_trans_query (trans, ALL_QT);
qof_query_set_book (q, book);
list = xaccQueryGetTransactions (q, QUERY_TXN_MATCH_ANY);
qof_query_destroy (q);
if (g_list_length (list) != 1)
{
failure_args ("test number returned", __FILE__, __LINE__,
@@ -59,7 +59,6 @@ test_trans_query (Transaction *trans, gpointer data)
}
success ("found right transaction");
qof_query_destroy (q);
g_list_free (list);
return 0;
@@ -80,7 +79,7 @@ run_test (void)
xaccAccountTreeForEachTransaction (root, test_trans_query, book);
qof_session_end (session);
qof_session_destroy (session);
}
int