Mercurial > hg > orthanc-stone

comparison UnitTestsSources/TestMessageBroker.cpp @ 643:f0008c55e5f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
getting rid of MessageType enumeration
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 10 May 2019 17:34:48 +0200
parents 573e35378999
children 5df50e0f0390
comparison
equal deleted inserted replaced
642:7ca8dc7ec17b 643:f0008c55e5f7
32 namespace { 32 namespace {
33 33
34 using namespace OrthancStone; 34 using namespace OrthancStone;
35 35
36 36
37 enum CustomMessageType
38 {
39 CustomMessageType_First = MessageType_CustomMessage + 1,
40
41 CustomMessageType_Completed,
42 CustomMessageType_Increment
43 };
44
45
46 class MyObservable : public IObservable 37 class MyObservable : public IObservable
47 { 38 {
48 public: 39 public:
49 struct MyCustomMessage: public BaseMessage<(MessageType) CustomMessageType_Completed> 40 struct MyCustomMessage : public IMessage
50 { 41 {
42 ORTHANC_STONE_MESSAGE(__FILE__, __LINE__);
43
51 int payload_; 44 int payload_;
52 45
53 MyCustomMessage(int payload) 46 MyCustomMessage(int payload) :
54 : BaseMessage(), 47 payload_(payload)
55 payload_(payload) 48 {
56 {} 49 }
57 }; 50 };
58 51
59 MyObservable(MessageBroker& broker) 52 MyObservable(MessageBroker& broker) :
60 : IObservable(broker) 53 IObservable(broker)
61 {} 54 {
62 55 }
63 }; 56 };
64 57
65 class MyObserver : public IObserver 58 class MyObserver : public IObserver
66 { 59 {
67 public: 60 public:
92 85
93 86
94 class MyPromiseSource : public IObservable 87 class MyPromiseSource : public IObservable
95 { 88 {
96 Promise* currentPromise_; 89 Promise* currentPromise_;
97 public: 90
98 struct MyPromiseMessage: public BaseMessage<MessageType_Test1> 91 public:
99 { 92 struct MyPromiseMessage: public IMessage
93 {
94 ORTHANC_STONE_MESSAGE(__FILE__, __LINE__);
95
100 int increment; 96 int increment;
101 97
102 MyPromiseMessage(int increment) 98 MyPromiseMessage(int increment) :
103 : BaseMessage(), 99 increment(increment)
104 increment(increment) 100 {
105 {} 101 }
106 }; 102 };
107 103
108 MyPromiseSource(MessageBroker& broker) 104 MyPromiseSource(MessageBroker& broker)
109 : IObservable(broker), 105 : IObservable(broker),
110 currentPromise_(NULL) 106 currentPromise_(NULL)