Skip to content

Commit 1bd16e0

Browse files
dbogdanovdbogdanov
committed
Fix cpptests broken after updates in MonoLoader
Fix cpp tests that broke after 4fd144e
1 parent 49dc50f commit 1bd16e0

File tree

1 file changed

+110
-41
lines changed

1 file changed

+110
-41
lines changed

‎test/src/basetest/test_network.cpp‎

Lines changed: 110 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,25 @@ TEST(Network, SimpleExecutionNetwork) {
6666
};
6767

6868
const char* expanded[] = {
69-
" +---------------+ +-------------+ +------------+ ",
70-
" | AudioLoader |----| MonoMixer |---| Resample | ",
71-
" +---------------+ +-------------+ +------------+ "
69+
" +---------+ ",
70+
" +--| DevNull | ",
71+
" | +---------+ ",
72+
" | ",
73+
" | +---------+ ",
74+
" +--| DevNull | ",
75+
" | +---------+ ",
76+
" | ",
77+
" | +---------+ ",
78+
" +--| DevNull | ",
79+
" | +---------+ ",
80+
" | ",
81+
" | +---------+ ",
82+
" +--| DevNull | ",
83+
" | +---------+ ",
84+
" | ",
85+
" +---------------+ | +-----------+ +----------+ ",
86+
" | AudioLoader |-+--| MonoMixer |---| Resample | ",
87+
" +---------------+ +-----------+ +----------+ "
7288
};
7389

7490
// create the expanded network by hand because AudioLoader and MonoMixer don't
@@ -82,6 +98,11 @@ TEST(Network, SimpleExecutionNetwork) {
8298
loader->output("numberChannels") >> mixer->input("numberChannels");
8399
mixer->output("audio") >> resample->input("signal");
84100

101+
loader->output("md5") >> NOWHERE;
102+
loader->output("bit_rate") >> NOWHERE;
103+
loader->output("codec") >> NOWHERE;
104+
loader->output("sampleRate") >> NOWHERE;
105+
85106
Network n1(loader);
86107
NetworkParser np2(expanded, false);
87108

@@ -108,9 +129,25 @@ TEST(Network, ExecutionNetworkWithComposite) {
108129
Network network(loader);
109130

110131
const char* expected[] = {
111-
" +---------------+ +-------------+ +------------+ +----------+ +---------+",
112-
" | AudioLoader |----| MonoMixer |---| Resample |--| LowPass |--| DevNull |",
113-
" +---------------+ +-------------+ +------------+ +----------+ +---------+"
132+
" +---------+ ",
133+
" +--| DevNull | ",
134+
" | +---------+ ",
135+
" | ",
136+
" | +---------+ ",
137+
" +--| DevNull | ",
138+
" | +---------+ ",
139+
" | ",
140+
" | +---------+ ",
141+
" +--| DevNull | ",
142+
" | +---------+ ",
143+
" | ",
144+
" | +---------+ ",
145+
" +--| DevNull | ",
146+
" | +---------+ ",
147+
" | ",
148+
" +---------------+ | +-----------+ +----------+ +---------+ +---------+ ",
149+
" | AudioLoader |-+--| MonoMixer |---| Resample |---| LowPass |---| DevNull | ",
150+
" +---------------+ +-----------+ +----------+ +---------+ +---------+ "
114151
};
115152

116153
ASSERT_TRUE(areNetworkTopologiesEqual(network.executionNetworkRoot(),
@@ -126,29 +163,45 @@ TEST(Network, ExecutionNetworkKeyExtractor) {
126163
};
127164

128165
const char* expanded[] = {
129-
" MonoLoader ",
130-
" <------------------------------------------------> ",
131-
" ",
132-
" +---------------+ +-------------+ +------------+ ",
133-
" | AudioLoader |----| MonoMixer |---| Resample |--+ ",
134-
" +---------------+ +-------------+ +------------+ | ",
135-
" | ",
136-
" +----------------------------------------------------+ ",
137-
" | ",
138-
" | <------------------------ KeyExtractor ------------------------------> ",
139-
" | ",
140-
" | +---------------+ +-------------+ +------------+ ",
141-
" +---| FrameCutter |----| Windowing |---| Spectrum |--+ ",
142-
" +---------------+ +-------------+ +------------+ | ",
143-
" | ",
144-
" +----------------------------------------------------+ ",
145-
" | ",
146-
" | +---------------+ +-------+ +-------------+ +-------+ ",
147-
" +-| SpectralPeaks |----| HPCP |---| PoolStorage |----| Key | ",
148-
" +---------------+ +-------+ +-------------+ +-------+ ",
149-
" ",
150-
" <---------- Key ---------> ",
151-
" "
166+
" MonoLoader ",
167+
" <------------------------------------------------> ",
168+
" ",
169+
" +---------+ ",
170+
" +--| DevNull | ",
171+
" | +---------+ ",
172+
" | ",
173+
" | +---------+ ",
174+
" +--| DevNull | ",
175+
" | +---------+ ",
176+
" | ",
177+
" | +---------+ ",
178+
" +--| DevNull | ",
179+
" | +---------+ ",
180+
" | ",
181+
" | +---------+ ",
182+
" +--| DevNull | ",
183+
" | +---------+ ",
184+
" | ",
185+
" +---------------+ | +-----------+ +----------+ ",
186+
" | AudioLoader |-+--| MonoMixer |---| Resample |--+ ",
187+
" +---------------+ +-----------+ +----------+ | ",
188+
" | ",
189+
" +------------------------------------------------+ ",
190+
" | ",
191+
" | <------------------------ KeyExtractor ------------------------------> ",
192+
" | ",
193+
" | +---------------+ +-------------+ +------------+ ",
194+
" +---| FrameCutter |----| Windowing |---| Spectrum |--+ ",
195+
" +---------------+ +-------------+ +------------+ | ",
196+
" | ",
197+
" +----------------------------------------------------+ ",
198+
" | ",
199+
" | +---------------+ +-------+ +-------------+ +-------+ ",
200+
" +-| SpectralPeaks |----| HPCP |---| PoolStorage |----| Key | ",
201+
" +---------------+ +-------+ +-------------+ +-------+ ",
202+
" ",
203+
" <---------- Key ---------> ",
204+
" "
152205
};
153206

154207
NetworkParser np(extractor);
@@ -165,18 +218,34 @@ TEST(Network, ExecutionNetworkKeyExtractorConnected) {
165218
};
166219

167220
const char* expanded[] = {
168-
" MonoLoader ",
169-
" <------------------------------------------------> ",
170-
" ",
171-
" +---------------+ +-------------+ +------------+ ",
172-
" | AudioLoader |----| MonoMixer |---| Resample |--+ ",
173-
" +---------------+ +-------------+ +------------+ | ",
174-
" | ",
175-
" +----------------------------------------------------+ ",
176-
" | ",
177-
" | <------------------------ KeyExtractor ------------------------------> ",
178-
" | ",
179-
" | +---------------+ +-------------+ +------------+ ",
221+
" MonoLoader ",
222+
" <------------------------------------------------> ",
223+
" ",
224+
" +---------+ ",
225+
" +--| DevNull | ",
226+
" | +---------+ ",
227+
" | ",
228+
" | +---------+ ",
229+
" +--| DevNull | ",
230+
" | +---------+ ",
231+
" | ",
232+
" | +---------+ ",
233+
" +--| DevNull | ",
234+
" | +---------+ ",
235+
" | ",
236+
" | +---------+ ",
237+
" +--| DevNull | ",
238+
" | +---------+ ",
239+
" | ",
240+
" +---------------+ | +-----------+ +----------+ ",
241+
" | AudioLoader |-+--| MonoMixer |---| Resample |--+ ",
242+
" +---------------+ +-----------+ +----------+ | ",
243+
" | ",
244+
" +------------------------------------------------+ ",
245+
" | ",
246+
" | <------------------------ KeyExtractor ------------------------------> ",
247+
" | ",
248+
" | +---------------+ +-------------+ +------------+ ",
180249
" +---| FrameCutter |----| Windowing |---| Spectrum |--+ +------------+ ",
181250
" +---------------+ +-------------+ +------------+ | +----| DevNull | ",
182251
" | | +------------+ ",

0 commit comments

Comments
 (0)