Skip to content

Commit 589affd

Browse files
Neko-Box-CoderNeko-Box-Coder
committed
Updating to latest CppOverride, excluding ConfigParsingTest
1 parent c30dd0b commit 589affd

File tree

10 files changed

+658
-818
lines changed

10 files changed

+658
-818
lines changed

‎External/CppOverride‎

Submodule CppOverride updated 87 files

‎Include/Tests/BuildsManager/MockComponents.hpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@ namespace ghc
1717
{
1818
namespace filesystem
1919
{
20-
CO_OVERRIDE_METHOD( OverrideInstance,
20+
CO_INSERT_METHOD( OverrideInstance,
2121
bool,
2222
Mock_exists,
2323
(const path&, std::error_code&),
2424
/* no prepend */,
2525
noexcept)
2626

27-
CO_OVERRIDE_METHOD( OverrideInstance,
27+
CO_INSERT_METHOD( OverrideInstance,
2828
bool,
2929
Mock_create_directories,
3030
(const path&, std::error_code&),
3131
/* no prepend */,
3232
noexcept)
3333

34-
CO_OVERRIDE_METHOD( OverrideInstance,
34+
CO_INSERT_METHOD( OverrideInstance,
3535
bool,
3636
Mock_remove_all,
3737
(const path&, std::error_code&),
@@ -45,21 +45,21 @@ namespace std
4545
class Mock_ifstream
4646
{
4747
public:
48-
CO_OVERRIDE_MEMBER_METHOD_CTOR(OverrideInstance, Mock_ifstream, const ghc::filesystem::path&)
49-
CO_OVERRIDE_MEMBER_METHOD(OverrideInstance, std::string, rdbuf, ())
50-
CO_OVERRIDE_MEMBER_METHOD(OverrideInstance, bool, is_open, ())
51-
CO_OVERRIDE_MEMBER_METHOD(OverrideInstance, void, close, ())
48+
CO_INSERT_MEMBER_METHOD_CTOR(OverrideInstance, Mock_ifstream, const ghc::filesystem::path&)
49+
CO_INSERT_MEMBER_METHOD(OverrideInstance, std::string, rdbuf, ())
50+
CO_INSERT_MEMBER_METHOD(OverrideInstance, bool, is_open, ())
51+
CO_INSERT_MEMBER_METHOD(OverrideInstance, void, close, ())
5252
};
5353

5454
class Mock_ofstream
5555
{
5656
public:
5757
std::stringstream StringStream;
5858

59-
CO_OVERRIDE_MEMBER_METHOD_CTOR(OverrideInstance, Mock_ofstream, const ghc::filesystem::path&)
59+
CO_INSERT_MEMBER_METHOD_CTOR(OverrideInstance, Mock_ofstream, const ghc::filesystem::path&)
6060

61-
CO_OVERRIDE_MEMBER_METHOD(OverrideInstance, bool, is_open, ())
62-
CO_OVERRIDE_MEMBER_METHOD(OverrideInstance, void, close, ())
61+
CO_INSERT_MEMBER_METHOD(OverrideInstance, bool, is_open, ())
62+
CO_INSERT_MEMBER_METHOD(OverrideInstance, void, close, ())
6363

6464
template<typename T>
6565
friend Mock_ofstream& operator<<(Mock_ofstream&, T const&);
@@ -70,7 +70,7 @@ namespace std
7070
{
7171
static_assert(std::is_same<T, std::string>::value, "We are only mocking std string");
7272
public:
73-
CO_OVERRIDE_MEMBER_METHOD(OverrideInstance, std::size_t, operator(), (T))
73+
CO_INSERT_MEMBER_METHOD(OverrideInstance, std::size_t, operator(), (T))
7474
};
7575

7676
template<typename T>

‎Include/Tests/ConfigParsing/MockComponents.hpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ namespace ghc
1616
{
1717
namespace filesystem
1818
{
19-
CO_OVERRIDE_METHOD( OverrideInstance,
19+
CO_INSERT_METHOD( OverrideInstance,
2020
bool,
2121
Mock_exists,
2222
(const std::string&, std::error_code&),
2323
/* no prepend */,
2424
noexcept)
2525

26-
CO_OVERRIDE_METHOD( OverrideInstance,
26+
CO_INSERT_METHOD( OverrideInstance,
2727
bool,
2828
Mock_is_directory,
2929
(const std::string&, std::error_code&),
@@ -37,12 +37,12 @@ namespace std
3737
class Mock_ifstream
3838
{
3939
public:
40-
CO_OVERRIDE_MEMBER_METHOD_CTOR( OverrideInstance,
40+
CO_INSERT_MEMBER_METHOD_CTOR( OverrideInstance,
4141
Mock_ifstream,
4242
const ghc::filesystem::path&)
43-
CO_OVERRIDE_MEMBER_METHOD(OverrideInstance, bool, operator!, ())
44-
CO_OVERRIDE_MEMBER_METHOD(OverrideInstance, std::string, rdbuf, ())
45-
CO_OVERRIDE_METHOD( OverrideInstance,
43+
CO_INSERT_MEMBER_METHOD(OverrideInstance, bool, operator!, ())
44+
CO_INSERT_MEMBER_METHOD(OverrideInstance, std::string, rdbuf, ())
45+
CO_INSERT_METHOD( OverrideInstance,
4646
Mock_ifstream&,
4747
operator<<,
4848
(Mock_ifstream&, T const&),

‎Include/Tests/IncludeManager/MockComponents.hpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@ namespace ghc
1616
{
1717
namespace filesystem
1818
{
19-
CO_OVERRIDE_METHOD( OverrideInstance,
19+
CO_INSERT_METHOD( OverrideInstance,
2020
bool,
2121
Mock_exists,
2222
(const path&, std::error_code&),
2323
/* no prepend */,
2424
noexcept)
2525

26-
CO_OVERRIDE_METHOD( OverrideInstance,
26+
CO_INSERT_METHOD( OverrideInstance,
2727
bool,
2828
Mock_create_directories,
2929
(const path&, std::error_code&),
3030
/* no prepend */,
3131
noexcept)
3232

33-
CO_OVERRIDE_METHOD( OverrideInstance,
33+
CO_INSERT_METHOD( OverrideInstance,
3434
file_time_type,
3535
Mock_last_write_time,
3636
(const path&, std::error_code&),
@@ -44,18 +44,18 @@ namespace std
4444
class Mock_ifstream
4545
{
4646
public:
47-
CO_OVERRIDE_MEMBER_METHOD_CTOR(OverrideInstance, Mock_ifstream, const ghc::filesystem::path&)
48-
CO_OVERRIDE_MEMBER_METHOD(OverrideInstance, bool, is_open, ())
47+
CO_INSERT_MEMBER_METHOD_CTOR(OverrideInstance, Mock_ifstream, const ghc::filesystem::path&)
48+
CO_INSERT_MEMBER_METHOD(OverrideInstance, bool, is_open, ())
4949
};
5050

5151
class Mock_ofstream
5252
{
5353
public:
5454
std::stringstream StringStream;
5555

56-
CO_OVERRIDE_MEMBER_METHOD_CTOR(OverrideInstance, Mock_ofstream, const ghc::filesystem::path&)
57-
CO_OVERRIDE_MEMBER_METHOD(OverrideInstance, bool, is_open, ())
58-
CO_OVERRIDE_MEMBER_METHOD(OverrideInstance, void, close, ())
56+
CO_INSERT_MEMBER_METHOD_CTOR(OverrideInstance, Mock_ofstream, const ghc::filesystem::path&)
57+
CO_INSERT_MEMBER_METHOD(OverrideInstance, bool, is_open, ())
58+
CO_INSERT_MEMBER_METHOD(OverrideInstance, void, close, ())
5959

6060
template<typename T>
6161
friend Mock_ofstream& operator<<(Mock_ofstream&, T const&);
@@ -66,7 +66,7 @@ namespace std
6666
{
6767
static_assert(std::is_same<T, std::string>::value, "We are only mocking std string");
6868
public:
69-
CO_OVERRIDE_MEMBER_METHOD(OverrideInstance, std::size_t, operator(), (T))
69+
CO_INSERT_MEMBER_METHOD(OverrideInstance, std::size_t, operator(), (T))
7070
};
7171

7272
template<typename T>
@@ -84,7 +84,7 @@ namespace std
8484

8585
inline bool Mock_getline(Mock_ifstream& stream, std::string& line)
8686
{
87-
CO_OVERRIDE_IMPL(OverrideInstance, bool, (stream, line));
87+
CO_INSERT_IMPL(OverrideInstance, bool, (stream, line));
8888
return false;
8989
}
9090
}

0 commit comments

Comments
 (0)