Skip to content

Commit

Permalink
Rename GObject type names of mock classes
Browse files Browse the repository at this point in the history 
According to a remark in PR #738 the lower case type name is changed.
Underscores should only be used between namespace and type name and
between type name and suffixes.
  • Loading branch information
Christian Gruber committed Sep 20, 2020
1 parent 41c147a commit 5408854
Show file tree
Hide file tree
Showing 9 changed files with 89 additions and 89 deletions.
2 changes: 1 addition & 1 deletion libgnucash/engine/mocks/fake-qofquery.cpp
View file
Expand Up @@ -119,7 +119,7 @@ void
qof_query_set_book (QofQuery *query, QofBook *book)
{
ASSERT_TRUE(queryPool.query_used(query));
ASSERT_TRUE(QOF_IS_MOCK_BOOK(book));
ASSERT_TRUE(QOF_IS_MOCKBOOK(book));
((QofFakeQuery*)query)->set_book(book);
}

Expand Down
22 changes: 11 additions & 11 deletions libgnucash/engine/mocks/gmock-Account.cpp
View file
Expand Up @@ -9,39 +9,39 @@ struct _MockAccountClass
};
typedef struct _MockAccountClass MockAccountClass;

G_DEFINE_TYPE(MockAccount, gnc_mock_account, QOF_TYPE_INSTANCE);
G_DEFINE_TYPE(MockAccount, gnc_mockaccount, QOF_TYPE_INSTANCE);

static void
gnc_mock_account_init (MockAccount *inst)
gnc_mockaccount_init (MockAccount *inst)
{
// function is unused, initialization is done in the MockAccount's C++ constructor
}

static void
gnc_mock_account_class_init(MockAccountClass *klass)
gnc_mockaccount_class_init(MockAccountClass *klass)
{
// function is unused, class functions are defined in C++ code
}

void
xaccAccountBeginEdit (Account *account)
{
ASSERT_TRUE(GNC_IS_MOCK_ACCOUNT(account));
ASSERT_TRUE(GNC_IS_MOCKACCOUNT(account));
((MockAccount*)account)->begin_edit();
}

void
xaccAccountCommitEdit (Account *account)
{
ASSERT_TRUE(GNC_IS_MOCK_ACCOUNT(account));
ASSERT_TRUE(GNC_IS_MOCKACCOUNT(account));
((MockAccount*)account)->commit_edit();
}

QofBook *
gnc_account_get_book(const Account *account)
{
EXPECT_TRUE(GNC_IS_MOCK_ACCOUNT(account));
if (GNC_IS_MOCK_ACCOUNT(account))
EXPECT_TRUE(GNC_IS_MOCKACCOUNT(account));
if (GNC_IS_MOCKACCOUNT(account))
return ((MockAccount*)account)->get_book();
else
return nullptr;
Expand All @@ -51,8 +51,8 @@ gint
xaccAccountForEachTransaction(const Account *acc, TransactionCallback proc,
void *data)
{
EXPECT_TRUE(GNC_IS_MOCK_ACCOUNT(acc));
if (GNC_IS_MOCK_ACCOUNT(acc))
EXPECT_TRUE(GNC_IS_MOCKACCOUNT(acc));
if (GNC_IS_MOCKACCOUNT(acc))
return ((MockAccount*)acc)->for_each_transaction(proc, data);
else
return 0;
Expand All @@ -61,8 +61,8 @@ xaccAccountForEachTransaction(const Account *acc, TransactionCallback proc,
GncImportMatchMap *
gnc_account_imap_create_imap (Account *acc)
{
EXPECT_TRUE(GNC_IS_MOCK_ACCOUNT(acc));
if (GNC_IS_MOCK_ACCOUNT(acc))
EXPECT_TRUE(GNC_IS_MOCKACCOUNT(acc));
if (GNC_IS_MOCKACCOUNT(acc))
return ((MockAccount*)acc)->create_imap();
else
return nullptr;
Expand Down
8 changes: 4 additions & 4 deletions libgnucash/engine/mocks/gmock-Account.h
View file
Expand Up @@ -10,10 +10,10 @@
#include "gmock-gobject.h"


GType gnc_mock_account_get_type(void);
GType gnc_mockaccount_get_type(void);

#define GNC_TYPE_MOCK_ACCOUNT (gnc_mock_account_get_type ())
#define GNC_IS_MOCK_ACCOUNT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNC_TYPE_MOCK_ACCOUNT))
#define GNC_TYPE_MOCKACCOUNT (gnc_mockaccount_get_type ())
#define GNC_IS_MOCKACCOUNT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNC_TYPE_MOCKACCOUNT))


// mock up for Account
Expand All @@ -26,7 +26,7 @@ class MockAccount : public Account
MockAccount() {}
void* operator new(size_t size)
{
return mock_g_object_new (GNC_TYPE_MOCK_ACCOUNT, NULL, size);
return mock_g_object_new (GNC_TYPE_MOCKACCOUNT, NULL, size);
}

// define separate free() function since destructor is protected
Expand Down
62 changes: 31 additions & 31 deletions libgnucash/engine/mocks/gmock-Split.cpp
View file
Expand Up @@ -12,16 +12,16 @@ struct _MockSplitClass
};
typedef struct _MockSplitClass MockSplitClass;

G_DEFINE_TYPE(MockSplit, gnc_mock_split, QOF_TYPE_INSTANCE);
G_DEFINE_TYPE(MockSplit, gnc_mocksplit, QOF_TYPE_INSTANCE);

static void
gnc_mock_split_init (MockSplit *inst)
gnc_mocksplit_init (MockSplit *inst)
{
// function is unused, initialization is done in the MockSplit's C++ constructor
}

static void
gnc_mock_split_class_init (MockSplitClass *klass)
gnc_mocksplit_class_init (MockSplitClass *klass)
{
// function is unused, class functions are defined in C++ code
}
Expand All @@ -30,8 +30,8 @@ gnc_mock_split_class_init (MockSplitClass *klass)
Split *
xaccMallocSplit (QofBook *book)
{
EXPECT_TRUE(QOF_IS_MOCK_BOOK(book));
if (QOF_IS_MOCK_BOOK(book))
EXPECT_TRUE(QOF_IS_MOCKBOOK(book));
if (QOF_IS_MOCKBOOK(book))
return ((QofMockBook*)book)->malloc_split();
else
return nullptr;
Expand All @@ -40,8 +40,8 @@ xaccMallocSplit (QofBook *book)
QofBook *
xaccSplitGetBook (const Split *split)
{
EXPECT_TRUE(GNC_IS_MOCK_SPLIT(split));
if (GNC_IS_MOCK_SPLIT(split))
EXPECT_TRUE(GNC_IS_MOCKSPLIT(split));
if (GNC_IS_MOCKSPLIT(split))
return ((MockSplit*)split)->get_book();
else
return nullptr;
Expand All @@ -50,8 +50,8 @@ xaccSplitGetBook (const Split *split)
Account *
xaccSplitGetAccount (const Split *split)
{
EXPECT_TRUE(GNC_IS_MOCK_SPLIT(split));
if (GNC_IS_MOCK_SPLIT(split))
EXPECT_TRUE(GNC_IS_MOCKSPLIT(split));
if (GNC_IS_MOCKSPLIT(split))
return ((MockSplit*)split)->get_account();
else
return nullptr;
Expand All @@ -60,16 +60,16 @@ xaccSplitGetAccount (const Split *split)
void
xaccSplitSetAccount (Split *split, Account *acc)
{
ASSERT_TRUE(GNC_IS_MOCK_SPLIT(split));
ASSERT_TRUE(GNC_IS_MOCK_ACCOUNT(acc));
ASSERT_TRUE(GNC_IS_MOCKSPLIT(split));
ASSERT_TRUE(GNC_IS_MOCKACCOUNT(acc));
((MockSplit*)split)->set_account(acc);
}

gnc_numeric
xaccSplitGetAmount (const Split *split)
{
EXPECT_TRUE(GNC_IS_MOCK_SPLIT(split));
if (GNC_IS_MOCK_SPLIT(split))
EXPECT_TRUE(GNC_IS_MOCKSPLIT(split));
if (GNC_IS_MOCKSPLIT(split))
return ((MockSplit*)split)->get_amount();
else
return gnc_numeric_zero();
Expand All @@ -78,15 +78,15 @@ xaccSplitGetAmount (const Split *split)
void
xaccSplitSetAmount (Split *split, gnc_numeric amt)
{
ASSERT_TRUE(GNC_IS_MOCK_SPLIT(split));
ASSERT_TRUE(GNC_IS_MOCKSPLIT(split));
((MockSplit*)split)->set_amount(amt);
}

gnc_numeric
xaccSplitGetValue (const Split *split)
{
EXPECT_TRUE(GNC_IS_MOCK_SPLIT(split));
if (GNC_IS_MOCK_SPLIT(split))
EXPECT_TRUE(GNC_IS_MOCKSPLIT(split));
if (GNC_IS_MOCKSPLIT(split))
return ((MockSplit*)split)->get_value();
else
return gnc_numeric_zero();
Expand All @@ -95,15 +95,15 @@ xaccSplitGetValue (const Split *split)
void
xaccSplitSetValue (Split *split, gnc_numeric val)
{
ASSERT_TRUE(GNC_IS_MOCK_SPLIT(split));
ASSERT_TRUE(GNC_IS_MOCKSPLIT(split));
((MockSplit*)split)->set_value(val);
}

const char *
xaccSplitGetMemo (const Split *split)
{
EXPECT_TRUE(GNC_IS_MOCK_SPLIT(split));
if (GNC_IS_MOCK_SPLIT(split))
EXPECT_TRUE(GNC_IS_MOCKSPLIT(split));
if (GNC_IS_MOCKSPLIT(split))
return ((MockSplit*)split)->get_memo();
else
return nullptr;
Expand All @@ -112,8 +112,8 @@ xaccSplitGetMemo (const Split *split)
char
xaccSplitGetReconcile (const Split *split)
{
EXPECT_TRUE(GNC_IS_MOCK_SPLIT(split));
if (GNC_IS_MOCK_SPLIT(split))
EXPECT_TRUE(GNC_IS_MOCKSPLIT(split));
if (GNC_IS_MOCKSPLIT(split))
return ((MockSplit*)split)->get_reconcile();
else
return VREC;
Expand All @@ -122,22 +122,22 @@ xaccSplitGetReconcile (const Split *split)
void
xaccSplitSetReconcile (Split *split, char recn)
{
ASSERT_TRUE(GNC_IS_MOCK_SPLIT(split));
ASSERT_TRUE(GNC_IS_MOCKSPLIT(split));
((MockSplit*)split)->set_reconcile(recn);
}

void
xaccSplitSetDateReconciledSecs (Split *split, time64 secs)
{
ASSERT_TRUE(GNC_IS_MOCK_SPLIT(split));
ASSERT_TRUE(GNC_IS_MOCKSPLIT(split));
((MockSplit*)split)->set_date_reconciled_secs(secs);
}

const char *
xaccSplitGetAction (const Split *split)
{
EXPECT_TRUE(GNC_IS_MOCK_SPLIT(split));
if (GNC_IS_MOCK_SPLIT(split))
EXPECT_TRUE(GNC_IS_MOCKSPLIT(split));
if (GNC_IS_MOCKSPLIT(split))
return ((MockSplit*)split)->get_action();
else
return nullptr;
Expand All @@ -146,8 +146,8 @@ xaccSplitGetAction (const Split *split)
Split *
xaccSplitGetOtherSplit (const Split *split)
{
EXPECT_TRUE(GNC_IS_MOCK_SPLIT(split));
if (GNC_IS_MOCK_SPLIT(split))
EXPECT_TRUE(GNC_IS_MOCKSPLIT(split));
if (GNC_IS_MOCKSPLIT(split))
return ((MockSplit*)split)->get_other_split();
else
return nullptr;
Expand All @@ -156,8 +156,8 @@ xaccSplitGetOtherSplit (const Split *split)
Transaction *
xaccSplitGetParent (const Split *split)
{
EXPECT_TRUE(GNC_IS_MOCK_SPLIT(split));
if (GNC_IS_MOCK_SPLIT(split))
EXPECT_TRUE(GNC_IS_MOCKSPLIT(split));
if (GNC_IS_MOCKSPLIT(split))
return ((MockSplit*)split)->get_parent();
else
return nullptr;
Expand All @@ -166,7 +166,7 @@ xaccSplitGetParent (const Split *split)
void
xaccSplitSetParent(Split *split, Transaction *trans)
{
ASSERT_TRUE(GNC_IS_MOCK_SPLIT(split));
ASSERT_TRUE(GNC_IS_MOCK_TRANSACTION(trans));
ASSERT_TRUE(GNC_IS_MOCKSPLIT(split));
ASSERT_TRUE(GNC_IS_MOCKTRANSACTION(trans));
((MockSplit*)split)->set_parent(trans);
}
8 changes: 4 additions & 4 deletions libgnucash/engine/mocks/gmock-Split.h
View file
Expand Up @@ -10,10 +10,10 @@
#include "gmock-gobject.h"


GType gnc_mock_split_get_type(void);
GType gnc_mocksplit_get_type(void);

#define GNC_TYPE_MOCK_SPLIT (gnc_mock_split_get_type ())
#define GNC_IS_MOCK_SPLIT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNC_TYPE_MOCK_SPLIT))
#define GNC_TYPE_MOCKSPLIT (gnc_mocksplit_get_type ())
#define GNC_IS_MOCKSPLIT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNC_TYPE_MOCKSPLIT))


// mock up for Split
Expand Down Expand Up @@ -46,7 +46,7 @@ class MockSplit : public Split
}
void* operator new(size_t size)
{
return mock_g_object_new (GNC_TYPE_MOCK_SPLIT, NULL, size);
return mock_g_object_new (GNC_TYPE_MOCKSPLIT, NULL, size);
}

// define separate free() function since destructor is protected
Expand Down

0 comments on commit 5408854

Please sign in to comment.