Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
Actor Framework
Commits
1e8bf53a
Commit
1e8bf53a
authored
Dec 06, 2017
by
Dominik Charousset
Committed by
Dominik Charousset
Feb 06, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove redundant macros from broadcast unit test
parent
4120e205
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
20 deletions
+16
-20
libcaf_core/test/broadcast_scatterer.cpp
libcaf_core/test/broadcast_scatterer.cpp
+16
-20
No files found.
libcaf_core/test/broadcast_scatterer.cpp
View file @
1e8bf53a
...
@@ -142,9 +142,11 @@ public:
...
@@ -142,9 +142,11 @@ public:
stream_slot
next_slot
;
stream_slot
next_slot
;
};
};
// Needed by `
SOME_BATCHES
` macro.
// Needed by `
some
` macro.
struct
not_empty_t
{};
struct
not_empty_t
{};
constexpr
auto
some
=
not_empty_t
{};
// Provides the setup with alice, bob, and carl.
// Provides the setup with alice, bob, and carl.
struct
fixture
{
struct
fixture
{
actor_system_config
cfg
;
actor_system_config
cfg
;
...
@@ -315,8 +317,6 @@ receive_checker<F> operator<<(receive_checker<F> xs, not_empty_t) {
...
@@ -315,8 +317,6 @@ receive_checker<F> operator<<(receive_checker<F> xs, not_empty_t) {
CONCAT(amount, __LINE__)} \
CONCAT(amount, __LINE__)} \
<<
<<
//CAF_CHECK_EQUAL(CONCAT(who, __LINE__).credit_for(x),
#define TOTAL \
#define TOTAL \
CAF_CHECK_EQUAL(CONCAT(who, __LINE__).bs.total_credit(), \
CAF_CHECK_EQUAL(CONCAT(who, __LINE__).bs.total_credit(), \
CONCAT(amount, __LINE__))
CONCAT(amount, __LINE__))
...
@@ -325,10 +325,6 @@ receive_checker<F> operator<<(receive_checker<F> xs, not_empty_t) {
...
@@ -325,10 +325,6 @@ receive_checker<F> operator<<(receive_checker<F> xs, not_empty_t) {
#define AND <<
#define AND <<
#define NOTHING none
#define SOME_BATCHES not_empty_t{}
// -- unit tests ---------------------------------------------------------------
// -- unit tests ---------------------------------------------------------------
CAF_TEST_FIXTURE_SCOPE
(
broadcast_scatterer
,
fixture
)
CAF_TEST_FIXTURE_SCOPE
(
broadcast_scatterer
,
fixture
)
...
@@ -357,7 +353,7 @@ CAF_TEST(one_path_force) {
...
@@ -357,7 +353,7 @@ CAF_TEST(one_path_force) {
}
}
// Drain all elements except the last 5.
// Drain all elements except the last 5.
AFTER
ENTITY
alice
TRIED
FORCE_SENDING
71
ELEMENTS
{
AFTER
ENTITY
alice
TRIED
FORCE_SENDING
71
ELEMENTS
{
ENTITY
bob
RECEIVED
SOME_BATCHES
;
ENTITY
bob
RECEIVED
some
;
ENTITY
alice
HAS
0u
CREDIT
FOR
bob
;
ENTITY
alice
HAS
0u
CREDIT
FOR
bob
;
}
}
// Give more credit than there are elements left.
// Give more credit than there are elements left.
...
@@ -367,7 +363,7 @@ CAF_TEST(one_path_force) {
...
@@ -367,7 +363,7 @@ CAF_TEST(one_path_force) {
}
}
// Give more credit than there are elements left.
// Give more credit than there are elements left.
AFTER
ENTITY
alice
TRIED
FORCE_SENDING
5
ELEMENTS
{
AFTER
ENTITY
alice
TRIED
FORCE_SENDING
5
ELEMENTS
{
ENTITY
bob
RECEIVED
NOTHING
;
ENTITY
bob
RECEIVED
none
;
ENTITY
alice
HAS
100u
CREDIT
FOR
bob
;
ENTITY
alice
HAS
100u
CREDIT
FOR
bob
;
}
}
}
}
...
@@ -380,7 +376,7 @@ CAF_TEST(one_path_without_force) {
...
@@ -380,7 +376,7 @@ CAF_TEST(one_path_without_force) {
alice
.
bs
.
push
(
i
);
alice
.
bs
.
push
(
i
);
// Give 3 credit (less than 10).
// Give 3 credit (less than 10).
AFTER
ENTITY
alice
TRIED
SENDING
3
ELEMENTS
{
AFTER
ENTITY
alice
TRIED
SENDING
3
ELEMENTS
{
ENTITY
bob
RECEIVED
NOTHING
;
ENTITY
bob
RECEIVED
none
;
ENTITY
alice
HAS
3u
CREDIT
FOR
bob
;
ENTITY
alice
HAS
3u
CREDIT
FOR
bob
;
ENTITY
alice
HAS
3u
CREDIT
TOTAL
;
ENTITY
alice
HAS
3u
CREDIT
TOTAL
;
}
}
...
@@ -396,7 +392,7 @@ CAF_TEST(one_path_without_force) {
...
@@ -396,7 +392,7 @@ CAF_TEST(one_path_without_force) {
}
}
// Drain all elements except the last 5.
// Drain all elements except the last 5.
AFTER
ENTITY
alice
TRIED
SENDING
71
ELEMENTS
{
AFTER
ENTITY
alice
TRIED
SENDING
71
ELEMENTS
{
ENTITY
bob
RECEIVED
SOME_BATCHES
;
ENTITY
bob
RECEIVED
some
;
ENTITY
alice
HAS
5u
CREDIT
FOR
bob
;
ENTITY
alice
HAS
5u
CREDIT
FOR
bob
;
}
}
// Give more credit than there are elements left.
// Give more credit than there are elements left.
...
@@ -406,7 +402,7 @@ CAF_TEST(one_path_without_force) {
...
@@ -406,7 +402,7 @@ CAF_TEST(one_path_without_force) {
}
}
// Give more credit than there are elements left.
// Give more credit than there are elements left.
AFTER
ENTITY
alice
TRIED
SENDING
5
ELEMENTS
{
AFTER
ENTITY
alice
TRIED
SENDING
5
ELEMENTS
{
ENTITY
bob
RECEIVED
NOTHING
;
ENTITY
bob
RECEIVED
none
;
ENTITY
alice
HAS
100u
CREDIT
FOR
bob
;
ENTITY
alice
HAS
100u
CREDIT
FOR
bob
;
}
}
}
}
...
@@ -442,8 +438,8 @@ CAF_TEST(two_paths_different_sizes_force) {
...
@@ -442,8 +438,8 @@ CAF_TEST(two_paths_different_sizes_force) {
}
}
// Drain all elements except the last 5.
// Drain all elements except the last 5.
AFTER
ENTITY
alice
TRIED
FORCE_SENDING
71
ELEMENTS
{
AFTER
ENTITY
alice
TRIED
FORCE_SENDING
71
ELEMENTS
{
ENTITY
bob
RECEIVED
SOME_BATCHES
;
ENTITY
bob
RECEIVED
some
;
ENTITY
carl
RECEIVED
SOME_BATCHES
;
ENTITY
carl
RECEIVED
some
;
ENTITY
alice
HAS
0u
CREDIT
TOTAL
;
ENTITY
alice
HAS
0u
CREDIT
TOTAL
;
}
}
// Give more credit than there are elements left.
// Give more credit than there are elements left.
...
@@ -456,8 +452,8 @@ CAF_TEST(two_paths_different_sizes_force) {
...
@@ -456,8 +452,8 @@ CAF_TEST(two_paths_different_sizes_force) {
}
}
// Give more credit than there are elements left.
// Give more credit than there are elements left.
AFTER
ENTITY
alice
TRIED
FORCE_SENDING
5
ELEMENTS
{
AFTER
ENTITY
alice
TRIED
FORCE_SENDING
5
ELEMENTS
{
ENTITY
bob
RECEIVED
NOTHING
;
ENTITY
bob
RECEIVED
none
;
ENTITY
carl
RECEIVED
NOTHING
;
ENTITY
carl
RECEIVED
none
;
ENTITY
alice
HAS
200u
CREDIT
TOTAL
;
ENTITY
alice
HAS
200u
CREDIT
TOTAL
;
}
}
}
}
...
@@ -471,15 +467,15 @@ CAF_TEST(two_paths_different_sizes_without_force) {
...
@@ -471,15 +467,15 @@ CAF_TEST(two_paths_different_sizes_without_force) {
alice
.
bs
.
push
(
i
);
alice
.
bs
.
push
(
i
);
// Give 3 credit (less than 10).
// Give 3 credit (less than 10).
AFTER
ENTITY
alice
TRIED
SENDING
3
ELEMENTS
{
AFTER
ENTITY
alice
TRIED
SENDING
3
ELEMENTS
{
ENTITY
bob
RECEIVED
NOTHING
;
ENTITY
bob
RECEIVED
none
;
ENTITY
carl
RECEIVED
NOTHING
;
ENTITY
carl
RECEIVED
none
;
ENTITY
alice
HAS
3u
CREDIT
FOR
bob
;
ENTITY
alice
HAS
3u
CREDIT
FOR
bob
;
ENTITY
alice
HAS
3u
CREDIT
FOR
carl
;
ENTITY
alice
HAS
3u
CREDIT
FOR
carl
;
ENTITY
alice
HAS
6u
CREDIT
TOTAL
;
ENTITY
alice
HAS
6u
CREDIT
TOTAL
;
}
}
// Give 4 more credit.
// Give 4 more credit.
AFTER
ENTITY
alice
TRIED
SENDING
4
ELEMENTS
{
AFTER
ENTITY
alice
TRIED
SENDING
4
ELEMENTS
{
ENTITY
bob
RECEIVED
NOTHING
;
ENTITY
bob
RECEIVED
none
;
ENTITY
carl
RECEIVED
BATCH
(
1
,
7
);
ENTITY
carl
RECEIVED
BATCH
(
1
,
7
);
ENTITY
alice
HAS
7u
CREDIT
FOR
bob
;
ENTITY
alice
HAS
7u
CREDIT
FOR
bob
;
ENTITY
alice
HAS
0u
CREDIT
FOR
carl
;
ENTITY
alice
HAS
0u
CREDIT
FOR
carl
;
...
@@ -488,7 +484,7 @@ CAF_TEST(two_paths_different_sizes_without_force) {
...
@@ -488,7 +484,7 @@ CAF_TEST(two_paths_different_sizes_without_force) {
// Give 3 more credit (reaching 10 for bob).
// Give 3 more credit (reaching 10 for bob).
AFTER
ENTITY
alice
TRIED
SENDING
3
ELEMENTS
{
AFTER
ENTITY
alice
TRIED
SENDING
3
ELEMENTS
{
ENTITY
bob
RECEIVED
BATCH
(
1
,
10
);
ENTITY
bob
RECEIVED
BATCH
(
1
,
10
);
ENTITY
carl
RECEIVED
NOTHING
;
ENTITY
carl
RECEIVED
none
;
ENTITY
alice
HAS
0u
CREDIT
FOR
bob
;
ENTITY
alice
HAS
0u
CREDIT
FOR
bob
;
ENTITY
alice
HAS
3u
CREDIT
FOR
carl
;
ENTITY
alice
HAS
3u
CREDIT
FOR
carl
;
ENTITY
alice
HAS
3u
CREDIT
TOTAL
;
ENTITY
alice
HAS
3u
CREDIT
TOTAL
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment