View | Details | Raw Unified | Return to bug 1563
Collapse All | Expand All

(-)a/src/antenna/test/test-angles.cc (-69 / +69 lines)
 Lines 120-209    Link Here 
120
AnglesTestSuite::AnglesTestSuite ()
120
AnglesTestSuite::AnglesTestSuite ()
121
  : TestSuite ("angles", UNIT)
121
  : TestSuite ("angles", UNIT)
122
{
122
{
123
  AddTestCase (new OneVectorConstructorTestCase (Vector (1, 0, 0),     Angles (0, M_PI_2)));
123
  AddTestCase (new OneVectorConstructorTestCase (Vector (1, 0, 0),     Angles (0, M_PI_2)), TestCase::QUICK);
124
  AddTestCase (new OneVectorConstructorTestCase (Vector (-1, 0, 0),    Angles (M_PI, M_PI_2)));
124
  AddTestCase (new OneVectorConstructorTestCase (Vector (-1, 0, 0),    Angles (M_PI, M_PI_2)), TestCase::QUICK);
125
  AddTestCase (new OneVectorConstructorTestCase (Vector (0, 1, 0),     Angles (M_PI_2, M_PI_2)));
125
  AddTestCase (new OneVectorConstructorTestCase (Vector (0, 1, 0),     Angles (M_PI_2, M_PI_2)), TestCase::QUICK);
126
  AddTestCase (new OneVectorConstructorTestCase (Vector (0, -1, 0),    Angles (-M_PI_2, M_PI_2)));
126
  AddTestCase (new OneVectorConstructorTestCase (Vector (0, -1, 0),    Angles (-M_PI_2, M_PI_2)), TestCase::QUICK);
127
  AddTestCase (new OneVectorConstructorTestCase (Vector (0, 0, 1),     Angles (0, 0)));
127
  AddTestCase (new OneVectorConstructorTestCase (Vector (0, 0, 1),     Angles (0, 0)), TestCase::QUICK);
128
  AddTestCase (new OneVectorConstructorTestCase (Vector (0, 0, -1),    Angles (0, M_PI)));
128
  AddTestCase (new OneVectorConstructorTestCase (Vector (0, 0, -1),    Angles (0, M_PI)), TestCase::QUICK);
129
129
130
  AddTestCase (new OneVectorConstructorTestCase (Vector (2, 0, 0),     Angles (0, M_PI_2)));
130
  AddTestCase (new OneVectorConstructorTestCase (Vector (2, 0, 0),     Angles (0, M_PI_2)), TestCase::QUICK);
131
  AddTestCase (new OneVectorConstructorTestCase (Vector (-2, 0, 0),    Angles (M_PI, M_PI_2)));
131
  AddTestCase (new OneVectorConstructorTestCase (Vector (-2, 0, 0),    Angles (M_PI, M_PI_2)), TestCase::QUICK);
132
  AddTestCase (new OneVectorConstructorTestCase (Vector (0, 2, 0),     Angles (M_PI_2, M_PI_2)));
132
  AddTestCase (new OneVectorConstructorTestCase (Vector (0, 2, 0),     Angles (M_PI_2, M_PI_2)), TestCase::QUICK);
133
  AddTestCase (new OneVectorConstructorTestCase (Vector (0, -2, 0),    Angles (-M_PI_2, M_PI_2)));
133
  AddTestCase (new OneVectorConstructorTestCase (Vector (0, -2, 0),    Angles (-M_PI_2, M_PI_2)), TestCase::QUICK);
134
  AddTestCase (new OneVectorConstructorTestCase (Vector (0, 0, 2),     Angles (0, 0)));
134
  AddTestCase (new OneVectorConstructorTestCase (Vector (0, 0, 2),     Angles (0, 0)), TestCase::QUICK);
135
  AddTestCase (new OneVectorConstructorTestCase (Vector (0, 0, -2),    Angles (0, M_PI)));
135
  AddTestCase (new OneVectorConstructorTestCase (Vector (0, 0, -2),    Angles (0, M_PI)), TestCase::QUICK);
136
136
137
  AddTestCase (new OneVectorConstructorTestCase (Vector (1, 0, 1),     Angles (0, M_PI_4)));
137
  AddTestCase (new OneVectorConstructorTestCase (Vector (1, 0, 1),     Angles (0, M_PI_4)), TestCase::QUICK);
138
  AddTestCase (new OneVectorConstructorTestCase (Vector (1, 0, -1),    Angles (0, 3*M_PI_4)));
138
  AddTestCase (new OneVectorConstructorTestCase (Vector (1, 0, -1),    Angles (0, 3*M_PI_4)), TestCase::QUICK);
139
  AddTestCase (new OneVectorConstructorTestCase (Vector (1, 1, 0),     Angles (M_PI_4, M_PI_2)));
139
  AddTestCase (new OneVectorConstructorTestCase (Vector (1, 1, 0),     Angles (M_PI_4, M_PI_2)), TestCase::QUICK);
140
  AddTestCase (new OneVectorConstructorTestCase (Vector (1, -1, 0),    Angles (-M_PI_4, M_PI_2)));
140
  AddTestCase (new OneVectorConstructorTestCase (Vector (1, -1, 0),    Angles (-M_PI_4, M_PI_2)), TestCase::QUICK);
141
  AddTestCase (new OneVectorConstructorTestCase (Vector (-1, 0, 1),    Angles (M_PI, M_PI_4)));
141
  AddTestCase (new OneVectorConstructorTestCase (Vector (-1, 0, 1),    Angles (M_PI, M_PI_4)), TestCase::QUICK);
142
  AddTestCase (new OneVectorConstructorTestCase (Vector (-1, 0, -1),   Angles (M_PI, 3*M_PI_4)));
142
  AddTestCase (new OneVectorConstructorTestCase (Vector (-1, 0, -1),   Angles (M_PI, 3*M_PI_4)), TestCase::QUICK);
143
  AddTestCase (new OneVectorConstructorTestCase (Vector (-1, 1, 0),    Angles (3*M_PI_4, M_PI_2)));
143
  AddTestCase (new OneVectorConstructorTestCase (Vector (-1, 1, 0),    Angles (3*M_PI_4, M_PI_2)), TestCase::QUICK);
144
  AddTestCase (new OneVectorConstructorTestCase (Vector (-1, -1, 0),   Angles (-3*M_PI_4, M_PI_2)));
144
  AddTestCase (new OneVectorConstructorTestCase (Vector (-1, -1, 0),   Angles (-3*M_PI_4, M_PI_2)), TestCase::QUICK);
145
  AddTestCase (new OneVectorConstructorTestCase (Vector (0, 1, 1),     Angles (M_PI_2, M_PI_4)));
145
  AddTestCase (new OneVectorConstructorTestCase (Vector (0, 1, 1),     Angles (M_PI_2, M_PI_4)), TestCase::QUICK);
146
  AddTestCase (new OneVectorConstructorTestCase (Vector (0, 1, -1),    Angles (M_PI_2, 3*M_PI_4)));
146
  AddTestCase (new OneVectorConstructorTestCase (Vector (0, 1, -1),    Angles (M_PI_2, 3*M_PI_4)), TestCase::QUICK);
147
  AddTestCase (new OneVectorConstructorTestCase (Vector (0, -1, 1),    Angles (-M_PI_2, M_PI_4)));
147
  AddTestCase (new OneVectorConstructorTestCase (Vector (0, -1, 1),    Angles (-M_PI_2, M_PI_4)), TestCase::QUICK);
148
  AddTestCase (new OneVectorConstructorTestCase (Vector (0, -1, -1),   Angles (-M_PI_2, 3*M_PI_4)));
148
  AddTestCase (new OneVectorConstructorTestCase (Vector (0, -1, -1),   Angles (-M_PI_2, 3*M_PI_4)), TestCase::QUICK);
149
149
150
  AddTestCase (new OneVectorConstructorTestCase (Vector (1, 1, std::sqrt (2)),  Angles (M_PI_4, M_PI_4)));
150
  AddTestCase (new OneVectorConstructorTestCase (Vector (1, 1, std::sqrt (2)),  Angles (M_PI_4, M_PI_4)), TestCase::QUICK);
151
  AddTestCase (new OneVectorConstructorTestCase (Vector (1, 1, -std::sqrt (2)), Angles (M_PI_4, 3*M_PI_4)));
151
  AddTestCase (new OneVectorConstructorTestCase (Vector (1, 1, -std::sqrt (2)), Angles (M_PI_4, 3*M_PI_4)), TestCase::QUICK);
152
  AddTestCase (new OneVectorConstructorTestCase (Vector (1, -1, std::sqrt (2)), Angles (-M_PI_4, M_PI_4)));
152
  AddTestCase (new OneVectorConstructorTestCase (Vector (1, -1, std::sqrt (2)), Angles (-M_PI_4, M_PI_4)), TestCase::QUICK);
153
  AddTestCase (new OneVectorConstructorTestCase (Vector (-1, 1, std::sqrt (2)), Angles (3*M_PI_4, M_PI_4)));
153
  AddTestCase (new OneVectorConstructorTestCase (Vector (-1, 1, std::sqrt (2)), Angles (3*M_PI_4, M_PI_4)), TestCase::QUICK);
154
154
155
155
156
156
157
157
158
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, 0, 0),     Vector (0, 0, 0), Angles (0, M_PI_2)));
158
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, 0, 0),     Vector (0, 0, 0), Angles (0, M_PI_2)), TestCase::QUICK);
159
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, 0, 0),    Vector (0, 0, 0), Angles (M_PI, M_PI_2)));
159
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, 0, 0),    Vector (0, 0, 0), Angles (M_PI, M_PI_2)), TestCase::QUICK);
160
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 1, 0),     Vector (0, 0, 0), Angles (M_PI_2, M_PI_2)));
160
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 1, 0),     Vector (0, 0, 0), Angles (M_PI_2, M_PI_2)), TestCase::QUICK);
161
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, -1, 0),    Vector (0, 0, 0), Angles (-M_PI_2, M_PI_2)));
161
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, -1, 0),    Vector (0, 0, 0), Angles (-M_PI_2, M_PI_2)), TestCase::QUICK);
162
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 0, 1),     Vector (0, 0, 0), Angles (0, 0)));
162
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 0, 1),     Vector (0, 0, 0), Angles (0, 0)), TestCase::QUICK);
163
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 0, -1),    Vector (0, 0, 0), Angles (0, M_PI)));
163
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 0, -1),    Vector (0, 0, 0), Angles (0, M_PI)), TestCase::QUICK);
164
164
165
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (2, 0, 0),     Vector (0, 0, 0), Angles (0, M_PI_2)));
165
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (2, 0, 0),     Vector (0, 0, 0), Angles (0, M_PI_2)), TestCase::QUICK);
166
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (-2, 0, 0),    Vector (0, 0, 0), Angles (M_PI, M_PI_2)));
166
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (-2, 0, 0),    Vector (0, 0, 0), Angles (M_PI, M_PI_2)), TestCase::QUICK);
167
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 2, 0),     Vector (0, 0, 0), Angles (M_PI_2, M_PI_2)));
167
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 2, 0),     Vector (0, 0, 0), Angles (M_PI_2, M_PI_2)), TestCase::QUICK);
168
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, -2, 0),    Vector (0, 0, 0), Angles (-M_PI_2, M_PI_2)));
168
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, -2, 0),    Vector (0, 0, 0), Angles (-M_PI_2, M_PI_2)), TestCase::QUICK);
169
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 0, 2),     Vector (0, 0, 0), Angles (0, 0)));
169
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 0, 2),     Vector (0, 0, 0), Angles (0, 0)), TestCase::QUICK);
170
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 0, -2),    Vector (0, 0, 0), Angles (0, M_PI)));
170
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 0, -2),    Vector (0, 0, 0), Angles (0, M_PI)), TestCase::QUICK);
171
171
172
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, 0, 1),     Vector (0, 0, 0), Angles (0, M_PI_4)));
172
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, 0, 1),     Vector (0, 0, 0), Angles (0, M_PI_4)), TestCase::QUICK);
173
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, 0, -1),    Vector (0, 0, 0), Angles (0, 3*M_PI_4)));
173
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, 0, -1),    Vector (0, 0, 0), Angles (0, 3*M_PI_4)), TestCase::QUICK);
174
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, 1, 0),     Vector (0, 0, 0), Angles (M_PI_4, M_PI_2)));
174
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, 1, 0),     Vector (0, 0, 0), Angles (M_PI_4, M_PI_2)), TestCase::QUICK);
175
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, -1, 0),    Vector (0, 0, 0), Angles (-M_PI_4, M_PI_2)));
175
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, -1, 0),    Vector (0, 0, 0), Angles (-M_PI_4, M_PI_2)), TestCase::QUICK);
176
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, 0, 1),    Vector (0, 0, 0), Angles (M_PI, M_PI_4)));
176
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, 0, 1),    Vector (0, 0, 0), Angles (M_PI, M_PI_4)), TestCase::QUICK);
177
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, 0, -1),   Vector (0, 0, 0), Angles (M_PI, 3*M_PI_4)));
177
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, 0, -1),   Vector (0, 0, 0), Angles (M_PI, 3*M_PI_4)), TestCase::QUICK);
178
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, 1, 0),    Vector (0, 0, 0), Angles (3*M_PI_4, M_PI_2)));
178
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, 1, 0),    Vector (0, 0, 0), Angles (3*M_PI_4, M_PI_2)), TestCase::QUICK);
179
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, -1, 0),   Vector (0, 0, 0), Angles (-3*M_PI_4, M_PI_2)));
179
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, -1, 0),   Vector (0, 0, 0), Angles (-3*M_PI_4, M_PI_2)), TestCase::QUICK);
180
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 1, 1),     Vector (0, 0, 0), Angles (M_PI_2, M_PI_4)));
180
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 1, 1),     Vector (0, 0, 0), Angles (M_PI_2, M_PI_4)), TestCase::QUICK);
181
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 1, -1),    Vector (0, 0, 0), Angles (M_PI_2, 3*M_PI_4)));
181
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 1, -1),    Vector (0, 0, 0), Angles (M_PI_2, 3*M_PI_4)), TestCase::QUICK);
182
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, -1, 1),    Vector (0, 0, 0), Angles (-M_PI_2, M_PI_4)));
182
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, -1, 1),    Vector (0, 0, 0), Angles (-M_PI_2, M_PI_4)), TestCase::QUICK);
183
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, -1, -1),   Vector (0, 0, 0), Angles (-M_PI_2, 3*M_PI_4)));
183
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, -1, -1),   Vector (0, 0, 0), Angles (-M_PI_2, 3*M_PI_4)), TestCase::QUICK);
184
184
185
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, 1, std::sqrt (2)),  Vector (0, 0, 0), Angles (M_PI_4, M_PI_4)));
185
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, 1, std::sqrt (2)),  Vector (0, 0, 0), Angles (M_PI_4, M_PI_4)), TestCase::QUICK);
186
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, 1, -std::sqrt (2)), Vector (0, 0, 0), Angles (M_PI_4, 3*M_PI_4)));
186
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, 1, -std::sqrt (2)), Vector (0, 0, 0), Angles (M_PI_4, 3*M_PI_4)), TestCase::QUICK);
187
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, -1, std::sqrt (2)), Vector (0, 0, 0), Angles (-M_PI_4, M_PI_4)));
187
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, -1, std::sqrt (2)), Vector (0, 0, 0), Angles (-M_PI_4, M_PI_4)), TestCase::QUICK);
188
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, 1, std::sqrt (2)), Vector (0, 0, 0), Angles (3*M_PI_4, M_PI_4)));
188
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, 1, std::sqrt (2)), Vector (0, 0, 0), Angles (3*M_PI_4, M_PI_4)), TestCase::QUICK);
189
189
190
190
191
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (3, 2, 2),     Vector (2, 2, 2), Angles (0, M_PI_2)));
191
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (3, 2, 2),     Vector (2, 2, 2), Angles (0, M_PI_2)), TestCase::QUICK);
192
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, 2, 2),     Vector (2, 2, 2), Angles (M_PI, M_PI_2)));
192
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, 2, 2),     Vector (2, 2, 2), Angles (M_PI, M_PI_2)), TestCase::QUICK);
193
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (2, 3, 2),     Vector (2, 2, 2), Angles (M_PI_2, M_PI_2)));
193
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (2, 3, 2),     Vector (2, 2, 2), Angles (M_PI_2, M_PI_2)), TestCase::QUICK);
194
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, 2, 2),    Vector (-1, 3, 2), Angles (-M_PI_2, M_PI_2)));
194
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, 2, 2),    Vector (-1, 3, 2), Angles (-M_PI_2, M_PI_2)), TestCase::QUICK);
195
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (4, -2, 7),    Vector (4, -2, 6), Angles (0, 0)));
195
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (4, -2, 7),    Vector (4, -2, 6), Angles (0, 0)), TestCase::QUICK);
196
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, -5, -1),   Vector (0, -5, 0), Angles (0, M_PI)));
196
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, -5, -1),   Vector (0, -5, 0), Angles (0, M_PI)), TestCase::QUICK);
197
197
198
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (-2, 2, -1),     Vector (-4, 2, -1), Angles (0, M_PI_2)));
198
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (-2, 2, -1),     Vector (-4, 2, -1), Angles (0, M_PI_2)), TestCase::QUICK);
199
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (2, 2, 0),    Vector (4, 2, 0), Angles (M_PI, M_PI_2)));
199
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (2, 2, 0),    Vector (4, 2, 0), Angles (M_PI, M_PI_2)), TestCase::QUICK);
200
200
201
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, 4, 4),     Vector (-2, 4, 3), Angles (0, M_PI_4)));
201
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, 4, 4),     Vector (-2, 4, 3), Angles (0, M_PI_4)), TestCase::QUICK);
202
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, -2, -6),    Vector (-1, -2, -5), Angles (0, 3*M_PI_4)));
202
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, -2, -6),    Vector (-1, -2, -5), Angles (0, 3*M_PI_4)), TestCase::QUICK);
203
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (77, 3, 43),    Vector (78, 2, 43), Angles (3*M_PI_4, M_PI_2)));
203
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (77, 3, 43),    Vector (78, 2, 43), Angles (3*M_PI_4, M_PI_2)), TestCase::QUICK);
204
204
205
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (24, -2, -6 -std::sqrt (2)), Vector (23, -3, -6), Angles (M_PI_4, 3*M_PI_4)));
205
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (24, -2, -6 -std::sqrt (2)), Vector (23, -3, -6), Angles (M_PI_4, 3*M_PI_4)), TestCase::QUICK);
206
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (0.5, 11.45, std::sqrt (2)-1), Vector (-0.5, 12.45, -1), Angles (-M_PI_4, M_PI_4)));
206
  AddTestCase (new TwoVectorsConstructorTestCase (Vector (0.5, 11.45, std::sqrt (2)-1), Vector (-0.5, 12.45, -1), Angles (-M_PI_4, M_PI_4)), TestCase::QUICK);
207
207
208
208
209
};
209
};
(-)a/src/antenna/test/test-cosine-antenna.cc (-71 / +71 lines)
 Lines 118-205    Link Here 
118
  // e.g., with a 60 deg beamwidth, gain is -20dB at +- 74.945 degrees from boresight
118
  // e.g., with a 60 deg beamwidth, gain is -20dB at +- 74.945 degrees from boresight
119
119
120
  //                                                                      phi,  theta, beamwidth, orientation,  maxGain,  expectedGain,   condition
120
  //                                                                      phi,  theta, beamwidth, orientation,  maxGain,  expectedGain,   condition
121
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians    (0),    0),        60,           0,        0,             0,     EQUAL));
121
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians    (0),    0),        60,           0,        0,             0,     EQUAL), TestCase::QUICK);
122
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (30),    0),        60,           0,        0,            -3,     EQUAL));
122
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (30),    0),        60,           0,        0,            -3,     EQUAL), TestCase::QUICK);
123
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (-30),    0),        60,           0,        0,            -3,     EQUAL));
123
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (-30),    0),        60,           0,        0,            -3,     EQUAL), TestCase::QUICK);
124
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (-90),    0),        60,           0,        0,           -20,  LESSTHAN));
124
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (-90),    0),        60,           0,        0,           -20,  LESSTHAN), TestCase::QUICK);
125
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (90),    0),        60,           0,        0,           -20,  LESSTHAN));
125
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (90),    0),        60,           0,        0,           -20,  LESSTHAN), TestCase::QUICK);
126
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (100),    0),        60,           0,        0,           -20,  LESSTHAN));
126
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (100),    0),        60,           0,        0,           -20,  LESSTHAN), TestCase::QUICK);
127
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (150),    0),        60,           0,        0,           -20,  LESSTHAN));
127
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (150),    0),        60,           0,        0,           -20,  LESSTHAN), TestCase::QUICK);
128
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (180),    0),        60,           0,        0,           -20,  LESSTHAN));
128
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (180),    0),        60,           0,        0,           -20,  LESSTHAN), TestCase::QUICK);
129
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-100),    0),        60,           0,        0,           -20,  LESSTHAN));
129
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-100),    0),        60,           0,        0,           -20,  LESSTHAN), TestCase::QUICK);
130
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-150),    0),        60,           0,        0,           -20,  LESSTHAN));
130
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-150),    0),        60,           0,        0,           -20,  LESSTHAN), TestCase::QUICK);
131
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-180),    0),        60,           0,        0,           -20,  LESSTHAN));
131
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-180),    0),        60,           0,        0,           -20,  LESSTHAN), TestCase::QUICK);
132
132
133
  // test positive orientation
133
  // test positive orientation
134
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (60),    0),        60,          60,        0,             0,     EQUAL));
134
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (60),    0),        60,          60,        0,             0,     EQUAL), TestCase::QUICK);
135
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (90),    0),        60,          60,        0,            -3,     EQUAL));
135
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (90),    0),        60,          60,        0,            -3,     EQUAL), TestCase::QUICK);
136
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (30),    0),        60,          60,        0,            -3,     EQUAL));
136
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (30),    0),        60,          60,        0,            -3,     EQUAL), TestCase::QUICK);
137
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (-30),    0),        60,          60,        0,           -20,  LESSTHAN));
137
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (-30),    0),        60,          60,        0,           -20,  LESSTHAN), TestCase::QUICK);
138
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (150),    0),        60,          60,        0,           -20,  LESSTHAN));
138
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (150),    0),        60,          60,        0,           -20,  LESSTHAN), TestCase::QUICK);
139
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (160),    0),        60,          60,        0,           -20,  LESSTHAN));
139
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (160),    0),        60,          60,        0,           -20,  LESSTHAN), TestCase::QUICK);
140
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (210),    0),        60,          60,        0,           -20,  LESSTHAN));
140
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (210),    0),        60,          60,        0,           -20,  LESSTHAN), TestCase::QUICK);
141
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (240),    0),        60,          60,        0,           -20,  LESSTHAN));
141
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (240),    0),        60,          60,        0,           -20,  LESSTHAN), TestCase::QUICK);
142
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (-40),    0),        60,          60,        0,           -20,  LESSTHAN));
142
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (-40),    0),        60,          60,        0,           -20,  LESSTHAN), TestCase::QUICK);
143
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (-90),    0),        60,          60,        0,           -20,  LESSTHAN));
143
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (-90),    0),        60,          60,        0,           -20,  LESSTHAN), TestCase::QUICK);
144
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-120),    0),        60,          60,        0,           -20,  LESSTHAN));
144
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-120),    0),        60,          60,        0,           -20,  LESSTHAN), TestCase::QUICK);
145
145
146
  // test negative orientation and different beamwidths
146
  // test negative orientation and different beamwidths
147
  // with a 100 deg beamwidth, gain is -20dB at +- 117.47 degrees from boresight
147
  // with a 100 deg beamwidth, gain is -20dB at +- 117.47 degrees from boresight
148
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-150),    0),       100,        -150,        0,             0,     EQUAL));
148
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-150),    0),       100,        -150,        0,             0,     EQUAL), TestCase::QUICK);
149
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-100),    0),       100,        -150,        0,            -3,     EQUAL));
149
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-100),    0),       100,        -150,        0,            -3,     EQUAL), TestCase::QUICK);
150
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-200),    0),       100,        -150,        0,            -3,     EQUAL));
150
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-200),    0),       100,        -150,        0,            -3,     EQUAL), TestCase::QUICK);
151
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-32.531), 0),       100,        -150,        0,           -20,     EQUAL));
151
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-32.531), 0),       100,        -150,        0,           -20,     EQUAL), TestCase::QUICK);
152
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (92.531),  0),       100,        -150,        0,           -20,     EQUAL));
152
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (92.531),  0),       100,        -150,        0,           -20,     EQUAL), TestCase::QUICK);
153
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (-30),    0),       100,        -150,        0,           -20,  LESSTHAN));
153
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (-30),    0),       100,        -150,        0,           -20,  LESSTHAN), TestCase::QUICK);
154
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians    (0),    0),       100,        -150,        0,           -20,  LESSTHAN));
154
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians    (0),    0),       100,        -150,        0,           -20,  LESSTHAN), TestCase::QUICK);
155
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (60),    0),       100,        -150,        0,           -20,  LESSTHAN));
155
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (60),    0),       100,        -150,        0,           -20,  LESSTHAN), TestCase::QUICK);
156
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (90),    0),       100,        -150,        0,           -20,  LESSTHAN));
156
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (90),    0),       100,        -150,        0,           -20,  LESSTHAN), TestCase::QUICK);
157
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (30),    0),       100,        -150,        0,           -20,  LESSTHAN));
157
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (30),    0),       100,        -150,        0,           -20,  LESSTHAN), TestCase::QUICK);
158
  // with a 150 deg beamwidth, gain is -10dB at +- 124.93 degrees from boresight, and -20dB at +- 155.32 degrees from boresight
158
  // with a 150 deg beamwidth, gain is -10dB at +- 124.93 degrees from boresight, and -20dB at +- 155.32 degrees from boresight
159
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-150),    0),       150,        -150,        0,             0,     EQUAL));
159
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-150),    0),       150,        -150,        0,             0,     EQUAL), TestCase::QUICK);
160
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (135),    0),       150,        -150,        0,            -3,     EQUAL));
160
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (135),    0),       150,        -150,        0,            -3,     EQUAL), TestCase::QUICK);
161
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (-75),    0),       150,        -150,        0,            -3,     EQUAL));
161
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (-75),    0),       150,        -150,        0,            -3,     EQUAL), TestCase::QUICK);
162
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (85.070),  0),       150,        -150,        0,           -10,     EQUAL));
162
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (85.070),  0),       150,        -150,        0,           -10,     EQUAL), TestCase::QUICK);
163
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-25.070), 0),       150,        -150,        0,           -10,     EQUAL));
163
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-25.070), 0),       150,        -150,        0,           -10,     EQUAL), TestCase::QUICK);
164
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (5.3230),  0),       150,        -150,        0,           -20,     EQUAL));
164
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (5.3230),  0),       150,        -150,        0,           -20,     EQUAL), TestCase::QUICK);
165
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (54.677),  0),       150,        -150,        0,           -20,     EQUAL));
165
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (54.677),  0),       150,        -150,        0,           -20,     EQUAL), TestCase::QUICK);
166
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (30),    0),       150,        -150,        0,           -20,  LESSTHAN));
166
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (30),    0),       150,        -150,        0,           -20,  LESSTHAN), TestCase::QUICK);
167
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (20),    0),       150,        -150,        0,           -20,  LESSTHAN));
167
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (20),    0),       150,        -150,        0,           -20,  LESSTHAN), TestCase::QUICK);
168
168
169
  // test maxGain
169
  // test maxGain
170
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians    (0),    0),        60,           0,       10,            10,     EQUAL));
170
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians    (0),    0),        60,           0,       10,            10,     EQUAL), TestCase::QUICK);
171
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (30),    0),        60,           0,       22,            19,     EQUAL));
171
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (30),    0),        60,           0,       22,            19,     EQUAL), TestCase::QUICK);
172
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (-30),    0),        60,           0,       -4,            -7,     EQUAL));
172
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (-30),    0),        60,           0,       -4,            -7,     EQUAL), TestCase::QUICK);
173
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (-90),    0),        60,           0,       10,           -10,  LESSTHAN));
173
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (-90),    0),        60,           0,       10,           -10,  LESSTHAN), TestCase::QUICK);
174
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (90),    0),        60,           0,      -20,           -40,  LESSTHAN));
174
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (90),    0),        60,           0,      -20,           -40,  LESSTHAN), TestCase::QUICK);
175
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (100),    0),        60,           0,       40,            20,  LESSTHAN));
175
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (100),    0),        60,           0,       40,            20,  LESSTHAN), TestCase::QUICK);
176
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-150),    0),       100,        -150,        2,             2,     EQUAL));
176
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-150),    0),       100,        -150,        2,             2,     EQUAL), TestCase::QUICK);
177
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-100),    0),       100,        -150,        4,             1,     EQUAL));
177
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-100),    0),       100,        -150,        4,             1,     EQUAL), TestCase::QUICK);
178
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-200),    0),       100,        -150,       -1,            -4,     EQUAL));
178
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-200),    0),       100,        -150,       -1,            -4,     EQUAL), TestCase::QUICK);
179
179
180
180
181
  // test elevation angle
181
  // test elevation angle
182
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians    (0),    2),        60,           0,        0,             0,     EQUAL));
182
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians    (0),    2),        60,           0,        0,             0,     EQUAL), TestCase::QUICK);
183
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (30),    2),        60,           0,        0,            -3,     EQUAL));
183
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (30),    2),        60,           0,        0,            -3,     EQUAL), TestCase::QUICK);
184
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (-30),    2),        60,           0,        0,            -3,     EQUAL));
184
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (-30),    2),        60,           0,        0,            -3,     EQUAL), TestCase::QUICK);
185
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (-90),    2),        60,           0,        0,           -20,  LESSTHAN));
185
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (-90),    2),        60,           0,        0,           -20,  LESSTHAN), TestCase::QUICK);
186
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-180),    2),        60,           0,        0,           -20,  LESSTHAN));
186
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-180),    2),        60,           0,        0,           -20,  LESSTHAN), TestCase::QUICK);
187
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (60),   -3),        60,          60,        0,             0,     EQUAL));
187
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (60),   -3),        60,          60,        0,             0,     EQUAL), TestCase::QUICK);
188
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (90),   -3),        60,          60,        0,            -3,     EQUAL));
188
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (90),   -3),        60,          60,        0,            -3,     EQUAL), TestCase::QUICK);
189
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (30),   -3),        60,          60,        0,            -3,     EQUAL));
189
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (30),   -3),        60,          60,        0,            -3,     EQUAL), TestCase::QUICK);
190
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-120),   -3),        60,          60,        0,           -20,  LESSTHAN));
190
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-120),   -3),        60,          60,        0,           -20,  LESSTHAN), TestCase::QUICK);
191
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-150),   -3),       100,        -150,        0,             0,     EQUAL));
191
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-150),   -3),       100,        -150,        0,             0,     EQUAL), TestCase::QUICK);
192
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-100),   -3),       100,        -150,        0,            -3,     EQUAL));
192
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-100),   -3),       100,        -150,        0,            -3,     EQUAL), TestCase::QUICK);
193
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-200),   -3),       100,        -150,        0,            -3,     EQUAL));
193
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-200),   -3),       100,        -150,        0,            -3,     EQUAL), TestCase::QUICK);
194
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (-30),   -3),       100,        -150,        0,           -20,  LESSTHAN));
194
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (-30),   -3),       100,        -150,        0,           -20,  LESSTHAN), TestCase::QUICK);
195
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (90),  9.5),       100,        -150,        0,           -20,  LESSTHAN));
195
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (90),  9.5),       100,        -150,        0,           -20,  LESSTHAN), TestCase::QUICK);
196
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians    (0),  9.5),        60,           0,       10,            10,     EQUAL));
196
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians    (0),  9.5),        60,           0,       10,            10,     EQUAL), TestCase::QUICK);
197
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (30),  9.5),        60,           0,       22,            19,     EQUAL));
197
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians   (30),  9.5),        60,           0,       22,            19,     EQUAL), TestCase::QUICK);
198
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (-30),  9.5),        60,           0,       -4,            -7,     EQUAL));
198
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (-30),  9.5),        60,           0,       -4,            -7,     EQUAL), TestCase::QUICK);
199
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (100),  9.5),        60,           0,       40,            20,  LESSTHAN));
199
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians  (100),  9.5),        60,           0,       40,            20,  LESSTHAN), TestCase::QUICK);
200
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-150),  9.5),       100,        -150,        2,             2,     EQUAL));
200
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-150),  9.5),       100,        -150,        2,             2,     EQUAL), TestCase::QUICK);
201
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-100),  9.5),       100,        -150,        4,             1,     EQUAL));
201
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-100),  9.5),       100,        -150,        4,             1,     EQUAL), TestCase::QUICK);
202
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-200),  9.5),       100,        -150,       -1,            -4,     EQUAL));
202
  AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-200),  9.5),       100,        -150,       -1,            -4,     EQUAL), TestCase::QUICK);
203
203
204
};
204
};
205
205
(-)a/src/antenna/test/test-degrees-radians.cc (-14 / +14 lines)
 Lines 113-133    Link Here 
113
DegreesRadiansTestSuite::DegreesRadiansTestSuite ()
113
DegreesRadiansTestSuite::DegreesRadiansTestSuite ()
114
  : TestSuite ("degrees-radians", UNIT)
114
  : TestSuite ("degrees-radians", UNIT)
115
{
115
{
116
  AddTestCase (new DegreesToRadiansTestCase (0, 0));
116
  AddTestCase (new DegreesToRadiansTestCase (0, 0), TestCase::QUICK);
117
  AddTestCase (new DegreesToRadiansTestCase (90, M_PI_2));
117
  AddTestCase (new DegreesToRadiansTestCase (90, M_PI_2), TestCase::QUICK);
118
  AddTestCase (new DegreesToRadiansTestCase (180, M_PI));
118
  AddTestCase (new DegreesToRadiansTestCase (180, M_PI), TestCase::QUICK);
119
  AddTestCase (new DegreesToRadiansTestCase (270, M_PI + M_PI_2));
119
  AddTestCase (new DegreesToRadiansTestCase (270, M_PI + M_PI_2), TestCase::QUICK);
120
  AddTestCase (new DegreesToRadiansTestCase (360, M_PI + M_PI));
120
  AddTestCase (new DegreesToRadiansTestCase (360, M_PI + M_PI), TestCase::QUICK);
121
  AddTestCase (new DegreesToRadiansTestCase (-90, -M_PI_2));
121
  AddTestCase (new DegreesToRadiansTestCase (-90, -M_PI_2), TestCase::QUICK);
122
  AddTestCase (new DegreesToRadiansTestCase (810, 4.5*M_PI));
122
  AddTestCase (new DegreesToRadiansTestCase (810, 4.5*M_PI), TestCase::QUICK);
123
123
124
  AddTestCase (new RadiansToDegreesTestCase (0, 0));
124
  AddTestCase (new RadiansToDegreesTestCase (0, 0), TestCase::QUICK);
125
  AddTestCase (new RadiansToDegreesTestCase (M_PI_2, 90));
125
  AddTestCase (new RadiansToDegreesTestCase (M_PI_2, 90), TestCase::QUICK);
126
  AddTestCase (new RadiansToDegreesTestCase (M_PI, 180));
126
  AddTestCase (new RadiansToDegreesTestCase (M_PI, 180), TestCase::QUICK);
127
  AddTestCase (new RadiansToDegreesTestCase (M_PI + M_PI_2, 270));
127
  AddTestCase (new RadiansToDegreesTestCase (M_PI + M_PI_2, 270), TestCase::QUICK);
128
  AddTestCase (new RadiansToDegreesTestCase (M_PI + M_PI, 360));
128
  AddTestCase (new RadiansToDegreesTestCase (M_PI + M_PI, 360), TestCase::QUICK);
129
  AddTestCase (new RadiansToDegreesTestCase (-M_PI_2, -90));
129
  AddTestCase (new RadiansToDegreesTestCase (-M_PI_2, -90), TestCase::QUICK);
130
  AddTestCase (new RadiansToDegreesTestCase (4.5*M_PI, 810));
130
  AddTestCase (new RadiansToDegreesTestCase (4.5*M_PI, 810), TestCase::QUICK);
131
131
132
};
132
};
133
133
(-)a/src/antenna/test/test-isotropic-antenna.cc (-9 / +9 lines)
 Lines 77-91    Link Here 
77
IsotropicAntennaModelTestSuite::IsotropicAntennaModelTestSuite ()
77
IsotropicAntennaModelTestSuite::IsotropicAntennaModelTestSuite ()
78
  : TestSuite ("isotropic-antenna-model", UNIT)
78
  : TestSuite ("isotropic-antenna-model", UNIT)
79
{
79
{
80
  AddTestCase (new IsotropicAntennaModelTestCase (Angles (0, 0),           0.0));
80
  AddTestCase (new IsotropicAntennaModelTestCase (Angles (0, 0),           0.0), TestCase::QUICK);
81
  AddTestCase (new IsotropicAntennaModelTestCase (Angles (0, M_PI),        0.0));
81
  AddTestCase (new IsotropicAntennaModelTestCase (Angles (0, M_PI),        0.0), TestCase::QUICK);
82
  AddTestCase (new IsotropicAntennaModelTestCase (Angles (0, M_PI_2),      0.0));
82
  AddTestCase (new IsotropicAntennaModelTestCase (Angles (0, M_PI_2),      0.0), TestCase::QUICK);
83
  AddTestCase (new IsotropicAntennaModelTestCase (Angles (M_PI, 0),        0.0));
83
  AddTestCase (new IsotropicAntennaModelTestCase (Angles (M_PI, 0),        0.0), TestCase::QUICK);
84
  AddTestCase (new IsotropicAntennaModelTestCase (Angles (M_PI, M_PI),     0.0));
84
  AddTestCase (new IsotropicAntennaModelTestCase (Angles (M_PI, M_PI),     0.0), TestCase::QUICK);
85
  AddTestCase (new IsotropicAntennaModelTestCase (Angles (M_PI, M_PI_2),   0.0));
85
  AddTestCase (new IsotropicAntennaModelTestCase (Angles (M_PI, M_PI_2),   0.0), TestCase::QUICK);
86
  AddTestCase (new IsotropicAntennaModelTestCase (Angles (M_PI_2, 0),      0.0));
86
  AddTestCase (new IsotropicAntennaModelTestCase (Angles (M_PI_2, 0),      0.0), TestCase::QUICK);
87
  AddTestCase (new IsotropicAntennaModelTestCase (Angles (M_PI_2, M_PI),   0.0));
87
  AddTestCase (new IsotropicAntennaModelTestCase (Angles (M_PI_2, M_PI),   0.0), TestCase::QUICK);
88
  AddTestCase (new IsotropicAntennaModelTestCase (Angles (M_PI_2, M_PI_2), 0.0));
88
  AddTestCase (new IsotropicAntennaModelTestCase (Angles (M_PI_2, M_PI_2), 0.0), TestCase::QUICK);
89
89
90
};
90
};
91
91
(-)a/src/antenna/test/test-parabolic-antenna.cc (-53 / +53 lines)
 Lines 116-184    Link Here 
116
116
117
  // with a 60 deg beamwidth, gain is -20dB at +-77.460 degrees from boresight
117
  // with a 60 deg beamwidth, gain is -20dB at +-77.460 degrees from boresight
118
  //                                                                         phi,  theta, beamwidth, orientation,  maxAttn,  expectedGain,   condition
118
  //                                                                         phi,  theta, beamwidth, orientation,  maxAttn,  expectedGain,   condition
119
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians    (0),    0),        60,           0,       20,             0,     EQUAL));
119
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians    (0),    0),        60,           0,       20,             0,     EQUAL), TestCase::QUICK);
120
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians   (30),    0),        60,           0,       20,            -3,     EQUAL));
120
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians   (30),    0),        60,           0,       20,            -3,     EQUAL), TestCase::QUICK);
121
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (-30),    0),        60,           0,       20,            -3,     EQUAL));
121
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (-30),    0),        60,           0,       20,            -3,     EQUAL), TestCase::QUICK);
122
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (-90),    0),        60,           0,       20,           -20,     EQUAL));
122
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (-90),    0),        60,           0,       20,           -20,     EQUAL), TestCase::QUICK);
123
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians   (90),    0),        60,           0,       20,           -20,     EQUAL));
123
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians   (90),    0),        60,           0,       20,           -20,     EQUAL), TestCase::QUICK);
124
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (100),    0),        60,           0,       20,           -20,     EQUAL));
124
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (100),    0),        60,           0,       20,           -20,     EQUAL), TestCase::QUICK);
125
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (150),    0),        60,           0,       20,           -20,     EQUAL));
125
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (150),    0),        60,           0,       20,           -20,     EQUAL), TestCase::QUICK);
126
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (180),    0),        60,           0,       20,           -20,     EQUAL));
126
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (180),    0),        60,           0,       20,           -20,     EQUAL), TestCase::QUICK);
127
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-100),    0),        60,           0,       20,           -20,     EQUAL));
127
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-100),    0),        60,           0,       20,           -20,     EQUAL), TestCase::QUICK);
128
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-150),    0),        60,           0,       20,           -20,     EQUAL));
128
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-150),    0),        60,           0,       20,           -20,     EQUAL), TestCase::QUICK);
129
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-180),    0),        60,           0,       20,           -20,     EQUAL));
129
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-180),    0),        60,           0,       20,           -20,     EQUAL), TestCase::QUICK);
130
130
131
  // with a 60 deg beamwidth, gain is -10dB at +-54.772 degrees from boresight
131
  // with a 60 deg beamwidth, gain is -10dB at +-54.772 degrees from boresight
132
  // test positive orientation
132
  // test positive orientation
133
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians   (60),    0),        60,          60,       10,             0,     EQUAL));
133
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians   (60),    0),        60,          60,       10,             0,     EQUAL), TestCase::QUICK);
134
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians   (90),    0),        60,          60,       10,            -3,     EQUAL));
134
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians   (90),    0),        60,          60,       10,            -3,     EQUAL), TestCase::QUICK);
135
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians   (30),    0),        60,          60,       10,            -3,     EQUAL));
135
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians   (30),    0),        60,          60,       10,            -3,     EQUAL), TestCase::QUICK);
136
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (-30),    0),        60,          60,       10,           -10,     EQUAL));
136
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (-30),    0),        60,          60,       10,           -10,     EQUAL), TestCase::QUICK);
137
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (150),    0),        60,          60,       10,           -10,     EQUAL));
137
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (150),    0),        60,          60,       10,           -10,     EQUAL), TestCase::QUICK);
138
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (160),    0),        60,          60,       10,           -10,     EQUAL));
138
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (160),    0),        60,          60,       10,           -10,     EQUAL), TestCase::QUICK);
139
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (210),    0),        60,          60,       10,           -10,     EQUAL));
139
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (210),    0),        60,          60,       10,           -10,     EQUAL), TestCase::QUICK);
140
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (240),    0),        60,          60,       10,           -10,     EQUAL));
140
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (240),    0),        60,          60,       10,           -10,     EQUAL), TestCase::QUICK);
141
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (-40),    0),        60,          60,       10,           -10,     EQUAL));
141
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (-40),    0),        60,          60,       10,           -10,     EQUAL), TestCase::QUICK);
142
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (-90),    0),        60,          60,       10,           -10,     EQUAL));
142
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (-90),    0),        60,          60,       10,           -10,     EQUAL), TestCase::QUICK);
143
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-120),    0),        60,          60,       10,           -10,     EQUAL));
143
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-120),    0),        60,          60,       10,           -10,     EQUAL), TestCase::QUICK);
144
144
145
  // test negative orientation and different beamwidths
145
  // test negative orientation and different beamwidths
146
  // with a 80 deg beamwidth, gain is -20dB at +- 73.030 degrees from boresight
146
  // with a 80 deg beamwidth, gain is -20dB at +- 73.030 degrees from boresight
147
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-150),    0),       80,        -150,       10,             0,     EQUAL));
147
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-150),    0),       80,        -150,       10,             0,     EQUAL), TestCase::QUICK);
148
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-110),    0),       80,        -150,       10,            -3,     EQUAL));
148
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-110),    0),       80,        -150,       10,            -3,     EQUAL), TestCase::QUICK);
149
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-190),    0),       80,        -150,       10,            -3,     EQUAL));
149
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-190),    0),       80,        -150,       10,            -3,     EQUAL), TestCase::QUICK);
150
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (-70),    0),       80,        -150,       10,           -10,     EQUAL));
150
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (-70),    0),       80,        -150,       10,           -10,     EQUAL), TestCase::QUICK);
151
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians   (92),    0),       80,        -150,       10,           -10,     EQUAL));
151
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians   (92),    0),       80,        -150,       10,           -10,     EQUAL), TestCase::QUICK);
152
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (-30),    0),       80,        -150,       10,           -10,     EQUAL));
152
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (-30),    0),       80,        -150,       10,           -10,     EQUAL), TestCase::QUICK);
153
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians    (0),    0),       80,        -150,       10,           -10,     EQUAL));
153
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians    (0),    0),       80,        -150,       10,           -10,     EQUAL), TestCase::QUICK);
154
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians   (60),    0),       80,        -150,       10,           -10,     EQUAL));
154
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians   (60),    0),       80,        -150,       10,           -10,     EQUAL), TestCase::QUICK);
155
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians   (90),    0),       80,        -150,       10,           -10,     EQUAL));
155
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians   (90),    0),       80,        -150,       10,           -10,     EQUAL), TestCase::QUICK);
156
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians   (30),    0),       80,        -150,       10,           -10,     EQUAL));
156
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians   (30),    0),       80,        -150,       10,           -10,     EQUAL), TestCase::QUICK);
157
157
158
158
159
159
160
  // test elevation angle
160
  // test elevation angle
161
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians    (0),    2),        60,           0,       20,             0,     EQUAL));
161
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians    (0),    2),        60,           0,       20,             0,     EQUAL), TestCase::QUICK);
162
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians   (30),    2),        60,           0,       20,            -3,     EQUAL));
162
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians   (30),    2),        60,           0,       20,            -3,     EQUAL), TestCase::QUICK);
163
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (-30),    2),        60,           0,       20,            -3,     EQUAL));
163
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (-30),    2),        60,           0,       20,            -3,     EQUAL), TestCase::QUICK);
164
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (-90),    2),        60,           0,       20,           -20,     EQUAL));
164
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (-90),    2),        60,           0,       20,           -20,     EQUAL), TestCase::QUICK);
165
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-180),    2),        60,           0,       20,           -20,     EQUAL));
165
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-180),    2),        60,           0,       20,           -20,     EQUAL), TestCase::QUICK);
166
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians   (60),   -3),        60,          60,       20,             0,     EQUAL));
166
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians   (60),   -3),        60,          60,       20,             0,     EQUAL), TestCase::QUICK);
167
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians   (90),   -3),        60,          60,       20,            -3,     EQUAL));
167
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians   (90),   -3),        60,          60,       20,            -3,     EQUAL), TestCase::QUICK);
168
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians   (30),   -3),        60,          60,       20,            -3,     EQUAL));
168
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians   (30),   -3),        60,          60,       20,            -3,     EQUAL), TestCase::QUICK);
169
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-120),   -3),        60,          60,       20,           -20,     EQUAL));
169
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-120),   -3),        60,          60,       20,           -20,     EQUAL), TestCase::QUICK);
170
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-150),   -3),       100,        -150,       10,             0,     EQUAL));
170
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-150),   -3),       100,        -150,       10,             0,     EQUAL), TestCase::QUICK);
171
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-100),   -3),       100,        -150,       10,            -3,     EQUAL));
171
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-100),   -3),       100,        -150,       10,            -3,     EQUAL), TestCase::QUICK);
172
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-200),   -3),       100,        -150,       10,            -3,     EQUAL));
172
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-200),   -3),       100,        -150,       10,            -3,     EQUAL), TestCase::QUICK);
173
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (-30),   -3),       100,        -150,       10,           -10,     EQUAL));
173
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (-30),   -3),       100,        -150,       10,           -10,     EQUAL), TestCase::QUICK);
174
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians   (90),  9.5),       100,        -150,       10,           -10,     EQUAL));
174
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians   (90),  9.5),       100,        -150,       10,           -10,     EQUAL), TestCase::QUICK);
175
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians    (0),  9.5),        60,           0,       20,             0,     EQUAL));
175
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians    (0),  9.5),        60,           0,       20,             0,     EQUAL), TestCase::QUICK);
176
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians   (30),  9.5),        60,           0,       20,            -3,     EQUAL));
176
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians   (30),  9.5),        60,           0,       20,            -3,     EQUAL), TestCase::QUICK);
177
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (-30),  9.5),        60,           0,       20,            -3,     EQUAL));
177
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (-30),  9.5),        60,           0,       20,            -3,     EQUAL), TestCase::QUICK);
178
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (100),  9.5),        60,           0,       20,           -20,     EQUAL));
178
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians  (100),  9.5),        60,           0,       20,           -20,     EQUAL), TestCase::QUICK);
179
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-150),  9.5),       100,        -150,       30,             0,     EQUAL));
179
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-150),  9.5),       100,        -150,       30,             0,     EQUAL), TestCase::QUICK);
180
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-100),  9.5),       100,        -150,       30,            -3,     EQUAL));
180
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-100),  9.5),       100,        -150,       30,            -3,     EQUAL), TestCase::QUICK);
181
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-200),  9.5),       100,        -150,       30,            -3,     EQUAL));
181
  AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-200),  9.5),       100,        -150,       30,            -3,     EQUAL), TestCase::QUICK);
182
182
183
};
183
};
184
184
(-)a/src/aodv/test/aodv-id-cache-test-suite.cc (-1 / +1 lines)
 Lines 95-101    Link Here 
95
public:
95
public:
96
  IdCacheTestSuite () : TestSuite ("routing-id-cache", UNIT)
96
  IdCacheTestSuite () : TestSuite ("routing-id-cache", UNIT)
97
  {
97
  {
98
    AddTestCase (new IdCacheTest);
98
    AddTestCase (new IdCacheTest, TestCase::QUICK);
99
  }
99
  }
100
} g_idCacheTestSuite;
100
} g_idCacheTestSuite;
101
101
(-)a/src/aodv/test/aodv-regression.cc (-5 / +5 lines)
 Lines 56-70    Link Here 
56
  {
56
  {
57
    SetDataDir (NS_TEST_SOURCEDIR);
57
    SetDataDir (NS_TEST_SOURCEDIR);
58
    // General RREQ-RREP-RRER test case
58
    // General RREQ-RREP-RRER test case
59
    AddTestCase (new ChainRegressionTest ("aodv-chain-regression-test"));
59
    AddTestCase (new ChainRegressionTest ("aodv-chain-regression-test"), TestCase::QUICK);
60
    // Bug 606 test case, should crash if bug is not fixed
60
    // Bug 606 test case, should crash if bug is not fixed
61
    AddTestCase (new ChainRegressionTest ("bug-606-test", Seconds (10), 3, Seconds (1)));
61
    AddTestCase (new ChainRegressionTest ("bug-606-test", Seconds (10), 3, Seconds (1)), TestCase::QUICK);
62
    // Bug 772 UDP test case
62
    // Bug 772 UDP test case
63
    AddTestCase (new Bug772ChainTest ("udp-chain-test", "ns3::UdpSocketFactory", Seconds (3), 10));
63
    AddTestCase (new Bug772ChainTest ("udp-chain-test", "ns3::UdpSocketFactory", Seconds (3), 10), TestCase::QUICK);
64
    // Bug 772 TCP test case
64
    // Bug 772 TCP test case
65
    AddTestCase (new Bug772ChainTest ("tcp-chain-test", "ns3::TcpSocketFactory", Seconds (3), 10));
65
    AddTestCase (new Bug772ChainTest ("tcp-chain-test", "ns3::TcpSocketFactory", Seconds (3), 10), TestCase::QUICK);
66
    // Ping loopback test case
66
    // Ping loopback test case
67
    AddTestCase (new LoopbackTestCase ());
67
    AddTestCase (new LoopbackTestCase (), TestCase::QUICK);
68
  }
68
  }
69
} g_aodvRegressionTestSuite;
69
} g_aodvRegressionTestSuite;
70
 
70
 
(-)a/src/aodv/test/aodv-test-suite.cc (-10 / +10 lines)
 Lines 525-540    Link Here 
525
public:
525
public:
526
  AodvTestSuite () : TestSuite ("routing-aodv", UNIT)
526
  AodvTestSuite () : TestSuite ("routing-aodv", UNIT)
527
  {
527
  {
528
    AddTestCase (new NeighborTest);
528
    AddTestCase (new NeighborTest, TestCase::QUICK);
529
    AddTestCase (new TypeHeaderTest);
529
    AddTestCase (new TypeHeaderTest, TestCase::QUICK);
530
    AddTestCase (new RreqHeaderTest);
530
    AddTestCase (new RreqHeaderTest, TestCase::QUICK);
531
    AddTestCase (new RrepHeaderTest);
531
    AddTestCase (new RrepHeaderTest, TestCase::QUICK);
532
    AddTestCase (new RrepAckHeaderTest);
532
    AddTestCase (new RrepAckHeaderTest, TestCase::QUICK);
533
    AddTestCase (new RerrHeaderTest);
533
    AddTestCase (new RerrHeaderTest, TestCase::QUICK);
534
    AddTestCase (new QueueEntryTest);
534
    AddTestCase (new QueueEntryTest, TestCase::QUICK);
535
    AddTestCase (new AodvRqueueTest);
535
    AddTestCase (new AodvRqueueTest, TestCase::QUICK);
536
    AddTestCase (new AodvRtableEntryTest);
536
    AddTestCase (new AodvRtableEntryTest, TestCase::QUICK);
537
    AddTestCase (new AodvRtableTest);
537
    AddTestCase (new AodvRtableTest, TestCase::QUICK);
538
  }
538
  }
539
} g_aodvTestSuite;
539
} g_aodvTestSuite;
540
540
(-)a/src/applications/test/udp-client-server-test.cc (-4 / +4 lines)
 Lines 340-349    Link Here 
340
UdpClientServerTestSuite::UdpClientServerTestSuite ()
340
UdpClientServerTestSuite::UdpClientServerTestSuite ()
341
  : TestSuite ("udp-client-server", UNIT)
341
  : TestSuite ("udp-client-server", UNIT)
342
{
342
{
343
  AddTestCase (new UdpTraceClientServerTestCase);
343
  AddTestCase (new UdpTraceClientServerTestCase, TestCase::QUICK);
344
  AddTestCase (new UdpClientServerTestCase);
344
  AddTestCase (new UdpClientServerTestCase, TestCase::QUICK);
345
  AddTestCase (new PacketLossCounterTestCase);
345
  AddTestCase (new PacketLossCounterTestCase, TestCase::QUICK);
346
  AddTestCase (new UdpEchoClientSetFillTestCase);
346
  AddTestCase (new UdpEchoClientSetFillTestCase, TestCase::QUICK);
347
}
347
}
348
348
349
static UdpClientServerTestSuite udpClientServerTestSuite;
349
static UdpClientServerTestSuite udpClientServerTestSuite;
(-)a/src/brite/test/brite-test-topology.cc (-2 / +2 lines)
 Lines 192-199    Link Here 
192
public:
192
public:
193
  BriteTestSuite () : TestSuite ("brite-testing", UNIT)
193
  BriteTestSuite () : TestSuite ("brite-testing", UNIT)
194
  {
194
  {
195
    AddTestCase (new BriteTopologyStructureTestCase);
195
    AddTestCase (new BriteTopologyStructureTestCase, TestCase::QUICK);
196
    AddTestCase (new BriteTopologyFunctionTestCase);
196
    AddTestCase (new BriteTopologyFunctionTestCase, TestCase::QUICK);
197
  }
197
  }
198
} g_briteTestSuite;
198
} g_briteTestSuite;
199
199
(-)a/src/buildings/test/building-position-allocator-test.cc (-2 / +2 lines)
 Lines 231-238    Link Here 
231
{
231
{
232
  NS_LOG_FUNCTION (this);
232
  NS_LOG_FUNCTION (this);
233
233
234
  AddTestCase (new RandomRoomPositionAllocatorTestCase);
234
  AddTestCase (new RandomRoomPositionAllocatorTestCase, TestCase::QUICK);
235
  AddTestCase (new SameRoomPositionAllocatorTestCase);
235
  AddTestCase (new SameRoomPositionAllocatorTestCase, TestCase::QUICK);
236
236
237
}
237
}
238
238
(-)a/src/buildings/test/buildings-helper-test.cc (-16 / +16 lines)
 Lines 203-227    Link Here 
203
  p1.rx = 1;
203
  p1.rx = 1;
204
  p1.ry = 1;
204
  p1.ry = 1;
205
  p1.fn = 1;
205
  p1.fn = 1;
206
  AddTestCase (new BuildingsHelperOneTestCase (p1, b1));
206
  AddTestCase (new BuildingsHelperOneTestCase (p1, b1), TestCase::QUICK);
207
207
208
  Vector vp2 (1.5, 0.5, 0.5);
208
  Vector vp2 (1.5, 0.5, 0.5);
209
  PositionInBuilding p2;
209
  PositionInBuilding p2;
210
  p2.pos = vp2;
210
  p2.pos = vp2;
211
  p2.indoor = false;
211
  p2.indoor = false;
212
  AddTestCase (new BuildingsHelperOneTestCase (p2, b1));
212
  AddTestCase (new BuildingsHelperOneTestCase (p2, b1), TestCase::QUICK);
213
213
214
  Vector vp3 (1.5, 2.5, 0.5);
214
  Vector vp3 (1.5, 2.5, 0.5);
215
  PositionInBuilding p3;
215
  PositionInBuilding p3;
216
  p3.pos = vp3;
216
  p3.pos = vp3;
217
  p3.indoor = false;
217
  p3.indoor = false;
218
  AddTestCase (new BuildingsHelperOneTestCase (p3, b1));
218
  AddTestCase (new BuildingsHelperOneTestCase (p3, b1), TestCase::QUICK);
219
219
220
  Vector vp4 (1.5, 1.5, 5);
220
  Vector vp4 (1.5, 1.5, 5);
221
  PositionInBuilding p4;
221
  PositionInBuilding p4;
222
  p4.pos = vp4;
222
  p4.pos = vp4;
223
  p4.indoor = false;
223
  p4.indoor = false;
224
  AddTestCase (new BuildingsHelperOneTestCase (p4, b1));
224
  AddTestCase (new BuildingsHelperOneTestCase (p4, b1), TestCase::QUICK);
225
225
226
  Vector vp5 (2.5, 1.6, 3.5);
226
  Vector vp5 (2.5, 1.6, 3.5);
227
  PositionInBuilding p5;
227
  PositionInBuilding p5;
 Lines 231-261    Link Here 
231
  p5.rx = 1;
231
  p5.rx = 1;
232
  p5.ry = 1;
232
  p5.ry = 1;
233
  p5.fn = 1;
233
  p5.fn = 1;
234
  AddTestCase (new BuildingsHelperOneTestCase (p5, b1));
234
  AddTestCase (new BuildingsHelperOneTestCase (p5, b1), TestCase::QUICK);
235
235
236
  Vector vp6 (0.9999, 1.5, 1.5);
236
  Vector vp6 (0.9999, 1.5, 1.5);
237
  PositionInBuilding p6;
237
  PositionInBuilding p6;
238
  p6.pos = vp6;
238
  p6.pos = vp6;
239
  p6.indoor = false;
239
  p6.indoor = false;
240
  AddTestCase (new BuildingsHelperOneTestCase (p6, b1));
240
  AddTestCase (new BuildingsHelperOneTestCase (p6, b1), TestCase::QUICK);
241
241
242
  Vector vp7 (3.0001, 1.5, 2.5);
242
  Vector vp7 (3.0001, 1.5, 2.5);
243
  PositionInBuilding p7;
243
  PositionInBuilding p7;
244
  p7.pos = vp7;
244
  p7.pos = vp7;
245
  p7.indoor = false;
245
  p7.indoor = false;
246
  AddTestCase (new BuildingsHelperOneTestCase (p7, b1));
246
  AddTestCase (new BuildingsHelperOneTestCase (p7, b1), TestCase::QUICK);
247
247
248
  Vector vp8 (1.001, 1.001, -0.01);
248
  Vector vp8 (1.001, 1.001, -0.01);
249
  PositionInBuilding p8;
249
  PositionInBuilding p8;
250
  p8.pos = vp8;
250
  p8.pos = vp8;
251
  p8.indoor = false;
251
  p8.indoor = false;
252
  AddTestCase (new BuildingsHelperOneTestCase (p8, b1));
252
  AddTestCase (new BuildingsHelperOneTestCase (p8, b1), TestCase::QUICK);
253
253
254
  Vector vp9 (1.5, 1.5, 4.001);
254
  Vector vp9 (1.5, 1.5, 4.001);
255
  PositionInBuilding p9;
255
  PositionInBuilding p9;
256
  p9.pos = vp9;
256
  p9.pos = vp9;
257
  p9.indoor = false;
257
  p9.indoor = false;
258
  AddTestCase (new BuildingsHelperOneTestCase (p9, b1));
258
  AddTestCase (new BuildingsHelperOneTestCase (p9, b1), TestCase::QUICK);
259
259
260
260
261
261
 Lines 279-285    Link Here 
279
  q1.rx = 1;
279
  q1.rx = 1;
280
  q1.ry = 2;
280
  q1.ry = 2;
281
  q1.fn = 3;
281
  q1.fn = 3;
282
  AddTestCase (new BuildingsHelperOneTestCase (q1, b2));
282
  AddTestCase (new BuildingsHelperOneTestCase (q1, b2), TestCase::QUICK);
283
283
284
  Vector vq2 (0.2, 0.3, 0.2);
284
  Vector vq2 (0.2, 0.3, 0.2);
285
  PositionInBuilding q2;
285
  PositionInBuilding q2;
 Lines 289-325    Link Here 
289
  q2.rx = 3;
289
  q2.rx = 3;
290
  q2.ry = 5;
290
  q2.ry = 5;
291
  q2.fn = 1;
291
  q2.fn = 1;
292
  AddTestCase (new BuildingsHelperOneTestCase (q2, b2));
292
  AddTestCase (new BuildingsHelperOneTestCase (q2, b2), TestCase::QUICK);
293
293
294
  Vector vq3 (0.6, -1.75, 1.5);
294
  Vector vq3 (0.6, -1.75, 1.5);
295
  PositionInBuilding q3;
295
  PositionInBuilding q3;
296
  q3.pos = vq3;
296
  q3.pos = vq3;
297
  q3.indoor = false;
297
  q3.indoor = false;
298
  AddTestCase (new BuildingsHelperOneTestCase (q3, b2));
298
  AddTestCase (new BuildingsHelperOneTestCase (q3, b2), TestCase::QUICK);
299
299
300
  Vector vq4 (-1.01, 0.3, 1.99);
300
  Vector vq4 (-1.01, 0.3, 1.99);
301
  PositionInBuilding q4;
301
  PositionInBuilding q4;
302
  q4.pos = vq4;
302
  q4.pos = vq4;
303
  q4.indoor = false;
303
  q4.indoor = false;
304
  AddTestCase (new BuildingsHelperOneTestCase (q4, b2));
304
  AddTestCase (new BuildingsHelperOneTestCase (q4, b2), TestCase::QUICK);
305
305
306
  Vector vq5 (-0.8, 0.7, 0.01);
306
  Vector vq5 (-0.8, 0.7, 0.01);
307
  PositionInBuilding q5;
307
  PositionInBuilding q5;
308
  q5.pos = vq5;
308
  q5.pos = vq5;
309
  q5.indoor = false;
309
  q5.indoor = false;
310
  AddTestCase (new BuildingsHelperOneTestCase (q5, b2));
310
  AddTestCase (new BuildingsHelperOneTestCase (q5, b2), TestCase::QUICK);
311
311
312
  Vector vq6 (0.2, 0.3, -0.2);
312
  Vector vq6 (0.2, 0.3, -0.2);
313
  PositionInBuilding q6;
313
  PositionInBuilding q6;
314
  q6.pos = vq6;
314
  q6.pos = vq6;
315
  q6.indoor = false;
315
  q6.indoor = false;
316
  AddTestCase (new BuildingsHelperOneTestCase (q6, b2));
316
  AddTestCase (new BuildingsHelperOneTestCase (q6, b2), TestCase::QUICK);
317
317
318
  Vector vq7 (0.2, 0.3, 2.001);
318
  Vector vq7 (0.2, 0.3, 2.001);
319
  PositionInBuilding q7;
319
  PositionInBuilding q7;
320
  q7.pos = vq7;
320
  q7.pos = vq7;
321
  q7.indoor = false;
321
  q7.indoor = false;
322
  AddTestCase (new BuildingsHelperOneTestCase (q7, b2));     
322
  AddTestCase (new BuildingsHelperOneTestCase (q7, b2), TestCase::QUICK);     
323
}
323
}
324
324
325
static BuildingsHelperTestSuite buildingsHelperAntennaTestSuiteInstance;
325
static BuildingsHelperTestSuite buildingsHelperAntennaTestSuiteInstance;
(-)a/src/buildings/test/buildings-pathloss-test.cc (-14 / +14 lines)
 Lines 55-110    Link Here 
55
55
56
  double freq = 869e6;  // E_UTRA BAND #5 see table 5.5-1 of 36.101
56
  double freq = 869e6;  // E_UTRA BAND #5 see table 5.5-1 of 36.101
57
57
58
  AddTestCase (new BuildingsPathlossTestCase (freq, 1, 2, UrbanEnvironment, LargeCity, 137.93, "OH Urban Large city"));
58
  AddTestCase (new BuildingsPathlossTestCase (freq, 1, 2, UrbanEnvironment, LargeCity, 137.93, "OH Urban Large city"), TestCase::QUICK);
59
59
60
  AddTestCase (new BuildingsPathlossTestCase (freq, 1, 2, UrbanEnvironment, SmallCity, 137.88, "OH Urban small city"));
60
  AddTestCase (new BuildingsPathlossTestCase (freq, 1, 2, UrbanEnvironment, SmallCity, 137.88, "OH Urban small city"), TestCase::QUICK);
61
61
62
  AddTestCase (new BuildingsPathlossTestCase (freq, 1, 2, SubUrbanEnvironment, LargeCity, 128.03, "loss OH SubUrban"));
62
  AddTestCase (new BuildingsPathlossTestCase (freq, 1, 2, SubUrbanEnvironment, LargeCity, 128.03, "loss OH SubUrban"), TestCase::QUICK);
63
63
64
  AddTestCase (new BuildingsPathlossTestCase (freq, 1, 2, OpenAreasEnvironment, LargeCity, 110.21, "loss OH OpenAreas"));
64
  AddTestCase (new BuildingsPathlossTestCase (freq, 1, 2, OpenAreasEnvironment, LargeCity, 110.21, "loss OH OpenAreas"), TestCase::QUICK);
65
65
66
  // Test #2 COST231 Model (1500 < freq < 2000~2170 MHz) (Macro<->UE)
66
  // Test #2 COST231 Model (1500 < freq < 2000~2170 MHz) (Macro<->UE)
67
67
68
  freq = 2.1140e9; // E_UTRA BAND #1 see table 5.5-1 of 36.101
68
  freq = 2.1140e9; // E_UTRA BAND #1 see table 5.5-1 of 36.101
69
69
70
  AddTestCase (new BuildingsPathlossTestCase (freq, 1, 2, UrbanEnvironment, LargeCity, 148.55, "COST231 Urban Large city"));
70
  AddTestCase (new BuildingsPathlossTestCase (freq, 1, 2, UrbanEnvironment, LargeCity, 148.55, "COST231 Urban Large city"), TestCase::QUICK);
71
71
72
  AddTestCase (new BuildingsPathlossTestCase (freq, 1, 2, UrbanEnvironment, SmallCity, 150.64, "COST231 Urban small city and suburban"));
72
  AddTestCase (new BuildingsPathlossTestCase (freq, 1, 2, UrbanEnvironment, SmallCity, 150.64, "COST231 Urban small city and suburban"), TestCase::QUICK);
73
73
74
  // Test #3 2.6 GHz model (Macro<->UE)
74
  // Test #3 2.6 GHz model (Macro<->UE)
75
75
76
  freq = 2.620e9; // E_UTRA BAND #7 see table 5.5-1 of 36.101
76
  freq = 2.620e9; // E_UTRA BAND #7 see table 5.5-1 of 36.101
77
77
78
  AddTestCase (new BuildingsPathlossTestCase (freq, 1, 2, UrbanEnvironment, SmallCity, 121.83, "2.6GHz model"));
78
  AddTestCase (new BuildingsPathlossTestCase (freq, 1, 2, UrbanEnvironment, SmallCity, 121.83, "2.6GHz model"), TestCase::QUICK);
79
79
80
  // Test #4 ITU1411 LOS model (Macro<->UE)
80
  // Test #4 ITU1411 LOS model (Macro<->UE)
81
81
82
  freq = 2.1140e9; // E_UTRA BAND #1 see table 5.5-1 of 36.101
82
  freq = 2.1140e9; // E_UTRA BAND #1 see table 5.5-1 of 36.101
83
  AddTestCase (new BuildingsPathlossTestCase (freq, 1, 3, UrbanEnvironment, LargeCity, 81.00, "ITU1411 LOS"));
83
  AddTestCase (new BuildingsPathlossTestCase (freq, 1, 3, UrbanEnvironment, LargeCity, 81.00, "ITU1411 LOS"), TestCase::QUICK);
84
84
85
  // Test #5 ITU1411 NLOS model (Macro<->UE)
85
  // Test #5 ITU1411 NLOS model (Macro<->UE)
86
86
87
  freq = 2.1140e9; // E_UTRA BAND #1 see table 5.5-1 of 36.101
87
  freq = 2.1140e9; // E_UTRA BAND #1 see table 5.5-1 of 36.101
88
88
89
  AddTestCase (new BuildingsPathlossTestCase (freq, 1, 4, UrbanEnvironment, LargeCity, 143.69, "ITU1411 NLOS"));
89
  AddTestCase (new BuildingsPathlossTestCase (freq, 1, 4, UrbanEnvironment, LargeCity, 143.69, "ITU1411 NLOS"), TestCase::QUICK);
90
90
91
  // Test #6 ITUP1238 (HeNB <-> UE)
91
  // Test #6 ITUP1238 (HeNB <-> UE)
92
92
93
  freq = 2.1140e9; // E_UTRA BAND #1 see table 5.5-1 of 36.101
93
  freq = 2.1140e9; // E_UTRA BAND #1 see table 5.5-1 of 36.101
94
  AddTestCase (new BuildingsPathlossTestCase (freq, 5, 6, UrbanEnvironment, LargeCity, 88.3855, "ITUP1238"));
94
  AddTestCase (new BuildingsPathlossTestCase (freq, 5, 6, UrbanEnvironment, LargeCity, 88.3855, "ITUP1238"), TestCase::QUICK);
95
95
96
  // Test #7 Outdoor -> Indoor OkumuraHata (Macro<->UE)
96
  // Test #7 Outdoor -> Indoor OkumuraHata (Macro<->UE)
97
97
98
  freq = 2.1140e9; // E_UTRA BAND #1 see table 5.5-1 of 36.101
98
  freq = 2.1140e9; // E_UTRA BAND #1 see table 5.5-1 of 36.101
99
  // The loss is as in test #2 (large city) plus the building penetration loss
99
  // The loss is as in test #2 (large city) plus the building penetration loss
100
  // which for ConcreteWithWindows is equal to 7 dB -> 148.55 + 7 = 155.55
100
  // which for ConcreteWithWindows is equal to 7 dB -> 148.55 + 7 = 155.55
101
  AddTestCase (new BuildingsPathlossTestCase (freq, 1, 7, UrbanEnvironment, LargeCity, 155.55, "Okumura Hata Outdoor -> Indoor"));
101
  AddTestCase (new BuildingsPathlossTestCase (freq, 1, 7, UrbanEnvironment, LargeCity, 155.55, "Okumura Hata Outdoor -> Indoor"), TestCase::QUICK);
102
102
103
  // Test #8 Outdoor -> Indoor ITU1411 (Macro<->UE)
103
  // Test #8 Outdoor -> Indoor ITU1411 (Macro<->UE)
104
  freq = 2.1140e9; // E_UTRA BAND #1 see table 5.5-1 of 36.101
104
  freq = 2.1140e9; // E_UTRA BAND #1 see table 5.5-1 of 36.101
105
  // The loss is as in test #4 plus the building penetration loss
105
  // The loss is as in test #4 plus the building penetration loss
106
  // which for ConcreteWithWindows is equal to 7 dB -> 81.000 + 7 = 88.000
106
  // which for ConcreteWithWindows is equal to 7 dB -> 81.000 + 7 = 88.000
107
  AddTestCase (new BuildingsPathlossTestCase (freq, 1, 8, UrbanEnvironment, LargeCity, 88.000, "ITU1411 LOS Outdoor -> Indoor"));
107
  AddTestCase (new BuildingsPathlossTestCase (freq, 1, 8, UrbanEnvironment, LargeCity, 88.000, "ITU1411 LOS Outdoor -> Indoor"), TestCase::QUICK);
108
108
109
  // Test #9 Indoor -> Outdoor LOS (HeNB <-> UE)
109
  // Test #9 Indoor -> Outdoor LOS (HeNB <-> UE)
110
110
 Lines 112-118    Link Here 
112
  // The loss is similar of test #4 plus the building penetration loss
112
  // The loss is similar of test #4 plus the building penetration loss
113
  // which for ConcreteWithWindows is equal to 7 dB and the height gain
113
  // which for ConcreteWithWindows is equal to 7 dB and the height gain
114
  // (2 floors x 2 dB/floor = 4) -> 81.838 + 7 - 4 = 84.838
114
  // (2 floors x 2 dB/floor = 4) -> 81.838 + 7 - 4 = 84.838
115
  AddTestCase (new BuildingsPathlossTestCase (freq, 9, 10, UrbanEnvironment, LargeCity, 84.838, "ITU1411 LOS Indoor -> Outdoor"));
115
  AddTestCase (new BuildingsPathlossTestCase (freq, 9, 10, UrbanEnvironment, LargeCity, 84.838, "ITU1411 LOS Indoor -> Outdoor"), TestCase::QUICK);
116
116
117
  // Test #10 Indoor -> Outdoor NLOS (HeNB <-> UE)
117
  // Test #10 Indoor -> Outdoor NLOS (HeNB <-> UE)
118
118
 Lines 120-126    Link Here 
120
  // The loss is similar as in test #4 plus the building penetration loss
120
  // The loss is similar as in test #4 plus the building penetration loss
121
  // which for ConcreteWithWindows is equal to 7 dB and the height gain
121
  // which for ConcreteWithWindows is equal to 7 dB and the height gain
122
  // (2 floors x 2 dB/floor = 4) -> 180.90 + 7 - 4 = 183.90
122
  // (2 floors x 2 dB/floor = 4) -> 180.90 + 7 - 4 = 183.90
123
  AddTestCase (new BuildingsPathlossTestCase (freq, 9, 11, UrbanEnvironment, LargeCity, 183.90, "ITU1411 NLOS Indoor -> Outdoor"));
123
  AddTestCase (new BuildingsPathlossTestCase (freq, 9, 11, UrbanEnvironment, LargeCity, 183.90, "ITU1411 NLOS Indoor -> Outdoor"), TestCase::QUICK);
124
124
125
125
126
}
126
}
(-)a/src/buildings/test/buildings-shadowing-test.cc (-3 / +3 lines)
 Lines 54-66    Link Here 
54
  LogComponentEnable ("BuildingsShadowingTest", LOG_LEVEL_ALL);
54
  LogComponentEnable ("BuildingsShadowingTest", LOG_LEVEL_ALL);
55
55
56
  // Test #1 Outdoor Model
56
  // Test #1 Outdoor Model
57
  AddTestCase (new BuildingsShadowingTestCase (1, 2, 148.86, 7.0, "Outdoor Shadowing"));
57
  AddTestCase (new BuildingsShadowingTestCase (1, 2, 148.86, 7.0, "Outdoor Shadowing"), TestCase::QUICK);
58
58
59
  // Test #2 Indoor model
59
  // Test #2 Indoor model
60
  AddTestCase (new BuildingsShadowingTestCase (5, 6, 88.5724, 8.0, "Indoor Shadowing"));
60
  AddTestCase (new BuildingsShadowingTestCase (5, 6, 88.5724, 8.0, "Indoor Shadowing"), TestCase::QUICK);
61
61
62
  // Test #3 Indoor -> Outdoor
62
  // Test #3 Indoor -> Outdoor
63
  AddTestCase (new BuildingsShadowingTestCase (9, 10, 85.0012, 8.6, "Indoor -> Outdoor Shadowing"));
63
  AddTestCase (new BuildingsShadowingTestCase (9, 10, 85.0012, 8.6, "Indoor -> Outdoor Shadowing"), TestCase::QUICK);
64
64
65
}
65
}
66
66
(-)a/src/click/test/ipv4-click-routing-test.cc (-3 / +3 lines)
 Lines 197-205    Link Here 
197
public:
197
public:
198
  ClickIfidFromNameTestSuite () : TestSuite ("routing-click", UNIT)
198
  ClickIfidFromNameTestSuite () : TestSuite ("routing-click", UNIT)
199
  {
199
  {
200
    AddTestCase (new ClickTrivialTest);
200
    AddTestCase (new ClickTrivialTest, TestCase::QUICK);
201
    AddTestCase (new ClickIfidFromNameTest);
201
    AddTestCase (new ClickIfidFromNameTest, TestCase::QUICK);
202
    AddTestCase (new ClickIpMacAddressFromNameTest);
202
    AddTestCase (new ClickIpMacAddressFromNameTest, TestCase::QUICK);
203
  }
203
  }
204
} g_ipv4ClickRoutingTestSuite;
204
} g_ipv4ClickRoutingTestSuite;
205
205
(-)a/src/core/model/test.h (-1 / +1 lines)
 Lines 858-864    Link Here 
858
   * \param testCase Pointer to the test case object to be added.
858
   * \param testCase Pointer to the test case object to be added.
859
   * \param duration Amount of time this test takes to execute.
859
   * \param duration Amount of time this test takes to execute.
860
   */
860
   */
861
  void AddTestCase (TestCase *testCase, enum TestDuration duration = QUICK);
861
  void AddTestCase (TestCase *testCase, enum TestDuration duration);
862
862
863
  /**
863
  /**
864
   * \param directory the directory where the test data is located
864
   * \param directory the directory where the test data is located
(-)a/src/core/test/attribute-test-suite.cc (-13 / +13 lines)
 Lines 1274-1292    Link Here 
1274
AttributesTestSuite::AttributesTestSuite ()
1274
AttributesTestSuite::AttributesTestSuite ()
1275
  : TestSuite ("attributes", UNIT)
1275
  : TestSuite ("attributes", UNIT)
1276
{
1276
{
1277
  AddTestCase (new AttributeTestCase<BooleanValue> ("Check Attributes of type BooleanValue"));
1277
  AddTestCase (new AttributeTestCase<BooleanValue> ("Check Attributes of type BooleanValue"), TestCase::QUICK);
1278
  AddTestCase (new AttributeTestCase<IntegerValue> ("Check Attributes of type IntegerValue"));
1278
  AddTestCase (new AttributeTestCase<IntegerValue> ("Check Attributes of type IntegerValue"), TestCase::QUICK);
1279
  AddTestCase (new AttributeTestCase<UintegerValue> ("Check Attributes of type UintegerValue"));
1279
  AddTestCase (new AttributeTestCase<UintegerValue> ("Check Attributes of type UintegerValue"), TestCase::QUICK);
1280
  AddTestCase (new AttributeTestCase<DoubleValue> ("Check Attributes of type DoubleValue"));
1280
  AddTestCase (new AttributeTestCase<DoubleValue> ("Check Attributes of type DoubleValue"), TestCase::QUICK);
1281
  AddTestCase (new AttributeTestCase<EnumValue> ("Check Attributes of type EnumValue"));
1281
  AddTestCase (new AttributeTestCase<EnumValue> ("Check Attributes of type EnumValue"), TestCase::QUICK);
1282
  AddTestCase (new RandomVariableStreamAttributeTestCase ("Check Attributes of type RandomVariableStream"));
1282
  AddTestCase (new RandomVariableStreamAttributeTestCase ("Check Attributes of type RandomVariableStream"), TestCase::QUICK);
1283
  AddTestCase (new ObjectVectorAttributeTestCase ("Check Attributes of type ObjectVectorValue"));
1283
  AddTestCase (new ObjectVectorAttributeTestCase ("Check Attributes of type ObjectVectorValue"), TestCase::QUICK);
1284
  AddTestCase (new ObjectMapAttributeTestCase ("Check Attributes of type ObjectMapValue"));
1284
  AddTestCase (new ObjectMapAttributeTestCase ("Check Attributes of type ObjectMapValue"), TestCase::QUICK);
1285
  AddTestCase (new IntegerTraceSourceAttributeTestCase ("Ensure TracedValue<uint8_t> can be set like IntegerValue"));
1285
  AddTestCase (new IntegerTraceSourceAttributeTestCase ("Ensure TracedValue<uint8_t> can be set like IntegerValue"), TestCase::QUICK);
1286
  AddTestCase (new IntegerTraceSourceTestCase ("Ensure TracedValue<uint8_t> also works as trace source"));
1286
  AddTestCase (new IntegerTraceSourceTestCase ("Ensure TracedValue<uint8_t> also works as trace source"), TestCase::QUICK);
1287
  AddTestCase (new TracedCallbackTestCase ("Ensure TracedCallback<double, int, float> works as trace source"));
1287
  AddTestCase (new TracedCallbackTestCase ("Ensure TracedCallback<double, int, float> works as trace source"), TestCase::QUICK);
1288
  AddTestCase (new PointerAttributeTestCase ("Check Attributes of type PointerValue"));
1288
  AddTestCase (new PointerAttributeTestCase ("Check Attributes of type PointerValue"), TestCase::QUICK);
1289
  AddTestCase (new CallbackValueTestCase ("Check Attributes of type CallbackValue"));
1289
  AddTestCase (new CallbackValueTestCase ("Check Attributes of type CallbackValue"), TestCase::QUICK);
1290
}
1290
}
1291
1291
1292
static AttributesTestSuite attributesTestSuite;
1292
static AttributesTestSuite attributesTestSuite;
(-)a/src/core/test/callback-test-suite.cc (-5 / +5 lines)
 Lines 568-578    Link Here 
568
CallbackTestSuite::CallbackTestSuite ()
568
CallbackTestSuite::CallbackTestSuite ()
569
  : TestSuite ("callback", UNIT)
569
  : TestSuite ("callback", UNIT)
570
{
570
{
571
  AddTestCase (new BasicCallbackTestCase);
571
  AddTestCase (new BasicCallbackTestCase, TestCase::QUICK);
572
  AddTestCase (new MakeCallbackTestCase);
572
  AddTestCase (new MakeCallbackTestCase, TestCase::QUICK);
573
  AddTestCase (new MakeBoundCallbackTestCase);
573
  AddTestCase (new MakeBoundCallbackTestCase, TestCase::QUICK);
574
  AddTestCase (new NullifyCallbackTestCase);
574
  AddTestCase (new NullifyCallbackTestCase, TestCase::QUICK);
575
  AddTestCase (new MakeCallbackTemplatesTestCase);
575
  AddTestCase (new MakeCallbackTemplatesTestCase, TestCase::QUICK);
576
}
576
}
577
577
578
static CallbackTestSuite CallbackTestSuite;
578
static CallbackTestSuite CallbackTestSuite;
(-)a/src/core/test/command-line-test-suite.cc (-4 / +4 lines)
 Lines 219-228    Link Here 
219
CommandLineTestSuite::CommandLineTestSuite ()
219
CommandLineTestSuite::CommandLineTestSuite ()
220
  : TestSuite ("command-line", UNIT)
220
  : TestSuite ("command-line", UNIT)
221
{
221
{
222
  AddTestCase (new CommandLineBooleanTestCase);
222
  AddTestCase (new CommandLineBooleanTestCase, TestCase::QUICK);
223
  AddTestCase (new CommandLineIntTestCase);
223
  AddTestCase (new CommandLineIntTestCase, TestCase::QUICK);
224
  AddTestCase (new CommandLineUnsignedIntTestCase);
224
  AddTestCase (new CommandLineUnsignedIntTestCase, TestCase::QUICK);
225
  AddTestCase (new CommandLineStringTestCase);
225
  AddTestCase (new CommandLineStringTestCase, TestCase::QUICK);
226
}
226
}
227
227
228
static CommandLineTestSuite CommandLineTestSuite;
228
static CommandLineTestSuite CommandLineTestSuite;
(-)a/src/core/test/config-test-suite.cc (-3 / +3 lines)
 Lines 618-626    Link Here 
618
ConfigTestSuite::ConfigTestSuite ()
618
ConfigTestSuite::ConfigTestSuite ()
619
  : TestSuite ("config", UNIT)
619
  : TestSuite ("config", UNIT)
620
{
620
{
621
  AddTestCase (new RootNamespaceConfigTestCase);
621
  AddTestCase (new RootNamespaceConfigTestCase, TestCase::QUICK);
622
  AddTestCase (new UnderRootNamespaceConfigTestCase);
622
  AddTestCase (new UnderRootNamespaceConfigTestCase, TestCase::QUICK);
623
  AddTestCase (new ObjectVectorConfigTestCase);
623
  AddTestCase (new ObjectVectorConfigTestCase, TestCase::QUICK);
624
}
624
}
625
625
626
static ConfigTestSuite configTestSuite;
626
static ConfigTestSuite configTestSuite;
(-)a/src/core/test/global-value-test-suite.cc (-1 / +1 lines)
 Lines 85-91    Link Here 
85
GlobalValueTestSuite::GlobalValueTestSuite ()
85
GlobalValueTestSuite::GlobalValueTestSuite ()
86
  : TestSuite ("global-value", UNIT)
86
  : TestSuite ("global-value", UNIT)
87
{
87
{
88
  AddTestCase (new GlobalValueTestCase);
88
  AddTestCase (new GlobalValueTestCase, TestCase::QUICK);
89
}
89
}
90
90
91
static GlobalValueTestSuite globalValueTestSuite;
91
static GlobalValueTestSuite globalValueTestSuite;
(-)a/src/core/test/int64x64-test-suite.cc (-8 / +8 lines)
 Lines 325-337    Link Here 
325
  Int64x64128TestSuite ()
325
  Int64x64128TestSuite ()
326
    : TestSuite ("int64x64", UNIT)
326
    : TestSuite ("int64x64", UNIT)
327
  {
327
  {
328
    AddTestCase (new Int64x64FracTestCase ());
328
    AddTestCase (new Int64x64FracTestCase (), TestCase::QUICK);
329
    AddTestCase (new Int64x64InputTestCase ());
329
    AddTestCase (new Int64x64InputTestCase (), TestCase::QUICK);
330
    AddTestCase (new Int64x64InputOutputTestCase ());
330
    AddTestCase (new Int64x64InputOutputTestCase (), TestCase::QUICK);
331
    AddTestCase (new Int64x64ArithmeticTestCase ());
331
    AddTestCase (new Int64x64ArithmeticTestCase (), TestCase::QUICK);
332
    AddTestCase (new Int64x64Bug455TestCase ());
332
    AddTestCase (new Int64x64Bug455TestCase (), TestCase::QUICK);
333
    AddTestCase (new Int64x64Bug863TestCase ());
333
    AddTestCase (new Int64x64Bug863TestCase (), TestCase::QUICK);
334
    AddTestCase (new Int64x64CompareTestCase ());
334
    AddTestCase (new Int64x64CompareTestCase (), TestCase::QUICK);
335
    AddTestCase (new Int64x64InvertTestCase ());
335
    AddTestCase (new Int64x64InvertTestCase (), TestCase::QUICK);
336
  }
336
  }
337
} g_int64x64TestSuite;
337
} g_int64x64TestSuite;
(-)a/src/core/test/many-uniform-random-variables-one-get-value-call-test-suite.cc (-1 / +1 lines)
 Lines 82-88    Link Here 
82
ManyUniformRandomVariablesOneGetValueCallTestSuite::ManyUniformRandomVariablesOneGetValueCallTestSuite ()
82
ManyUniformRandomVariablesOneGetValueCallTestSuite::ManyUniformRandomVariablesOneGetValueCallTestSuite ()
83
  : TestSuite ("many-uniform-random-variables-one-get-value-call", PERFORMANCE)
83
  : TestSuite ("many-uniform-random-variables-one-get-value-call", PERFORMANCE)
84
{
84
{
85
  AddTestCase (new ManyUniformRandomVariablesOneGetValueCallTestCase);
85
  AddTestCase (new ManyUniformRandomVariablesOneGetValueCallTestCase, TestCase::QUICK);
86
}
86
}
87
87
88
static ManyUniformRandomVariablesOneGetValueCallTestSuite manyUniformRandomVariablesOneGetValueCallTestSuite;
88
static ManyUniformRandomVariablesOneGetValueCallTestSuite manyUniformRandomVariablesOneGetValueCallTestSuite;
(-)a/src/core/test/names-test-suite.cc (-14 / +14 lines)
 Lines 928-947    Link Here 
928
NamesTestSuite::NamesTestSuite ()
928
NamesTestSuite::NamesTestSuite ()
929
  : TestSuite ("object-name-service", UNIT)
929
  : TestSuite ("object-name-service", UNIT)
930
{
930
{
931
  AddTestCase (new BasicAddTestCase);
931
  AddTestCase (new BasicAddTestCase, TestCase::QUICK);
932
  AddTestCase (new StringContextAddTestCase);
932
  AddTestCase (new StringContextAddTestCase, TestCase::QUICK);
933
  AddTestCase (new FullyQualifiedAddTestCase);
933
  AddTestCase (new FullyQualifiedAddTestCase, TestCase::QUICK);
934
  AddTestCase (new RelativeAddTestCase);
934
  AddTestCase (new RelativeAddTestCase, TestCase::QUICK);
935
  AddTestCase (new BasicRenameTestCase);
935
  AddTestCase (new BasicRenameTestCase, TestCase::QUICK);
936
  AddTestCase (new StringContextRenameTestCase);
936
  AddTestCase (new StringContextRenameTestCase, TestCase::QUICK);
937
  AddTestCase (new FullyQualifiedRenameTestCase);
937
  AddTestCase (new FullyQualifiedRenameTestCase, TestCase::QUICK);
938
  AddTestCase (new RelativeRenameTestCase);
938
  AddTestCase (new RelativeRenameTestCase, TestCase::QUICK);
939
  AddTestCase (new FindPathTestCase);
939
  AddTestCase (new FindPathTestCase, TestCase::QUICK);
940
  AddTestCase (new BasicFindTestCase);
940
  AddTestCase (new BasicFindTestCase, TestCase::QUICK);
941
  AddTestCase (new StringContextFindTestCase);
941
  AddTestCase (new StringContextFindTestCase, TestCase::QUICK);
942
  AddTestCase (new FullyQualifiedFindTestCase);
942
  AddTestCase (new FullyQualifiedFindTestCase, TestCase::QUICK);
943
  AddTestCase (new RelativeFindTestCase);
943
  AddTestCase (new RelativeFindTestCase, TestCase::QUICK);
944
  AddTestCase (new AlternateFindTestCase);
944
  AddTestCase (new AlternateFindTestCase, TestCase::QUICK);
945
}
945
}
946
946
947
static NamesTestSuite namesTestSuite;
947
static NamesTestSuite namesTestSuite;
(-)a/src/core/test/object-test-suite.cc (-3 / +3 lines)
 Lines 419-427    Link Here 
419
ObjectTestSuite::ObjectTestSuite ()
419
ObjectTestSuite::ObjectTestSuite ()
420
  : TestSuite ("object", UNIT)
420
  : TestSuite ("object", UNIT)
421
{
421
{
422
  AddTestCase (new CreateObjectTestCase);
422
  AddTestCase (new CreateObjectTestCase, TestCase::QUICK);
423
  AddTestCase (new AggregateObjectTestCase);
423
  AddTestCase (new AggregateObjectTestCase, TestCase::QUICK);
424
  AddTestCase (new ObjectFactoryTestCase);
424
  AddTestCase (new ObjectFactoryTestCase, TestCase::QUICK);
425
}
425
}
426
426
427
static ObjectTestSuite objectTestSuite;
427
static ObjectTestSuite objectTestSuite;
(-)a/src/core/test/one-uniform-random-variable-many-get-value-calls-test-suite.cc (-1 / +1 lines)
 Lines 82-88    Link Here 
82
OneUniformRandomVariableManyGetValueCallsTestSuite::OneUniformRandomVariableManyGetValueCallsTestSuite ()
82
OneUniformRandomVariableManyGetValueCallsTestSuite::OneUniformRandomVariableManyGetValueCallsTestSuite ()
83
  : TestSuite ("one-uniform-random-variable-many-get-value-calls", PERFORMANCE)
83
  : TestSuite ("one-uniform-random-variable-many-get-value-calls", PERFORMANCE)
84
{
84
{
85
  AddTestCase (new OneUniformRandomVariableManyGetValueCallsTestCase);
85
  AddTestCase (new OneUniformRandomVariableManyGetValueCallsTestCase, TestCase::QUICK);
86
}
86
}
87
87
88
static OneUniformRandomVariableManyGetValueCallsTestSuite oneUniformRandomVariableManyGetValueCallsTestSuite;
88
static OneUniformRandomVariableManyGetValueCallsTestSuite oneUniformRandomVariableManyGetValueCallsTestSuite;
(-)a/src/core/test/ptr-test-suite.cc (-1 / +1 lines)
 Lines 269-274    Link Here 
269
  PtrTestSuite ()
269
  PtrTestSuite ()
270
    : TestSuite ("ptr", UNIT)
270
    : TestSuite ("ptr", UNIT)
271
  {
271
  {
272
    AddTestCase (new PtrTestCase ());
272
    AddTestCase (new PtrTestCase (), TestCase::QUICK);
273
  }
273
  }
274
} g_ptrTestSuite;
274
} g_ptrTestSuite;
(-)a/src/core/test/random-variable-stream-test-suite.cc (-25 / +25 lines)
 Lines 2785-2825    Link Here 
2785
RandomVariableStreamTestSuite::RandomVariableStreamTestSuite ()
2785
RandomVariableStreamTestSuite::RandomVariableStreamTestSuite ()
2786
  : TestSuite ("random-variable-stream-generators", UNIT)
2786
  : TestSuite ("random-variable-stream-generators", UNIT)
2787
{
2787
{
2788
  AddTestCase (new RandomVariableStreamUniformTestCase);
2788
  AddTestCase (new RandomVariableStreamUniformTestCase, TestCase::QUICK);
2789
  AddTestCase (new RandomVariableStreamUniformAntitheticTestCase);
2789
  AddTestCase (new RandomVariableStreamUniformAntitheticTestCase, TestCase::QUICK);
2790
  AddTestCase (new RandomVariableStreamConstantTestCase);
2790
  AddTestCase (new RandomVariableStreamConstantTestCase, TestCase::QUICK);
2791
  AddTestCase (new RandomVariableStreamSequentialTestCase);
2791
  AddTestCase (new RandomVariableStreamSequentialTestCase, TestCase::QUICK);
2792
  AddTestCase (new RandomVariableStreamNormalTestCase);
2792
  AddTestCase (new RandomVariableStreamNormalTestCase, TestCase::QUICK);
2793
  AddTestCase (new RandomVariableStreamNormalAntitheticTestCase);
2793
  AddTestCase (new RandomVariableStreamNormalAntitheticTestCase, TestCase::QUICK);
2794
  AddTestCase (new RandomVariableStreamExponentialTestCase);
2794
  AddTestCase (new RandomVariableStreamExponentialTestCase, TestCase::QUICK);
2795
  AddTestCase (new RandomVariableStreamExponentialAntitheticTestCase);
2795
  AddTestCase (new RandomVariableStreamExponentialAntitheticTestCase, TestCase::QUICK);
2796
  AddTestCase (new RandomVariableStreamParetoTestCase);
2796
  AddTestCase (new RandomVariableStreamParetoTestCase, TestCase::QUICK);
2797
  AddTestCase (new RandomVariableStreamParetoAntitheticTestCase);
2797
  AddTestCase (new RandomVariableStreamParetoAntitheticTestCase, TestCase::QUICK);
2798
  AddTestCase (new RandomVariableStreamWeibullTestCase);
2798
  AddTestCase (new RandomVariableStreamWeibullTestCase, TestCase::QUICK);
2799
  AddTestCase (new RandomVariableStreamWeibullAntitheticTestCase);
2799
  AddTestCase (new RandomVariableStreamWeibullAntitheticTestCase, TestCase::QUICK);
2800
  AddTestCase (new RandomVariableStreamLogNormalTestCase);
2800
  AddTestCase (new RandomVariableStreamLogNormalTestCase, TestCase::QUICK);
2801
  // XXX This test is currently disabled because it fails sometimes.
2801
  // XXX This test is currently disabled because it fails sometimes.
2802
  // A possible reason for the failure is that the antithetic code is
2802
  // A possible reason for the failure is that the antithetic code is
2803
  // not implemented properly for this log-normal case.
2803
  // not implemented properly for this log-normal case.
2804
  /*
2804
  /*
2805
  AddTestCase (new RandomVariableStreamLogNormalAntitheticTestCase);
2805
  AddTestCase (new RandomVariableStreamLogNormalAntitheticTestCase, TestCase::QUICK);
2806
  */
2806
  */
2807
  AddTestCase (new RandomVariableStreamGammaTestCase);
2807
  AddTestCase (new RandomVariableStreamGammaTestCase, TestCase::QUICK);
2808
  // XXX This test is currently disabled because it fails sometimes.
2808
  // XXX This test is currently disabled because it fails sometimes.
2809
  // A possible reason for the failure is that the antithetic code is
2809
  // A possible reason for the failure is that the antithetic code is
2810
  // not implemented properly for this gamma case.
2810
  // not implemented properly for this gamma case.
2811
  /*
2811
  /*
2812
  AddTestCase (new RandomVariableStreamGammaAntitheticTestCase);
2812
  AddTestCase (new RandomVariableStreamGammaAntitheticTestCase, TestCase::QUICK);
2813
  */
2813
  */
2814
  AddTestCase (new RandomVariableStreamErlangTestCase);
2814
  AddTestCase (new RandomVariableStreamErlangTestCase, TestCase::QUICK);
2815
  AddTestCase (new RandomVariableStreamErlangAntitheticTestCase);
2815
  AddTestCase (new RandomVariableStreamErlangAntitheticTestCase, TestCase::QUICK);
2816
  AddTestCase (new RandomVariableStreamZipfTestCase);
2816
  AddTestCase (new RandomVariableStreamZipfTestCase, TestCase::QUICK);
2817
  AddTestCase (new RandomVariableStreamZipfAntitheticTestCase);
2817
  AddTestCase (new RandomVariableStreamZipfAntitheticTestCase, TestCase::QUICK);
2818
  AddTestCase (new RandomVariableStreamZetaTestCase);
2818
  AddTestCase (new RandomVariableStreamZetaTestCase, TestCase::QUICK);
2819
  AddTestCase (new RandomVariableStreamZetaAntitheticTestCase);
2819
  AddTestCase (new RandomVariableStreamZetaAntitheticTestCase, TestCase::QUICK);
2820
  AddTestCase (new RandomVariableStreamDeterministicTestCase);
2820
  AddTestCase (new RandomVariableStreamDeterministicTestCase, TestCase::QUICK);
2821
  AddTestCase (new RandomVariableStreamEmpiricalTestCase);
2821
  AddTestCase (new RandomVariableStreamEmpiricalTestCase, TestCase::QUICK);
2822
  AddTestCase (new RandomVariableStreamEmpiricalAntitheticTestCase);
2822
  AddTestCase (new RandomVariableStreamEmpiricalAntitheticTestCase, TestCase::QUICK);
2823
}
2823
}
2824
2824
2825
static RandomVariableStreamTestSuite randomVariableStreamTestSuite;
2825
static RandomVariableStreamTestSuite randomVariableStreamTestSuite;
(-)a/src/core/test/random-variable-test-suite.cc (-2 / +2 lines)
 Lines 138-145    Link Here 
138
BasicRandomNumberTestSuite::BasicRandomNumberTestSuite ()
138
BasicRandomNumberTestSuite::BasicRandomNumberTestSuite ()
139
  : TestSuite ("basic-random-number", UNIT)
139
  : TestSuite ("basic-random-number", UNIT)
140
{
140
{
141
  AddTestCase (new BasicRandomNumberTestCase);
141
  AddTestCase (new BasicRandomNumberTestCase, TestCase::QUICK);
142
  AddTestCase (new RandomNumberSerializationTestCase);
142
  AddTestCase (new RandomNumberSerializationTestCase, TestCase::QUICK);
143
}
143
}
144
144
145
static BasicRandomNumberTestSuite BasicRandomNumberTestSuite;
145
static BasicRandomNumberTestSuite BasicRandomNumberTestSuite;
(-)a/src/core/test/rng-test-suite.cc (-4 / +4 lines)
 Lines 421-430    Link Here 
421
RngTestSuite::RngTestSuite ()
421
RngTestSuite::RngTestSuite ()
422
  : TestSuite ("random-number-generators", UNIT)
422
  : TestSuite ("random-number-generators", UNIT)
423
{
423
{
424
  AddTestCase (new RngUniformTestCase);
424
  AddTestCase (new RngUniformTestCase, TestCase::QUICK);
425
  AddTestCase (new RngNormalTestCase);
425
  AddTestCase (new RngNormalTestCase, TestCase::QUICK);
426
  AddTestCase (new RngExponentialTestCase);
426
  AddTestCase (new RngExponentialTestCase, TestCase::QUICK);
427
  AddTestCase (new RngParetoTestCase);
427
  AddTestCase (new RngParetoTestCase, TestCase::QUICK);
428
}
428
}
429
429
430
static RngTestSuite rngTestSuite;
430
static RngTestSuite rngTestSuite;
(-)a/src/core/test/sample-test-suite.cc (-1 / +1 lines)
 Lines 56-62    Link Here 
56
SampleTestSuite::SampleTestSuite ()
56
SampleTestSuite::SampleTestSuite ()
57
  : TestSuite ("sample", UNIT)
57
  : TestSuite ("sample", UNIT)
58
{
58
{
59
  AddTestCase (new SampleTestCase1);
59
  AddTestCase (new SampleTestCase1, TestCase::QUICK);
60
}
60
}
61
61
62
// Do not forget to allocate an instance of this TestSuite
62
// Do not forget to allocate an instance of this TestSuite
(-)a/src/core/test/simulator-test-suite.cc (-4 / +4 lines)
 Lines 468-479    Link Here 
468
    ObjectFactory factory;
468
    ObjectFactory factory;
469
    factory.SetTypeId (ListScheduler::GetTypeId ());
469
    factory.SetTypeId (ListScheduler::GetTypeId ());
470
470
471
    AddTestCase (new SimulatorEventsTestCase (factory));
471
    AddTestCase (new SimulatorEventsTestCase (factory), TestCase::QUICK);
472
    factory.SetTypeId (MapScheduler::GetTypeId ());
472
    factory.SetTypeId (MapScheduler::GetTypeId ());
473
    AddTestCase (new SimulatorEventsTestCase (factory));
473
    AddTestCase (new SimulatorEventsTestCase (factory), TestCase::QUICK);
474
    factory.SetTypeId (HeapScheduler::GetTypeId ());
474
    factory.SetTypeId (HeapScheduler::GetTypeId ());
475
    AddTestCase (new SimulatorEventsTestCase (factory));
475
    AddTestCase (new SimulatorEventsTestCase (factory), TestCase::QUICK);
476
    factory.SetTypeId (CalendarScheduler::GetTypeId ());
476
    factory.SetTypeId (CalendarScheduler::GetTypeId ());
477
    AddTestCase (new SimulatorEventsTestCase (factory));
477
    AddTestCase (new SimulatorEventsTestCase (factory), TestCase::QUICK);
478
  }
478
  }
479
} g_simulatorTestSuite;
479
} g_simulatorTestSuite;
(-)a/src/core/test/threaded-test-suite.cc (-1 / +1 lines)
 Lines 258-264    Link Here 
258
            for (unsigned int k=0; k < (sizeof(schedulerTypes) / sizeof(schedulerTypes[0])); ++k) 
258
            for (unsigned int k=0; k < (sizeof(schedulerTypes) / sizeof(schedulerTypes[0])); ++k) 
259
              {
259
              {
260
                factory.SetTypeId(schedulerTypes[k]);
260
                factory.SetTypeId(schedulerTypes[k]);
261
                AddTestCase (new ThreadedSimulatorEventsTestCase (factory, simulatorTypes[i], threadcounts[j]));
261
                AddTestCase (new ThreadedSimulatorEventsTestCase (factory, simulatorTypes[i], threadcounts[j]), TestCase::QUICK);
262
              }
262
              }
263
          }
263
          }
264
      }
264
      }
(-)a/src/core/test/time-test-suite.cc (-2 / +2 lines)
 Lines 139-145    Link Here 
139
  TimeTestSuite ()
139
  TimeTestSuite ()
140
    : TestSuite ("time", UNIT)
140
    : TestSuite ("time", UNIT)
141
  {
141
  {
142
    AddTestCase (new TimeSimpleTestCase (Time::US));
142
    AddTestCase (new TimeSimpleTestCase (Time::US), TestCase::QUICK);
143
    AddTestCase (new TimesWithSignsTestCase ());
143
    AddTestCase (new TimesWithSignsTestCase (), TestCase::QUICK);
144
  }
144
  }
145
} g_timeTestSuite;
145
} g_timeTestSuite;
(-)a/src/core/test/timer-test-suite.cc (-2 / +2 lines)
 Lines 214-220    Link Here 
214
  TimerTestSuite ()
214
  TimerTestSuite ()
215
    : TestSuite ("timer", UNIT)
215
    : TestSuite ("timer", UNIT)
216
  {
216
  {
217
    AddTestCase (new TimerStateTestCase ());
217
    AddTestCase (new TimerStateTestCase (), TestCase::QUICK);
218
    AddTestCase (new TimerTemplateTestCase ());
218
    AddTestCase (new TimerTemplateTestCase (), TestCase::QUICK);
219
  }
219
  }
220
} g_timerTestSuite;
220
} g_timerTestSuite;
(-)a/src/core/test/traced-callback-test-suite.cc (-1 / +1 lines)
 Lines 117-123    Link Here 
117
TracedCallbackTestSuite::TracedCallbackTestSuite ()
117
TracedCallbackTestSuite::TracedCallbackTestSuite ()
118
  : TestSuite ("traced-callback", UNIT)
118
  : TestSuite ("traced-callback", UNIT)
119
{
119
{
120
  AddTestCase (new BasicTracedCallbackTestCase);
120
  AddTestCase (new BasicTracedCallbackTestCase, TestCase::QUICK);
121
}
121
}
122
122
123
static TracedCallbackTestSuite tracedCallbackTestSuite;
123
static TracedCallbackTestSuite tracedCallbackTestSuite;
(-)a/src/core/test/type-traits-test-suite.cc (-1 / +1 lines)
 Lines 56-62    Link Here 
56
TypeTraitsTestSuite::TypeTraitsTestSuite ()
56
TypeTraitsTestSuite::TypeTraitsTestSuite ()
57
  : TestSuite ("type-traits", UNIT)
57
  : TestSuite ("type-traits", UNIT)
58
{
58
{
59
  AddTestCase (new TypeTraitsTestCase);
59
  AddTestCase (new TypeTraitsTestCase, TestCase::QUICK);
60
}
60
}
61
61
62
static TypeTraitsTestSuite typeTraitsTestSuite;
62
static TypeTraitsTestSuite typeTraitsTestSuite;
(-)a/src/core/test/watchdog-test-suite.cc (-1 / +1 lines)
 Lines 74-79    Link Here 
74
  WatchdogTestSuite()
74
  WatchdogTestSuite()
75
    : TestSuite ("watchdog", UNIT)
75
    : TestSuite ("watchdog", UNIT)
76
  {
76
  {
77
    AddTestCase (new WatchdogTestCase ());
77
    AddTestCase (new WatchdogTestCase (), TestCase::QUICK);
78
  }
78
  }
79
} g_watchdogTestSuite;
79
} g_watchdogTestSuite;
(-)a/src/dsdv/test/dsdv-testcase.cc (-2 / +2 lines)
 Lines 188-195    Link Here 
188
public:
188
public:
189
  DsdvTestSuite () : TestSuite ("routing-dsdv", UNIT)
189
  DsdvTestSuite () : TestSuite ("routing-dsdv", UNIT)
190
  {
190
  {
191
    AddTestCase (new DsdvHeaderTestCase ());
191
    AddTestCase (new DsdvHeaderTestCase (), TestCase::QUICK);
192
    AddTestCase (new DsdvTableTestCase ());
192
    AddTestCase (new DsdvTableTestCase (), TestCase::QUICK);
193
  }
193
  }
194
} g_dsdvTestSuite;
194
} g_dsdvTestSuite;
195
}
195
}
(-)a/src/dsr/test/dsr-test-suite.cc (-9 / +9 lines)
 Lines 508-522    Link Here 
508
public:
508
public:
509
  DsrTestSuite () : TestSuite ("routing-dsr", UNIT)
509
  DsrTestSuite () : TestSuite ("routing-dsr", UNIT)
510
  {
510
  {
511
    AddTestCase (new DsrFsHeaderTest);
511
    AddTestCase (new DsrFsHeaderTest, TestCase::QUICK);
512
    AddTestCase (new DsrRreqHeaderTest);
512
    AddTestCase (new DsrRreqHeaderTest, TestCase::QUICK);
513
    AddTestCase (new DsrRrepHeaderTest);
513
    AddTestCase (new DsrRrepHeaderTest, TestCase::QUICK);
514
    AddTestCase (new DsrSRHeaderTest);
514
    AddTestCase (new DsrSRHeaderTest, TestCase::QUICK);
515
    AddTestCase (new DsrRerrHeaderTest);
515
    AddTestCase (new DsrRerrHeaderTest, TestCase::QUICK);
516
    AddTestCase (new DsrAckReqHeaderTest);
516
    AddTestCase (new DsrAckReqHeaderTest, TestCase::QUICK);
517
    AddTestCase (new DsrAckHeaderTest);
517
    AddTestCase (new DsrAckHeaderTest, TestCase::QUICK);
518
    AddTestCase (new DsrCacheEntryTest);
518
    AddTestCase (new DsrCacheEntryTest, TestCase::QUICK);
519
    AddTestCase (new DsrSendBuffTest);
519
    AddTestCase (new DsrSendBuffTest, TestCase::QUICK);
520
  }
520
  }
521
} g_dsrTestSuite;
521
} g_dsrTestSuite;
522
} // namespace dsr
522
} // namespace dsr
(-)a/src/energy/test/basic-energy-model-test.cc (-2 / +2 lines)
 Lines 380-387    Link Here 
380
BasicEnergyModelTestSuite::BasicEnergyModelTestSuite ()
380
BasicEnergyModelTestSuite::BasicEnergyModelTestSuite ()
381
  : TestSuite ("basic-energy-model", UNIT)
381
  : TestSuite ("basic-energy-model", UNIT)
382
{
382
{
383
  AddTestCase (new BasicEnergyUpdateTest);
383
  AddTestCase (new BasicEnergyUpdateTest, TestCase::QUICK);
384
  AddTestCase (new BasicEnergyDepletionTest);
384
  AddTestCase (new BasicEnergyDepletionTest, TestCase::QUICK);
385
}
385
}
386
386
387
// create an instance of the test suite
387
// create an instance of the test suite
(-)a/src/energy/test/li-ion-energy-source-test.cc (-1 / +1 lines)
 Lines 87-93    Link Here 
87
LiIonEnergySourceTestSuite::LiIonEnergySourceTestSuite ()
87
LiIonEnergySourceTestSuite::LiIonEnergySourceTestSuite ()
88
  : TestSuite ("li-ion-energy-source", UNIT)
88
  : TestSuite ("li-ion-energy-source", UNIT)
89
{
89
{
90
  AddTestCase (new LiIonEnergyTestCase);
90
  AddTestCase (new LiIonEnergyTestCase, TestCase::QUICK);
91
}
91
}
92
92
93
// create an instance of the test suite
93
// create an instance of the test suite
(-)a/src/energy/test/rv-battery-model-test.cc (-1 / +1 lines)
 Lines 883-889    Link Here 
883
RvBatteryModelTestSuite::RvBatteryModelTestSuite ()
883
RvBatteryModelTestSuite::RvBatteryModelTestSuite ()
884
  : TestSuite ("rv-battery-model", SYSTEM)
884
  : TestSuite ("rv-battery-model", SYSTEM)
885
{
885
{
886
  AddTestCase (new BatteryLifetimeTest);
886
  AddTestCase (new BatteryLifetimeTest, TestCase::QUICK);
887
}
887
}
888
888
889
// create an instance of the test suite
889
// create an instance of the test suite
(-)a/src/flow-monitor/test/histogram-test-suite.cc (-1 / +1 lines)
 Lines 75-81    Link Here 
75
  HistogramTestSuite ()
75
  HistogramTestSuite ()
76
    : TestSuite ("histogram", UNIT) 
76
    : TestSuite ("histogram", UNIT) 
77
  {
77
  {
78
    AddTestCase (new HistogramTestCase ());
78
    AddTestCase (new HistogramTestCase (), TestCase::QUICK);
79
  }
79
  }
80
} g_HistogramTestSuite;
80
} g_HistogramTestSuite;
81
81
(-)a/src/internet/test/global-route-manager-impl-test-suite.cc (-1 / +1 lines)
 Lines 220-225    Link Here 
220
  GlobalRouteManagerImplTestSuite()
220
  GlobalRouteManagerImplTestSuite()
221
    : TestSuite ("global-route-manager-impl", UNIT)
221
    : TestSuite ("global-route-manager-impl", UNIT)
222
  {
222
  {
223
    AddTestCase (new GlobalRouteManagerImplTestCase ());
223
    AddTestCase (new GlobalRouteManagerImplTestCase (), TestCase::QUICK);
224
  }
224
  }
225
} g_globalRoutingManagerImplTestSuite;
225
} g_globalRoutingManagerImplTestSuite;
(-)a/src/internet/test/ipv4-address-generator-test-suite.cc (-5 / +5 lines)
 Lines 308-317    Link Here 
308
  Ipv4AddressGeneratorTestSuite ()
308
  Ipv4AddressGeneratorTestSuite ()
309
    : TestSuite ("ipv4-address-generator")
309
    : TestSuite ("ipv4-address-generator")
310
  {
310
  {
311
    AddTestCase (new NetworkNumberAllocatorTestCase ());
311
    AddTestCase (new NetworkNumberAllocatorTestCase (), TestCase::QUICK);
312
    AddTestCase (new AddressAllocatorTestCase ());
312
    AddTestCase (new AddressAllocatorTestCase (), TestCase::QUICK);
313
    AddTestCase (new NetworkAndAddressTestCase ());
313
    AddTestCase (new NetworkAndAddressTestCase (), TestCase::QUICK);
314
    AddTestCase (new ExampleAddressGeneratorTestCase ());
314
    AddTestCase (new ExampleAddressGeneratorTestCase (), TestCase::QUICK);
315
    AddTestCase (new AddressCollisionTestCase ());
315
    AddTestCase (new AddressCollisionTestCase (), TestCase::QUICK);
316
  }
316
  }
317
} g_ipv4AddressGeneratorTestSuite;
317
} g_ipv4AddressGeneratorTestSuite;
(-)a/src/internet/test/ipv4-address-helper-test-suite.cc (-4 / +4 lines)
 Lines 261-269    Link Here 
261
  Ipv4AddressHelperTestSuite ()
261
  Ipv4AddressHelperTestSuite ()
262
    : TestSuite ("ipv4-address-helper", UNIT) 
262
    : TestSuite ("ipv4-address-helper", UNIT) 
263
  {
263
  {
264
    AddTestCase (new NetworkAllocatorHelperTestCase ());
264
    AddTestCase (new NetworkAllocatorHelperTestCase (), TestCase::QUICK);
265
    AddTestCase (new AddressAllocatorHelperTestCase ());
265
    AddTestCase (new AddressAllocatorHelperTestCase (), TestCase::QUICK);
266
    AddTestCase (new ResetAllocatorHelperTestCase ());
266
    AddTestCase (new ResetAllocatorHelperTestCase (), TestCase::QUICK);
267
    AddTestCase (new IpAddressHelperTestCasev4 ());
267
    AddTestCase (new IpAddressHelperTestCasev4 (), TestCase::QUICK);
268
  }
268
  }
269
} g_ipv4AddressHelperTestSuite;
269
} g_ipv4AddressHelperTestSuite;
(-)a/src/internet/test/ipv4-fragmentation-test.cc (-1 / +1 lines)
 Lines 407-412    Link Here 
407
public:
407
public:
408
  Ipv4FragmentationTestSuite () : TestSuite ("ipv4-fragmentation", UNIT)
408
  Ipv4FragmentationTestSuite () : TestSuite ("ipv4-fragmentation", UNIT)
409
  {
409
  {
410
    AddTestCase (new Ipv4FragmentationTest);
410
    AddTestCase (new Ipv4FragmentationTest, TestCase::QUICK);
411
  }
411
  }
412
} g_ipv4fragmentationTestSuite;
412
} g_ipv4fragmentationTestSuite;
(-)a/src/internet/test/ipv4-header-test.cc (-1 / +1 lines)
 Lines 261-266    Link Here 
261
public:
261
public:
262
  Ipv4HeaderTestSuite () : TestSuite ("ipv4-header", UNIT)
262
  Ipv4HeaderTestSuite () : TestSuite ("ipv4-header", UNIT)
263
  {
263
  {
264
    AddTestCase (new Ipv4HeaderTest);
264
    AddTestCase (new Ipv4HeaderTest, TestCase::QUICK);
265
  }
265
  }
266
} g_ipv4HeaderTestSuite;
266
} g_ipv4HeaderTestSuite;
(-)a/src/internet/test/ipv4-list-routing-test-suite.cc (-2 / +2 lines)
 Lines 118-125    Link Here 
118
  Ipv4ListRoutingTestSuite()
118
  Ipv4ListRoutingTestSuite()
119
    : TestSuite ("ipv4-list-routing", UNIT)
119
    : TestSuite ("ipv4-list-routing", UNIT)
120
  {
120
  {
121
    AddTestCase (new Ipv4ListRoutingPositiveTestCase ());
121
    AddTestCase (new Ipv4ListRoutingPositiveTestCase (), TestCase::QUICK);
122
    AddTestCase (new Ipv4ListRoutingNegativeTestCase ());
122
    AddTestCase (new Ipv4ListRoutingNegativeTestCase (), TestCase::QUICK);
123
  }
123
  }
124
124
125
} g_ipv4ListRoutingTestSuite;
125
} g_ipv4ListRoutingTestSuite;
(-)a/src/internet/test/ipv4-packet-info-tag-test-suite.cc (-1 / +1 lines)
 Lines 206-210    Link Here 
206
Ipv4PacketInfoTagTestSuite::Ipv4PacketInfoTagTestSuite ()
206
Ipv4PacketInfoTagTestSuite::Ipv4PacketInfoTagTestSuite ()
207
  : TestSuite ("ipv4-packet-info-tag", UNIT)
207
  : TestSuite ("ipv4-packet-info-tag", UNIT)
208
{
208
{
209
  AddTestCase (new Ipv4PacketInfoTagTest ());
209
  AddTestCase (new Ipv4PacketInfoTagTest (), TestCase::QUICK);
210
}
210
}
(-)a/src/internet/test/ipv4-raw-test.cc (-1 / +1 lines)
 Lines 320-325    Link Here 
320
public:
320
public:
321
  Ipv4RawTestSuite () : TestSuite ("ipv4-raw", UNIT)
321
  Ipv4RawTestSuite () : TestSuite ("ipv4-raw", UNIT)
322
  {
322
  {
323
    AddTestCase (new Ipv4RawSocketImplTest);
323
    AddTestCase (new Ipv4RawSocketImplTest, TestCase::QUICK);
324
  }
324
  }
325
} g_ipv4rawTestSuite;
325
} g_ipv4rawTestSuite;
(-)a/src/internet/test/ipv4-test.cc (-1 / +1 lines)
 Lines 103-109    Link Here 
103
  IPv4L3ProtocolTestSuite () :
103
  IPv4L3ProtocolTestSuite () :
104
    TestSuite ("ipv4-protocol", UNIT)
104
    TestSuite ("ipv4-protocol", UNIT)
105
  {
105
  {
106
    AddTestCase (new Ipv4L3ProtocolTestCase ());
106
    AddTestCase (new Ipv4L3ProtocolTestCase (), TestCase::QUICK);
107
  }
107
  }
108
} g_ipv4protocolTestSuite;
108
} g_ipv4protocolTestSuite;
109
109
(-)a/src/internet/test/ipv6-address-generator-test-suite.cc (-5 / +5 lines)
 Lines 279-288    Link Here 
279
  Ipv6AddressGeneratorTestSuite ()
279
  Ipv6AddressGeneratorTestSuite ()
280
    : TestSuite ("ipv6-address-generator")
280
    : TestSuite ("ipv6-address-generator")
281
  {
281
  {
282
    AddTestCase (new NetworkNumber6AllocatorTestCase ());
282
    AddTestCase (new NetworkNumber6AllocatorTestCase (), TestCase::QUICK);
283
    AddTestCase (new AddressAllocator6TestCase ());
283
    AddTestCase (new AddressAllocator6TestCase (), TestCase::QUICK);
284
    AddTestCase (new NetworkAndAddress6TestCase ());
284
    AddTestCase (new NetworkAndAddress6TestCase (), TestCase::QUICK);
285
    AddTestCase (new ExampleAddress6GeneratorTestCase ());
285
    AddTestCase (new ExampleAddress6GeneratorTestCase (), TestCase::QUICK);
286
    AddTestCase (new AddressCollision6TestCase ());
286
    AddTestCase (new AddressCollision6TestCase (), TestCase::QUICK);
287
  }
287
  }
288
} g_ipv6AddressGeneratorTestSuite;
288
} g_ipv6AddressGeneratorTestSuite;
(-)a/src/internet/test/ipv6-address-helper-test-suite.cc (-1 / +1 lines)
 Lines 148-154    Link Here 
148
Ipv6AddressHelperTestSuite::Ipv6AddressHelperTestSuite ()
148
Ipv6AddressHelperTestSuite::Ipv6AddressHelperTestSuite ()
149
  : TestSuite ("ipv6-address-helper", UNIT)
149
  : TestSuite ("ipv6-address-helper", UNIT)
150
{
150
{
151
  AddTestCase (new IpAddressHelperTestCasev6);
151
  AddTestCase (new IpAddressHelperTestCasev6, TestCase::QUICK);
152
}
152
}
153
153
154
// Do not forget to allocate an instance of this TestSuite
154
// Do not forget to allocate an instance of this TestSuite
(-)a/src/internet/test/ipv6-dual-stack-test-suite.cc (-1 / +1 lines)
 Lines 306-311    Link Here 
306
  Ipv6DualStackTestSuite ()
306
  Ipv6DualStackTestSuite ()
307
    : TestSuite ("ipv6-dual-stack", UNIT)
307
    : TestSuite ("ipv6-dual-stack", UNIT)
308
  {
308
  {
309
    AddTestCase (new DualStackTestCase());
309
    AddTestCase (new DualStackTestCase(), TestCase::QUICK);
310
  }
310
  }
311
} g_ipv6DualStackTestSuite;
311
} g_ipv6DualStackTestSuite;
(-)a/src/internet/test/ipv6-extension-header-test-suite.cc (-4 / +4 lines)
 Lines 215-224    Link Here 
215
  Ipv6ExtensionHeaderTestSuite ()
215
  Ipv6ExtensionHeaderTestSuite ()
216
    : TestSuite ("ipv6-extension-header", UNIT)
216
    : TestSuite ("ipv6-extension-header", UNIT)
217
  {
217
  {
218
    AddTestCase (new TestEmptyOptionField);
218
    AddTestCase (new TestEmptyOptionField, TestCase::QUICK);
219
    AddTestCase (new TestOptionWithoutAlignment);
219
    AddTestCase (new TestOptionWithoutAlignment, TestCase::QUICK);
220
    AddTestCase (new TestOptionWithAlignment);
220
    AddTestCase (new TestOptionWithAlignment, TestCase::QUICK);
221
    AddTestCase (new TestFulfilledAlignment);
221
    AddTestCase (new TestFulfilledAlignment, TestCase::QUICK);
222
222
223
  }
223
  }
224
};
224
};
(-)a/src/internet/test/ipv6-fragmentation-test.cc (-1 / +1 lines)
 Lines 423-428    Link Here 
423
public:
423
public:
424
  Ipv6FragmentationTestSuite () : TestSuite ("ipv6-fragmentation", UNIT)
424
  Ipv6FragmentationTestSuite () : TestSuite ("ipv6-fragmentation", UNIT)
425
  {
425
  {
426
    AddTestCase (new Ipv6FragmentationTest);
426
    AddTestCase (new Ipv6FragmentationTest, TestCase::QUICK);
427
  }
427
  }
428
} g_ipv6fragmentationTestSuite;
428
} g_ipv6fragmentationTestSuite;
(-)a/src/internet/test/ipv6-list-routing-test-suite.cc (-2 / +2 lines)
 Lines 125-132    Link Here 
125
  Ipv6ListRoutingTestSuite()
125
  Ipv6ListRoutingTestSuite()
126
    : TestSuite ("ipv6-list-routing", UNIT)
126
    : TestSuite ("ipv6-list-routing", UNIT)
127
  {
127
  {
128
    AddTestCase (new Ipv6ListRoutingPositiveTestCase ());
128
    AddTestCase (new Ipv6ListRoutingPositiveTestCase (), TestCase::QUICK);
129
    AddTestCase (new Ipv6ListRoutingNegativeTestCase ());
129
    AddTestCase (new Ipv6ListRoutingNegativeTestCase (), TestCase::QUICK);
130
  }
130
  }
131
131
132
} g_ipv6ListRoutingTestSuite;
132
} g_ipv6ListRoutingTestSuite;
(-)a/src/internet/test/ipv6-packet-info-tag-test-suite.cc (-1 / +1 lines)
 Lines 207-211    Link Here 
207
Ipv6PacketInfoTagTestSuite::Ipv6PacketInfoTagTestSuite ()
207
Ipv6PacketInfoTagTestSuite::Ipv6PacketInfoTagTestSuite ()
208
  : TestSuite ("ipv6-packet-info-tag", UNIT)
208
  : TestSuite ("ipv6-packet-info-tag", UNIT)
209
{
209
{
210
  AddTestCase (new Ipv6PacketInfoTagTest ());
210
  AddTestCase (new Ipv6PacketInfoTagTest (), TestCase::QUICK);
211
}
211
}
(-)a/src/internet/test/ipv6-raw-test.cc (-1 / +1 lines)
 Lines 270-275    Link Here 
270
public:
270
public:
271
  Ipv6RawTestSuite () : TestSuite ("ipv6-raw", UNIT)
271
  Ipv6RawTestSuite () : TestSuite ("ipv6-raw", UNIT)
272
  {
272
  {
273
    AddTestCase (new Ipv6RawSocketImplTest);
273
    AddTestCase (new Ipv6RawSocketImplTest, TestCase::QUICK);
274
  }
274
  }
275
} g_ipv6rawTestSuite;
275
} g_ipv6rawTestSuite;
(-)a/src/internet/test/ipv6-test.cc (-1 / +1 lines)
 Lines 144-150    Link Here 
144
  IPv6L3ProtocolTestSuite () :
144
  IPv6L3ProtocolTestSuite () :
145
    TestSuite ("ipv6-protocol", UNIT)
145
    TestSuite ("ipv6-protocol", UNIT)
146
  {
146
  {
147
    AddTestCase (new Ipv6L3ProtocolTestCase ());
147
    AddTestCase (new Ipv6L3ProtocolTestCase (), TestCase::QUICK);
148
  }
148
  }
149
} g_ipv6protocolTestSuite;
149
} g_ipv6protocolTestSuite;
150
150
(-)a/src/internet/test/tcp-test.cc (-6 / +6 lines)
 Lines 435-447    Link Here 
435
    // 2) source write size, 3) source read size
435
    // 2) source write size, 3) source read size
436
    // 4) server write size, and 5) server read size
436
    // 4) server write size, and 5) server read size
437
    // with units of bytes
437
    // with units of bytes
438
    AddTestCase (new TcpTestCase (13, 200, 200, 200, 200, false));
438
    AddTestCase (new TcpTestCase (13, 200, 200, 200, 200, false), TestCase::QUICK);
439
    AddTestCase (new TcpTestCase (13, 1, 1, 1, 1, false));
439
    AddTestCase (new TcpTestCase (13, 1, 1, 1, 1, false), TestCase::QUICK);
440
    AddTestCase (new TcpTestCase (100000, 100, 50, 100, 20, false));
440
    AddTestCase (new TcpTestCase (100000, 100, 50, 100, 20, false), TestCase::QUICK);
441
441
442
    AddTestCase (new TcpTestCase (13, 200, 200, 200, 200, true));
442
    AddTestCase (new TcpTestCase (13, 200, 200, 200, 200, true), TestCase::QUICK);
443
    AddTestCase (new TcpTestCase (13, 1, 1, 1, 1, true));
443
    AddTestCase (new TcpTestCase (13, 1, 1, 1, 1, true), TestCase::QUICK);
444
    AddTestCase (new TcpTestCase (100000, 100, 50, 100, 20, true));
444
    AddTestCase (new TcpTestCase (100000, 100, 50, 100, 20, true), TestCase::QUICK);
445
  }
445
  }
446
446
447
} g_tcpTestSuite;
447
} g_tcpTestSuite;
(-)a/src/internet/test/udp-test.cc (-4 / +4 lines)
 Lines 576-584    Link Here 
576
public:
576
public:
577
  UdpTestSuite () : TestSuite ("udp", UNIT)
577
  UdpTestSuite () : TestSuite ("udp", UNIT)
578
  {
578
  {
579
    AddTestCase (new UdpSocketImplTest);
579
    AddTestCase (new UdpSocketImplTest, TestCase::QUICK);
580
    AddTestCase (new UdpSocketLoopbackTest);
580
    AddTestCase (new UdpSocketLoopbackTest, TestCase::QUICK);
581
    AddTestCase (new Udp6SocketImplTest);
581
    AddTestCase (new Udp6SocketImplTest, TestCase::QUICK);
582
    AddTestCase (new Udp6SocketLoopbackTest);
582
    AddTestCase (new Udp6SocketLoopbackTest, TestCase::QUICK);
583
  }
583
  }
584
} g_udpTestSuite;
584
} g_udpTestSuite;
(-)a/src/lte/test/epc-test-gtpu.cc (-1 / +1 lines)
 Lines 38-44    Link Here 
38
EpsGtpuTestSuite::EpsGtpuTestSuite ()
38
EpsGtpuTestSuite::EpsGtpuTestSuite ()
39
  : TestSuite ("epc-gtpu", SYSTEM)
39
  : TestSuite ("epc-gtpu", SYSTEM)
40
{
40
{
41
  AddTestCase (new EpsGtpuHeaderTestCase ());
41
  AddTestCase (new EpsGtpuHeaderTestCase (), TestCase::QUICK);
42
}
42
}
43
43
44
static EpsGtpuTestSuite epsGtpuTestSuite;
44
static EpsGtpuTestSuite epsGtpuTestSuite;
(-)a/src/lte/test/epc-test-s1u-downlink.cc (-8 / +8 lines)
 Lines 238-244    Link Here 
238
  UeDlTestData f1 (1, 100);
238
  UeDlTestData f1 (1, 100);
239
  e1.ues.push_back (f1);
239
  e1.ues.push_back (f1);
240
  v1.push_back (e1);
240
  v1.push_back (e1);
241
  AddTestCase (new EpcS1uDlTestCase ("1 eNB, 1UE", v1));
241
  AddTestCase (new EpcS1uDlTestCase ("1 eNB, 1UE", v1), TestCase::QUICK);
242
242
243
243
244
  std::vector<EnbDlTestData> v2;  
244
  std::vector<EnbDlTestData> v2;  
 Lines 248-260    Link Here 
248
  UeDlTestData f2_2 (2, 200);
248
  UeDlTestData f2_2 (2, 200);
249
  e2.ues.push_back (f2_2);
249
  e2.ues.push_back (f2_2);
250
  v2.push_back (e2);
250
  v2.push_back (e2);
251
  AddTestCase (new EpcS1uDlTestCase ("1 eNB, 2UEs", v2));
251
  AddTestCase (new EpcS1uDlTestCase ("1 eNB, 2UEs", v2), TestCase::QUICK);
252
252
253
253
254
  std::vector<EnbDlTestData> v3;  
254
  std::vector<EnbDlTestData> v3;  
255
  v3.push_back (e1);
255
  v3.push_back (e1);
256
  v3.push_back (e2);
256
  v3.push_back (e2);
257
  AddTestCase (new EpcS1uDlTestCase ("2 eNBs", v3));
257
  AddTestCase (new EpcS1uDlTestCase ("2 eNBs", v3), TestCase::QUICK);
258
258
259
259
260
  EnbDlTestData e3;
260
  EnbDlTestData e3;
 Lines 268-302    Link Here 
268
  v4.push_back (e3);
268
  v4.push_back (e3);
269
  v4.push_back (e1);
269
  v4.push_back (e1);
270
  v4.push_back (e2);
270
  v4.push_back (e2);
271
  AddTestCase (new EpcS1uDlTestCase ("3 eNBs", v4));
271
  AddTestCase (new EpcS1uDlTestCase ("3 eNBs", v4), TestCase::QUICK);
272
272
273
  std::vector<EnbDlTestData> v5;  
273
  std::vector<EnbDlTestData> v5;  
274
  EnbDlTestData e5;
274
  EnbDlTestData e5;
275
  UeDlTestData f5 (10, 3000);
275
  UeDlTestData f5 (10, 3000);
276
  e5.ues.push_back (f5);
276
  e5.ues.push_back (f5);
277
  v5.push_back (e5);
277
  v5.push_back (e5);
278
  AddTestCase (new EpcS1uDlTestCase ("1 eNB, 10 pkts 3000 bytes each", v5));
278
  AddTestCase (new EpcS1uDlTestCase ("1 eNB, 10 pkts 3000 bytes each", v5), TestCase::QUICK);
279
279
280
  std::vector<EnbDlTestData> v6;  
280
  std::vector<EnbDlTestData> v6;  
281
  EnbDlTestData e6;
281
  EnbDlTestData e6;
282
  UeDlTestData f6 (50, 3000);
282
  UeDlTestData f6 (50, 3000);
283
  e6.ues.push_back (f6);
283
  e6.ues.push_back (f6);
284
  v6.push_back (e6);
284
  v6.push_back (e6);
285
  AddTestCase (new EpcS1uDlTestCase ("1 eNB, 50 pkts 3000 bytes each", v6));
285
  AddTestCase (new EpcS1uDlTestCase ("1 eNB, 50 pkts 3000 bytes each", v6), TestCase::QUICK);
286
  
286
  
287
  std::vector<EnbDlTestData> v7;  
287
  std::vector<EnbDlTestData> v7;  
288
  EnbDlTestData e7;
288
  EnbDlTestData e7;
289
  UeDlTestData f7 (10, 15000);
289
  UeDlTestData f7 (10, 15000);
290
  e7.ues.push_back (f7);
290
  e7.ues.push_back (f7);
291
  v7.push_back (e7);
291
  v7.push_back (e7);
292
  AddTestCase (new EpcS1uDlTestCase ("1 eNB, 10 pkts 15000 bytes each", v7));
292
  AddTestCase (new EpcS1uDlTestCase ("1 eNB, 10 pkts 15000 bytes each", v7), TestCase::QUICK);
293
293
294
  std::vector<EnbDlTestData> v8;  
294
  std::vector<EnbDlTestData> v8;  
295
  EnbDlTestData e8;
295
  EnbDlTestData e8;
296
  UeDlTestData f8 (100, 15000);
296
  UeDlTestData f8 (100, 15000);
297
  e8.ues.push_back (f8);
297
  e8.ues.push_back (f8);
298
  v8.push_back (e8);
298
  v8.push_back (e8);
299
  AddTestCase (new EpcS1uDlTestCase ("1 eNB, 100 pkts 15000 bytes each", v8));
299
  AddTestCase (new EpcS1uDlTestCase ("1 eNB, 100 pkts 15000 bytes each", v8), TestCase::QUICK);
300
}
300
}
301
301
302
302
(-)a/src/lte/test/epc-test-s1u-uplink.cc (-8 / +8 lines)
 Lines 463-469    Link Here 
463
  UeUlTestData f1 (1, 100, 1, 1);
463
  UeUlTestData f1 (1, 100, 1, 1);
464
  e1.ues.push_back (f1);
464
  e1.ues.push_back (f1);
465
  v1.push_back (e1);
465
  v1.push_back (e1);
466
  AddTestCase (new EpcS1uUlTestCase ("1 eNB, 1UE", v1));
466
  AddTestCase (new EpcS1uUlTestCase ("1 eNB, 1UE", v1), TestCase::QUICK);
467
467
468
468
469
  std::vector<EnbUlTestData> v2;  
469
  std::vector<EnbUlTestData> v2;  
 Lines 473-485    Link Here 
473
  UeUlTestData f2_2 (2, 200, 2, 1);
473
  UeUlTestData f2_2 (2, 200, 2, 1);
474
  e2.ues.push_back (f2_2);
474
  e2.ues.push_back (f2_2);
475
  v2.push_back (e2);
475
  v2.push_back (e2);
476
  AddTestCase (new EpcS1uUlTestCase ("1 eNB, 2UEs", v2));
476
  AddTestCase (new EpcS1uUlTestCase ("1 eNB, 2UEs", v2), TestCase::QUICK);
477
477
478
478
479
  std::vector<EnbUlTestData> v3;  
479
  std::vector<EnbUlTestData> v3;  
480
  v3.push_back (e1);
480
  v3.push_back (e1);
481
  v3.push_back (e2);
481
  v3.push_back (e2);
482
  AddTestCase (new EpcS1uUlTestCase ("2 eNBs", v3));
482
  AddTestCase (new EpcS1uUlTestCase ("2 eNBs", v3), TestCase::QUICK);
483
483
484
484
485
  EnbUlTestData e3;
485
  EnbUlTestData e3;
 Lines 493-527    Link Here 
493
  v4.push_back (e3);
493
  v4.push_back (e3);
494
  v4.push_back (e1);
494
  v4.push_back (e1);
495
  v4.push_back (e2);
495
  v4.push_back (e2);
496
  AddTestCase (new EpcS1uUlTestCase ("3 eNBs", v4));
496
  AddTestCase (new EpcS1uUlTestCase ("3 eNBs", v4), TestCase::QUICK);
497
497
498
  std::vector<EnbUlTestData> v5;  
498
  std::vector<EnbUlTestData> v5;  
499
  EnbUlTestData e5;
499
  EnbUlTestData e5;
500
  UeUlTestData f5 (10, 3000, 1, 1);
500
  UeUlTestData f5 (10, 3000, 1, 1);
501
  e5.ues.push_back (f5);
501
  e5.ues.push_back (f5);
502
  v5.push_back (e5);
502
  v5.push_back (e5);
503
  AddTestCase (new EpcS1uUlTestCase ("1 eNB, 10 pkts 3000 bytes each", v5));
503
  AddTestCase (new EpcS1uUlTestCase ("1 eNB, 10 pkts 3000 bytes each", v5), TestCase::QUICK);
504
504
505
  std::vector<EnbUlTestData> v6;  
505
  std::vector<EnbUlTestData> v6;  
506
  EnbUlTestData e6;
506
  EnbUlTestData e6;
507
  UeUlTestData f6 (50, 3000, 1, 1);
507
  UeUlTestData f6 (50, 3000, 1, 1);
508
  e6.ues.push_back (f6);
508
  e6.ues.push_back (f6);
509
  v6.push_back (e6);
509
  v6.push_back (e6);
510
  AddTestCase (new EpcS1uUlTestCase ("1 eNB, 50 pkts 3000 bytes each", v6));
510
  AddTestCase (new EpcS1uUlTestCase ("1 eNB, 50 pkts 3000 bytes each", v6), TestCase::QUICK);
511
511
512
  std::vector<EnbUlTestData> v7;  
512
  std::vector<EnbUlTestData> v7;  
513
  EnbUlTestData e7;
513
  EnbUlTestData e7;
514
  UeUlTestData f7 (10, 15000, 1, 1);
514
  UeUlTestData f7 (10, 15000, 1, 1);
515
  e7.ues.push_back (f7);
515
  e7.ues.push_back (f7);
516
  v7.push_back (e7);
516
  v7.push_back (e7);
517
  AddTestCase (new EpcS1uUlTestCase ("1 eNB, 10 pkts 15000 bytes each", v7));
517
  AddTestCase (new EpcS1uUlTestCase ("1 eNB, 10 pkts 15000 bytes each", v7), TestCase::QUICK);
518
518
519
  std::vector<EnbUlTestData> v8;  
519
  std::vector<EnbUlTestData> v8;  
520
  EnbUlTestData e8;
520
  EnbUlTestData e8;
521
  UeUlTestData f8 (100, 15000, 1, 1);
521
  UeUlTestData f8 (100, 15000, 1, 1);
522
  e8.ues.push_back (f8);
522
  e8.ues.push_back (f8);
523
  v8.push_back (e8);
523
  v8.push_back (e8);
524
  AddTestCase (new EpcS1uUlTestCase ("1 eNB, 100 pkts 15000 bytes each", v8));
524
  AddTestCase (new EpcS1uUlTestCase ("1 eNB, 100 pkts 15000 bytes each", v8), TestCase::QUICK);
525
  
525
  
526
}
526
}
527
527
(-)a/src/lte/test/lte-test-downlink-sinr.cc (-4 / +4 lines)
82
  (*theoreticalSinr1)[0] = 3.72589167251055;
82
  (*theoreticalSinr1)[0] = 3.72589167251055;
83
  (*theoreticalSinr1)[1] = 3.72255684126076;
83
  (*theoreticalSinr1)[1] = 3.72255684126076;
84
84
85
  AddTestCase (new LteDownlinkDataSinrTestCase (rxPsd1, theoreticalSinr1, "sdBm = [-46 -48]"));
85
  AddTestCase (new LteDownlinkDataSinrTestCase (rxPsd1, theoreticalSinr1, "sdBm = [-46 -48]"), TestCase::QUICK);
86
  AddTestCase (new LteDownlinkCtrlSinrTestCase (rxPsd1, theoreticalSinr1, "sdBm = [-46 -48]"));
86
  AddTestCase (new LteDownlinkCtrlSinrTestCase (rxPsd1, theoreticalSinr1, "sdBm = [-46 -48]"), TestCase::QUICK);
87
87
88
  /**
88
  /**
89
   * TX signal #2: Power Spectral Density (W/Hz) of the signal of interest = [-63 -61] dBm and BW = [20 22] MHz
89
   * TX signal #2: Power Spectral Density (W/Hz) of the signal of interest = [-63 -61] dBm and BW = [20 22] MHz
96
  (*theoreticalSinr2)[0] = 0.0743413124381667;
96
  (*theoreticalSinr2)[0] = 0.0743413124381667;
97
  (*theoreticalSinr2)[1] = 0.1865697965291756;
97
  (*theoreticalSinr2)[1] = 0.1865697965291756;
98
98
99
  AddTestCase (new LteDownlinkDataSinrTestCase (rxPsd2, theoreticalSinr2, "sdBm = [-63 -61]"));
99
  AddTestCase (new LteDownlinkDataSinrTestCase (rxPsd2, theoreticalSinr2, "sdBm = [-63 -61]"), TestCase::QUICK);
100
  AddTestCase (new LteDownlinkCtrlSinrTestCase (rxPsd2, theoreticalSinr2, "sdBm = [-63 -61]"));
100
  AddTestCase (new LteDownlinkCtrlSinrTestCase (rxPsd2, theoreticalSinr2, "sdBm = [-63 -61]"), TestCase::QUICK);
101
  
101
  
102
102
103
}
103
}
(-)a/src/lte/test/lte-test-earfcn.cc (-21 / +21 lines)
 Lines 126-154    Link Here 
126
{
126
{
127
  NS_LOG_FUNCTION (this);
127
  NS_LOG_FUNCTION (this);
128
128
129
  AddTestCase (new LteEarfcnDlTestCase ("DL EARFCN=500", 500, 2160e6));
129
  AddTestCase (new LteEarfcnDlTestCase ("DL EARFCN=500", 500, 2160e6), TestCase::QUICK);
130
  AddTestCase (new LteEarfcnDlTestCase ("DL EARFCN=1000", 1000, 1970e6));
130
  AddTestCase (new LteEarfcnDlTestCase ("DL EARFCN=1000", 1000, 1970e6), TestCase::QUICK);
131
  AddTestCase (new LteEarfcnDlTestCase ("DL EARFCN=1301", 1301, 1815.1e6));
131
  AddTestCase (new LteEarfcnDlTestCase ("DL EARFCN=1301", 1301, 1815.1e6), TestCase::QUICK);
132
  AddTestCase (new LteEarfcnDlTestCase ("DL EARFCN=7000", 7000, 0.0));
132
  AddTestCase (new LteEarfcnDlTestCase ("DL EARFCN=7000", 7000, 0.0), TestCase::QUICK);
133
  AddTestCase (new LteEarfcnDlTestCase ("DL EARFCN=20000", 20000, 0.0));
133
  AddTestCase (new LteEarfcnDlTestCase ("DL EARFCN=20000", 20000, 0.0), TestCase::QUICK);
134
  AddTestCase (new LteEarfcnDlTestCase ("DL EARFCN=50000", 50000, 0.0));
134
  AddTestCase (new LteEarfcnDlTestCase ("DL EARFCN=50000", 50000, 0.0), TestCase::QUICK);
135
135
136
  AddTestCase (new LteEarfcnUlTestCase ("UL EARFCN=18100", 18100, 1930e6));
136
  AddTestCase (new LteEarfcnUlTestCase ("UL EARFCN=18100", 18100, 1930e6), TestCase::QUICK);
137
  AddTestCase (new LteEarfcnUlTestCase ("UL EARFCN=19000", 19000, 1890e6));
137
  AddTestCase (new LteEarfcnUlTestCase ("UL EARFCN=19000", 19000, 1890e6), TestCase::QUICK);
138
  AddTestCase (new LteEarfcnUlTestCase ("UL EARFCN=19400", 19400, 1730e6));
138
  AddTestCase (new LteEarfcnUlTestCase ("UL EARFCN=19400", 19400, 1730e6), TestCase::QUICK);
139
  AddTestCase (new LteEarfcnUlTestCase ("UL EARFCN=10", 10, 0.0));
139
  AddTestCase (new LteEarfcnUlTestCase ("UL EARFCN=10", 10, 0.0), TestCase::QUICK);
140
  AddTestCase (new LteEarfcnUlTestCase ("UL EARFCN=1000", 1000, 0.0));
140
  AddTestCase (new LteEarfcnUlTestCase ("UL EARFCN=1000", 1000, 0.0), TestCase::QUICK);
141
  AddTestCase (new LteEarfcnUlTestCase ("UL EARFCN=50000", 50000, 0.0));
141
  AddTestCase (new LteEarfcnUlTestCase ("UL EARFCN=50000", 50000, 0.0), TestCase::QUICK);
142
142
143
  AddTestCase (new LteEarfcnTestCase ("EARFCN=500", 500, 2160e6));
143
  AddTestCase (new LteEarfcnTestCase ("EARFCN=500", 500, 2160e6), TestCase::QUICK);
144
  AddTestCase (new LteEarfcnTestCase ("EARFCN=1000", 1000, 1970e6));
144
  AddTestCase (new LteEarfcnTestCase ("EARFCN=1000", 1000, 1970e6), TestCase::QUICK);
145
  AddTestCase (new LteEarfcnTestCase ("EARFCN=1301", 1301, 1815.1e6));
145
  AddTestCase (new LteEarfcnTestCase ("EARFCN=1301", 1301, 1815.1e6), TestCase::QUICK);
146
  AddTestCase (new LteEarfcnTestCase ("EARFCN=8000", 8000, 0.0));
146
  AddTestCase (new LteEarfcnTestCase ("EARFCN=8000", 8000, 0.0), TestCase::QUICK);
147
  AddTestCase (new LteEarfcnTestCase ("EARFCN=50000", 50000, 0.0));
147
  AddTestCase (new LteEarfcnTestCase ("EARFCN=50000", 50000, 0.0), TestCase::QUICK);
148
  AddTestCase (new LteEarfcnTestCase ("EARFCN=18100", 18100, 1930e6));
148
  AddTestCase (new LteEarfcnTestCase ("EARFCN=18100", 18100, 1930e6), TestCase::QUICK);
149
  AddTestCase (new LteEarfcnTestCase ("EARFCN=19000", 19000, 1890e6));
149
  AddTestCase (new LteEarfcnTestCase ("EARFCN=19000", 19000, 1890e6), TestCase::QUICK);
150
  AddTestCase (new LteEarfcnTestCase ("EARFCN=19400", 19400, 1730e6));
150
  AddTestCase (new LteEarfcnTestCase ("EARFCN=19400", 19400, 1730e6), TestCase::QUICK);
151
  AddTestCase (new LteEarfcnTestCase ("EARFCN=50000", 50000, 0.0));
151
  AddTestCase (new LteEarfcnTestCase ("EARFCN=50000", 50000, 0.0), TestCase::QUICK);
152
}
152
}
153
153
154
154
(-)a/src/lte/test/lte-test-fading.cc (-1 / +1 lines)
 Lines 124-130    Link Here 
124
  Ptr<BuildingsMobilityModel> mm2 = ueNodes.Get (0)->GetObject<BuildingsMobilityModel> ();
124
  Ptr<BuildingsMobilityModel> mm2 = ueNodes.Get (0)->GetObject<BuildingsMobilityModel> ();
125
  mm2->SetPosition (Vector (distance, 0.0, hm));
125
  mm2->SetPosition (Vector (distance, 0.0, hm));
126
  
126
  
127
  AddTestCase (new LteFadingTestCase (mm1, mm2, 137.93, "OH Urban Large city"));
127
  AddTestCase (new LteFadingTestCase (mm1, mm2, 137.93, "OH Urban Large city"), TestCase::QUICK);
128
    
128
    
129
  
129
  
130
}
130
}
(-)a/src/lte/test/lte-test-fdbet-ff-mac-scheduler.cc (-21 / +21 lines)
 Lines 72-81    Link Here 
72
  // 3 users -> 8 PRB at Itbs 26 -> 749 -> 749000 bytes/sec
72
  // 3 users -> 8 PRB at Itbs 26 -> 749 -> 749000 bytes/sec
73
  // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 bytes/sec
73
  // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 bytes/sec
74
  // 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 bytes/sec
74
  // 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 bytes/sec
75
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (1,0,0,2196000,2292000));
75
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (1,0,0,2196000,2292000), TestCase::QUICK);
76
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (3,0,0,749000,749000));
76
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (3,0,0,749000,749000), TestCase::QUICK);
77
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (6,0,0,373000,373000));
77
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (6,0,0,373000,373000), TestCase::QUICK);
78
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (12,0,0,185000,185000));
78
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (12,0,0,185000,185000), TestCase::QUICK);
79
79
80
  // DOWNLINK - DISTANCE 3000 -> MCS 22 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213)
80
  // DOWNLINK - DISTANCE 3000 -> MCS 22 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213)
81
  // 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 bytes/sec
81
  // 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 bytes/sec
 Lines 87-96    Link Here 
87
  // 3 users -> 8 PRB at Itbs 18 -> 389 -> 389000 bytes/sec
87
  // 3 users -> 8 PRB at Itbs 18 -> 389 -> 389000 bytes/sec
88
  // 6 users -> 4 PRB at Itbs 18 -> 193 -> 193000 bytes/sec
88
  // 6 users -> 4 PRB at Itbs 18 -> 193 -> 193000 bytes/sec
89
  // 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 bytes/sec
89
  // 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 bytes/sec
90
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (1,0,3000,1383000,1239000));
90
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (1,0,3000,1383000,1239000), TestCase::QUICK);
91
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (3,0,3000,469000,389000));
91
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (3,0,3000,469000,389000), TestCase::QUICK);
92
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (6,0,3000,233500,193000));
92
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (6,0,3000,233500,193000), TestCase::QUICK);
93
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (12,0,3000,113000,97000));
93
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (12,0,3000,113000,97000), TestCase::QUICK);
94
94
95
  // DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
95
  // DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
96
  // 1 user -> 24 PRB at Itbs 15 -> 903 -> 903000 bytes/sec
96
  // 1 user -> 24 PRB at Itbs 15 -> 903 -> 903000 bytes/sec
 Lines 102-111    Link Here 
102
  // 3 users -> 8 PRB at Itbs 11 -> 201 -> 201000 bytes/sec
102
  // 3 users -> 8 PRB at Itbs 11 -> 201 -> 201000 bytes/sec
103
  // 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 bytes/sec
103
  // 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 bytes/sec
104
  // 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 bytes/sec
104
  // 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 bytes/sec
105
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (1,0,6000,903000,621000));
105
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (1,0,6000,903000,621000), TestCase::QUICK);
106
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (3,0,6000,309000,201000));
106
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (3,0,6000,309000,201000), TestCase::QUICK);
107
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (6,0,6000,153000,97000));
107
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (6,0,6000,153000,97000), TestCase::QUICK);
108
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (12,0,6000,75000,47000));
108
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (12,0,6000,75000,47000), TestCase::QUICK);
109
109
110
  // DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
110
  // DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
111
  // 1 user -> 24 PRB at Itbs 11 -> 597 -> 597000 bytes/sec
111
  // 1 user -> 24 PRB at Itbs 11 -> 597 -> 597000 bytes/sec
 Lines 117-126    Link Here 
117
  // 3 users -> 8 PRB at Itbs 8 -> 137 -> 137000 bytes/sec
117
  // 3 users -> 8 PRB at Itbs 8 -> 137 -> 137000 bytes/sec
118
  // 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 bytes/sec
118
  // 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 bytes/sec
119
  // 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 bytes/sec
119
  // 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 bytes/sec
120
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (1,0,9000,597000,437000));
120
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (1,0,9000,597000,437000), TestCase::QUICK);
121
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (3,0,9000,201000,137000));
121
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (3,0,9000,201000,137000), TestCase::QUICK);
122
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (6,0,9000,97000,67000));
122
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (6,0,9000,97000,67000), TestCase::QUICK);
123
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (12,0,9000,47000,32000));
123
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (12,0,9000,47000,32000), TestCase::QUICK);
124
124
125
  // DOWNLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
125
  // DOWNLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
126
  // 1 user -> 24 PRB at Itbs 6 -> 309 -> 309000 bytes/sec
126
  // 1 user -> 24 PRB at Itbs 6 -> 309 -> 309000 bytes/sec
 Lines 132-141    Link Here 
132
  // 3 users -> 8 PRB at Itbs 6 -> 69 -> 69000 bytes/sec
132
  // 3 users -> 8 PRB at Itbs 6 -> 69 -> 69000 bytes/sec
133
  // 6 users -> 4 PRB at Itbs 6 -> 32 -> 32000 bytes/sec
133
  // 6 users -> 4 PRB at Itbs 6 -> 32 -> 32000 bytes/sec
134
  // 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 bytes/sec
134
  // 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 bytes/sec
135
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (1,0,15000,309000,233000));
135
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (1,0,15000,309000,233000), TestCase::QUICK);
136
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (3,0,15000,101000,69000));
136
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (3,0,15000,101000,69000), TestCase::QUICK);
137
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (6,0,15000,49000,32000));
137
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (6,0,15000,49000,32000), TestCase::QUICK);
138
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (12,0,15000,22000,15000));
138
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (12,0,15000,22000,15000), TestCase::QUICK);
139
139
140
  // Test Case 2: fairness check
140
  // Test Case 2: fairness check
141
141
 Lines 154-160    Link Here 
154
  estThrFdBetUl.push_back (293000); // User 1 estimated TTI throughput from FDBET
154
  estThrFdBetUl.push_back (293000); // User 1 estimated TTI throughput from FDBET
155
  estThrFdBetUl.push_back (149000); // User 2 estimated TTI throughput from FDBET
155
  estThrFdBetUl.push_back (149000); // User 2 estimated TTI throughput from FDBET
156
  estThrFdBetUl.push_back (101000);  // User 3 estimated TTI throughput from FDBET
156
  estThrFdBetUl.push_back (101000);  // User 3 estimated TTI throughput from FDBET
157
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase2 (dist, estAchievableRateDl, estThrFdBetUl));
157
  AddTestCase (new LenaFdBetFfMacSchedulerTestCase2 (dist, estAchievableRateDl, estThrFdBetUl), TestCase::QUICK);
158
158
159
159
160
}
160
}
(-)a/src/lte/test/lte-test-fdmt-ff-mac-scheduler.cc (-25 / +25 lines)
 Lines 74-84    Link Here 
74
  // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 bytes/sec
74
  // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 bytes/sec
75
  // 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 bytes/sec
75
  // 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 bytes/sec
76
  // 15 users -> 1 PRB at Itbs 26 -> 89 -> 89000 bytes/sec
76
  // 15 users -> 1 PRB at Itbs 26 -> 89 -> 89000 bytes/sec
77
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (1,0,0,2196000,2292000));
77
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (1,0,0,2196000,2292000), TestCase::QUICK);
78
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (3,0,0,2196000,749000));
78
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (3,0,0,2196000,749000), TestCase::QUICK);
79
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (6,0,0,2196000,373000));
79
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (6,0,0,2196000,373000), TestCase::QUICK);
80
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (12,0,0,2196000,185000));
80
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (12,0,0,2196000,185000), TestCase::QUICK);
81
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (15,0,0,2196000,89000));
81
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (15,0,0,2196000,89000), TestCase::QUICK);
82
 
82
 
83
  // DOWNLINK - DISTANCE 3000 -> MCS 24 -> Itbs 30 (from table 7.1.7.2.1-1 of 36.213)
83
  // DOWNLINK - DISTANCE 3000 -> MCS 24 -> Itbs 30 (from table 7.1.7.2.1-1 of 36.213)
84
  // 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 bytes/sec for first UE; 0 bytes/sec for other UEs
84
  // 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 bytes/sec for first UE; 0 bytes/sec for other UEs
 Lines 92-102    Link Here 
92
  // 6 users -> 4 PRB at Itbs 18 -> 193 -> 193000 bytes/sec
92
  // 6 users -> 4 PRB at Itbs 18 -> 193 -> 193000 bytes/sec
93
  // 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 bytes/sec
93
  // 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 bytes/sec
94
  // 15 users -> 1 PRB at Itbs 18 -> 47 -> 47000 bytes/sec 
94
  // 15 users -> 1 PRB at Itbs 18 -> 47 -> 47000 bytes/sec 
95
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (1,0,3000,1383000,1239000));
95
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (1,0,3000,1383000,1239000), TestCase::QUICK);
96
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (3,0,3000,1383000,389000));
96
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (3,0,3000,1383000,389000), TestCase::QUICK);
97
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (6,0,3000,1383000,193000));
97
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (6,0,3000,1383000,193000), TestCase::QUICK);
98
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (12,0,3000,1383000,97000));
98
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (12,0,3000,1383000,97000), TestCase::QUICK);
99
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (15,0,3000,1383000,47000));
99
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (15,0,3000,1383000,47000), TestCase::QUICK);
100
 
100
 
101
  // DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
101
  // DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
102
  // 1 user -> 24 PRB at Itbs 15 -> 903 -> 903000 bytes/sec for first UE; 0 bytes/sec for other UEs
102
  // 1 user -> 24 PRB at Itbs 15 -> 903 -> 903000 bytes/sec for first UE; 0 bytes/sec for other UEs
 Lines 110-120    Link Here 
110
  // 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 bytes/sec
110
  // 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 bytes/sec
111
  // 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 bytes/sec
111
  // 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 bytes/sec
112
  // 15 users -> 1 PRB at Itbs 11 -> 22 -> 22000 bytes/sec
112
  // 15 users -> 1 PRB at Itbs 11 -> 22 -> 22000 bytes/sec
113
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (1,0,6000,903000,621000));
113
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (1,0,6000,903000,621000), TestCase::QUICK);
114
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (3,0,6000,903000,201000));
114
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (3,0,6000,903000,201000), TestCase::QUICK);
115
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (6,0,6000,903000,97000));
115
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (6,0,6000,903000,97000), TestCase::QUICK);
116
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (12,0,6000,903000,47000));
116
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (12,0,6000,903000,47000), TestCase::QUICK);
117
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (15,0,6000,903000,22000));
117
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (15,0,6000,903000,22000), TestCase::QUICK);
118
 
118
 
119
  // DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
119
  // DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
120
  // 1 user -> 24 PRB at Itbs 11 -> 597 -> 597000 bytes/sec
120
  // 1 user -> 24 PRB at Itbs 11 -> 597 -> 597000 bytes/sec
 Lines 128-138    Link Here 
128
  // 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 bytes/sec
128
  // 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 bytes/sec
129
  // 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 bytes/sec
129
  // 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 bytes/sec
130
  // 15 users -> 1 PRB at Itbs 8 -> 15 -> 15000 bytes/sec 
130
  // 15 users -> 1 PRB at Itbs 8 -> 15 -> 15000 bytes/sec 
131
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (1,0,9000,597000,437000));
131
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (1,0,9000,597000,437000), TestCase::QUICK);
132
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (3,0,9000,597000,137000));
132
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (3,0,9000,597000,137000), TestCase::QUICK);
133
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (6,0,9000,597000,67000));
133
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (6,0,9000,597000,67000), TestCase::QUICK);
134
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (12,0,9000,597000,32000));
134
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (12,0,9000,597000,32000), TestCase::QUICK);
135
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (15,0,9000,597000,15000));
135
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (15,0,9000,597000,15000), TestCase::QUICK);
136
 
136
 
137
  // DONWLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
137
  // DONWLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
138
  // 1 user -> 24 PRB at Itbs 6 -> 309 -> 309000 bytes/sec
138
  // 1 user -> 24 PRB at Itbs 6 -> 309 -> 309000 bytes/sec
 Lines 146-156    Link Here 
146
  // 6 users -> 4 PRB at Itbs 6 -> 32 -> 32000 bytes/sec
146
  // 6 users -> 4 PRB at Itbs 6 -> 32 -> 32000 bytes/sec
147
  // 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 bytes/sec
147
  // 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 bytes/sec
148
  // 15 users -> 1 PRB at Itbs 6 -> 7 -> 7000 bytes/sec
148
  // 15 users -> 1 PRB at Itbs 6 -> 7 -> 7000 bytes/sec
149
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (1,0,15000,309000,233000));
149
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (1,0,15000,309000,233000), TestCase::QUICK);
150
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (3,0,15000,309000,69000));
150
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (3,0,15000,309000,69000), TestCase::QUICK);
151
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (6,0,15000,309000,32000));
151
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (6,0,15000,309000,32000), TestCase::QUICK);
152
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (12,0,15000,309000,15000));
152
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (12,0,15000,309000,15000), TestCase::QUICK);
153
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (15,0,15000,309000,7000));
153
  AddTestCase (new LenaFdMtFfMacSchedulerTestCase (15,0,15000,309000,7000), TestCase::QUICK);
154
154
155
 
155
 
156
}
156
}
(-)a/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc (-23 / +23 lines)
 Lines 90-99    Link Here 
90
  // 3 users -> 8 PRB at Itbs 26 -> 749 -> 749000 > 232000 -> throughput = 232000 bytes/sec 
90
  // 3 users -> 8 PRB at Itbs 26 -> 749 -> 749000 > 232000 -> throughput = 232000 bytes/sec 
91
  // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 > 232000 -> throughput = 232000 bytes/sec
91
  // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 > 232000 -> throughput = 232000 bytes/sec
92
  // 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 < 232000 -> throughput = 185000 bytes/sec
92
  // 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 < 232000 -> throughput = 185000 bytes/sec
93
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (1,0,0,232000,232000,200,1));
93
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (1,0,0,232000,232000,200,1), TestCase::QUICK);
94
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (3,0,0,232000,232000,200,1));
94
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (3,0,0,232000,232000,200,1), TestCase::QUICK);
95
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (6,0,0,232000,232000,200,1));
95
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (6,0,0,232000,232000,200,1), TestCase::QUICK);
96
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (12,0,0,183000,185000,200,1));
96
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (12,0,0,183000,185000,200,1), TestCase::QUICK);
97
97
98
  // DOWNLINK - DISTANCE 3000 -> MCS 24 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213)
98
  // DOWNLINK - DISTANCE 3000 -> MCS 24 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213)
99
  // DOWNLINK -> DISTANCE 0 -> MCS 28 -> Itbs 26 (from table 7.1.7.2.1-1 of 36.2    13)
99
  // DOWNLINK -> DISTANCE 0 -> MCS 28 -> Itbs 26 (from table 7.1.7.2.1-1 of 36.2    13)
 Lines 110-119    Link Here 
110
  // 3 users -> 8 PRB at Itbs 18 -> 389 -> 389000 > 232000 -> throughput = 232000 bytes/sec
110
  // 3 users -> 8 PRB at Itbs 18 -> 389 -> 389000 > 232000 -> throughput = 232000 bytes/sec
111
  // 6 users -> 4 PRB at Itbs 18 -> 193 -> 193000 < 232000 -> throughput = 193000 bytes/sec
111
  // 6 users -> 4 PRB at Itbs 18 -> 193 -> 193000 < 232000 -> throughput = 193000 bytes/sec
112
  // 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 < 232000 -> throughput = 97000 bytes/sec
112
  // 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 < 232000 -> throughput = 97000 bytes/sec
113
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (1,0,3000,232000,232000,200,1));
113
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (1,0,3000,232000,232000,200,1), TestCase::QUICK);
114
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (3,0,3000,232000,232000,200,1));
114
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (3,0,3000,232000,232000,200,1), TestCase::QUICK);
115
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (6,0,3000,230500,193000,200,1));
115
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (6,0,3000,230500,193000,200,1), TestCase::QUICK);
116
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (12,0,3000,115250,97000,200,1));
116
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (12,0,3000,115250,97000,200,1), TestCase::QUICK);
117
 
117
 
118
  // DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
118
  // DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
119
  // Traffic info
119
  // Traffic info
 Lines 129-138    Link Here 
129
  // 3 users -> 8 PRB at Itbs 11 -> 201 -> 201000 < 232000 -> throughput = 201000  bytes/sec
129
  // 3 users -> 8 PRB at Itbs 11 -> 201 -> 201000 < 232000 -> throughput = 201000  bytes/sec
130
  // 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 < 232000 -> throughput = 97000 bytes/sec
130
  // 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 < 232000 -> throughput = 97000 bytes/sec
131
  // 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 < 232000 -> throughput = 47000 bytes/sec
131
  // 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 < 232000 -> throughput = 47000 bytes/sec
132
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (1,0,6000,232000,232000,200,1));
132
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (1,0,6000,232000,232000,200,1), TestCase::QUICK);
133
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (3,0,6000,232000,201000,200,1));
133
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (3,0,6000,232000,201000,200,1), TestCase::QUICK);
134
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (6,0,6000,150500,97000,200,1));
134
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (6,0,6000,150500,97000,200,1), TestCase::QUICK);
135
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (12,0,6000,75250,47000,200,1));
135
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (12,0,6000,75250,47000,200,1), TestCase::QUICK);
136
136
137
  // DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
137
  // DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
138
  // Traffic info
138
  // Traffic info
 Lines 148-157    Link Here 
148
  // 3 users -> 8 PRB at Itbs 8 -> 137 -> 137000 < 232000 -> throughput = 137000 bytes/sec
148
  // 3 users -> 8 PRB at Itbs 8 -> 137 -> 137000 < 232000 -> throughput = 137000 bytes/sec
149
  // 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 < 232000 -> throughput = 67000 bytes/sec
149
  // 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 < 232000 -> throughput = 67000 bytes/sec
150
  // 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 < 232000 -> throughput = 32000 bytes/sec
150
  // 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 < 232000 -> throughput = 32000 bytes/sec
151
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (1,0,9000,232000,232000,200,1));
151
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (1,0,9000,232000,232000,200,1), TestCase::QUICK);
152
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (3,0,9000,199000,137000,200,1));
152
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (3,0,9000,199000,137000,200,1), TestCase::QUICK);
153
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (6,0,9000,99500,67000,200,1));
153
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (6,0,9000,99500,67000,200,1), TestCase::QUICK);
154
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (12,0,9000,49750,32000,200,1));
154
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (12,0,9000,49750,32000,200,1), TestCase::QUICK);
155
 
155
 
156
  // DONWLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
156
  // DONWLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
157
  // Traffic info
157
  // Traffic info
 Lines 167-176    Link Here 
167
  // 3 users -> 8 PRB at Itbs 6 -> 69 -> 69000 < 232000 -> throughput = 69000 bytes/sec
167
  // 3 users -> 8 PRB at Itbs 6 -> 69 -> 69000 < 232000 -> throughput = 69000 bytes/sec
168
  // 6 users -> 4 PRB at Itbs 6 -> 32 -> 32000 < 232000 -> throughput = 32000 bytes/sec
168
  // 6 users -> 4 PRB at Itbs 6 -> 32 -> 32000 < 232000 -> throughput = 32000 bytes/sec
169
  // 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 < 232000 -> throughput = 15000 bytes/sec
169
  // 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 < 232000 -> throughput = 15000 bytes/sec
170
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (1,0,15000,232000,232000,200,1));
170
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (1,0,15000,232000,232000,200,1), TestCase::QUICK);
171
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (3,0,15000,103000,69000,200,1));
171
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (3,0,15000,103000,69000,200,1), TestCase::QUICK);
172
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (6,0,15000,51500,32000,200,1));
172
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (6,0,15000,51500,32000,200,1), TestCase::QUICK);
173
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (12,0,15000,25750,15000,200,1));
173
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (12,0,15000,25750,15000,200,1), TestCase::QUICK);
174
174
175
  // Test Case 2: homogeneous flow test in FDTBFQ (different distance)
175
  // Test Case 2: homogeneous flow test in FDTBFQ (different distance)
176
  // Traffic1 info
176
  // Traffic1 info
 Lines 196-202    Link Here 
196
  estThrFdTbfqDl1.push_back (132000); // User 2 estimated TTI throughput from FDTBFQ
196
  estThrFdTbfqDl1.push_back (132000); // User 2 estimated TTI throughput from FDTBFQ
197
  estThrFdTbfqDl1.push_back (132000); // User 3 estimated TTI throughput from FDTBFQ
197
  estThrFdTbfqDl1.push_back (132000); // User 3 estimated TTI throughput from FDTBFQ
198
  estThrFdTbfqDl1.push_back (132000); // User 4 estimated TTI throughput from FDTBFQ
198
  estThrFdTbfqDl1.push_back (132000); // User 4 estimated TTI throughput from FDTBFQ
199
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase2 (dist1,estThrFdTbfqDl1,packetSize1,1));
199
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase2 (dist1,estThrFdTbfqDl1,packetSize1,1), TestCase::QUICK);
200
200
201
  // Traffic2 info
201
  // Traffic2 info
202
  //   UDP traffic: payload size = 200 bytes, interval = 1 ms
202
  //   UDP traffic: payload size = 200 bytes, interval = 1 ms
 Lines 221-227    Link Here 
221
  estThrFdTbfqDl2.push_back (138944); // User 2 estimated TTI throughput from FDTBFQ
221
  estThrFdTbfqDl2.push_back (138944); // User 2 estimated TTI throughput from FDTBFQ
222
  estThrFdTbfqDl2.push_back (138944); // User 3 estimated TTI throughput from FDTBFQ
222
  estThrFdTbfqDl2.push_back (138944); // User 3 estimated TTI throughput from FDTBFQ
223
  estThrFdTbfqDl2.push_back (138944); // User 4 estimated TTI throughput from FDTBFQ
223
  estThrFdTbfqDl2.push_back (138944); // User 4 estimated TTI throughput from FDTBFQ
224
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase2 (dist2,estThrFdTbfqDl2,packetSize2,1));
224
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase2 (dist2,estThrFdTbfqDl2,packetSize2,1), TestCase::QUICK);
225
225
226
  // Test Case 3: heterogeneous flow test in FDTBFQ
226
  // Test Case 3: heterogeneous flow test in FDTBFQ
227
  //   UDP traffic: payload size = [100,200,300] bytes, interval = 1 ms
227
  //   UDP traffic: payload size = [100,200,300] bytes, interval = 1 ms
 Lines 240-246    Link Here 
240
  estThrFdTbfqDl3.push_back (132000); // User 0 estimated TTI throughput from FDTBFQ
240
  estThrFdTbfqDl3.push_back (132000); // User 0 estimated TTI throughput from FDTBFQ
241
  estThrFdTbfqDl3.push_back (232000); // User 1 estimated TTI throughput from FDTBFQ
241
  estThrFdTbfqDl3.push_back (232000); // User 1 estimated TTI throughput from FDTBFQ
242
  estThrFdTbfqDl3.push_back (332000); // User 2 estimated TTI throughput from FDTBFQ
242
  estThrFdTbfqDl3.push_back (332000); // User 2 estimated TTI throughput from FDTBFQ
243
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase2 (dist3,estThrFdTbfqDl3,packetSize3,1));
243
  AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase2 (dist3,estThrFdTbfqDl3,packetSize3,1), TestCase::QUICK);
244
244
245
}
245
}
246
246
(-)a/src/lte/test/lte-test-interference.cc (-13 / +13 lines)
 Lines 70-88    Link Here 
70
{
70
{
71
  NS_LOG_INFO ("Creating LteInterferenceTestSuite");
71
  NS_LOG_INFO ("Creating LteInterferenceTestSuite");
72
72
73
  AddTestCase (new LteInterferenceTestCase ("d1=3000, d2=6000",  3000.000000, 6000.000000,  3.844681, 1.714583,  0.761558, 0.389662, 6, 4));
73
  AddTestCase (new LteInterferenceTestCase ("d1=3000, d2=6000",  3000.000000, 6000.000000,  3.844681, 1.714583,  0.761558, 0.389662, 6, 4), TestCase::QUICK);
74
  AddTestCase (new LteInterferenceTestCase ("d1=50, d2=10",  50.000000, 10.000000,  0.040000, 0.040000,  0.010399, 0.010399, 0, 0));
74
  AddTestCase (new LteInterferenceTestCase ("d1=50, d2=10",  50.000000, 10.000000,  0.040000, 0.040000,  0.010399, 0.010399, 0, 0), TestCase::QUICK);
75
  AddTestCase (new LteInterferenceTestCase ("d1=50, d2=20",  50.000000, 20.000000,  0.160000, 0.159998,  0.041154, 0.041153, 0, 0));
75
  AddTestCase (new LteInterferenceTestCase ("d1=50, d2=20",  50.000000, 20.000000,  0.160000, 0.159998,  0.041154, 0.041153, 0, 0), TestCase::QUICK);
76
  AddTestCase (new LteInterferenceTestCase ("d1=50, d2=50",  50.000000, 50.000000,  0.999997, 0.999907,  0.239828, 0.239808, 2, 2));
76
  AddTestCase (new LteInterferenceTestCase ("d1=50, d2=50",  50.000000, 50.000000,  0.999997, 0.999907,  0.239828, 0.239808, 2, 2), TestCase::QUICK);
77
  AddTestCase (new LteInterferenceTestCase ("d1=50, d2=100",  50.000000, 100.000000,  3.999955, 3.998520,  0.785259, 0.785042, 6, 6));
77
  AddTestCase (new LteInterferenceTestCase ("d1=50, d2=100",  50.000000, 100.000000,  3.999955, 3.998520,  0.785259, 0.785042, 6, 6), TestCase::QUICK);
78
  AddTestCase (new LteInterferenceTestCase ("d1=50, d2=200",  50.000000, 200.000000,  15.999282, 15.976339,  1.961072, 1.959533, 14, 14));
78
  AddTestCase (new LteInterferenceTestCase ("d1=50, d2=200",  50.000000, 200.000000,  15.999282, 15.976339,  1.961072, 1.959533, 14, 14), TestCase::QUICK);
79
  AddTestCase (new LteInterferenceTestCase ("d1=50, d2=500",  50.000000, 500.000000,  99.971953, 99.082845,  4.254003, 4.241793, 22, 22));
79
  AddTestCase (new LteInterferenceTestCase ("d1=50, d2=500",  50.000000, 500.000000,  99.971953, 99.082845,  4.254003, 4.241793, 22, 22), TestCase::QUICK);
80
  AddTestCase (new LteInterferenceTestCase ("d1=50, d2=1000",  50.000000, 1000.000000,  399.551632, 385.718468,  6.194952, 6.144825, 28, 28));
80
  AddTestCase (new LteInterferenceTestCase ("d1=50, d2=1000",  50.000000, 1000.000000,  399.551632, 385.718468,  6.194952, 6.144825, 28, 28), TestCase::QUICK);
81
  AddTestCase (new LteInterferenceTestCase ("d1=50, d2=10000",  50.000000, 10000.000000,  35964.181431, 8505.970614,  12.667381, 10.588084, 28, 28));
81
  AddTestCase (new LteInterferenceTestCase ("d1=50, d2=10000",  50.000000, 10000.000000,  35964.181431, 8505.970614,  12.667381, 10.588084, 28, 28), TestCase::QUICK);
82
  AddTestCase (new LteInterferenceTestCase ("d1=50, d2=100000",  50.000000, 100000.000000,  327284.773828, 10774.181090,  15.853097, 10.928917, 28, 28));
82
  AddTestCase (new LteInterferenceTestCase ("d1=50, d2=100000",  50.000000, 100000.000000,  327284.773828, 10774.181090,  15.853097, 10.928917, 28, 28), TestCase::QUICK);
83
  AddTestCase (new LteInterferenceTestCase ("d1=50, d2=1000000",  50.000000, 1000000.000000,  356132.574152, 10802.988445,  15.974963, 10.932767, 28, 28));
83
  AddTestCase (new LteInterferenceTestCase ("d1=50, d2=1000000",  50.000000, 1000000.000000,  356132.574152, 10802.988445,  15.974963, 10.932767, 28, 28), TestCase::QUICK);
84
  AddTestCase (new LteInterferenceTestCase ("d1=4500, d2=12600",  4500.000000, 12600.000000,  6.654462, 1.139831,  1.139781, 0.270399, 8, 2));
84
  AddTestCase (new LteInterferenceTestCase ("d1=4500, d2=12600",  4500.000000, 12600.000000,  6.654462, 1.139831,  1.139781, 0.270399, 8, 2), TestCase::QUICK);
85
  AddTestCase (new LteInterferenceTestCase ("d1=5400, d2=12600",  5400.000000, 12600.000000,  4.621154, 0.791549,  0.876368, 0.193019, 6, 0));
85
  AddTestCase (new LteInterferenceTestCase ("d1=5400, d2=12600",  5400.000000, 12600.000000,  4.621154, 0.791549,  0.876368, 0.193019, 6, 0), TestCase::QUICK);
86
86
87
87
88
}
88
}
(-)a/src/lte/test/lte-test-link-adaptation.cc (-1 / +1 lines)
123
      std::ostringstream name;
123
      std::ostringstream name;
124
      name << " snr= " << snrEfficiencyMcs[i].snrDb << " dB, "
124
      name << " snr= " << snrEfficiencyMcs[i].snrDb << " dB, "
125
           << " mcs= " << snrEfficiencyMcs[i].mcsIndex;
125
           << " mcs= " << snrEfficiencyMcs[i].mcsIndex;
126
      AddTestCase (new LteLinkAdaptationTestCase (name.str (),  snrEfficiencyMcs[i].snrDb, lossDb, snrEfficiencyMcs[i].mcsIndex));
126
      AddTestCase (new LteLinkAdaptationTestCase (name.str (),  snrEfficiencyMcs[i].snrDb, lossDb, snrEfficiencyMcs[i].mcsIndex), TestCase::QUICK);
127
    }
127
    }
128
128
129
}
129
}
(-)a/src/lte/test/lte-test-mimo.cc (-2 / +2 lines)
 Lines 74-81    Link Here 
74
  estThrDl.push_back (119100); // TTI 1 estimated throughput for TxMode 1
74
  estThrDl.push_back (119100); // TTI 1 estimated throughput for TxMode 1
75
  estThrDl.push_back (183600); // TTI 2 estimated throughput for TxMode 2
75
  estThrDl.push_back (183600); // TTI 2 estimated throughput for TxMode 2
76
  estThrDl.push_back (193400); // TTI 3 estimated throughput for TxMode 3
76
  estThrDl.push_back (193400); // TTI 3 estimated throughput for TxMode 3
77
  AddTestCase (new LenaMimoTestCase(300, estThrDl, "ns3::RrFfMacScheduler"));
77
  AddTestCase (new LenaMimoTestCase(300, estThrDl, "ns3::RrFfMacScheduler"), TestCase::QUICK);
78
  AddTestCase (new LenaMimoTestCase(300, estThrDl, "ns3::PfFfMacScheduler"));
78
  AddTestCase (new LenaMimoTestCase(300, estThrDl, "ns3::PfFfMacScheduler"), TestCase::QUICK);
79
 
79
 
80
80
81
}
81
}
(-)a/src/lte/test/lte-test-pathloss-model.cc (-1 / +1 lines)
 Lines 161-167    Link Here 
161
    std::ostringstream name;
161
    std::ostringstream name;
162
    name << " snr= " << sinrDb << " dB, "
162
    name << " snr= " << sinrDb << " dB, "
163
    << " mcs= " << snrEfficiencyMcs[i].mcsIndex;
163
    << " mcs= " << snrEfficiencyMcs[i].mcsIndex;
164
    AddTestCase (new LtePathlossModelSystemTestCase (name.str (),  sinrDb, dist[i], snrEfficiencyMcs[i].mcsIndex));
164
    AddTestCase (new LtePathlossModelSystemTestCase (name.str (),  sinrDb, dist[i], snrEfficiencyMcs[i].mcsIndex), TestCase::QUICK);
165
  }
165
  }
166
166
167
167
(-)a/src/lte/test/lte-test-pf-ff-mac-scheduler.cc (-26 / +26 lines)
 Lines 73-83    Link Here 
73
  // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 bytes/sec
73
  // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 bytes/sec
74
  // 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 bytes/sec
74
  // 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 bytes/sec
75
  // 15 users -> 1 PRB at Itbs 26 -> 89 -> 89000 bytes/sec
75
  // 15 users -> 1 PRB at Itbs 26 -> 89 -> 89000 bytes/sec
76
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (1,0,0,2196000,2292000));
76
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (1,0,0,2196000,2292000), TestCase::QUICK);
77
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (3,0,0,732000,749000));
77
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (3,0,0,732000,749000), TestCase::QUICK);
78
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (6,0,0,366000,373000));
78
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (6,0,0,366000,373000), TestCase::QUICK);
79
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (12,0,0,183000,185000));
79
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (12,0,0,183000,185000), TestCase::QUICK);
80
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (15,0,0,146400,89000));
80
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (15,0,0,146400,89000), TestCase::QUICK);
81
 
81
 
82
  // DOWNLINK - DISTANCE 3000 -> MCS 24 -> Itbs 30 (from table 7.1.7.2.1-1 of 36.213)
82
  // DOWNLINK - DISTANCE 3000 -> MCS 24 -> Itbs 30 (from table 7.1.7.2.1-1 of 36.213)
83
  // 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 bytes/sec
83
  // 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 bytes/sec
 Lines 91-101    Link Here 
91
  // 6 users -> 4 PRB at Itbs 18 -> 193 -> 193000 bytes/sec
91
  // 6 users -> 4 PRB at Itbs 18 -> 193 -> 193000 bytes/sec
92
  // 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 bytes/sec
92
  // 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 bytes/sec
93
  // 15 users -> 1 PRB at Itbs 18 -> 47 -> 47000 bytes/sec 
93
  // 15 users -> 1 PRB at Itbs 18 -> 47 -> 47000 bytes/sec 
94
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (1,0,3000,1383000,1239000));
94
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (1,0,3000,1383000,1239000), TestCase::QUICK);
95
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (3,0,3000,461000,389000));
95
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (3,0,3000,461000,389000), TestCase::QUICK);
96
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (6,0,3000,230500,193000));
96
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (6,0,3000,230500,193000), TestCase::QUICK);
97
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (12,0,3000,115250,97000));
97
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (12,0,3000,115250,97000), TestCase::QUICK);
98
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (15,0,3000,92200,47000));
98
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (15,0,3000,92200,47000), TestCase::QUICK);
99
 
99
 
100
  // DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
100
  // DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
101
  // 1 user -> 24 PRB at Itbs 15 -> 903 -> 903000 bytes/sec
101
  // 1 user -> 24 PRB at Itbs 15 -> 903 -> 903000 bytes/sec
 Lines 109-119    Link Here 
109
  // 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 bytes/sec
109
  // 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 bytes/sec
110
  // 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 bytes/sec
110
  // 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 bytes/sec
111
  // 15 users -> 1 PRB at Itbs 11 -> 22 -> 22000 bytes/sec
111
  // 15 users -> 1 PRB at Itbs 11 -> 22 -> 22000 bytes/sec
112
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (1,0,6000,903000,621000));
112
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (1,0,6000,903000,621000), TestCase::QUICK);
113
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (3,0,6000,301000,201000));
113
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (3,0,6000,301000,201000), TestCase::QUICK);
114
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (6,0,6000,150500,97000));
114
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (6,0,6000,150500,97000), TestCase::QUICK);
115
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (12,0,6000,75250,47000));
115
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (12,0,6000,75250,47000), TestCase::QUICK);
116
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (15,0,6000,60200,22000));
116
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (15,0,6000,60200,22000), TestCase::QUICK);
117
 
117
 
118
  // DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
118
  // DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
119
  // 1 user -> 24 PRB at Itbs 11 -> 597 -> 597000 bytes/sec
119
  // 1 user -> 24 PRB at Itbs 11 -> 597 -> 597000 bytes/sec
 Lines 127-137    Link Here 
127
  // 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 bytes/sec
127
  // 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 bytes/sec
128
  // 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 bytes/sec
128
  // 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 bytes/sec
129
  // 15 users -> 1 PRB at Itbs 8 -> 15 -> 15000 bytes/sec 
129
  // 15 users -> 1 PRB at Itbs 8 -> 15 -> 15000 bytes/sec 
130
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (1,0,9000,597000,437000));
130
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (1,0,9000,597000,437000), TestCase::QUICK);
131
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (3,0,9000,199000,137000));
131
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (3,0,9000,199000,137000), TestCase::QUICK);
132
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (6,0,9000,99500,67000));
132
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (6,0,9000,99500,67000), TestCase::QUICK);
133
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (12,0,9000,49750,32000));
133
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (12,0,9000,49750,32000), TestCase::QUICK);
134
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (15,0,9000,39800,15000));
134
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (15,0,9000,39800,15000), TestCase::QUICK);
135
 
135
 
136
  // DONWLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
136
  // DONWLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
137
  // 1 user -> 24 PRB at Itbs 6 -> 309 -> 309000 bytes/sec
137
  // 1 user -> 24 PRB at Itbs 6 -> 309 -> 309000 bytes/sec
 Lines 145-155    Link Here 
145
  // 6 users -> 4 PRB at Itbs 6 -> 32 -> 32000 bytes/sec
145
  // 6 users -> 4 PRB at Itbs 6 -> 32 -> 32000 bytes/sec
146
  // 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 bytes/sec
146
  // 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 bytes/sec
147
  // 15 users -> 1 PRB at Itbs 6 -> 7 -> 7000 bytes/sec
147
  // 15 users -> 1 PRB at Itbs 6 -> 7 -> 7000 bytes/sec
148
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (1,0,15000,309000,233000));
148
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (1,0,15000,309000,233000), TestCase::QUICK);
149
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (3,0,15000,103000,69000));
149
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (3,0,15000,103000,69000), TestCase::QUICK);
150
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (6,0,15000,51500,32000));
150
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (6,0,15000,51500,32000), TestCase::QUICK);
151
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (12,0,15000,25750,15000));
151
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (12,0,15000,25750,15000), TestCase::QUICK);
152
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (15,0,15000,20600,7000));
152
  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (15,0,15000,20600,7000), TestCase::QUICK);
153
153
154
  // Test Case 2: fairness check
154
  // Test Case 2: fairness check
155
155
 Lines 171-177    Link Here 
171
  estThrPfUl.push_back (125000); // User 2 estimated TTI throughput from PF
171
  estThrPfUl.push_back (125000); // User 2 estimated TTI throughput from PF
172
  estThrPfUl.push_back (85000); // User 3 estimated TTI throughput from PF
172
  estThrPfUl.push_back (85000); // User 3 estimated TTI throughput from PF
173
  estThrPfUl.push_back (41000); // User 4 estimated TTI throughput from PF
173
  estThrPfUl.push_back (41000); // User 4 estimated TTI throughput from PF
174
  AddTestCase (new LenaPfFfMacSchedulerTestCase2 (dist, estThrPfDl, estThrPfUl));
174
  AddTestCase (new LenaPfFfMacSchedulerTestCase2 (dist, estThrPfDl, estThrPfUl), TestCase::QUICK);
175
175
176
176
177
}
177
}
(-)a/src/lte/test/lte-test-phy-error-model.cc (-10 / +10 lines)
 Lines 63-90    Link Here 
63
  
63
  
64
  // Tests on DL Control Channels (PCFICH+PDDCH)
64
  // Tests on DL Control Channels (PCFICH+PDDCH)
65
  // 1 interfering eNB SINR -2.0 BER 0.007 TB size 217
65
  // 1 interfering eNB SINR -2.0 BER 0.007 TB size 217
66
  AddTestCase (new LenaDlCtrlPhyErrorModelTestCase (2, 1078, 217, 0.007));
66
  AddTestCase (new LenaDlCtrlPhyErrorModelTestCase (2, 1078, 217, 0.007), TestCase::QUICK);
67
  // 2 interfering eNBs SINR -4.0 BER 0.037 TB size 217
67
  // 2 interfering eNBs SINR -4.0 BER 0.037 TB size 217
68
  AddTestCase (new LenaDlCtrlPhyErrorModelTestCase (3, 1040, 217, 0.045));
68
  AddTestCase (new LenaDlCtrlPhyErrorModelTestCase (3, 1040, 217, 0.045), TestCase::QUICK);
69
  // 3 interfering eNBs SINR -6.0 BER 0.21 TB size 133
69
  // 3 interfering eNBs SINR -6.0 BER 0.21 TB size 133
70
  AddTestCase (new LenaDlCtrlPhyErrorModelTestCase (4, 1250, 133, 0.206));
70
  AddTestCase (new LenaDlCtrlPhyErrorModelTestCase (4, 1250, 133, 0.206), TestCase::QUICK);
71
  // 4 interfering eNBs SINR -7.0 BER 0.34 TB size 133
71
  // 4 interfering eNBs SINR -7.0 BER 0.34 TB size 133
72
  AddTestCase (new LenaDlCtrlPhyErrorModelTestCase (5, 1260, 81, 0.343));
72
  AddTestCase (new LenaDlCtrlPhyErrorModelTestCase (5, 1260, 81, 0.343), TestCase::QUICK);
73
73
74
  // Tests on DL/UL Data channels (PDSCH, PUSCH)
74
  // Tests on DL/UL Data channels (PDSCH, PUSCH)
75
  // MCS 2 TB size of 256 bits BER 0.33 SINR -5.51
75
  // MCS 2 TB size of 256 bits BER 0.33 SINR -5.51
76
  AddTestCase (new LenaDataPhyErrorModelTestCase (4, 1800, 32, 0.35, 50));
76
  AddTestCase (new LenaDataPhyErrorModelTestCase (4, 1800, 32, 0.35, 50), TestCase::QUICK);
77
// MCS 2 TB size of 528 bits BER 0.11 SINR -5.51
77
// MCS 2 TB size of 528 bits BER 0.11 SINR -5.51
78
  AddTestCase (new LenaDataPhyErrorModelTestCase (2, 1800, 66, 0.11, 34));
78
  AddTestCase (new LenaDataPhyErrorModelTestCase (2, 1800, 66, 0.11, 34), TestCase::QUICK);
79
// MCS 2 TB size of 1088 bits BER 0.02 SINR -5.51
79
// MCS 2 TB size of 1088 bits BER 0.02 SINR -5.51
80
  AddTestCase (new LenaDataPhyErrorModelTestCase (1, 1800, 136, 0.02, 16));
80
  AddTestCase (new LenaDataPhyErrorModelTestCase (1, 1800, 136, 0.02, 16), TestCase::QUICK);
81
  // MCS 12 TB size of 4800 bits  BER 0.3  SINR 4.43
81
  // MCS 12 TB size of 4800 bits  BER 0.3  SINR 4.43
82
  AddTestCase (new LenaDataPhyErrorModelTestCase (1, 600, 600, 0.3, 48));
82
  AddTestCase (new LenaDataPhyErrorModelTestCase (1, 600, 600, 0.3, 48), TestCase::QUICK);
83
// MCS 12 TB size of 1632 bits  BER 0.55  SINR 4.43
83
// MCS 12 TB size of 1632 bits  BER 0.55  SINR 4.43
84
  AddTestCase (new LenaDataPhyErrorModelTestCase (3, 600, 204, 0.55, 52));
84
  AddTestCase (new LenaDataPhyErrorModelTestCase (3, 600, 204, 0.55, 52), TestCase::QUICK);
85
// MCS 16 TB size of 7272 bits (3648 x 3584) BER 0.14 SINR 8.48
85
// MCS 16 TB size of 7272 bits (3648 x 3584) BER 0.14 SINR 8.48
86
// BER 0.14 = 1 - ((1-0.075)*(1-0.075))
86
// BER 0.14 = 1 - ((1-0.075)*(1-0.075))
87
  AddTestCase (new LenaDataPhyErrorModelTestCase (1, 470, 781, 0.14, 29));
87
  AddTestCase (new LenaDataPhyErrorModelTestCase (1, 470, 781, 0.14, 29), TestCase::QUICK);
88
88
89
 
89
 
90
90
(-)a/src/lte/test/lte-test-pss-ff-mac-scheduler.cc (-24 / +24 lines)
 Lines 90-99    Link Here 
90
  // 3 users -> 8 PRB at Itbs 26 -> 749 -> 749000 > 232000 -> throughput = 232000 bytes/sec 
90
  // 3 users -> 8 PRB at Itbs 26 -> 749 -> 749000 > 232000 -> throughput = 232000 bytes/sec 
91
  // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 > 232000 -> throughput = 232000 bytes/sec
91
  // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 > 232000 -> throughput = 232000 bytes/sec
92
  // 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 < 232000 -> throughput = 185000 bytes/sec
92
  // 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 < 232000 -> throughput = 185000 bytes/sec
93
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (1,0,0,232000,232000,200,1));
93
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (1,0,0,232000,232000,200,1), TestCase::QUICK);
94
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (3,0,0,232000,232000,200,1));
94
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (3,0,0,232000,232000,200,1), TestCase::QUICK);
95
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (6,0,0,232000,232000,200,1));
95
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (6,0,0,232000,232000,200,1), TestCase::QUICK);
96
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (12,0,0,183000,185000,200,1));
96
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (12,0,0,183000,185000,200,1), TestCase::QUICK);
97
97
98
  // DOWNLINK - DISTANCE 3000 -> MCS 24 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213)
98
  // DOWNLINK - DISTANCE 3000 -> MCS 24 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213)
99
  // DOWNLINK -> DISTANCE 0 -> MCS 28 -> Itbs 26 (from table 7.1.7.2.1-1 of 36.2    13)
99
  // DOWNLINK -> DISTANCE 0 -> MCS 28 -> Itbs 26 (from table 7.1.7.2.1-1 of 36.2    13)
 Lines 110-119    Link Here 
110
  // 3 users -> 8 PRB at Itbs 18 -> 389 -> 389000 > 232000 -> throughput = 232000 bytes/sec
110
  // 3 users -> 8 PRB at Itbs 18 -> 389 -> 389000 > 232000 -> throughput = 232000 bytes/sec
111
  // 6 users -> 4 PRB at Itbs 18 -> 193 -> 193000 < 232000 -> throughput = 193000 bytes/sec
111
  // 6 users -> 4 PRB at Itbs 18 -> 193 -> 193000 < 232000 -> throughput = 193000 bytes/sec
112
  // 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 < 232000 -> throughput = 97000 bytes/sec
112
  // 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 < 232000 -> throughput = 97000 bytes/sec
113
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (1,0,3000,232000,232000,200,1));
113
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (1,0,3000,232000,232000,200,1), TestCase::QUICK);
114
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (3,0,3000,232000,232000,200,1));
114
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (3,0,3000,232000,232000,200,1), TestCase::QUICK);
115
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (6,0,3000,230500,193000,200,1));
115
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (6,0,3000,230500,193000,200,1), TestCase::QUICK);
116
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (12,0,3000,115250,97000,200,1));
116
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (12,0,3000,115250,97000,200,1), TestCase::QUICK);
117
 
117
 
118
  // DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
118
  // DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
119
  // Traffic info
119
  // Traffic info
 Lines 129-138    Link Here 
129
  // 3 users -> 8 PRB at Itbs 11 -> 201 -> 201000 < 232000 -> throughput = 201000  bytes/sec
129
  // 3 users -> 8 PRB at Itbs 11 -> 201 -> 201000 < 232000 -> throughput = 201000  bytes/sec
130
  // 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 < 232000 -> throughput = 97000 bytes/sec
130
  // 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 < 232000 -> throughput = 97000 bytes/sec
131
  // 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 < 232000 -> throughput = 47000 bytes/sec
131
  // 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 < 232000 -> throughput = 47000 bytes/sec
132
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (1,0,6000,232000,232000,200,1));
132
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (1,0,6000,232000,232000,200,1), TestCase::QUICK);
133
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (3,0,6000,232000,201000,200,1));
133
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (3,0,6000,232000,201000,200,1), TestCase::QUICK);
134
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (6,0,6000,150500,97000,200,1));
134
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (6,0,6000,150500,97000,200,1), TestCase::QUICK);
135
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (12,0,6000,75250,47000,200,1));
135
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (12,0,6000,75250,47000,200,1), TestCase::QUICK);
136
136
137
  // DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
137
  // DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
138
  // Traffic info
138
  // Traffic info
 Lines 148-157    Link Here 
148
  // 3 users -> 8 PRB at Itbs 8 -> 137 -> 137000 < 232000 -> throughput = 137000 bytes/sec
148
  // 3 users -> 8 PRB at Itbs 8 -> 137 -> 137000 < 232000 -> throughput = 137000 bytes/sec
149
  // 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 < 232000 -> throughput = 67000 bytes/sec
149
  // 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 < 232000 -> throughput = 67000 bytes/sec
150
  // 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 < 232000 -> throughput = 32000 bytes/sec
150
  // 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 < 232000 -> throughput = 32000 bytes/sec
151
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (1,0,9000,232000,232000,200,1));
151
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (1,0,9000,232000,232000,200,1), TestCase::QUICK);
152
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (3,0,9000,199000,137000,200,1));
152
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (3,0,9000,199000,137000,200,1), TestCase::QUICK);
153
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (6,0,9000,99500,67000,200,1));
153
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (6,0,9000,99500,67000,200,1), TestCase::QUICK);
154
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (12,0,9000,49750,32000,200,1));
154
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (12,0,9000,49750,32000,200,1), TestCase::QUICK);
155
 
155
 
156
  // DONWLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
156
  // DONWLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
157
  // Traffic info
157
  // Traffic info
 Lines 167-176    Link Here 
167
  // 3 users -> 8 PRB at Itbs 6 -> 69 -> 69000 < 232000 -> throughput = 69000 bytes/sec
167
  // 3 users -> 8 PRB at Itbs 6 -> 69 -> 69000 < 232000 -> throughput = 69000 bytes/sec
168
  // 6 users -> 4 PRB at Itbs 6 -> 32 -> 32000 < 232000 -> throughput = 32000 bytes/sec
168
  // 6 users -> 4 PRB at Itbs 6 -> 32 -> 32000 < 232000 -> throughput = 32000 bytes/sec
169
  // 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 < 232000 -> throughput = 15000 bytes/sec
169
  // 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 < 232000 -> throughput = 15000 bytes/sec
170
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (1,0,15000,232000,232000,200,1));
170
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (1,0,15000,232000,232000,200,1), TestCase::QUICK);
171
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (3,0,15000,103000,69000,200,1));
171
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (3,0,15000,103000,69000,200,1), TestCase::QUICK);
172
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (6,0,15000,51500,32000,200,1));
172
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (6,0,15000,51500,32000,200,1), TestCase::QUICK);
173
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (12,0,15000,25750,15000,200,1));
173
  AddTestCase (new LenaPssFfMacSchedulerTestCase1 (12,0,15000,25750,15000,200,1), TestCase::QUICK);
174
174
175
  // Test Case 2: homogeneous flow test in PSS (different distance)
175
  // Test Case 2: homogeneous flow test in PSS (different distance)
176
  // Traffic1 info
176
  // Traffic1 info
 Lines 196-202    Link Here 
196
  estThrPssDl1.push_back (132000);
196
  estThrPssDl1.push_back (132000);
197
  estThrPssDl1.push_back (132000);
197
  estThrPssDl1.push_back (132000);
198
  estThrPssDl1.push_back (132000);
198
  estThrPssDl1.push_back (132000);
199
  AddTestCase (new LenaPssFfMacSchedulerTestCase2 (dist1,estThrPssDl1,packetSize1,1));
199
  AddTestCase (new LenaPssFfMacSchedulerTestCase2 (dist1,estThrPssDl1,packetSize1,1), TestCase::QUICK);
200
200
201
  // Traffic2 info
201
  // Traffic2 info
202
  //   UDP traffic: payload size = 200 bytes, interval = 1 ms
202
  //   UDP traffic: payload size = 200 bytes, interval = 1 ms
 Lines 221-227    Link Here 
221
  estThrPssDl2.push_back (138944);
221
  estThrPssDl2.push_back (138944);
222
  estThrPssDl2.push_back (138944);
222
  estThrPssDl2.push_back (138944);
223
  estThrPssDl2.push_back (138944);
223
  estThrPssDl2.push_back (138944);
224
  AddTestCase (new LenaPssFfMacSchedulerTestCase2 (dist2,estThrPssDl2,packetSize2,1));
224
  AddTestCase (new LenaPssFfMacSchedulerTestCase2 (dist2,estThrPssDl2,packetSize2,1), TestCase::QUICK);
225
  
225
  
226
  // Test Case 3: : heterogeneous flow test in PSS (same distance)
226
  // Test Case 3: : heterogeneous flow test in PSS (same distance)
227
  // Traffic3 info:
227
  // Traffic3 info:
 Lines 247-253    Link Here 
247
  estThrPssDl3.push_back (332000);
247
  estThrPssDl3.push_back (332000);
248
  estThrPssDl3.push_back (432000);
248
  estThrPssDl3.push_back (432000);
249
  estThrPssDl3.push_back (532000);
249
  estThrPssDl3.push_back (532000);
250
  AddTestCase (new LenaPssFfMacSchedulerTestCase2 (dist3,estThrPssDl3,packetSize3,1));
250
  AddTestCase (new LenaPssFfMacSchedulerTestCase2 (dist3,estThrPssDl3,packetSize3,1), TestCase::QUICK);
251
  
251
  
252
252
253
  // Test Case 4: heterogeneous flow test in PSS (different distance)
253
  // Test Case 4: heterogeneous flow test in PSS (different distance)
 Lines 268-274    Link Here 
268
  estThrPssDl4.push_back (132000); // User 0 estimated TTI throughput from PSS
268
  estThrPssDl4.push_back (132000); // User 0 estimated TTI throughput from PSS
269
  estThrPssDl4.push_back (232000); // User 1 estimated TTI throughput from PSS
269
  estThrPssDl4.push_back (232000); // User 1 estimated TTI throughput from PSS
270
  estThrPssDl4.push_back (332000); // User 2 estimated TTI throughput from PSS
270
  estThrPssDl4.push_back (332000); // User 2 estimated TTI throughput from PSS
271
  AddTestCase (new LenaPssFfMacSchedulerTestCase2 (dist4,estThrPssDl4,packetSize4,1));
271
  AddTestCase (new LenaPssFfMacSchedulerTestCase2 (dist4,estThrPssDl4,packetSize4,1), TestCase::QUICK);
272
}
272
}
273
273
274
static LenaTestPssFfMacSchedulerSuite lenaTestPssFfMacSchedulerSuite;
274
static LenaTestPssFfMacSchedulerSuite lenaTestPssFfMacSchedulerSuite;
(-)a/src/lte/test/lte-test-rlc-am-e2e.cc (-1 / +1 lines)
 Lines 64-70    Link Here 
64
        {
64
        {
65
          std::ostringstream name;
65
          std::ostringstream name;
66
          name << " Losses = " << losses[l] << "%. Seed = " << seeds[s];
66
          name << " Losses = " << losses[l] << "%. Seed = " << seeds[s];
67
          AddTestCase (new LteRlcAmE2eTestCase (name.str (), seeds[s], losses[l]));
67
          AddTestCase (new LteRlcAmE2eTestCase (name.str (), seeds[s], losses[l]), TestCase::QUICK);
68
        }
68
        }
69
    }
69
    }
70
}
70
}
(-)a/src/lte/test/lte-test-rlc-am-transmitter.cc (-4 / +4 lines)
 Lines 42-51    Link Here 
42
  // LogLevel logLevel = (LogLevel)(LOG_PREFIX_FUNC | LOG_PREFIX_TIME | LOG_LEVEL_ALL);
42
  // LogLevel logLevel = (LogLevel)(LOG_PREFIX_FUNC | LOG_PREFIX_TIME | LOG_LEVEL_ALL);
43
  // LogComponentEnable ("LteRlcAmTransmitterTest", logLevel);
43
  // LogComponentEnable ("LteRlcAmTransmitterTest", logLevel);
44
44
45
  AddTestCase (new LteRlcAmTransmitterOneSduTestCase ("One SDU, one PDU"));
45
  AddTestCase (new LteRlcAmTransmitterOneSduTestCase ("One SDU, one PDU"), TestCase::QUICK);
46
  AddTestCase (new LteRlcAmTransmitterSegmentationTestCase ("Segmentation"));
46
  AddTestCase (new LteRlcAmTransmitterSegmentationTestCase ("Segmentation"), TestCase::QUICK);
47
  AddTestCase (new LteRlcAmTransmitterConcatenationTestCase ("Concatenation"));
47
  AddTestCase (new LteRlcAmTransmitterConcatenationTestCase ("Concatenation"), TestCase::QUICK);
48
  AddTestCase (new LteRlcAmTransmitterReportBufferStatusTestCase ("ReportBufferStatus primitive"));
48
  AddTestCase (new LteRlcAmTransmitterReportBufferStatusTestCase ("ReportBufferStatus primitive"), TestCase::QUICK);
49
49
50
}
50
}
51
51
(-)a/src/lte/test/lte-test-rlc-um-e2e.cc (-1 / +1 lines)
 Lines 63-69    Link Here 
63
        {
63
        {
64
          std::ostringstream name;
64
          std::ostringstream name;
65
          name << " Losses = " << losses[l] << "%. Seed = " << seeds[s];
65
          name << " Losses = " << losses[l] << "%. Seed = " << seeds[s];
66
          AddTestCase (new LteRlcUmE2eTestCase (name.str (), seeds[s], losses[l]));
66
          AddTestCase (new LteRlcUmE2eTestCase (name.str (), seeds[s], losses[l]), TestCase::QUICK);
67
        }
67
        }
68
    }
68
    }
69
}
69
}
(-)a/src/lte/test/lte-test-rlc-um-transmitter.cc (-4 / +4 lines)
 Lines 44-53    Link Here 
44
44
45
  // NS_LOG_INFO ("Creating LteRlcUmTransmitterTestSuite");
45
  // NS_LOG_INFO ("Creating LteRlcUmTransmitterTestSuite");
46
46
47
  AddTestCase (new LteRlcUmTransmitterOneSduTestCase ("One SDU, one PDU"));
47
  AddTestCase (new LteRlcUmTransmitterOneSduTestCase ("One SDU, one PDU"), TestCase::QUICK);
48
  AddTestCase (new LteRlcUmTransmitterSegmentationTestCase ("Segmentation"));
48
  AddTestCase (new LteRlcUmTransmitterSegmentationTestCase ("Segmentation"), TestCase::QUICK);
49
  AddTestCase (new LteRlcUmTransmitterConcatenationTestCase ("Concatenation"));
49
  AddTestCase (new LteRlcUmTransmitterConcatenationTestCase ("Concatenation"), TestCase::QUICK);
50
  AddTestCase (new LteRlcUmTransmitterReportBufferStatusTestCase ("ReportBufferStatus primitive"));
50
  AddTestCase (new LteRlcUmTransmitterReportBufferStatusTestCase ("ReportBufferStatus primitive"), TestCase::QUICK);
51
51
52
}
52
}
53
53
(-)a/src/lte/test/lte-test-rr-ff-mac-scheduler.cc (-30 / +30 lines)
 Lines 71-82    Link Here 
71
  // 9 user -> 2 PRB at Itbs 26 -> 185 -> 185000 bytes/sec
71
  // 9 user -> 2 PRB at Itbs 26 -> 185 -> 185000 bytes/sec
72
  // 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 bytes/sec
72
  // 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 bytes/sec
73
  // 15 users -> 1 PRB at Itbs 26 -> 89 -> 89000 bytes/sec
73
  // 15 users -> 1 PRB at Itbs 26 -> 89 -> 89000 bytes/sec
74
  AddTestCase (new LenaRrFfMacSchedulerTestCase (1,0,0,2196000,2292000));
74
  AddTestCase (new LenaRrFfMacSchedulerTestCase (1,0,0,2196000,2292000), TestCase::QUICK);
75
  AddTestCase (new LenaRrFfMacSchedulerTestCase (3,0,0,749000,749000));
75
  AddTestCase (new LenaRrFfMacSchedulerTestCase (3,0,0,749000,749000), TestCase::QUICK);
76
  AddTestCase (new LenaRrFfMacSchedulerTestCase (6,0,0,373000,373000));
76
  AddTestCase (new LenaRrFfMacSchedulerTestCase (6,0,0,373000,373000), TestCase::QUICK);
77
  AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,0,185000,185000));
77
  AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,0,185000,185000), TestCase::QUICK);
78
  AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,0,185000,185000));
78
  AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,0,185000,185000), TestCase::QUICK);
79
  AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,0,148000,89000));
79
  AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,0,148000,89000), TestCase::QUICK);
80
80
81
  // DOWNLINK - DISTANCE 3000 -> MCS 22 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213)
81
  // DOWNLINK - DISTANCE 3000 -> MCS 22 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213)
82
  // 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 bytes/sec
82
  // 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 bytes/sec
 Lines 92-103    Link Here 
92
  // 9 user -> 2 PRB at Itbs 18 -> 97 -> 97000 bytes/sec
92
  // 9 user -> 2 PRB at Itbs 18 -> 97 -> 97000 bytes/sec
93
  // 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 bytes/sec
93
  // 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 bytes/sec
94
  // 15 users -> 1 PRB at Itbs 18 -> 47 -> 47000 bytes/sec 
94
  // 15 users -> 1 PRB at Itbs 18 -> 47 -> 47000 bytes/sec 
95
  AddTestCase (new LenaRrFfMacSchedulerTestCase (1,0,3000,1383000,1239000));
95
  AddTestCase (new LenaRrFfMacSchedulerTestCase (1,0,3000,1383000,1239000), TestCase::QUICK);
96
  AddTestCase (new LenaRrFfMacSchedulerTestCase (3,0,3000,469000,389000));
96
  AddTestCase (new LenaRrFfMacSchedulerTestCase (3,0,3000,469000,389000), TestCase::QUICK);
97
  AddTestCase (new LenaRrFfMacSchedulerTestCase (6,0,3000,233000,193000));
97
  AddTestCase (new LenaRrFfMacSchedulerTestCase (6,0,3000,233000,193000), TestCase::QUICK);
98
  AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,3000,113000,97000));
98
  AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,3000,113000,97000), TestCase::QUICK);
99
  AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,3000,113000,97000));
99
  AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,3000,113000,97000), TestCase::QUICK);
100
  AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,3000,90400,47000));
100
  AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,3000,90400,47000), TestCase::QUICK);
101
101
102
  // DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
102
  // DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
103
  // 1 user -> 24 PRB at Itbs 15 -> 903 -> 903000 bytes/sec
103
  // 1 user -> 24 PRB at Itbs 15 -> 903 -> 903000 bytes/sec
 Lines 113-124    Link Here 
113
  // 9 user -> 2 PRB at Itbs 11 -> 47 -> 47000 bytes/sec
113
  // 9 user -> 2 PRB at Itbs 11 -> 47 -> 47000 bytes/sec
114
  // 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 bytes/sec
114
  // 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 bytes/sec
115
  // 15 users -> 1 PRB at Itbs 11 -> 22 -> 22000 bytes/sec
115
  // 15 users -> 1 PRB at Itbs 11 -> 22 -> 22000 bytes/sec
116
  AddTestCase (new LenaRrFfMacSchedulerTestCase (1,0,6000,903000,621000));
116
  AddTestCase (new LenaRrFfMacSchedulerTestCase (1,0,6000,903000,621000), TestCase::QUICK);
117
  AddTestCase (new LenaRrFfMacSchedulerTestCase (3,0,6000,309000,201000));
117
  AddTestCase (new LenaRrFfMacSchedulerTestCase (3,0,6000,309000,201000), TestCase::QUICK);
118
  AddTestCase (new LenaRrFfMacSchedulerTestCase (6,0,6000,153000,97000));
118
  AddTestCase (new LenaRrFfMacSchedulerTestCase (6,0,6000,153000,97000), TestCase::QUICK);
119
  AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,6000,75000,47000));
119
  AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,6000,75000,47000), TestCase::QUICK);
120
  AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,6000,75000,47000));
120
  AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,6000,75000,47000), TestCase::QUICK);
121
  AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,6000,60000,22000));
121
  AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,6000,60000,22000), TestCase::QUICK);
122
122
123
  // DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
123
  // DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
124
  // 1 user -> 24 PRB at Itbs 11 -> 597 -> 597000 bytes/sec
124
  // 1 user -> 24 PRB at Itbs 11 -> 597 -> 597000 bytes/sec
 Lines 134-145    Link Here 
134
  // 9 user -> 2 PRB at Itbs 8 -> 32 -> 32000 bytes/sec
134
  // 9 user -> 2 PRB at Itbs 8 -> 32 -> 32000 bytes/sec
135
  // 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 bytes/sec
135
  // 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 bytes/sec
136
  // 15 users -> 1 PRB at Itbs 8 -> 15 -> 15000 bytes/sec
136
  // 15 users -> 1 PRB at Itbs 8 -> 15 -> 15000 bytes/sec
137
  AddTestCase (new LenaRrFfMacSchedulerTestCase (1,0,9000,597000,437000));
137
  AddTestCase (new LenaRrFfMacSchedulerTestCase (1,0,9000,597000,437000), TestCase::QUICK);
138
  AddTestCase (new LenaRrFfMacSchedulerTestCase (3,0,9000,201000,137000));
138
  AddTestCase (new LenaRrFfMacSchedulerTestCase (3,0,9000,201000,137000), TestCase::QUICK);
139
  AddTestCase (new LenaRrFfMacSchedulerTestCase (6,0,9000,97000,67000));
139
  AddTestCase (new LenaRrFfMacSchedulerTestCase (6,0,9000,97000,67000), TestCase::QUICK);
140
  AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,9000,47000,32000));
140
  AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,9000,47000,32000), TestCase::QUICK);
141
  AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,9000,47000,32000));
141
  AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,9000,47000,32000), TestCase::QUICK);
142
  AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,9000,37600,15000));
142
  AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,9000,37600,15000), TestCase::QUICK);
143
143
144
  // DOWNLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
144
  // DOWNLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
145
  // 1 user -> 24 PRB at Itbs 6 -> 309 -> 309000 bytes/sec
145
  // 1 user -> 24 PRB at Itbs 6 -> 309 -> 309000 bytes/sec
 Lines 155-166    Link Here 
155
  // 9 user -> 2 PRB at Itbs 6 -> 15 -> 15000 bytes/sec
155
  // 9 user -> 2 PRB at Itbs 6 -> 15 -> 15000 bytes/sec
156
  // 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 bytes/sec
156
  // 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 bytes/sec
157
  // 15 users -> 1 PRB at Itbs 6 -> 7 -> 7000 bytes/sec
157
  // 15 users -> 1 PRB at Itbs 6 -> 7 -> 7000 bytes/sec
158
  AddTestCase (new LenaRrFfMacSchedulerTestCase (1,0,15000,309000,233000));
158
  AddTestCase (new LenaRrFfMacSchedulerTestCase (1,0,15000,309000,233000), TestCase::QUICK);
159
  AddTestCase (new LenaRrFfMacSchedulerTestCase (3,0,15000,101000,69000));
159
  AddTestCase (new LenaRrFfMacSchedulerTestCase (3,0,15000,101000,69000), TestCase::QUICK);
160
  AddTestCase (new LenaRrFfMacSchedulerTestCase (6,0,15000,49000,32000));
160
  AddTestCase (new LenaRrFfMacSchedulerTestCase (6,0,15000,49000,32000), TestCase::QUICK);
161
  AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,15000,22000,15000));
161
  AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,15000,22000,15000), TestCase::QUICK);
162
  AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,15000,22000,15000));
162
  AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,15000,22000,15000), TestCase::QUICK);
163
  AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,15000,17600,7000));
163
  AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,15000,17600,7000), TestCase::QUICK);
164
164
165
}
165
}
166
166
(-)a/src/lte/test/lte-test-spectrum-value-helper.cc (-29 / +29 lines)
 Lines 167-173    Link Here 
167
  fc2160nrb6[3] = 2.160090000000e+09;
167
  fc2160nrb6[3] = 2.160090000000e+09;
168
  fc2160nrb6[4] = 2.160270000000e+09;
168
  fc2160nrb6[4] = 2.160270000000e+09;
169
  fc2160nrb6[5] = 2.160450000000e+09;
169
  fc2160nrb6[5] = 2.160450000000e+09;
170
  AddTestCase (new LteSpectrumModelTestCase ("fc2160nrb6", 500, 6, fc2160nrb6));
170
  AddTestCase (new LteSpectrumModelTestCase ("fc2160nrb6", 500, 6, fc2160nrb6), TestCase::QUICK);
171
171
172
  std::vector<double> fc2160nrb15 (15);
172
  std::vector<double> fc2160nrb15 (15);
173
  fc2160nrb15[0] = 2.158740000000e+09;
173
  fc2160nrb15[0] = 2.158740000000e+09;
 Lines 185-191    Link Here 
185
  fc2160nrb15[12] = 2.160900000000e+09;
185
  fc2160nrb15[12] = 2.160900000000e+09;
186
  fc2160nrb15[13] = 2.161080000000e+09;
186
  fc2160nrb15[13] = 2.161080000000e+09;
187
  fc2160nrb15[14] = 2.161260000000e+09;
187
  fc2160nrb15[14] = 2.161260000000e+09;
188
  AddTestCase (new LteSpectrumModelTestCase ("fc2160nrb15", 500, 15, fc2160nrb15));
188
  AddTestCase (new LteSpectrumModelTestCase ("fc2160nrb15", 500, 15, fc2160nrb15), TestCase::QUICK);
189
189
190
  std::vector<double> fc2160nrb25 (25);
190
  std::vector<double> fc2160nrb25 (25);
191
  fc2160nrb25[0] = 2.157840000000e+09;
191
  fc2160nrb25[0] = 2.157840000000e+09;
 Lines 213-219    Link Here 
213
  fc2160nrb25[22] = 2.161800000000e+09;
213
  fc2160nrb25[22] = 2.161800000000e+09;
214
  fc2160nrb25[23] = 2.161980000000e+09;
214
  fc2160nrb25[23] = 2.161980000000e+09;
215
  fc2160nrb25[24] = 2.162160000000e+09;
215
  fc2160nrb25[24] = 2.162160000000e+09;
216
  AddTestCase (new LteSpectrumModelTestCase ("fc2160nrb25", 500, 25, fc2160nrb25));
216
  AddTestCase (new LteSpectrumModelTestCase ("fc2160nrb25", 500, 25, fc2160nrb25), TestCase::QUICK);
217
217
218
  std::vector<double> fc2160nrb50 (50);
218
  std::vector<double> fc2160nrb50 (50);
219
  fc2160nrb50[0] = 2.155590000000e+09;
219
  fc2160nrb50[0] = 2.155590000000e+09;
 Lines 266-272    Link Here 
266
  fc2160nrb50[47] = 2.164050000000e+09;
266
  fc2160nrb50[47] = 2.164050000000e+09;
267
  fc2160nrb50[48] = 2.164230000000e+09;
267
  fc2160nrb50[48] = 2.164230000000e+09;
268
  fc2160nrb50[49] = 2.164410000000e+09;
268
  fc2160nrb50[49] = 2.164410000000e+09;
269
  AddTestCase (new LteSpectrumModelTestCase ("fc2160nrb50", 500, 50, fc2160nrb50));
269
  AddTestCase (new LteSpectrumModelTestCase ("fc2160nrb50", 500, 50, fc2160nrb50), TestCase::QUICK);
270
270
271
  std::vector<double> fc2160nrb75 (75);
271
  std::vector<double> fc2160nrb75 (75);
272
  fc2160nrb75[0] = 2.153340000000e+09;
272
  fc2160nrb75[0] = 2.153340000000e+09;
 Lines 344-350    Link Here 
344
  fc2160nrb75[72] = 2.166300000000e+09;
344
  fc2160nrb75[72] = 2.166300000000e+09;
345
  fc2160nrb75[73] = 2.166480000000e+09;
345
  fc2160nrb75[73] = 2.166480000000e+09;
346
  fc2160nrb75[74] = 2.166660000000e+09;
346
  fc2160nrb75[74] = 2.166660000000e+09;
347
  AddTestCase (new LteSpectrumModelTestCase ("fc2160nrb75", 500, 75, fc2160nrb75));
347
  AddTestCase (new LteSpectrumModelTestCase ("fc2160nrb75", 500, 75, fc2160nrb75), TestCase::QUICK);
348
348
349
  std::vector<double> fc2160nrb100 (100);
349
  std::vector<double> fc2160nrb100 (100);
350
  fc2160nrb100[0] = 2.151090000000e+09;
350
  fc2160nrb100[0] = 2.151090000000e+09;
 Lines 447-453    Link Here 
447
  fc2160nrb100[97] = 2.168550000000e+09;
447
  fc2160nrb100[97] = 2.168550000000e+09;
448
  fc2160nrb100[98] = 2.168730000000e+09;
448
  fc2160nrb100[98] = 2.168730000000e+09;
449
  fc2160nrb100[99] = 2.168910000000e+09;
449
  fc2160nrb100[99] = 2.168910000000e+09;
450
  AddTestCase (new LteSpectrumModelTestCase ("fc2160nrb100", 500, 100, fc2160nrb100));
450
  AddTestCase (new LteSpectrumModelTestCase ("fc2160nrb100", 500, 100, fc2160nrb100), TestCase::QUICK);
451
451
452
  std::vector<double> fc1730nrb6 (6);
452
  std::vector<double> fc1730nrb6 (6);
453
  fc1730nrb6[0] = 1.729550000000e+09;
453
  fc1730nrb6[0] = 1.729550000000e+09;
 Lines 456-462    Link Here 
456
  fc1730nrb6[3] = 1.730090000000e+09;
456
  fc1730nrb6[3] = 1.730090000000e+09;
457
  fc1730nrb6[4] = 1.730270000000e+09;
457
  fc1730nrb6[4] = 1.730270000000e+09;
458
  fc1730nrb6[5] = 1.730450000000e+09;
458
  fc1730nrb6[5] = 1.730450000000e+09;
459
  AddTestCase (new LteSpectrumModelTestCase ("fc1730nrb6", 19400, 6, fc1730nrb6));
459
  AddTestCase (new LteSpectrumModelTestCase ("fc1730nrb6", 19400, 6, fc1730nrb6), TestCase::QUICK);
460
460
461
  std::vector<double> fc1730nrb15 (15);
461
  std::vector<double> fc1730nrb15 (15);
462
  fc1730nrb15[0] = 1.728740000000e+09;
462
  fc1730nrb15[0] = 1.728740000000e+09;
 Lines 474-480    Link Here 
474
  fc1730nrb15[12] = 1.730900000000e+09;
474
  fc1730nrb15[12] = 1.730900000000e+09;
475
  fc1730nrb15[13] = 1.731080000000e+09;
475
  fc1730nrb15[13] = 1.731080000000e+09;
476
  fc1730nrb15[14] = 1.731260000000e+09;
476
  fc1730nrb15[14] = 1.731260000000e+09;
477
  AddTestCase (new LteSpectrumModelTestCase ("fc1730nrb15", 19400, 15, fc1730nrb15));
477
  AddTestCase (new LteSpectrumModelTestCase ("fc1730nrb15", 19400, 15, fc1730nrb15), TestCase::QUICK);
478
478
479
  std::vector<double> fc1730nrb25 (25);
479
  std::vector<double> fc1730nrb25 (25);
480
  fc1730nrb25[0] = 1.727840000000e+09;
480
  fc1730nrb25[0] = 1.727840000000e+09;
 Lines 502-508    Link Here 
502
  fc1730nrb25[22] = 1.731800000000e+09;
502
  fc1730nrb25[22] = 1.731800000000e+09;
503
  fc1730nrb25[23] = 1.731980000000e+09;
503
  fc1730nrb25[23] = 1.731980000000e+09;
504
  fc1730nrb25[24] = 1.732160000000e+09;
504
  fc1730nrb25[24] = 1.732160000000e+09;
505
  AddTestCase (new LteSpectrumModelTestCase ("fc1730nrb25", 19400, 25, fc1730nrb25));
505
  AddTestCase (new LteSpectrumModelTestCase ("fc1730nrb25", 19400, 25, fc1730nrb25), TestCase::QUICK);
506
506
507
  std::vector<double> fc1730nrb50 (50);
507
  std::vector<double> fc1730nrb50 (50);
508
  fc1730nrb50[0] = 1.725590000000e+09;
508
  fc1730nrb50[0] = 1.725590000000e+09;
 Lines 555-561    Link Here 
555
  fc1730nrb50[47] = 1.734050000000e+09;
555
  fc1730nrb50[47] = 1.734050000000e+09;
556
  fc1730nrb50[48] = 1.734230000000e+09;
556
  fc1730nrb50[48] = 1.734230000000e+09;
557
  fc1730nrb50[49] = 1.734410000000e+09;
557
  fc1730nrb50[49] = 1.734410000000e+09;
558
  AddTestCase (new LteSpectrumModelTestCase ("fc1730nrb50", 19400, 50, fc1730nrb50));
558
  AddTestCase (new LteSpectrumModelTestCase ("fc1730nrb50", 19400, 50, fc1730nrb50), TestCase::QUICK);
559
559
560
  std::vector<double> fc1730nrb75 (75);
560
  std::vector<double> fc1730nrb75 (75);
561
  fc1730nrb75[0] = 1.723340000000e+09;
561
  fc1730nrb75[0] = 1.723340000000e+09;
 Lines 633-639    Link Here 
633
  fc1730nrb75[72] = 1.736300000000e+09;
633
  fc1730nrb75[72] = 1.736300000000e+09;
634
  fc1730nrb75[73] = 1.736480000000e+09;
634
  fc1730nrb75[73] = 1.736480000000e+09;
635
  fc1730nrb75[74] = 1.736660000000e+09;
635
  fc1730nrb75[74] = 1.736660000000e+09;
636
  AddTestCase (new LteSpectrumModelTestCase ("fc1730nrb75", 19400, 75, fc1730nrb75));
636
  AddTestCase (new LteSpectrumModelTestCase ("fc1730nrb75", 19400, 75, fc1730nrb75), TestCase::QUICK);
637
637
638
  std::vector<double> fc1730nrb100 (100);
638
  std::vector<double> fc1730nrb100 (100);
639
  fc1730nrb100[0] = 1.721090000000e+09;
639
  fc1730nrb100[0] = 1.721090000000e+09;
 Lines 736-742    Link Here 
736
  fc1730nrb100[97] = 1.738550000000e+09;
736
  fc1730nrb100[97] = 1.738550000000e+09;
737
  fc1730nrb100[98] = 1.738730000000e+09;
737
  fc1730nrb100[98] = 1.738730000000e+09;
738
  fc1730nrb100[99] = 1.738910000000e+09;
738
  fc1730nrb100[99] = 1.738910000000e+09;
739
  AddTestCase (new LteSpectrumModelTestCase ("fc1730nrb100", 19400, 100, fc1730nrb100));
739
  AddTestCase (new LteSpectrumModelTestCase ("fc1730nrb100", 19400, 100, fc1730nrb100), TestCase::QUICK);
740
740
741
741
742
  SpectrumValue nfdB0earfcn500nrb6 (LteSpectrumValueHelper::GetSpectrumModel (500, 6));
742
  SpectrumValue nfdB0earfcn500nrb6 (LteSpectrumValueHelper::GetSpectrumModel (500, 6));
 Lines 746-752    Link Here 
746
  nfdB0earfcn500nrb6[3] = 4.002000000000e-21;
746
  nfdB0earfcn500nrb6[3] = 4.002000000000e-21;
747
  nfdB0earfcn500nrb6[4] = 4.002000000000e-21;
747
  nfdB0earfcn500nrb6[4] = 4.002000000000e-21;
748
  nfdB0earfcn500nrb6[5] = 4.002000000000e-21;
748
  nfdB0earfcn500nrb6[5] = 4.002000000000e-21;
749
  AddTestCase (new LteNoisePsdTestCase ("nfdB0earfcn500nrb6", 500, 6, 0.000000, nfdB0earfcn500nrb6));
749
  AddTestCase (new LteNoisePsdTestCase ("nfdB0earfcn500nrb6", 500, 6, 0.000000, nfdB0earfcn500nrb6), TestCase::QUICK);
750
750
751
  SpectrumValue nfdB5earfcn500nrb6 (LteSpectrumValueHelper::GetSpectrumModel (500, 6));
751
  SpectrumValue nfdB5earfcn500nrb6 (LteSpectrumValueHelper::GetSpectrumModel (500, 6));
752
  nfdB5earfcn500nrb6[0] = 1.265543519599e-20;
752
  nfdB5earfcn500nrb6[0] = 1.265543519599e-20;
 Lines 755-761    Link Here 
755
  nfdB5earfcn500nrb6[3] = 1.265543519599e-20;
755
  nfdB5earfcn500nrb6[3] = 1.265543519599e-20;
756
  nfdB5earfcn500nrb6[4] = 1.265543519599e-20;
756
  nfdB5earfcn500nrb6[4] = 1.265543519599e-20;
757
  nfdB5earfcn500nrb6[5] = 1.265543519599e-20;
757
  nfdB5earfcn500nrb6[5] = 1.265543519599e-20;
758
  AddTestCase (new LteNoisePsdTestCase ("nfdB5earfcn500nrb6", 500, 6, 5.000000, nfdB5earfcn500nrb6));
758
  AddTestCase (new LteNoisePsdTestCase ("nfdB5earfcn500nrb6", 500, 6, 5.000000, nfdB5earfcn500nrb6), TestCase::QUICK);
759
759
760
  SpectrumValue nfdB10earfcn500nrb6 (LteSpectrumValueHelper::GetSpectrumModel (500, 6));
760
  SpectrumValue nfdB10earfcn500nrb6 (LteSpectrumValueHelper::GetSpectrumModel (500, 6));
761
  nfdB10earfcn500nrb6[0] = 4.002000000000e-20;
761
  nfdB10earfcn500nrb6[0] = 4.002000000000e-20;
 Lines 764-770    Link Here 
764
  nfdB10earfcn500nrb6[3] = 4.002000000000e-20;
764
  nfdB10earfcn500nrb6[3] = 4.002000000000e-20;
765
  nfdB10earfcn500nrb6[4] = 4.002000000000e-20;
765
  nfdB10earfcn500nrb6[4] = 4.002000000000e-20;
766
  nfdB10earfcn500nrb6[5] = 4.002000000000e-20;
766
  nfdB10earfcn500nrb6[5] = 4.002000000000e-20;
767
  AddTestCase (new LteNoisePsdTestCase ("nfdB10earfcn500nrb6", 500, 6, 10.000000, nfdB10earfcn500nrb6));
767
  AddTestCase (new LteNoisePsdTestCase ("nfdB10earfcn500nrb6", 500, 6, 10.000000, nfdB10earfcn500nrb6), TestCase::QUICK);
768
768
769
  SpectrumValue nfdB0earfcn500nrb15 (LteSpectrumValueHelper::GetSpectrumModel (500, 15));
769
  SpectrumValue nfdB0earfcn500nrb15 (LteSpectrumValueHelper::GetSpectrumModel (500, 15));
770
  nfdB0earfcn500nrb15[0] = 4.002000000000e-21;
770
  nfdB0earfcn500nrb15[0] = 4.002000000000e-21;
 Lines 782-788    Link Here 
782
  nfdB0earfcn500nrb15[12] = 4.002000000000e-21;
782
  nfdB0earfcn500nrb15[12] = 4.002000000000e-21;
783
  nfdB0earfcn500nrb15[13] = 4.002000000000e-21;
783
  nfdB0earfcn500nrb15[13] = 4.002000000000e-21;
784
  nfdB0earfcn500nrb15[14] = 4.002000000000e-21;
784
  nfdB0earfcn500nrb15[14] = 4.002000000000e-21;
785
  AddTestCase (new LteNoisePsdTestCase ("nfdB0earfcn500nrb15", 500, 15, 0.000000, nfdB0earfcn500nrb15));
785
  AddTestCase (new LteNoisePsdTestCase ("nfdB0earfcn500nrb15", 500, 15, 0.000000, nfdB0earfcn500nrb15), TestCase::QUICK);
786
786
787
  SpectrumValue nfdB5earfcn500nrb15 (LteSpectrumValueHelper::GetSpectrumModel (500, 15));
787
  SpectrumValue nfdB5earfcn500nrb15 (LteSpectrumValueHelper::GetSpectrumModel (500, 15));
788
  nfdB5earfcn500nrb15[0] = 1.265543519599e-20;
788
  nfdB5earfcn500nrb15[0] = 1.265543519599e-20;
 Lines 800-806    Link Here 
800
  nfdB5earfcn500nrb15[12] = 1.265543519599e-20;
800
  nfdB5earfcn500nrb15[12] = 1.265543519599e-20;
801
  nfdB5earfcn500nrb15[13] = 1.265543519599e-20;
801
  nfdB5earfcn500nrb15[13] = 1.265543519599e-20;
802
  nfdB5earfcn500nrb15[14] = 1.265543519599e-20;
802
  nfdB5earfcn500nrb15[14] = 1.265543519599e-20;
803
  AddTestCase (new LteNoisePsdTestCase ("nfdB5earfcn500nrb15", 500, 15, 5.000000, nfdB5earfcn500nrb15));
803
  AddTestCase (new LteNoisePsdTestCase ("nfdB5earfcn500nrb15", 500, 15, 5.000000, nfdB5earfcn500nrb15), TestCase::QUICK);
804
804
805
  SpectrumValue nfdB10earfcn500nrb15 (LteSpectrumValueHelper::GetSpectrumModel (500, 15));
805
  SpectrumValue nfdB10earfcn500nrb15 (LteSpectrumValueHelper::GetSpectrumModel (500, 15));
806
  nfdB10earfcn500nrb15[0] = 4.002000000000e-20;
806
  nfdB10earfcn500nrb15[0] = 4.002000000000e-20;
 Lines 830-836    Link Here 
830
  spectrumValue_txpowdB10nrb6run1earfcn500[3] = 0.000000000000e+00;
830
  spectrumValue_txpowdB10nrb6run1earfcn500[3] = 0.000000000000e+00;
831
  spectrumValue_txpowdB10nrb6run1earfcn500[4] = 0.000000000000e+00;
831
  spectrumValue_txpowdB10nrb6run1earfcn500[4] = 0.000000000000e+00;
832
  spectrumValue_txpowdB10nrb6run1earfcn500[5] = 0.000000000000e+00;
832
  spectrumValue_txpowdB10nrb6run1earfcn500[5] = 0.000000000000e+00;
833
  AddTestCase (new LteTxPsdTestCase ("txpowdB10nrb6run1earfcn500", 500, 6, 10.000000, activeRbs_txpowdB10nrb6run1earfcn500, spectrumValue_txpowdB10nrb6run1earfcn500));
833
  AddTestCase (new LteTxPsdTestCase ("txpowdB10nrb6run1earfcn500", 500, 6, 10.000000, activeRbs_txpowdB10nrb6run1earfcn500, spectrumValue_txpowdB10nrb6run1earfcn500), TestCase::QUICK);
834
834
835
  std::vector<int> activeRbs_txpowdB30nrb6run1earfcn500 (1);
835
  std::vector<int> activeRbs_txpowdB30nrb6run1earfcn500 (1);
836
  activeRbs_txpowdB30nrb6run1earfcn500[0] = 5.000000000000e+00;
836
  activeRbs_txpowdB30nrb6run1earfcn500[0] = 5.000000000000e+00;
 Lines 841-847    Link Here 
841
  spectrumValue_txpowdB30nrb6run1earfcn500[3] = 0.000000000000e+00;
841
  spectrumValue_txpowdB30nrb6run1earfcn500[3] = 0.000000000000e+00;
842
  spectrumValue_txpowdB30nrb6run1earfcn500[4] = 0.000000000000e+00;
842
  spectrumValue_txpowdB30nrb6run1earfcn500[4] = 0.000000000000e+00;
843
  spectrumValue_txpowdB30nrb6run1earfcn500[5] = 9.259259259259e-07;
843
  spectrumValue_txpowdB30nrb6run1earfcn500[5] = 9.259259259259e-07;
844
  AddTestCase (new LteTxPsdTestCase ("txpowdB30nrb6run1earfcn500", 500, 6, 30.000000, activeRbs_txpowdB30nrb6run1earfcn500, spectrumValue_txpowdB30nrb6run1earfcn500));
844
  AddTestCase (new LteTxPsdTestCase ("txpowdB30nrb6run1earfcn500", 500, 6, 30.000000, activeRbs_txpowdB30nrb6run1earfcn500, spectrumValue_txpowdB30nrb6run1earfcn500), TestCase::QUICK);
845
845
846
  std::vector<int> activeRbs_txpowdB10nrb25run1earfcn500 (8);
846
  std::vector<int> activeRbs_txpowdB10nrb25run1earfcn500 (8);
847
  activeRbs_txpowdB10nrb25run1earfcn500[0] = 1.000000000000e+00;
847
  activeRbs_txpowdB10nrb25run1earfcn500[0] = 1.000000000000e+00;
 Lines 878-884    Link Here 
878
  spectrumValue_txpowdB10nrb25run1earfcn500[22] = 0.000000000000e+00;
878
  spectrumValue_txpowdB10nrb25run1earfcn500[22] = 0.000000000000e+00;
879
  spectrumValue_txpowdB10nrb25run1earfcn500[23] = 0.000000000000e+00;
879
  spectrumValue_txpowdB10nrb25run1earfcn500[23] = 0.000000000000e+00;
880
  spectrumValue_txpowdB10nrb25run1earfcn500[24] = 2.222222222222e-09;
880
  spectrumValue_txpowdB10nrb25run1earfcn500[24] = 2.222222222222e-09;
881
  AddTestCase (new LteTxPsdTestCase ("txpowdB10nrb25run1earfcn500", 500, 25, 10.000000, activeRbs_txpowdB10nrb25run1earfcn500, spectrumValue_txpowdB10nrb25run1earfcn500));
881
  AddTestCase (new LteTxPsdTestCase ("txpowdB10nrb25run1earfcn500", 500, 25, 10.000000, activeRbs_txpowdB10nrb25run1earfcn500, spectrumValue_txpowdB10nrb25run1earfcn500), TestCase::QUICK);
882
882
883
  std::vector<int> activeRbs_txpowdB30nrb25run1earfcn500 (13);
883
  std::vector<int> activeRbs_txpowdB30nrb25run1earfcn500 (13);
884
  activeRbs_txpowdB30nrb25run1earfcn500[0] = 0.000000000000e+00;
884
  activeRbs_txpowdB30nrb25run1earfcn500[0] = 0.000000000000e+00;
 Lines 920-926    Link Here 
920
  spectrumValue_txpowdB30nrb25run1earfcn500[22] = 0.000000000000e+00;
920
  spectrumValue_txpowdB30nrb25run1earfcn500[22] = 0.000000000000e+00;
921
  spectrumValue_txpowdB30nrb25run1earfcn500[23] = 0.000000000000e+00;
921
  spectrumValue_txpowdB30nrb25run1earfcn500[23] = 0.000000000000e+00;
922
  spectrumValue_txpowdB30nrb25run1earfcn500[24] = 2.222222222222e-07;
922
  spectrumValue_txpowdB30nrb25run1earfcn500[24] = 2.222222222222e-07;
923
  AddTestCase (new LteTxPsdTestCase ("txpowdB30nrb25run1earfcn500", 500, 25, 30.000000, activeRbs_txpowdB30nrb25run1earfcn500, spectrumValue_txpowdB30nrb25run1earfcn500));
923
  AddTestCase (new LteTxPsdTestCase ("txpowdB30nrb25run1earfcn500", 500, 25, 30.000000, activeRbs_txpowdB30nrb25run1earfcn500, spectrumValue_txpowdB30nrb25run1earfcn500), TestCase::QUICK);
924
924
925
  std::vector<int> activeRbs_txpowdB10nrb100run1earfcn500 (60);
925
  std::vector<int> activeRbs_txpowdB10nrb100run1earfcn500 (60);
926
  activeRbs_txpowdB10nrb100run1earfcn500[0] = 0.000000000000e+00;
926
  activeRbs_txpowdB10nrb100run1earfcn500[0] = 0.000000000000e+00;
 Lines 1084-1090    Link Here 
1084
  spectrumValue_txpowdB10nrb100run1earfcn500[97] = 5.555555555556e-10;
1084
  spectrumValue_txpowdB10nrb100run1earfcn500[97] = 5.555555555556e-10;
1085
  spectrumValue_txpowdB10nrb100run1earfcn500[98] = 5.555555555556e-10;
1085
  spectrumValue_txpowdB10nrb100run1earfcn500[98] = 5.555555555556e-10;
1086
  spectrumValue_txpowdB10nrb100run1earfcn500[99] = 0.000000000000e+00;
1086
  spectrumValue_txpowdB10nrb100run1earfcn500[99] = 0.000000000000e+00;
1087
  AddTestCase (new LteTxPsdTestCase ("txpowdB10nrb100run1earfcn500", 500, 100, 10.000000, activeRbs_txpowdB10nrb100run1earfcn500, spectrumValue_txpowdB10nrb100run1earfcn500));
1087
  AddTestCase (new LteTxPsdTestCase ("txpowdB10nrb100run1earfcn500", 500, 100, 10.000000, activeRbs_txpowdB10nrb100run1earfcn500, spectrumValue_txpowdB10nrb100run1earfcn500), TestCase::QUICK);
1088
1088
1089
  std::vector<int> activeRbs_txpowdB30nrb100run1earfcn500 (39);
1089
  std::vector<int> activeRbs_txpowdB30nrb100run1earfcn500 (39);
1090
  activeRbs_txpowdB30nrb100run1earfcn500[0] = 0.000000000000e+00;
1090
  activeRbs_txpowdB30nrb100run1earfcn500[0] = 0.000000000000e+00;
 Lines 1227-1233    Link Here 
1227
  spectrumValue_txpowdB30nrb100run1earfcn500[97] = 0.000000000000e+00;
1227
  spectrumValue_txpowdB30nrb100run1earfcn500[97] = 0.000000000000e+00;
1228
  spectrumValue_txpowdB30nrb100run1earfcn500[98] = 5.555555555556e-08;
1228
  spectrumValue_txpowdB30nrb100run1earfcn500[98] = 5.555555555556e-08;
1229
  spectrumValue_txpowdB30nrb100run1earfcn500[99] = 5.555555555556e-08;
1229
  spectrumValue_txpowdB30nrb100run1earfcn500[99] = 5.555555555556e-08;
1230
  AddTestCase (new LteTxPsdTestCase ("txpowdB30nrb100run1earfcn500", 500, 100, 30.000000, activeRbs_txpowdB30nrb100run1earfcn500, spectrumValue_txpowdB30nrb100run1earfcn500));
1230
  AddTestCase (new LteTxPsdTestCase ("txpowdB30nrb100run1earfcn500", 500, 100, 30.000000, activeRbs_txpowdB30nrb100run1earfcn500, spectrumValue_txpowdB30nrb100run1earfcn500), TestCase::QUICK);
1231
1231
1232
  std::vector<int> activeRbs_txpowdB10nrb6run2earfcn500 (3);
1232
  std::vector<int> activeRbs_txpowdB10nrb6run2earfcn500 (3);
1233
  activeRbs_txpowdB10nrb6run2earfcn500[0] = 1.000000000000e+00;
1233
  activeRbs_txpowdB10nrb6run2earfcn500[0] = 1.000000000000e+00;
 Lines 1240-1246    Link Here 
1240
  spectrumValue_txpowdB10nrb6run2earfcn500[3] = 0.000000000000e+00;
1240
  spectrumValue_txpowdB10nrb6run2earfcn500[3] = 0.000000000000e+00;
1241
  spectrumValue_txpowdB10nrb6run2earfcn500[4] = 9.259259259259e-09;
1241
  spectrumValue_txpowdB10nrb6run2earfcn500[4] = 9.259259259259e-09;
1242
  spectrumValue_txpowdB10nrb6run2earfcn500[5] = 9.259259259259e-09;
1242
  spectrumValue_txpowdB10nrb6run2earfcn500[5] = 9.259259259259e-09;
1243
  AddTestCase (new LteTxPsdTestCase ("txpowdB10nrb6run2earfcn500", 500, 6, 10.000000, activeRbs_txpowdB10nrb6run2earfcn500, spectrumValue_txpowdB10nrb6run2earfcn500));
1243
  AddTestCase (new LteTxPsdTestCase ("txpowdB10nrb6run2earfcn500", 500, 6, 10.000000, activeRbs_txpowdB10nrb6run2earfcn500, spectrumValue_txpowdB10nrb6run2earfcn500), TestCase::QUICK);
1244
1244
1245
  std::vector<int> activeRbs_txpowdB30nrb6run2earfcn500 (3);
1245
  std::vector<int> activeRbs_txpowdB30nrb6run2earfcn500 (3);
1246
  activeRbs_txpowdB30nrb6run2earfcn500[0] = 3.000000000000e+00;
1246
  activeRbs_txpowdB30nrb6run2earfcn500[0] = 3.000000000000e+00;
 Lines 1253-1259    Link Here 
1253
  spectrumValue_txpowdB30nrb6run2earfcn500[3] = 9.259259259259e-07;
1253
  spectrumValue_txpowdB30nrb6run2earfcn500[3] = 9.259259259259e-07;
1254
  spectrumValue_txpowdB30nrb6run2earfcn500[4] = 9.259259259259e-07;
1254
  spectrumValue_txpowdB30nrb6run2earfcn500[4] = 9.259259259259e-07;
1255
  spectrumValue_txpowdB30nrb6run2earfcn500[5] = 9.259259259259e-07;
1255
  spectrumValue_txpowdB30nrb6run2earfcn500[5] = 9.259259259259e-07;
1256
  AddTestCase (new LteTxPsdTestCase ("txpowdB30nrb6run2earfcn500", 500, 6, 30.000000, activeRbs_txpowdB30nrb6run2earfcn500, spectrumValue_txpowdB30nrb6run2earfcn500));
1256
  AddTestCase (new LteTxPsdTestCase ("txpowdB30nrb6run2earfcn500", 500, 6, 30.000000, activeRbs_txpowdB30nrb6run2earfcn500, spectrumValue_txpowdB30nrb6run2earfcn500), TestCase::QUICK);
1257
1257
1258
  std::vector<int> activeRbs_txpowdB10nrb25run2earfcn500 (15);
1258
  std::vector<int> activeRbs_txpowdB10nrb25run2earfcn500 (15);
1259
  activeRbs_txpowdB10nrb25run2earfcn500[0] = 0.000000000000e+00;
1259
  activeRbs_txpowdB10nrb25run2earfcn500[0] = 0.000000000000e+00;
 Lines 1297-1303    Link Here 
1297
  spectrumValue_txpowdB10nrb25run2earfcn500[22] = 0.000000000000e+00;
1297
  spectrumValue_txpowdB10nrb25run2earfcn500[22] = 0.000000000000e+00;
1298
  spectrumValue_txpowdB10nrb25run2earfcn500[23] = 0.000000000000e+00;
1298
  spectrumValue_txpowdB10nrb25run2earfcn500[23] = 0.000000000000e+00;
1299
  spectrumValue_txpowdB10nrb25run2earfcn500[24] = 2.222222222222e-09;
1299
  spectrumValue_txpowdB10nrb25run2earfcn500[24] = 2.222222222222e-09;
1300
  AddTestCase (new LteTxPsdTestCase ("txpowdB10nrb25run2earfcn500", 500, 25, 10.000000, activeRbs_txpowdB10nrb25run2earfcn500, spectrumValue_txpowdB10nrb25run2earfcn500));
1300
  AddTestCase (new LteTxPsdTestCase ("txpowdB10nrb25run2earfcn500", 500, 25, 10.000000, activeRbs_txpowdB10nrb25run2earfcn500, spectrumValue_txpowdB10nrb25run2earfcn500), TestCase::QUICK);
1301
1301
1302
  std::vector<int> activeRbs_txpowdB30nrb25run2earfcn500 (13);
1302
  std::vector<int> activeRbs_txpowdB30nrb25run2earfcn500 (13);
1303
  activeRbs_txpowdB30nrb25run2earfcn500[0] = 0.000000000000e+00;
1303
  activeRbs_txpowdB30nrb25run2earfcn500[0] = 0.000000000000e+00;
 Lines 1339-1345    Link Here 
1339
  spectrumValue_txpowdB30nrb25run2earfcn500[22] = 0.000000000000e+00;
1339
  spectrumValue_txpowdB30nrb25run2earfcn500[22] = 0.000000000000e+00;
1340
  spectrumValue_txpowdB30nrb25run2earfcn500[23] = 2.222222222222e-07;
1340
  spectrumValue_txpowdB30nrb25run2earfcn500[23] = 2.222222222222e-07;
1341
  spectrumValue_txpowdB30nrb25run2earfcn500[24] = 2.222222222222e-07;
1341
  spectrumValue_txpowdB30nrb25run2earfcn500[24] = 2.222222222222e-07;
1342
  AddTestCase (new LteTxPsdTestCase ("txpowdB30nrb25run2earfcn500", 500, 25, 30.000000, activeRbs_txpowdB30nrb25run2earfcn500, spectrumValue_txpowdB30nrb25run2earfcn500));
1342
  AddTestCase (new LteTxPsdTestCase ("txpowdB30nrb25run2earfcn500", 500, 25, 30.000000, activeRbs_txpowdB30nrb25run2earfcn500, spectrumValue_txpowdB30nrb25run2earfcn500), TestCase::QUICK);
1343
1343
1344
  std::vector<int> activeRbs_txpowdB10nrb100run2earfcn500 (48);
1344
  std::vector<int> activeRbs_txpowdB10nrb100run2earfcn500 (48);
1345
  activeRbs_txpowdB10nrb100run2earfcn500[0] = 2.000000000000e+00;
1345
  activeRbs_txpowdB10nrb100run2earfcn500[0] = 2.000000000000e+00;
 Lines 1491-1497    Link Here 
1491
  spectrumValue_txpowdB10nrb100run2earfcn500[97] = 5.555555555556e-10;
1491
  spectrumValue_txpowdB10nrb100run2earfcn500[97] = 5.555555555556e-10;
1492
  spectrumValue_txpowdB10nrb100run2earfcn500[98] = 0.000000000000e+00;
1492
  spectrumValue_txpowdB10nrb100run2earfcn500[98] = 0.000000000000e+00;
1493
  spectrumValue_txpowdB10nrb100run2earfcn500[99] = 0.000000000000e+00;
1493
  spectrumValue_txpowdB10nrb100run2earfcn500[99] = 0.000000000000e+00;
1494
  AddTestCase (new LteTxPsdTestCase ("txpowdB10nrb100run2earfcn500", 500, 100, 10.000000, activeRbs_txpowdB10nrb100run2earfcn500, spectrumValue_txpowdB10nrb100run2earfcn500));
1494
  AddTestCase (new LteTxPsdTestCase ("txpowdB10nrb100run2earfcn500", 500, 100, 10.000000, activeRbs_txpowdB10nrb100run2earfcn500, spectrumValue_txpowdB10nrb100run2earfcn500), TestCase::QUICK);
1495
1495
1496
  std::vector<int> activeRbs_txpowdB30nrb100run2earfcn500 (52);
1496
  std::vector<int> activeRbs_txpowdB30nrb100run2earfcn500 (52);
1497
  activeRbs_txpowdB30nrb100run2earfcn500[0] = 0.000000000000e+00;
1497
  activeRbs_txpowdB30nrb100run2earfcn500[0] = 0.000000000000e+00;
 Lines 1647-1653    Link Here 
1647
  spectrumValue_txpowdB30nrb100run2earfcn500[97] = 0.000000000000e+00;
1647
  spectrumValue_txpowdB30nrb100run2earfcn500[97] = 0.000000000000e+00;
1648
  spectrumValue_txpowdB30nrb100run2earfcn500[98] = 5.555555555556e-08;
1648
  spectrumValue_txpowdB30nrb100run2earfcn500[98] = 5.555555555556e-08;
1649
  spectrumValue_txpowdB30nrb100run2earfcn500[99] = 5.555555555556e-08;
1649
  spectrumValue_txpowdB30nrb100run2earfcn500[99] = 5.555555555556e-08;
1650
  AddTestCase (new LteTxPsdTestCase ("txpowdB30nrb100run2earfcn500", 500, 100, 30.000000, activeRbs_txpowdB30nrb100run2earfcn500, spectrumValue_txpowdB30nrb100run2earfcn500));
1650
  AddTestCase (new LteTxPsdTestCase ("txpowdB30nrb100run2earfcn500", 500, 100, 30.000000, activeRbs_txpowdB30nrb100run2earfcn500, spectrumValue_txpowdB30nrb100run2earfcn500), TestCase::QUICK);
1651
1651
1652
1652
1653
1653
(-)a/src/lte/test/lte-test-tdbet-ff-mac-scheduler.cc (-26 / +26 lines)
 Lines 74-84    Link Here 
74
  // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 bytes/sec
74
  // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 bytes/sec
75
  // 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 bytes/sec
75
  // 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 bytes/sec
76
  // 15 users -> 1 PRB at Itbs 26 -> 89 -> 89000 bytes/sec
76
  // 15 users -> 1 PRB at Itbs 26 -> 89 -> 89000 bytes/sec
77
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (1,0,0,2196000,2292000));
77
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (1,0,0,2196000,2292000), TestCase::QUICK);
78
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (3,0,0,732000,749000));
78
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (3,0,0,732000,749000), TestCase::QUICK);
79
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (6,0,0,366000,373000));
79
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (6,0,0,366000,373000), TestCase::QUICK);
80
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (12,0,0,183000,185000));
80
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (12,0,0,183000,185000), TestCase::QUICK);
81
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (15,0,0,146400,89000));
81
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (15,0,0,146400,89000), TestCase::QUICK);
82
 
82
 
83
  // DOWNLINK - DISTANCE 3000 -> MCS 24 -> Itbs 30 (from table 7.1.7.2.1-1 of 36.213)
83
  // DOWNLINK - DISTANCE 3000 -> MCS 24 -> Itbs 30 (from table 7.1.7.2.1-1 of 36.213)
84
  // 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 bytes/sec
84
  // 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 bytes/sec
 Lines 92-102    Link Here 
92
  // 6 users -> 4 PRB at Itbs 18 -> 193 -> 193000 bytes/sec
92
  // 6 users -> 4 PRB at Itbs 18 -> 193 -> 193000 bytes/sec
93
  // 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 bytes/sec
93
  // 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 bytes/sec
94
  // 15 users -> 1 PRB at Itbs 18 -> 47 -> 47000 bytes/sec 
94
  // 15 users -> 1 PRB at Itbs 18 -> 47 -> 47000 bytes/sec 
95
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (1,0,3000,1383000,1239000));
95
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (1,0,3000,1383000,1239000), TestCase::QUICK);
96
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (3,0,3000,461000,389000));
96
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (3,0,3000,461000,389000), TestCase::QUICK);
97
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (6,0,3000,230500,193000));
97
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (6,0,3000,230500,193000), TestCase::QUICK);
98
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (12,0,3000,115250,97000));
98
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (12,0,3000,115250,97000), TestCase::QUICK);
99
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (15,0,3000,92200,47000));
99
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (15,0,3000,92200,47000), TestCase::QUICK);
100
 
100
 
101
  // DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
101
  // DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
102
  // 1 user -> 24 PRB at Itbs 15 -> 903 -> 903000 bytes/sec
102
  // 1 user -> 24 PRB at Itbs 15 -> 903 -> 903000 bytes/sec
 Lines 110-120    Link Here 
110
  // 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 bytes/sec
110
  // 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 bytes/sec
111
  // 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 bytes/sec
111
  // 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 bytes/sec
112
  // 15 users -> 1 PRB at Itbs 11 -> 22 -> 22000 bytes/sec
112
  // 15 users -> 1 PRB at Itbs 11 -> 22 -> 22000 bytes/sec
113
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (1,0,6000,903000,621000));
113
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (1,0,6000,903000,621000), TestCase::QUICK);
114
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (3,0,6000,301000,201000));
114
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (3,0,6000,301000,201000), TestCase::QUICK);
115
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (6,0,6000,150500,97000));
115
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (6,0,6000,150500,97000), TestCase::QUICK);
116
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (12,0,6000,75250,47000));
116
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (12,0,6000,75250,47000), TestCase::QUICK);
117
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (15,0,6000,60200,22000));
117
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (15,0,6000,60200,22000), TestCase::QUICK);
118
 
118
 
119
  // DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
119
  // DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
120
  // 1 user -> 24 PRB at Itbs 11 -> 597 -> 597000 bytes/sec
120
  // 1 user -> 24 PRB at Itbs 11 -> 597 -> 597000 bytes/sec
 Lines 128-138    Link Here 
128
  // 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 bytes/sec
128
  // 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 bytes/sec
129
  // 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 bytes/sec
129
  // 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 bytes/sec
130
  // 15 users -> 1 PRB at Itbs 8 -> 15 -> 15000 bytes/sec 
130
  // 15 users -> 1 PRB at Itbs 8 -> 15 -> 15000 bytes/sec 
131
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (1,0,9000,597000,437000));
131
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (1,0,9000,597000,437000), TestCase::QUICK);
132
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (3,0,9000,199000,137000));
132
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (3,0,9000,199000,137000), TestCase::QUICK);
133
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (6,0,9000,99500,67000));
133
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (6,0,9000,99500,67000), TestCase::QUICK);
134
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (12,0,9000,49750,32000));
134
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (12,0,9000,49750,32000), TestCase::QUICK);
135
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (15,0,9000,39800,15000));
135
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (15,0,9000,39800,15000), TestCase::QUICK);
136
 
136
 
137
  // DONWLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
137
  // DONWLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
138
  // 1 user -> 24 PRB at Itbs 6 -> 309 -> 309000 bytes/sec
138
  // 1 user -> 24 PRB at Itbs 6 -> 309 -> 309000 bytes/sec
 Lines 146-156    Link Here 
146
  // 6 users -> 4 PRB at Itbs 6 -> 32 -> 32000 bytes/sec
146
  // 6 users -> 4 PRB at Itbs 6 -> 32 -> 32000 bytes/sec
147
  // 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 bytes/sec
147
  // 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 bytes/sec
148
  // 15 users -> 1 PRB at Itbs 6 -> 7 -> 7000 bytes/sec
148
  // 15 users -> 1 PRB at Itbs 6 -> 7 -> 7000 bytes/sec
149
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (1,0,15000,309000,233000));
149
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (1,0,15000,309000,233000), TestCase::QUICK);
150
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (3,0,15000,103000,69000));
150
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (3,0,15000,103000,69000), TestCase::QUICK);
151
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (6,0,15000,51500,32000));
151
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (6,0,15000,51500,32000), TestCase::QUICK);
152
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (12,0,15000,25750,15000));
152
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (12,0,15000,25750,15000), TestCase::QUICK);
153
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (15,0,15000,20600,7000));
153
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (15,0,15000,20600,7000), TestCase::QUICK);
154
154
155
  // Test Case 2: fairness check
155
  // Test Case 2: fairness check
156
156
 Lines 172-178    Link Here 
172
  estThrTdBetUl.push_back (125000); // User 2 estimated TTI throughput from TDBET
172
  estThrTdBetUl.push_back (125000); // User 2 estimated TTI throughput from TDBET
173
  estThrTdBetUl.push_back (85000);  // User 3 estimated TTI throughput from TDBET
173
  estThrTdBetUl.push_back (85000);  // User 3 estimated TTI throughput from TDBET
174
  estThrTdBetUl.push_back (41000);  // User 4 estimated TTI throughput from TDBET
174
  estThrTdBetUl.push_back (41000);  // User 4 estimated TTI throughput from TDBET
175
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase2 (dist, estAchievableRateDl, estThrTdBetUl));
175
  AddTestCase (new LenaTdBetFfMacSchedulerTestCase2 (dist, estAchievableRateDl, estThrTdBetUl), TestCase::QUICK);
176
176
177
177
178
}
178
}
(-)a/src/lte/test/lte-test-tdmt-ff-mac-scheduler.cc (-25 / +25 lines)
 Lines 74-84    Link Here 
74
  // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 bytes/sec
74
  // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 bytes/sec
75
  // 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 bytes/sec
75
  // 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 bytes/sec
76
  // 15 users -> 1 PRB at Itbs 26 -> 89 -> 89000 bytes/sec
76
  // 15 users -> 1 PRB at Itbs 26 -> 89 -> 89000 bytes/sec
77
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (1,0,0,2196000,2292000));
77
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (1,0,0,2196000,2292000), TestCase::QUICK);
78
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (3,0,0,2196000,749000));
78
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (3,0,0,2196000,749000), TestCase::QUICK);
79
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (6,0,0,2196000,373000));
79
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (6,0,0,2196000,373000), TestCase::QUICK);
80
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (12,0,0,2196000,185000));
80
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (12,0,0,2196000,185000), TestCase::QUICK);
81
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (15,0,0,2196000,89000));
81
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (15,0,0,2196000,89000), TestCase::QUICK);
82
 
82
 
83
  // DOWNLINK - DISTANCE 3000 -> MCS 24 -> Itbs 30 (from table 7.1.7.2.1-1 of 36.213)
83
  // DOWNLINK - DISTANCE 3000 -> MCS 24 -> Itbs 30 (from table 7.1.7.2.1-1 of 36.213)
84
  // 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 bytes/sec for first UE; 0 bytes/sec for other UEs
84
  // 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 bytes/sec for first UE; 0 bytes/sec for other UEs
 Lines 92-102    Link Here 
92
  // 6 users -> 4 PRB at Itbs 18 -> 193 -> 193000 bytes/sec
92
  // 6 users -> 4 PRB at Itbs 18 -> 193 -> 193000 bytes/sec
93
  // 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 bytes/sec
93
  // 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 bytes/sec
94
  // 15 users -> 1 PRB at Itbs 18 -> 47 -> 47000 bytes/sec 
94
  // 15 users -> 1 PRB at Itbs 18 -> 47 -> 47000 bytes/sec 
95
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (1,0,3000,1383000,1239000));
95
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (1,0,3000,1383000,1239000), TestCase::QUICK);
96
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (3,0,3000,1383000,389000));
96
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (3,0,3000,1383000,389000), TestCase::QUICK);
97
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (6,0,3000,1383000,193000));
97
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (6,0,3000,1383000,193000), TestCase::QUICK);
98
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (12,0,3000,1383000,97000));
98
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (12,0,3000,1383000,97000), TestCase::QUICK);
99
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (15,0,3000,1383000,47000));
99
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (15,0,3000,1383000,47000), TestCase::QUICK);
100
 
100
 
101
  // DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
101
  // DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
102
  // 1 user -> 24 PRB at Itbs 15 -> 903 -> 903000 bytes/sec for first UE; 0 bytes/sec for other UEs
102
  // 1 user -> 24 PRB at Itbs 15 -> 903 -> 903000 bytes/sec for first UE; 0 bytes/sec for other UEs
 Lines 110-120    Link Here 
110
  // 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 bytes/sec
110
  // 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 bytes/sec
111
  // 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 bytes/sec
111
  // 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 bytes/sec
112
  // 15 users -> 1 PRB at Itbs 11 -> 22 -> 22000 bytes/sec
112
  // 15 users -> 1 PRB at Itbs 11 -> 22 -> 22000 bytes/sec
113
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (1,0,6000,903000,621000));
113
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (1,0,6000,903000,621000), TestCase::QUICK);
114
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (3,0,6000,903000,201000));
114
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (3,0,6000,903000,201000), TestCase::QUICK);
115
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (6,0,6000,903000,97000));
115
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (6,0,6000,903000,97000), TestCase::QUICK);
116
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (12,0,6000,903000,47000));
116
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (12,0,6000,903000,47000), TestCase::QUICK);
117
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (15,0,6000,903000,22000));
117
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (15,0,6000,903000,22000), TestCase::QUICK);
118
 
118
 
119
  // DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
119
  // DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
120
  // 1 user -> 24 PRB at Itbs 11 -> 597 -> 597000 bytes/sec
120
  // 1 user -> 24 PRB at Itbs 11 -> 597 -> 597000 bytes/sec
 Lines 128-138    Link Here 
128
  // 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 bytes/sec
128
  // 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 bytes/sec
129
  // 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 bytes/sec
129
  // 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 bytes/sec
130
  // 15 users -> 1 PRB at Itbs 8 -> 15 -> 15000 bytes/sec 
130
  // 15 users -> 1 PRB at Itbs 8 -> 15 -> 15000 bytes/sec 
131
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (1,0,9000,597000,437000));
131
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (1,0,9000,597000,437000), TestCase::QUICK);
132
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (3,0,9000,597000,137000));
132
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (3,0,9000,597000,137000), TestCase::QUICK);
133
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (6,0,9000,597000,67000));
133
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (6,0,9000,597000,67000), TestCase::QUICK);
134
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (12,0,9000,597000,32000));
134
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (12,0,9000,597000,32000), TestCase::QUICK);
135
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (15,0,9000,597000,15000));
135
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (15,0,9000,597000,15000), TestCase::QUICK);
136
 
136
 
137
  // DONWLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
137
  // DONWLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
138
  // 1 user -> 24 PRB at Itbs 6 -> 309 -> 309000 bytes/sec
138
  // 1 user -> 24 PRB at Itbs 6 -> 309 -> 309000 bytes/sec
 Lines 146-156    Link Here 
146
  // 6 users -> 4 PRB at Itbs 6 -> 32 -> 32000 bytes/sec
146
  // 6 users -> 4 PRB at Itbs 6 -> 32 -> 32000 bytes/sec
147
  // 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 bytes/sec
147
  // 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 bytes/sec
148
  // 15 users -> 1 PRB at Itbs 6 -> 7 -> 7000 bytes/sec
148
  // 15 users -> 1 PRB at Itbs 6 -> 7 -> 7000 bytes/sec
149
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (1,0,15000,309000,233000));
149
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (1,0,15000,309000,233000), TestCase::QUICK);
150
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (3,0,15000,309000,69000));
150
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (3,0,15000,309000,69000), TestCase::QUICK);
151
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (6,0,15000,309000,32000));
151
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (6,0,15000,309000,32000), TestCase::QUICK);
152
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (12,0,15000,309000,15000));
152
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (12,0,15000,309000,15000), TestCase::QUICK);
153
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (15,0,15000,309000,7000));
153
  AddTestCase (new LenaTdMtFfMacSchedulerTestCase (15,0,15000,309000,7000), TestCase::QUICK);
154
154
155
 
155
 
156
}
156
}
(-)a/src/lte/test/lte-test-tdtbfq-ff-mac-scheduler.cc (-23 / +23 lines)
 Lines 90-99    Link Here 
90
  // 3 users -> 8 PRB at Itbs 26 -> 749 -> 749000 > 232000 -> throughput = 232000 bytes/sec 
90
  // 3 users -> 8 PRB at Itbs 26 -> 749 -> 749000 > 232000 -> throughput = 232000 bytes/sec 
91
  // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 > 232000 -> throughput = 232000 bytes/sec
91
  // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 > 232000 -> throughput = 232000 bytes/sec
92
  // 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 < 232000 -> throughput = 185000 bytes/sec
92
  // 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 < 232000 -> throughput = 185000 bytes/sec
93
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (1,0,0,232000,232000,200,1));
93
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (1,0,0,232000,232000,200,1), TestCase::QUICK);
94
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (3,0,0,232000,232000,200,1));
94
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (3,0,0,232000,232000,200,1), TestCase::QUICK);
95
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (6,0,0,232000,232000,200,1));
95
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (6,0,0,232000,232000,200,1), TestCase::QUICK);
96
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (12,0,0,183000,185000,200,1));
96
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (12,0,0,183000,185000,200,1), TestCase::QUICK);
97
97
98
  // DOWNLINK - DISTANCE 3000 -> MCS 24 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213)
98
  // DOWNLINK - DISTANCE 3000 -> MCS 24 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213)
99
  // DOWNLINK -> DISTANCE 0 -> MCS 28 -> Itbs 26 (from table 7.1.7.2.1-1 of 36.2    13)
99
  // DOWNLINK -> DISTANCE 0 -> MCS 28 -> Itbs 26 (from table 7.1.7.2.1-1 of 36.2    13)
 Lines 110-119    Link Here 
110
  // 3 users -> 8 PRB at Itbs 18 -> 389 -> 389000 > 232000 -> throughput = 232000 bytes/sec
110
  // 3 users -> 8 PRB at Itbs 18 -> 389 -> 389000 > 232000 -> throughput = 232000 bytes/sec
111
  // 6 users -> 4 PRB at Itbs 18 -> 193 -> 193000 < 232000 -> throughput = 193000 bytes/sec
111
  // 6 users -> 4 PRB at Itbs 18 -> 193 -> 193000 < 232000 -> throughput = 193000 bytes/sec
112
  // 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 < 232000 -> throughput = 97000 bytes/sec
112
  // 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 < 232000 -> throughput = 97000 bytes/sec
113
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (1,0,3000,232000,232000,200,1));
113
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (1,0,3000,232000,232000,200,1), TestCase::QUICK);
114
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (3,0,3000,232000,232000,200,1));
114
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (3,0,3000,232000,232000,200,1), TestCase::QUICK);
115
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (6,0,3000,230500,193000,200,1));
115
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (6,0,3000,230500,193000,200,1), TestCase::QUICK);
116
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (12,0,3000,115250,97000,200,1));
116
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (12,0,3000,115250,97000,200,1), TestCase::QUICK);
117
117
118
  // DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
118
  // DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
119
  // Traffic info
119
  // Traffic info
 Lines 129-138    Link Here 
129
  // 3 users -> 8 PRB at Itbs 11 -> 201 -> 201000 < 232000 -> throughput = 201000  bytes/sec
129
  // 3 users -> 8 PRB at Itbs 11 -> 201 -> 201000 < 232000 -> throughput = 201000  bytes/sec
130
  // 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 < 232000 -> throughput = 97000 bytes/sec
130
  // 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 < 232000 -> throughput = 97000 bytes/sec
131
  // 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 < 232000 -> throughput = 47000 bytes/sec
131
  // 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 < 232000 -> throughput = 47000 bytes/sec
132
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (1,0,6000,232000,232000,200,1));
132
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (1,0,6000,232000,232000,200,1), TestCase::QUICK);
133
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (3,0,6000,232000,201000,200,1));
133
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (3,0,6000,232000,201000,200,1), TestCase::QUICK);
134
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (6,0,6000,150500,97000,200,1));
134
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (6,0,6000,150500,97000,200,1), TestCase::QUICK);
135
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (12,0,6000,75250,47000,200,1));
135
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (12,0,6000,75250,47000,200,1), TestCase::QUICK);
136
136
137
  // DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
137
  // DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
138
  // Traffic info
138
  // Traffic info
 Lines 148-157    Link Here 
148
  // 3 users -> 8 PRB at Itbs 8 -> 137 -> 137000 < 232000 -> throughput = 137000 bytes/sec
148
  // 3 users -> 8 PRB at Itbs 8 -> 137 -> 137000 < 232000 -> throughput = 137000 bytes/sec
149
  // 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 < 232000 -> throughput = 67000 bytes/sec
149
  // 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 < 232000 -> throughput = 67000 bytes/sec
150
  // 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 < 232000 -> throughput = 32000 bytes/sec
150
  // 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 < 232000 -> throughput = 32000 bytes/sec
151
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (1,0,9000,232000,232000,200,1));
151
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (1,0,9000,232000,232000,200,1), TestCase::QUICK);
152
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (3,0,9000,199000,137000,200,1));
152
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (3,0,9000,199000,137000,200,1), TestCase::QUICK);
153
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (6,0,9000,99500,67000,200,1));
153
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (6,0,9000,99500,67000,200,1), TestCase::QUICK);
154
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (12,0,9000,49750,32000,200,1));
154
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (12,0,9000,49750,32000,200,1), TestCase::QUICK);
155
 
155
 
156
  // DONWLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
156
  // DONWLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
157
  // Traffic info
157
  // Traffic info
 Lines 167-176    Link Here 
167
  // 3 users -> 8 PRB at Itbs 6 -> 69 -> 69000 < 232000 -> throughput = 69000 bytes/sec
167
  // 3 users -> 8 PRB at Itbs 6 -> 69 -> 69000 < 232000 -> throughput = 69000 bytes/sec
168
  // 6 users -> 4 PRB at Itbs 6 -> 32 -> 32000 < 232000 -> throughput = 32000 bytes/sec
168
  // 6 users -> 4 PRB at Itbs 6 -> 32 -> 32000 < 232000 -> throughput = 32000 bytes/sec
169
  // 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 < 232000 -> throughput = 15000 bytes/sec
169
  // 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 < 232000 -> throughput = 15000 bytes/sec
170
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (1,0,15000,232000,232000,200,1));
170
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (1,0,15000,232000,232000,200,1), TestCase::QUICK);
171
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (3,0,15000,103000,69000,200,1));
171
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (3,0,15000,103000,69000,200,1), TestCase::QUICK);
172
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (6,0,15000,51500,32000,200,1));
172
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (6,0,15000,51500,32000,200,1), TestCase::QUICK);
173
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (12,0,15000,25750,15000,200,1));
173
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (12,0,15000,25750,15000,200,1), TestCase::QUICK);
174
174
175
  // Test Case 2: homogeneous flow test in TDTBFQ (different distance)
175
  // Test Case 2: homogeneous flow test in TDTBFQ (different distance)
176
  // Traffic1 info
176
  // Traffic1 info
 Lines 196-202    Link Here 
196
  estThrTdTbfqDl1.push_back (132000); // User 2 estimated TTI throughput from TDTBFQ
196
  estThrTdTbfqDl1.push_back (132000); // User 2 estimated TTI throughput from TDTBFQ
197
  estThrTdTbfqDl1.push_back (132000); // User 3 estimated TTI throughput from TDTBFQ
197
  estThrTdTbfqDl1.push_back (132000); // User 3 estimated TTI throughput from TDTBFQ
198
  estThrTdTbfqDl1.push_back (132000); // User 4 estimated TTI throughput from TDTBFQ
198
  estThrTdTbfqDl1.push_back (132000); // User 4 estimated TTI throughput from TDTBFQ
199
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase2 (dist1,estThrTdTbfqDl1,packetSize1,1));
199
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase2 (dist1,estThrTdTbfqDl1,packetSize1,1), TestCase::QUICK);
200
200
201
  // Traffic2 info
201
  // Traffic2 info
202
  //   UDP traffic: payload size = 200 bytes, interval = 1 ms
202
  //   UDP traffic: payload size = 200 bytes, interval = 1 ms
 Lines 221-227    Link Here 
221
  estThrTdTbfqDl2.push_back (138944); // User 2 estimated TTI throughput from TDTBFQ
221
  estThrTdTbfqDl2.push_back (138944); // User 2 estimated TTI throughput from TDTBFQ
222
  estThrTdTbfqDl2.push_back (138944); // User 3 estimated TTI throughput from TDTBFQ
222
  estThrTdTbfqDl2.push_back (138944); // User 3 estimated TTI throughput from TDTBFQ
223
  estThrTdTbfqDl2.push_back (138944); // User 4 estimated TTI throughput from TDTBFQ
223
  estThrTdTbfqDl2.push_back (138944); // User 4 estimated TTI throughput from TDTBFQ
224
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase2 (dist2,estThrTdTbfqDl2,packetSize2,1));
224
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase2 (dist2,estThrTdTbfqDl2,packetSize2,1), TestCase::QUICK);
225
225
226
  // Test Case 3: heterogeneous flow test in TDTBFQ
226
  // Test Case 3: heterogeneous flow test in TDTBFQ
227
  //   UDP traffic: payload size = [100,200,300] bytes, interval = 1 ms
227
  //   UDP traffic: payload size = [100,200,300] bytes, interval = 1 ms
 Lines 240-246    Link Here 
240
  estThrTdTbfqDl3.push_back (132000); // User 0 estimated TTI throughput from TDTBFQ
240
  estThrTdTbfqDl3.push_back (132000); // User 0 estimated TTI throughput from TDTBFQ
241
  estThrTdTbfqDl3.push_back (232000); // User 1 estimated TTI throughput from TDTBFQ
241
  estThrTdTbfqDl3.push_back (232000); // User 1 estimated TTI throughput from TDTBFQ
242
  estThrTdTbfqDl3.push_back (332000); // User 2 estimated TTI throughput from TDTBFQ
242
  estThrTdTbfqDl3.push_back (332000); // User 2 estimated TTI throughput from TDTBFQ
243
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase2 (dist3,estThrTdTbfqDl3,packetSize3,1));
243
  AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase2 (dist3,estThrTdTbfqDl3,packetSize3,1), TestCase::QUICK);
244
244
245
}
245
}
246
246
(-)a/src/lte/test/lte-test-tta-ff-mac-scheduler.cc (-25 / +25 lines)
 Lines 74-84    Link Here 
74
  // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 bytes/sec
74
  // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 bytes/sec
75
  // 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 bytes/sec
75
  // 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 bytes/sec
76
  // 15 users -> 1 PRB at Itbs 26 -> 89 -> 89000 bytes/sec
76
  // 15 users -> 1 PRB at Itbs 26 -> 89 -> 89000 bytes/sec
77
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,0,0,2196000,2292000));
77
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,0,0,2196000,2292000), TestCase::QUICK);
78
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,0,0,2196000,749000));
78
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,0,0,2196000,749000), TestCase::QUICK);
79
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,0,0,2196000,373000));
79
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,0,0,2196000,373000), TestCase::QUICK);
80
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,0,0,2196000,185000));
80
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,0,0,2196000,185000), TestCase::QUICK);
81
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (15,0,0,2196000,89000));
81
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (15,0,0,2196000,89000), TestCase::QUICK);
82
 
82
 
83
  // DOWNLINK - DISTANCE 3000 -> MCS 24 -> Itbs 30 (from table 7.1.7.2.1-1 of 36.213)
83
  // DOWNLINK - DISTANCE 3000 -> MCS 24 -> Itbs 30 (from table 7.1.7.2.1-1 of 36.213)
84
  // 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 bytes/sec for first UE; 0 bytes/sec for other UEs
84
  // 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 bytes/sec for first UE; 0 bytes/sec for other UEs
 Lines 92-102    Link Here 
92
  // 6 users -> 4 PRB at Itbs 18 -> 193 -> 193000 bytes/sec
92
  // 6 users -> 4 PRB at Itbs 18 -> 193 -> 193000 bytes/sec
93
  // 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 bytes/sec
93
  // 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 bytes/sec
94
  // 15 users -> 1 PRB at Itbs 18 -> 47 -> 47000 bytes/sec 
94
  // 15 users -> 1 PRB at Itbs 18 -> 47 -> 47000 bytes/sec 
95
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,0,3000,1383000,1239000));
95
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,0,3000,1383000,1239000), TestCase::QUICK);
96
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,0,3000,1383000,389000));
96
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,0,3000,1383000,389000), TestCase::QUICK);
97
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,0,3000,1383000,193000));
97
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,0,3000,1383000,193000), TestCase::QUICK);
98
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,0,3000,1383000,97000));
98
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,0,3000,1383000,97000), TestCase::QUICK);
99
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (15,0,3000,1383000,47000));
99
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (15,0,3000,1383000,47000), TestCase::QUICK);
100
 
100
 
101
  // DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
101
  // DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
102
  // 1 user -> 24 PRB at Itbs 15 -> 903 -> 903000 bytes/sec for first UE; 0 bytes/sec for other UEs
102
  // 1 user -> 24 PRB at Itbs 15 -> 903 -> 903000 bytes/sec for first UE; 0 bytes/sec for other UEs
 Lines 110-120    Link Here 
110
  // 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 bytes/sec
110
  // 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 bytes/sec
111
  // 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 bytes/sec
111
  // 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 bytes/sec
112
  // 15 users -> 1 PRB at Itbs 11 -> 22 -> 22000 bytes/sec
112
  // 15 users -> 1 PRB at Itbs 11 -> 22 -> 22000 bytes/sec
113
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,0,6000,903000,621000));
113
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,0,6000,903000,621000), TestCase::QUICK);
114
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,0,6000,903000,201000));
114
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,0,6000,903000,201000), TestCase::QUICK);
115
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,0,6000,903000,97000));
115
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,0,6000,903000,97000), TestCase::QUICK);
116
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,0,6000,903000,47000));
116
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,0,6000,903000,47000), TestCase::QUICK);
117
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (15,0,6000,903000,22000));
117
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (15,0,6000,903000,22000), TestCase::QUICK);
118
 
118
 
119
  // DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
119
  // DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
120
  // 1 user -> 24 PRB at Itbs 11 -> 597 -> 597000 bytes/sec
120
  // 1 user -> 24 PRB at Itbs 11 -> 597 -> 597000 bytes/sec
 Lines 128-138    Link Here 
128
  // 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 bytes/sec
128
  // 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 bytes/sec
129
  // 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 bytes/sec
129
  // 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 bytes/sec
130
  // 15 users -> 1 PRB at Itbs 8 -> 15 -> 15000 bytes/sec 
130
  // 15 users -> 1 PRB at Itbs 8 -> 15 -> 15000 bytes/sec 
131
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,0,9000,597000,437000));
131
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,0,9000,597000,437000), TestCase::QUICK);
132
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,0,9000,597000,137000));
132
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,0,9000,597000,137000), TestCase::QUICK);
133
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,0,9000,597000,67000));
133
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,0,9000,597000,67000), TestCase::QUICK);
134
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,0,9000,597000,32000));
134
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,0,9000,597000,32000), TestCase::QUICK);
135
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (15,0,9000,597000,15000));
135
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (15,0,9000,597000,15000), TestCase::QUICK);
136
 
136
 
137
  // DONWLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
137
  // DONWLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
138
  // 1 user -> 24 PRB at Itbs 6 -> 309 -> 309000 bytes/sec
138
  // 1 user -> 24 PRB at Itbs 6 -> 309 -> 309000 bytes/sec
 Lines 146-156    Link Here 
146
  // 6 users -> 4 PRB at Itbs 6 -> 32 -> 32000 bytes/sec
146
  // 6 users -> 4 PRB at Itbs 6 -> 32 -> 32000 bytes/sec
147
  // 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 bytes/sec
147
  // 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 bytes/sec
148
  // 15 users -> 1 PRB at Itbs 6 -> 7 -> 7000 bytes/sec
148
  // 15 users -> 1 PRB at Itbs 6 -> 7 -> 7000 bytes/sec
149
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,0,15000,309000,233000));
149
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,0,15000,309000,233000), TestCase::QUICK);
150
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,0,15000,309000,69000));
150
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,0,15000,309000,69000), TestCase::QUICK);
151
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,0,15000,309000,32000));
151
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,0,15000,309000,32000), TestCase::QUICK);
152
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,0,15000,309000,15000));
152
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,0,15000,309000,15000), TestCase::QUICK);
153
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (15,0,15000,309000,7000));
153
  AddTestCase (new LenaTtaFfMacSchedulerTestCase (15,0,15000,309000,7000), TestCase::QUICK);
154
154
155
 
155
 
156
}
156
}
(-)a/src/lte/test/lte-test-uplink-sinr.cc (-4 / +4 lines)
85
  (*theoreticalSinr1)[0] = 3.72589167251055;
85
  (*theoreticalSinr1)[0] = 3.72589167251055;
86
  (*theoreticalSinr1)[1] = 3.72255684126076;
86
  (*theoreticalSinr1)[1] = 3.72255684126076;
87
87
88
  AddTestCase (new LteUplinkDataSinrTestCase (rxPsd1, rxPsd2, theoreticalSinr1, "sdBm = [-46 -inf] and [-inf -48]"));
88
  AddTestCase (new LteUplinkDataSinrTestCase (rxPsd1, rxPsd2, theoreticalSinr1, "sdBm = [-46 -inf] and [-inf -48]"), TestCase::QUICK);
89
  
89
  
90
  AddTestCase (new LteUplinkSrsSinrTestCase (rxPsd1, rxPsd2, theoreticalSinr1, "sdBm = [-46 -inf] and [-inf -48]"));
90
  AddTestCase (new LteUplinkSrsSinrTestCase (rxPsd1, rxPsd2, theoreticalSinr1, "sdBm = [-46 -inf] and [-inf -48]"), TestCase::QUICK);
91
91
92
  /**
92
  /**
93
   * TX signals #2: Power Spectral Density of the signals of interest = [-63 -inf] and [-inf -61] dBm and BW = [20 22] MHz
93
   * TX signals #2: Power Spectral Density of the signals of interest = [-63 -inf] and [-inf -61] dBm and BW = [20 22] MHz
104
  (*theoreticalSinr2)[0] = 0.0743413124381667;
104
  (*theoreticalSinr2)[0] = 0.0743413124381667;
105
  (*theoreticalSinr2)[1] = 0.1865697965291756;
105
  (*theoreticalSinr2)[1] = 0.1865697965291756;
106
106
107
  AddTestCase (new LteUplinkDataSinrTestCase (rxPsd3, rxPsd4, theoreticalSinr2, "sdBm = [-63 -inf] and [-inf -61]"));
107
  AddTestCase (new LteUplinkDataSinrTestCase (rxPsd3, rxPsd4, theoreticalSinr2, "sdBm = [-63 -inf] and [-inf -61]"), TestCase::QUICK);
108
  
108
  
109
  AddTestCase (new LteUplinkSrsSinrTestCase (rxPsd3, rxPsd4, theoreticalSinr2, "sdBm = [-63 -inf] and [-inf -61]"));
109
  AddTestCase (new LteUplinkSrsSinrTestCase (rxPsd3, rxPsd4, theoreticalSinr2, "sdBm = [-63 -inf] and [-inf -61]"), TestCase::QUICK);
110
110
111
}
111
}
112
112
(-)a/src/lte/test/test-epc-tft-classifier.cc (-66 / +66 lines)
 Lines 208-240    Link Here 
208
  // ------------------------------------classifier---direction--------------src address---------------dst address---src port--dst port--ToS--TFT id
208
  // ------------------------------------classifier---direction--------------src address---------------dst address---src port--dst port--ToS--TFT id
209
209
210
  // test IP addresses
210
  // test IP addresses
211
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK,   Ipv4Address ("2.2.3.4"), Ipv4Address ("1.1.1.1"),     4,     1234,     0,    1));
211
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK,   Ipv4Address ("2.2.3.4"), Ipv4Address ("1.1.1.1"),     4,     1234,     0,    1), TestCase::QUICK);
212
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK,   Ipv4Address ("2.2.3.4"), Ipv4Address ("1.0.0.0"),     2,      123,     5,    1));
212
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK,   Ipv4Address ("2.2.3.4"), Ipv4Address ("1.0.0.0"),     2,      123,     5,    1), TestCase::QUICK);
213
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK,   Ipv4Address ("6.2.3.4"), Ipv4Address ("1.1.1.1"),     4,     1234,     0,    0));
213
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK,   Ipv4Address ("6.2.3.4"), Ipv4Address ("1.1.1.1"),     4,     1234,     0,    0), TestCase::QUICK);
214
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("3.3.3.4"), Ipv4Address ("4.4.4.1"),     4,     1234,     0,    1));
214
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("3.3.3.4"), Ipv4Address ("4.4.4.1"),     4,     1234,     0,    1), TestCase::QUICK);
215
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("3.3.4.4"), Ipv4Address ("4.4.4.1"),     4,     1234,     0,    0));
215
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("3.3.4.4"), Ipv4Address ("4.4.4.1"),     4,     1234,     0,    0), TestCase::QUICK);
216
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK,   Ipv4Address ("3.3.3.4"), Ipv4Address ("4.4.2.1"),     4,     1234,     0,    0));
216
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK,   Ipv4Address ("3.3.3.4"), Ipv4Address ("4.4.2.1"),     4,     1234,     0,    0), TestCase::QUICK);
217
217
218
  // test remote port
218
  // test remote port
219
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1024,     0,    2));
219
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1024,     0,    2), TestCase::QUICK);
220
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1025,     0,    2));
220
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1025,     0,    2), TestCase::QUICK);
221
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1035,     0,    2));
221
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1035,     0,    2), TestCase::QUICK);
222
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1234,     0,    0));
222
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1234,     0,    0), TestCase::QUICK);
223
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1024,     0,    0));
223
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1024,     0,    0), TestCase::QUICK);
224
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1025,     0,    0));
224
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1025,     0,    0), TestCase::QUICK);
225
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1035,     0,    0));
225
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1035,     0,    0), TestCase::QUICK);
226
226
227
  // test local port
227
  // test local port
228
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     3456,     0,    0));
228
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     3456,     0,    0), TestCase::QUICK);
229
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     3457,     0,    0));
229
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     3457,     0,    0), TestCase::QUICK);
230
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     3489,     0,    0));
230
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     3489,     0,    0), TestCase::QUICK);
231
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),  3456,        6,     0,    2));
231
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),  3456,        6,     0,    2), TestCase::QUICK);
232
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),  3461,     3461,     0,    2));
232
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),  3461,     3461,     0,    2), TestCase::QUICK);
233
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     9,     3489,     0,    2));
233
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     9,     3489,     0,    2), TestCase::QUICK);
234
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     9,     7895,     0,    2));
234
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     9,     7895,     0,    2), TestCase::QUICK);
235
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),  7895,       10,     0,    2));
235
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),  7895,       10,     0,    2), TestCase::QUICK);
236
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     9,     5897,     0,    2));
236
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     9,     5897,     0,    2), TestCase::QUICK);
237
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),  5897,       10,     0,    2));
237
  AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),  5897,       10,     0,    2), TestCase::QUICK);
238
238
239
239
240
  ///////////////////////////
240
  ///////////////////////////
 Lines 247-275    Link Here 
247
  // ------------------------------------classifier---direction--------------src address---------------dst address---src port--dst port--ToS--TFT id
247
  // ------------------------------------classifier---direction--------------src address---------------dst address---src port--dst port--ToS--TFT id
248
248
249
  // test IP addresses
249
  // test IP addresses
250
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK,   Ipv4Address ("2.2.3.4"), Ipv4Address ("1.1.1.1"),     4,     1234,     0,    1));
250
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK,   Ipv4Address ("2.2.3.4"), Ipv4Address ("1.1.1.1"),     4,     1234,     0,    1), TestCase::QUICK);
251
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK,   Ipv4Address ("2.2.3.4"), Ipv4Address ("1.0.0.0"),     2,      123,     5,    1));
251
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK,   Ipv4Address ("2.2.3.4"), Ipv4Address ("1.0.0.0"),     2,      123,     5,    1), TestCase::QUICK);
252
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK,   Ipv4Address ("6.2.3.4"), Ipv4Address ("1.1.1.1"),     4,     1234,     0,    1));
252
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK,   Ipv4Address ("6.2.3.4"), Ipv4Address ("1.1.1.1"),     4,     1234,     0,    1), TestCase::QUICK);
253
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::DOWNLINK, Ipv4Address ("3.3.3.4"), Ipv4Address ("4.4.4.1"),     4,     1234,     0,    1));
253
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::DOWNLINK, Ipv4Address ("3.3.3.4"), Ipv4Address ("4.4.4.1"),     4,     1234,     0,    1), TestCase::QUICK);
254
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::DOWNLINK, Ipv4Address ("3.3.4.4"), Ipv4Address ("4.4.4.1"),     4,     1234,     0,    1));
254
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::DOWNLINK, Ipv4Address ("3.3.4.4"), Ipv4Address ("4.4.4.1"),     4,     1234,     0,    1), TestCase::QUICK);
255
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK,   Ipv4Address ("3.3.3.4"), Ipv4Address ("4.4.2.1"),     4,     1234,     0,    1));
255
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK,   Ipv4Address ("3.3.3.4"), Ipv4Address ("4.4.2.1"),     4,     1234,     0,    1), TestCase::QUICK);
256
256
257
  // test remote port
257
  // test remote port
258
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1024,     0,    1));
258
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1024,     0,    1), TestCase::QUICK);
259
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1025,     0,    1));
259
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1025,     0,    1), TestCase::QUICK);
260
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1035,     0,    1));
260
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1035,     0,    1), TestCase::QUICK);
261
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1234,     0,    1));
261
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1234,     0,    1), TestCase::QUICK);
262
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1024,     0,    1));
262
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1024,     0,    1), TestCase::QUICK);
263
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1025,     0,    1));
263
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1025,     0,    1), TestCase::QUICK);
264
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1035,     0,    1));
264
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1035,     0,    1), TestCase::QUICK);
265
265
266
  // test local port
266
  // test local port
267
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     3456,     0,    1));
267
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     3456,     0,    1), TestCase::QUICK);
268
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     3457,     0,    1));
268
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     3457,     0,    1), TestCase::QUICK);
269
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     3489,     0,    1));
269
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     3489,     0,    1), TestCase::QUICK);
270
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),  3456,        6,     0,    1));
270
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),  3456,        6,     0,    1), TestCase::QUICK);
271
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),  3461,     3461,     0,    1));
271
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),  3461,     3461,     0,    1), TestCase::QUICK);
272
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     9,     3489,     0,    1));
272
  AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     9,     3489,     0,    1), TestCase::QUICK);
273
273
274
  
274
  
275
275
 Lines 285-313    Link Here 
285
  // ------------------------------------classifier---direction--------------src address---------------dst address---src port--dst port--ToS--TFT id
285
  // ------------------------------------classifier---direction--------------src address---------------dst address---src port--dst port--ToS--TFT id
286
286
287
  // test IP addresses
287
  // test IP addresses
288
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK,   Ipv4Address ("2.2.3.4"), Ipv4Address ("1.1.1.1"),     4,     1234,     0,    2));
288
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK,   Ipv4Address ("2.2.3.4"), Ipv4Address ("1.1.1.1"),     4,     1234,     0,    2), TestCase::QUICK);
289
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK,   Ipv4Address ("2.2.3.4"), Ipv4Address ("1.0.0.0"),     2,      123,     5,    2));
289
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK,   Ipv4Address ("2.2.3.4"), Ipv4Address ("1.0.0.0"),     2,      123,     5,    2), TestCase::QUICK);
290
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK,   Ipv4Address ("6.2.3.4"), Ipv4Address ("1.1.1.1"),     4,     1234,     0,    1));
290
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK,   Ipv4Address ("6.2.3.4"), Ipv4Address ("1.1.1.1"),     4,     1234,     0,    1), TestCase::QUICK);
291
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::DOWNLINK, Ipv4Address ("3.3.3.4"), Ipv4Address ("4.4.4.1"),     4,     1234,     0,    2));
291
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::DOWNLINK, Ipv4Address ("3.3.3.4"), Ipv4Address ("4.4.4.1"),     4,     1234,     0,    2), TestCase::QUICK);
292
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::DOWNLINK, Ipv4Address ("3.3.4.4"), Ipv4Address ("4.4.4.1"),     4,     1234,     0,    1));
292
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::DOWNLINK, Ipv4Address ("3.3.4.4"), Ipv4Address ("4.4.4.1"),     4,     1234,     0,    1), TestCase::QUICK);
293
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK,   Ipv4Address ("3.3.3.4"), Ipv4Address ("4.4.2.1"),     4,     1234,     0,    1));
293
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK,   Ipv4Address ("3.3.3.4"), Ipv4Address ("4.4.2.1"),     4,     1234,     0,    1), TestCase::QUICK);
294
294
295
  // test remote port
295
  // test remote port
296
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1024,     0,    3));
296
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1024,     0,    3), TestCase::QUICK);
297
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1025,     0,    3));
297
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1025,     0,    3), TestCase::QUICK);
298
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1035,     0,    3));
298
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1035,     0,    3), TestCase::QUICK);
299
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1234,     0,    1));
299
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1234,     0,    1), TestCase::QUICK);
300
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1024,     0,    1));
300
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1024,     0,    1), TestCase::QUICK);
301
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1025,     0,    1));
301
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1025,     0,    1), TestCase::QUICK);
302
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1035,     0,    1));
302
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     1035,     0,    1), TestCase::QUICK);
303
303
304
  // test local port
304
  // test local port
305
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     3456,     0,    1));
305
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     3456,     0,    1), TestCase::QUICK);
306
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     3457,     0,    1));
306
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     3457,     0,    1), TestCase::QUICK);
307
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     3489,     0,    1));
307
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     4,     3489,     0,    1), TestCase::QUICK);
308
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),  3456,        6,     0,    3));
308
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),  3456,        6,     0,    3), TestCase::QUICK);
309
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),  3461,     3461,     0,    3));
309
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),  3461,     3461,     0,    3), TestCase::QUICK);
310
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     9,     3489,     0,    3));
310
  AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     9,     3489,     0,    3), TestCase::QUICK);
311
311
312
312
313
313
 Lines 322-332    Link Here 
322
  Ptr<EpcTft> tft4_2 = Create<EpcTft> ();
322
  Ptr<EpcTft> tft4_2 = Create<EpcTft> ();
323
  tft4_2->Add (pf1_2_4);
323
  tft4_2->Add (pf1_2_4);
324
  c4->Add (tft4_2, 2);
324
  c4->Add (tft4_2, 2);
325
  AddTestCase (new EpcTftClassifierTestCase (c4, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     9,     3489,     0,    0));
325
  AddTestCase (new EpcTftClassifierTestCase (c4, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     9,     3489,     0,    0), TestCase::QUICK);
326
  AddTestCase (new EpcTftClassifierTestCase (c4, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     9,     7895,     0,    1));
326
  AddTestCase (new EpcTftClassifierTestCase (c4, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     9,     7895,     0,    1), TestCase::QUICK);
327
  AddTestCase (new EpcTftClassifierTestCase (c4, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),  7895,       10,     0,    1));
327
  AddTestCase (new EpcTftClassifierTestCase (c4, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),  7895,       10,     0,    1), TestCase::QUICK);
328
  AddTestCase (new EpcTftClassifierTestCase (c4, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     9,     5897,     0,    2));
328
  AddTestCase (new EpcTftClassifierTestCase (c4, EpcTft::UPLINK,   Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),     9,     5897,     0,    2), TestCase::QUICK);
329
  AddTestCase (new EpcTftClassifierTestCase (c4, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),  5897,       10,     0,    2));
329
  AddTestCase (new EpcTftClassifierTestCase (c4, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"),  5897,       10,     0,    2), TestCase::QUICK);
330
330
331
}
331
}
332
332
(-)a/src/lte/test/test-lte-antenna.cc (-25 / +25 lines)
 Lines 195-226    Link Here 
195
  NS_LOG_FUNCTION (this);
195
  NS_LOG_FUNCTION (this);
196
196
197
  //                                      orientation beamwidth     x            y         gain 
197
  //                                      orientation beamwidth     x            y         gain 
198
  AddTestCase (new LteEnbAntennaTestCase (       0.0,     90.0,    1.0,          0.0,       0.0));
198
  AddTestCase (new LteEnbAntennaTestCase (       0.0,     90.0,    1.0,          0.0,       0.0), TestCase::QUICK);
199
  AddTestCase (new LteEnbAntennaTestCase (       0.0,     90.0,    1.0,          1.0,      -3.0));
199
  AddTestCase (new LteEnbAntennaTestCase (       0.0,     90.0,    1.0,          1.0,      -3.0), TestCase::QUICK);
200
  AddTestCase (new LteEnbAntennaTestCase (       0.0,     90.0,    1.0,         -1.0,      -3.0));
200
  AddTestCase (new LteEnbAntennaTestCase (       0.0,     90.0,    1.0,         -1.0,      -3.0), TestCase::QUICK);
201
  AddTestCase (new LteEnbAntennaTestCase (       0.0,     90.0,   -1.0,         -1.0,   -36.396));
201
  AddTestCase (new LteEnbAntennaTestCase (       0.0,     90.0,   -1.0,         -1.0,   -36.396), TestCase::QUICK);
202
  AddTestCase (new LteEnbAntennaTestCase (       0.0,     90.0,   -1.0,         -0.0,   -1414.6));
202
  AddTestCase (new LteEnbAntennaTestCase (       0.0,     90.0,   -1.0,         -0.0,   -1414.6), TestCase::QUICK);
203
  AddTestCase (new LteEnbAntennaTestCase (       0.0,     90.0,   -1.0,          1.0,   -36.396));
203
  AddTestCase (new LteEnbAntennaTestCase (       0.0,     90.0,   -1.0,          1.0,   -36.396), TestCase::QUICK);
204
  AddTestCase (new LteEnbAntennaTestCase (      45.0,     90.0,    1.0,          1.0,       0.0));
204
  AddTestCase (new LteEnbAntennaTestCase (      45.0,     90.0,    1.0,          1.0,       0.0), TestCase::QUICK);
205
  AddTestCase (new LteEnbAntennaTestCase (     -45.0,     90.0,    1.0,         -1.0,       0.0));
205
  AddTestCase (new LteEnbAntennaTestCase (     -45.0,     90.0,    1.0,         -1.0,       0.0), TestCase::QUICK);
206
  AddTestCase (new LteEnbAntennaTestCase (      90.0,     90.0,    1.0,          1.0,      -3.0));
206
  AddTestCase (new LteEnbAntennaTestCase (      90.0,     90.0,    1.0,          1.0,      -3.0), TestCase::QUICK);
207
  AddTestCase (new LteEnbAntennaTestCase (     -90.0,     90.0,    1.0,         -1.0,      -3.0)); 
207
  AddTestCase (new LteEnbAntennaTestCase (     -90.0,     90.0,    1.0,         -1.0,      -3.0), TestCase::QUICK); 
208
208
209
  AddTestCase (new LteEnbAntennaTestCase (       0.0,    120.0,    1.0,          0.0,       0.0));
209
  AddTestCase (new LteEnbAntennaTestCase (       0.0,    120.0,    1.0,          0.0,       0.0), TestCase::QUICK);
210
  AddTestCase (new LteEnbAntennaTestCase (       0.0,    120.0,    0.5,  sin(M_PI/3),      -3.0));
210
  AddTestCase (new LteEnbAntennaTestCase (       0.0,    120.0,    0.5,  sin(M_PI/3),      -3.0), TestCase::QUICK);
211
  AddTestCase (new LteEnbAntennaTestCase (       0.0,    120.0,    0.5, -sin(M_PI/3),      -3.0));
211
  AddTestCase (new LteEnbAntennaTestCase (       0.0,    120.0,    0.5, -sin(M_PI/3),      -3.0), TestCase::QUICK);
212
  AddTestCase (new LteEnbAntennaTestCase (       0.0,    120.0,   -1.0,         -2.0,   -13.410));
212
  AddTestCase (new LteEnbAntennaTestCase (       0.0,    120.0,   -1.0,         -2.0,   -13.410), TestCase::QUICK);
213
  AddTestCase (new LteEnbAntennaTestCase (       0.0,    120.0,   -1.0,          1.0,   -20.034));
213
  AddTestCase (new LteEnbAntennaTestCase (       0.0,    120.0,   -1.0,          1.0,   -20.034), TestCase::QUICK);
214
  AddTestCase (new LteEnbAntennaTestCase (      60.0,    120.0,    0.5,  sin(M_PI/3),       0.0));
214
  AddTestCase (new LteEnbAntennaTestCase (      60.0,    120.0,    0.5,  sin(M_PI/3),       0.0), TestCase::QUICK);
215
  AddTestCase (new LteEnbAntennaTestCase (     -60.0,    120.0,    0.5, -sin(M_PI/3),       0.0));
215
  AddTestCase (new LteEnbAntennaTestCase (     -60.0,    120.0,    0.5, -sin(M_PI/3),       0.0), TestCase::QUICK);
216
  AddTestCase (new LteEnbAntennaTestCase (     -60.0,    120.0,    0.5, -sin(M_PI/3),       0.0));
216
  AddTestCase (new LteEnbAntennaTestCase (     -60.0,    120.0,    0.5, -sin(M_PI/3),       0.0), TestCase::QUICK);
217
  AddTestCase (new LteEnbAntennaTestCase (    -120.0,    120.0,   -0.5, -sin(M_PI/3),       0.0));
217
  AddTestCase (new LteEnbAntennaTestCase (    -120.0,    120.0,   -0.5, -sin(M_PI/3),       0.0), TestCase::QUICK);
218
  AddTestCase (new LteEnbAntennaTestCase (    -120.0,    120.0,    0.5, -sin(M_PI/3),      -3.0));
218
  AddTestCase (new LteEnbAntennaTestCase (    -120.0,    120.0,    0.5, -sin(M_PI/3),      -3.0), TestCase::QUICK);
219
  AddTestCase (new LteEnbAntennaTestCase (    -120.0,    120.0,     -1,            0,      -3.0));
219
  AddTestCase (new LteEnbAntennaTestCase (    -120.0,    120.0,     -1,            0,      -3.0), TestCase::QUICK);
220
  AddTestCase (new LteEnbAntennaTestCase (    -120.0,    120.0,     -1,            2,   -15.578));
220
  AddTestCase (new LteEnbAntennaTestCase (    -120.0,    120.0,     -1,            2,   -15.578), TestCase::QUICK);
221
  AddTestCase (new LteEnbAntennaTestCase (    -120.0,    120.0,      1,            0,   -14.457));
221
  AddTestCase (new LteEnbAntennaTestCase (    -120.0,    120.0,      1,            0,   -14.457), TestCase::QUICK);
222
  AddTestCase (new LteEnbAntennaTestCase (    -120.0,    120.0,      1,            2,   -73.154));
222
  AddTestCase (new LteEnbAntennaTestCase (    -120.0,    120.0,      1,            2,   -73.154), TestCase::QUICK);
223
  AddTestCase (new LteEnbAntennaTestCase (    -120.0,    120.0,      1,         -0.1,   -12.754));
223
  AddTestCase (new LteEnbAntennaTestCase (    -120.0,    120.0,      1,         -0.1,   -12.754), TestCase::QUICK);
224
224
225
225
226
}
226
}
(-)a/src/lte/test/test-lte-epc-e2e-data.cc (-9 / +9 lines)
 Lines 335-341    Link Here 
335
  u1.bearers.push_back (f1);
335
  u1.bearers.push_back (f1);
336
  e1.ues.push_back (u1);
336
  e1.ues.push_back (u1);
337
  v1.push_back (e1);
337
  v1.push_back (e1);
338
  AddTestCase (new LteEpcE2eDataTestCase ("1 eNB, 1UE", v1));
338
  AddTestCase (new LteEpcE2eDataTestCase ("1 eNB, 1UE", v1), TestCase::QUICK);
339
339
340
  std::vector<EnbTestData> v2;  
340
  std::vector<EnbTestData> v2;  
341
  EnbTestData e2;
341
  EnbTestData e2;
 Lines 348-359    Link Here 
348
  u2_2.bearers.push_back (f2_2);
348
  u2_2.bearers.push_back (f2_2);
349
  e2.ues.push_back (u2_2);
349
  e2.ues.push_back (u2_2);
350
  v2.push_back (e2);
350
  v2.push_back (e2);
351
  AddTestCase (new LteEpcE2eDataTestCase ("1 eNB, 2UEs", v2));
351
  AddTestCase (new LteEpcE2eDataTestCase ("1 eNB, 2UEs", v2), TestCase::QUICK);
352
352
353
  std::vector<EnbTestData> v3;  
353
  std::vector<EnbTestData> v3;  
354
  v3.push_back (e1);
354
  v3.push_back (e1);
355
  v3.push_back (e2);
355
  v3.push_back (e2);
356
  AddTestCase (new LteEpcE2eDataTestCase ("2 eNBs", v3));
356
  AddTestCase (new LteEpcE2eDataTestCase ("2 eNBs", v3), TestCase::QUICK);
357
357
358
  EnbTestData e4;
358
  EnbTestData e4;
359
  UeTestData u4_1;
359
  UeTestData u4_1;
 Lines 372-378    Link Here 
372
  v4.push_back (e4);
372
  v4.push_back (e4);
373
  v4.push_back (e1);
373
  v4.push_back (e1);
374
  v4.push_back (e2);
374
  v4.push_back (e2);
375
  AddTestCase (new LteEpcE2eDataTestCase ("3 eNBs", v4));
375
  AddTestCase (new LteEpcE2eDataTestCase ("3 eNBs", v4), TestCase::QUICK);
376
376
377
  EnbTestData e5;
377
  EnbTestData e5;
378
  UeTestData u5;
378
  UeTestData u5;
 Lines 381-387    Link Here 
381
  e5.ues.push_back (u5);
381
  e5.ues.push_back (u5);
382
  std::vector<EnbTestData> v5;
382
  std::vector<EnbTestData> v5;
383
  v5.push_back (e5);
383
  v5.push_back (e5);
384
  AddTestCase (new LteEpcE2eDataTestCase ("1 eNB, 1UE with 1000 byte packets", v5));
384
  AddTestCase (new LteEpcE2eDataTestCase ("1 eNB, 1UE with 1000 byte packets", v5), TestCase::QUICK);
385
385
386
386
387
  EnbTestData e6;
387
  EnbTestData e6;
 Lines 391-397    Link Here 
391
  e6.ues.push_back (u6);
391
  e6.ues.push_back (u6);
392
  std::vector<EnbTestData> v6;
392
  std::vector<EnbTestData> v6;
393
  v6.push_back (e6);
393
  v6.push_back (e6);
394
  AddTestCase (new LteEpcE2eDataTestCase ("1 eNB, 1UE with 1400 byte packets", v6));
394
  AddTestCase (new LteEpcE2eDataTestCase ("1 eNB, 1UE with 1400 byte packets", v6), TestCase::QUICK);
395
395
396
  EnbTestData e7;
396
  EnbTestData e7;
397
  UeTestData u7;
397
  UeTestData u7;
 Lines 402-408    Link Here 
402
  e7.ues.push_back (u7);
402
  e7.ues.push_back (u7);
403
  std::vector<EnbTestData> v7;
403
  std::vector<EnbTestData> v7;
404
  v7.push_back (e7);
404
  v7.push_back (e7);
405
  AddTestCase (new LteEpcE2eDataTestCase ("1 eNB, 1UE with 2 bearers", v7));
405
  AddTestCase (new LteEpcE2eDataTestCase ("1 eNB, 1UE with 2 bearers", v7), TestCase::QUICK);
406
406
407
  EnbTestData e8;
407
  EnbTestData e8;
408
  UeTestData u8;
408
  UeTestData u8;
 Lines 411-417    Link Here 
411
  e8.ues.push_back (u8);
411
  e8.ues.push_back (u8);
412
  std::vector<EnbTestData> v8;
412
  std::vector<EnbTestData> v8;
413
  v8.push_back (e8);
413
  v8.push_back (e8);
414
  AddTestCase (new LteEpcE2eDataTestCase ("1 eNB, 1UE with fragmentation", v8));
414
  AddTestCase (new LteEpcE2eDataTestCase ("1 eNB, 1UE with fragmentation", v8), TestCase::QUICK);
415
415
416
416
417
  EnbTestData e9;
417
  EnbTestData e9;
 Lines 421-427    Link Here 
421
  e9.ues.push_back (u9);
421
  e9.ues.push_back (u9);
422
  std::vector<EnbTestData> v9;
422
  std::vector<EnbTestData> v9;
423
  v9.push_back (e9);
423
  v9.push_back (e9);
424
  AddTestCase (new LteEpcE2eDataTestCase ("1 eNB, 1UE with aggregation", v9));
424
  AddTestCase (new LteEpcE2eDataTestCase ("1 eNB, 1UE with aggregation", v9), TestCase::QUICK);
425
425
426
426
427
}
427
}
(-)a/src/mesh/test/dot11s/dot11s-test-suite.cc (-3 / +3 lines)
 Lines 279-287    Link Here 
279
Dot11sTestSuite::Dot11sTestSuite ()
279
Dot11sTestSuite::Dot11sTestSuite ()
280
  : TestSuite ("devices-mesh-dot11s", UNIT)
280
  : TestSuite ("devices-mesh-dot11s", UNIT)
281
{
281
{
282
  AddTestCase (new MeshHeaderTest);
282
  AddTestCase (new MeshHeaderTest, TestCase::QUICK);
283
  AddTestCase (new HwmpRtableTest);
283
  AddTestCase (new HwmpRtableTest, TestCase::QUICK);
284
  AddTestCase (new PeerLinkFrameStartTest);
284
  AddTestCase (new PeerLinkFrameStartTest, TestCase::QUICK);
285
}
285
}
286
286
287
static Dot11sTestSuite g_dot11sTestSuite;
287
static Dot11sTestSuite g_dot11sTestSuite;
(-)a/src/mesh/test/dot11s/regression.cc (-5 / +5 lines)
 Lines 34-43    Link Here 
34
    // We do not use NS_TEST_SOURCEDIR variable here since mesh/test has 
34
    // We do not use NS_TEST_SOURCEDIR variable here since mesh/test has 
35
    // subdirectories
35
    // subdirectories
36
    SetDataDir (std::string ("src/mesh/test/dot11s"));
36
    SetDataDir (std::string ("src/mesh/test/dot11s"));
37
    AddTestCase (new PeerManagementProtocolRegressionTest);
37
    AddTestCase (new PeerManagementProtocolRegressionTest, TestCase::QUICK);
38
    AddTestCase (new HwmpSimplestRegressionTest);
38
    AddTestCase (new HwmpSimplestRegressionTest, TestCase::QUICK);
39
    AddTestCase (new HwmpReactiveRegressionTest);
39
    AddTestCase (new HwmpReactiveRegressionTest, TestCase::QUICK);
40
    AddTestCase (new HwmpProactiveRegressionTest);
40
    AddTestCase (new HwmpProactiveRegressionTest, TestCase::QUICK);
41
    AddTestCase (new HwmpDoRfRegressionTest);
41
    AddTestCase (new HwmpDoRfRegressionTest, TestCase::QUICK);
42
  }
42
  }
43
} g_dot11sRegressionSuite;
43
} g_dot11sRegressionSuite;
(-)a/src/mesh/test/flame/flame-test-suite.cc (-2 / +2 lines)
 Lines 145-152    Link Here 
145
FlameTestSuite::FlameTestSuite ()
145
FlameTestSuite::FlameTestSuite ()
146
  : TestSuite ("devices-mesh-flame", UNIT)
146
  : TestSuite ("devices-mesh-flame", UNIT)
147
{
147
{
148
  AddTestCase (new FlameHeaderTest);
148
  AddTestCase (new FlameHeaderTest, TestCase::QUICK);
149
  AddTestCase (new FlameRtableTest);
149
  AddTestCase (new FlameRtableTest, TestCase::QUICK);
150
}
150
}
151
151
152
static FlameTestSuite g_flameTestSuite;
152
static FlameTestSuite g_flameTestSuite;
(-)a/src/mesh/test/flame/regression.cc (-1 / +1 lines)
 Lines 30-35    Link Here 
30
    // We do not use NS_TEST_SOURCEDIR variable here since mesh/test has 
30
    // We do not use NS_TEST_SOURCEDIR variable here since mesh/test has 
31
    // subdirectories
31
    // subdirectories
32
    SetDataDir (std::string ("src/mesh/test/flame"));
32
    SetDataDir (std::string ("src/mesh/test/flame"));
33
    AddTestCase (new FlameRegressionTest);
33
    AddTestCase (new FlameRegressionTest, TestCase::QUICK);
34
  }
34
  }
35
} g_flameRegressionSuite;
35
} g_flameRegressionSuite;
(-)a/src/mesh/test/mesh-information-element-vector-test-suite.cc (-1 / +1 lines)
 Lines 151-157    Link Here 
151
MeshTestSuite::MeshTestSuite ()
151
MeshTestSuite::MeshTestSuite ()
152
  : TestSuite ("devices-mesh", UNIT)
152
  : TestSuite ("devices-mesh", UNIT)
153
{
153
{
154
  AddTestCase (new MeshInformationElementVectorBist);
154
  AddTestCase (new MeshInformationElementVectorBist, TestCase::QUICK);
155
}
155
}
156
156
157
static MeshTestSuite g_meshTestSuite;
157
static MeshTestSuite g_meshTestSuite;
(-)a/src/mobility/test/mobility-trace-test-suite.cc (-1 / +1 lines)
 Lines 123-129    Link Here 
123
MobilityTraceTestSuite::MobilityTraceTestSuite ()
123
MobilityTraceTestSuite::MobilityTraceTestSuite ()
124
  : TestSuite ("mobility-trace", UNIT)
124
  : TestSuite ("mobility-trace", UNIT)
125
{
125
{
126
  AddTestCase (new MobilityTraceTestCase);
126
  AddTestCase (new MobilityTraceTestCase, TestCase::QUICK);
127
}
127
}
128
128
129
static MobilityTraceTestSuite mobilityTraceTestSuite;
129
static MobilityTraceTestSuite mobilityTraceTestSuite;
(-)a/src/mobility/test/ns2-mobility-helper-test-suite.cc (-16 / +16 lines)
 Lines 273-279    Link Here 
273
                 "$node_(0) set Z_ 3.0\n"
273
                 "$node_(0) set Z_ 3.0\n"
274
                 );
274
                 );
275
    t->AddReferencePoint ("0", 0, Vector (1, 2, 3), Vector (0, 0, 0));
275
    t->AddReferencePoint ("0", 0, Vector (1, 2, 3), Vector (0, 0, 0));
276
    AddTestCase (t);
276
    AddTestCase (t, TestCase::QUICK);
277
277
278
    // Check parsing comments, empty lines and no EOF at the end of file
278
    // Check parsing comments, empty lines and no EOF at the end of file
279
    t = new Ns2MobilityHelperTest ("comments", Seconds (1));
279
    t = new Ns2MobilityHelperTest ("comments", Seconds (1));
 Lines 285-291    Link Here 
285
                 "#$node_(0) set Z_ 100 #"
285
                 "#$node_(0) set Z_ 100 #"
286
                 );
286
                 );
287
    t->AddReferencePoint ("0", 0, Vector (1, 2, 3), Vector (0, 0, 0));
287
    t->AddReferencePoint ("0", 0, Vector (1, 2, 3), Vector (0, 0, 0));
288
    AddTestCase (t);
288
    AddTestCase (t, TestCase::QUICK);
289
289
290
    // Simple setdest. Arguments are interpreted as x, y, speed by default
290
    // Simple setdest. Arguments are interpreted as x, y, speed by default
291
    t = new Ns2MobilityHelperTest ("simple setdest", Seconds (10));
291
    t = new Ns2MobilityHelperTest ("simple setdest", Seconds (10));
 Lines 294-300    Link Here 
294
    t->AddReferencePoint ("0", 0, Vector (0, 0, 0), Vector (0, 0, 0));
294
    t->AddReferencePoint ("0", 0, Vector (0, 0, 0), Vector (0, 0, 0));
295
    t->AddReferencePoint ("0", 1, Vector (0, 0, 0), Vector (5, 0, 0));
295
    t->AddReferencePoint ("0", 1, Vector (0, 0, 0), Vector (5, 0, 0));
296
    t->AddReferencePoint ("0", 6, Vector (25, 0, 0), Vector (0, 0, 0));
296
    t->AddReferencePoint ("0", 6, Vector (25, 0, 0), Vector (0, 0, 0));
297
    AddTestCase (t);
297
    AddTestCase (t, TestCase::QUICK);
298
298
299
    // Several set and setdest. Arguments are interpreted as x, y, speed by default
299
    // Several set and setdest. Arguments are interpreted as x, y, speed by default
300
    t = new Ns2MobilityHelperTest ("square setdest", Seconds (6));
300
    t = new Ns2MobilityHelperTest ("square setdest", Seconds (6));
 Lines 315-321    Link Here 
315
    t->AddReferencePoint ("0", 4, Vector (0, 5, 0), Vector (0, 0, 0));
315
    t->AddReferencePoint ("0", 4, Vector (0, 5, 0), Vector (0, 0, 0));
316
    t->AddReferencePoint ("0", 4, Vector (0, 5, 0), Vector (0, -5, 0));
316
    t->AddReferencePoint ("0", 4, Vector (0, 5, 0), Vector (0, -5, 0));
317
    t->AddReferencePoint ("0", 5, Vector (0, 0, 0), Vector (0,  0, 0));
317
    t->AddReferencePoint ("0", 5, Vector (0, 0, 0), Vector (0,  0, 0));
318
    AddTestCase (t);
318
    AddTestCase (t, TestCase::QUICK);
319
319
320
    // Copy of previous test case but with the initial positions at
320
    // Copy of previous test case but with the initial positions at
321
    // the end of the trace rather than at the beginning.
321
    // the end of the trace rather than at the beginning.
 Lines 339-345    Link Here 
339
    t->AddReferencePoint ("0", 4, Vector (10, 15, 0), Vector (0, 0, 0));
339
    t->AddReferencePoint ("0", 4, Vector (10, 15, 0), Vector (0, 0, 0));
340
    t->AddReferencePoint ("0", 4, Vector (10, 15, 0), Vector (0, -5, 0));
340
    t->AddReferencePoint ("0", 4, Vector (10, 15, 0), Vector (0, -5, 0));
341
    t->AddReferencePoint ("0", 5, Vector (10, 10, 0), Vector (0,  0, 0));
341
    t->AddReferencePoint ("0", 5, Vector (10, 10, 0), Vector (0,  0, 0));
342
    AddTestCase (t);
342
    AddTestCase (t, TestCase::QUICK);
343
343
344
    // Scheduled set position
344
    // Scheduled set position
345
    t = new Ns2MobilityHelperTest ("scheduled set position", Seconds (2));
345
    t = new Ns2MobilityHelperTest ("scheduled set position", Seconds (2));
 Lines 350-356    Link Here 
350
    t->AddReferencePoint ("0", 1, Vector (10, 0, 0), Vector (0, 0, 0));
350
    t->AddReferencePoint ("0", 1, Vector (10, 0, 0), Vector (0, 0, 0));
351
    t->AddReferencePoint ("0", 1, Vector (10, 0, 10), Vector (0, 0, 0));
351
    t->AddReferencePoint ("0", 1, Vector (10, 0, 10), Vector (0, 0, 0));
352
    t->AddReferencePoint ("0", 1, Vector (10, 10, 10), Vector (0, 0, 0));
352
    t->AddReferencePoint ("0", 1, Vector (10, 10, 10), Vector (0, 0, 0));
353
    AddTestCase (t);
353
    AddTestCase (t, TestCase::QUICK);
354
354
355
    // Malformed lines
355
    // Malformed lines
356
    t = new Ns2MobilityHelperTest ("malformed lines", Seconds (2));
356
    t = new Ns2MobilityHelperTest ("malformed lines", Seconds (2));
 Lines 366-372    Link Here 
366
    t->AddReferencePoint ("0", 0, Vector (1, 2, 3), Vector (0, 0, 0));
366
    t->AddReferencePoint ("0", 0, Vector (1, 2, 3), Vector (0, 0, 0));
367
    t->AddReferencePoint ("0", 1, Vector (1, 2, 3), Vector (1, 0, 0));
367
    t->AddReferencePoint ("0", 1, Vector (1, 2, 3), Vector (1, 0, 0));
368
    t->AddReferencePoint ("0", 2, Vector (2, 2, 3), Vector (0, 0, 0));
368
    t->AddReferencePoint ("0", 2, Vector (2, 2, 3), Vector (0, 0, 0));
369
    AddTestCase (t);
369
    AddTestCase (t, TestCase::QUICK);
370
370
371
    // Non possible values
371
    // Non possible values
372
    t = new Ns2MobilityHelperTest ("non possible values", Seconds (2));
372
    t = new Ns2MobilityHelperTest ("non possible values", Seconds (2));
 Lines 386-392    Link Here 
386
    t->AddReferencePoint ("0", 0, Vector (1, 2, 3), Vector (0, 0, 0));
386
    t->AddReferencePoint ("0", 0, Vector (1, 2, 3), Vector (0, 0, 0));
387
    t->AddReferencePoint ("0", 1, Vector (1, 2, 3), Vector (1, 0, 0));
387
    t->AddReferencePoint ("0", 1, Vector (1, 2, 3), Vector (1, 0, 0));
388
    t->AddReferencePoint ("0", 2, Vector (2, 2, 3), Vector (0, 0, 0));
388
    t->AddReferencePoint ("0", 2, Vector (2, 2, 3), Vector (0, 0, 0));
389
    AddTestCase (t);
389
    AddTestCase (t, TestCase::QUICK);
390
390
391
    // More than one node
391
    // More than one node
392
    t = new Ns2MobilityHelperTest ("few nodes, combinations of set and setdest", Seconds (10), 3);
392
    t = new Ns2MobilityHelperTest ("few nodes, combinations of set and setdest", Seconds (10), 3);
 Lines 414-420    Link Here 
414
    t->AddReferencePoint ("2", 4, Vector (0, 5, 0), Vector (0, 0, 0));
414
    t->AddReferencePoint ("2", 4, Vector (0, 5, 0), Vector (0, 0, 0));
415
    t->AddReferencePoint ("2", 4, Vector (0, 5, 0), Vector (0, -5, 0));
415
    t->AddReferencePoint ("2", 4, Vector (0, 5, 0), Vector (0, -5, 0));
416
    t->AddReferencePoint ("2", 5, Vector (0, 0, 0), Vector (0,  0, 0));
416
    t->AddReferencePoint ("2", 5, Vector (0, 0, 0), Vector (0,  0, 0));
417
    AddTestCase (t);
417
    AddTestCase (t, TestCase::QUICK);
418
418
419
    // Test for Speed == 0, that acts as stop the node.
419
    // Test for Speed == 0, that acts as stop the node.
420
    t = new Ns2MobilityHelperTest ("setdest with speed cero", Seconds (10));
420
    t = new Ns2MobilityHelperTest ("setdest with speed cero", Seconds (10));
 Lines 425-431    Link Here 
425
    t->AddReferencePoint ("0", 1, Vector (0, 0, 0), Vector (5, 0, 0));
425
    t->AddReferencePoint ("0", 1, Vector (0, 0, 0), Vector (5, 0, 0));
426
    t->AddReferencePoint ("0", 6, Vector (25, 0, 0), Vector (0, 0, 0));
426
    t->AddReferencePoint ("0", 6, Vector (25, 0, 0), Vector (0, 0, 0));
427
    t->AddReferencePoint ("0", 7, Vector (25, 0, 0), Vector (0, 0, 0));
427
    t->AddReferencePoint ("0", 7, Vector (25, 0, 0), Vector (0, 0, 0));
428
    AddTestCase (t);
428
    AddTestCase (t, TestCase::QUICK);
429
429
430
430
431
    // Test negative positions
431
    // Test negative positions
 Lines 440-446    Link Here 
440
    t->AddReferencePoint ("0", 2, Vector (0, 0, 0), Vector (0, 0, 0));
440
    t->AddReferencePoint ("0", 2, Vector (0, 0, 0), Vector (0, 0, 0));
441
    t->AddReferencePoint ("0", 2, Vector (0, 0, 0), Vector (0, -1, 0));
441
    t->AddReferencePoint ("0", 2, Vector (0, 0, 0), Vector (0, -1, 0));
442
    t->AddReferencePoint ("0", 3, Vector (0, -1, 0), Vector (0, 0, 0));
442
    t->AddReferencePoint ("0", 3, Vector (0, -1, 0), Vector (0, 0, 0));
443
    AddTestCase (t);
443
    AddTestCase (t, TestCase::QUICK);
444
444
445
    // Sqare setdest with values in the form 1.0e+2
445
    // Sqare setdest with values in the form 1.0e+2
446
    t = new Ns2MobilityHelperTest ("Foalt numbers in 1.0e+2 format", Seconds (6));
446
    t = new Ns2MobilityHelperTest ("Foalt numbers in 1.0e+2 format", Seconds (6));
 Lines 460-466    Link Here 
460
    t->AddReferencePoint ("0", 4, Vector (0, 100, 0), Vector (0, 0, 0));
460
    t->AddReferencePoint ("0", 4, Vector (0, 100, 0), Vector (0, 0, 0));
461
    t->AddReferencePoint ("0", 4, Vector (0, 100, 0), Vector (0, -100, 0));
461
    t->AddReferencePoint ("0", 4, Vector (0, 100, 0), Vector (0, -100, 0));
462
    t->AddReferencePoint ("0", 5, Vector (0, 0, 0), Vector (0,  0, 0));
462
    t->AddReferencePoint ("0", 5, Vector (0, 0, 0), Vector (0,  0, 0));
463
    AddTestCase (t);
463
    AddTestCase (t, TestCase::QUICK);
464
    t = new Ns2MobilityHelperTest ("Bug 1219 testcase", Seconds (16));
464
    t = new Ns2MobilityHelperTest ("Bug 1219 testcase", Seconds (16));
465
    t->SetTrace ("$node_(0) set X_ 0.0\n"
465
    t->SetTrace ("$node_(0) set X_ 0.0\n"
466
                 "$node_(0) set Y_ 0.0\n"
466
                 "$node_(0) set Y_ 0.0\n"
 Lines 472-485    Link Here 
472
    t->AddReferencePoint ("0", 1, Vector (0, 0, 0), Vector (0,  1, 0));
472
    t->AddReferencePoint ("0", 1, Vector (0, 0, 0), Vector (0,  1, 0));
473
    t->AddReferencePoint ("0", 6, Vector (0, 5, 0), Vector (0,  -1, 0));
473
    t->AddReferencePoint ("0", 6, Vector (0, 5, 0), Vector (0,  -1, 0));
474
    t->AddReferencePoint ("0", 16, Vector (0, -10, 0), Vector (0, 0, 0));
474
    t->AddReferencePoint ("0", 16, Vector (0, -10, 0), Vector (0, 0, 0));
475
    AddTestCase (t);
475
    AddTestCase (t, TestCase::QUICK);
476
    t = new Ns2MobilityHelperTest ("Bug 1059 testcase", Seconds (16));
476
    t = new Ns2MobilityHelperTest ("Bug 1059 testcase", Seconds (16));
477
    t->SetTrace ("$node_(0) set X_ 10.0\r\n"
477
    t->SetTrace ("$node_(0) set X_ 10.0\r\n"
478
                 "$node_(0) set Y_ 0.0\r\n"
478
                 "$node_(0) set Y_ 0.0\r\n"
479
                 );
479
                 );
480
    //                     id  t  position         velocity
480
    //                     id  t  position         velocity
481
    t->AddReferencePoint ("0", 0, Vector (10, 0, 0), Vector (0,  0, 0));
481
    t->AddReferencePoint ("0", 0, Vector (10, 0, 0), Vector (0,  0, 0));
482
    AddTestCase (t);
482
    AddTestCase (t, TestCase::QUICK);
483
    t = new Ns2MobilityHelperTest ("Bug 1301 testcase", Seconds (16));
483
    t = new Ns2MobilityHelperTest ("Bug 1301 testcase", Seconds (16));
484
    t->SetTrace ("$node_(0) set X_ 10.0\n"
484
    t->SetTrace ("$node_(0) set X_ 10.0\n"
485
                 "$node_(0) set Y_ 0.0\n"
485
                 "$node_(0) set Y_ 0.0\n"
 Lines 489-495    Link Here 
489
    // Moving to the current position must change nothing. No NaN
489
    // Moving to the current position must change nothing. No NaN
490
    // speed must be.
490
    // speed must be.
491
    t->AddReferencePoint ("0", 0, Vector (10, 0, 0), Vector (0,  0, 0));
491
    t->AddReferencePoint ("0", 0, Vector (10, 0, 0), Vector (0,  0, 0));
492
    AddTestCase (t);
492
    AddTestCase (t, TestCase::QUICK);
493
493
494
    t = new Ns2MobilityHelperTest ("Bug 1316 testcase", Seconds (1000));
494
    t = new Ns2MobilityHelperTest ("Bug 1316 testcase", Seconds (1000));
495
    t->SetTrace ("$node_(0) set X_ 350.00000000000000\n"
495
    t->SetTrace ("$node_(0) set X_ 350.00000000000000\n"
 Lines 513-519    Link Here 
513
    t->AddReferencePoint ("0", 600.000, Vector (250.000,  50.000, 0.000), Vector (0.000, 2.000, 0.000));
513
    t->AddReferencePoint ("0", 600.000, Vector (250.000,  50.000, 0.000), Vector (0.000, 2.000, 0.000));
514
    t->AddReferencePoint ("0", 900.000, Vector (250.000,  650.000, 0.000), Vector (2.500, 0.000, 0.000));
514
    t->AddReferencePoint ("0", 900.000, Vector (250.000,  650.000, 0.000), Vector (2.500, 0.000, 0.000));
515
    t->AddReferencePoint ("0", 920.000, Vector (300.000,  650.000, 0.000), Vector (0.000, 0.000, 0.000));
515
    t->AddReferencePoint ("0", 920.000, Vector (300.000,  650.000, 0.000), Vector (0.000, 0.000, 0.000));
516
    AddTestCase (t);
516
    AddTestCase (t, TestCase::QUICK);
517
517
518
  }
518
  }
519
} g_ns2TransmobilityHelperTestSuite;
519
} g_ns2TransmobilityHelperTestSuite;
(-)a/src/mobility/test/steady-state-random-waypoint-mobility-model-test.cc (-1 / +1 lines)
 Lines 141-147    Link Here 
141
{
141
{
142
  SteadyStateRandomWaypointTestSuite () : TestSuite ("steady-state-rwp-mobility-model", UNIT)
142
  SteadyStateRandomWaypointTestSuite () : TestSuite ("steady-state-rwp-mobility-model", UNIT)
143
  {
143
  {
144
    AddTestCase (new SteadyStateRandomWaypointTest);
144
    AddTestCase (new SteadyStateRandomWaypointTest, TestCase::QUICK);
145
  }
145
  }
146
} g_steadyStateRandomWaypointTestSuite;
146
} g_steadyStateRandomWaypointTestSuite;
147
147
(-)a/src/mobility/test/waypoint-mobility-model-test.cc (-2 / +2 lines)
 Lines 151-158    Link Here 
151
{
151
{
152
  WaypointMobilityModelTestSuite () : TestSuite ("waypoint-mobility-model", UNIT)
152
  WaypointMobilityModelTestSuite () : TestSuite ("waypoint-mobility-model", UNIT)
153
  {
153
  {
154
    AddTestCase (new WaypointMobilityModelNotifyTest (true));
154
    AddTestCase (new WaypointMobilityModelNotifyTest (true), TestCase::QUICK);
155
    AddTestCase (new WaypointMobilityModelNotifyTest (false));
155
    AddTestCase (new WaypointMobilityModelNotifyTest (false), TestCase::QUICK);
156
  }
156
  }
157
} g_waypointMobilityModelTestSuite;
157
} g_waypointMobilityModelTestSuite;
158
158
(-)a/src/netanim/test/netanim-test.cc (-1 / +1 lines)
 Lines 112-118    Link Here 
112
  AnimationInterfaceTestSuite () :
112
  AnimationInterfaceTestSuite () :
113
    TestSuite ("animation-interface", UNIT)
113
    TestSuite ("animation-interface", UNIT)
114
  {
114
  {
115
    AddTestCase (new AnimationInterfaceTestCase ());
115
    AddTestCase (new AnimationInterfaceTestCase (), TestCase::QUICK);
116
  }
116
  }
117
} g_animationInterfaceTestSuite;
117
} g_animationInterfaceTestSuite;
118
118
(-)a/src/network/test/buffer-test.cc (-1 / +1 lines)
 Lines 332-338    Link Here 
332
BufferTestSuite::BufferTestSuite ()
332
BufferTestSuite::BufferTestSuite ()
333
  : TestSuite ("buffer", UNIT)
333
  : TestSuite ("buffer", UNIT)
334
{
334
{
335
  AddTestCase (new BufferTest);
335
  AddTestCase (new BufferTest, TestCase::QUICK);
336
}
336
}
337
337
338
static BufferTestSuite g_bufferTestSuite;
338
static BufferTestSuite g_bufferTestSuite;
(-)a/src/network/test/drop-tail-queue-test-suite.cc (-1 / +1 lines)
 Lines 83-88    Link Here 
83
  DropTailQueueTestSuite ()
83
  DropTailQueueTestSuite ()
84
    : TestSuite ("drop-tail-queue", UNIT)
84
    : TestSuite ("drop-tail-queue", UNIT)
85
  {
85
  {
86
    AddTestCase (new DropTailQueueTestCase ());
86
    AddTestCase (new DropTailQueueTestCase (), TestCase::QUICK);
87
  }
87
  }
88
} g_dropTailQueueTestSuite;
88
} g_dropTailQueueTestSuite;
(-)a/src/network/test/error-model-test-suite.cc (-1 / +1 lines)
 Lines 129-135    Link Here 
129
ErrorModelTestSuite::ErrorModelTestSuite ()
129
ErrorModelTestSuite::ErrorModelTestSuite ()
130
  : TestSuite ("error-model", UNIT)
130
  : TestSuite ("error-model", UNIT)
131
{
131
{
132
  AddTestCase (new ErrorModelSimple);
132
  AddTestCase (new ErrorModelSimple, TestCase::QUICK);
133
}
133
}
134
134
135
// Do not forget to allocate an instance of this TestSuite
135
// Do not forget to allocate an instance of this TestSuite
(-)a/src/network/test/ipv6-address-test-suite.cc (-1 / +1 lines)
 Lines 100-106    Link Here 
100
Ipv6AddressTestSuite::Ipv6AddressTestSuite ()
100
Ipv6AddressTestSuite::Ipv6AddressTestSuite ()
101
  : TestSuite ("ipv6-address", UNIT)
101
  : TestSuite ("ipv6-address", UNIT)
102
{
102
{
103
  AddTestCase (new Ipv6AddressTestCase1);
103
  AddTestCase (new Ipv6AddressTestCase1, TestCase::QUICK);
104
}
104
}
105
105
106
static Ipv6AddressTestSuite ipv6AddressTestSuite;
106
static Ipv6AddressTestSuite ipv6AddressTestSuite;
(-)a/src/network/test/packet-metadata-test.cc (-1 / +1 lines)
 Lines 829-835    Link Here 
829
PacketMetadataTestSuite::PacketMetadataTestSuite ()
829
PacketMetadataTestSuite::PacketMetadataTestSuite ()
830
  : TestSuite ("packet-metadata", UNIT)
830
  : TestSuite ("packet-metadata", UNIT)
831
{
831
{
832
  AddTestCase (new PacketMetadataTest);
832
  AddTestCase (new PacketMetadataTest, TestCase::QUICK);
833
}
833
}
834
834
835
PacketMetadataTestSuite g_packetMetadataTest;
835
PacketMetadataTestSuite g_packetMetadataTest;
(-)a/src/network/test/packet-test-suite.cc (-1 / +1 lines)
 Lines 445-451    Link Here 
445
PacketTestSuite::PacketTestSuite ()
445
PacketTestSuite::PacketTestSuite ()
446
  : TestSuite ("packet", UNIT)
446
  : TestSuite ("packet", UNIT)
447
{
447
{
448
  AddTestCase (new PacketTest);
448
  AddTestCase (new PacketTest, TestCase::QUICK);
449
}
449
}
450
450
451
static PacketTestSuite g_packetTestSuite;
451
static PacketTestSuite g_packetTestSuite;
(-)a/src/network/test/packetbb-test-suite.cc (-37 / +37 lines)
 Lines 119-125    Link Here 
119
  {
119
  {
120
    Ptr<PbbPacket> packet = Create<PbbPacket> ();
120
    Ptr<PbbPacket> packet = Create<PbbPacket> ();
121
    uint8_t buffer[] = { 0x00};
121
    uint8_t buffer[] = { 0x00};
122
    AddTestCase (new PbbTestCase ("1", packet, buffer, sizeof(buffer)));
122
    AddTestCase (new PbbTestCase ("1", packet, buffer, sizeof(buffer)), TestCase::QUICK);
123
  }
123
  }
124
124
125
  /* Test 2
125
  /* Test 2
 Lines 135-141    Link Here 
135
    Ptr<PbbPacket> packet = Create<PbbPacket> ();
135
    Ptr<PbbPacket> packet = Create<PbbPacket> ();
136
    packet->SetSequenceNumber (2);
136
    packet->SetSequenceNumber (2);
137
    uint8_t buffer[] = { 0x08, 0x00, 0x02};
137
    uint8_t buffer[] = { 0x08, 0x00, 0x02};
138
    AddTestCase (new PbbTestCase ("2", packet, buffer, sizeof(buffer)));
138
    AddTestCase (new PbbTestCase ("2", packet, buffer, sizeof(buffer)), TestCase::QUICK);
139
  }
139
  }
140
140
141
  /* Test 3
141
  /* Test 3
 Lines 154-160    Link Here 
154
    Ptr<PbbPacket> packet = Create<PbbPacket> ();
154
    Ptr<PbbPacket> packet = Create<PbbPacket> ();
155
    packet->SetSequenceNumber (3);
155
    packet->SetSequenceNumber (3);
156
    uint8_t buffer[] = { 0x0c, 0x00, 0x03, 0x00, 0x00};
156
    uint8_t buffer[] = { 0x0c, 0x00, 0x03, 0x00, 0x00};
157
    AddTestCase (new PbbTestCase ("3", packet, buffer, sizeof(buffer)));
157
    AddTestCase (new PbbTestCase ("3", packet, buffer, sizeof(buffer)), TestCase::QUICK);
158
  }
158
  }
159
#endif
159
#endif
160
160
 Lines 183-189    Link Here 
183
      0x0c, 0x00, 0x04, 0x00,
183
      0x0c, 0x00, 0x04, 0x00,
184
      0x02, 0x01, 0x00
184
      0x02, 0x01, 0x00
185
    };
185
    };
186
    AddTestCase (new PbbTestCase ("4", packet, buffer, sizeof(buffer)));
186
    AddTestCase (new PbbTestCase ("4", packet, buffer, sizeof(buffer)), TestCase::QUICK);
187
  }
187
  }
188
188
189
  /* Test 5
189
  /* Test 5
 Lines 220-226    Link Here 
220
      0x05, 0x01, 0x00, 0x02,
220
      0x05, 0x01, 0x00, 0x02,
221
      0x80, 0x64
221
      0x80, 0x64
222
    };
222
    };
223
    AddTestCase (new PbbTestCase ("5", packet, buffer, sizeof(buffer)));
223
    AddTestCase (new PbbTestCase ("5", packet, buffer, sizeof(buffer)), TestCase::QUICK);
224
  }
224
  }
225
225
226
  /* Test 6
226
  /* Test 6
 Lines 263-269    Link Here 
263
      0x90, 0x64, 0x04, 0x01,
263
      0x90, 0x64, 0x04, 0x01,
264
      0x02, 0x03, 0x04
264
      0x02, 0x03, 0x04
265
    };
265
    };
266
    AddTestCase (new PbbTestCase ("6", packet, buffer, sizeof(buffer)));
266
    AddTestCase (new PbbTestCase ("6", packet, buffer, sizeof(buffer)), TestCase::QUICK);
267
  }
267
  }
268
268
269
  /* Test 7
269
  /* Test 7
 Lines 530-536    Link Here 
530
      0x25, 0x26, 0x27, 0x28,
530
      0x25, 0x26, 0x27, 0x28,
531
      0x29, 0x2a, 0x2b, 0x2c
531
      0x29, 0x2a, 0x2b, 0x2c
532
    };
532
    };
533
    AddTestCase (new PbbTestCase ("7", packet, buffer, sizeof(buffer)));
533
    AddTestCase (new PbbTestCase ("7", packet, buffer, sizeof(buffer)), TestCase::QUICK);
534
  }
534
  }
535
535
536
  /* Test 8
536
  /* Test 8
 Lines 571-577    Link Here 
571
      0x03, 0x00, 0x06, 0x00,
571
      0x03, 0x00, 0x06, 0x00,
572
      0x00
572
      0x00
573
    };
573
    };
574
    AddTestCase (new PbbTestCase ("8", packet, buffer, sizeof(buffer)));
574
    AddTestCase (new PbbTestCase ("8", packet, buffer, sizeof(buffer)), TestCase::QUICK);
575
  }
575
  }
576
576
577
  /* Test 9
577
  /* Test 9
 Lines 627-633    Link Here 
627
      0x0a, 0x0a, 0x00, 0x00,
627
      0x0a, 0x0a, 0x00, 0x00,
628
      0x01, 0x00, 0x00
628
      0x01, 0x00, 0x00
629
    };
629
    };
630
    AddTestCase (new PbbTestCase ("9", packet, buffer, sizeof(buffer)));
630
    AddTestCase (new PbbTestCase ("9", packet, buffer, sizeof(buffer)), TestCase::QUICK);
631
  }
631
  }
632
632
633
  /* Test 10
633
  /* Test 10
 Lines 685-691    Link Here 
685
      0x0b, 0x0a, 0x00, 0x00,
685
      0x0b, 0x0a, 0x00, 0x00,
686
      0x01, 0x01, 0x00, 0x00,
686
      0x01, 0x01, 0x00, 0x00,
687
    };
687
    };
688
    AddTestCase (new PbbTestCase ("10", packet, buffer, sizeof(buffer)));
688
    AddTestCase (new PbbTestCase ("10", packet, buffer, sizeof(buffer)), TestCase::QUICK);
689
  }
689
  }
690
690
691
  /* Test 11
691
  /* Test 11
 Lines 746-752    Link Here 
746
      0x01, 0xff, 0x01, 0x00,
746
      0x01, 0xff, 0x01, 0x00,
747
      0x00
747
      0x00
748
    };
748
    };
749
    AddTestCase (new PbbTestCase ("11", packet, buffer, sizeof(buffer)));
749
    AddTestCase (new PbbTestCase ("11", packet, buffer, sizeof(buffer)), TestCase::QUICK);
750
  }
750
  }
751
751
752
  /* Test 12
752
  /* Test 12
 Lines 809-815    Link Here 
809
      0x01, 0xff, 0x01, 0x30,
809
      0x01, 0xff, 0x01, 0x30,
810
      0x39, 0x00, 0x00
810
      0x39, 0x00, 0x00
811
    };
811
    };
812
    AddTestCase (new PbbTestCase ("12", packet, buffer, sizeof(buffer)));
812
    AddTestCase (new PbbTestCase ("12", packet, buffer, sizeof(buffer)), TestCase::QUICK);
813
  }
813
  }
814
814
815
  /* Test 13
815
  /* Test 13
 Lines 872-878    Link Here 
872
      0x01, 0xff, 0x01, 0x30,
872
      0x01, 0xff, 0x01, 0x30,
873
      0x39, 0x00, 0x00
873
      0x39, 0x00, 0x00
874
    };
874
    };
875
    AddTestCase (new PbbTestCase ("13", packet, buffer, sizeof(buffer)));
875
    AddTestCase (new PbbTestCase ("13", packet, buffer, sizeof(buffer)), TestCase::QUICK);
876
  }
876
  }
877
877
878
  /* Test 14
878
  /* Test 14
 Lines 945-951    Link Here 
945
      0x01, 0x30, 0x39, 0x00,
945
      0x01, 0x30, 0x39, 0x00,
946
      0x00
946
      0x00
947
    };
947
    };
948
    AddTestCase (new PbbTestCase ("14", packet, buffer, sizeof(buffer)));
948
    AddTestCase (new PbbTestCase ("14", packet, buffer, sizeof(buffer)), TestCase::QUICK);
949
  }
949
  }
950
950
951
  /* Test 15
951
  /* Test 15
 Lines 1029-1035    Link Here 
1029
      0x00, 0x00, 0x00, 0x00,
1029
      0x00, 0x00, 0x00, 0x00,
1030
      0x00
1030
      0x00
1031
    };
1031
    };
1032
    AddTestCase (new PbbTestCase ("15", packet, buffer, sizeof(buffer)));
1032
    AddTestCase (new PbbTestCase ("15", packet, buffer, sizeof(buffer)), TestCase::QUICK);
1033
  }
1033
  }
1034
1034
1035
  /* Test 16
1035
  /* Test 16
 Lines 1113-1119    Link Here 
1113
      0xff, 0xff, 0xff, 0x00,
1113
      0xff, 0xff, 0xff, 0x00,
1114
      0x00,
1114
      0x00,
1115
    };
1115
    };
1116
    AddTestCase (new PbbTestCase ("16", packet, buffer, sizeof(buffer)));
1116
    AddTestCase (new PbbTestCase ("16", packet, buffer, sizeof(buffer)), TestCase::QUICK);
1117
  }
1117
  }
1118
1118
1119
  /* Test 17
1119
  /* Test 17
 Lines 1197-1203    Link Here 
1197
      0x00, 0x00, 0x01, 0x00,
1197
      0x00, 0x00, 0x01, 0x00,
1198
      0x00,
1198
      0x00,
1199
    };
1199
    };
1200
    AddTestCase (new PbbTestCase ("17", packet, buffer, sizeof(buffer)));
1200
    AddTestCase (new PbbTestCase ("17", packet, buffer, sizeof(buffer)), TestCase::QUICK);
1201
  }
1201
  }
1202
1202
1203
  /* Test 18
1203
  /* Test 18
 Lines 1281-1287    Link Here 
1281
      0x00, 0x00, 0x00, 0x00,
1281
      0x00, 0x00, 0x00, 0x00,
1282
      0x00,
1282
      0x00,
1283
    };
1283
    };
1284
    AddTestCase (new PbbTestCase ("18", packet, buffer, sizeof(buffer)));
1284
    AddTestCase (new PbbTestCase ("18", packet, buffer, sizeof(buffer)), TestCase::QUICK);
1285
  }
1285
  }
1286
1286
1287
  /* Test 19
1287
  /* Test 19
 Lines 1365-1371    Link Here 
1365
      0x00, 0x00, 0x01, 0x00,
1365
      0x00, 0x00, 0x01, 0x00,
1366
      0x00,
1366
      0x00,
1367
    };
1367
    };
1368
    AddTestCase (new PbbTestCase ("19", packet, buffer, sizeof(buffer)));
1368
    AddTestCase (new PbbTestCase ("19", packet, buffer, sizeof(buffer)), TestCase::QUICK);
1369
  }
1369
  }
1370
1370
1371
  /* Test 20
1371
  /* Test 20
 Lines 1451-1457    Link Here 
1451
      0x0a, 0x00, 0x00, 0x01,
1451
      0x0a, 0x00, 0x00, 0x01,
1452
      0x02, 0x00, 0x00,
1452
      0x02, 0x00, 0x00,
1453
    };
1453
    };
1454
    AddTestCase (new PbbTestCase ("20", packet, buffer, sizeof(buffer)));
1454
    AddTestCase (new PbbTestCase ("20", packet, buffer, sizeof(buffer)), TestCase::QUICK);
1455
  }
1455
  }
1456
1456
1457
  /* Test 21
1457
  /* Test 21
 Lines 1538-1544    Link Here 
1538
      0x00, 0x01, 0x01, 0x00,
1538
      0x00, 0x01, 0x01, 0x00,
1539
      0x00,
1539
      0x00,
1540
    };
1540
    };
1541
    AddTestCase (new PbbTestCase ("21", packet, buffer, sizeof(buffer)));
1541
    AddTestCase (new PbbTestCase ("21", packet, buffer, sizeof(buffer)), TestCase::QUICK);
1542
  }
1542
  }
1543
1543
1544
  /* Test 22
1544
  /* Test 22
 Lines 1636-1642    Link Here 
1636
      0x00, 0x02, 0x20, 0x03,
1636
      0x00, 0x02, 0x20, 0x03,
1637
      0x0a, 0x0b, 0x00, 0x00,
1637
      0x0a, 0x0b, 0x00, 0x00,
1638
    };
1638
    };
1639
    AddTestCase (new PbbTestCase ("22", packet, buffer, sizeof(buffer)));
1639
    AddTestCase (new PbbTestCase ("22", packet, buffer, sizeof(buffer)), TestCase::QUICK);
1640
  }
1640
  }
1641
1641
1642
  /* Test 23
1642
  /* Test 23
 Lines 1749-1755    Link Here 
1749
      0x20, 0x10, 0x18, 0x00,
1749
      0x20, 0x10, 0x18, 0x00,
1750
      0x00,
1750
      0x00,
1751
    };
1751
    };
1752
    AddTestCase (new PbbTestCase ("23", packet, buffer, sizeof(buffer)));
1752
    AddTestCase (new PbbTestCase ("23", packet, buffer, sizeof(buffer)), TestCase::QUICK);
1753
  }
1753
  }
1754
1754
1755
  /* Test 24
1755
  /* Test 24
 Lines 1869-1875    Link Here 
1869
      0x20, 0x10, 0x18, 0x00,
1869
      0x20, 0x10, 0x18, 0x00,
1870
      0x02, 0x01, 0x00,
1870
      0x02, 0x01, 0x00,
1871
    };
1871
    };
1872
    AddTestCase (new PbbTestCase ("24", packet, buffer, sizeof(buffer)));
1872
    AddTestCase (new PbbTestCase ("24", packet, buffer, sizeof(buffer)), TestCase::QUICK);
1873
  }
1873
  }
1874
1874
1875
  /* Test 25
1875
  /* Test 25
 Lines 1991-1997    Link Here 
1991
      0x20, 0x10, 0x18, 0x00,
1991
      0x20, 0x10, 0x18, 0x00,
1992
      0x03, 0x01, 0x40, 0x01,
1992
      0x03, 0x01, 0x40, 0x01,
1993
    };
1993
    };
1994
    AddTestCase (new PbbTestCase ("25", packet, buffer, sizeof(buffer)));
1994
    AddTestCase (new PbbTestCase ("25", packet, buffer, sizeof(buffer)), TestCase::QUICK);
1995
  }
1995
  }
1996
1996
1997
  /* Test 26
1997
  /* Test 26
 Lines 2116-2122    Link Here 
2116
      0x04, 0x01, 0x20, 0x01,
2116
      0x04, 0x01, 0x20, 0x01,
2117
      0x03,
2117
      0x03,
2118
    };
2118
    };
2119
    AddTestCase (new PbbTestCase ("26", packet, buffer, sizeof(buffer)));
2119
    AddTestCase (new PbbTestCase ("26", packet, buffer, sizeof(buffer)), TestCase::QUICK);
2120
  }
2120
  }
2121
2121
2122
  /* Test 27
2122
  /* Test 27
 Lines 2247-2253    Link Here 
2247
      0x03, 0x03, 0x01, 0x02,
2247
      0x03, 0x03, 0x01, 0x02,
2248
      0x03,
2248
      0x03,
2249
    };
2249
    };
2250
    AddTestCase (new PbbTestCase ("27", packet, buffer, sizeof(buffer)));
2250
    AddTestCase (new PbbTestCase ("27", packet, buffer, sizeof(buffer)), TestCase::QUICK);
2251
  }
2251
  }
2252
2252
2253
  /* Test 28
2253
  /* Test 28
 Lines 2602-2608    Link Here 
2602
      0x26, 0x27, 0x28, 0x29,
2602
      0x26, 0x27, 0x28, 0x29,
2603
      0x2a, 0x2b, 0x2c
2603
      0x2a, 0x2b, 0x2c
2604
    };
2604
    };
2605
    AddTestCase (new PbbTestCase ("28", packet, buffer, sizeof(buffer)));
2605
    AddTestCase (new PbbTestCase ("28", packet, buffer, sizeof(buffer)), TestCase::QUICK);
2606
  }
2606
  }
2607
2607
2608
  /* Test 29
2608
  /* Test 29
 Lines 2632-2638    Link Here 
2632
      0x00, 0x01, 0x0f, 0x00,
2632
      0x00, 0x01, 0x0f, 0x00,
2633
      0x06, 0x00, 0x00,
2633
      0x06, 0x00, 0x00,
2634
    };
2634
    };
2635
    AddTestCase (new PbbTestCase ("29", packet, buffer, sizeof(buffer)));
2635
    AddTestCase (new PbbTestCase ("29", packet, buffer, sizeof(buffer)), TestCase::QUICK);
2636
  }
2636
  }
2637
2637
2638
  /* Test 30
2638
  /* Test 30
 Lines 2668-2674    Link Here 
2668
      0x00, 0x00, 0x00, 0x00,
2668
      0x00, 0x00, 0x00, 0x00,
2669
      0x01, 0x00, 0x00
2669
      0x01, 0x00, 0x00
2670
    };
2670
    };
2671
    AddTestCase (new PbbTestCase ("30", packet, buffer, sizeof(buffer)));
2671
    AddTestCase (new PbbTestCase ("30", packet, buffer, sizeof(buffer)), TestCase::QUICK);
2672
  }
2672
  }
2673
2673
2674
  /* Test 31
2674
  /* Test 31
 Lines 2717-2723    Link Here 
2717
      0x00, 0x00, 0x00, 0x00,
2717
      0x00, 0x00, 0x00, 0x00,
2718
      0x01, 0x00, 0x00,
2718
      0x01, 0x00, 0x00,
2719
    };
2719
    };
2720
    AddTestCase (new PbbTestCase ("31", packet, buffer, sizeof(buffer)));
2720
    AddTestCase (new PbbTestCase ("31", packet, buffer, sizeof(buffer)), TestCase::QUICK);
2721
  }
2721
  }
2722
2722
2723
  /* Test 32
2723
  /* Test 32
 Lines 2769-2775    Link Here 
2769
      0x00, 0x01, 0x02, 0x00,
2769
      0x00, 0x01, 0x02, 0x00,
2770
      0x00,
2770
      0x00,
2771
    };
2771
    };
2772
    AddTestCase (new PbbTestCase ("32", packet, buffer, sizeof(buffer)));
2772
    AddTestCase (new PbbTestCase ("32", packet, buffer, sizeof(buffer)), TestCase::QUICK);
2773
  }
2773
  }
2774
2774
2775
  /* Test 33
2775
  /* Test 33
 Lines 2821-2827    Link Here 
2821
      0x00, 0x02, 0x00, 0x11,
2821
      0x00, 0x02, 0x00, 0x11,
2822
      0x00, 0x00,
2822
      0x00, 0x00,
2823
    };
2823
    };
2824
    AddTestCase (new PbbTestCase ("33", packet, buffer, sizeof(buffer)));
2824
    AddTestCase (new PbbTestCase ("33", packet, buffer, sizeof(buffer)), TestCase::QUICK);
2825
  }
2825
  }
2826
2826
2827
  /* Test 34
2827
  /* Test 34
 Lines 2885-2891    Link Here 
2885
      0x01, 0x00, 0x0e, 0x10,
2885
      0x01, 0x00, 0x0e, 0x10,
2886
      0x11, 0x00, 0x00,
2886
      0x11, 0x00, 0x00,
2887
    };
2887
    };
2888
    AddTestCase (new PbbTestCase ("34", packet, buffer, sizeof(buffer)));
2888
    AddTestCase (new PbbTestCase ("34", packet, buffer, sizeof(buffer)), TestCase::QUICK);
2889
  }
2889
  }
2890
2890
2891
  /* Test 35
2891
  /* Test 35
 Lines 2972-2978    Link Here 
2972
      0x00, 0x06, 0x80, 0x80,
2972
      0x00, 0x06, 0x80, 0x80,
2973
      0x40, 0x30, 0x00, 0x00,
2973
      0x40, 0x30, 0x00, 0x00,
2974
    };
2974
    };
2975
    AddTestCase (new PbbTestCase ("35", packet, buffer, sizeof(buffer)));
2975
    AddTestCase (new PbbTestCase ("35", packet, buffer, sizeof(buffer)), TestCase::QUICK);
2976
  }
2976
  }
2977
2977
2978
  /* Test 36
2978
  /* Test 36
 Lines 3394-3400    Link Here 
3394
      0x80, 0x80, 0x40, 0x30,
3394
      0x80, 0x80, 0x40, 0x30,
3395
      0x00, 0x00,
3395
      0x00, 0x00,
3396
    };
3396
    };
3397
    AddTestCase (new PbbTestCase ("36", packet, buffer, sizeof(buffer)));
3397
    AddTestCase (new PbbTestCase ("36", packet, buffer, sizeof(buffer)), TestCase::QUICK);
3398
  }
3398
  }
3399
3399
3400
  /* Test 37
3400
  /* Test 37
 Lines 3816-3822    Link Here 
3816
      0x80, 0x80, 0x40, 0x30,
3816
      0x80, 0x80, 0x40, 0x30,
3817
      0x00, 0x00,
3817
      0x00, 0x00,
3818
    };
3818
    };
3819
    AddTestCase (new PbbTestCase ("37", packet, buffer, sizeof(buffer)));
3819
    AddTestCase (new PbbTestCase ("37", packet, buffer, sizeof(buffer)), TestCase::QUICK);
3820
  }
3820
  }
3821
}
3821
}
3822
3822
(-)a/src/network/test/pcap-file-test-suite.cc (-7 / +7 lines)
 Lines 1111-1123    Link Here 
1111
  : TestSuite ("pcap-file", UNIT)
1111
  : TestSuite ("pcap-file", UNIT)
1112
{
1112
{
1113
  SetDataDir (NS_TEST_SOURCEDIR);
1113
  SetDataDir (NS_TEST_SOURCEDIR);
1114
  AddTestCase (new WriteModeCreateTestCase);
1114
  AddTestCase (new WriteModeCreateTestCase, TestCase::QUICK);
1115
  AddTestCase (new ReadModeCreateTestCase);
1115
  AddTestCase (new ReadModeCreateTestCase, TestCase::QUICK);
1116
  //AddTestCase (new AppendModeCreateTestCase);
1116
  //AddTestCase (new AppendModeCreateTestCase, TestCase::QUICK);
1117
  AddTestCase (new FileHeaderTestCase);
1117
  AddTestCase (new FileHeaderTestCase, TestCase::QUICK);
1118
  AddTestCase (new RecordHeaderTestCase);
1118
  AddTestCase (new RecordHeaderTestCase, TestCase::QUICK);
1119
  AddTestCase (new ReadFileTestCase);
1119
  AddTestCase (new ReadFileTestCase, TestCase::QUICK);
1120
  AddTestCase (new DiffTestCase);
1120
  AddTestCase (new DiffTestCase, TestCase::QUICK);
1121
}
1121
}
1122
1122
1123
static PcapFileTestSuite pcapFileTestSuite;
1123
static PcapFileTestSuite pcapFileTestSuite;
(-)a/src/network/test/red-queue-test-suite.cc (-1 / +1 lines)
 Lines 276-281    Link Here 
276
  RedQueueTestSuite ()
276
  RedQueueTestSuite ()
277
    : TestSuite ("red-queue", UNIT)
277
    : TestSuite ("red-queue", UNIT)
278
  {
278
  {
279
    AddTestCase (new RedQueueTestCase ());
279
    AddTestCase (new RedQueueTestCase (), TestCase::QUICK);
280
  }
280
  }
281
} g_redQueueTestSuite;
281
} g_redQueueTestSuite;
(-)a/src/network/test/sequence-number-test-suite.cc (-1 / +1 lines)
 Lines 186-191    Link Here 
186
  SequenceNumberTestSuite ()
186
  SequenceNumberTestSuite ()
187
    : TestSuite ("SequenceNumber", UNIT) 
187
    : TestSuite ("SequenceNumber", UNIT) 
188
  {
188
  {
189
    AddTestCase (new SequenceNumberTestCase ());
189
    AddTestCase (new SequenceNumberTestCase (), TestCase::QUICK);
190
  }
190
  }
191
} g_seqNumTests;
191
} g_seqNumTests;
(-)a/src/olsr/test/olsr-header-test-suite.cc (-5 / +5 lines)
 Lines 305-315    Link Here 
305
OlsrTestSuite::OlsrTestSuite()
305
OlsrTestSuite::OlsrTestSuite()
306
  : TestSuite ("routing-olsr-header", UNIT)
306
  : TestSuite ("routing-olsr-header", UNIT)
307
{
307
{
308
  AddTestCase (new OlsrHnaTestCase ());
308
  AddTestCase (new OlsrHnaTestCase (), TestCase::QUICK);
309
  AddTestCase (new OlsrTcTestCase ());
309
  AddTestCase (new OlsrTcTestCase (), TestCase::QUICK);
310
  AddTestCase (new OlsrHelloTestCase ());
310
  AddTestCase (new OlsrHelloTestCase (), TestCase::QUICK);
311
  AddTestCase (new OlsrMidTestCase ());
311
  AddTestCase (new OlsrMidTestCase (), TestCase::QUICK);
312
  AddTestCase (new OlsrEmfTestCase ());
312
  AddTestCase (new OlsrEmfTestCase (), TestCase::QUICK);
313
}
313
}
314
314
315
} // namespace ns3
315
} // namespace ns3
(-)a/src/olsr/test/olsr-routing-protocol-test-suite.cc (-1 / +1 lines)
 Lines 176-182    Link Here 
176
OlsrProtocolTestSuite::OlsrProtocolTestSuite()
176
OlsrProtocolTestSuite::OlsrProtocolTestSuite()
177
  : TestSuite ("routing-olsr", UNIT)
177
  : TestSuite ("routing-olsr", UNIT)
178
{
178
{
179
  AddTestCase (new OlsrMprTestCase ());
179
  AddTestCase (new OlsrMprTestCase (), TestCase::QUICK);
180
}
180
}
181
181
182
}
182
}
(-)a/src/olsr/test/regression-test-suite.cc (-3 / +3 lines)
 Lines 31-39    Link Here 
31
  RegressionTestSuite () : TestSuite ("routing-olsr-regression", SYSTEM) 
31
  RegressionTestSuite () : TestSuite ("routing-olsr-regression", SYSTEM) 
32
  {
32
  {
33
    SetDataDir (NS_TEST_SOURCEDIR);
33
    SetDataDir (NS_TEST_SOURCEDIR);
34
    AddTestCase (new HelloRegressionTest);
34
    AddTestCase (new HelloRegressionTest, TestCase::QUICK);
35
    AddTestCase (new TcRegressionTest);
35
    AddTestCase (new TcRegressionTest, TestCase::QUICK);
36
    AddTestCase (new Bug780Test);
36
    AddTestCase (new Bug780Test, TestCase::QUICK);
37
  }
37
  }
38
} g_olsrRegressionTestSuite;
38
} g_olsrRegressionTestSuite;
39
39
(-)a/src/openflow/test/openflow-switch-test-suite.cc (-1 / +1 lines)
 Lines 181-187    Link Here 
181
181
182
SwitchTestSuite::SwitchTestSuite () : TestSuite ("openflow", UNIT)
182
SwitchTestSuite::SwitchTestSuite () : TestSuite ("openflow", UNIT)
183
{
183
{
184
  AddTestCase (new SwitchFlowTableTestCase);
184
  AddTestCase (new SwitchFlowTableTestCase, TestCase::QUICK);
185
}
185
}
186
186
187
// Do not forget to allocate an instance of this TestSuite
187
// Do not forget to allocate an instance of this TestSuite
(-)a/src/point-to-point/test/point-to-point-test.cc (-1 / +1 lines)
 Lines 65-71    Link Here 
65
PointToPointTestSuite::PointToPointTestSuite ()
65
PointToPointTestSuite::PointToPointTestSuite ()
66
  : TestSuite ("devices-point-to-point", UNIT)
66
  : TestSuite ("devices-point-to-point", UNIT)
67
{
67
{
68
  AddTestCase (new PointToPointTest);
68
  AddTestCase (new PointToPointTest, TestCase::QUICK);
69
}
69
}
70
70
71
static PointToPointTestSuite g_pointToPointTestSuite;
71
static PointToPointTestSuite g_pointToPointTestSuite;
(-)a/src/propagation/test/itu-r-1411-los-test-suite.cc (-2 / +2 lines)
 Lines 110-118    Link Here 
110
110
111
  // reference values obtained with the octave scripts in src/propagation/test/reference/
111
  // reference values obtained with the octave scripts in src/propagation/test/reference/
112
112
113
  AddTestCase (new ItuR1411LosPropagationLossModelTestCase (2.1140e9, 100, 30, 1,  81.005, "freq=2114MHz, dist=100m"));
113
  AddTestCase (new ItuR1411LosPropagationLossModelTestCase (2.1140e9, 100, 30, 1,  81.005, "freq=2114MHz, dist=100m"), TestCase::QUICK);
114
114
115
  AddTestCase (new ItuR1411LosPropagationLossModelTestCase (1999e6, 200, 30, 1,  87.060, "freq=1999MHz, dist=200m"));
115
  AddTestCase (new ItuR1411LosPropagationLossModelTestCase (1999e6, 200, 30, 1,  87.060, "freq=1999MHz, dist=200m"), TestCase::QUICK);
116
116
117
117
118
118
(-)a/src/propagation/test/itu-r-1411-nlos-over-rooftop-test-suite.cc (-2 / +2 lines)
 Lines 116-124    Link Here 
116
116
117
  // reference values obtained with the octave scripts in src/propagation/test/reference/
117
  // reference values obtained with the octave scripts in src/propagation/test/reference/
118
118
119
  AddTestCase (new ItuR1411NlosOverRooftopPropagationLossModelTestCase (2.1140e9, 900, 30, 1, UrbanEnvironment, LargeCity, 143.68, "f=2114Mhz, dist=900, urban large city"));
119
  AddTestCase (new ItuR1411NlosOverRooftopPropagationLossModelTestCase (2.1140e9, 900, 30, 1, UrbanEnvironment, LargeCity, 143.68, "f=2114Mhz, dist=900, urban large city"), TestCase::QUICK);
120
120
121
  AddTestCase (new ItuR1411NlosOverRooftopPropagationLossModelTestCase (1.865e9, 500, 30, 1, UrbanEnvironment, LargeCity,  132.84, "f=2114Mhz, dist=900, urban large city"));
121
  AddTestCase (new ItuR1411NlosOverRooftopPropagationLossModelTestCase (1.865e9, 500, 30, 1, UrbanEnvironment, LargeCity,  132.84, "f=2114Mhz, dist=900, urban large city"), TestCase::QUICK);
122
122
123
}
123
}
124
124
(-)a/src/propagation/test/kun-2600-mhz-test-suite.cc (-1 / +1 lines)
 Lines 105-111    Link Here 
105
105
106
  LogComponentEnable ("Kun2600MhzPropagationLossModelTest", LOG_LEVEL_ALL);
106
  LogComponentEnable ("Kun2600MhzPropagationLossModelTest", LOG_LEVEL_ALL);
107
107
108
  AddTestCase (new Kun2600MhzPropagationLossModelTestCase (2000, 30, 1,  121.83, "dist=2000m"));
108
  AddTestCase (new Kun2600MhzPropagationLossModelTestCase (2000, 30, 1,  121.83, "dist=2000m"), TestCase::QUICK);
109
109
110
110
111
}
111
}
(-)a/src/propagation/test/okumura-hata-test-suite.cc (-6 / +6 lines)
 Lines 120-139    Link Here 
120
120
121
  double freq = 869e6; // this will use the original OH model
121
  double freq = 869e6; // this will use the original OH model
122
122
123
  AddTestCase (new OkumuraHataPropagationLossModelTestCase (freq, 2000, 30, 1, UrbanEnvironment, LargeCity, 137.93, "original OH Urban Large city"));
123
  AddTestCase (new OkumuraHataPropagationLossModelTestCase (freq, 2000, 30, 1, UrbanEnvironment, LargeCity, 137.93, "original OH Urban Large city"), TestCase::QUICK);
124
124
125
  AddTestCase (new OkumuraHataPropagationLossModelTestCase (freq, 2000, 30, 1, UrbanEnvironment, SmallCity, 137.88, "original OH Urban small city"));
125
  AddTestCase (new OkumuraHataPropagationLossModelTestCase (freq, 2000, 30, 1, UrbanEnvironment, SmallCity, 137.88, "original OH Urban small city"), TestCase::QUICK);
126
126
127
  AddTestCase (new OkumuraHataPropagationLossModelTestCase (freq, 2000, 30, 1, SubUrbanEnvironment, LargeCity, 128.03, "original OH SubUrban"));
127
  AddTestCase (new OkumuraHataPropagationLossModelTestCase (freq, 2000, 30, 1, SubUrbanEnvironment, LargeCity, 128.03, "original OH SubUrban"), TestCase::QUICK);
128
128
129
  AddTestCase (new OkumuraHataPropagationLossModelTestCase (freq, 2000, 30, 1, OpenAreasEnvironment, LargeCity, 110.21, "original OH OpenAreas"));
129
  AddTestCase (new OkumuraHataPropagationLossModelTestCase (freq, 2000, 30, 1, OpenAreasEnvironment, LargeCity, 110.21, "original OH OpenAreas"), TestCase::QUICK);
130
130
131
131
132
  freq = 2.1140e9;  // this will use the extended COST231 OH model
132
  freq = 2.1140e9;  // this will use the extended COST231 OH model
133
133
134
  AddTestCase (new OkumuraHataPropagationLossModelTestCase (freq, 2000, 30, 1, UrbanEnvironment, LargeCity, 148.55, "COST231 OH Urban Large city"));
134
  AddTestCase (new OkumuraHataPropagationLossModelTestCase (freq, 2000, 30, 1, UrbanEnvironment, LargeCity, 148.55, "COST231 OH Urban Large city"), TestCase::QUICK);
135
135
136
  AddTestCase (new OkumuraHataPropagationLossModelTestCase (freq, 2000, 30, 1, UrbanEnvironment, SmallCity, 150.64, "COST231 OH Urban small city and suburban"));
136
  AddTestCase (new OkumuraHataPropagationLossModelTestCase (freq, 2000, 30, 1, UrbanEnvironment, SmallCity, 150.64, "COST231 OH Urban small city and suburban"), TestCase::QUICK);
137
137
138
}
138
}
139
139
(-)a/src/propagation/test/propagation-loss-model-test-suite.cc (-5 / +5 lines)
 Lines 443-453    Link Here 
443
PropagationLossModelsTestSuite::PropagationLossModelsTestSuite ()
443
PropagationLossModelsTestSuite::PropagationLossModelsTestSuite ()
444
  : TestSuite ("propagation-loss-model", UNIT)
444
  : TestSuite ("propagation-loss-model", UNIT)
445
{
445
{
446
  AddTestCase (new FriisPropagationLossModelTestCase);
446
  AddTestCase (new FriisPropagationLossModelTestCase, TestCase::QUICK);
447
  AddTestCase (new TwoRayGroundPropagationLossModelTestCase);
447
  AddTestCase (new TwoRayGroundPropagationLossModelTestCase, TestCase::QUICK);
448
  AddTestCase (new LogDistancePropagationLossModelTestCase);
448
  AddTestCase (new LogDistancePropagationLossModelTestCase, TestCase::QUICK);
449
  AddTestCase (new MatrixPropagationLossModelTestCase);
449
  AddTestCase (new MatrixPropagationLossModelTestCase, TestCase::QUICK);
450
  AddTestCase (new RangePropagationLossModelTestCase);
450
  AddTestCase (new RangePropagationLossModelTestCase, TestCase::QUICK);
451
}
451
}
452
452
453
static PropagationLossModelsTestSuite propagationLossModelsTestSuite;
453
static PropagationLossModelsTestSuite propagationLossModelsTestSuite;
(-)a/src/spectrum/test/spectrum-ideal-phy-test.cc (-12 / +12 lines)
 Lines 224-245    Link Here 
224
  for (double snr = 0.01; snr <= 10 ; snr *= 2)
224
  for (double snr = 0.01; snr <= 10 ; snr *= 2)
225
    {          
225
    {          
226
      double achievableRate = g_bandwidth*log2(1+snr);      
226
      double achievableRate = g_bandwidth*log2(1+snr);      
227
      AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*0.1),  true,  "ns3::SingleModelSpectrumChannel"));
227
      AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*0.1),  true,  "ns3::SingleModelSpectrumChannel"), TestCase::QUICK);
228
      AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*0.5),  true,  "ns3::SingleModelSpectrumChannel"));
228
      AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*0.5),  true,  "ns3::SingleModelSpectrumChannel"), TestCase::QUICK);
229
      AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*0.95), true,  "ns3::SingleModelSpectrumChannel"));
229
      AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*0.95), true,  "ns3::SingleModelSpectrumChannel"), TestCase::QUICK);
230
      AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*1.05), false,  "ns3::SingleModelSpectrumChannel"));
230
      AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*1.05), false,  "ns3::SingleModelSpectrumChannel"), TestCase::QUICK);
231
      AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*2),    false,  "ns3::SingleModelSpectrumChannel"));
231
      AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*2),    false,  "ns3::SingleModelSpectrumChannel"), TestCase::QUICK);
232
      AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*4),    false,  "ns3::SingleModelSpectrumChannel"));
232
      AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*4),    false,  "ns3::SingleModelSpectrumChannel"), TestCase::QUICK);
233
    }
233
    }
234
  for (double snr = 0.01; snr <= 10 ; snr *= 10)
234
  for (double snr = 0.01; snr <= 10 ; snr *= 10)
235
    {          
235
    {          
236
      double achievableRate = g_bandwidth*log2(1+snr);      
236
      double achievableRate = g_bandwidth*log2(1+snr);      
237
      AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*0.1),  true,  "ns3::MultiModelSpectrumChannel"));
237
      AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*0.1),  true,  "ns3::MultiModelSpectrumChannel"), TestCase::QUICK);
238
      AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*0.5),  true,  "ns3::MultiModelSpectrumChannel"));
238
      AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*0.5),  true,  "ns3::MultiModelSpectrumChannel"), TestCase::QUICK);
239
      AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*0.95), true,  "ns3::MultiModelSpectrumChannel"));
239
      AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*0.95), true,  "ns3::MultiModelSpectrumChannel"), TestCase::QUICK);
240
      AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*1.05), false,  "ns3::MultiModelSpectrumChannel"));
240
      AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*1.05), false,  "ns3::MultiModelSpectrumChannel"), TestCase::QUICK);
241
      AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*2),    false,  "ns3::MultiModelSpectrumChannel"));
241
      AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*2),    false,  "ns3::MultiModelSpectrumChannel"), TestCase::QUICK);
242
      AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*4),    false,  "ns3::MultiModelSpectrumChannel"));
242
      AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*4),    false,  "ns3::MultiModelSpectrumChannel"), TestCase::QUICK);
243
    }
243
    }
244
}
244
}
245
245
(-)a/src/spectrum/test/spectrum-interference-test.cc (-12 / +12 lines)
 Lines 171-194    Link Here 
171
  (*s1)[0] = 1.255943215755e-15;
171
  (*s1)[0] = 1.255943215755e-15;
172
  (*s1)[1] = 7.204059965732e-16;
172
  (*s1)[1] = 7.204059965732e-16;
173
  b = 10067205.5632012;
173
  b = 10067205.5632012;
174
  AddTestCase (new SpectrumInterferenceTestCase (s1,   0, true,            "sdBm  = [-46 -48]  tx bytes: 1"));
174
  AddTestCase (new SpectrumInterferenceTestCase (s1,   0, true,            "sdBm  = [-46 -48]  tx bytes: 1"), TestCase::QUICK);
175
  AddTestCase (new SpectrumInterferenceTestCase (s1, static_cast<uint32_t> (b * 0.5 + 0.5), true,   "sdBm  = [-46 -48]  tx bytes: b*0.5"));
175
  AddTestCase (new SpectrumInterferenceTestCase (s1, static_cast<uint32_t> (b * 0.5 + 0.5), true,   "sdBm  = [-46 -48]  tx bytes: b*0.5"), TestCase::QUICK);
176
  AddTestCase (new SpectrumInterferenceTestCase (s1, static_cast<uint32_t> (b * (1 - e) + 0.5), true, "sdBm  = [-46 -48]  tx bytes: b*(1-e)"));
176
  AddTestCase (new SpectrumInterferenceTestCase (s1, static_cast<uint32_t> (b * (1 - e) + 0.5), true, "sdBm  = [-46 -48]  tx bytes: b*(1-e)"), TestCase::QUICK);
177
  AddTestCase (new SpectrumInterferenceTestCase (s1, static_cast<uint32_t> (b * (1 + e) + 0.5), false, "sdBm  = [-46 -48]  tx bytes: b*(1+e)"));
177
  AddTestCase (new SpectrumInterferenceTestCase (s1, static_cast<uint32_t> (b * (1 + e) + 0.5), false, "sdBm  = [-46 -48]  tx bytes: b*(1+e)"), TestCase::QUICK);
178
  AddTestCase (new SpectrumInterferenceTestCase (s1, static_cast<uint32_t> (b * 1.5 + 0.5), false,   "sdBm  = [-46 -48]  tx bytes: b*1.5"));
178
  AddTestCase (new SpectrumInterferenceTestCase (s1, static_cast<uint32_t> (b * 1.5 + 0.5), false,   "sdBm  = [-46 -48]  tx bytes: b*1.5"), TestCase::QUICK);
179
  AddTestCase (new SpectrumInterferenceTestCase (s1, 0xffffffff, false,     "sdBm  = [-46 -48]  tx bytes: 2^32-1"));
179
  AddTestCase (new SpectrumInterferenceTestCase (s1, 0xffffffff, false,     "sdBm  = [-46 -48]  tx bytes: 2^32-1"), TestCase::QUICK);
180
180
181
  // Power Spectral Density of the signal of interest  =  [-63 -61] dBm;
181
  // Power Spectral Density of the signal of interest  =  [-63 -61] dBm;
182
  Ptr<SpectrumValue> s2  = Create<SpectrumValue> (m);
182
  Ptr<SpectrumValue> s2  = Create<SpectrumValue> (m);
183
  (*s2)[0] = 2.505936168136e-17;
183
  (*s2)[0] = 2.505936168136e-17;
184
  (*s2)[1] = 3.610582885110e-17;
184
  (*s2)[1] = 3.610582885110e-17;
185
  b = 882401.591840728;
185
  b = 882401.591840728;
186
  AddTestCase (new SpectrumInterferenceTestCase (s2,   1, true,            "sdBm  = [-63 -61]  tx bytes: 1"));
186
  AddTestCase (new SpectrumInterferenceTestCase (s2,   1, true,            "sdBm  = [-63 -61]  tx bytes: 1"), TestCase::QUICK);
187
  AddTestCase (new SpectrumInterferenceTestCase (s2, static_cast<uint32_t> (b * 0.5 + 0.5), true,   "sdBm  = [-63 -61]  tx bytes: b*0.5"));
187
  AddTestCase (new SpectrumInterferenceTestCase (s2, static_cast<uint32_t> (b * 0.5 + 0.5), true,   "sdBm  = [-63 -61]  tx bytes: b*0.5"), TestCase::QUICK);
188
  AddTestCase (new SpectrumInterferenceTestCase (s2, static_cast<uint32_t> (b * (1 - e) + 0.5), true, "sdBm  = [-63 -61]  tx bytes: b*(1-e)"));
188
  AddTestCase (new SpectrumInterferenceTestCase (s2, static_cast<uint32_t> (b * (1 - e) + 0.5), true, "sdBm  = [-63 -61]  tx bytes: b*(1-e)"), TestCase::QUICK);
189
  AddTestCase (new SpectrumInterferenceTestCase (s2, static_cast<uint32_t> (b * (1 + e) + 0.5), false, "sdBm  = [-63 -61]  tx bytes: b*(1+e)"));
189
  AddTestCase (new SpectrumInterferenceTestCase (s2, static_cast<uint32_t> (b * (1 + e) + 0.5), false, "sdBm  = [-63 -61]  tx bytes: b*(1+e)"), TestCase::QUICK);
190
  AddTestCase (new SpectrumInterferenceTestCase (s2, static_cast<uint32_t> (b * 1.5 + 0.5), false,   "sdBm  = [-63 -61]  tx bytes: b*1.5"));
190
  AddTestCase (new SpectrumInterferenceTestCase (s2, static_cast<uint32_t> (b * 1.5 + 0.5), false,   "sdBm  = [-63 -61]  tx bytes: b*1.5"), TestCase::QUICK);
191
  AddTestCase (new SpectrumInterferenceTestCase (s2, 0xffffffff, false,     "sdBm  = [-63 -61]  tx bytes: 2^32-1"));
191
  AddTestCase (new SpectrumInterferenceTestCase (s2, 0xffffffff, false,     "sdBm  = [-63 -61]  tx bytes: 2^32-1"), TestCase::QUICK);
192
192
193
}
193
}
194
194
(-)a/src/spectrum/test/spectrum-value-test.cc (-21 / +21 lines)
 Lines 180-189    Link Here 
180
  tv6 = v1 / v2;
180
  tv6 = v1 / v2;
181
181
182
182
183
  AddTestCase (new SpectrumValueTestCase (tv3, v3, "tv3 = v1 + v2"));
183
  AddTestCase (new SpectrumValueTestCase (tv3, v3, "tv3 = v1 + v2"), TestCase::QUICK);
184
  AddTestCase (new SpectrumValueTestCase (tv4, v4, "tv4 = v1 - v2"));
184
  AddTestCase (new SpectrumValueTestCase (tv4, v4, "tv4 = v1 - v2"), TestCase::QUICK);
185
  AddTestCase (new SpectrumValueTestCase (tv5, v5, "tv5 = v1 * v2"));
185
  AddTestCase (new SpectrumValueTestCase (tv5, v5, "tv5 = v1 * v2"), TestCase::QUICK);
186
  AddTestCase (new SpectrumValueTestCase (tv6, v6, "tv6 = v1 div v2"));
186
  AddTestCase (new SpectrumValueTestCase (tv6, v6, "tv6 = v1 div v2"), TestCase::QUICK);
187
187
188
  // std::cerr << v6 << std::endl;
188
  // std::cerr << v6 << std::endl;
189
  // std::cerr << tv6 << std::endl;
189
  // std::cerr << tv6 << std::endl;
 Lines 199-228    Link Here 
199
  tv5 *= v2;
199
  tv5 *= v2;
200
  tv6 /= v2;
200
  tv6 /= v2;
201
201
202
  AddTestCase (new SpectrumValueTestCase (tv3, v3, "tv3 += v2"));
202
  AddTestCase (new SpectrumValueTestCase (tv3, v3, "tv3 += v2"), TestCase::QUICK);
203
  AddTestCase (new SpectrumValueTestCase (tv4, v4, "tv4 -= v2"));
203
  AddTestCase (new SpectrumValueTestCase (tv4, v4, "tv4 -= v2"), TestCase::QUICK);
204
  AddTestCase (new SpectrumValueTestCase (tv5, v5, "tv5 *= v2"));
204
  AddTestCase (new SpectrumValueTestCase (tv5, v5, "tv5 *= v2"), TestCase::QUICK);
205
  AddTestCase (new SpectrumValueTestCase (tv6, v6, "tv6 div= v2"));
205
  AddTestCase (new SpectrumValueTestCase (tv6, v6, "tv6 div= v2"), TestCase::QUICK);
206
206
207
  SpectrumValue tv7a (f), tv8a (f), tv9a (f), tv10a (f);
207
  SpectrumValue tv7a (f), tv8a (f), tv9a (f), tv10a (f);
208
  tv7a = v1 + doubleValue;
208
  tv7a = v1 + doubleValue;
209
  tv8a = v1 - doubleValue;
209
  tv8a = v1 - doubleValue;
210
  tv9a = v1 * doubleValue;
210
  tv9a = v1 * doubleValue;
211
  tv10a = v1 / doubleValue;
211
  tv10a = v1 / doubleValue;
212
  AddTestCase (new SpectrumValueTestCase (tv7a, v7, "tv7a = v1 + doubleValue"));
212
  AddTestCase (new SpectrumValueTestCase (tv7a, v7, "tv7a = v1 + doubleValue"), TestCase::QUICK);
213
  AddTestCase (new SpectrumValueTestCase (tv8a, v8, "tv8a = v1 - doubleValue"));
213
  AddTestCase (new SpectrumValueTestCase (tv8a, v8, "tv8a = v1 - doubleValue"), TestCase::QUICK);
214
  AddTestCase (new SpectrumValueTestCase (tv9a, v9, "tv9a = v1 * doubleValue"));
214
  AddTestCase (new SpectrumValueTestCase (tv9a, v9, "tv9a = v1 * doubleValue"), TestCase::QUICK);
215
  AddTestCase (new SpectrumValueTestCase (tv10a, v10, "tv10a = v1 div doubleValue"));
215
  AddTestCase (new SpectrumValueTestCase (tv10a, v10, "tv10a = v1 div doubleValue"), TestCase::QUICK);
216
216
217
  SpectrumValue tv7b (f), tv8b (f), tv9b (f), tv10b (f);
217
  SpectrumValue tv7b (f), tv8b (f), tv9b (f), tv10b (f);
218
  tv7b =  doubleValue + v1;
218
  tv7b =  doubleValue + v1;
219
  tv8b =  doubleValue - v1;
219
  tv8b =  doubleValue - v1;
220
  tv9b =  doubleValue * v1;
220
  tv9b =  doubleValue * v1;
221
  tv10b = doubleValue / v1;
221
  tv10b = doubleValue / v1;
222
  AddTestCase (new SpectrumValueTestCase (tv7b, v7, "tv7b =  doubleValue + v1"));
222
  AddTestCase (new SpectrumValueTestCase (tv7b, v7, "tv7b =  doubleValue + v1"), TestCase::QUICK);
223
  AddTestCase (new SpectrumValueTestCase (tv8b, v8, "tv8b =  doubleValue - v1"));
223
  AddTestCase (new SpectrumValueTestCase (tv8b, v8, "tv8b =  doubleValue - v1"), TestCase::QUICK);
224
  AddTestCase (new SpectrumValueTestCase (tv9b, v9, "tv9b =  doubleValue * v1"));
224
  AddTestCase (new SpectrumValueTestCase (tv9b, v9, "tv9b =  doubleValue * v1"), TestCase::QUICK);
225
  AddTestCase (new SpectrumValueTestCase (tv10b, v10, "tv10b = doubleValue div v1"));
225
  AddTestCase (new SpectrumValueTestCase (tv10b, v10, "tv10b = doubleValue div v1"), TestCase::QUICK);
226
226
227
227
228
228
 Lines 234-246    Link Here 
234
  v1ls3[0] = v1[3];
234
  v1ls3[0] = v1[3];
235
  v1ls3[1] = v1[4];
235
  v1ls3[1] = v1[4];
236
  tv1ls3 = v1 << 3;
236
  tv1ls3 = v1 << 3;
237
  AddTestCase (new SpectrumValueTestCase (tv1ls3, v1ls3, "tv1ls3 = v1 << 3"));
237
  AddTestCase (new SpectrumValueTestCase (tv1ls3, v1ls3, "tv1ls3 = v1 << 3"), TestCase::QUICK);
238
238
239
239
240
  v1rs3[3] = v1[0];
240
  v1rs3[3] = v1[0];
241
  v1rs3[4] = v1[1];
241
  v1rs3[4] = v1[1];
242
  tv1rs3 = v1 >> 3;
242
  tv1rs3 = v1 >> 3;
243
  AddTestCase (new SpectrumValueTestCase (tv1rs3, v1rs3, "tv1rs3 = v1 >> 3"));
243
  AddTestCase (new SpectrumValueTestCase (tv1rs3, v1rs3, "tv1rs3 = v1 >> 3"), TestCase::QUICK);
244
244
245
245
246
}
246
}
 Lines 296-302    Link Here 
296
//   NS_LOG_LOGIC(t12);
296
//   NS_LOG_LOGIC(t12);
297
//   NS_LOG_LOGIC(*res);
297
//   NS_LOG_LOGIC(*res);
298
298
299
  AddTestCase (new SpectrumValueTestCase (t12, *res, ""));
299
  AddTestCase (new SpectrumValueTestCase (t12, *res, ""), TestCase::QUICK);
300
  // TEST_ASSERT(MoreOrLessEqual(t12, *res));
300
  // TEST_ASSERT(MoreOrLessEqual(t12, *res));
301
301
302
  Ptr<SpectrumValue> v2a = Create<SpectrumValue> (sof2);
302
  Ptr<SpectrumValue> v2a = Create<SpectrumValue> (sof2);
 Lines 308-314    Link Here 
308
//   NS_LOG_LOGIC(*v2a);
308
//   NS_LOG_LOGIC(*v2a);
309
//   NS_LOG_LOGIC(t21a);
309
//   NS_LOG_LOGIC(t21a);
310
//   NS_LOG_LOGIC(*res);
310
//   NS_LOG_LOGIC(*res);
311
  AddTestCase (new SpectrumValueTestCase (t21a, *res, ""));
311
  AddTestCase (new SpectrumValueTestCase (t21a, *res, ""), TestCase::QUICK);
312
  // TEST_ASSERT(MoreOrLessEqual(t21a, *res));
312
  // TEST_ASSERT(MoreOrLessEqual(t21a, *res));
313
313
314
  Ptr<SpectrumValue> v2b = Create<SpectrumValue> (sof2);
314
  Ptr<SpectrumValue> v2b = Create<SpectrumValue> (sof2);
 Lines 327-333    Link Here 
327
//   NS_LOG_LOGIC(*v2b);
327
//   NS_LOG_LOGIC(*v2b);
328
//   NS_LOG_LOGIC(t21b);
328
//   NS_LOG_LOGIC(t21b);
329
//   NS_LOG_LOGIC(*res);
329
//   NS_LOG_LOGIC(*res);
330
  AddTestCase (new SpectrumValueTestCase (t21b, *res, ""));
330
  AddTestCase (new SpectrumValueTestCase (t21b, *res, ""), TestCase::QUICK);
331
331
332
332
333
}
333
}
(-)a/src/stats/test/basic-data-calculators-test-suite.cc (-3 / +3 lines)
 Lines 270-278    Link Here 
270
BasicDataCalculatorsTestSuite::BasicDataCalculatorsTestSuite ()
270
BasicDataCalculatorsTestSuite::BasicDataCalculatorsTestSuite ()
271
  : TestSuite ("basic-data-calculators", UNIT)
271
  : TestSuite ("basic-data-calculators", UNIT)
272
{
272
{
273
  AddTestCase (new OneIntegerTestCase);
273
  AddTestCase (new OneIntegerTestCase, TestCase::QUICK);
274
  AddTestCase (new FiveIntegersTestCase);
274
  AddTestCase (new FiveIntegersTestCase, TestCase::QUICK);
275
  AddTestCase (new FiveDoublesTestCase);
275
  AddTestCase (new FiveDoublesTestCase, TestCase::QUICK);
276
}
276
}
277
277
278
static BasicDataCalculatorsTestSuite basicDataCalculatorsTestSuite;
278
static BasicDataCalculatorsTestSuite basicDataCalculatorsTestSuite;
(-)a/src/test/csma-system-test-suite.cc (-8 / +8 lines)
 Lines 1079-1092    Link Here 
1079
CsmaSystemTestSuite::CsmaSystemTestSuite ()
1079
CsmaSystemTestSuite::CsmaSystemTestSuite ()
1080
  : TestSuite ("csma-system", UNIT)
1080
  : TestSuite ("csma-system", UNIT)
1081
{
1081
{
1082
  AddTestCase (new CsmaBridgeTestCase);
1082
  AddTestCase (new CsmaBridgeTestCase, TestCase::QUICK);
1083
  AddTestCase (new CsmaBroadcastTestCase);
1083
  AddTestCase (new CsmaBroadcastTestCase, TestCase::QUICK);
1084
  AddTestCase (new CsmaMulticastTestCase);
1084
  AddTestCase (new CsmaMulticastTestCase, TestCase::QUICK);
1085
  AddTestCase (new CsmaOneSubnetTestCase);
1085
  AddTestCase (new CsmaOneSubnetTestCase, TestCase::QUICK);
1086
  AddTestCase (new CsmaPacketSocketTestCase);
1086
  AddTestCase (new CsmaPacketSocketTestCase, TestCase::QUICK);
1087
  AddTestCase (new CsmaPingTestCase);
1087
  AddTestCase (new CsmaPingTestCase, TestCase::QUICK);
1088
  AddTestCase (new CsmaRawIpSocketTestCase);
1088
  AddTestCase (new CsmaRawIpSocketTestCase, TestCase::QUICK);
1089
  AddTestCase (new CsmaStarTestCase);
1089
  AddTestCase (new CsmaStarTestCase, TestCase::QUICK);
1090
}
1090
}
1091
1091
1092
// Do not forget to allocate an instance of this TestSuite
1092
// Do not forget to allocate an instance of this TestSuite
(-)a/src/test/global-routing-test-suite.cc (-2 / +2 lines)
 Lines 395-402    Link Here 
395
GlobalRoutingTestSuite::GlobalRoutingTestSuite ()
395
GlobalRoutingTestSuite::GlobalRoutingTestSuite ()
396
  : TestSuite ("global-routing", UNIT)
396
  : TestSuite ("global-routing", UNIT)
397
{
397
{
398
  AddTestCase (new DynamicGlobalRoutingTestCase);
398
  AddTestCase (new DynamicGlobalRoutingTestCase, TestCase::QUICK);
399
  AddTestCase (new GlobalRoutingSlash32TestCase);
399
  AddTestCase (new GlobalRoutingSlash32TestCase, TestCase::QUICK);
400
}
400
}
401
401
402
// Do not forget to allocate an instance of this TestSuite
402
// Do not forget to allocate an instance of this TestSuite
(-)a/src/test/mobility-test-suite.cc (-4 / +4 lines)
 Lines 363-372    Link Here 
363
MobilityTestSuite::MobilityTestSuite ()
363
MobilityTestSuite::MobilityTestSuite ()
364
  : TestSuite ("mobility", UNIT)
364
  : TestSuite ("mobility", UNIT)
365
{
365
{
366
  AddTestCase (new WaypointLazyNotifyFalse);
366
  AddTestCase (new WaypointLazyNotifyFalse, TestCase::QUICK);
367
  AddTestCase (new WaypointLazyNotifyTrue);
367
  AddTestCase (new WaypointLazyNotifyTrue, TestCase::QUICK);
368
  AddTestCase (new WaypointInitialPositionIsWaypoint);
368
  AddTestCase (new WaypointInitialPositionIsWaypoint, TestCase::QUICK);
369
  AddTestCase (new WaypointMobilityModelViaHelper);
369
  AddTestCase (new WaypointMobilityModelViaHelper, TestCase::QUICK);
370
}
370
}
371
371
372
static MobilityTestSuite mobilityTestSuite;
372
static MobilityTestSuite mobilityTestSuite;
(-)a/src/test/ns3tcp/ns3tcp-cwnd-test-suite.cc (-2 / +2 lines)
 Lines 588-595    Link Here 
588
Ns3TcpCwndTestSuite::Ns3TcpCwndTestSuite ()
588
Ns3TcpCwndTestSuite::Ns3TcpCwndTestSuite ()
589
  : TestSuite ("ns3-tcp-cwnd", SYSTEM)
589
  : TestSuite ("ns3-tcp-cwnd", SYSTEM)
590
{
590
{
591
  AddTestCase (new Ns3TcpCwndTestCase1);
591
  AddTestCase (new Ns3TcpCwndTestCase1, TestCase::QUICK);
592
  AddTestCase (new Ns3TcpCwndTestCase2);
592
  AddTestCase (new Ns3TcpCwndTestCase2, TestCase::QUICK);
593
}
593
}
594
594
595
Ns3TcpCwndTestSuite ns3TcpCwndTestSuite;
595
Ns3TcpCwndTestSuite ns3TcpCwndTestSuite;
(-)a/src/test/ns3tcp/ns3tcp-interop-test-suite.cc (-1 / +1 lines)
 Lines 311-317    Link Here 
311
Ns3TcpInteroperabilityTestSuite::Ns3TcpInteroperabilityTestSuite ()
311
Ns3TcpInteroperabilityTestSuite::Ns3TcpInteroperabilityTestSuite ()
312
  : TestSuite ("ns3-tcp-interoperability", SYSTEM)
312
  : TestSuite ("ns3-tcp-interoperability", SYSTEM)
313
{
313
{
314
  AddTestCase (new Ns3TcpInteroperabilityTestCase);
314
  AddTestCase (new Ns3TcpInteroperabilityTestCase, TestCase::QUICK);
315
}
315
}
316
316
317
static Ns3TcpInteroperabilityTestSuite ns3TcpInteroperabilityTestSuite;
317
static Ns3TcpInteroperabilityTestSuite ns3TcpInteroperabilityTestSuite;
(-)a/src/test/ns3tcp/ns3tcp-loss-test-suite.cc (-15 / +15 lines)
 Lines 447-469    Link Here 
447
  SetDataDir (NS_TEST_SOURCEDIR);
447
  SetDataDir (NS_TEST_SOURCEDIR);
448
  Packet::EnablePrinting ();  // Enable packet metadata for all test cases
448
  Packet::EnablePrinting ();  // Enable packet metadata for all test cases
449
449
450
  AddTestCase (new Ns3TcpLossTestCase ("Tahoe", 0));
450
  AddTestCase (new Ns3TcpLossTestCase ("Tahoe", 0), TestCase::QUICK);
451
  AddTestCase (new Ns3TcpLossTestCase ("Tahoe", 1));
451
  AddTestCase (new Ns3TcpLossTestCase ("Tahoe", 1), TestCase::QUICK);
452
  AddTestCase (new Ns3TcpLossTestCase ("Tahoe", 2));
452
  AddTestCase (new Ns3TcpLossTestCase ("Tahoe", 2), TestCase::QUICK);
453
  AddTestCase (new Ns3TcpLossTestCase ("Tahoe", 3));
453
  AddTestCase (new Ns3TcpLossTestCase ("Tahoe", 3), TestCase::QUICK);
454
  AddTestCase (new Ns3TcpLossTestCase ("Tahoe", 4));
454
  AddTestCase (new Ns3TcpLossTestCase ("Tahoe", 4), TestCase::QUICK);
455
455
456
  AddTestCase (new Ns3TcpLossTestCase ("Reno", 0));
456
  AddTestCase (new Ns3TcpLossTestCase ("Reno", 0), TestCase::QUICK);
457
  AddTestCase (new Ns3TcpLossTestCase ("Reno", 1));
457
  AddTestCase (new Ns3TcpLossTestCase ("Reno", 1), TestCase::QUICK);
458
  AddTestCase (new Ns3TcpLossTestCase ("Reno", 2));
458
  AddTestCase (new Ns3TcpLossTestCase ("Reno", 2), TestCase::QUICK);
459
  AddTestCase (new Ns3TcpLossTestCase ("Reno", 3));
459
  AddTestCase (new Ns3TcpLossTestCase ("Reno", 3), TestCase::QUICK);
460
  AddTestCase (new Ns3TcpLossTestCase ("Reno", 4));
460
  AddTestCase (new Ns3TcpLossTestCase ("Reno", 4), TestCase::QUICK);
461
461
462
  AddTestCase (new Ns3TcpLossTestCase ("NewReno", 0));
462
  AddTestCase (new Ns3TcpLossTestCase ("NewReno", 0), TestCase::QUICK);
463
  AddTestCase (new Ns3TcpLossTestCase ("NewReno", 1));
463
  AddTestCase (new Ns3TcpLossTestCase ("NewReno", 1), TestCase::QUICK);
464
  AddTestCase (new Ns3TcpLossTestCase ("NewReno", 2));
464
  AddTestCase (new Ns3TcpLossTestCase ("NewReno", 2), TestCase::QUICK);
465
  AddTestCase (new Ns3TcpLossTestCase ("NewReno", 3));
465
  AddTestCase (new Ns3TcpLossTestCase ("NewReno", 3), TestCase::QUICK);
466
  AddTestCase (new Ns3TcpLossTestCase ("NewReno", 4));
466
  AddTestCase (new Ns3TcpLossTestCase ("NewReno", 4), TestCase::QUICK);
467
467
468
}
468
}
469
469
(-)a/src/test/ns3tcp/ns3tcp-no-delay-test-suite.cc (-2 / +2 lines)
 Lines 199-206    Link Here 
199
Ns3TcpNoDelayTestSuite::Ns3TcpNoDelayTestSuite ()
199
Ns3TcpNoDelayTestSuite::Ns3TcpNoDelayTestSuite ()
200
  : TestSuite ("ns3-tcp-no-delay", SYSTEM)
200
  : TestSuite ("ns3-tcp-no-delay", SYSTEM)
201
{
201
{
202
  AddTestCase (new Ns3TcpNoDelayTestCase (true));
202
  AddTestCase (new Ns3TcpNoDelayTestCase (true), TestCase::QUICK);
203
  AddTestCase (new Ns3TcpNoDelayTestCase (false));
203
  AddTestCase (new Ns3TcpNoDelayTestCase (false), TestCase::QUICK);
204
}
204
}
205
205
206
static Ns3TcpNoDelayTestSuite ns3TcpNoDelayTestSuite;
206
static Ns3TcpNoDelayTestSuite ns3TcpNoDelayTestSuite;
(-)a/src/test/ns3tcp/ns3tcp-socket-test-suite.cc (-2 / +2 lines)
 Lines 271-278    Link Here 
271
Ns3TcpSocketTestSuite::Ns3TcpSocketTestSuite ()
271
Ns3TcpSocketTestSuite::Ns3TcpSocketTestSuite ()
272
  : TestSuite ("ns3-tcp-socket", SYSTEM)
272
  : TestSuite ("ns3-tcp-socket", SYSTEM)
273
{
273
{
274
  AddTestCase (new Ns3TcpSocketTestCase1);
274
  AddTestCase (new Ns3TcpSocketTestCase1, TestCase::QUICK);
275
  AddTestCase (new Ns3TcpSocketTestCase2);
275
  AddTestCase (new Ns3TcpSocketTestCase2, TestCase::QUICK);
276
}
276
}
277
277
278
static Ns3TcpSocketTestSuite ns3TcpSocketTestSuite;
278
static Ns3TcpSocketTestSuite ns3TcpSocketTestSuite;
(-)a/src/test/ns3tcp/ns3tcp-state-test-suite.cc (-9 / +9 lines)
 Lines 449-463    Link Here 
449
  : TestSuite ("ns3-tcp-state", SYSTEM)
449
  : TestSuite ("ns3-tcp-state", SYSTEM)
450
{
450
{
451
  Packet::EnablePrinting ();  // Enable packet metadata for all test cases
451
  Packet::EnablePrinting ();  // Enable packet metadata for all test cases
452
  AddTestCase (new Ns3TcpStateTestCase (0));
452
  AddTestCase (new Ns3TcpStateTestCase (0), TestCase::QUICK);
453
  AddTestCase (new Ns3TcpStateTestCase (1));
453
  AddTestCase (new Ns3TcpStateTestCase (1), TestCase::QUICK);
454
  AddTestCase (new Ns3TcpStateTestCase (2));
454
  AddTestCase (new Ns3TcpStateTestCase (2), TestCase::QUICK);
455
  AddTestCase (new Ns3TcpStateTestCase (3));
455
  AddTestCase (new Ns3TcpStateTestCase (3), TestCase::QUICK);
456
  AddTestCase (new Ns3TcpStateTestCase (4));
456
  AddTestCase (new Ns3TcpStateTestCase (4), TestCase::QUICK);
457
  AddTestCase (new Ns3TcpStateTestCase (5));
457
  AddTestCase (new Ns3TcpStateTestCase (5), TestCase::QUICK);
458
  AddTestCase (new Ns3TcpStateTestCase (6));
458
  AddTestCase (new Ns3TcpStateTestCase (6), TestCase::QUICK);
459
  AddTestCase (new Ns3TcpStateTestCase (7));
459
  AddTestCase (new Ns3TcpStateTestCase (7), TestCase::QUICK);
460
  AddTestCase (new Ns3TcpStateTestCase (8));
460
  AddTestCase (new Ns3TcpStateTestCase (8), TestCase::QUICK);
461
}
461
}
462
462
463
static Ns3TcpStateTestSuite ns3TcpLossTestSuite;
463
static Ns3TcpStateTestSuite ns3TcpLossTestSuite;
(-)a/src/test/ns3tcp/nsctcp-loss-test-suite.cc (-2 / +2 lines)
 Lines 271-278    Link Here 
271
NscTcpLossTestSuite::NscTcpLossTestSuite ()
271
NscTcpLossTestSuite::NscTcpLossTestSuite ()
272
  : TestSuite ("nsc-tcp-loss", SYSTEM)
272
  : TestSuite ("nsc-tcp-loss", SYSTEM)
273
{
273
{
274
  AddTestCase (new NscTcpLossTestCase1);
274
  AddTestCase (new NscTcpLossTestCase1, TestCase::QUICK);
275
  AddTestCase (new NscTcpLossTestCase2);
275
  AddTestCase (new NscTcpLossTestCase2, TestCase::QUICK);
276
}
276
}
277
277
278
static NscTcpLossTestSuite nscTcpLossTestSuite;
278
static NscTcpLossTestSuite nscTcpLossTestSuite;
(-)a/src/test/ns3wifi/wifi-interference-test-suite.cc (-1 / +1 lines)
 Lines 282-288    Link Here 
282
WifiInterferenceTestSuite::WifiInterferenceTestSuite ()
282
WifiInterferenceTestSuite::WifiInterferenceTestSuite ()
283
  : TestSuite ("ns3-wifi-interference", UNIT)
283
  : TestSuite ("ns3-wifi-interference", UNIT)
284
{
284
{
285
  AddTestCase (new WifiInterferenceTestCase);
285
  AddTestCase (new WifiInterferenceTestCase, TestCase::QUICK);
286
}
286
}
287
287
288
static WifiInterferenceTestSuite wifiInterferenceTestSuite;
288
static WifiInterferenceTestSuite wifiInterferenceTestSuite;
(-)a/src/test/ns3wifi/wifi-msdu-aggregator-test-suite.cc (-1 / +1 lines)
 Lines 201-207    Link Here 
201
WifiMsduAggregatorTestSuite::WifiMsduAggregatorTestSuite ()
201
WifiMsduAggregatorTestSuite::WifiMsduAggregatorTestSuite ()
202
  : TestSuite ("ns3-wifi-msdu-aggregator", SYSTEM)
202
  : TestSuite ("ns3-wifi-msdu-aggregator", SYSTEM)
203
{
203
{
204
  AddTestCase (new WifiMsduAggregatorThroughputTest);
204
  AddTestCase (new WifiMsduAggregatorThroughputTest, TestCase::QUICK);
205
}
205
}
206
206
207
static WifiMsduAggregatorTestSuite wifiMsduAggregatorTestSuite;
207
static WifiMsduAggregatorTestSuite wifiMsduAggregatorTestSuite;
(-)a/src/test/static-routing-test-suite.cc (-1 / +1 lines)
 Lines 163-169    Link Here 
163
StaticRoutingTestSuite::StaticRoutingTestSuite ()
163
StaticRoutingTestSuite::StaticRoutingTestSuite ()
164
  : TestSuite ("static-routing", UNIT)
164
  : TestSuite ("static-routing", UNIT)
165
{
165
{
166
  AddTestCase (new StaticRoutingSlash32TestCase);
166
  AddTestCase (new StaticRoutingSlash32TestCase, TestCase::QUICK);
167
}
167
}
168
168
169
// Do not forget to allocate an instance of this TestSuite
169
// Do not forget to allocate an instance of this TestSuite
(-)a/src/tools/test/average-test-suite.cc (-3 / +3 lines)
 Lines 264-272    Link Here 
264
AverageTestSuite::AverageTestSuite ()
264
AverageTestSuite::AverageTestSuite ()
265
  : TestSuite ("average", UNIT)
265
  : TestSuite ("average", UNIT)
266
{
266
{
267
  AddTestCase (new OneIntegerAverageTestCase);
267
  AddTestCase (new OneIntegerAverageTestCase, TestCase::QUICK);
268
  AddTestCase (new FiveIntegersAverageTestCase);
268
  AddTestCase (new FiveIntegersAverageTestCase, TestCase::QUICK);
269
  AddTestCase (new FiveDoublesAverageTestCase);
269
  AddTestCase (new FiveDoublesAverageTestCase, TestCase::QUICK);
270
}
270
}
271
271
272
static AverageTestSuite averageTestSuite;
272
static AverageTestSuite averageTestSuite;
(-)a/src/tools/test/event-garbage-collector-test-suite.cc (-1 / +1 lines)
 Lines 81-87    Link Here 
81
  EventGarbageCollectorTestSuite ()
81
  EventGarbageCollectorTestSuite ()
82
    : TestSuite ("event-garbage-collector", UNIT) 
82
    : TestSuite ("event-garbage-collector", UNIT) 
83
  {
83
  {
84
    AddTestCase (new EventGarbageCollectorTestCase ());
84
    AddTestCase (new EventGarbageCollectorTestCase (), TestCase::QUICK);
85
  }
85
  }
86
} g_eventGarbageCollectorTests;
86
} g_eventGarbageCollectorTests;
87
87
(-)a/src/topology-read/test/rocketfuel-topology-reader-test-suite.cc (-1 / +1 lines)
 Lines 82-88    Link Here 
82
RocketfuelTopologyReaderTestSuite::RocketfuelTopologyReaderTestSuite ()
82
RocketfuelTopologyReaderTestSuite::RocketfuelTopologyReaderTestSuite ()
83
  : TestSuite ("rocketfuel-topology-reader", UNIT)
83
  : TestSuite ("rocketfuel-topology-reader", UNIT)
84
{
84
{
85
  AddTestCase (new RocketfuelTopologyReaderTest ());
85
  AddTestCase (new RocketfuelTopologyReaderTest (), TestCase::QUICK);
86
}
86
}
87
87
88
static RocketfuelTopologyReaderTestSuite rocketfuelTopologyReaderTestSuite;
88
static RocketfuelTopologyReaderTestSuite rocketfuelTopologyReaderTestSuite;
(-)a/src/uan/test/uan-energy-model-test.cc (-2 / +2 lines)
 Lines 303-310    Link Here 
303
UanEnergyModelTestSuite::UanEnergyModelTestSuite ()
303
UanEnergyModelTestSuite::UanEnergyModelTestSuite ()
304
  : TestSuite ("uan-energy-model", UNIT)
304
  : TestSuite ("uan-energy-model", UNIT)
305
{
305
{
306
  AddTestCase (new AcousticModemEnergyTestCase);
306
  AddTestCase (new AcousticModemEnergyTestCase, TestCase::QUICK);
307
  AddTestCase (new AcousticModemEnergyDepletionTestCase);
307
  AddTestCase (new AcousticModemEnergyDepletionTestCase, TestCase::QUICK);
308
}
308
}
309
309
310
// create an instance of the test suite
310
// create an instance of the test suite
(-)a/src/uan/test/uan-test.cc (-1 / +1 lines)
 Lines 250-256    Link Here 
250
UanTestSuite::UanTestSuite ()
250
UanTestSuite::UanTestSuite ()
251
  :  TestSuite ("devices-uan", UNIT)
251
  :  TestSuite ("devices-uan", UNIT)
252
{
252
{
253
  AddTestCase (new UanTest);
253
  AddTestCase (new UanTest, TestCase::QUICK);
254
}
254
}
255
255
256
static UanTestSuite g_uanTestSuite;
256
static UanTestSuite g_uanTestSuite;
(-)a/src/wifi/test/block-ack-test-suite.cc (-3 / +3 lines)
 Lines 284-292    Link Here 
284
BlockAckTestSuite::BlockAckTestSuite ()
284
BlockAckTestSuite::BlockAckTestSuite ()
285
  : TestSuite ("wifi-block-ack", UNIT)
285
  : TestSuite ("wifi-block-ack", UNIT)
286
{
286
{
287
  AddTestCase (new PacketBufferingCaseA);
287
  AddTestCase (new PacketBufferingCaseA, TestCase::QUICK);
288
  AddTestCase (new PacketBufferingCaseB);
288
  AddTestCase (new PacketBufferingCaseB, TestCase::QUICK);
289
  AddTestCase (new CtrlBAckResponseHeaderTest);
289
  AddTestCase (new CtrlBAckResponseHeaderTest, TestCase::QUICK);
290
}
290
}
291
291
292
static BlockAckTestSuite g_blockAckTestSuite;
292
static BlockAckTestSuite g_blockAckTestSuite;
(-)a/src/wifi/test/dcf-manager-test.cc (-1 / +1 lines)
 Lines 682-688    Link Here 
682
DcfTestSuite::DcfTestSuite ()
682
DcfTestSuite::DcfTestSuite ()
683
  : TestSuite ("devices-wifi-dcf", UNIT)
683
  : TestSuite ("devices-wifi-dcf", UNIT)
684
{
684
{
685
  AddTestCase (new DcfManagerTest);
685
  AddTestCase (new DcfManagerTest, TestCase::QUICK);
686
}
686
}
687
687
688
static DcfTestSuite g_dcfTestSuite;
688
static DcfTestSuite g_dcfTestSuite;
(-)a/src/wifi/test/tx-duration-test.cc (-1 / +1 lines)
 Lines 188-194    Link Here 
188
TxDurationTestSuite::TxDurationTestSuite ()
188
TxDurationTestSuite::TxDurationTestSuite ()
189
  : TestSuite ("devices-wifi-tx-duration", UNIT)
189
  : TestSuite ("devices-wifi-tx-duration", UNIT)
190
{
190
{
191
  AddTestCase (new TxDurationTest);
191
  AddTestCase (new TxDurationTest, TestCase::QUICK);
192
}
192
}
193
193
194
static TxDurationTestSuite g_txDurationTestSuite;
194
static TxDurationTestSuite g_txDurationTestSuite;
(-)a/src/wifi/test/wifi-test.cc (-4 / +4 lines)
 Lines 438-447    Link Here 
438
WifiTestSuite::WifiTestSuite ()
438
WifiTestSuite::WifiTestSuite ()
439
  : TestSuite ("devices-wifi", UNIT)
439
  : TestSuite ("devices-wifi", UNIT)
440
{
440
{
441
  AddTestCase (new WifiTest);
441
  AddTestCase (new WifiTest, TestCase::QUICK);
442
  AddTestCase (new QosUtilsIsOldPacketTest);
442
  AddTestCase (new QosUtilsIsOldPacketTest, TestCase::QUICK);
443
  AddTestCase (new InterferenceHelperSequenceTest); // Bug 991
443
  AddTestCase (new InterferenceHelperSequenceTest, TestCase::QUICK); // Bug 991
444
  AddTestCase (new Bug555TestCase); // Bug 555
444
  AddTestCase (new Bug555TestCase, TestCase::QUICK); // Bug 555
445
}
445
}
446
446
447
static WifiTestSuite g_wifiTestSuite;
447
static WifiTestSuite g_wifiTestSuite;
(-)a/src/wimax/test/mac-messages-test.cc (-1 / +1 lines)
 Lines 112-118    Link Here 
112
Ns3WimaxMacMessagesTestSuite::Ns3WimaxMacMessagesTestSuite ()
112
Ns3WimaxMacMessagesTestSuite::Ns3WimaxMacMessagesTestSuite ()
113
  : TestSuite ("wimax-mac-messages", UNIT)
113
  : TestSuite ("wimax-mac-messages", UNIT)
114
{
114
{
115
  AddTestCase (new DsaRequestTestCase);
115
  AddTestCase (new DsaRequestTestCase, TestCase::QUICK);
116
}
116
}
117
117
118
static Ns3WimaxMacMessagesTestSuite ns3WimaxMacMessagesTestSuite;
118
static Ns3WimaxMacMessagesTestSuite ns3WimaxMacMessagesTestSuite;
(-)a/src/wimax/test/phy-test.cc (-2 / +2 lines)
 Lines 180-187    Link Here 
180
Ns3WimaxPhyTestSuite::Ns3WimaxPhyTestSuite ()
180
Ns3WimaxPhyTestSuite::Ns3WimaxPhyTestSuite ()
181
  : TestSuite ("wimax-phy-layer", UNIT)
181
  : TestSuite ("wimax-phy-layer", UNIT)
182
{
182
{
183
  AddTestCase (new Ns3WimaxSNRtoBLERTestCase);
183
  AddTestCase (new Ns3WimaxSNRtoBLERTestCase, TestCase::QUICK);
184
  AddTestCase (new Ns3WimaxSimpleOFDMTestCase);
184
  AddTestCase (new Ns3WimaxSimpleOFDMTestCase, TestCase::QUICK);
185
185
186
}
186
}
187
187
(-)a/src/wimax/test/qos-test.cc (-2 / +2 lines)
 Lines 287-294    Link Here 
287
Ns3WimaxQoSTestSuite::Ns3WimaxQoSTestSuite ()
287
Ns3WimaxQoSTestSuite::Ns3WimaxQoSTestSuite ()
288
  : TestSuite ("wimax-qos", SYSTEM)
288
  : TestSuite ("wimax-qos", SYSTEM)
289
{
289
{
290
  AddTestCase (new Ns3WimaxSFTypeTestCase);
290
  AddTestCase (new Ns3WimaxSFTypeTestCase, TestCase::QUICK);
291
  AddTestCase (new Ns3WimaxSchedulingTestCase);
291
  AddTestCase (new Ns3WimaxSchedulingTestCase, TestCase::QUICK);
292
}
292
}
293
293
294
static Ns3WimaxQoSTestSuite ns3WimaxQoSTestSuite;
294
static Ns3WimaxQoSTestSuite ns3WimaxQoSTestSuite;
(-)a/src/wimax/test/ss-mac-test.cc (-2 / +2 lines)
 Lines 165-172    Link Here 
165
Ns3WimaxSSMacTestSuite::Ns3WimaxSSMacTestSuite ()
165
Ns3WimaxSSMacTestSuite::Ns3WimaxSSMacTestSuite ()
166
  : TestSuite ("wimax-ss-mac-layer", UNIT)
166
  : TestSuite ("wimax-ss-mac-layer", UNIT)
167
{
167
{
168
  AddTestCase (new Ns3WimaxNetworkEntryTestCase);
168
  AddTestCase (new Ns3WimaxNetworkEntryTestCase, TestCase::QUICK);
169
  AddTestCase (new Ns3WimaxManagementConnectionsTestCase);
169
  AddTestCase (new Ns3WimaxManagementConnectionsTestCase, TestCase::QUICK);
170
}
170
}
171
171
172
static Ns3WimaxSSMacTestSuite ns3WimaxSSMacTestSuite;
172
static Ns3WimaxSSMacTestSuite ns3WimaxSSMacTestSuite;
(-)a/src/wimax/test/wimax-fragmentation-test.cc (-1 / +1 lines)
 Lines 161-167    Link Here 
161
Ns3WimaxFragmentationTestSuite::Ns3WimaxFragmentationTestSuite ()
161
Ns3WimaxFragmentationTestSuite::Ns3WimaxFragmentationTestSuite ()
162
  : TestSuite ("wimax-fragmentation", UNIT)
162
  : TestSuite ("wimax-fragmentation", UNIT)
163
{
163
{
164
  AddTestCase (new Ns3WimaxFragmentationTestCase);
164
  AddTestCase (new Ns3WimaxFragmentationTestCase, TestCase::QUICK);
165
}
165
}
166
166
167
static Ns3WimaxFragmentationTestSuite ns3WimaxFragmentationTestSuite;
167
static Ns3WimaxFragmentationTestSuite ns3WimaxFragmentationTestSuite;
(-)a/src/wimax/test/wimax-service-flow-test.cc (-1 / +1 lines)
 Lines 165-171    Link Here 
165
Ns3WimaxServiceFlowTestSuite::Ns3WimaxServiceFlowTestSuite ()
165
Ns3WimaxServiceFlowTestSuite::Ns3WimaxServiceFlowTestSuite ()
166
  : TestSuite ("wimax-service-flow", UNIT)
166
  : TestSuite ("wimax-service-flow", UNIT)
167
{
167
{
168
  AddTestCase (new Ns3WimaxSfCreationTestCase);
168
  AddTestCase (new Ns3WimaxSfCreationTestCase, TestCase::QUICK);
169
}
169
}
170
170
171
static Ns3WimaxServiceFlowTestSuite ns3WimaxServiceFlowTestSuite;
171
static Ns3WimaxServiceFlowTestSuite ns3WimaxServiceFlowTestSuite;
(-)a/src/wimax/test/wimax-tlv-test.cc (-2 / +2 lines)
 Lines 208-215    Link Here 
208
Ns3WimaxTlvTestSuite::Ns3WimaxTlvTestSuite ()
208
Ns3WimaxTlvTestSuite::Ns3WimaxTlvTestSuite ()
209
  : TestSuite ("wimax-tlv", UNIT)
209
  : TestSuite ("wimax-tlv", UNIT)
210
{
210
{
211
  AddTestCase (new Ns3WimaxCsParamTlvTestCase);
211
  AddTestCase (new Ns3WimaxCsParamTlvTestCase, TestCase::QUICK);
212
  AddTestCase (new Ns3WimaxSfTlvTestCase);
212
  AddTestCase (new Ns3WimaxSfTlvTestCase, TestCase::QUICK);
213
}
213
}
214
214
215
static Ns3WimaxTlvTestSuite ns3WimaxTlvTestSuite;
215
static Ns3WimaxTlvTestSuite ns3WimaxTlvTestSuite;

Return to bug 1563