Skip to content

Commit 296bbdc

Browse files
schlangsterschlangster
committed
Instantiation of test cases for all engine modes.
1 parent 8b30d02 commit 296bbdc

11 files changed

Lines changed: 146 additions & 40 deletions

‎project/msvc/CppReactTest.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,14 @@
9090
<ClInclude Include="..\..\src\test\TransactionTest.h" />
9191
</ItemGroup>
9292
<ItemGroup>
93+
<ClCompile Include="..\..\src\test\EventStreamTestQ.cpp" />
94+
<ClCompile Include="..\..\src\test\ObserverTestQ.cpp" />
9395
<ClCompile Include="..\..\src\test\OperationsTest.cpp" />
9496
<ClCompile Include="..\..\src\test\EventStreamTest.cpp" />
9597
<ClCompile Include="..\..\src\test\ObserverTest.cpp" />
98+
<ClCompile Include="..\..\src\test\OperationsTestQ.cpp" />
9699
<ClCompile Include="..\..\src\test\SignalTest.cpp" />
100+
<ClCompile Include="..\..\src\test\SignalTestQ.cpp" />
97101
<ClCompile Include="..\..\src\test\TransactionTest.cpp" />
98102
</ItemGroup>
99103
<ItemGroup>

‎project/msvc/CppReactTest.vcxproj.filters‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,17 @@
4747
<ClCompile Include="..\..\src\test\OperationsTest.cpp">
4848
<Filter>Source Files</Filter>
4949
</ClCompile>
50+
<ClCompile Include="..\..\src\test\EventStreamTestQ.cpp">
51+
<Filter>Source Files</Filter>
52+
</ClCompile>
53+
<ClCompile Include="..\..\src\test\ObserverTestQ.cpp">
54+
<Filter>Source Files</Filter>
55+
</ClCompile>
56+
<ClCompile Include="..\..\src\test\SignalTestQ.cpp">
57+
<Filter>Source Files</Filter>
58+
</ClCompile>
59+
<ClCompile Include="..\..\src\test\OperationsTestQ.cpp">
60+
<Filter>Source Files</Filter>
61+
</ClCompile>
5062
</ItemGroup>
5163
</Project>

‎src/test/EventStreamTest.cpp‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include "react/propagation/PulseCountEngine.h"
55
#include "react/propagation/TopoSortEngine.h"
66
#include "react/propagation/SourceSetEngine.h"
7-
#include "react/propagation/TopoSortSTEngine.h"
87
#include "react/propagation/PulseCountO1Engine.h"
98
#include "react/propagation/ELMEngine.h"
109

@@ -13,13 +12,13 @@ namespace {
1312

1413
using namespace react;
1514

16-
INSTANTIATE_TYPED_TEST_CASE_P(Flooding, EventStreamTest, FloodingEngine<>);
17-
INSTANTIATE_TYPED_TEST_CASE_P(TopoSort, EventStreamTest, TopoSortEngine<>);
18-
INSTANTIATE_TYPED_TEST_CASE_P(PulseCount, EventStreamTest, PulseCountEngine<>);
19-
INSTANTIATE_TYPED_TEST_CASE_P(SourceSet, EventStreamTest, SourceSetEngine<>);
20-
INSTANTIATE_TYPED_TEST_CASE_P(TopoSortST, EventStreamTest, TopoSortEngine<sequential>);
21-
INSTANTIATE_TYPED_TEST_CASE_P(PulseCountO1, EventStreamTest, PulseCountO1Engine<>);
22-
INSTANTIATE_TYPED_TEST_CASE_P(ELM, EventStreamTest, ELMEngine<>);
15+
INSTANTIATE_TYPED_TEST_CASE_P(SeqTopoSort, EventStreamTest, TopoSortEngine<sequential>);
16+
INSTANTIATE_TYPED_TEST_CASE_P(ParTopoSort, EventStreamTest, TopoSortEngine<parallel>);
17+
INSTANTIATE_TYPED_TEST_CASE_P(Flooding, EventStreamTest, FloodingEngine<parallel>);
18+
INSTANTIATE_TYPED_TEST_CASE_P(ELM, EventStreamTest, ELMEngine<parallel>);
19+
INSTANTIATE_TYPED_TEST_CASE_P(PulseCount, EventStreamTest, PulseCountEngine<parallel>);
20+
INSTANTIATE_TYPED_TEST_CASE_P(SourceSet, EventStreamTest, SourceSetEngine<parallel>);
21+
INSTANTIATE_TYPED_TEST_CASE_P(PulseCountO1, EventStreamTest, PulseCountO1Engine<parallel>);
2322

2423
// ---
2524
}

‎src/test/EventStreamTestQ.cpp‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#include "EventStreamTest.h"
2+
3+
#include "react/propagation/FloodingEngine.h"
4+
#include "react/propagation/PulseCountEngine.h"
5+
#include "react/propagation/TopoSortEngine.h"
6+
#include "react/propagation/SourceSetEngine.h"
7+
#include "react/propagation/PulseCountO1Engine.h"
8+
#include "react/propagation/ELMEngine.h"
9+
10+
////////////////////////////////////////////////////////////////////////////////////////
11+
namespace {
12+
13+
using namespace react;
14+
15+
INSTANTIATE_TYPED_TEST_CASE_P(SeqTopoSortQ, EventStreamTest, TopoSortEngine<sequential_queuing>);
16+
INSTANTIATE_TYPED_TEST_CASE_P(ParTopoSortQ, EventStreamTest, TopoSortEngine<parallel_queuing>);
17+
INSTANTIATE_TYPED_TEST_CASE_P(FloodingQ, EventStreamTest, FloodingEngine<parallel_queuing>);
18+
INSTANTIATE_TYPED_TEST_CASE_P(ELMQ, EventStreamTest, ELMEngine<parallel_queuing>);
19+
INSTANTIATE_TYPED_TEST_CASE_P(PulseCountQ, EventStreamTest, PulseCountEngine<parallel_queuing>);
20+
INSTANTIATE_TYPED_TEST_CASE_P(SourceSetQ, EventStreamTest, SourceSetEngine<parallel_queuing>);
21+
INSTANTIATE_TYPED_TEST_CASE_P(PulseCountO1Q, EventStreamTest, PulseCountO1Engine<parallel_queuing>);
22+
23+
// ---
24+
}

‎src/test/ObserverTest.cpp‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include "react/propagation/PulseCountEngine.h"
55
#include "react/propagation/TopoSortEngine.h"
66
#include "react/propagation/SourceSetEngine.h"
7-
#include "react/propagation/TopoSortSTEngine.h"
87
#include "react/propagation/PulseCountO1Engine.h"
98
#include "react/propagation/ELMEngine.h"
109

@@ -13,13 +12,13 @@ namespace {
1312

1413
using namespace react;
1514

16-
INSTANTIATE_TYPED_TEST_CASE_P(Flooding, ObserverTest, FloodingEngine<>);
17-
INSTANTIATE_TYPED_TEST_CASE_P(TopoSort, ObserverTest, TopoSortEngine<>);
18-
INSTANTIATE_TYPED_TEST_CASE_P(PulseCount, ObserverTest, PulseCountEngine<>);
19-
INSTANTIATE_TYPED_TEST_CASE_P(SourceSet, ObserverTest, SourceSetEngine<>);
20-
INSTANTIATE_TYPED_TEST_CASE_P(TopoSortST, ObserverTest, TopoSortEngine<sequential>);
21-
INSTANTIATE_TYPED_TEST_CASE_P(PulseCountO1, ObserverTest, PulseCountO1Engine<>);
22-
INSTANTIATE_TYPED_TEST_CASE_P(ELM, ObserverTest, ELMEngine<>);
15+
INSTANTIATE_TYPED_TEST_CASE_P(SeqTopoSort, ObserverTest, TopoSortEngine<sequential>);
16+
INSTANTIATE_TYPED_TEST_CASE_P(ParTopoSort, ObserverTest, TopoSortEngine<parallel>);
17+
INSTANTIATE_TYPED_TEST_CASE_P(Flooding, ObserverTest, FloodingEngine<parallel>);
18+
INSTANTIATE_TYPED_TEST_CASE_P(ELM, ObserverTest, ELMEngine<parallel>);
19+
INSTANTIATE_TYPED_TEST_CASE_P(PulseCount, ObserverTest, PulseCountEngine<parallel>);
20+
INSTANTIATE_TYPED_TEST_CASE_P(SourceSet, ObserverTest, SourceSetEngine<parallel>);
21+
INSTANTIATE_TYPED_TEST_CASE_P(PulseCountO1, ObserverTest, PulseCountO1Engine<parallel>);
2322

2423
// ---
2524
}

‎src/test/ObserverTestQ.cpp‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#include "ObserverTest.h"
2+
3+
#include "react/propagation/FloodingEngine.h"
4+
#include "react/propagation/PulseCountEngine.h"
5+
#include "react/propagation/TopoSortEngine.h"
6+
#include "react/propagation/SourceSetEngine.h"
7+
#include "react/propagation/PulseCountO1Engine.h"
8+
#include "react/propagation/ELMEngine.h"
9+
10+
////////////////////////////////////////////////////////////////////////////////////////
11+
namespace {
12+
13+
using namespace react;
14+
15+
INSTANTIATE_TYPED_TEST_CASE_P(SeqTopoSortQ, ObserverTest, TopoSortEngine<sequential_queuing>);
16+
INSTANTIATE_TYPED_TEST_CASE_P(ParTopoSortQ, ObserverTest, TopoSortEngine<parallel_queuing>);
17+
INSTANTIATE_TYPED_TEST_CASE_P(FloodingQ, ObserverTest, FloodingEngine<parallel_queuing>);
18+
INSTANTIATE_TYPED_TEST_CASE_P(ELMQ, ObserverTest, ELMEngine<parallel_queuing>);
19+
INSTANTIATE_TYPED_TEST_CASE_P(PulseCountQ, ObserverTest, PulseCountEngine<parallel_queuing>);
20+
INSTANTIATE_TYPED_TEST_CASE_P(SourceSetQ, ObserverTest, SourceSetEngine<parallel_queuing>);
21+
INSTANTIATE_TYPED_TEST_CASE_P(PulseCountO1Q, ObserverTest, PulseCountO1Engine<parallel_queuing>);
22+
23+
// ---
24+
}

‎src/test/OperationsTest.cpp‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include "react/propagation/PulseCountEngine.h"
55
#include "react/propagation/TopoSortEngine.h"
66
#include "react/propagation/SourceSetEngine.h"
7-
#include "react/propagation/TopoSortSTEngine.h"
87
#include "react/propagation/PulseCountO1Engine.h"
98
#include "react/propagation/ELMEngine.h"
109

@@ -13,12 +12,12 @@ namespace {
1312

1413
using namespace react;
1514

16-
INSTANTIATE_TYPED_TEST_CASE_P(Flooding, OperationsTest, FloodingEngine<>);
17-
INSTANTIATE_TYPED_TEST_CASE_P(TopoSort, OperationsTest, TopoSortEngine<>);
18-
INSTANTIATE_TYPED_TEST_CASE_P(PulseCount, OperationsTest, PulseCountEngine<>);
19-
INSTANTIATE_TYPED_TEST_CASE_P(SourceSet, OperationsTest, SourceSetEngine<>);
20-
INSTANTIATE_TYPED_TEST_CASE_P(TopoSortST, OperationsTest, TopoSortEngine<sequential>);
21-
INSTANTIATE_TYPED_TEST_CASE_P(PulseCountO1, OperationsTest, PulseCountO1Engine<>);
22-
INSTANTIATE_TYPED_TEST_CASE_P(ELM, OperationsTest, ELMEngine<>);
15+
INSTANTIATE_TYPED_TEST_CASE_P(SeqTopoSort, OperationsTest, TopoSortEngine<sequential>);
16+
INSTANTIATE_TYPED_TEST_CASE_P(ParTopoSort, OperationsTest, TopoSortEngine<parallel>);
17+
INSTANTIATE_TYPED_TEST_CASE_P(Flooding, OperationsTest, FloodingEngine<parallel>);
18+
INSTANTIATE_TYPED_TEST_CASE_P(ELM, OperationsTest, ELMEngine<parallel>);
19+
INSTANTIATE_TYPED_TEST_CASE_P(PulseCount, OperationsTest, PulseCountEngine<parallel>);
20+
INSTANTIATE_TYPED_TEST_CASE_P(SourceSet, OperationsTest, SourceSetEngine<parallel>);
21+
INSTANTIATE_TYPED_TEST_CASE_P(PulseCountO1, OperationsTest, PulseCountO1Engine<parallel>);
2322

2423
} // ~namespace

‎src/test/OperationsTestQ.cpp‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#include "OperationsTest.h"
2+
3+
#include "react/propagation/FloodingEngine.h"
4+
#include "react/propagation/PulseCountEngine.h"
5+
#include "react/propagation/TopoSortEngine.h"
6+
#include "react/propagation/SourceSetEngine.h"
7+
#include "react/propagation/PulseCountO1Engine.h"
8+
#include "react/propagation/ELMEngine.h"
9+
10+
////////////////////////////////////////////////////////////////////////////////////////
11+
namespace {
12+
13+
using namespace react;
14+
15+
INSTANTIATE_TYPED_TEST_CASE_P(SeqTopoSortQ, OperationsTest, TopoSortEngine<sequential_queuing>);
16+
INSTANTIATE_TYPED_TEST_CASE_P(ParTopoSortQ, OperationsTest, TopoSortEngine<parallel_queuing>);
17+
INSTANTIATE_TYPED_TEST_CASE_P(FloodingQ, OperationsTest, FloodingEngine<parallel_queuing>);
18+
INSTANTIATE_TYPED_TEST_CASE_P(ELMQ, OperationsTest, ELMEngine<parallel_queuing>);
19+
INSTANTIATE_TYPED_TEST_CASE_P(PulseCountQ, OperationsTest, PulseCountEngine<parallel_queuing>);
20+
INSTANTIATE_TYPED_TEST_CASE_P(SourceSetQ, OperationsTest, SourceSetEngine<parallel_queuing>);
21+
INSTANTIATE_TYPED_TEST_CASE_P(PulseCountO1Q, OperationsTest, PulseCountO1Engine<parallel_queuing>);
22+
23+
} // ~namespace

‎src/test/SignalTest.cpp‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include "react/propagation/PulseCountEngine.h"
55
#include "react/propagation/TopoSortEngine.h"
66
#include "react/propagation/SourceSetEngine.h"
7-
#include "react/propagation/TopoSortSTEngine.h"
87
#include "react/propagation/PulseCountO1Engine.h"
98
#include "react/propagation/ELMEngine.h"
109

@@ -13,13 +12,13 @@ namespace {
1312

1413
using namespace react;
1514

16-
INSTANTIATE_TYPED_TEST_CASE_P(Flooding, SignalTest, FloodingEngine<>);
17-
INSTANTIATE_TYPED_TEST_CASE_P(TopoSort, SignalTest, TopoSortEngine<>);
18-
INSTANTIATE_TYPED_TEST_CASE_P(PulseCount, SignalTest, PulseCountEngine<>);
19-
INSTANTIATE_TYPED_TEST_CASE_P(SourceSet, SignalTest, SourceSetEngine<>);
20-
INSTANTIATE_TYPED_TEST_CASE_P(TopoSortST, SignalTest, TopoSortEngine<sequential>);
21-
INSTANTIATE_TYPED_TEST_CASE_P(PulseCountO1, SignalTest, PulseCountO1Engine<>);
22-
INSTANTIATE_TYPED_TEST_CASE_P(ELM, SignalTest, ELMEngine<>);
15+
INSTANTIATE_TYPED_TEST_CASE_P(SeqTopoSort, SignalTest, TopoSortEngine<sequential>);
16+
INSTANTIATE_TYPED_TEST_CASE_P(ParTopoSort, SignalTest, TopoSortEngine<parallel>);
17+
INSTANTIATE_TYPED_TEST_CASE_P(Flooding, SignalTest, FloodingEngine<parallel>);
18+
INSTANTIATE_TYPED_TEST_CASE_P(ELM, SignalTest, ELMEngine<parallel>);
19+
INSTANTIATE_TYPED_TEST_CASE_P(PulseCount, SignalTest, PulseCountEngine<parallel>);
20+
INSTANTIATE_TYPED_TEST_CASE_P(SourceSet, SignalTest, SourceSetEngine<parallel>);
21+
INSTANTIATE_TYPED_TEST_CASE_P(PulseCountO1, SignalTest, PulseCountO1Engine<parallel>);
2322

2423
// ---
2524
}

‎src/test/SignalTestQ.cpp‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#include "SignalTest.h"
2+
3+
#include "react/propagation/FloodingEngine.h"
4+
#include "react/propagation/PulseCountEngine.h"
5+
#include "react/propagation/TopoSortEngine.h"
6+
#include "react/propagation/SourceSetEngine.h"
7+
#include "react/propagation/PulseCountO1Engine.h"
8+
#include "react/propagation/ELMEngine.h"
9+
10+
////////////////////////////////////////////////////////////////////////////////////////
11+
namespace {
12+
13+
using namespace react;
14+
15+
INSTANTIATE_TYPED_TEST_CASE_P(SeqTopoSortQ, SignalTest, TopoSortEngine<sequential_queuing>);
16+
INSTANTIATE_TYPED_TEST_CASE_P(ParTopoSortQ, SignalTest, TopoSortEngine<parallel_queuing>);
17+
INSTANTIATE_TYPED_TEST_CASE_P(FloodingQ, SignalTest, FloodingEngine<parallel_queuing>);
18+
INSTANTIATE_TYPED_TEST_CASE_P(ELMQ, SignalTest, ELMEngine<parallel_queuing>);
19+
INSTANTIATE_TYPED_TEST_CASE_P(PulseCountQ, SignalTest, PulseCountEngine<parallel_queuing>);
20+
INSTANTIATE_TYPED_TEST_CASE_P(SourceSetQ, SignalTest, SourceSetEngine<parallel_queuing>);
21+
INSTANTIATE_TYPED_TEST_CASE_P(PulseCountO1Q, SignalTest, PulseCountO1Engine<parallel_queuing>);
22+
23+
// ---
24+
}

0 commit comments

Comments
 (0)