--- a/src/antenna/test/test-angles.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/antenna/test/test-angles.cc Fri Mar 22 13:14:38 2013 +0100
@@ -120,90 +120,90 @@
AnglesTestSuite::AnglesTestSuite ()
: TestSuite ("angles", UNIT)
{
- AddTestCase (new OneVectorConstructorTestCase (Vector (1, 0, 0), Angles (0, M_PI_2)));
- AddTestCase (new OneVectorConstructorTestCase (Vector (-1, 0, 0), Angles (M_PI, M_PI_2)));
- AddTestCase (new OneVectorConstructorTestCase (Vector (0, 1, 0), Angles (M_PI_2, M_PI_2)));
- AddTestCase (new OneVectorConstructorTestCase (Vector (0, -1, 0), Angles (-M_PI_2, M_PI_2)));
- AddTestCase (new OneVectorConstructorTestCase (Vector (0, 0, 1), Angles (0, 0)));
- AddTestCase (new OneVectorConstructorTestCase (Vector (0, 0, -1), Angles (0, M_PI)));
+ AddTestCase (new OneVectorConstructorTestCase (Vector (1, 0, 0), Angles (0, M_PI_2)), TestCase::QUICK);
+ AddTestCase (new OneVectorConstructorTestCase (Vector (-1, 0, 0), Angles (M_PI, M_PI_2)), TestCase::QUICK);
+ AddTestCase (new OneVectorConstructorTestCase (Vector (0, 1, 0), Angles (M_PI_2, M_PI_2)), TestCase::QUICK);
+ AddTestCase (new OneVectorConstructorTestCase (Vector (0, -1, 0), Angles (-M_PI_2, M_PI_2)), TestCase::QUICK);
+ AddTestCase (new OneVectorConstructorTestCase (Vector (0, 0, 1), Angles (0, 0)), TestCase::QUICK);
+ AddTestCase (new OneVectorConstructorTestCase (Vector (0, 0, -1), Angles (0, M_PI)), TestCase::QUICK);
- AddTestCase (new OneVectorConstructorTestCase (Vector (2, 0, 0), Angles (0, M_PI_2)));
- AddTestCase (new OneVectorConstructorTestCase (Vector (-2, 0, 0), Angles (M_PI, M_PI_2)));
- AddTestCase (new OneVectorConstructorTestCase (Vector (0, 2, 0), Angles (M_PI_2, M_PI_2)));
- AddTestCase (new OneVectorConstructorTestCase (Vector (0, -2, 0), Angles (-M_PI_2, M_PI_2)));
- AddTestCase (new OneVectorConstructorTestCase (Vector (0, 0, 2), Angles (0, 0)));
- AddTestCase (new OneVectorConstructorTestCase (Vector (0, 0, -2), Angles (0, M_PI)));
+ AddTestCase (new OneVectorConstructorTestCase (Vector (2, 0, 0), Angles (0, M_PI_2)), TestCase::QUICK);
+ AddTestCase (new OneVectorConstructorTestCase (Vector (-2, 0, 0), Angles (M_PI, M_PI_2)), TestCase::QUICK);
+ AddTestCase (new OneVectorConstructorTestCase (Vector (0, 2, 0), Angles (M_PI_2, M_PI_2)), TestCase::QUICK);
+ AddTestCase (new OneVectorConstructorTestCase (Vector (0, -2, 0), Angles (-M_PI_2, M_PI_2)), TestCase::QUICK);
+ AddTestCase (new OneVectorConstructorTestCase (Vector (0, 0, 2), Angles (0, 0)), TestCase::QUICK);
+ AddTestCase (new OneVectorConstructorTestCase (Vector (0, 0, -2), Angles (0, M_PI)), TestCase::QUICK);
- AddTestCase (new OneVectorConstructorTestCase (Vector (1, 0, 1), Angles (0, M_PI_4)));
- AddTestCase (new OneVectorConstructorTestCase (Vector (1, 0, -1), Angles (0, 3*M_PI_4)));
- AddTestCase (new OneVectorConstructorTestCase (Vector (1, 1, 0), Angles (M_PI_4, M_PI_2)));
- AddTestCase (new OneVectorConstructorTestCase (Vector (1, -1, 0), Angles (-M_PI_4, M_PI_2)));
- AddTestCase (new OneVectorConstructorTestCase (Vector (-1, 0, 1), Angles (M_PI, M_PI_4)));
- AddTestCase (new OneVectorConstructorTestCase (Vector (-1, 0, -1), Angles (M_PI, 3*M_PI_4)));
- AddTestCase (new OneVectorConstructorTestCase (Vector (-1, 1, 0), Angles (3*M_PI_4, M_PI_2)));
- AddTestCase (new OneVectorConstructorTestCase (Vector (-1, -1, 0), Angles (-3*M_PI_4, M_PI_2)));
- AddTestCase (new OneVectorConstructorTestCase (Vector (0, 1, 1), Angles (M_PI_2, M_PI_4)));
- AddTestCase (new OneVectorConstructorTestCase (Vector (0, 1, -1), Angles (M_PI_2, 3*M_PI_4)));
- AddTestCase (new OneVectorConstructorTestCase (Vector (0, -1, 1), Angles (-M_PI_2, M_PI_4)));
- AddTestCase (new OneVectorConstructorTestCase (Vector (0, -1, -1), Angles (-M_PI_2, 3*M_PI_4)));
+ AddTestCase (new OneVectorConstructorTestCase (Vector (1, 0, 1), Angles (0, M_PI_4)), TestCase::QUICK);
+ AddTestCase (new OneVectorConstructorTestCase (Vector (1, 0, -1), Angles (0, 3*M_PI_4)), TestCase::QUICK);
+ AddTestCase (new OneVectorConstructorTestCase (Vector (1, 1, 0), Angles (M_PI_4, M_PI_2)), TestCase::QUICK);
+ AddTestCase (new OneVectorConstructorTestCase (Vector (1, -1, 0), Angles (-M_PI_4, M_PI_2)), TestCase::QUICK);
+ AddTestCase (new OneVectorConstructorTestCase (Vector (-1, 0, 1), Angles (M_PI, M_PI_4)), TestCase::QUICK);
+ AddTestCase (new OneVectorConstructorTestCase (Vector (-1, 0, -1), Angles (M_PI, 3*M_PI_4)), TestCase::QUICK);
+ AddTestCase (new OneVectorConstructorTestCase (Vector (-1, 1, 0), Angles (3*M_PI_4, M_PI_2)), TestCase::QUICK);
+ AddTestCase (new OneVectorConstructorTestCase (Vector (-1, -1, 0), Angles (-3*M_PI_4, M_PI_2)), TestCase::QUICK);
+ AddTestCase (new OneVectorConstructorTestCase (Vector (0, 1, 1), Angles (M_PI_2, M_PI_4)), TestCase::QUICK);
+ AddTestCase (new OneVectorConstructorTestCase (Vector (0, 1, -1), Angles (M_PI_2, 3*M_PI_4)), TestCase::QUICK);
+ AddTestCase (new OneVectorConstructorTestCase (Vector (0, -1, 1), Angles (-M_PI_2, M_PI_4)), TestCase::QUICK);
+ AddTestCase (new OneVectorConstructorTestCase (Vector (0, -1, -1), Angles (-M_PI_2, 3*M_PI_4)), TestCase::QUICK);
- AddTestCase (new OneVectorConstructorTestCase (Vector (1, 1, std::sqrt (2)), Angles (M_PI_4, M_PI_4)));
- AddTestCase (new OneVectorConstructorTestCase (Vector (1, 1, -std::sqrt (2)), Angles (M_PI_4, 3*M_PI_4)));
- AddTestCase (new OneVectorConstructorTestCase (Vector (1, -1, std::sqrt (2)), Angles (-M_PI_4, M_PI_4)));
- AddTestCase (new OneVectorConstructorTestCase (Vector (-1, 1, std::sqrt (2)), Angles (3*M_PI_4, M_PI_4)));
+ AddTestCase (new OneVectorConstructorTestCase (Vector (1, 1, std::sqrt (2)), Angles (M_PI_4, M_PI_4)), TestCase::QUICK);
+ AddTestCase (new OneVectorConstructorTestCase (Vector (1, 1, -std::sqrt (2)), Angles (M_PI_4, 3*M_PI_4)), TestCase::QUICK);
+ AddTestCase (new OneVectorConstructorTestCase (Vector (1, -1, std::sqrt (2)), Angles (-M_PI_4, M_PI_4)), TestCase::QUICK);
+ AddTestCase (new OneVectorConstructorTestCase (Vector (-1, 1, std::sqrt (2)), Angles (3*M_PI_4, M_PI_4)), TestCase::QUICK);
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, 0, 0), Vector (0, 0, 0), Angles (0, M_PI_2)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, 0, 0), Vector (0, 0, 0), Angles (M_PI, M_PI_2)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 1, 0), Vector (0, 0, 0), Angles (M_PI_2, M_PI_2)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, -1, 0), Vector (0, 0, 0), Angles (-M_PI_2, M_PI_2)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 0, 1), Vector (0, 0, 0), Angles (0, 0)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 0, -1), Vector (0, 0, 0), Angles (0, M_PI)));
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, 0, 0), Vector (0, 0, 0), Angles (0, M_PI_2)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, 0, 0), Vector (0, 0, 0), Angles (M_PI, M_PI_2)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 1, 0), Vector (0, 0, 0), Angles (M_PI_2, M_PI_2)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, -1, 0), Vector (0, 0, 0), Angles (-M_PI_2, M_PI_2)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 0, 1), Vector (0, 0, 0), Angles (0, 0)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 0, -1), Vector (0, 0, 0), Angles (0, M_PI)), TestCase::QUICK);
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (2, 0, 0), Vector (0, 0, 0), Angles (0, M_PI_2)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (-2, 0, 0), Vector (0, 0, 0), Angles (M_PI, M_PI_2)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 2, 0), Vector (0, 0, 0), Angles (M_PI_2, M_PI_2)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, -2, 0), Vector (0, 0, 0), Angles (-M_PI_2, M_PI_2)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 0, 2), Vector (0, 0, 0), Angles (0, 0)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 0, -2), Vector (0, 0, 0), Angles (0, M_PI)));
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (2, 0, 0), Vector (0, 0, 0), Angles (0, M_PI_2)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (-2, 0, 0), Vector (0, 0, 0), Angles (M_PI, M_PI_2)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 2, 0), Vector (0, 0, 0), Angles (M_PI_2, M_PI_2)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, -2, 0), Vector (0, 0, 0), Angles (-M_PI_2, M_PI_2)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 0, 2), Vector (0, 0, 0), Angles (0, 0)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 0, -2), Vector (0, 0, 0), Angles (0, M_PI)), TestCase::QUICK);
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, 0, 1), Vector (0, 0, 0), Angles (0, M_PI_4)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, 0, -1), Vector (0, 0, 0), Angles (0, 3*M_PI_4)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, 1, 0), Vector (0, 0, 0), Angles (M_PI_4, M_PI_2)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, -1, 0), Vector (0, 0, 0), Angles (-M_PI_4, M_PI_2)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, 0, 1), Vector (0, 0, 0), Angles (M_PI, M_PI_4)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, 0, -1), Vector (0, 0, 0), Angles (M_PI, 3*M_PI_4)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, 1, 0), Vector (0, 0, 0), Angles (3*M_PI_4, M_PI_2)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, -1, 0), Vector (0, 0, 0), Angles (-3*M_PI_4, M_PI_2)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 1, 1), Vector (0, 0, 0), Angles (M_PI_2, M_PI_4)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 1, -1), Vector (0, 0, 0), Angles (M_PI_2, 3*M_PI_4)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, -1, 1), Vector (0, 0, 0), Angles (-M_PI_2, M_PI_4)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, -1, -1), Vector (0, 0, 0), Angles (-M_PI_2, 3*M_PI_4)));
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, 0, 1), Vector (0, 0, 0), Angles (0, M_PI_4)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, 0, -1), Vector (0, 0, 0), Angles (0, 3*M_PI_4)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, 1, 0), Vector (0, 0, 0), Angles (M_PI_4, M_PI_2)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, -1, 0), Vector (0, 0, 0), Angles (-M_PI_4, M_PI_2)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, 0, 1), Vector (0, 0, 0), Angles (M_PI, M_PI_4)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, 0, -1), Vector (0, 0, 0), Angles (M_PI, 3*M_PI_4)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, 1, 0), Vector (0, 0, 0), Angles (3*M_PI_4, M_PI_2)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, -1, 0), Vector (0, 0, 0), Angles (-3*M_PI_4, M_PI_2)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 1, 1), Vector (0, 0, 0), Angles (M_PI_2, M_PI_4)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, 1, -1), Vector (0, 0, 0), Angles (M_PI_2, 3*M_PI_4)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, -1, 1), Vector (0, 0, 0), Angles (-M_PI_2, M_PI_4)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, -1, -1), Vector (0, 0, 0), Angles (-M_PI_2, 3*M_PI_4)), TestCase::QUICK);
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, 1, std::sqrt (2)), Vector (0, 0, 0), Angles (M_PI_4, M_PI_4)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, 1, -std::sqrt (2)), Vector (0, 0, 0), Angles (M_PI_4, 3*M_PI_4)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, -1, std::sqrt (2)), Vector (0, 0, 0), Angles (-M_PI_4, M_PI_4)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, 1, std::sqrt (2)), Vector (0, 0, 0), Angles (3*M_PI_4, M_PI_4)));
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, 1, std::sqrt (2)), Vector (0, 0, 0), Angles (M_PI_4, M_PI_4)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, 1, -std::sqrt (2)), Vector (0, 0, 0), Angles (M_PI_4, 3*M_PI_4)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, -1, std::sqrt (2)), Vector (0, 0, 0), Angles (-M_PI_4, M_PI_4)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, 1, std::sqrt (2)), Vector (0, 0, 0), Angles (3*M_PI_4, M_PI_4)), TestCase::QUICK);
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (3, 2, 2), Vector (2, 2, 2), Angles (0, M_PI_2)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, 2, 2), Vector (2, 2, 2), Angles (M_PI, M_PI_2)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (2, 3, 2), Vector (2, 2, 2), Angles (M_PI_2, M_PI_2)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, 2, 2), Vector (-1, 3, 2), Angles (-M_PI_2, M_PI_2)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (4, -2, 7), Vector (4, -2, 6), Angles (0, 0)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, -5, -1), Vector (0, -5, 0), Angles (0, M_PI)));
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (3, 2, 2), Vector (2, 2, 2), Angles (0, M_PI_2)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (1, 2, 2), Vector (2, 2, 2), Angles (M_PI, M_PI_2)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (2, 3, 2), Vector (2, 2, 2), Angles (M_PI_2, M_PI_2)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, 2, 2), Vector (-1, 3, 2), Angles (-M_PI_2, M_PI_2)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (4, -2, 7), Vector (4, -2, 6), Angles (0, 0)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, -5, -1), Vector (0, -5, 0), Angles (0, M_PI)), TestCase::QUICK);
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (-2, 2, -1), Vector (-4, 2, -1), Angles (0, M_PI_2)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (2, 2, 0), Vector (4, 2, 0), Angles (M_PI, M_PI_2)));
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (-2, 2, -1), Vector (-4, 2, -1), Angles (0, M_PI_2)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (2, 2, 0), Vector (4, 2, 0), Angles (M_PI, M_PI_2)), TestCase::QUICK);
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, 4, 4), Vector (-2, 4, 3), Angles (0, M_PI_4)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, -2, -6), Vector (-1, -2, -5), Angles (0, 3*M_PI_4)));
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (77, 3, 43), Vector (78, 2, 43), Angles (3*M_PI_4, M_PI_2)));
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (-1, 4, 4), Vector (-2, 4, 3), Angles (0, M_PI_4)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (0, -2, -6), Vector (-1, -2, -5), Angles (0, 3*M_PI_4)), TestCase::QUICK);
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (77, 3, 43), Vector (78, 2, 43), Angles (3*M_PI_4, M_PI_2)), TestCase::QUICK);
- AddTestCase (new TwoVectorsConstructorTestCase (Vector (24, -2, -6 -std::sqrt (2)), Vector (23, -3, -6), Angles (M_PI_4, 3*M_PI_4)));
- 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)));
+ AddTestCase (new TwoVectorsConstructorTestCase (Vector (24, -2, -6 -std::sqrt (2)), Vector (23, -3, -6), Angles (M_PI_4, 3*M_PI_4)), TestCase::QUICK);
+ 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);
};
--- a/src/antenna/test/test-cosine-antenna.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/antenna/test/test-cosine-antenna.cc Fri Mar 22 13:14:38 2013 +0100
@@ -118,88 +118,88 @@
// e.g., with a 60 deg beamwidth, gain is -20dB at +- 74.945 degrees from boresight
// phi, theta, beamwidth, orientation, maxGain, expectedGain, condition
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (0), 0), 60, 0, 0, 0, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (30), 0), 60, 0, 0, -3, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-30), 0), 60, 0, 0, -3, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-90), 0), 60, 0, 0, -20, LESSTHAN));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (90), 0), 60, 0, 0, -20, LESSTHAN));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (100), 0), 60, 0, 0, -20, LESSTHAN));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (150), 0), 60, 0, 0, -20, LESSTHAN));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (180), 0), 60, 0, 0, -20, LESSTHAN));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-100), 0), 60, 0, 0, -20, LESSTHAN));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-150), 0), 60, 0, 0, -20, LESSTHAN));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-180), 0), 60, 0, 0, -20, LESSTHAN));
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (0), 0), 60, 0, 0, 0, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (30), 0), 60, 0, 0, -3, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-30), 0), 60, 0, 0, -3, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-90), 0), 60, 0, 0, -20, LESSTHAN), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (90), 0), 60, 0, 0, -20, LESSTHAN), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (100), 0), 60, 0, 0, -20, LESSTHAN), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (150), 0), 60, 0, 0, -20, LESSTHAN), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (180), 0), 60, 0, 0, -20, LESSTHAN), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-100), 0), 60, 0, 0, -20, LESSTHAN), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-150), 0), 60, 0, 0, -20, LESSTHAN), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-180), 0), 60, 0, 0, -20, LESSTHAN), TestCase::QUICK);
// test positive orientation
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (60), 0), 60, 60, 0, 0, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (90), 0), 60, 60, 0, -3, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (30), 0), 60, 60, 0, -3, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-30), 0), 60, 60, 0, -20, LESSTHAN));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (150), 0), 60, 60, 0, -20, LESSTHAN));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (160), 0), 60, 60, 0, -20, LESSTHAN));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (210), 0), 60, 60, 0, -20, LESSTHAN));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (240), 0), 60, 60, 0, -20, LESSTHAN));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-40), 0), 60, 60, 0, -20, LESSTHAN));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-90), 0), 60, 60, 0, -20, LESSTHAN));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-120), 0), 60, 60, 0, -20, LESSTHAN));
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (60), 0), 60, 60, 0, 0, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (90), 0), 60, 60, 0, -3, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (30), 0), 60, 60, 0, -3, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-30), 0), 60, 60, 0, -20, LESSTHAN), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (150), 0), 60, 60, 0, -20, LESSTHAN), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (160), 0), 60, 60, 0, -20, LESSTHAN), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (210), 0), 60, 60, 0, -20, LESSTHAN), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (240), 0), 60, 60, 0, -20, LESSTHAN), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-40), 0), 60, 60, 0, -20, LESSTHAN), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-90), 0), 60, 60, 0, -20, LESSTHAN), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-120), 0), 60, 60, 0, -20, LESSTHAN), TestCase::QUICK);
// test negative orientation and different beamwidths
// with a 100 deg beamwidth, gain is -20dB at +- 117.47 degrees from boresight
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-150), 0), 100, -150, 0, 0, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-100), 0), 100, -150, 0, -3, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-200), 0), 100, -150, 0, -3, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-32.531), 0), 100, -150, 0, -20, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (92.531), 0), 100, -150, 0, -20, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-30), 0), 100, -150, 0, -20, LESSTHAN));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (0), 0), 100, -150, 0, -20, LESSTHAN));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (60), 0), 100, -150, 0, -20, LESSTHAN));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (90), 0), 100, -150, 0, -20, LESSTHAN));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (30), 0), 100, -150, 0, -20, LESSTHAN));
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-150), 0), 100, -150, 0, 0, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-100), 0), 100, -150, 0, -3, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-200), 0), 100, -150, 0, -3, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-32.531), 0), 100, -150, 0, -20, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (92.531), 0), 100, -150, 0, -20, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-30), 0), 100, -150, 0, -20, LESSTHAN), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (0), 0), 100, -150, 0, -20, LESSTHAN), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (60), 0), 100, -150, 0, -20, LESSTHAN), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (90), 0), 100, -150, 0, -20, LESSTHAN), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (30), 0), 100, -150, 0, -20, LESSTHAN), TestCase::QUICK);
// with a 150 deg beamwidth, gain is -10dB at +- 124.93 degrees from boresight, and -20dB at +- 155.32 degrees from boresight
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-150), 0), 150, -150, 0, 0, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (135), 0), 150, -150, 0, -3, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-75), 0), 150, -150, 0, -3, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (85.070), 0), 150, -150, 0, -10, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-25.070), 0), 150, -150, 0, -10, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (5.3230), 0), 150, -150, 0, -20, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (54.677), 0), 150, -150, 0, -20, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (30), 0), 150, -150, 0, -20, LESSTHAN));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (20), 0), 150, -150, 0, -20, LESSTHAN));
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-150), 0), 150, -150, 0, 0, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (135), 0), 150, -150, 0, -3, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-75), 0), 150, -150, 0, -3, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (85.070), 0), 150, -150, 0, -10, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-25.070), 0), 150, -150, 0, -10, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (5.3230), 0), 150, -150, 0, -20, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (54.677), 0), 150, -150, 0, -20, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (30), 0), 150, -150, 0, -20, LESSTHAN), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (20), 0), 150, -150, 0, -20, LESSTHAN), TestCase::QUICK);
// test maxGain
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (0), 0), 60, 0, 10, 10, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (30), 0), 60, 0, 22, 19, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-30), 0), 60, 0, -4, -7, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-90), 0), 60, 0, 10, -10, LESSTHAN));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (90), 0), 60, 0, -20, -40, LESSTHAN));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (100), 0), 60, 0, 40, 20, LESSTHAN));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-150), 0), 100, -150, 2, 2, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-100), 0), 100, -150, 4, 1, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-200), 0), 100, -150, -1, -4, EQUAL));
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (0), 0), 60, 0, 10, 10, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (30), 0), 60, 0, 22, 19, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-30), 0), 60, 0, -4, -7, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-90), 0), 60, 0, 10, -10, LESSTHAN), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (90), 0), 60, 0, -20, -40, LESSTHAN), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (100), 0), 60, 0, 40, 20, LESSTHAN), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-150), 0), 100, -150, 2, 2, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-100), 0), 100, -150, 4, 1, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-200), 0), 100, -150, -1, -4, EQUAL), TestCase::QUICK);
// test elevation angle
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (0), 2), 60, 0, 0, 0, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (30), 2), 60, 0, 0, -3, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-30), 2), 60, 0, 0, -3, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-90), 2), 60, 0, 0, -20, LESSTHAN));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-180), 2), 60, 0, 0, -20, LESSTHAN));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (60), -3), 60, 60, 0, 0, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (90), -3), 60, 60, 0, -3, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (30), -3), 60, 60, 0, -3, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-120), -3), 60, 60, 0, -20, LESSTHAN));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-150), -3), 100, -150, 0, 0, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-100), -3), 100, -150, 0, -3, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-200), -3), 100, -150, 0, -3, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-30), -3), 100, -150, 0, -20, LESSTHAN));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (90), 9.5), 100, -150, 0, -20, LESSTHAN));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (0), 9.5), 60, 0, 10, 10, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (30), 9.5), 60, 0, 22, 19, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-30), 9.5), 60, 0, -4, -7, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (100), 9.5), 60, 0, 40, 20, LESSTHAN));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-150), 9.5), 100, -150, 2, 2, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-100), 9.5), 100, -150, 4, 1, EQUAL));
- AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-200), 9.5), 100, -150, -1, -4, EQUAL));
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (0), 2), 60, 0, 0, 0, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (30), 2), 60, 0, 0, -3, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-30), 2), 60, 0, 0, -3, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-90), 2), 60, 0, 0, -20, LESSTHAN), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-180), 2), 60, 0, 0, -20, LESSTHAN), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (60), -3), 60, 60, 0, 0, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (90), -3), 60, 60, 0, -3, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (30), -3), 60, 60, 0, -3, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-120), -3), 60, 60, 0, -20, LESSTHAN), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-150), -3), 100, -150, 0, 0, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-100), -3), 100, -150, 0, -3, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-200), -3), 100, -150, 0, -3, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-30), -3), 100, -150, 0, -20, LESSTHAN), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (90), 9.5), 100, -150, 0, -20, LESSTHAN), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (0), 9.5), 60, 0, 10, 10, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (30), 9.5), 60, 0, 22, 19, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-30), 9.5), 60, 0, -4, -7, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (100), 9.5), 60, 0, 40, 20, LESSTHAN), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-150), 9.5), 100, -150, 2, 2, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-100), 9.5), 100, -150, 4, 1, EQUAL), TestCase::QUICK);
+ AddTestCase (new CosineAntennaModelTestCase (Angles (DegreesToRadians (-200), 9.5), 100, -150, -1, -4, EQUAL), TestCase::QUICK);
};
--- a/src/antenna/test/test-degrees-radians.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/antenna/test/test-degrees-radians.cc Fri Mar 22 13:14:38 2013 +0100
@@ -113,21 +113,21 @@
DegreesRadiansTestSuite::DegreesRadiansTestSuite ()
: TestSuite ("degrees-radians", UNIT)
{
- AddTestCase (new DegreesToRadiansTestCase (0, 0));
- AddTestCase (new DegreesToRadiansTestCase (90, M_PI_2));
- AddTestCase (new DegreesToRadiansTestCase (180, M_PI));
- AddTestCase (new DegreesToRadiansTestCase (270, M_PI + M_PI_2));
- AddTestCase (new DegreesToRadiansTestCase (360, M_PI + M_PI));
- AddTestCase (new DegreesToRadiansTestCase (-90, -M_PI_2));
- AddTestCase (new DegreesToRadiansTestCase (810, 4.5*M_PI));
+ AddTestCase (new DegreesToRadiansTestCase (0, 0), TestCase::QUICK);
+ AddTestCase (new DegreesToRadiansTestCase (90, M_PI_2), TestCase::QUICK);
+ AddTestCase (new DegreesToRadiansTestCase (180, M_PI), TestCase::QUICK);
+ AddTestCase (new DegreesToRadiansTestCase (270, M_PI + M_PI_2), TestCase::QUICK);
+ AddTestCase (new DegreesToRadiansTestCase (360, M_PI + M_PI), TestCase::QUICK);
+ AddTestCase (new DegreesToRadiansTestCase (-90, -M_PI_2), TestCase::QUICK);
+ AddTestCase (new DegreesToRadiansTestCase (810, 4.5*M_PI), TestCase::QUICK);
- AddTestCase (new RadiansToDegreesTestCase (0, 0));
- AddTestCase (new RadiansToDegreesTestCase (M_PI_2, 90));
- AddTestCase (new RadiansToDegreesTestCase (M_PI, 180));
- AddTestCase (new RadiansToDegreesTestCase (M_PI + M_PI_2, 270));
- AddTestCase (new RadiansToDegreesTestCase (M_PI + M_PI, 360));
- AddTestCase (new RadiansToDegreesTestCase (-M_PI_2, -90));
- AddTestCase (new RadiansToDegreesTestCase (4.5*M_PI, 810));
+ AddTestCase (new RadiansToDegreesTestCase (0, 0), TestCase::QUICK);
+ AddTestCase (new RadiansToDegreesTestCase (M_PI_2, 90), TestCase::QUICK);
+ AddTestCase (new RadiansToDegreesTestCase (M_PI, 180), TestCase::QUICK);
+ AddTestCase (new RadiansToDegreesTestCase (M_PI + M_PI_2, 270), TestCase::QUICK);
+ AddTestCase (new RadiansToDegreesTestCase (M_PI + M_PI, 360), TestCase::QUICK);
+ AddTestCase (new RadiansToDegreesTestCase (-M_PI_2, -90), TestCase::QUICK);
+ AddTestCase (new RadiansToDegreesTestCase (4.5*M_PI, 810), TestCase::QUICK);
};
--- a/src/antenna/test/test-isotropic-antenna.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/antenna/test/test-isotropic-antenna.cc Fri Mar 22 13:14:38 2013 +0100
@@ -77,15 +77,15 @@
IsotropicAntennaModelTestSuite::IsotropicAntennaModelTestSuite ()
: TestSuite ("isotropic-antenna-model", UNIT)
{
- AddTestCase (new IsotropicAntennaModelTestCase (Angles (0, 0), 0.0));
- AddTestCase (new IsotropicAntennaModelTestCase (Angles (0, M_PI), 0.0));
- AddTestCase (new IsotropicAntennaModelTestCase (Angles (0, M_PI_2), 0.0));
- AddTestCase (new IsotropicAntennaModelTestCase (Angles (M_PI, 0), 0.0));
- AddTestCase (new IsotropicAntennaModelTestCase (Angles (M_PI, M_PI), 0.0));
- AddTestCase (new IsotropicAntennaModelTestCase (Angles (M_PI, M_PI_2), 0.0));
- AddTestCase (new IsotropicAntennaModelTestCase (Angles (M_PI_2, 0), 0.0));
- AddTestCase (new IsotropicAntennaModelTestCase (Angles (M_PI_2, M_PI), 0.0));
- AddTestCase (new IsotropicAntennaModelTestCase (Angles (M_PI_2, M_PI_2), 0.0));
+ AddTestCase (new IsotropicAntennaModelTestCase (Angles (0, 0), 0.0), TestCase::QUICK);
+ AddTestCase (new IsotropicAntennaModelTestCase (Angles (0, M_PI), 0.0), TestCase::QUICK);
+ AddTestCase (new IsotropicAntennaModelTestCase (Angles (0, M_PI_2), 0.0), TestCase::QUICK);
+ AddTestCase (new IsotropicAntennaModelTestCase (Angles (M_PI, 0), 0.0), TestCase::QUICK);
+ AddTestCase (new IsotropicAntennaModelTestCase (Angles (M_PI, M_PI), 0.0), TestCase::QUICK);
+ AddTestCase (new IsotropicAntennaModelTestCase (Angles (M_PI, M_PI_2), 0.0), TestCase::QUICK);
+ AddTestCase (new IsotropicAntennaModelTestCase (Angles (M_PI_2, 0), 0.0), TestCase::QUICK);
+ AddTestCase (new IsotropicAntennaModelTestCase (Angles (M_PI_2, M_PI), 0.0), TestCase::QUICK);
+ AddTestCase (new IsotropicAntennaModelTestCase (Angles (M_PI_2, M_PI_2), 0.0), TestCase::QUICK);
};
--- a/src/antenna/test/test-parabolic-antenna.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/antenna/test/test-parabolic-antenna.cc Fri Mar 22 13:14:38 2013 +0100
@@ -116,69 +116,69 @@
// with a 60 deg beamwidth, gain is -20dB at +-77.460 degrees from boresight
// phi, theta, beamwidth, orientation, maxAttn, expectedGain, condition
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (0), 0), 60, 0, 20, 0, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (30), 0), 60, 0, 20, -3, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-30), 0), 60, 0, 20, -3, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-90), 0), 60, 0, 20, -20, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (90), 0), 60, 0, 20, -20, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (100), 0), 60, 0, 20, -20, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (150), 0), 60, 0, 20, -20, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (180), 0), 60, 0, 20, -20, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-100), 0), 60, 0, 20, -20, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-150), 0), 60, 0, 20, -20, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-180), 0), 60, 0, 20, -20, EQUAL));
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (0), 0), 60, 0, 20, 0, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (30), 0), 60, 0, 20, -3, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-30), 0), 60, 0, 20, -3, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-90), 0), 60, 0, 20, -20, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (90), 0), 60, 0, 20, -20, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (100), 0), 60, 0, 20, -20, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (150), 0), 60, 0, 20, -20, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (180), 0), 60, 0, 20, -20, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-100), 0), 60, 0, 20, -20, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-150), 0), 60, 0, 20, -20, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-180), 0), 60, 0, 20, -20, EQUAL), TestCase::QUICK);
// with a 60 deg beamwidth, gain is -10dB at +-54.772 degrees from boresight
// test positive orientation
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (60), 0), 60, 60, 10, 0, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (90), 0), 60, 60, 10, -3, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (30), 0), 60, 60, 10, -3, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-30), 0), 60, 60, 10, -10, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (150), 0), 60, 60, 10, -10, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (160), 0), 60, 60, 10, -10, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (210), 0), 60, 60, 10, -10, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (240), 0), 60, 60, 10, -10, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-40), 0), 60, 60, 10, -10, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-90), 0), 60, 60, 10, -10, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-120), 0), 60, 60, 10, -10, EQUAL));
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (60), 0), 60, 60, 10, 0, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (90), 0), 60, 60, 10, -3, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (30), 0), 60, 60, 10, -3, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-30), 0), 60, 60, 10, -10, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (150), 0), 60, 60, 10, -10, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (160), 0), 60, 60, 10, -10, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (210), 0), 60, 60, 10, -10, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (240), 0), 60, 60, 10, -10, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-40), 0), 60, 60, 10, -10, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-90), 0), 60, 60, 10, -10, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-120), 0), 60, 60, 10, -10, EQUAL), TestCase::QUICK);
// test negative orientation and different beamwidths
// with a 80 deg beamwidth, gain is -20dB at +- 73.030 degrees from boresight
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-150), 0), 80, -150, 10, 0, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-110), 0), 80, -150, 10, -3, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-190), 0), 80, -150, 10, -3, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-70), 0), 80, -150, 10, -10, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (92), 0), 80, -150, 10, -10, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-30), 0), 80, -150, 10, -10, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (0), 0), 80, -150, 10, -10, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (60), 0), 80, -150, 10, -10, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (90), 0), 80, -150, 10, -10, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (30), 0), 80, -150, 10, -10, EQUAL));
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-150), 0), 80, -150, 10, 0, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-110), 0), 80, -150, 10, -3, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-190), 0), 80, -150, 10, -3, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-70), 0), 80, -150, 10, -10, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (92), 0), 80, -150, 10, -10, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-30), 0), 80, -150, 10, -10, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (0), 0), 80, -150, 10, -10, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (60), 0), 80, -150, 10, -10, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (90), 0), 80, -150, 10, -10, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (30), 0), 80, -150, 10, -10, EQUAL), TestCase::QUICK);
// test elevation angle
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (0), 2), 60, 0, 20, 0, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (30), 2), 60, 0, 20, -3, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-30), 2), 60, 0, 20, -3, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-90), 2), 60, 0, 20, -20, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-180), 2), 60, 0, 20, -20, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (60), -3), 60, 60, 20, 0, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (90), -3), 60, 60, 20, -3, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (30), -3), 60, 60, 20, -3, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-120), -3), 60, 60, 20, -20, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-150), -3), 100, -150, 10, 0, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-100), -3), 100, -150, 10, -3, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-200), -3), 100, -150, 10, -3, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-30), -3), 100, -150, 10, -10, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (90), 9.5), 100, -150, 10, -10, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (0), 9.5), 60, 0, 20, 0, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (30), 9.5), 60, 0, 20, -3, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-30), 9.5), 60, 0, 20, -3, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (100), 9.5), 60, 0, 20, -20, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-150), 9.5), 100, -150, 30, 0, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-100), 9.5), 100, -150, 30, -3, EQUAL));
- AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-200), 9.5), 100, -150, 30, -3, EQUAL));
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (0), 2), 60, 0, 20, 0, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (30), 2), 60, 0, 20, -3, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-30), 2), 60, 0, 20, -3, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-90), 2), 60, 0, 20, -20, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-180), 2), 60, 0, 20, -20, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (60), -3), 60, 60, 20, 0, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (90), -3), 60, 60, 20, -3, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (30), -3), 60, 60, 20, -3, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-120), -3), 60, 60, 20, -20, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-150), -3), 100, -150, 10, 0, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-100), -3), 100, -150, 10, -3, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-200), -3), 100, -150, 10, -3, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-30), -3), 100, -150, 10, -10, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (90), 9.5), 100, -150, 10, -10, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (0), 9.5), 60, 0, 20, 0, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (30), 9.5), 60, 0, 20, -3, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-30), 9.5), 60, 0, 20, -3, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (100), 9.5), 60, 0, 20, -20, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-150), 9.5), 100, -150, 30, 0, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-100), 9.5), 100, -150, 30, -3, EQUAL), TestCase::QUICK);
+ AddTestCase (new ParabolicAntennaModelTestCase (Angles (DegreesToRadians (-200), 9.5), 100, -150, 30, -3, EQUAL), TestCase::QUICK);
};
--- a/src/aodv/test/aodv-id-cache-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/aodv/test/aodv-id-cache-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -95,7 +95,7 @@
public:
IdCacheTestSuite () : TestSuite ("routing-id-cache", UNIT)
{
- AddTestCase (new IdCacheTest);
+ AddTestCase (new IdCacheTest, TestCase::QUICK);
}
} g_idCacheTestSuite;
--- a/src/aodv/test/aodv-regression.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/aodv/test/aodv-regression.cc Fri Mar 22 13:14:38 2013 +0100
@@ -56,15 +56,15 @@
{
SetDataDir (NS_TEST_SOURCEDIR);
// General RREQ-RREP-RRER test case
- AddTestCase (new ChainRegressionTest ("aodv-chain-regression-test"));
+ AddTestCase (new ChainRegressionTest ("aodv-chain-regression-test"), TestCase::QUICK);
// Bug 606 test case, should crash if bug is not fixed
- AddTestCase (new ChainRegressionTest ("bug-606-test", Seconds (10), 3, Seconds (1)));
+ AddTestCase (new ChainRegressionTest ("bug-606-test", Seconds (10), 3, Seconds (1)), TestCase::QUICK);
// Bug 772 UDP test case
- AddTestCase (new Bug772ChainTest ("udp-chain-test", "ns3::UdpSocketFactory", Seconds (3), 10));
+ AddTestCase (new Bug772ChainTest ("udp-chain-test", "ns3::UdpSocketFactory", Seconds (3), 10), TestCase::QUICK);
// Bug 772 TCP test case
- AddTestCase (new Bug772ChainTest ("tcp-chain-test", "ns3::TcpSocketFactory", Seconds (3), 10));
+ AddTestCase (new Bug772ChainTest ("tcp-chain-test", "ns3::TcpSocketFactory", Seconds (3), 10), TestCase::QUICK);
// Ping loopback test case
- AddTestCase (new LoopbackTestCase ());
+ AddTestCase (new LoopbackTestCase (), TestCase::QUICK);
}
} g_aodvRegressionTestSuite;
--- a/src/aodv/test/aodv-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/aodv/test/aodv-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -525,16 +525,16 @@
public:
AodvTestSuite () : TestSuite ("routing-aodv", UNIT)
{
- AddTestCase (new NeighborTest);
- AddTestCase (new TypeHeaderTest);
- AddTestCase (new RreqHeaderTest);
- AddTestCase (new RrepHeaderTest);
- AddTestCase (new RrepAckHeaderTest);
- AddTestCase (new RerrHeaderTest);
- AddTestCase (new QueueEntryTest);
- AddTestCase (new AodvRqueueTest);
- AddTestCase (new AodvRtableEntryTest);
- AddTestCase (new AodvRtableTest);
+ AddTestCase (new NeighborTest, TestCase::QUICK);
+ AddTestCase (new TypeHeaderTest, TestCase::QUICK);
+ AddTestCase (new RreqHeaderTest, TestCase::QUICK);
+ AddTestCase (new RrepHeaderTest, TestCase::QUICK);
+ AddTestCase (new RrepAckHeaderTest, TestCase::QUICK);
+ AddTestCase (new RerrHeaderTest, TestCase::QUICK);
+ AddTestCase (new QueueEntryTest, TestCase::QUICK);
+ AddTestCase (new AodvRqueueTest, TestCase::QUICK);
+ AddTestCase (new AodvRtableEntryTest, TestCase::QUICK);
+ AddTestCase (new AodvRtableTest, TestCase::QUICK);
}
} g_aodvTestSuite;
--- a/src/applications/test/udp-client-server-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/applications/test/udp-client-server-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -340,10 +340,10 @@
UdpClientServerTestSuite::UdpClientServerTestSuite ()
: TestSuite ("udp-client-server", UNIT)
{
- AddTestCase (new UdpTraceClientServerTestCase);
- AddTestCase (new UdpClientServerTestCase);
- AddTestCase (new PacketLossCounterTestCase);
- AddTestCase (new UdpEchoClientSetFillTestCase);
+ AddTestCase (new UdpTraceClientServerTestCase, TestCase::QUICK);
+ AddTestCase (new UdpClientServerTestCase, TestCase::QUICK);
+ AddTestCase (new PacketLossCounterTestCase, TestCase::QUICK);
+ AddTestCase (new UdpEchoClientSetFillTestCase, TestCase::QUICK);
}
static UdpClientServerTestSuite udpClientServerTestSuite;
--- a/src/brite/test/brite-test-topology.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/brite/test/brite-test-topology.cc Fri Mar 22 13:14:38 2013 +0100
@@ -192,8 +192,8 @@
public:
BriteTestSuite () : TestSuite ("brite-testing", UNIT)
{
- AddTestCase (new BriteTopologyStructureTestCase);
- AddTestCase (new BriteTopologyFunctionTestCase);
+ AddTestCase (new BriteTopologyStructureTestCase, TestCase::QUICK);
+ AddTestCase (new BriteTopologyFunctionTestCase, TestCase::QUICK);
}
} g_briteTestSuite;
--- a/src/buildings/test/building-position-allocator-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/buildings/test/building-position-allocator-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -231,8 +231,8 @@
{
NS_LOG_FUNCTION (this);
- AddTestCase (new RandomRoomPositionAllocatorTestCase);
- AddTestCase (new SameRoomPositionAllocatorTestCase);
+ AddTestCase (new RandomRoomPositionAllocatorTestCase, TestCase::QUICK);
+ AddTestCase (new SameRoomPositionAllocatorTestCase, TestCase::QUICK);
}
--- a/src/buildings/test/buildings-helper-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/buildings/test/buildings-helper-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -203,25 +203,25 @@
p1.rx = 1;
p1.ry = 1;
p1.fn = 1;
- AddTestCase (new BuildingsHelperOneTestCase (p1, b1));
+ AddTestCase (new BuildingsHelperOneTestCase (p1, b1), TestCase::QUICK);
Vector vp2 (1.5, 0.5, 0.5);
PositionInBuilding p2;
p2.pos = vp2;
p2.indoor = false;
- AddTestCase (new BuildingsHelperOneTestCase (p2, b1));
+ AddTestCase (new BuildingsHelperOneTestCase (p2, b1), TestCase::QUICK);
Vector vp3 (1.5, 2.5, 0.5);
PositionInBuilding p3;
p3.pos = vp3;
p3.indoor = false;
- AddTestCase (new BuildingsHelperOneTestCase (p3, b1));
+ AddTestCase (new BuildingsHelperOneTestCase (p3, b1), TestCase::QUICK);
Vector vp4 (1.5, 1.5, 5);
PositionInBuilding p4;
p4.pos = vp4;
p4.indoor = false;
- AddTestCase (new BuildingsHelperOneTestCase (p4, b1));
+ AddTestCase (new BuildingsHelperOneTestCase (p4, b1), TestCase::QUICK);
Vector vp5 (2.5, 1.6, 3.5);
PositionInBuilding p5;
@@ -231,31 +231,31 @@
p5.rx = 1;
p5.ry = 1;
p5.fn = 1;
- AddTestCase (new BuildingsHelperOneTestCase (p5, b1));
+ AddTestCase (new BuildingsHelperOneTestCase (p5, b1), TestCase::QUICK);
Vector vp6 (0.9999, 1.5, 1.5);
PositionInBuilding p6;
p6.pos = vp6;
p6.indoor = false;
- AddTestCase (new BuildingsHelperOneTestCase (p6, b1));
+ AddTestCase (new BuildingsHelperOneTestCase (p6, b1), TestCase::QUICK);
Vector vp7 (3.0001, 1.5, 2.5);
PositionInBuilding p7;
p7.pos = vp7;
p7.indoor = false;
- AddTestCase (new BuildingsHelperOneTestCase (p7, b1));
+ AddTestCase (new BuildingsHelperOneTestCase (p7, b1), TestCase::QUICK);
Vector vp8 (1.001, 1.001, -0.01);
PositionInBuilding p8;
p8.pos = vp8;
p8.indoor = false;
- AddTestCase (new BuildingsHelperOneTestCase (p8, b1));
+ AddTestCase (new BuildingsHelperOneTestCase (p8, b1), TestCase::QUICK);
Vector vp9 (1.5, 1.5, 4.001);
PositionInBuilding p9;
p9.pos = vp9;
p9.indoor = false;
- AddTestCase (new BuildingsHelperOneTestCase (p9, b1));
+ AddTestCase (new BuildingsHelperOneTestCase (p9, b1), TestCase::QUICK);
@@ -279,7 +279,7 @@
q1.rx = 1;
q1.ry = 2;
q1.fn = 3;
- AddTestCase (new BuildingsHelperOneTestCase (q1, b2));
+ AddTestCase (new BuildingsHelperOneTestCase (q1, b2), TestCase::QUICK);
Vector vq2 (0.2, 0.3, 0.2);
PositionInBuilding q2;
@@ -289,37 +289,37 @@
q2.rx = 3;
q2.ry = 5;
q2.fn = 1;
- AddTestCase (new BuildingsHelperOneTestCase (q2, b2));
+ AddTestCase (new BuildingsHelperOneTestCase (q2, b2), TestCase::QUICK);
Vector vq3 (0.6, -1.75, 1.5);
PositionInBuilding q3;
q3.pos = vq3;
q3.indoor = false;
- AddTestCase (new BuildingsHelperOneTestCase (q3, b2));
+ AddTestCase (new BuildingsHelperOneTestCase (q3, b2), TestCase::QUICK);
Vector vq4 (-1.01, 0.3, 1.99);
PositionInBuilding q4;
q4.pos = vq4;
q4.indoor = false;
- AddTestCase (new BuildingsHelperOneTestCase (q4, b2));
+ AddTestCase (new BuildingsHelperOneTestCase (q4, b2), TestCase::QUICK);
Vector vq5 (-0.8, 0.7, 0.01);
PositionInBuilding q5;
q5.pos = vq5;
q5.indoor = false;
- AddTestCase (new BuildingsHelperOneTestCase (q5, b2));
+ AddTestCase (new BuildingsHelperOneTestCase (q5, b2), TestCase::QUICK);
Vector vq6 (0.2, 0.3, -0.2);
PositionInBuilding q6;
q6.pos = vq6;
q6.indoor = false;
- AddTestCase (new BuildingsHelperOneTestCase (q6, b2));
+ AddTestCase (new BuildingsHelperOneTestCase (q6, b2), TestCase::QUICK);
Vector vq7 (0.2, 0.3, 2.001);
PositionInBuilding q7;
q7.pos = vq7;
q7.indoor = false;
- AddTestCase (new BuildingsHelperOneTestCase (q7, b2));
+ AddTestCase (new BuildingsHelperOneTestCase (q7, b2), TestCase::QUICK);
}
static BuildingsHelperTestSuite buildingsHelperAntennaTestSuiteInstance;
--- a/src/buildings/test/buildings-pathloss-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/buildings/test/buildings-pathloss-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -55,56 +55,56 @@
double freq = 869e6; // E_UTRA BAND #5 see table 5.5-1 of 36.101
- AddTestCase (new BuildingsPathlossTestCase (freq, 1, 2, UrbanEnvironment, LargeCity, 137.93, "OH Urban Large city"));
+ AddTestCase (new BuildingsPathlossTestCase (freq, 1, 2, UrbanEnvironment, LargeCity, 137.93, "OH Urban Large city"), TestCase::QUICK);
- AddTestCase (new BuildingsPathlossTestCase (freq, 1, 2, UrbanEnvironment, SmallCity, 137.88, "OH Urban small city"));
+ AddTestCase (new BuildingsPathlossTestCase (freq, 1, 2, UrbanEnvironment, SmallCity, 137.88, "OH Urban small city"), TestCase::QUICK);
- AddTestCase (new BuildingsPathlossTestCase (freq, 1, 2, SubUrbanEnvironment, LargeCity, 128.03, "loss OH SubUrban"));
+ AddTestCase (new BuildingsPathlossTestCase (freq, 1, 2, SubUrbanEnvironment, LargeCity, 128.03, "loss OH SubUrban"), TestCase::QUICK);
- AddTestCase (new BuildingsPathlossTestCase (freq, 1, 2, OpenAreasEnvironment, LargeCity, 110.21, "loss OH OpenAreas"));
+ AddTestCase (new BuildingsPathlossTestCase (freq, 1, 2, OpenAreasEnvironment, LargeCity, 110.21, "loss OH OpenAreas"), TestCase::QUICK);
// Test #2 COST231 Model (1500 < freq < 2000~2170 MHz) (Macro<->UE)
freq = 2.1140e9; // E_UTRA BAND #1 see table 5.5-1 of 36.101
- AddTestCase (new BuildingsPathlossTestCase (freq, 1, 2, UrbanEnvironment, LargeCity, 148.55, "COST231 Urban Large city"));
+ AddTestCase (new BuildingsPathlossTestCase (freq, 1, 2, UrbanEnvironment, LargeCity, 148.55, "COST231 Urban Large city"), TestCase::QUICK);
- AddTestCase (new BuildingsPathlossTestCase (freq, 1, 2, UrbanEnvironment, SmallCity, 150.64, "COST231 Urban small city and suburban"));
+ AddTestCase (new BuildingsPathlossTestCase (freq, 1, 2, UrbanEnvironment, SmallCity, 150.64, "COST231 Urban small city and suburban"), TestCase::QUICK);
// Test #3 2.6 GHz model (Macro<->UE)
freq = 2.620e9; // E_UTRA BAND #7 see table 5.5-1 of 36.101
- AddTestCase (new BuildingsPathlossTestCase (freq, 1, 2, UrbanEnvironment, SmallCity, 121.83, "2.6GHz model"));
+ AddTestCase (new BuildingsPathlossTestCase (freq, 1, 2, UrbanEnvironment, SmallCity, 121.83, "2.6GHz model"), TestCase::QUICK);
// Test #4 ITU1411 LOS model (Macro<->UE)
freq = 2.1140e9; // E_UTRA BAND #1 see table 5.5-1 of 36.101
- AddTestCase (new BuildingsPathlossTestCase (freq, 1, 3, UrbanEnvironment, LargeCity, 81.00, "ITU1411 LOS"));
+ AddTestCase (new BuildingsPathlossTestCase (freq, 1, 3, UrbanEnvironment, LargeCity, 81.00, "ITU1411 LOS"), TestCase::QUICK);
// Test #5 ITU1411 NLOS model (Macro<->UE)
freq = 2.1140e9; // E_UTRA BAND #1 see table 5.5-1 of 36.101
- AddTestCase (new BuildingsPathlossTestCase (freq, 1, 4, UrbanEnvironment, LargeCity, 143.69, "ITU1411 NLOS"));
+ AddTestCase (new BuildingsPathlossTestCase (freq, 1, 4, UrbanEnvironment, LargeCity, 143.69, "ITU1411 NLOS"), TestCase::QUICK);
// Test #6 ITUP1238 (HeNB <-> UE)
freq = 2.1140e9; // E_UTRA BAND #1 see table 5.5-1 of 36.101
- AddTestCase (new BuildingsPathlossTestCase (freq, 5, 6, UrbanEnvironment, LargeCity, 88.3855, "ITUP1238"));
+ AddTestCase (new BuildingsPathlossTestCase (freq, 5, 6, UrbanEnvironment, LargeCity, 88.3855, "ITUP1238"), TestCase::QUICK);
// Test #7 Outdoor -> Indoor OkumuraHata (Macro<->UE)
freq = 2.1140e9; // E_UTRA BAND #1 see table 5.5-1 of 36.101
// The loss is as in test #2 (large city) plus the building penetration loss
// which for ConcreteWithWindows is equal to 7 dB -> 148.55 + 7 = 155.55
- AddTestCase (new BuildingsPathlossTestCase (freq, 1, 7, UrbanEnvironment, LargeCity, 155.55, "Okumura Hata Outdoor -> Indoor"));
+ AddTestCase (new BuildingsPathlossTestCase (freq, 1, 7, UrbanEnvironment, LargeCity, 155.55, "Okumura Hata Outdoor -> Indoor"), TestCase::QUICK);
// Test #8 Outdoor -> Indoor ITU1411 (Macro<->UE)
freq = 2.1140e9; // E_UTRA BAND #1 see table 5.5-1 of 36.101
// The loss is as in test #4 plus the building penetration loss
// which for ConcreteWithWindows is equal to 7 dB -> 81.000 + 7 = 88.000
- AddTestCase (new BuildingsPathlossTestCase (freq, 1, 8, UrbanEnvironment, LargeCity, 88.000, "ITU1411 LOS Outdoor -> Indoor"));
+ AddTestCase (new BuildingsPathlossTestCase (freq, 1, 8, UrbanEnvironment, LargeCity, 88.000, "ITU1411 LOS Outdoor -> Indoor"), TestCase::QUICK);
// Test #9 Indoor -> Outdoor LOS (HeNB <-> UE)
@@ -112,7 +112,7 @@
// The loss is similar of test #4 plus the building penetration loss
// which for ConcreteWithWindows is equal to 7 dB and the height gain
// (2 floors x 2 dB/floor = 4) -> 81.838 + 7 - 4 = 84.838
- AddTestCase (new BuildingsPathlossTestCase (freq, 9, 10, UrbanEnvironment, LargeCity, 84.838, "ITU1411 LOS Indoor -> Outdoor"));
+ AddTestCase (new BuildingsPathlossTestCase (freq, 9, 10, UrbanEnvironment, LargeCity, 84.838, "ITU1411 LOS Indoor -> Outdoor"), TestCase::QUICK);
// Test #10 Indoor -> Outdoor NLOS (HeNB <-> UE)
@@ -120,7 +120,7 @@
// The loss is similar as in test #4 plus the building penetration loss
// which for ConcreteWithWindows is equal to 7 dB and the height gain
// (2 floors x 2 dB/floor = 4) -> 180.90 + 7 - 4 = 183.90
- AddTestCase (new BuildingsPathlossTestCase (freq, 9, 11, UrbanEnvironment, LargeCity, 183.90, "ITU1411 NLOS Indoor -> Outdoor"));
+ AddTestCase (new BuildingsPathlossTestCase (freq, 9, 11, UrbanEnvironment, LargeCity, 183.90, "ITU1411 NLOS Indoor -> Outdoor"), TestCase::QUICK);
}
--- a/src/buildings/test/buildings-shadowing-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/buildings/test/buildings-shadowing-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -54,13 +54,13 @@
LogComponentEnable ("BuildingsShadowingTest", LOG_LEVEL_ALL);
// Test #1 Outdoor Model
- AddTestCase (new BuildingsShadowingTestCase (1, 2, 148.86, 7.0, "Outdoor Shadowing"));
+ AddTestCase (new BuildingsShadowingTestCase (1, 2, 148.86, 7.0, "Outdoor Shadowing"), TestCase::QUICK);
// Test #2 Indoor model
- AddTestCase (new BuildingsShadowingTestCase (5, 6, 88.5724, 8.0, "Indoor Shadowing"));
+ AddTestCase (new BuildingsShadowingTestCase (5, 6, 88.5724, 8.0, "Indoor Shadowing"), TestCase::QUICK);
// Test #3 Indoor -> Outdoor
- AddTestCase (new BuildingsShadowingTestCase (9, 10, 85.0012, 8.6, "Indoor -> Outdoor Shadowing"));
+ AddTestCase (new BuildingsShadowingTestCase (9, 10, 85.0012, 8.6, "Indoor -> Outdoor Shadowing"), TestCase::QUICK);
}
--- a/src/click/test/ipv4-click-routing-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/click/test/ipv4-click-routing-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -197,9 +197,9 @@
public:
ClickIfidFromNameTestSuite () : TestSuite ("routing-click", UNIT)
{
- AddTestCase (new ClickTrivialTest);
- AddTestCase (new ClickIfidFromNameTest);
- AddTestCase (new ClickIpMacAddressFromNameTest);
+ AddTestCase (new ClickTrivialTest, TestCase::QUICK);
+ AddTestCase (new ClickIfidFromNameTest, TestCase::QUICK);
+ AddTestCase (new ClickIpMacAddressFromNameTest, TestCase::QUICK);
}
} g_ipv4ClickRoutingTestSuite;
--- a/src/core/model/test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/core/model/test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -169,6 +169,12 @@
}
void
+TestCase::AddTestCase (TestCase *testCase)
+{
+ AddTestCase (testCase, TestCase::QUICK);
+}
+
+void
TestCase::AddTestCase (TestCase *testCase, enum TestCase::TestDuration duration)
{
// Record this for use later when all test cases are run.
--- a/src/core/model/test.h Tue Mar 19 13:14:12 2013 -0700
+++ b/src/core/model/test.h Fri Mar 22 13:14:38 2013 +0100
@@ -856,9 +856,19 @@
* \brief Add an individual test case to this test suite.
*
* \param testCase Pointer to the test case object to be added.
+ *
+ * \deprecated this method will go away in future versions of
+ * ns-3. Please use instead AddTestCase (TestCase, TestDuration)
+ */
+ void AddTestCase (TestCase *testCase) NS_DEPRECATED;
+
+ /**
+ * \brief Add an individual test case to this test suite.
+ *
+ * \param testCase Pointer to the test case object to be added.
* \param duration Amount of time this test takes to execute.
*/
- void AddTestCase (TestCase *testCase, enum TestDuration duration = QUICK);
+ void AddTestCase (TestCase *testCase, enum TestDuration duration);
/**
* \param directory the directory where the test data is located
--- a/src/core/test/attribute-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/core/test/attribute-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -1274,19 +1274,19 @@
AttributesTestSuite::AttributesTestSuite ()
: TestSuite ("attributes", UNIT)
{
- AddTestCase (new AttributeTestCase<BooleanValue> ("Check Attributes of type BooleanValue"));
- AddTestCase (new AttributeTestCase<IntegerValue> ("Check Attributes of type IntegerValue"));
- AddTestCase (new AttributeTestCase<UintegerValue> ("Check Attributes of type UintegerValue"));
- AddTestCase (new AttributeTestCase<DoubleValue> ("Check Attributes of type DoubleValue"));
- AddTestCase (new AttributeTestCase<EnumValue> ("Check Attributes of type EnumValue"));
- AddTestCase (new RandomVariableStreamAttributeTestCase ("Check Attributes of type RandomVariableStream"));
- AddTestCase (new ObjectVectorAttributeTestCase ("Check Attributes of type ObjectVectorValue"));
- AddTestCase (new ObjectMapAttributeTestCase ("Check Attributes of type ObjectMapValue"));
- AddTestCase (new IntegerTraceSourceAttributeTestCase ("Ensure TracedValue<uint8_t> can be set like IntegerValue"));
- AddTestCase (new IntegerTraceSourceTestCase ("Ensure TracedValue<uint8_t> also works as trace source"));
- AddTestCase (new TracedCallbackTestCase ("Ensure TracedCallback<double, int, float> works as trace source"));
- AddTestCase (new PointerAttributeTestCase ("Check Attributes of type PointerValue"));
- AddTestCase (new CallbackValueTestCase ("Check Attributes of type CallbackValue"));
+ AddTestCase (new AttributeTestCase<BooleanValue> ("Check Attributes of type BooleanValue"), TestCase::QUICK);
+ AddTestCase (new AttributeTestCase<IntegerValue> ("Check Attributes of type IntegerValue"), TestCase::QUICK);
+ AddTestCase (new AttributeTestCase<UintegerValue> ("Check Attributes of type UintegerValue"), TestCase::QUICK);
+ AddTestCase (new AttributeTestCase<DoubleValue> ("Check Attributes of type DoubleValue"), TestCase::QUICK);
+ AddTestCase (new AttributeTestCase<EnumValue> ("Check Attributes of type EnumValue"), TestCase::QUICK);
+ AddTestCase (new RandomVariableStreamAttributeTestCase ("Check Attributes of type RandomVariableStream"), TestCase::QUICK);
+ AddTestCase (new ObjectVectorAttributeTestCase ("Check Attributes of type ObjectVectorValue"), TestCase::QUICK);
+ AddTestCase (new ObjectMapAttributeTestCase ("Check Attributes of type ObjectMapValue"), TestCase::QUICK);
+ AddTestCase (new IntegerTraceSourceAttributeTestCase ("Ensure TracedValue<uint8_t> can be set like IntegerValue"), TestCase::QUICK);
+ AddTestCase (new IntegerTraceSourceTestCase ("Ensure TracedValue<uint8_t> also works as trace source"), TestCase::QUICK);
+ AddTestCase (new TracedCallbackTestCase ("Ensure TracedCallback<double, int, float> works as trace source"), TestCase::QUICK);
+ AddTestCase (new PointerAttributeTestCase ("Check Attributes of type PointerValue"), TestCase::QUICK);
+ AddTestCase (new CallbackValueTestCase ("Check Attributes of type CallbackValue"), TestCase::QUICK);
}
static AttributesTestSuite attributesTestSuite;
--- a/src/core/test/callback-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/core/test/callback-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -568,11 +568,11 @@
CallbackTestSuite::CallbackTestSuite ()
: TestSuite ("callback", UNIT)
{
- AddTestCase (new BasicCallbackTestCase);
- AddTestCase (new MakeCallbackTestCase);
- AddTestCase (new MakeBoundCallbackTestCase);
- AddTestCase (new NullifyCallbackTestCase);
- AddTestCase (new MakeCallbackTemplatesTestCase);
+ AddTestCase (new BasicCallbackTestCase, TestCase::QUICK);
+ AddTestCase (new MakeCallbackTestCase, TestCase::QUICK);
+ AddTestCase (new MakeBoundCallbackTestCase, TestCase::QUICK);
+ AddTestCase (new NullifyCallbackTestCase, TestCase::QUICK);
+ AddTestCase (new MakeCallbackTemplatesTestCase, TestCase::QUICK);
}
static CallbackTestSuite CallbackTestSuite;
--- a/src/core/test/command-line-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/core/test/command-line-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -219,10 +219,10 @@
CommandLineTestSuite::CommandLineTestSuite ()
: TestSuite ("command-line", UNIT)
{
- AddTestCase (new CommandLineBooleanTestCase);
- AddTestCase (new CommandLineIntTestCase);
- AddTestCase (new CommandLineUnsignedIntTestCase);
- AddTestCase (new CommandLineStringTestCase);
+ AddTestCase (new CommandLineBooleanTestCase, TestCase::QUICK);
+ AddTestCase (new CommandLineIntTestCase, TestCase::QUICK);
+ AddTestCase (new CommandLineUnsignedIntTestCase, TestCase::QUICK);
+ AddTestCase (new CommandLineStringTestCase, TestCase::QUICK);
}
static CommandLineTestSuite CommandLineTestSuite;
--- a/src/core/test/config-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/core/test/config-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -618,9 +618,9 @@
ConfigTestSuite::ConfigTestSuite ()
: TestSuite ("config", UNIT)
{
- AddTestCase (new RootNamespaceConfigTestCase);
- AddTestCase (new UnderRootNamespaceConfigTestCase);
- AddTestCase (new ObjectVectorConfigTestCase);
+ AddTestCase (new RootNamespaceConfigTestCase, TestCase::QUICK);
+ AddTestCase (new UnderRootNamespaceConfigTestCase, TestCase::QUICK);
+ AddTestCase (new ObjectVectorConfigTestCase, TestCase::QUICK);
}
static ConfigTestSuite configTestSuite;
--- a/src/core/test/global-value-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/core/test/global-value-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -85,7 +85,7 @@
GlobalValueTestSuite::GlobalValueTestSuite ()
: TestSuite ("global-value", UNIT)
{
- AddTestCase (new GlobalValueTestCase);
+ AddTestCase (new GlobalValueTestCase, TestCase::QUICK);
}
static GlobalValueTestSuite globalValueTestSuite;
--- a/src/core/test/int64x64-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/core/test/int64x64-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -325,13 +325,13 @@
Int64x64128TestSuite ()
: TestSuite ("int64x64", UNIT)
{
- AddTestCase (new Int64x64FracTestCase ());
- AddTestCase (new Int64x64InputTestCase ());
- AddTestCase (new Int64x64InputOutputTestCase ());
- AddTestCase (new Int64x64ArithmeticTestCase ());
- AddTestCase (new Int64x64Bug455TestCase ());
- AddTestCase (new Int64x64Bug863TestCase ());
- AddTestCase (new Int64x64CompareTestCase ());
- AddTestCase (new Int64x64InvertTestCase ());
+ AddTestCase (new Int64x64FracTestCase (), TestCase::QUICK);
+ AddTestCase (new Int64x64InputTestCase (), TestCase::QUICK);
+ AddTestCase (new Int64x64InputOutputTestCase (), TestCase::QUICK);
+ AddTestCase (new Int64x64ArithmeticTestCase (), TestCase::QUICK);
+ AddTestCase (new Int64x64Bug455TestCase (), TestCase::QUICK);
+ AddTestCase (new Int64x64Bug863TestCase (), TestCase::QUICK);
+ AddTestCase (new Int64x64CompareTestCase (), TestCase::QUICK);
+ AddTestCase (new Int64x64InvertTestCase (), TestCase::QUICK);
}
} g_int64x64TestSuite;
--- a/src/core/test/many-uniform-random-variables-one-get-value-call-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/core/test/many-uniform-random-variables-one-get-value-call-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -82,7 +82,7 @@
ManyUniformRandomVariablesOneGetValueCallTestSuite::ManyUniformRandomVariablesOneGetValueCallTestSuite ()
: TestSuite ("many-uniform-random-variables-one-get-value-call", PERFORMANCE)
{
- AddTestCase (new ManyUniformRandomVariablesOneGetValueCallTestCase);
+ AddTestCase (new ManyUniformRandomVariablesOneGetValueCallTestCase, TestCase::QUICK);
}
static ManyUniformRandomVariablesOneGetValueCallTestSuite manyUniformRandomVariablesOneGetValueCallTestSuite;
--- a/src/core/test/names-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/core/test/names-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -928,20 +928,20 @@
NamesTestSuite::NamesTestSuite ()
: TestSuite ("object-name-service", UNIT)
{
- AddTestCase (new BasicAddTestCase);
- AddTestCase (new StringContextAddTestCase);
- AddTestCase (new FullyQualifiedAddTestCase);
- AddTestCase (new RelativeAddTestCase);
- AddTestCase (new BasicRenameTestCase);
- AddTestCase (new StringContextRenameTestCase);
- AddTestCase (new FullyQualifiedRenameTestCase);
- AddTestCase (new RelativeRenameTestCase);
- AddTestCase (new FindPathTestCase);
- AddTestCase (new BasicFindTestCase);
- AddTestCase (new StringContextFindTestCase);
- AddTestCase (new FullyQualifiedFindTestCase);
- AddTestCase (new RelativeFindTestCase);
- AddTestCase (new AlternateFindTestCase);
+ AddTestCase (new BasicAddTestCase, TestCase::QUICK);
+ AddTestCase (new StringContextAddTestCase, TestCase::QUICK);
+ AddTestCase (new FullyQualifiedAddTestCase, TestCase::QUICK);
+ AddTestCase (new RelativeAddTestCase, TestCase::QUICK);
+ AddTestCase (new BasicRenameTestCase, TestCase::QUICK);
+ AddTestCase (new StringContextRenameTestCase, TestCase::QUICK);
+ AddTestCase (new FullyQualifiedRenameTestCase, TestCase::QUICK);
+ AddTestCase (new RelativeRenameTestCase, TestCase::QUICK);
+ AddTestCase (new FindPathTestCase, TestCase::QUICK);
+ AddTestCase (new BasicFindTestCase, TestCase::QUICK);
+ AddTestCase (new StringContextFindTestCase, TestCase::QUICK);
+ AddTestCase (new FullyQualifiedFindTestCase, TestCase::QUICK);
+ AddTestCase (new RelativeFindTestCase, TestCase::QUICK);
+ AddTestCase (new AlternateFindTestCase, TestCase::QUICK);
}
static NamesTestSuite namesTestSuite;
--- a/src/core/test/object-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/core/test/object-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -419,9 +419,9 @@
ObjectTestSuite::ObjectTestSuite ()
: TestSuite ("object", UNIT)
{
- AddTestCase (new CreateObjectTestCase);
- AddTestCase (new AggregateObjectTestCase);
- AddTestCase (new ObjectFactoryTestCase);
+ AddTestCase (new CreateObjectTestCase, TestCase::QUICK);
+ AddTestCase (new AggregateObjectTestCase, TestCase::QUICK);
+ AddTestCase (new ObjectFactoryTestCase, TestCase::QUICK);
}
static ObjectTestSuite objectTestSuite;
--- a/src/core/test/one-uniform-random-variable-many-get-value-calls-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/core/test/one-uniform-random-variable-many-get-value-calls-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -82,7 +82,7 @@
OneUniformRandomVariableManyGetValueCallsTestSuite::OneUniformRandomVariableManyGetValueCallsTestSuite ()
: TestSuite ("one-uniform-random-variable-many-get-value-calls", PERFORMANCE)
{
- AddTestCase (new OneUniformRandomVariableManyGetValueCallsTestCase);
+ AddTestCase (new OneUniformRandomVariableManyGetValueCallsTestCase, TestCase::QUICK);
}
static OneUniformRandomVariableManyGetValueCallsTestSuite oneUniformRandomVariableManyGetValueCallsTestSuite;
--- a/src/core/test/ptr-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/core/test/ptr-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -269,6 +269,6 @@
PtrTestSuite ()
: TestSuite ("ptr", UNIT)
{
- AddTestCase (new PtrTestCase ());
+ AddTestCase (new PtrTestCase (), TestCase::QUICK);
}
} g_ptrTestSuite;
--- a/src/core/test/random-variable-stream-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/core/test/random-variable-stream-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -2785,41 +2785,41 @@
RandomVariableStreamTestSuite::RandomVariableStreamTestSuite ()
: TestSuite ("random-variable-stream-generators", UNIT)
{
- AddTestCase (new RandomVariableStreamUniformTestCase);
- AddTestCase (new RandomVariableStreamUniformAntitheticTestCase);
- AddTestCase (new RandomVariableStreamConstantTestCase);
- AddTestCase (new RandomVariableStreamSequentialTestCase);
- AddTestCase (new RandomVariableStreamNormalTestCase);
- AddTestCase (new RandomVariableStreamNormalAntitheticTestCase);
- AddTestCase (new RandomVariableStreamExponentialTestCase);
- AddTestCase (new RandomVariableStreamExponentialAntitheticTestCase);
- AddTestCase (new RandomVariableStreamParetoTestCase);
- AddTestCase (new RandomVariableStreamParetoAntitheticTestCase);
- AddTestCase (new RandomVariableStreamWeibullTestCase);
- AddTestCase (new RandomVariableStreamWeibullAntitheticTestCase);
- AddTestCase (new RandomVariableStreamLogNormalTestCase);
+ AddTestCase (new RandomVariableStreamUniformTestCase, TestCase::QUICK);
+ AddTestCase (new RandomVariableStreamUniformAntitheticTestCase, TestCase::QUICK);
+ AddTestCase (new RandomVariableStreamConstantTestCase, TestCase::QUICK);
+ AddTestCase (new RandomVariableStreamSequentialTestCase, TestCase::QUICK);
+ AddTestCase (new RandomVariableStreamNormalTestCase, TestCase::QUICK);
+ AddTestCase (new RandomVariableStreamNormalAntitheticTestCase, TestCase::QUICK);
+ AddTestCase (new RandomVariableStreamExponentialTestCase, TestCase::QUICK);
+ AddTestCase (new RandomVariableStreamExponentialAntitheticTestCase, TestCase::QUICK);
+ AddTestCase (new RandomVariableStreamParetoTestCase, TestCase::QUICK);
+ AddTestCase (new RandomVariableStreamParetoAntitheticTestCase, TestCase::QUICK);
+ AddTestCase (new RandomVariableStreamWeibullTestCase, TestCase::QUICK);
+ AddTestCase (new RandomVariableStreamWeibullAntitheticTestCase, TestCase::QUICK);
+ AddTestCase (new RandomVariableStreamLogNormalTestCase, TestCase::QUICK);
// XXX This test is currently disabled because it fails sometimes.
// A possible reason for the failure is that the antithetic code is
// not implemented properly for this log-normal case.
/*
- AddTestCase (new RandomVariableStreamLogNormalAntitheticTestCase);
+ AddTestCase (new RandomVariableStreamLogNormalAntitheticTestCase, TestCase::QUICK);
*/
- AddTestCase (new RandomVariableStreamGammaTestCase);
+ AddTestCase (new RandomVariableStreamGammaTestCase, TestCase::QUICK);
// XXX This test is currently disabled because it fails sometimes.
// A possible reason for the failure is that the antithetic code is
// not implemented properly for this gamma case.
/*
- AddTestCase (new RandomVariableStreamGammaAntitheticTestCase);
+ AddTestCase (new RandomVariableStreamGammaAntitheticTestCase, TestCase::QUICK);
*/
- AddTestCase (new RandomVariableStreamErlangTestCase);
- AddTestCase (new RandomVariableStreamErlangAntitheticTestCase);
- AddTestCase (new RandomVariableStreamZipfTestCase);
- AddTestCase (new RandomVariableStreamZipfAntitheticTestCase);
- AddTestCase (new RandomVariableStreamZetaTestCase);
- AddTestCase (new RandomVariableStreamZetaAntitheticTestCase);
- AddTestCase (new RandomVariableStreamDeterministicTestCase);
- AddTestCase (new RandomVariableStreamEmpiricalTestCase);
- AddTestCase (new RandomVariableStreamEmpiricalAntitheticTestCase);
+ AddTestCase (new RandomVariableStreamErlangTestCase, TestCase::QUICK);
+ AddTestCase (new RandomVariableStreamErlangAntitheticTestCase, TestCase::QUICK);
+ AddTestCase (new RandomVariableStreamZipfTestCase, TestCase::QUICK);
+ AddTestCase (new RandomVariableStreamZipfAntitheticTestCase, TestCase::QUICK);
+ AddTestCase (new RandomVariableStreamZetaTestCase, TestCase::QUICK);
+ AddTestCase (new RandomVariableStreamZetaAntitheticTestCase, TestCase::QUICK);
+ AddTestCase (new RandomVariableStreamDeterministicTestCase, TestCase::QUICK);
+ AddTestCase (new RandomVariableStreamEmpiricalTestCase, TestCase::QUICK);
+ AddTestCase (new RandomVariableStreamEmpiricalAntitheticTestCase, TestCase::QUICK);
}
static RandomVariableStreamTestSuite randomVariableStreamTestSuite;
--- a/src/core/test/random-variable-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/core/test/random-variable-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -138,8 +138,8 @@
BasicRandomNumberTestSuite::BasicRandomNumberTestSuite ()
: TestSuite ("basic-random-number", UNIT)
{
- AddTestCase (new BasicRandomNumberTestCase);
- AddTestCase (new RandomNumberSerializationTestCase);
+ AddTestCase (new BasicRandomNumberTestCase, TestCase::QUICK);
+ AddTestCase (new RandomNumberSerializationTestCase, TestCase::QUICK);
}
static BasicRandomNumberTestSuite BasicRandomNumberTestSuite;
--- a/src/core/test/rng-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/core/test/rng-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -421,10 +421,10 @@
RngTestSuite::RngTestSuite ()
: TestSuite ("random-number-generators", UNIT)
{
- AddTestCase (new RngUniformTestCase);
- AddTestCase (new RngNormalTestCase);
- AddTestCase (new RngExponentialTestCase);
- AddTestCase (new RngParetoTestCase);
+ AddTestCase (new RngUniformTestCase, TestCase::QUICK);
+ AddTestCase (new RngNormalTestCase, TestCase::QUICK);
+ AddTestCase (new RngExponentialTestCase, TestCase::QUICK);
+ AddTestCase (new RngParetoTestCase, TestCase::QUICK);
}
static RngTestSuite rngTestSuite;
--- a/src/core/test/sample-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/core/test/sample-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -56,7 +56,7 @@
SampleTestSuite::SampleTestSuite ()
: TestSuite ("sample", UNIT)
{
- AddTestCase (new SampleTestCase1);
+ AddTestCase (new SampleTestCase1, TestCase::QUICK);
}
// Do not forget to allocate an instance of this TestSuite
--- a/src/core/test/simulator-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/core/test/simulator-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -468,12 +468,12 @@
ObjectFactory factory;
factory.SetTypeId (ListScheduler::GetTypeId ());
- AddTestCase (new SimulatorEventsTestCase (factory));
+ AddTestCase (new SimulatorEventsTestCase (factory), TestCase::QUICK);
factory.SetTypeId (MapScheduler::GetTypeId ());
- AddTestCase (new SimulatorEventsTestCase (factory));
+ AddTestCase (new SimulatorEventsTestCase (factory), TestCase::QUICK);
factory.SetTypeId (HeapScheduler::GetTypeId ());
- AddTestCase (new SimulatorEventsTestCase (factory));
+ AddTestCase (new SimulatorEventsTestCase (factory), TestCase::QUICK);
factory.SetTypeId (CalendarScheduler::GetTypeId ());
- AddTestCase (new SimulatorEventsTestCase (factory));
+ AddTestCase (new SimulatorEventsTestCase (factory), TestCase::QUICK);
}
} g_simulatorTestSuite;
--- a/src/core/test/threaded-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/core/test/threaded-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -258,7 +258,7 @@
for (unsigned int k=0; k < (sizeof(schedulerTypes) / sizeof(schedulerTypes[0])); ++k)
{
factory.SetTypeId(schedulerTypes[k]);
- AddTestCase (new ThreadedSimulatorEventsTestCase (factory, simulatorTypes[i], threadcounts[j]));
+ AddTestCase (new ThreadedSimulatorEventsTestCase (factory, simulatorTypes[i], threadcounts[j]), TestCase::QUICK);
}
}
}
--- a/src/core/test/time-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/core/test/time-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -139,7 +139,7 @@
TimeTestSuite ()
: TestSuite ("time", UNIT)
{
- AddTestCase (new TimeSimpleTestCase (Time::US));
- AddTestCase (new TimesWithSignsTestCase ());
+ AddTestCase (new TimeSimpleTestCase (Time::US), TestCase::QUICK);
+ AddTestCase (new TimesWithSignsTestCase (), TestCase::QUICK);
}
} g_timeTestSuite;
--- a/src/core/test/timer-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/core/test/timer-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -214,7 +214,7 @@
TimerTestSuite ()
: TestSuite ("timer", UNIT)
{
- AddTestCase (new TimerStateTestCase ());
- AddTestCase (new TimerTemplateTestCase ());
+ AddTestCase (new TimerStateTestCase (), TestCase::QUICK);
+ AddTestCase (new TimerTemplateTestCase (), TestCase::QUICK);
}
} g_timerTestSuite;
--- a/src/core/test/traced-callback-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/core/test/traced-callback-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -117,7 +117,7 @@
TracedCallbackTestSuite::TracedCallbackTestSuite ()
: TestSuite ("traced-callback", UNIT)
{
- AddTestCase (new BasicTracedCallbackTestCase);
+ AddTestCase (new BasicTracedCallbackTestCase, TestCase::QUICK);
}
static TracedCallbackTestSuite tracedCallbackTestSuite;
--- a/src/core/test/type-traits-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/core/test/type-traits-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -56,7 +56,7 @@
TypeTraitsTestSuite::TypeTraitsTestSuite ()
: TestSuite ("type-traits", UNIT)
{
- AddTestCase (new TypeTraitsTestCase);
+ AddTestCase (new TypeTraitsTestCase, TestCase::QUICK);
}
static TypeTraitsTestSuite typeTraitsTestSuite;
--- a/src/core/test/watchdog-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/core/test/watchdog-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -74,6 +74,6 @@
WatchdogTestSuite()
: TestSuite ("watchdog", UNIT)
{
- AddTestCase (new WatchdogTestCase ());
+ AddTestCase (new WatchdogTestCase (), TestCase::QUICK);
}
} g_watchdogTestSuite;
--- a/src/dsdv/test/dsdv-testcase.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/dsdv/test/dsdv-testcase.cc Fri Mar 22 13:14:38 2013 +0100
@@ -188,8 +188,8 @@
public:
DsdvTestSuite () : TestSuite ("routing-dsdv", UNIT)
{
- AddTestCase (new DsdvHeaderTestCase ());
- AddTestCase (new DsdvTableTestCase ());
+ AddTestCase (new DsdvHeaderTestCase (), TestCase::QUICK);
+ AddTestCase (new DsdvTableTestCase (), TestCase::QUICK);
}
} g_dsdvTestSuite;
}
--- a/src/dsr/test/dsr-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/dsr/test/dsr-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -508,15 +508,15 @@
public:
DsrTestSuite () : TestSuite ("routing-dsr", UNIT)
{
- AddTestCase (new DsrFsHeaderTest);
- AddTestCase (new DsrRreqHeaderTest);
- AddTestCase (new DsrRrepHeaderTest);
- AddTestCase (new DsrSRHeaderTest);
- AddTestCase (new DsrRerrHeaderTest);
- AddTestCase (new DsrAckReqHeaderTest);
- AddTestCase (new DsrAckHeaderTest);
- AddTestCase (new DsrCacheEntryTest);
- AddTestCase (new DsrSendBuffTest);
+ AddTestCase (new DsrFsHeaderTest, TestCase::QUICK);
+ AddTestCase (new DsrRreqHeaderTest, TestCase::QUICK);
+ AddTestCase (new DsrRrepHeaderTest, TestCase::QUICK);
+ AddTestCase (new DsrSRHeaderTest, TestCase::QUICK);
+ AddTestCase (new DsrRerrHeaderTest, TestCase::QUICK);
+ AddTestCase (new DsrAckReqHeaderTest, TestCase::QUICK);
+ AddTestCase (new DsrAckHeaderTest, TestCase::QUICK);
+ AddTestCase (new DsrCacheEntryTest, TestCase::QUICK);
+ AddTestCase (new DsrSendBuffTest, TestCase::QUICK);
}
} g_dsrTestSuite;
} // namespace dsr
--- a/src/energy/test/basic-energy-model-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/energy/test/basic-energy-model-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -380,8 +380,8 @@
BasicEnergyModelTestSuite::BasicEnergyModelTestSuite ()
: TestSuite ("basic-energy-model", UNIT)
{
- AddTestCase (new BasicEnergyUpdateTest);
- AddTestCase (new BasicEnergyDepletionTest);
+ AddTestCase (new BasicEnergyUpdateTest, TestCase::QUICK);
+ AddTestCase (new BasicEnergyDepletionTest, TestCase::QUICK);
}
// create an instance of the test suite
--- a/src/energy/test/li-ion-energy-source-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/energy/test/li-ion-energy-source-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -87,7 +87,7 @@
LiIonEnergySourceTestSuite::LiIonEnergySourceTestSuite ()
: TestSuite ("li-ion-energy-source", UNIT)
{
- AddTestCase (new LiIonEnergyTestCase);
+ AddTestCase (new LiIonEnergyTestCase, TestCase::QUICK);
}
// create an instance of the test suite
--- a/src/energy/test/rv-battery-model-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/energy/test/rv-battery-model-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -883,7 +883,7 @@
RvBatteryModelTestSuite::RvBatteryModelTestSuite ()
: TestSuite ("rv-battery-model", SYSTEM)
{
- AddTestCase (new BatteryLifetimeTest);
+ AddTestCase (new BatteryLifetimeTest, TestCase::QUICK);
}
// create an instance of the test suite
--- a/src/flow-monitor/test/histogram-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/flow-monitor/test/histogram-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -75,7 +75,7 @@
HistogramTestSuite ()
: TestSuite ("histogram", UNIT)
{
- AddTestCase (new HistogramTestCase ());
+ AddTestCase (new HistogramTestCase (), TestCase::QUICK);
}
} g_HistogramTestSuite;
--- a/src/internet/test/global-route-manager-impl-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/internet/test/global-route-manager-impl-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -220,6 +220,6 @@
GlobalRouteManagerImplTestSuite()
: TestSuite ("global-route-manager-impl", UNIT)
{
- AddTestCase (new GlobalRouteManagerImplTestCase ());
+ AddTestCase (new GlobalRouteManagerImplTestCase (), TestCase::QUICK);
}
} g_globalRoutingManagerImplTestSuite;
--- a/src/internet/test/ipv4-address-generator-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/internet/test/ipv4-address-generator-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -308,10 +308,10 @@
Ipv4AddressGeneratorTestSuite ()
: TestSuite ("ipv4-address-generator")
{
- AddTestCase (new NetworkNumberAllocatorTestCase ());
- AddTestCase (new AddressAllocatorTestCase ());
- AddTestCase (new NetworkAndAddressTestCase ());
- AddTestCase (new ExampleAddressGeneratorTestCase ());
- AddTestCase (new AddressCollisionTestCase ());
+ AddTestCase (new NetworkNumberAllocatorTestCase (), TestCase::QUICK);
+ AddTestCase (new AddressAllocatorTestCase (), TestCase::QUICK);
+ AddTestCase (new NetworkAndAddressTestCase (), TestCase::QUICK);
+ AddTestCase (new ExampleAddressGeneratorTestCase (), TestCase::QUICK);
+ AddTestCase (new AddressCollisionTestCase (), TestCase::QUICK);
}
} g_ipv4AddressGeneratorTestSuite;
--- a/src/internet/test/ipv4-address-helper-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/internet/test/ipv4-address-helper-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -261,9 +261,9 @@
Ipv4AddressHelperTestSuite ()
: TestSuite ("ipv4-address-helper", UNIT)
{
- AddTestCase (new NetworkAllocatorHelperTestCase ());
- AddTestCase (new AddressAllocatorHelperTestCase ());
- AddTestCase (new ResetAllocatorHelperTestCase ());
- AddTestCase (new IpAddressHelperTestCasev4 ());
+ AddTestCase (new NetworkAllocatorHelperTestCase (), TestCase::QUICK);
+ AddTestCase (new AddressAllocatorHelperTestCase (), TestCase::QUICK);
+ AddTestCase (new ResetAllocatorHelperTestCase (), TestCase::QUICK);
+ AddTestCase (new IpAddressHelperTestCasev4 (), TestCase::QUICK);
}
} g_ipv4AddressHelperTestSuite;
--- a/src/internet/test/ipv4-fragmentation-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/internet/test/ipv4-fragmentation-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -407,6 +407,6 @@
public:
Ipv4FragmentationTestSuite () : TestSuite ("ipv4-fragmentation", UNIT)
{
- AddTestCase (new Ipv4FragmentationTest);
+ AddTestCase (new Ipv4FragmentationTest, TestCase::QUICK);
}
} g_ipv4fragmentationTestSuite;
--- a/src/internet/test/ipv4-header-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/internet/test/ipv4-header-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -261,6 +261,6 @@
public:
Ipv4HeaderTestSuite () : TestSuite ("ipv4-header", UNIT)
{
- AddTestCase (new Ipv4HeaderTest);
+ AddTestCase (new Ipv4HeaderTest, TestCase::QUICK);
}
} g_ipv4HeaderTestSuite;
--- a/src/internet/test/ipv4-list-routing-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/internet/test/ipv4-list-routing-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -118,8 +118,8 @@
Ipv4ListRoutingTestSuite()
: TestSuite ("ipv4-list-routing", UNIT)
{
- AddTestCase (new Ipv4ListRoutingPositiveTestCase ());
- AddTestCase (new Ipv4ListRoutingNegativeTestCase ());
+ AddTestCase (new Ipv4ListRoutingPositiveTestCase (), TestCase::QUICK);
+ AddTestCase (new Ipv4ListRoutingNegativeTestCase (), TestCase::QUICK);
}
} g_ipv4ListRoutingTestSuite;
--- a/src/internet/test/ipv4-packet-info-tag-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/internet/test/ipv4-packet-info-tag-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -206,5 +206,5 @@
Ipv4PacketInfoTagTestSuite::Ipv4PacketInfoTagTestSuite ()
: TestSuite ("ipv4-packet-info-tag", UNIT)
{
- AddTestCase (new Ipv4PacketInfoTagTest ());
+ AddTestCase (new Ipv4PacketInfoTagTest (), TestCase::QUICK);
}
--- a/src/internet/test/ipv4-raw-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/internet/test/ipv4-raw-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -320,6 +320,6 @@
public:
Ipv4RawTestSuite () : TestSuite ("ipv4-raw", UNIT)
{
- AddTestCase (new Ipv4RawSocketImplTest);
+ AddTestCase (new Ipv4RawSocketImplTest, TestCase::QUICK);
}
} g_ipv4rawTestSuite;
--- a/src/internet/test/ipv4-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/internet/test/ipv4-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -103,7 +103,7 @@
IPv4L3ProtocolTestSuite () :
TestSuite ("ipv4-protocol", UNIT)
{
- AddTestCase (new Ipv4L3ProtocolTestCase ());
+ AddTestCase (new Ipv4L3ProtocolTestCase (), TestCase::QUICK);
}
} g_ipv4protocolTestSuite;
--- a/src/internet/test/ipv6-address-generator-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/internet/test/ipv6-address-generator-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -279,10 +279,10 @@
Ipv6AddressGeneratorTestSuite ()
: TestSuite ("ipv6-address-generator")
{
- AddTestCase (new NetworkNumber6AllocatorTestCase ());
- AddTestCase (new AddressAllocator6TestCase ());
- AddTestCase (new NetworkAndAddress6TestCase ());
- AddTestCase (new ExampleAddress6GeneratorTestCase ());
- AddTestCase (new AddressCollision6TestCase ());
+ AddTestCase (new NetworkNumber6AllocatorTestCase (), TestCase::QUICK);
+ AddTestCase (new AddressAllocator6TestCase (), TestCase::QUICK);
+ AddTestCase (new NetworkAndAddress6TestCase (), TestCase::QUICK);
+ AddTestCase (new ExampleAddress6GeneratorTestCase (), TestCase::QUICK);
+ AddTestCase (new AddressCollision6TestCase (), TestCase::QUICK);
}
} g_ipv6AddressGeneratorTestSuite;
--- a/src/internet/test/ipv6-address-helper-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/internet/test/ipv6-address-helper-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -148,7 +148,7 @@
Ipv6AddressHelperTestSuite::Ipv6AddressHelperTestSuite ()
: TestSuite ("ipv6-address-helper", UNIT)
{
- AddTestCase (new IpAddressHelperTestCasev6);
+ AddTestCase (new IpAddressHelperTestCasev6, TestCase::QUICK);
}
// Do not forget to allocate an instance of this TestSuite
--- a/src/internet/test/ipv6-dual-stack-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/internet/test/ipv6-dual-stack-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -306,6 +306,6 @@
Ipv6DualStackTestSuite ()
: TestSuite ("ipv6-dual-stack", UNIT)
{
- AddTestCase (new DualStackTestCase());
+ AddTestCase (new DualStackTestCase(), TestCase::QUICK);
}
} g_ipv6DualStackTestSuite;
--- a/src/internet/test/ipv6-extension-header-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/internet/test/ipv6-extension-header-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -215,10 +215,10 @@
Ipv6ExtensionHeaderTestSuite ()
: TestSuite ("ipv6-extension-header", UNIT)
{
- AddTestCase (new TestEmptyOptionField);
- AddTestCase (new TestOptionWithoutAlignment);
- AddTestCase (new TestOptionWithAlignment);
- AddTestCase (new TestFulfilledAlignment);
+ AddTestCase (new TestEmptyOptionField, TestCase::QUICK);
+ AddTestCase (new TestOptionWithoutAlignment, TestCase::QUICK);
+ AddTestCase (new TestOptionWithAlignment, TestCase::QUICK);
+ AddTestCase (new TestFulfilledAlignment, TestCase::QUICK);
}
};
--- a/src/internet/test/ipv6-fragmentation-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/internet/test/ipv6-fragmentation-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -423,6 +423,6 @@
public:
Ipv6FragmentationTestSuite () : TestSuite ("ipv6-fragmentation", UNIT)
{
- AddTestCase (new Ipv6FragmentationTest);
+ AddTestCase (new Ipv6FragmentationTest, TestCase::QUICK);
}
} g_ipv6fragmentationTestSuite;
--- a/src/internet/test/ipv6-list-routing-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/internet/test/ipv6-list-routing-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -125,8 +125,8 @@
Ipv6ListRoutingTestSuite()
: TestSuite ("ipv6-list-routing", UNIT)
{
- AddTestCase (new Ipv6ListRoutingPositiveTestCase ());
- AddTestCase (new Ipv6ListRoutingNegativeTestCase ());
+ AddTestCase (new Ipv6ListRoutingPositiveTestCase (), TestCase::QUICK);
+ AddTestCase (new Ipv6ListRoutingNegativeTestCase (), TestCase::QUICK);
}
} g_ipv6ListRoutingTestSuite;
--- a/src/internet/test/ipv6-packet-info-tag-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/internet/test/ipv6-packet-info-tag-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -207,5 +207,5 @@
Ipv6PacketInfoTagTestSuite::Ipv6PacketInfoTagTestSuite ()
: TestSuite ("ipv6-packet-info-tag", UNIT)
{
- AddTestCase (new Ipv6PacketInfoTagTest ());
+ AddTestCase (new Ipv6PacketInfoTagTest (), TestCase::QUICK);
}
--- a/src/internet/test/ipv6-raw-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/internet/test/ipv6-raw-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -270,6 +270,6 @@
public:
Ipv6RawTestSuite () : TestSuite ("ipv6-raw", UNIT)
{
- AddTestCase (new Ipv6RawSocketImplTest);
+ AddTestCase (new Ipv6RawSocketImplTest, TestCase::QUICK);
}
} g_ipv6rawTestSuite;
--- a/src/internet/test/ipv6-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/internet/test/ipv6-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -144,7 +144,7 @@
IPv6L3ProtocolTestSuite () :
TestSuite ("ipv6-protocol", UNIT)
{
- AddTestCase (new Ipv6L3ProtocolTestCase ());
+ AddTestCase (new Ipv6L3ProtocolTestCase (), TestCase::QUICK);
}
} g_ipv6protocolTestSuite;
--- a/src/internet/test/tcp-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/internet/test/tcp-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -435,13 +435,13 @@
// 2) source write size, 3) source read size
// 4) server write size, and 5) server read size
// with units of bytes
- AddTestCase (new TcpTestCase (13, 200, 200, 200, 200, false));
- AddTestCase (new TcpTestCase (13, 1, 1, 1, 1, false));
- AddTestCase (new TcpTestCase (100000, 100, 50, 100, 20, false));
+ AddTestCase (new TcpTestCase (13, 200, 200, 200, 200, false), TestCase::QUICK);
+ AddTestCase (new TcpTestCase (13, 1, 1, 1, 1, false), TestCase::QUICK);
+ AddTestCase (new TcpTestCase (100000, 100, 50, 100, 20, false), TestCase::QUICK);
- AddTestCase (new TcpTestCase (13, 200, 200, 200, 200, true));
- AddTestCase (new TcpTestCase (13, 1, 1, 1, 1, true));
- AddTestCase (new TcpTestCase (100000, 100, 50, 100, 20, true));
+ AddTestCase (new TcpTestCase (13, 200, 200, 200, 200, true), TestCase::QUICK);
+ AddTestCase (new TcpTestCase (13, 1, 1, 1, 1, true), TestCase::QUICK);
+ AddTestCase (new TcpTestCase (100000, 100, 50, 100, 20, true), TestCase::QUICK);
}
} g_tcpTestSuite;
--- a/src/internet/test/udp-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/internet/test/udp-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -576,9 +576,9 @@
public:
UdpTestSuite () : TestSuite ("udp", UNIT)
{
- AddTestCase (new UdpSocketImplTest);
- AddTestCase (new UdpSocketLoopbackTest);
- AddTestCase (new Udp6SocketImplTest);
- AddTestCase (new Udp6SocketLoopbackTest);
+ AddTestCase (new UdpSocketImplTest, TestCase::QUICK);
+ AddTestCase (new UdpSocketLoopbackTest, TestCase::QUICK);
+ AddTestCase (new Udp6SocketImplTest, TestCase::QUICK);
+ AddTestCase (new Udp6SocketLoopbackTest, TestCase::QUICK);
}
} g_udpTestSuite;
--- a/src/lte/test/epc-test-gtpu.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/lte/test/epc-test-gtpu.cc Fri Mar 22 13:14:38 2013 +0100
@@ -38,7 +38,7 @@
EpsGtpuTestSuite::EpsGtpuTestSuite ()
: TestSuite ("epc-gtpu", SYSTEM)
{
- AddTestCase (new EpsGtpuHeaderTestCase ());
+ AddTestCase (new EpsGtpuHeaderTestCase (), TestCase::QUICK);
}
static EpsGtpuTestSuite epsGtpuTestSuite;
--- a/src/lte/test/epc-test-s1u-downlink.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/lte/test/epc-test-s1u-downlink.cc Fri Mar 22 13:14:38 2013 +0100
@@ -238,7 +238,7 @@
UeDlTestData f1 (1, 100);
e1.ues.push_back (f1);
v1.push_back (e1);
- AddTestCase (new EpcS1uDlTestCase ("1 eNB, 1UE", v1));
+ AddTestCase (new EpcS1uDlTestCase ("1 eNB, 1UE", v1), TestCase::QUICK);
std::vector<EnbDlTestData> v2;
@@ -248,13 +248,13 @@
UeDlTestData f2_2 (2, 200);
e2.ues.push_back (f2_2);
v2.push_back (e2);
- AddTestCase (new EpcS1uDlTestCase ("1 eNB, 2UEs", v2));
+ AddTestCase (new EpcS1uDlTestCase ("1 eNB, 2UEs", v2), TestCase::QUICK);
std::vector<EnbDlTestData> v3;
v3.push_back (e1);
v3.push_back (e2);
- AddTestCase (new EpcS1uDlTestCase ("2 eNBs", v3));
+ AddTestCase (new EpcS1uDlTestCase ("2 eNBs", v3), TestCase::QUICK);
EnbDlTestData e3;
@@ -268,35 +268,35 @@
v4.push_back (e3);
v4.push_back (e1);
v4.push_back (e2);
- AddTestCase (new EpcS1uDlTestCase ("3 eNBs", v4));
+ AddTestCase (new EpcS1uDlTestCase ("3 eNBs", v4), TestCase::QUICK);
std::vector<EnbDlTestData> v5;
EnbDlTestData e5;
UeDlTestData f5 (10, 3000);
e5.ues.push_back (f5);
v5.push_back (e5);
- AddTestCase (new EpcS1uDlTestCase ("1 eNB, 10 pkts 3000 bytes each", v5));
+ AddTestCase (new EpcS1uDlTestCase ("1 eNB, 10 pkts 3000 bytes each", v5), TestCase::QUICK);
std::vector<EnbDlTestData> v6;
EnbDlTestData e6;
UeDlTestData f6 (50, 3000);
e6.ues.push_back (f6);
v6.push_back (e6);
- AddTestCase (new EpcS1uDlTestCase ("1 eNB, 50 pkts 3000 bytes each", v6));
+ AddTestCase (new EpcS1uDlTestCase ("1 eNB, 50 pkts 3000 bytes each", v6), TestCase::QUICK);
std::vector<EnbDlTestData> v7;
EnbDlTestData e7;
UeDlTestData f7 (10, 15000);
e7.ues.push_back (f7);
v7.push_back (e7);
- AddTestCase (new EpcS1uDlTestCase ("1 eNB, 10 pkts 15000 bytes each", v7));
+ AddTestCase (new EpcS1uDlTestCase ("1 eNB, 10 pkts 15000 bytes each", v7), TestCase::QUICK);
std::vector<EnbDlTestData> v8;
EnbDlTestData e8;
UeDlTestData f8 (100, 15000);
e8.ues.push_back (f8);
v8.push_back (e8);
- AddTestCase (new EpcS1uDlTestCase ("1 eNB, 100 pkts 15000 bytes each", v8));
+ AddTestCase (new EpcS1uDlTestCase ("1 eNB, 100 pkts 15000 bytes each", v8), TestCase::QUICK);
}
--- a/src/lte/test/epc-test-s1u-uplink.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/lte/test/epc-test-s1u-uplink.cc Fri Mar 22 13:14:38 2013 +0100
@@ -463,7 +463,7 @@
UeUlTestData f1 (1, 100, 1, 1);
e1.ues.push_back (f1);
v1.push_back (e1);
- AddTestCase (new EpcS1uUlTestCase ("1 eNB, 1UE", v1));
+ AddTestCase (new EpcS1uUlTestCase ("1 eNB, 1UE", v1), TestCase::QUICK);
std::vector<EnbUlTestData> v2;
@@ -473,13 +473,13 @@
UeUlTestData f2_2 (2, 200, 2, 1);
e2.ues.push_back (f2_2);
v2.push_back (e2);
- AddTestCase (new EpcS1uUlTestCase ("1 eNB, 2UEs", v2));
+ AddTestCase (new EpcS1uUlTestCase ("1 eNB, 2UEs", v2), TestCase::QUICK);
std::vector<EnbUlTestData> v3;
v3.push_back (e1);
v3.push_back (e2);
- AddTestCase (new EpcS1uUlTestCase ("2 eNBs", v3));
+ AddTestCase (new EpcS1uUlTestCase ("2 eNBs", v3), TestCase::QUICK);
EnbUlTestData e3;
@@ -493,35 +493,35 @@
v4.push_back (e3);
v4.push_back (e1);
v4.push_back (e2);
- AddTestCase (new EpcS1uUlTestCase ("3 eNBs", v4));
+ AddTestCase (new EpcS1uUlTestCase ("3 eNBs", v4), TestCase::QUICK);
std::vector<EnbUlTestData> v5;
EnbUlTestData e5;
UeUlTestData f5 (10, 3000, 1, 1);
e5.ues.push_back (f5);
v5.push_back (e5);
- AddTestCase (new EpcS1uUlTestCase ("1 eNB, 10 pkts 3000 bytes each", v5));
+ AddTestCase (new EpcS1uUlTestCase ("1 eNB, 10 pkts 3000 bytes each", v5), TestCase::QUICK);
std::vector<EnbUlTestData> v6;
EnbUlTestData e6;
UeUlTestData f6 (50, 3000, 1, 1);
e6.ues.push_back (f6);
v6.push_back (e6);
- AddTestCase (new EpcS1uUlTestCase ("1 eNB, 50 pkts 3000 bytes each", v6));
+ AddTestCase (new EpcS1uUlTestCase ("1 eNB, 50 pkts 3000 bytes each", v6), TestCase::QUICK);
std::vector<EnbUlTestData> v7;
EnbUlTestData e7;
UeUlTestData f7 (10, 15000, 1, 1);
e7.ues.push_back (f7);
v7.push_back (e7);
- AddTestCase (new EpcS1uUlTestCase ("1 eNB, 10 pkts 15000 bytes each", v7));
+ AddTestCase (new EpcS1uUlTestCase ("1 eNB, 10 pkts 15000 bytes each", v7), TestCase::QUICK);
std::vector<EnbUlTestData> v8;
EnbUlTestData e8;
UeUlTestData f8 (100, 15000, 1, 1);
e8.ues.push_back (f8);
v8.push_back (e8);
- AddTestCase (new EpcS1uUlTestCase ("1 eNB, 100 pkts 15000 bytes each", v8));
+ AddTestCase (new EpcS1uUlTestCase ("1 eNB, 100 pkts 15000 bytes each", v8), TestCase::QUICK);
}
--- a/src/lte/test/lte-test-downlink-sinr.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/lte/test/lte-test-downlink-sinr.cc Fri Mar 22 13:14:38 2013 +0100
@@ -82,8 +82,8 @@
(*theoreticalSinr1)[0] = 3.72589167251055;
(*theoreticalSinr1)[1] = 3.72255684126076;
- AddTestCase (new LteDownlinkDataSinrTestCase (rxPsd1, theoreticalSinr1, "sdBm = [-46 -48]"));
- AddTestCase (new LteDownlinkCtrlSinrTestCase (rxPsd1, theoreticalSinr1, "sdBm = [-46 -48]"));
+ AddTestCase (new LteDownlinkDataSinrTestCase (rxPsd1, theoreticalSinr1, "sdBm = [-46 -48]"), TestCase::QUICK);
+ AddTestCase (new LteDownlinkCtrlSinrTestCase (rxPsd1, theoreticalSinr1, "sdBm = [-46 -48]"), TestCase::QUICK);
/**
* TX signal #2: Power Spectral Density (W/Hz) of the signal of interest = [-63 -61] dBm and BW = [20 22] MHz
@@ -96,8 +96,8 @@
(*theoreticalSinr2)[0] = 0.0743413124381667;
(*theoreticalSinr2)[1] = 0.1865697965291756;
- AddTestCase (new LteDownlinkDataSinrTestCase (rxPsd2, theoreticalSinr2, "sdBm = [-63 -61]"));
- AddTestCase (new LteDownlinkCtrlSinrTestCase (rxPsd2, theoreticalSinr2, "sdBm = [-63 -61]"));
+ AddTestCase (new LteDownlinkDataSinrTestCase (rxPsd2, theoreticalSinr2, "sdBm = [-63 -61]"), TestCase::QUICK);
+ AddTestCase (new LteDownlinkCtrlSinrTestCase (rxPsd2, theoreticalSinr2, "sdBm = [-63 -61]"), TestCase::QUICK);
}
--- a/src/lte/test/lte-test-earfcn.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/lte/test/lte-test-earfcn.cc Fri Mar 22 13:14:38 2013 +0100
@@ -126,29 +126,29 @@
{
NS_LOG_FUNCTION (this);
- AddTestCase (new LteEarfcnDlTestCase ("DL EARFCN=500", 500, 2160e6));
- AddTestCase (new LteEarfcnDlTestCase ("DL EARFCN=1000", 1000, 1970e6));
- AddTestCase (new LteEarfcnDlTestCase ("DL EARFCN=1301", 1301, 1815.1e6));
- AddTestCase (new LteEarfcnDlTestCase ("DL EARFCN=7000", 7000, 0.0));
- AddTestCase (new LteEarfcnDlTestCase ("DL EARFCN=20000", 20000, 0.0));
- AddTestCase (new LteEarfcnDlTestCase ("DL EARFCN=50000", 50000, 0.0));
+ AddTestCase (new LteEarfcnDlTestCase ("DL EARFCN=500", 500, 2160e6), TestCase::QUICK);
+ AddTestCase (new LteEarfcnDlTestCase ("DL EARFCN=1000", 1000, 1970e6), TestCase::QUICK);
+ AddTestCase (new LteEarfcnDlTestCase ("DL EARFCN=1301", 1301, 1815.1e6), TestCase::QUICK);
+ AddTestCase (new LteEarfcnDlTestCase ("DL EARFCN=7000", 7000, 0.0), TestCase::QUICK);
+ AddTestCase (new LteEarfcnDlTestCase ("DL EARFCN=20000", 20000, 0.0), TestCase::QUICK);
+ AddTestCase (new LteEarfcnDlTestCase ("DL EARFCN=50000", 50000, 0.0), TestCase::QUICK);
- AddTestCase (new LteEarfcnUlTestCase ("UL EARFCN=18100", 18100, 1930e6));
- AddTestCase (new LteEarfcnUlTestCase ("UL EARFCN=19000", 19000, 1890e6));
- AddTestCase (new LteEarfcnUlTestCase ("UL EARFCN=19400", 19400, 1730e6));
- AddTestCase (new LteEarfcnUlTestCase ("UL EARFCN=10", 10, 0.0));
- AddTestCase (new LteEarfcnUlTestCase ("UL EARFCN=1000", 1000, 0.0));
- AddTestCase (new LteEarfcnUlTestCase ("UL EARFCN=50000", 50000, 0.0));
+ AddTestCase (new LteEarfcnUlTestCase ("UL EARFCN=18100", 18100, 1930e6), TestCase::QUICK);
+ AddTestCase (new LteEarfcnUlTestCase ("UL EARFCN=19000", 19000, 1890e6), TestCase::QUICK);
+ AddTestCase (new LteEarfcnUlTestCase ("UL EARFCN=19400", 19400, 1730e6), TestCase::QUICK);
+ AddTestCase (new LteEarfcnUlTestCase ("UL EARFCN=10", 10, 0.0), TestCase::QUICK);
+ AddTestCase (new LteEarfcnUlTestCase ("UL EARFCN=1000", 1000, 0.0), TestCase::QUICK);
+ AddTestCase (new LteEarfcnUlTestCase ("UL EARFCN=50000", 50000, 0.0), TestCase::QUICK);
- AddTestCase (new LteEarfcnTestCase ("EARFCN=500", 500, 2160e6));
- AddTestCase (new LteEarfcnTestCase ("EARFCN=1000", 1000, 1970e6));
- AddTestCase (new LteEarfcnTestCase ("EARFCN=1301", 1301, 1815.1e6));
- AddTestCase (new LteEarfcnTestCase ("EARFCN=8000", 8000, 0.0));
- AddTestCase (new LteEarfcnTestCase ("EARFCN=50000", 50000, 0.0));
- AddTestCase (new LteEarfcnTestCase ("EARFCN=18100", 18100, 1930e6));
- AddTestCase (new LteEarfcnTestCase ("EARFCN=19000", 19000, 1890e6));
- AddTestCase (new LteEarfcnTestCase ("EARFCN=19400", 19400, 1730e6));
- AddTestCase (new LteEarfcnTestCase ("EARFCN=50000", 50000, 0.0));
+ AddTestCase (new LteEarfcnTestCase ("EARFCN=500", 500, 2160e6), TestCase::QUICK);
+ AddTestCase (new LteEarfcnTestCase ("EARFCN=1000", 1000, 1970e6), TestCase::QUICK);
+ AddTestCase (new LteEarfcnTestCase ("EARFCN=1301", 1301, 1815.1e6), TestCase::QUICK);
+ AddTestCase (new LteEarfcnTestCase ("EARFCN=8000", 8000, 0.0), TestCase::QUICK);
+ AddTestCase (new LteEarfcnTestCase ("EARFCN=50000", 50000, 0.0), TestCase::QUICK);
+ AddTestCase (new LteEarfcnTestCase ("EARFCN=18100", 18100, 1930e6), TestCase::QUICK);
+ AddTestCase (new LteEarfcnTestCase ("EARFCN=19000", 19000, 1890e6), TestCase::QUICK);
+ AddTestCase (new LteEarfcnTestCase ("EARFCN=19400", 19400, 1730e6), TestCase::QUICK);
+ AddTestCase (new LteEarfcnTestCase ("EARFCN=50000", 50000, 0.0), TestCase::QUICK);
}
--- a/src/lte/test/lte-test-fading.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/lte/test/lte-test-fading.cc Fri Mar 22 13:14:38 2013 +0100
@@ -124,7 +124,7 @@
Ptr<BuildingsMobilityModel> mm2 = ueNodes.Get (0)->GetObject<BuildingsMobilityModel> ();
mm2->SetPosition (Vector (distance, 0.0, hm));
- AddTestCase (new LteFadingTestCase (mm1, mm2, 137.93, "OH Urban Large city"));
+ AddTestCase (new LteFadingTestCase (mm1, mm2, 137.93, "OH Urban Large city"), TestCase::QUICK);
}
--- a/src/lte/test/lte-test-fdbet-ff-mac-scheduler.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/lte/test/lte-test-fdbet-ff-mac-scheduler.cc Fri Mar 22 13:14:38 2013 +0100
@@ -72,10 +72,10 @@
// 3 users -> 8 PRB at Itbs 26 -> 749 -> 749000 bytes/sec
// 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 bytes/sec
// 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 bytes/sec
- AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (1,0,0,2196000,2292000));
- AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (3,0,0,749000,749000));
- AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (6,0,0,373000,373000));
- AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (12,0,0,185000,185000));
+ AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (1,0,0,2196000,2292000), TestCase::QUICK);
+ AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (3,0,0,749000,749000), TestCase::QUICK);
+ AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (6,0,0,373000,373000), TestCase::QUICK);
+ AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (12,0,0,185000,185000), TestCase::QUICK);
// DOWNLINK - DISTANCE 3000 -> MCS 22 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213)
// 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 bytes/sec
@@ -87,10 +87,10 @@
// 3 users -> 8 PRB at Itbs 18 -> 389 -> 389000 bytes/sec
// 6 users -> 4 PRB at Itbs 18 -> 193 -> 193000 bytes/sec
// 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 bytes/sec
- AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (1,0,3000,1383000,1239000));
- AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (3,0,3000,469000,389000));
- AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (6,0,3000,233500,193000));
- AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (12,0,3000,113000,97000));
+ AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (1,0,3000,1383000,1239000), TestCase::QUICK);
+ AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (3,0,3000,469000,389000), TestCase::QUICK);
+ AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (6,0,3000,233500,193000), TestCase::QUICK);
+ AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (12,0,3000,113000,97000), TestCase::QUICK);
// DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
// 1 user -> 24 PRB at Itbs 15 -> 903 -> 903000 bytes/sec
@@ -102,10 +102,10 @@
// 3 users -> 8 PRB at Itbs 11 -> 201 -> 201000 bytes/sec
// 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 bytes/sec
// 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 bytes/sec
- AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (1,0,6000,903000,621000));
- AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (3,0,6000,309000,201000));
- AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (6,0,6000,153000,97000));
- AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (12,0,6000,75000,47000));
+ AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (1,0,6000,903000,621000), TestCase::QUICK);
+ AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (3,0,6000,309000,201000), TestCase::QUICK);
+ AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (6,0,6000,153000,97000), TestCase::QUICK);
+ AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (12,0,6000,75000,47000), TestCase::QUICK);
// DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
// 1 user -> 24 PRB at Itbs 11 -> 597 -> 597000 bytes/sec
@@ -117,10 +117,10 @@
// 3 users -> 8 PRB at Itbs 8 -> 137 -> 137000 bytes/sec
// 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 bytes/sec
// 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 bytes/sec
- AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (1,0,9000,597000,437000));
- AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (3,0,9000,201000,137000));
- AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (6,0,9000,97000,67000));
- AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (12,0,9000,47000,32000));
+ AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (1,0,9000,597000,437000), TestCase::QUICK);
+ AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (3,0,9000,201000,137000), TestCase::QUICK);
+ AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (6,0,9000,97000,67000), TestCase::QUICK);
+ AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (12,0,9000,47000,32000), TestCase::QUICK);
// DOWNLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
// 1 user -> 24 PRB at Itbs 6 -> 309 -> 309000 bytes/sec
@@ -132,10 +132,10 @@
// 3 users -> 8 PRB at Itbs 6 -> 69 -> 69000 bytes/sec
// 6 users -> 4 PRB at Itbs 6 -> 32 -> 32000 bytes/sec
// 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 bytes/sec
- AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (1,0,15000,309000,233000));
- AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (3,0,15000,101000,69000));
- AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (6,0,15000,49000,32000));
- AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (12,0,15000,22000,15000));
+ AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (1,0,15000,309000,233000), TestCase::QUICK);
+ AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (3,0,15000,101000,69000), TestCase::QUICK);
+ AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (6,0,15000,49000,32000), TestCase::QUICK);
+ AddTestCase (new LenaFdBetFfMacSchedulerTestCase1 (12,0,15000,22000,15000), TestCase::QUICK);
// Test Case 2: fairness check
@@ -154,7 +154,7 @@
estThrFdBetUl.push_back (293000); // User 1 estimated TTI throughput from FDBET
estThrFdBetUl.push_back (149000); // User 2 estimated TTI throughput from FDBET
estThrFdBetUl.push_back (101000); // User 3 estimated TTI throughput from FDBET
- AddTestCase (new LenaFdBetFfMacSchedulerTestCase2 (dist, estAchievableRateDl, estThrFdBetUl));
+ AddTestCase (new LenaFdBetFfMacSchedulerTestCase2 (dist, estAchievableRateDl, estThrFdBetUl), TestCase::QUICK);
}
--- a/src/lte/test/lte-test-fdmt-ff-mac-scheduler.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/lte/test/lte-test-fdmt-ff-mac-scheduler.cc Fri Mar 22 13:14:38 2013 +0100
@@ -74,11 +74,11 @@
// 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 bytes/sec
// 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 bytes/sec
// 15 users -> 1 PRB at Itbs 26 -> 89 -> 89000 bytes/sec
- AddTestCase (new LenaFdMtFfMacSchedulerTestCase (1,0,0,2196000,2292000));
- AddTestCase (new LenaFdMtFfMacSchedulerTestCase (3,0,0,2196000,749000));
- AddTestCase (new LenaFdMtFfMacSchedulerTestCase (6,0,0,2196000,373000));
- AddTestCase (new LenaFdMtFfMacSchedulerTestCase (12,0,0,2196000,185000));
- AddTestCase (new LenaFdMtFfMacSchedulerTestCase (15,0,0,2196000,89000));
+ AddTestCase (new LenaFdMtFfMacSchedulerTestCase (1,0,0,2196000,2292000), TestCase::QUICK);
+ AddTestCase (new LenaFdMtFfMacSchedulerTestCase (3,0,0,2196000,749000), TestCase::QUICK);
+ AddTestCase (new LenaFdMtFfMacSchedulerTestCase (6,0,0,2196000,373000), TestCase::QUICK);
+ AddTestCase (new LenaFdMtFfMacSchedulerTestCase (12,0,0,2196000,185000), TestCase::QUICK);
+ AddTestCase (new LenaFdMtFfMacSchedulerTestCase (15,0,0,2196000,89000), TestCase::QUICK);
// DOWNLINK - DISTANCE 3000 -> MCS 24 -> Itbs 30 (from table 7.1.7.2.1-1 of 36.213)
// 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 bytes/sec for first UE; 0 bytes/sec for other UEs
@@ -92,11 +92,11 @@
// 6 users -> 4 PRB at Itbs 18 -> 193 -> 193000 bytes/sec
// 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 bytes/sec
// 15 users -> 1 PRB at Itbs 18 -> 47 -> 47000 bytes/sec
- AddTestCase (new LenaFdMtFfMacSchedulerTestCase (1,0,3000,1383000,1239000));
- AddTestCase (new LenaFdMtFfMacSchedulerTestCase (3,0,3000,1383000,389000));
- AddTestCase (new LenaFdMtFfMacSchedulerTestCase (6,0,3000,1383000,193000));
- AddTestCase (new LenaFdMtFfMacSchedulerTestCase (12,0,3000,1383000,97000));
- AddTestCase (new LenaFdMtFfMacSchedulerTestCase (15,0,3000,1383000,47000));
+ AddTestCase (new LenaFdMtFfMacSchedulerTestCase (1,0,3000,1383000,1239000), TestCase::QUICK);
+ AddTestCase (new LenaFdMtFfMacSchedulerTestCase (3,0,3000,1383000,389000), TestCase::QUICK);
+ AddTestCase (new LenaFdMtFfMacSchedulerTestCase (6,0,3000,1383000,193000), TestCase::QUICK);
+ AddTestCase (new LenaFdMtFfMacSchedulerTestCase (12,0,3000,1383000,97000), TestCase::QUICK);
+ AddTestCase (new LenaFdMtFfMacSchedulerTestCase (15,0,3000,1383000,47000), TestCase::QUICK);
// DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
// 1 user -> 24 PRB at Itbs 15 -> 903 -> 903000 bytes/sec for first UE; 0 bytes/sec for other UEs
@@ -110,11 +110,11 @@
// 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 bytes/sec
// 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 bytes/sec
// 15 users -> 1 PRB at Itbs 11 -> 22 -> 22000 bytes/sec
- AddTestCase (new LenaFdMtFfMacSchedulerTestCase (1,0,6000,903000,621000));
- AddTestCase (new LenaFdMtFfMacSchedulerTestCase (3,0,6000,903000,201000));
- AddTestCase (new LenaFdMtFfMacSchedulerTestCase (6,0,6000,903000,97000));
- AddTestCase (new LenaFdMtFfMacSchedulerTestCase (12,0,6000,903000,47000));
- AddTestCase (new LenaFdMtFfMacSchedulerTestCase (15,0,6000,903000,22000));
+ AddTestCase (new LenaFdMtFfMacSchedulerTestCase (1,0,6000,903000,621000), TestCase::QUICK);
+ AddTestCase (new LenaFdMtFfMacSchedulerTestCase (3,0,6000,903000,201000), TestCase::QUICK);
+ AddTestCase (new LenaFdMtFfMacSchedulerTestCase (6,0,6000,903000,97000), TestCase::QUICK);
+ AddTestCase (new LenaFdMtFfMacSchedulerTestCase (12,0,6000,903000,47000), TestCase::QUICK);
+ AddTestCase (new LenaFdMtFfMacSchedulerTestCase (15,0,6000,903000,22000), TestCase::QUICK);
// DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
// 1 user -> 24 PRB at Itbs 11 -> 597 -> 597000 bytes/sec
@@ -128,11 +128,11 @@
// 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 bytes/sec
// 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 bytes/sec
// 15 users -> 1 PRB at Itbs 8 -> 15 -> 15000 bytes/sec
- AddTestCase (new LenaFdMtFfMacSchedulerTestCase (1,0,9000,597000,437000));
- AddTestCase (new LenaFdMtFfMacSchedulerTestCase (3,0,9000,597000,137000));
- AddTestCase (new LenaFdMtFfMacSchedulerTestCase (6,0,9000,597000,67000));
- AddTestCase (new LenaFdMtFfMacSchedulerTestCase (12,0,9000,597000,32000));
- AddTestCase (new LenaFdMtFfMacSchedulerTestCase (15,0,9000,597000,15000));
+ AddTestCase (new LenaFdMtFfMacSchedulerTestCase (1,0,9000,597000,437000), TestCase::QUICK);
+ AddTestCase (new LenaFdMtFfMacSchedulerTestCase (3,0,9000,597000,137000), TestCase::QUICK);
+ AddTestCase (new LenaFdMtFfMacSchedulerTestCase (6,0,9000,597000,67000), TestCase::QUICK);
+ AddTestCase (new LenaFdMtFfMacSchedulerTestCase (12,0,9000,597000,32000), TestCase::QUICK);
+ AddTestCase (new LenaFdMtFfMacSchedulerTestCase (15,0,9000,597000,15000), TestCase::QUICK);
// DONWLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
// 1 user -> 24 PRB at Itbs 6 -> 309 -> 309000 bytes/sec
@@ -146,11 +146,11 @@
// 6 users -> 4 PRB at Itbs 6 -> 32 -> 32000 bytes/sec
// 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 bytes/sec
// 15 users -> 1 PRB at Itbs 6 -> 7 -> 7000 bytes/sec
- AddTestCase (new LenaFdMtFfMacSchedulerTestCase (1,0,15000,309000,233000));
- AddTestCase (new LenaFdMtFfMacSchedulerTestCase (3,0,15000,309000,69000));
- AddTestCase (new LenaFdMtFfMacSchedulerTestCase (6,0,15000,309000,32000));
- AddTestCase (new LenaFdMtFfMacSchedulerTestCase (12,0,15000,309000,15000));
- AddTestCase (new LenaFdMtFfMacSchedulerTestCase (15,0,15000,309000,7000));
+ AddTestCase (new LenaFdMtFfMacSchedulerTestCase (1,0,15000,309000,233000), TestCase::QUICK);
+ AddTestCase (new LenaFdMtFfMacSchedulerTestCase (3,0,15000,309000,69000), TestCase::QUICK);
+ AddTestCase (new LenaFdMtFfMacSchedulerTestCase (6,0,15000,309000,32000), TestCase::QUICK);
+ AddTestCase (new LenaFdMtFfMacSchedulerTestCase (12,0,15000,309000,15000), TestCase::QUICK);
+ AddTestCase (new LenaFdMtFfMacSchedulerTestCase (15,0,15000,309000,7000), TestCase::QUICK);
}
--- a/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc Fri Mar 22 13:14:38 2013 +0100
@@ -90,10 +90,10 @@
// 3 users -> 8 PRB at Itbs 26 -> 749 -> 749000 > 232000 -> throughput = 232000 bytes/sec
// 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 > 232000 -> throughput = 232000 bytes/sec
// 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 < 232000 -> throughput = 185000 bytes/sec
- AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (1,0,0,232000,232000,200,1));
- AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (3,0,0,232000,232000,200,1));
- AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (6,0,0,232000,232000,200,1));
- AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (12,0,0,183000,185000,200,1));
+ AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (1,0,0,232000,232000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (3,0,0,232000,232000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (6,0,0,232000,232000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (12,0,0,183000,185000,200,1), TestCase::QUICK);
// DOWNLINK - DISTANCE 3000 -> MCS 24 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213)
// DOWNLINK -> DISTANCE 0 -> MCS 28 -> Itbs 26 (from table 7.1.7.2.1-1 of 36.2 13)
@@ -110,10 +110,10 @@
// 3 users -> 8 PRB at Itbs 18 -> 389 -> 389000 > 232000 -> throughput = 232000 bytes/sec
// 6 users -> 4 PRB at Itbs 18 -> 193 -> 193000 < 232000 -> throughput = 193000 bytes/sec
// 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 < 232000 -> throughput = 97000 bytes/sec
- AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (1,0,3000,232000,232000,200,1));
- AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (3,0,3000,232000,232000,200,1));
- AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (6,0,3000,230500,193000,200,1));
- AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (12,0,3000,115250,97000,200,1));
+ AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (1,0,3000,232000,232000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (3,0,3000,232000,232000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (6,0,3000,230500,193000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (12,0,3000,115250,97000,200,1), TestCase::QUICK);
// DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
// Traffic info
@@ -129,10 +129,10 @@
// 3 users -> 8 PRB at Itbs 11 -> 201 -> 201000 < 232000 -> throughput = 201000 bytes/sec
// 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 < 232000 -> throughput = 97000 bytes/sec
// 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 < 232000 -> throughput = 47000 bytes/sec
- AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (1,0,6000,232000,232000,200,1));
- AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (3,0,6000,232000,201000,200,1));
- AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (6,0,6000,150500,97000,200,1));
- AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (12,0,6000,75250,47000,200,1));
+ AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (1,0,6000,232000,232000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (3,0,6000,232000,201000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (6,0,6000,150500,97000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (12,0,6000,75250,47000,200,1), TestCase::QUICK);
// DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
// Traffic info
@@ -148,10 +148,10 @@
// 3 users -> 8 PRB at Itbs 8 -> 137 -> 137000 < 232000 -> throughput = 137000 bytes/sec
// 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 < 232000 -> throughput = 67000 bytes/sec
// 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 < 232000 -> throughput = 32000 bytes/sec
- AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (1,0,9000,232000,232000,200,1));
- AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (3,0,9000,199000,137000,200,1));
- AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (6,0,9000,99500,67000,200,1));
- AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (12,0,9000,49750,32000,200,1));
+ AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (1,0,9000,232000,232000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (3,0,9000,199000,137000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (6,0,9000,99500,67000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (12,0,9000,49750,32000,200,1), TestCase::QUICK);
// DONWLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
// Traffic info
@@ -167,10 +167,10 @@
// 3 users -> 8 PRB at Itbs 6 -> 69 -> 69000 < 232000 -> throughput = 69000 bytes/sec
// 6 users -> 4 PRB at Itbs 6 -> 32 -> 32000 < 232000 -> throughput = 32000 bytes/sec
// 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 < 232000 -> throughput = 15000 bytes/sec
- AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (1,0,15000,232000,232000,200,1));
- AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (3,0,15000,103000,69000,200,1));
- AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (6,0,15000,51500,32000,200,1));
- AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (12,0,15000,25750,15000,200,1));
+ AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (1,0,15000,232000,232000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (3,0,15000,103000,69000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (6,0,15000,51500,32000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase1 (12,0,15000,25750,15000,200,1), TestCase::QUICK);
// Test Case 2: homogeneous flow test in FDTBFQ (different distance)
// Traffic1 info
@@ -196,7 +196,7 @@
estThrFdTbfqDl1.push_back (132000); // User 2 estimated TTI throughput from FDTBFQ
estThrFdTbfqDl1.push_back (132000); // User 3 estimated TTI throughput from FDTBFQ
estThrFdTbfqDl1.push_back (132000); // User 4 estimated TTI throughput from FDTBFQ
- AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase2 (dist1,estThrFdTbfqDl1,packetSize1,1));
+ AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase2 (dist1,estThrFdTbfqDl1,packetSize1,1), TestCase::QUICK);
// Traffic2 info
// UDP traffic: payload size = 200 bytes, interval = 1 ms
@@ -221,7 +221,7 @@
estThrFdTbfqDl2.push_back (138944); // User 2 estimated TTI throughput from FDTBFQ
estThrFdTbfqDl2.push_back (138944); // User 3 estimated TTI throughput from FDTBFQ
estThrFdTbfqDl2.push_back (138944); // User 4 estimated TTI throughput from FDTBFQ
- AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase2 (dist2,estThrFdTbfqDl2,packetSize2,1));
+ AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase2 (dist2,estThrFdTbfqDl2,packetSize2,1), TestCase::QUICK);
// Test Case 3: heterogeneous flow test in FDTBFQ
// UDP traffic: payload size = [100,200,300] bytes, interval = 1 ms
@@ -240,7 +240,7 @@
estThrFdTbfqDl3.push_back (132000); // User 0 estimated TTI throughput from FDTBFQ
estThrFdTbfqDl3.push_back (232000); // User 1 estimated TTI throughput from FDTBFQ
estThrFdTbfqDl3.push_back (332000); // User 2 estimated TTI throughput from FDTBFQ
- AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase2 (dist3,estThrFdTbfqDl3,packetSize3,1));
+ AddTestCase (new LenaFdTbfqFfMacSchedulerTestCase2 (dist3,estThrFdTbfqDl3,packetSize3,1), TestCase::QUICK);
}
--- a/src/lte/test/lte-test-interference.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/lte/test/lte-test-interference.cc Fri Mar 22 13:14:38 2013 +0100
@@ -70,19 +70,19 @@
{
NS_LOG_INFO ("Creating LteInterferenceTestSuite");
- AddTestCase (new LteInterferenceTestCase ("d1=3000, d2=6000", 3000.000000, 6000.000000, 3.844681, 1.714583, 0.761558, 0.389662, 6, 4));
- AddTestCase (new LteInterferenceTestCase ("d1=50, d2=10", 50.000000, 10.000000, 0.040000, 0.040000, 0.010399, 0.010399, 0, 0));
- AddTestCase (new LteInterferenceTestCase ("d1=50, d2=20", 50.000000, 20.000000, 0.160000, 0.159998, 0.041154, 0.041153, 0, 0));
- AddTestCase (new LteInterferenceTestCase ("d1=50, d2=50", 50.000000, 50.000000, 0.999997, 0.999907, 0.239828, 0.239808, 2, 2));
- AddTestCase (new LteInterferenceTestCase ("d1=50, d2=100", 50.000000, 100.000000, 3.999955, 3.998520, 0.785259, 0.785042, 6, 6));
- AddTestCase (new LteInterferenceTestCase ("d1=50, d2=200", 50.000000, 200.000000, 15.999282, 15.976339, 1.961072, 1.959533, 14, 14));
- AddTestCase (new LteInterferenceTestCase ("d1=50, d2=500", 50.000000, 500.000000, 99.971953, 99.082845, 4.254003, 4.241793, 22, 22));
- AddTestCase (new LteInterferenceTestCase ("d1=50, d2=1000", 50.000000, 1000.000000, 399.551632, 385.718468, 6.194952, 6.144825, 28, 28));
- AddTestCase (new LteInterferenceTestCase ("d1=50, d2=10000", 50.000000, 10000.000000, 35964.181431, 8505.970614, 12.667381, 10.588084, 28, 28));
- AddTestCase (new LteInterferenceTestCase ("d1=50, d2=100000", 50.000000, 100000.000000, 327284.773828, 10774.181090, 15.853097, 10.928917, 28, 28));
- AddTestCase (new LteInterferenceTestCase ("d1=50, d2=1000000", 50.000000, 1000000.000000, 356132.574152, 10802.988445, 15.974963, 10.932767, 28, 28));
- AddTestCase (new LteInterferenceTestCase ("d1=4500, d2=12600", 4500.000000, 12600.000000, 6.654462, 1.139831, 1.139781, 0.270399, 8, 2));
- AddTestCase (new LteInterferenceTestCase ("d1=5400, d2=12600", 5400.000000, 12600.000000, 4.621154, 0.791549, 0.876368, 0.193019, 6, 0));
+ AddTestCase (new LteInterferenceTestCase ("d1=3000, d2=6000", 3000.000000, 6000.000000, 3.844681, 1.714583, 0.761558, 0.389662, 6, 4), TestCase::QUICK);
+ AddTestCase (new LteInterferenceTestCase ("d1=50, d2=10", 50.000000, 10.000000, 0.040000, 0.040000, 0.010399, 0.010399, 0, 0), TestCase::QUICK);
+ AddTestCase (new LteInterferenceTestCase ("d1=50, d2=20", 50.000000, 20.000000, 0.160000, 0.159998, 0.041154, 0.041153, 0, 0), TestCase::QUICK);
+ AddTestCase (new LteInterferenceTestCase ("d1=50, d2=50", 50.000000, 50.000000, 0.999997, 0.999907, 0.239828, 0.239808, 2, 2), TestCase::QUICK);
+ AddTestCase (new LteInterferenceTestCase ("d1=50, d2=100", 50.000000, 100.000000, 3.999955, 3.998520, 0.785259, 0.785042, 6, 6), TestCase::QUICK);
+ AddTestCase (new LteInterferenceTestCase ("d1=50, d2=200", 50.000000, 200.000000, 15.999282, 15.976339, 1.961072, 1.959533, 14, 14), TestCase::QUICK);
+ AddTestCase (new LteInterferenceTestCase ("d1=50, d2=500", 50.000000, 500.000000, 99.971953, 99.082845, 4.254003, 4.241793, 22, 22), TestCase::QUICK);
+ AddTestCase (new LteInterferenceTestCase ("d1=50, d2=1000", 50.000000, 1000.000000, 399.551632, 385.718468, 6.194952, 6.144825, 28, 28), TestCase::QUICK);
+ AddTestCase (new LteInterferenceTestCase ("d1=50, d2=10000", 50.000000, 10000.000000, 35964.181431, 8505.970614, 12.667381, 10.588084, 28, 28), TestCase::QUICK);
+ AddTestCase (new LteInterferenceTestCase ("d1=50, d2=100000", 50.000000, 100000.000000, 327284.773828, 10774.181090, 15.853097, 10.928917, 28, 28), TestCase::QUICK);
+ AddTestCase (new LteInterferenceTestCase ("d1=50, d2=1000000", 50.000000, 1000000.000000, 356132.574152, 10802.988445, 15.974963, 10.932767, 28, 28), TestCase::QUICK);
+ AddTestCase (new LteInterferenceTestCase ("d1=4500, d2=12600", 4500.000000, 12600.000000, 6.654462, 1.139831, 1.139781, 0.270399, 8, 2), TestCase::QUICK);
+ AddTestCase (new LteInterferenceTestCase ("d1=5400, d2=12600", 5400.000000, 12600.000000, 4.621154, 0.791549, 0.876368, 0.193019, 6, 0), TestCase::QUICK);
}
--- a/src/lte/test/lte-test-link-adaptation.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/lte/test/lte-test-link-adaptation.cc Fri Mar 22 13:14:38 2013 +0100
@@ -123,7 +123,7 @@
std::ostringstream name;
name << " snr= " << snrEfficiencyMcs[i].snrDb << " dB, "
<< " mcs= " << snrEfficiencyMcs[i].mcsIndex;
- AddTestCase (new LteLinkAdaptationTestCase (name.str (), snrEfficiencyMcs[i].snrDb, lossDb, snrEfficiencyMcs[i].mcsIndex));
+ AddTestCase (new LteLinkAdaptationTestCase (name.str (), snrEfficiencyMcs[i].snrDb, lossDb, snrEfficiencyMcs[i].mcsIndex), TestCase::QUICK);
}
}
--- a/src/lte/test/lte-test-mimo.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/lte/test/lte-test-mimo.cc Fri Mar 22 13:14:38 2013 +0100
@@ -74,8 +74,8 @@
estThrDl.push_back (119100); // TTI 1 estimated throughput for TxMode 1
estThrDl.push_back (183600); // TTI 2 estimated throughput for TxMode 2
estThrDl.push_back (193400); // TTI 3 estimated throughput for TxMode 3
- AddTestCase (new LenaMimoTestCase(300, estThrDl, "ns3::RrFfMacScheduler"));
- AddTestCase (new LenaMimoTestCase(300, estThrDl, "ns3::PfFfMacScheduler"));
+ AddTestCase (new LenaMimoTestCase(300, estThrDl, "ns3::RrFfMacScheduler"), TestCase::QUICK);
+ AddTestCase (new LenaMimoTestCase(300, estThrDl, "ns3::PfFfMacScheduler"), TestCase::QUICK);
}
--- a/src/lte/test/lte-test-pathloss-model.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/lte/test/lte-test-pathloss-model.cc Fri Mar 22 13:14:38 2013 +0100
@@ -161,7 +161,7 @@
std::ostringstream name;
name << " snr= " << sinrDb << " dB, "
<< " mcs= " << snrEfficiencyMcs[i].mcsIndex;
- AddTestCase (new LtePathlossModelSystemTestCase (name.str (), sinrDb, dist[i], snrEfficiencyMcs[i].mcsIndex));
+ AddTestCase (new LtePathlossModelSystemTestCase (name.str (), sinrDb, dist[i], snrEfficiencyMcs[i].mcsIndex), TestCase::QUICK);
}
--- a/src/lte/test/lte-test-pf-ff-mac-scheduler.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/lte/test/lte-test-pf-ff-mac-scheduler.cc Fri Mar 22 13:14:38 2013 +0100
@@ -73,11 +73,11 @@
// 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 bytes/sec
// 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 bytes/sec
// 15 users -> 1 PRB at Itbs 26 -> 89 -> 89000 bytes/sec
- AddTestCase (new LenaPfFfMacSchedulerTestCase1 (1,0,0,2196000,2292000));
- AddTestCase (new LenaPfFfMacSchedulerTestCase1 (3,0,0,732000,749000));
- AddTestCase (new LenaPfFfMacSchedulerTestCase1 (6,0,0,366000,373000));
- AddTestCase (new LenaPfFfMacSchedulerTestCase1 (12,0,0,183000,185000));
- AddTestCase (new LenaPfFfMacSchedulerTestCase1 (15,0,0,146400,89000));
+ AddTestCase (new LenaPfFfMacSchedulerTestCase1 (1,0,0,2196000,2292000), TestCase::QUICK);
+ AddTestCase (new LenaPfFfMacSchedulerTestCase1 (3,0,0,732000,749000), TestCase::QUICK);
+ AddTestCase (new LenaPfFfMacSchedulerTestCase1 (6,0,0,366000,373000), TestCase::QUICK);
+ AddTestCase (new LenaPfFfMacSchedulerTestCase1 (12,0,0,183000,185000), TestCase::QUICK);
+ AddTestCase (new LenaPfFfMacSchedulerTestCase1 (15,0,0,146400,89000), TestCase::QUICK);
// DOWNLINK - DISTANCE 3000 -> MCS 24 -> Itbs 30 (from table 7.1.7.2.1-1 of 36.213)
// 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 bytes/sec
@@ -91,11 +91,11 @@
// 6 users -> 4 PRB at Itbs 18 -> 193 -> 193000 bytes/sec
// 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 bytes/sec
// 15 users -> 1 PRB at Itbs 18 -> 47 -> 47000 bytes/sec
- AddTestCase (new LenaPfFfMacSchedulerTestCase1 (1,0,3000,1383000,1239000));
- AddTestCase (new LenaPfFfMacSchedulerTestCase1 (3,0,3000,461000,389000));
- AddTestCase (new LenaPfFfMacSchedulerTestCase1 (6,0,3000,230500,193000));
- AddTestCase (new LenaPfFfMacSchedulerTestCase1 (12,0,3000,115250,97000));
- AddTestCase (new LenaPfFfMacSchedulerTestCase1 (15,0,3000,92200,47000));
+ AddTestCase (new LenaPfFfMacSchedulerTestCase1 (1,0,3000,1383000,1239000), TestCase::QUICK);
+ AddTestCase (new LenaPfFfMacSchedulerTestCase1 (3,0,3000,461000,389000), TestCase::QUICK);
+ AddTestCase (new LenaPfFfMacSchedulerTestCase1 (6,0,3000,230500,193000), TestCase::QUICK);
+ AddTestCase (new LenaPfFfMacSchedulerTestCase1 (12,0,3000,115250,97000), TestCase::QUICK);
+ AddTestCase (new LenaPfFfMacSchedulerTestCase1 (15,0,3000,92200,47000), TestCase::QUICK);
// DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
// 1 user -> 24 PRB at Itbs 15 -> 903 -> 903000 bytes/sec
@@ -109,11 +109,11 @@
// 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 bytes/sec
// 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 bytes/sec
// 15 users -> 1 PRB at Itbs 11 -> 22 -> 22000 bytes/sec
- AddTestCase (new LenaPfFfMacSchedulerTestCase1 (1,0,6000,903000,621000));
- AddTestCase (new LenaPfFfMacSchedulerTestCase1 (3,0,6000,301000,201000));
- AddTestCase (new LenaPfFfMacSchedulerTestCase1 (6,0,6000,150500,97000));
- AddTestCase (new LenaPfFfMacSchedulerTestCase1 (12,0,6000,75250,47000));
- AddTestCase (new LenaPfFfMacSchedulerTestCase1 (15,0,6000,60200,22000));
+ AddTestCase (new LenaPfFfMacSchedulerTestCase1 (1,0,6000,903000,621000), TestCase::QUICK);
+ AddTestCase (new LenaPfFfMacSchedulerTestCase1 (3,0,6000,301000,201000), TestCase::QUICK);
+ AddTestCase (new LenaPfFfMacSchedulerTestCase1 (6,0,6000,150500,97000), TestCase::QUICK);
+ AddTestCase (new LenaPfFfMacSchedulerTestCase1 (12,0,6000,75250,47000), TestCase::QUICK);
+ AddTestCase (new LenaPfFfMacSchedulerTestCase1 (15,0,6000,60200,22000), TestCase::QUICK);
// DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
// 1 user -> 24 PRB at Itbs 11 -> 597 -> 597000 bytes/sec
@@ -127,11 +127,11 @@
// 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 bytes/sec
// 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 bytes/sec
// 15 users -> 1 PRB at Itbs 8 -> 15 -> 15000 bytes/sec
- AddTestCase (new LenaPfFfMacSchedulerTestCase1 (1,0,9000,597000,437000));
- AddTestCase (new LenaPfFfMacSchedulerTestCase1 (3,0,9000,199000,137000));
- AddTestCase (new LenaPfFfMacSchedulerTestCase1 (6,0,9000,99500,67000));
- AddTestCase (new LenaPfFfMacSchedulerTestCase1 (12,0,9000,49750,32000));
- AddTestCase (new LenaPfFfMacSchedulerTestCase1 (15,0,9000,39800,15000));
+ AddTestCase (new LenaPfFfMacSchedulerTestCase1 (1,0,9000,597000,437000), TestCase::QUICK);
+ AddTestCase (new LenaPfFfMacSchedulerTestCase1 (3,0,9000,199000,137000), TestCase::QUICK);
+ AddTestCase (new LenaPfFfMacSchedulerTestCase1 (6,0,9000,99500,67000), TestCase::QUICK);
+ AddTestCase (new LenaPfFfMacSchedulerTestCase1 (12,0,9000,49750,32000), TestCase::QUICK);
+ AddTestCase (new LenaPfFfMacSchedulerTestCase1 (15,0,9000,39800,15000), TestCase::QUICK);
// DONWLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
// 1 user -> 24 PRB at Itbs 6 -> 309 -> 309000 bytes/sec
@@ -145,11 +145,11 @@
// 6 users -> 4 PRB at Itbs 6 -> 32 -> 32000 bytes/sec
// 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 bytes/sec
// 15 users -> 1 PRB at Itbs 6 -> 7 -> 7000 bytes/sec
- AddTestCase (new LenaPfFfMacSchedulerTestCase1 (1,0,15000,309000,233000));
- AddTestCase (new LenaPfFfMacSchedulerTestCase1 (3,0,15000,103000,69000));
- AddTestCase (new LenaPfFfMacSchedulerTestCase1 (6,0,15000,51500,32000));
- AddTestCase (new LenaPfFfMacSchedulerTestCase1 (12,0,15000,25750,15000));
- AddTestCase (new LenaPfFfMacSchedulerTestCase1 (15,0,15000,20600,7000));
+ AddTestCase (new LenaPfFfMacSchedulerTestCase1 (1,0,15000,309000,233000), TestCase::QUICK);
+ AddTestCase (new LenaPfFfMacSchedulerTestCase1 (3,0,15000,103000,69000), TestCase::QUICK);
+ AddTestCase (new LenaPfFfMacSchedulerTestCase1 (6,0,15000,51500,32000), TestCase::QUICK);
+ AddTestCase (new LenaPfFfMacSchedulerTestCase1 (12,0,15000,25750,15000), TestCase::QUICK);
+ AddTestCase (new LenaPfFfMacSchedulerTestCase1 (15,0,15000,20600,7000), TestCase::QUICK);
// Test Case 2: fairness check
@@ -171,7 +171,7 @@
estThrPfUl.push_back (125000); // User 2 estimated TTI throughput from PF
estThrPfUl.push_back (85000); // User 3 estimated TTI throughput from PF
estThrPfUl.push_back (41000); // User 4 estimated TTI throughput from PF
- AddTestCase (new LenaPfFfMacSchedulerTestCase2 (dist, estThrPfDl, estThrPfUl));
+ AddTestCase (new LenaPfFfMacSchedulerTestCase2 (dist, estThrPfDl, estThrPfUl), TestCase::QUICK);
}
--- a/src/lte/test/lte-test-phy-error-model.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/lte/test/lte-test-phy-error-model.cc Fri Mar 22 13:14:38 2013 +0100
@@ -63,28 +63,28 @@
// Tests on DL Control Channels (PCFICH+PDDCH)
// 1 interfering eNB SINR -2.0 BER 0.007 TB size 217
- AddTestCase (new LenaDlCtrlPhyErrorModelTestCase (2, 1078, 217, 0.007));
+ AddTestCase (new LenaDlCtrlPhyErrorModelTestCase (2, 1078, 217, 0.007), TestCase::QUICK);
// 2 interfering eNBs SINR -4.0 BER 0.037 TB size 217
- AddTestCase (new LenaDlCtrlPhyErrorModelTestCase (3, 1040, 217, 0.045));
+ AddTestCase (new LenaDlCtrlPhyErrorModelTestCase (3, 1040, 217, 0.045), TestCase::QUICK);
// 3 interfering eNBs SINR -6.0 BER 0.21 TB size 133
- AddTestCase (new LenaDlCtrlPhyErrorModelTestCase (4, 1250, 133, 0.206));
+ AddTestCase (new LenaDlCtrlPhyErrorModelTestCase (4, 1250, 133, 0.206), TestCase::QUICK);
// 4 interfering eNBs SINR -7.0 BER 0.34 TB size 133
- AddTestCase (new LenaDlCtrlPhyErrorModelTestCase (5, 1260, 81, 0.343));
+ AddTestCase (new LenaDlCtrlPhyErrorModelTestCase (5, 1260, 81, 0.343), TestCase::QUICK);
// Tests on DL/UL Data channels (PDSCH, PUSCH)
// MCS 2 TB size of 256 bits BER 0.33 SINR -5.51
- AddTestCase (new LenaDataPhyErrorModelTestCase (4, 1800, 32, 0.35, 50));
+ AddTestCase (new LenaDataPhyErrorModelTestCase (4, 1800, 32, 0.35, 50), TestCase::QUICK);
// MCS 2 TB size of 528 bits BER 0.11 SINR -5.51
- AddTestCase (new LenaDataPhyErrorModelTestCase (2, 1800, 66, 0.11, 34));
+ AddTestCase (new LenaDataPhyErrorModelTestCase (2, 1800, 66, 0.11, 34), TestCase::QUICK);
// MCS 2 TB size of 1088 bits BER 0.02 SINR -5.51
- AddTestCase (new LenaDataPhyErrorModelTestCase (1, 1800, 136, 0.02, 16));
+ AddTestCase (new LenaDataPhyErrorModelTestCase (1, 1800, 136, 0.02, 16), TestCase::QUICK);
// MCS 12 TB size of 4800 bits BER 0.3 SINR 4.43
- AddTestCase (new LenaDataPhyErrorModelTestCase (1, 600, 600, 0.3, 48));
+ AddTestCase (new LenaDataPhyErrorModelTestCase (1, 600, 600, 0.3, 48), TestCase::QUICK);
// MCS 12 TB size of 1632 bits BER 0.55 SINR 4.43
- AddTestCase (new LenaDataPhyErrorModelTestCase (3, 600, 204, 0.55, 52));
+ AddTestCase (new LenaDataPhyErrorModelTestCase (3, 600, 204, 0.55, 52), TestCase::QUICK);
// MCS 16 TB size of 7272 bits (3648 x 3584) BER 0.14 SINR 8.48
// BER 0.14 = 1 - ((1-0.075)*(1-0.075))
- AddTestCase (new LenaDataPhyErrorModelTestCase (1, 470, 781, 0.14, 29));
+ AddTestCase (new LenaDataPhyErrorModelTestCase (1, 470, 781, 0.14, 29), TestCase::QUICK);
--- a/src/lte/test/lte-test-pss-ff-mac-scheduler.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/lte/test/lte-test-pss-ff-mac-scheduler.cc Fri Mar 22 13:14:38 2013 +0100
@@ -90,10 +90,10 @@
// 3 users -> 8 PRB at Itbs 26 -> 749 -> 749000 > 232000 -> throughput = 232000 bytes/sec
// 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 > 232000 -> throughput = 232000 bytes/sec
// 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 < 232000 -> throughput = 185000 bytes/sec
- AddTestCase (new LenaPssFfMacSchedulerTestCase1 (1,0,0,232000,232000,200,1));
- AddTestCase (new LenaPssFfMacSchedulerTestCase1 (3,0,0,232000,232000,200,1));
- AddTestCase (new LenaPssFfMacSchedulerTestCase1 (6,0,0,232000,232000,200,1));
- AddTestCase (new LenaPssFfMacSchedulerTestCase1 (12,0,0,183000,185000,200,1));
+ AddTestCase (new LenaPssFfMacSchedulerTestCase1 (1,0,0,232000,232000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaPssFfMacSchedulerTestCase1 (3,0,0,232000,232000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaPssFfMacSchedulerTestCase1 (6,0,0,232000,232000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaPssFfMacSchedulerTestCase1 (12,0,0,183000,185000,200,1), TestCase::QUICK);
// DOWNLINK - DISTANCE 3000 -> MCS 24 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213)
// DOWNLINK -> DISTANCE 0 -> MCS 28 -> Itbs 26 (from table 7.1.7.2.1-1 of 36.2 13)
@@ -110,10 +110,10 @@
// 3 users -> 8 PRB at Itbs 18 -> 389 -> 389000 > 232000 -> throughput = 232000 bytes/sec
// 6 users -> 4 PRB at Itbs 18 -> 193 -> 193000 < 232000 -> throughput = 193000 bytes/sec
// 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 < 232000 -> throughput = 97000 bytes/sec
- AddTestCase (new LenaPssFfMacSchedulerTestCase1 (1,0,3000,232000,232000,200,1));
- AddTestCase (new LenaPssFfMacSchedulerTestCase1 (3,0,3000,232000,232000,200,1));
- AddTestCase (new LenaPssFfMacSchedulerTestCase1 (6,0,3000,230500,193000,200,1));
- AddTestCase (new LenaPssFfMacSchedulerTestCase1 (12,0,3000,115250,97000,200,1));
+ AddTestCase (new LenaPssFfMacSchedulerTestCase1 (1,0,3000,232000,232000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaPssFfMacSchedulerTestCase1 (3,0,3000,232000,232000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaPssFfMacSchedulerTestCase1 (6,0,3000,230500,193000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaPssFfMacSchedulerTestCase1 (12,0,3000,115250,97000,200,1), TestCase::QUICK);
// DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
// Traffic info
@@ -129,10 +129,10 @@
// 3 users -> 8 PRB at Itbs 11 -> 201 -> 201000 < 232000 -> throughput = 201000 bytes/sec
// 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 < 232000 -> throughput = 97000 bytes/sec
// 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 < 232000 -> throughput = 47000 bytes/sec
- AddTestCase (new LenaPssFfMacSchedulerTestCase1 (1,0,6000,232000,232000,200,1));
- AddTestCase (new LenaPssFfMacSchedulerTestCase1 (3,0,6000,232000,201000,200,1));
- AddTestCase (new LenaPssFfMacSchedulerTestCase1 (6,0,6000,150500,97000,200,1));
- AddTestCase (new LenaPssFfMacSchedulerTestCase1 (12,0,6000,75250,47000,200,1));
+ AddTestCase (new LenaPssFfMacSchedulerTestCase1 (1,0,6000,232000,232000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaPssFfMacSchedulerTestCase1 (3,0,6000,232000,201000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaPssFfMacSchedulerTestCase1 (6,0,6000,150500,97000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaPssFfMacSchedulerTestCase1 (12,0,6000,75250,47000,200,1), TestCase::QUICK);
// DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
// Traffic info
@@ -148,10 +148,10 @@
// 3 users -> 8 PRB at Itbs 8 -> 137 -> 137000 < 232000 -> throughput = 137000 bytes/sec
// 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 < 232000 -> throughput = 67000 bytes/sec
// 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 < 232000 -> throughput = 32000 bytes/sec
- AddTestCase (new LenaPssFfMacSchedulerTestCase1 (1,0,9000,232000,232000,200,1));
- AddTestCase (new LenaPssFfMacSchedulerTestCase1 (3,0,9000,199000,137000,200,1));
- AddTestCase (new LenaPssFfMacSchedulerTestCase1 (6,0,9000,99500,67000,200,1));
- AddTestCase (new LenaPssFfMacSchedulerTestCase1 (12,0,9000,49750,32000,200,1));
+ AddTestCase (new LenaPssFfMacSchedulerTestCase1 (1,0,9000,232000,232000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaPssFfMacSchedulerTestCase1 (3,0,9000,199000,137000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaPssFfMacSchedulerTestCase1 (6,0,9000,99500,67000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaPssFfMacSchedulerTestCase1 (12,0,9000,49750,32000,200,1), TestCase::QUICK);
// DONWLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
// Traffic info
@@ -167,10 +167,10 @@
// 3 users -> 8 PRB at Itbs 6 -> 69 -> 69000 < 232000 -> throughput = 69000 bytes/sec
// 6 users -> 4 PRB at Itbs 6 -> 32 -> 32000 < 232000 -> throughput = 32000 bytes/sec
// 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 < 232000 -> throughput = 15000 bytes/sec
- AddTestCase (new LenaPssFfMacSchedulerTestCase1 (1,0,15000,232000,232000,200,1));
- AddTestCase (new LenaPssFfMacSchedulerTestCase1 (3,0,15000,103000,69000,200,1));
- AddTestCase (new LenaPssFfMacSchedulerTestCase1 (6,0,15000,51500,32000,200,1));
- AddTestCase (new LenaPssFfMacSchedulerTestCase1 (12,0,15000,25750,15000,200,1));
+ AddTestCase (new LenaPssFfMacSchedulerTestCase1 (1,0,15000,232000,232000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaPssFfMacSchedulerTestCase1 (3,0,15000,103000,69000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaPssFfMacSchedulerTestCase1 (6,0,15000,51500,32000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaPssFfMacSchedulerTestCase1 (12,0,15000,25750,15000,200,1), TestCase::QUICK);
// Test Case 2: homogeneous flow test in PSS (different distance)
// Traffic1 info
@@ -196,7 +196,7 @@
estThrPssDl1.push_back (132000);
estThrPssDl1.push_back (132000);
estThrPssDl1.push_back (132000);
- AddTestCase (new LenaPssFfMacSchedulerTestCase2 (dist1,estThrPssDl1,packetSize1,1));
+ AddTestCase (new LenaPssFfMacSchedulerTestCase2 (dist1,estThrPssDl1,packetSize1,1), TestCase::QUICK);
// Traffic2 info
// UDP traffic: payload size = 200 bytes, interval = 1 ms
@@ -221,7 +221,7 @@
estThrPssDl2.push_back (138944);
estThrPssDl2.push_back (138944);
estThrPssDl2.push_back (138944);
- AddTestCase (new LenaPssFfMacSchedulerTestCase2 (dist2,estThrPssDl2,packetSize2,1));
+ AddTestCase (new LenaPssFfMacSchedulerTestCase2 (dist2,estThrPssDl2,packetSize2,1), TestCase::QUICK);
// Test Case 3: : heterogeneous flow test in PSS (same distance)
// Traffic3 info:
@@ -247,7 +247,7 @@
estThrPssDl3.push_back (332000);
estThrPssDl3.push_back (432000);
estThrPssDl3.push_back (532000);
- AddTestCase (new LenaPssFfMacSchedulerTestCase2 (dist3,estThrPssDl3,packetSize3,1));
+ AddTestCase (new LenaPssFfMacSchedulerTestCase2 (dist3,estThrPssDl3,packetSize3,1), TestCase::QUICK);
// Test Case 4: heterogeneous flow test in PSS (different distance)
@@ -268,7 +268,7 @@
estThrPssDl4.push_back (132000); // User 0 estimated TTI throughput from PSS
estThrPssDl4.push_back (232000); // User 1 estimated TTI throughput from PSS
estThrPssDl4.push_back (332000); // User 2 estimated TTI throughput from PSS
- AddTestCase (new LenaPssFfMacSchedulerTestCase2 (dist4,estThrPssDl4,packetSize4,1));
+ AddTestCase (new LenaPssFfMacSchedulerTestCase2 (dist4,estThrPssDl4,packetSize4,1), TestCase::QUICK);
}
static LenaTestPssFfMacSchedulerSuite lenaTestPssFfMacSchedulerSuite;
--- a/src/lte/test/lte-test-rlc-am-e2e.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/lte/test/lte-test-rlc-am-e2e.cc Fri Mar 22 13:14:38 2013 +0100
@@ -64,7 +64,7 @@
{
std::ostringstream name;
name << " Losses = " << losses[l] << "%. Seed = " << seeds[s];
- AddTestCase (new LteRlcAmE2eTestCase (name.str (), seeds[s], losses[l]));
+ AddTestCase (new LteRlcAmE2eTestCase (name.str (), seeds[s], losses[l]), TestCase::QUICK);
}
}
}
--- a/src/lte/test/lte-test-rlc-am-transmitter.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/lte/test/lte-test-rlc-am-transmitter.cc Fri Mar 22 13:14:38 2013 +0100
@@ -42,10 +42,10 @@
// LogLevel logLevel = (LogLevel)(LOG_PREFIX_FUNC | LOG_PREFIX_TIME | LOG_LEVEL_ALL);
// LogComponentEnable ("LteRlcAmTransmitterTest", logLevel);
- AddTestCase (new LteRlcAmTransmitterOneSduTestCase ("One SDU, one PDU"));
- AddTestCase (new LteRlcAmTransmitterSegmentationTestCase ("Segmentation"));
- AddTestCase (new LteRlcAmTransmitterConcatenationTestCase ("Concatenation"));
- AddTestCase (new LteRlcAmTransmitterReportBufferStatusTestCase ("ReportBufferStatus primitive"));
+ AddTestCase (new LteRlcAmTransmitterOneSduTestCase ("One SDU, one PDU"), TestCase::QUICK);
+ AddTestCase (new LteRlcAmTransmitterSegmentationTestCase ("Segmentation"), TestCase::QUICK);
+ AddTestCase (new LteRlcAmTransmitterConcatenationTestCase ("Concatenation"), TestCase::QUICK);
+ AddTestCase (new LteRlcAmTransmitterReportBufferStatusTestCase ("ReportBufferStatus primitive"), TestCase::QUICK);
}
--- a/src/lte/test/lte-test-rlc-um-e2e.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/lte/test/lte-test-rlc-um-e2e.cc Fri Mar 22 13:14:38 2013 +0100
@@ -63,7 +63,7 @@
{
std::ostringstream name;
name << " Losses = " << losses[l] << "%. Seed = " << seeds[s];
- AddTestCase (new LteRlcUmE2eTestCase (name.str (), seeds[s], losses[l]));
+ AddTestCase (new LteRlcUmE2eTestCase (name.str (), seeds[s], losses[l]), TestCase::QUICK);
}
}
}
--- a/src/lte/test/lte-test-rlc-um-transmitter.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/lte/test/lte-test-rlc-um-transmitter.cc Fri Mar 22 13:14:38 2013 +0100
@@ -44,10 +44,10 @@
// NS_LOG_INFO ("Creating LteRlcUmTransmitterTestSuite");
- AddTestCase (new LteRlcUmTransmitterOneSduTestCase ("One SDU, one PDU"));
- AddTestCase (new LteRlcUmTransmitterSegmentationTestCase ("Segmentation"));
- AddTestCase (new LteRlcUmTransmitterConcatenationTestCase ("Concatenation"));
- AddTestCase (new LteRlcUmTransmitterReportBufferStatusTestCase ("ReportBufferStatus primitive"));
+ AddTestCase (new LteRlcUmTransmitterOneSduTestCase ("One SDU, one PDU"), TestCase::QUICK);
+ AddTestCase (new LteRlcUmTransmitterSegmentationTestCase ("Segmentation"), TestCase::QUICK);
+ AddTestCase (new LteRlcUmTransmitterConcatenationTestCase ("Concatenation"), TestCase::QUICK);
+ AddTestCase (new LteRlcUmTransmitterReportBufferStatusTestCase ("ReportBufferStatus primitive"), TestCase::QUICK);
}
--- a/src/lte/test/lte-test-rr-ff-mac-scheduler.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/lte/test/lte-test-rr-ff-mac-scheduler.cc Fri Mar 22 13:14:38 2013 +0100
@@ -71,12 +71,12 @@
// 9 user -> 2 PRB at Itbs 26 -> 185 -> 185000 bytes/sec
// 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 bytes/sec
// 15 users -> 1 PRB at Itbs 26 -> 89 -> 89000 bytes/sec
- AddTestCase (new LenaRrFfMacSchedulerTestCase (1,0,0,2196000,2292000));
- AddTestCase (new LenaRrFfMacSchedulerTestCase (3,0,0,749000,749000));
- AddTestCase (new LenaRrFfMacSchedulerTestCase (6,0,0,373000,373000));
- AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,0,185000,185000));
- AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,0,185000,185000));
- AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,0,148000,89000));
+ AddTestCase (new LenaRrFfMacSchedulerTestCase (1,0,0,2196000,2292000), TestCase::QUICK);
+ AddTestCase (new LenaRrFfMacSchedulerTestCase (3,0,0,749000,749000), TestCase::QUICK);
+ AddTestCase (new LenaRrFfMacSchedulerTestCase (6,0,0,373000,373000), TestCase::QUICK);
+ AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,0,185000,185000), TestCase::QUICK);
+ AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,0,185000,185000), TestCase::QUICK);
+ AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,0,148000,89000), TestCase::QUICK);
// DOWNLINK - DISTANCE 3000 -> MCS 22 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213)
// 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 bytes/sec
@@ -92,12 +92,12 @@
// 9 user -> 2 PRB at Itbs 18 -> 97 -> 97000 bytes/sec
// 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 bytes/sec
// 15 users -> 1 PRB at Itbs 18 -> 47 -> 47000 bytes/sec
- AddTestCase (new LenaRrFfMacSchedulerTestCase (1,0,3000,1383000,1239000));
- AddTestCase (new LenaRrFfMacSchedulerTestCase (3,0,3000,469000,389000));
- AddTestCase (new LenaRrFfMacSchedulerTestCase (6,0,3000,233000,193000));
- AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,3000,113000,97000));
- AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,3000,113000,97000));
- AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,3000,90400,47000));
+ AddTestCase (new LenaRrFfMacSchedulerTestCase (1,0,3000,1383000,1239000), TestCase::QUICK);
+ AddTestCase (new LenaRrFfMacSchedulerTestCase (3,0,3000,469000,389000), TestCase::QUICK);
+ AddTestCase (new LenaRrFfMacSchedulerTestCase (6,0,3000,233000,193000), TestCase::QUICK);
+ AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,3000,113000,97000), TestCase::QUICK);
+ AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,3000,113000,97000), TestCase::QUICK);
+ AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,3000,90400,47000), TestCase::QUICK);
// DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
// 1 user -> 24 PRB at Itbs 15 -> 903 -> 903000 bytes/sec
@@ -113,12 +113,12 @@
// 9 user -> 2 PRB at Itbs 11 -> 47 -> 47000 bytes/sec
// 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 bytes/sec
// 15 users -> 1 PRB at Itbs 11 -> 22 -> 22000 bytes/sec
- AddTestCase (new LenaRrFfMacSchedulerTestCase (1,0,6000,903000,621000));
- AddTestCase (new LenaRrFfMacSchedulerTestCase (3,0,6000,309000,201000));
- AddTestCase (new LenaRrFfMacSchedulerTestCase (6,0,6000,153000,97000));
- AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,6000,75000,47000));
- AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,6000,75000,47000));
- AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,6000,60000,22000));
+ AddTestCase (new LenaRrFfMacSchedulerTestCase (1,0,6000,903000,621000), TestCase::QUICK);
+ AddTestCase (new LenaRrFfMacSchedulerTestCase (3,0,6000,309000,201000), TestCase::QUICK);
+ AddTestCase (new LenaRrFfMacSchedulerTestCase (6,0,6000,153000,97000), TestCase::QUICK);
+ AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,6000,75000,47000), TestCase::QUICK);
+ AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,6000,75000,47000), TestCase::QUICK);
+ AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,6000,60000,22000), TestCase::QUICK);
// DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
// 1 user -> 24 PRB at Itbs 11 -> 597 -> 597000 bytes/sec
@@ -134,12 +134,12 @@
// 9 user -> 2 PRB at Itbs 8 -> 32 -> 32000 bytes/sec
// 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 bytes/sec
// 15 users -> 1 PRB at Itbs 8 -> 15 -> 15000 bytes/sec
- AddTestCase (new LenaRrFfMacSchedulerTestCase (1,0,9000,597000,437000));
- AddTestCase (new LenaRrFfMacSchedulerTestCase (3,0,9000,201000,137000));
- AddTestCase (new LenaRrFfMacSchedulerTestCase (6,0,9000,97000,67000));
- AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,9000,47000,32000));
- AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,9000,47000,32000));
- AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,9000,37600,15000));
+ AddTestCase (new LenaRrFfMacSchedulerTestCase (1,0,9000,597000,437000), TestCase::QUICK);
+ AddTestCase (new LenaRrFfMacSchedulerTestCase (3,0,9000,201000,137000), TestCase::QUICK);
+ AddTestCase (new LenaRrFfMacSchedulerTestCase (6,0,9000,97000,67000), TestCase::QUICK);
+ AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,9000,47000,32000), TestCase::QUICK);
+ AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,9000,47000,32000), TestCase::QUICK);
+ AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,9000,37600,15000), TestCase::QUICK);
// DOWNLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
// 1 user -> 24 PRB at Itbs 6 -> 309 -> 309000 bytes/sec
@@ -155,12 +155,12 @@
// 9 user -> 2 PRB at Itbs 6 -> 15 -> 15000 bytes/sec
// 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 bytes/sec
// 15 users -> 1 PRB at Itbs 6 -> 7 -> 7000 bytes/sec
- AddTestCase (new LenaRrFfMacSchedulerTestCase (1,0,15000,309000,233000));
- AddTestCase (new LenaRrFfMacSchedulerTestCase (3,0,15000,101000,69000));
- AddTestCase (new LenaRrFfMacSchedulerTestCase (6,0,15000,49000,32000));
- AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,15000,22000,15000));
- AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,15000,22000,15000));
- AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,15000,17600,7000));
+ AddTestCase (new LenaRrFfMacSchedulerTestCase (1,0,15000,309000,233000), TestCase::QUICK);
+ AddTestCase (new LenaRrFfMacSchedulerTestCase (3,0,15000,101000,69000), TestCase::QUICK);
+ AddTestCase (new LenaRrFfMacSchedulerTestCase (6,0,15000,49000,32000), TestCase::QUICK);
+ AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,15000,22000,15000), TestCase::QUICK);
+ AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,15000,22000,15000), TestCase::QUICK);
+ AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,15000,17600,7000), TestCase::QUICK);
}
--- a/src/lte/test/lte-test-spectrum-value-helper.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/lte/test/lte-test-spectrum-value-helper.cc Fri Mar 22 13:14:38 2013 +0100
@@ -167,7 +167,7 @@
fc2160nrb6[3] = 2.160090000000e+09;
fc2160nrb6[4] = 2.160270000000e+09;
fc2160nrb6[5] = 2.160450000000e+09;
- AddTestCase (new LteSpectrumModelTestCase ("fc2160nrb6", 500, 6, fc2160nrb6));
+ AddTestCase (new LteSpectrumModelTestCase ("fc2160nrb6", 500, 6, fc2160nrb6), TestCase::QUICK);
std::vector<double> fc2160nrb15 (15);
fc2160nrb15[0] = 2.158740000000e+09;
@@ -185,7 +185,7 @@
fc2160nrb15[12] = 2.160900000000e+09;
fc2160nrb15[13] = 2.161080000000e+09;
fc2160nrb15[14] = 2.161260000000e+09;
- AddTestCase (new LteSpectrumModelTestCase ("fc2160nrb15", 500, 15, fc2160nrb15));
+ AddTestCase (new LteSpectrumModelTestCase ("fc2160nrb15", 500, 15, fc2160nrb15), TestCase::QUICK);
std::vector<double> fc2160nrb25 (25);
fc2160nrb25[0] = 2.157840000000e+09;
@@ -213,7 +213,7 @@
fc2160nrb25[22] = 2.161800000000e+09;
fc2160nrb25[23] = 2.161980000000e+09;
fc2160nrb25[24] = 2.162160000000e+09;
- AddTestCase (new LteSpectrumModelTestCase ("fc2160nrb25", 500, 25, fc2160nrb25));
+ AddTestCase (new LteSpectrumModelTestCase ("fc2160nrb25", 500, 25, fc2160nrb25), TestCase::QUICK);
std::vector<double> fc2160nrb50 (50);
fc2160nrb50[0] = 2.155590000000e+09;
@@ -266,7 +266,7 @@
fc2160nrb50[47] = 2.164050000000e+09;
fc2160nrb50[48] = 2.164230000000e+09;
fc2160nrb50[49] = 2.164410000000e+09;
- AddTestCase (new LteSpectrumModelTestCase ("fc2160nrb50", 500, 50, fc2160nrb50));
+ AddTestCase (new LteSpectrumModelTestCase ("fc2160nrb50", 500, 50, fc2160nrb50), TestCase::QUICK);
std::vector<double> fc2160nrb75 (75);
fc2160nrb75[0] = 2.153340000000e+09;
@@ -344,7 +344,7 @@
fc2160nrb75[72] = 2.166300000000e+09;
fc2160nrb75[73] = 2.166480000000e+09;
fc2160nrb75[74] = 2.166660000000e+09;
- AddTestCase (new LteSpectrumModelTestCase ("fc2160nrb75", 500, 75, fc2160nrb75));
+ AddTestCase (new LteSpectrumModelTestCase ("fc2160nrb75", 500, 75, fc2160nrb75), TestCase::QUICK);
std::vector<double> fc2160nrb100 (100);
fc2160nrb100[0] = 2.151090000000e+09;
@@ -447,7 +447,7 @@
fc2160nrb100[97] = 2.168550000000e+09;
fc2160nrb100[98] = 2.168730000000e+09;
fc2160nrb100[99] = 2.168910000000e+09;
- AddTestCase (new LteSpectrumModelTestCase ("fc2160nrb100", 500, 100, fc2160nrb100));
+ AddTestCase (new LteSpectrumModelTestCase ("fc2160nrb100", 500, 100, fc2160nrb100), TestCase::QUICK);
std::vector<double> fc1730nrb6 (6);
fc1730nrb6[0] = 1.729550000000e+09;
@@ -456,7 +456,7 @@
fc1730nrb6[3] = 1.730090000000e+09;
fc1730nrb6[4] = 1.730270000000e+09;
fc1730nrb6[5] = 1.730450000000e+09;
- AddTestCase (new LteSpectrumModelTestCase ("fc1730nrb6", 19400, 6, fc1730nrb6));
+ AddTestCase (new LteSpectrumModelTestCase ("fc1730nrb6", 19400, 6, fc1730nrb6), TestCase::QUICK);
std::vector<double> fc1730nrb15 (15);
fc1730nrb15[0] = 1.728740000000e+09;
@@ -474,7 +474,7 @@
fc1730nrb15[12] = 1.730900000000e+09;
fc1730nrb15[13] = 1.731080000000e+09;
fc1730nrb15[14] = 1.731260000000e+09;
- AddTestCase (new LteSpectrumModelTestCase ("fc1730nrb15", 19400, 15, fc1730nrb15));
+ AddTestCase (new LteSpectrumModelTestCase ("fc1730nrb15", 19400, 15, fc1730nrb15), TestCase::QUICK);
std::vector<double> fc1730nrb25 (25);
fc1730nrb25[0] = 1.727840000000e+09;
@@ -502,7 +502,7 @@
fc1730nrb25[22] = 1.731800000000e+09;
fc1730nrb25[23] = 1.731980000000e+09;
fc1730nrb25[24] = 1.732160000000e+09;
- AddTestCase (new LteSpectrumModelTestCase ("fc1730nrb25", 19400, 25, fc1730nrb25));
+ AddTestCase (new LteSpectrumModelTestCase ("fc1730nrb25", 19400, 25, fc1730nrb25), TestCase::QUICK);
std::vector<double> fc1730nrb50 (50);
fc1730nrb50[0] = 1.725590000000e+09;
@@ -555,7 +555,7 @@
fc1730nrb50[47] = 1.734050000000e+09;
fc1730nrb50[48] = 1.734230000000e+09;
fc1730nrb50[49] = 1.734410000000e+09;
- AddTestCase (new LteSpectrumModelTestCase ("fc1730nrb50", 19400, 50, fc1730nrb50));
+ AddTestCase (new LteSpectrumModelTestCase ("fc1730nrb50", 19400, 50, fc1730nrb50), TestCase::QUICK);
std::vector<double> fc1730nrb75 (75);
fc1730nrb75[0] = 1.723340000000e+09;
@@ -633,7 +633,7 @@
fc1730nrb75[72] = 1.736300000000e+09;
fc1730nrb75[73] = 1.736480000000e+09;
fc1730nrb75[74] = 1.736660000000e+09;
- AddTestCase (new LteSpectrumModelTestCase ("fc1730nrb75", 19400, 75, fc1730nrb75));
+ AddTestCase (new LteSpectrumModelTestCase ("fc1730nrb75", 19400, 75, fc1730nrb75), TestCase::QUICK);
std::vector<double> fc1730nrb100 (100);
fc1730nrb100[0] = 1.721090000000e+09;
@@ -736,7 +736,7 @@
fc1730nrb100[97] = 1.738550000000e+09;
fc1730nrb100[98] = 1.738730000000e+09;
fc1730nrb100[99] = 1.738910000000e+09;
- AddTestCase (new LteSpectrumModelTestCase ("fc1730nrb100", 19400, 100, fc1730nrb100));
+ AddTestCase (new LteSpectrumModelTestCase ("fc1730nrb100", 19400, 100, fc1730nrb100), TestCase::QUICK);
SpectrumValue nfdB0earfcn500nrb6 (LteSpectrumValueHelper::GetSpectrumModel (500, 6));
@@ -746,7 +746,7 @@
nfdB0earfcn500nrb6[3] = 4.002000000000e-21;
nfdB0earfcn500nrb6[4] = 4.002000000000e-21;
nfdB0earfcn500nrb6[5] = 4.002000000000e-21;
- AddTestCase (new LteNoisePsdTestCase ("nfdB0earfcn500nrb6", 500, 6, 0.000000, nfdB0earfcn500nrb6));
+ AddTestCase (new LteNoisePsdTestCase ("nfdB0earfcn500nrb6", 500, 6, 0.000000, nfdB0earfcn500nrb6), TestCase::QUICK);
SpectrumValue nfdB5earfcn500nrb6 (LteSpectrumValueHelper::GetSpectrumModel (500, 6));
nfdB5earfcn500nrb6[0] = 1.265543519599e-20;
@@ -755,7 +755,7 @@
nfdB5earfcn500nrb6[3] = 1.265543519599e-20;
nfdB5earfcn500nrb6[4] = 1.265543519599e-20;
nfdB5earfcn500nrb6[5] = 1.265543519599e-20;
- AddTestCase (new LteNoisePsdTestCase ("nfdB5earfcn500nrb6", 500, 6, 5.000000, nfdB5earfcn500nrb6));
+ AddTestCase (new LteNoisePsdTestCase ("nfdB5earfcn500nrb6", 500, 6, 5.000000, nfdB5earfcn500nrb6), TestCase::QUICK);
SpectrumValue nfdB10earfcn500nrb6 (LteSpectrumValueHelper::GetSpectrumModel (500, 6));
nfdB10earfcn500nrb6[0] = 4.002000000000e-20;
@@ -764,7 +764,7 @@
nfdB10earfcn500nrb6[3] = 4.002000000000e-20;
nfdB10earfcn500nrb6[4] = 4.002000000000e-20;
nfdB10earfcn500nrb6[5] = 4.002000000000e-20;
- AddTestCase (new LteNoisePsdTestCase ("nfdB10earfcn500nrb6", 500, 6, 10.000000, nfdB10earfcn500nrb6));
+ AddTestCase (new LteNoisePsdTestCase ("nfdB10earfcn500nrb6", 500, 6, 10.000000, nfdB10earfcn500nrb6), TestCase::QUICK);
SpectrumValue nfdB0earfcn500nrb15 (LteSpectrumValueHelper::GetSpectrumModel (500, 15));
nfdB0earfcn500nrb15[0] = 4.002000000000e-21;
@@ -782,7 +782,7 @@
nfdB0earfcn500nrb15[12] = 4.002000000000e-21;
nfdB0earfcn500nrb15[13] = 4.002000000000e-21;
nfdB0earfcn500nrb15[14] = 4.002000000000e-21;
- AddTestCase (new LteNoisePsdTestCase ("nfdB0earfcn500nrb15", 500, 15, 0.000000, nfdB0earfcn500nrb15));
+ AddTestCase (new LteNoisePsdTestCase ("nfdB0earfcn500nrb15", 500, 15, 0.000000, nfdB0earfcn500nrb15), TestCase::QUICK);
SpectrumValue nfdB5earfcn500nrb15 (LteSpectrumValueHelper::GetSpectrumModel (500, 15));
nfdB5earfcn500nrb15[0] = 1.265543519599e-20;
@@ -800,7 +800,7 @@
nfdB5earfcn500nrb15[12] = 1.265543519599e-20;
nfdB5earfcn500nrb15[13] = 1.265543519599e-20;
nfdB5earfcn500nrb15[14] = 1.265543519599e-20;
- AddTestCase (new LteNoisePsdTestCase ("nfdB5earfcn500nrb15", 500, 15, 5.000000, nfdB5earfcn500nrb15));
+ AddTestCase (new LteNoisePsdTestCase ("nfdB5earfcn500nrb15", 500, 15, 5.000000, nfdB5earfcn500nrb15), TestCase::QUICK);
SpectrumValue nfdB10earfcn500nrb15 (LteSpectrumValueHelper::GetSpectrumModel (500, 15));
nfdB10earfcn500nrb15[0] = 4.002000000000e-20;
@@ -830,7 +830,7 @@
spectrumValue_txpowdB10nrb6run1earfcn500[3] = 0.000000000000e+00;
spectrumValue_txpowdB10nrb6run1earfcn500[4] = 0.000000000000e+00;
spectrumValue_txpowdB10nrb6run1earfcn500[5] = 0.000000000000e+00;
- AddTestCase (new LteTxPsdTestCase ("txpowdB10nrb6run1earfcn500", 500, 6, 10.000000, activeRbs_txpowdB10nrb6run1earfcn500, spectrumValue_txpowdB10nrb6run1earfcn500));
+ AddTestCase (new LteTxPsdTestCase ("txpowdB10nrb6run1earfcn500", 500, 6, 10.000000, activeRbs_txpowdB10nrb6run1earfcn500, spectrumValue_txpowdB10nrb6run1earfcn500), TestCase::QUICK);
std::vector<int> activeRbs_txpowdB30nrb6run1earfcn500 (1);
activeRbs_txpowdB30nrb6run1earfcn500[0] = 5.000000000000e+00;
@@ -841,7 +841,7 @@
spectrumValue_txpowdB30nrb6run1earfcn500[3] = 0.000000000000e+00;
spectrumValue_txpowdB30nrb6run1earfcn500[4] = 0.000000000000e+00;
spectrumValue_txpowdB30nrb6run1earfcn500[5] = 9.259259259259e-07;
- AddTestCase (new LteTxPsdTestCase ("txpowdB30nrb6run1earfcn500", 500, 6, 30.000000, activeRbs_txpowdB30nrb6run1earfcn500, spectrumValue_txpowdB30nrb6run1earfcn500));
+ AddTestCase (new LteTxPsdTestCase ("txpowdB30nrb6run1earfcn500", 500, 6, 30.000000, activeRbs_txpowdB30nrb6run1earfcn500, spectrumValue_txpowdB30nrb6run1earfcn500), TestCase::QUICK);
std::vector<int> activeRbs_txpowdB10nrb25run1earfcn500 (8);
activeRbs_txpowdB10nrb25run1earfcn500[0] = 1.000000000000e+00;
@@ -878,7 +878,7 @@
spectrumValue_txpowdB10nrb25run1earfcn500[22] = 0.000000000000e+00;
spectrumValue_txpowdB10nrb25run1earfcn500[23] = 0.000000000000e+00;
spectrumValue_txpowdB10nrb25run1earfcn500[24] = 2.222222222222e-09;
- AddTestCase (new LteTxPsdTestCase ("txpowdB10nrb25run1earfcn500", 500, 25, 10.000000, activeRbs_txpowdB10nrb25run1earfcn500, spectrumValue_txpowdB10nrb25run1earfcn500));
+ AddTestCase (new LteTxPsdTestCase ("txpowdB10nrb25run1earfcn500", 500, 25, 10.000000, activeRbs_txpowdB10nrb25run1earfcn500, spectrumValue_txpowdB10nrb25run1earfcn500), TestCase::QUICK);
std::vector<int> activeRbs_txpowdB30nrb25run1earfcn500 (13);
activeRbs_txpowdB30nrb25run1earfcn500[0] = 0.000000000000e+00;
@@ -920,7 +920,7 @@
spectrumValue_txpowdB30nrb25run1earfcn500[22] = 0.000000000000e+00;
spectrumValue_txpowdB30nrb25run1earfcn500[23] = 0.000000000000e+00;
spectrumValue_txpowdB30nrb25run1earfcn500[24] = 2.222222222222e-07;
- AddTestCase (new LteTxPsdTestCase ("txpowdB30nrb25run1earfcn500", 500, 25, 30.000000, activeRbs_txpowdB30nrb25run1earfcn500, spectrumValue_txpowdB30nrb25run1earfcn500));
+ AddTestCase (new LteTxPsdTestCase ("txpowdB30nrb25run1earfcn500", 500, 25, 30.000000, activeRbs_txpowdB30nrb25run1earfcn500, spectrumValue_txpowdB30nrb25run1earfcn500), TestCase::QUICK);
std::vector<int> activeRbs_txpowdB10nrb100run1earfcn500 (60);
activeRbs_txpowdB10nrb100run1earfcn500[0] = 0.000000000000e+00;
@@ -1084,7 +1084,7 @@
spectrumValue_txpowdB10nrb100run1earfcn500[97] = 5.555555555556e-10;
spectrumValue_txpowdB10nrb100run1earfcn500[98] = 5.555555555556e-10;
spectrumValue_txpowdB10nrb100run1earfcn500[99] = 0.000000000000e+00;
- AddTestCase (new LteTxPsdTestCase ("txpowdB10nrb100run1earfcn500", 500, 100, 10.000000, activeRbs_txpowdB10nrb100run1earfcn500, spectrumValue_txpowdB10nrb100run1earfcn500));
+ AddTestCase (new LteTxPsdTestCase ("txpowdB10nrb100run1earfcn500", 500, 100, 10.000000, activeRbs_txpowdB10nrb100run1earfcn500, spectrumValue_txpowdB10nrb100run1earfcn500), TestCase::QUICK);
std::vector<int> activeRbs_txpowdB30nrb100run1earfcn500 (39);
activeRbs_txpowdB30nrb100run1earfcn500[0] = 0.000000000000e+00;
@@ -1227,7 +1227,7 @@
spectrumValue_txpowdB30nrb100run1earfcn500[97] = 0.000000000000e+00;
spectrumValue_txpowdB30nrb100run1earfcn500[98] = 5.555555555556e-08;
spectrumValue_txpowdB30nrb100run1earfcn500[99] = 5.555555555556e-08;
- AddTestCase (new LteTxPsdTestCase ("txpowdB30nrb100run1earfcn500", 500, 100, 30.000000, activeRbs_txpowdB30nrb100run1earfcn500, spectrumValue_txpowdB30nrb100run1earfcn500));
+ AddTestCase (new LteTxPsdTestCase ("txpowdB30nrb100run1earfcn500", 500, 100, 30.000000, activeRbs_txpowdB30nrb100run1earfcn500, spectrumValue_txpowdB30nrb100run1earfcn500), TestCase::QUICK);
std::vector<int> activeRbs_txpowdB10nrb6run2earfcn500 (3);
activeRbs_txpowdB10nrb6run2earfcn500[0] = 1.000000000000e+00;
@@ -1240,7 +1240,7 @@
spectrumValue_txpowdB10nrb6run2earfcn500[3] = 0.000000000000e+00;
spectrumValue_txpowdB10nrb6run2earfcn500[4] = 9.259259259259e-09;
spectrumValue_txpowdB10nrb6run2earfcn500[5] = 9.259259259259e-09;
- AddTestCase (new LteTxPsdTestCase ("txpowdB10nrb6run2earfcn500", 500, 6, 10.000000, activeRbs_txpowdB10nrb6run2earfcn500, spectrumValue_txpowdB10nrb6run2earfcn500));
+ AddTestCase (new LteTxPsdTestCase ("txpowdB10nrb6run2earfcn500", 500, 6, 10.000000, activeRbs_txpowdB10nrb6run2earfcn500, spectrumValue_txpowdB10nrb6run2earfcn500), TestCase::QUICK);
std::vector<int> activeRbs_txpowdB30nrb6run2earfcn500 (3);
activeRbs_txpowdB30nrb6run2earfcn500[0] = 3.000000000000e+00;
@@ -1253,7 +1253,7 @@
spectrumValue_txpowdB30nrb6run2earfcn500[3] = 9.259259259259e-07;
spectrumValue_txpowdB30nrb6run2earfcn500[4] = 9.259259259259e-07;
spectrumValue_txpowdB30nrb6run2earfcn500[5] = 9.259259259259e-07;
- AddTestCase (new LteTxPsdTestCase ("txpowdB30nrb6run2earfcn500", 500, 6, 30.000000, activeRbs_txpowdB30nrb6run2earfcn500, spectrumValue_txpowdB30nrb6run2earfcn500));
+ AddTestCase (new LteTxPsdTestCase ("txpowdB30nrb6run2earfcn500", 500, 6, 30.000000, activeRbs_txpowdB30nrb6run2earfcn500, spectrumValue_txpowdB30nrb6run2earfcn500), TestCase::QUICK);
std::vector<int> activeRbs_txpowdB10nrb25run2earfcn500 (15);
activeRbs_txpowdB10nrb25run2earfcn500[0] = 0.000000000000e+00;
@@ -1297,7 +1297,7 @@
spectrumValue_txpowdB10nrb25run2earfcn500[22] = 0.000000000000e+00;
spectrumValue_txpowdB10nrb25run2earfcn500[23] = 0.000000000000e+00;
spectrumValue_txpowdB10nrb25run2earfcn500[24] = 2.222222222222e-09;
- AddTestCase (new LteTxPsdTestCase ("txpowdB10nrb25run2earfcn500", 500, 25, 10.000000, activeRbs_txpowdB10nrb25run2earfcn500, spectrumValue_txpowdB10nrb25run2earfcn500));
+ AddTestCase (new LteTxPsdTestCase ("txpowdB10nrb25run2earfcn500", 500, 25, 10.000000, activeRbs_txpowdB10nrb25run2earfcn500, spectrumValue_txpowdB10nrb25run2earfcn500), TestCase::QUICK);
std::vector<int> activeRbs_txpowdB30nrb25run2earfcn500 (13);
activeRbs_txpowdB30nrb25run2earfcn500[0] = 0.000000000000e+00;
@@ -1339,7 +1339,7 @@
spectrumValue_txpowdB30nrb25run2earfcn500[22] = 0.000000000000e+00;
spectrumValue_txpowdB30nrb25run2earfcn500[23] = 2.222222222222e-07;
spectrumValue_txpowdB30nrb25run2earfcn500[24] = 2.222222222222e-07;
- AddTestCase (new LteTxPsdTestCase ("txpowdB30nrb25run2earfcn500", 500, 25, 30.000000, activeRbs_txpowdB30nrb25run2earfcn500, spectrumValue_txpowdB30nrb25run2earfcn500));
+ AddTestCase (new LteTxPsdTestCase ("txpowdB30nrb25run2earfcn500", 500, 25, 30.000000, activeRbs_txpowdB30nrb25run2earfcn500, spectrumValue_txpowdB30nrb25run2earfcn500), TestCase::QUICK);
std::vector<int> activeRbs_txpowdB10nrb100run2earfcn500 (48);
activeRbs_txpowdB10nrb100run2earfcn500[0] = 2.000000000000e+00;
@@ -1491,7 +1491,7 @@
spectrumValue_txpowdB10nrb100run2earfcn500[97] = 5.555555555556e-10;
spectrumValue_txpowdB10nrb100run2earfcn500[98] = 0.000000000000e+00;
spectrumValue_txpowdB10nrb100run2earfcn500[99] = 0.000000000000e+00;
- AddTestCase (new LteTxPsdTestCase ("txpowdB10nrb100run2earfcn500", 500, 100, 10.000000, activeRbs_txpowdB10nrb100run2earfcn500, spectrumValue_txpowdB10nrb100run2earfcn500));
+ AddTestCase (new LteTxPsdTestCase ("txpowdB10nrb100run2earfcn500", 500, 100, 10.000000, activeRbs_txpowdB10nrb100run2earfcn500, spectrumValue_txpowdB10nrb100run2earfcn500), TestCase::QUICK);
std::vector<int> activeRbs_txpowdB30nrb100run2earfcn500 (52);
activeRbs_txpowdB30nrb100run2earfcn500[0] = 0.000000000000e+00;
@@ -1647,7 +1647,7 @@
spectrumValue_txpowdB30nrb100run2earfcn500[97] = 0.000000000000e+00;
spectrumValue_txpowdB30nrb100run2earfcn500[98] = 5.555555555556e-08;
spectrumValue_txpowdB30nrb100run2earfcn500[99] = 5.555555555556e-08;
- AddTestCase (new LteTxPsdTestCase ("txpowdB30nrb100run2earfcn500", 500, 100, 30.000000, activeRbs_txpowdB30nrb100run2earfcn500, spectrumValue_txpowdB30nrb100run2earfcn500));
+ AddTestCase (new LteTxPsdTestCase ("txpowdB30nrb100run2earfcn500", 500, 100, 30.000000, activeRbs_txpowdB30nrb100run2earfcn500, spectrumValue_txpowdB30nrb100run2earfcn500), TestCase::QUICK);
--- a/src/lte/test/lte-test-tdbet-ff-mac-scheduler.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/lte/test/lte-test-tdbet-ff-mac-scheduler.cc Fri Mar 22 13:14:38 2013 +0100
@@ -74,11 +74,11 @@
// 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 bytes/sec
// 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 bytes/sec
// 15 users -> 1 PRB at Itbs 26 -> 89 -> 89000 bytes/sec
- AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (1,0,0,2196000,2292000));
- AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (3,0,0,732000,749000));
- AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (6,0,0,366000,373000));
- AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (12,0,0,183000,185000));
- AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (15,0,0,146400,89000));
+ AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (1,0,0,2196000,2292000), TestCase::QUICK);
+ AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (3,0,0,732000,749000), TestCase::QUICK);
+ AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (6,0,0,366000,373000), TestCase::QUICK);
+ AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (12,0,0,183000,185000), TestCase::QUICK);
+ AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (15,0,0,146400,89000), TestCase::QUICK);
// DOWNLINK - DISTANCE 3000 -> MCS 24 -> Itbs 30 (from table 7.1.7.2.1-1 of 36.213)
// 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 bytes/sec
@@ -92,11 +92,11 @@
// 6 users -> 4 PRB at Itbs 18 -> 193 -> 193000 bytes/sec
// 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 bytes/sec
// 15 users -> 1 PRB at Itbs 18 -> 47 -> 47000 bytes/sec
- AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (1,0,3000,1383000,1239000));
- AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (3,0,3000,461000,389000));
- AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (6,0,3000,230500,193000));
- AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (12,0,3000,115250,97000));
- AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (15,0,3000,92200,47000));
+ AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (1,0,3000,1383000,1239000), TestCase::QUICK);
+ AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (3,0,3000,461000,389000), TestCase::QUICK);
+ AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (6,0,3000,230500,193000), TestCase::QUICK);
+ AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (12,0,3000,115250,97000), TestCase::QUICK);
+ AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (15,0,3000,92200,47000), TestCase::QUICK);
// DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
// 1 user -> 24 PRB at Itbs 15 -> 903 -> 903000 bytes/sec
@@ -110,11 +110,11 @@
// 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 bytes/sec
// 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 bytes/sec
// 15 users -> 1 PRB at Itbs 11 -> 22 -> 22000 bytes/sec
- AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (1,0,6000,903000,621000));
- AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (3,0,6000,301000,201000));
- AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (6,0,6000,150500,97000));
- AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (12,0,6000,75250,47000));
- AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (15,0,6000,60200,22000));
+ AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (1,0,6000,903000,621000), TestCase::QUICK);
+ AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (3,0,6000,301000,201000), TestCase::QUICK);
+ AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (6,0,6000,150500,97000), TestCase::QUICK);
+ AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (12,0,6000,75250,47000), TestCase::QUICK);
+ AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (15,0,6000,60200,22000), TestCase::QUICK);
// DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
// 1 user -> 24 PRB at Itbs 11 -> 597 -> 597000 bytes/sec
@@ -128,11 +128,11 @@
// 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 bytes/sec
// 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 bytes/sec
// 15 users -> 1 PRB at Itbs 8 -> 15 -> 15000 bytes/sec
- AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (1,0,9000,597000,437000));
- AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (3,0,9000,199000,137000));
- AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (6,0,9000,99500,67000));
- AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (12,0,9000,49750,32000));
- AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (15,0,9000,39800,15000));
+ AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (1,0,9000,597000,437000), TestCase::QUICK);
+ AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (3,0,9000,199000,137000), TestCase::QUICK);
+ AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (6,0,9000,99500,67000), TestCase::QUICK);
+ AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (12,0,9000,49750,32000), TestCase::QUICK);
+ AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (15,0,9000,39800,15000), TestCase::QUICK);
// DONWLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
// 1 user -> 24 PRB at Itbs 6 -> 309 -> 309000 bytes/sec
@@ -146,11 +146,11 @@
// 6 users -> 4 PRB at Itbs 6 -> 32 -> 32000 bytes/sec
// 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 bytes/sec
// 15 users -> 1 PRB at Itbs 6 -> 7 -> 7000 bytes/sec
- AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (1,0,15000,309000,233000));
- AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (3,0,15000,103000,69000));
- AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (6,0,15000,51500,32000));
- AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (12,0,15000,25750,15000));
- AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (15,0,15000,20600,7000));
+ AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (1,0,15000,309000,233000), TestCase::QUICK);
+ AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (3,0,15000,103000,69000), TestCase::QUICK);
+ AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (6,0,15000,51500,32000), TestCase::QUICK);
+ AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (12,0,15000,25750,15000), TestCase::QUICK);
+ AddTestCase (new LenaTdBetFfMacSchedulerTestCase1 (15,0,15000,20600,7000), TestCase::QUICK);
// Test Case 2: fairness check
@@ -172,7 +172,7 @@
estThrTdBetUl.push_back (125000); // User 2 estimated TTI throughput from TDBET
estThrTdBetUl.push_back (85000); // User 3 estimated TTI throughput from TDBET
estThrTdBetUl.push_back (41000); // User 4 estimated TTI throughput from TDBET
- AddTestCase (new LenaTdBetFfMacSchedulerTestCase2 (dist, estAchievableRateDl, estThrTdBetUl));
+ AddTestCase (new LenaTdBetFfMacSchedulerTestCase2 (dist, estAchievableRateDl, estThrTdBetUl), TestCase::QUICK);
}
--- a/src/lte/test/lte-test-tdmt-ff-mac-scheduler.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/lte/test/lte-test-tdmt-ff-mac-scheduler.cc Fri Mar 22 13:14:38 2013 +0100
@@ -74,11 +74,11 @@
// 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 bytes/sec
// 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 bytes/sec
// 15 users -> 1 PRB at Itbs 26 -> 89 -> 89000 bytes/sec
- AddTestCase (new LenaTdMtFfMacSchedulerTestCase (1,0,0,2196000,2292000));
- AddTestCase (new LenaTdMtFfMacSchedulerTestCase (3,0,0,2196000,749000));
- AddTestCase (new LenaTdMtFfMacSchedulerTestCase (6,0,0,2196000,373000));
- AddTestCase (new LenaTdMtFfMacSchedulerTestCase (12,0,0,2196000,185000));
- AddTestCase (new LenaTdMtFfMacSchedulerTestCase (15,0,0,2196000,89000));
+ AddTestCase (new LenaTdMtFfMacSchedulerTestCase (1,0,0,2196000,2292000), TestCase::QUICK);
+ AddTestCase (new LenaTdMtFfMacSchedulerTestCase (3,0,0,2196000,749000), TestCase::QUICK);
+ AddTestCase (new LenaTdMtFfMacSchedulerTestCase (6,0,0,2196000,373000), TestCase::QUICK);
+ AddTestCase (new LenaTdMtFfMacSchedulerTestCase (12,0,0,2196000,185000), TestCase::QUICK);
+ AddTestCase (new LenaTdMtFfMacSchedulerTestCase (15,0,0,2196000,89000), TestCase::QUICK);
// DOWNLINK - DISTANCE 3000 -> MCS 24 -> Itbs 30 (from table 7.1.7.2.1-1 of 36.213)
// 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 bytes/sec for first UE; 0 bytes/sec for other UEs
@@ -92,11 +92,11 @@
// 6 users -> 4 PRB at Itbs 18 -> 193 -> 193000 bytes/sec
// 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 bytes/sec
// 15 users -> 1 PRB at Itbs 18 -> 47 -> 47000 bytes/sec
- AddTestCase (new LenaTdMtFfMacSchedulerTestCase (1,0,3000,1383000,1239000));
- AddTestCase (new LenaTdMtFfMacSchedulerTestCase (3,0,3000,1383000,389000));
- AddTestCase (new LenaTdMtFfMacSchedulerTestCase (6,0,3000,1383000,193000));
- AddTestCase (new LenaTdMtFfMacSchedulerTestCase (12,0,3000,1383000,97000));
- AddTestCase (new LenaTdMtFfMacSchedulerTestCase (15,0,3000,1383000,47000));
+ AddTestCase (new LenaTdMtFfMacSchedulerTestCase (1,0,3000,1383000,1239000), TestCase::QUICK);
+ AddTestCase (new LenaTdMtFfMacSchedulerTestCase (3,0,3000,1383000,389000), TestCase::QUICK);
+ AddTestCase (new LenaTdMtFfMacSchedulerTestCase (6,0,3000,1383000,193000), TestCase::QUICK);
+ AddTestCase (new LenaTdMtFfMacSchedulerTestCase (12,0,3000,1383000,97000), TestCase::QUICK);
+ AddTestCase (new LenaTdMtFfMacSchedulerTestCase (15,0,3000,1383000,47000), TestCase::QUICK);
// DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
// 1 user -> 24 PRB at Itbs 15 -> 903 -> 903000 bytes/sec for first UE; 0 bytes/sec for other UEs
@@ -110,11 +110,11 @@
// 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 bytes/sec
// 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 bytes/sec
// 15 users -> 1 PRB at Itbs 11 -> 22 -> 22000 bytes/sec
- AddTestCase (new LenaTdMtFfMacSchedulerTestCase (1,0,6000,903000,621000));
- AddTestCase (new LenaTdMtFfMacSchedulerTestCase (3,0,6000,903000,201000));
- AddTestCase (new LenaTdMtFfMacSchedulerTestCase (6,0,6000,903000,97000));
- AddTestCase (new LenaTdMtFfMacSchedulerTestCase (12,0,6000,903000,47000));
- AddTestCase (new LenaTdMtFfMacSchedulerTestCase (15,0,6000,903000,22000));
+ AddTestCase (new LenaTdMtFfMacSchedulerTestCase (1,0,6000,903000,621000), TestCase::QUICK);
+ AddTestCase (new LenaTdMtFfMacSchedulerTestCase (3,0,6000,903000,201000), TestCase::QUICK);
+ AddTestCase (new LenaTdMtFfMacSchedulerTestCase (6,0,6000,903000,97000), TestCase::QUICK);
+ AddTestCase (new LenaTdMtFfMacSchedulerTestCase (12,0,6000,903000,47000), TestCase::QUICK);
+ AddTestCase (new LenaTdMtFfMacSchedulerTestCase (15,0,6000,903000,22000), TestCase::QUICK);
// DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
// 1 user -> 24 PRB at Itbs 11 -> 597 -> 597000 bytes/sec
@@ -128,11 +128,11 @@
// 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 bytes/sec
// 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 bytes/sec
// 15 users -> 1 PRB at Itbs 8 -> 15 -> 15000 bytes/sec
- AddTestCase (new LenaTdMtFfMacSchedulerTestCase (1,0,9000,597000,437000));
- AddTestCase (new LenaTdMtFfMacSchedulerTestCase (3,0,9000,597000,137000));
- AddTestCase (new LenaTdMtFfMacSchedulerTestCase (6,0,9000,597000,67000));
- AddTestCase (new LenaTdMtFfMacSchedulerTestCase (12,0,9000,597000,32000));
- AddTestCase (new LenaTdMtFfMacSchedulerTestCase (15,0,9000,597000,15000));
+ AddTestCase (new LenaTdMtFfMacSchedulerTestCase (1,0,9000,597000,437000), TestCase::QUICK);
+ AddTestCase (new LenaTdMtFfMacSchedulerTestCase (3,0,9000,597000,137000), TestCase::QUICK);
+ AddTestCase (new LenaTdMtFfMacSchedulerTestCase (6,0,9000,597000,67000), TestCase::QUICK);
+ AddTestCase (new LenaTdMtFfMacSchedulerTestCase (12,0,9000,597000,32000), TestCase::QUICK);
+ AddTestCase (new LenaTdMtFfMacSchedulerTestCase (15,0,9000,597000,15000), TestCase::QUICK);
// DONWLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
// 1 user -> 24 PRB at Itbs 6 -> 309 -> 309000 bytes/sec
@@ -146,11 +146,11 @@
// 6 users -> 4 PRB at Itbs 6 -> 32 -> 32000 bytes/sec
// 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 bytes/sec
// 15 users -> 1 PRB at Itbs 6 -> 7 -> 7000 bytes/sec
- AddTestCase (new LenaTdMtFfMacSchedulerTestCase (1,0,15000,309000,233000));
- AddTestCase (new LenaTdMtFfMacSchedulerTestCase (3,0,15000,309000,69000));
- AddTestCase (new LenaTdMtFfMacSchedulerTestCase (6,0,15000,309000,32000));
- AddTestCase (new LenaTdMtFfMacSchedulerTestCase (12,0,15000,309000,15000));
- AddTestCase (new LenaTdMtFfMacSchedulerTestCase (15,0,15000,309000,7000));
+ AddTestCase (new LenaTdMtFfMacSchedulerTestCase (1,0,15000,309000,233000), TestCase::QUICK);
+ AddTestCase (new LenaTdMtFfMacSchedulerTestCase (3,0,15000,309000,69000), TestCase::QUICK);
+ AddTestCase (new LenaTdMtFfMacSchedulerTestCase (6,0,15000,309000,32000), TestCase::QUICK);
+ AddTestCase (new LenaTdMtFfMacSchedulerTestCase (12,0,15000,309000,15000), TestCase::QUICK);
+ AddTestCase (new LenaTdMtFfMacSchedulerTestCase (15,0,15000,309000,7000), TestCase::QUICK);
}
--- a/src/lte/test/lte-test-tdtbfq-ff-mac-scheduler.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/lte/test/lte-test-tdtbfq-ff-mac-scheduler.cc Fri Mar 22 13:14:38 2013 +0100
@@ -90,10 +90,10 @@
// 3 users -> 8 PRB at Itbs 26 -> 749 -> 749000 > 232000 -> throughput = 232000 bytes/sec
// 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 > 232000 -> throughput = 232000 bytes/sec
// 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 < 232000 -> throughput = 185000 bytes/sec
- AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (1,0,0,232000,232000,200,1));
- AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (3,0,0,232000,232000,200,1));
- AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (6,0,0,232000,232000,200,1));
- AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (12,0,0,183000,185000,200,1));
+ AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (1,0,0,232000,232000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (3,0,0,232000,232000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (6,0,0,232000,232000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (12,0,0,183000,185000,200,1), TestCase::QUICK);
// DOWNLINK - DISTANCE 3000 -> MCS 24 -> Itbs 20 (from table 7.1.7.2.1-1 of 36.213)
// DOWNLINK -> DISTANCE 0 -> MCS 28 -> Itbs 26 (from table 7.1.7.2.1-1 of 36.2 13)
@@ -110,10 +110,10 @@
// 3 users -> 8 PRB at Itbs 18 -> 389 -> 389000 > 232000 -> throughput = 232000 bytes/sec
// 6 users -> 4 PRB at Itbs 18 -> 193 -> 193000 < 232000 -> throughput = 193000 bytes/sec
// 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 < 232000 -> throughput = 97000 bytes/sec
- AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (1,0,3000,232000,232000,200,1));
- AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (3,0,3000,232000,232000,200,1));
- AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (6,0,3000,230500,193000,200,1));
- AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (12,0,3000,115250,97000,200,1));
+ AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (1,0,3000,232000,232000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (3,0,3000,232000,232000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (6,0,3000,230500,193000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (12,0,3000,115250,97000,200,1), TestCase::QUICK);
// DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
// Traffic info
@@ -129,10 +129,10 @@
// 3 users -> 8 PRB at Itbs 11 -> 201 -> 201000 < 232000 -> throughput = 201000 bytes/sec
// 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 < 232000 -> throughput = 97000 bytes/sec
// 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 < 232000 -> throughput = 47000 bytes/sec
- AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (1,0,6000,232000,232000,200,1));
- AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (3,0,6000,232000,201000,200,1));
- AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (6,0,6000,150500,97000,200,1));
- AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (12,0,6000,75250,47000,200,1));
+ AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (1,0,6000,232000,232000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (3,0,6000,232000,201000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (6,0,6000,150500,97000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (12,0,6000,75250,47000,200,1), TestCase::QUICK);
// DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
// Traffic info
@@ -148,10 +148,10 @@
// 3 users -> 8 PRB at Itbs 8 -> 137 -> 137000 < 232000 -> throughput = 137000 bytes/sec
// 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 < 232000 -> throughput = 67000 bytes/sec
// 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 < 232000 -> throughput = 32000 bytes/sec
- AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (1,0,9000,232000,232000,200,1));
- AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (3,0,9000,199000,137000,200,1));
- AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (6,0,9000,99500,67000,200,1));
- AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (12,0,9000,49750,32000,200,1));
+ AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (1,0,9000,232000,232000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (3,0,9000,199000,137000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (6,0,9000,99500,67000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (12,0,9000,49750,32000,200,1), TestCase::QUICK);
// DONWLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
// Traffic info
@@ -167,10 +167,10 @@
// 3 users -> 8 PRB at Itbs 6 -> 69 -> 69000 < 232000 -> throughput = 69000 bytes/sec
// 6 users -> 4 PRB at Itbs 6 -> 32 -> 32000 < 232000 -> throughput = 32000 bytes/sec
// 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 < 232000 -> throughput = 15000 bytes/sec
- AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (1,0,15000,232000,232000,200,1));
- AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (3,0,15000,103000,69000,200,1));
- AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (6,0,15000,51500,32000,200,1));
- AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (12,0,15000,25750,15000,200,1));
+ AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (1,0,15000,232000,232000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (3,0,15000,103000,69000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (6,0,15000,51500,32000,200,1), TestCase::QUICK);
+ AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase1 (12,0,15000,25750,15000,200,1), TestCase::QUICK);
// Test Case 2: homogeneous flow test in TDTBFQ (different distance)
// Traffic1 info
@@ -196,7 +196,7 @@
estThrTdTbfqDl1.push_back (132000); // User 2 estimated TTI throughput from TDTBFQ
estThrTdTbfqDl1.push_back (132000); // User 3 estimated TTI throughput from TDTBFQ
estThrTdTbfqDl1.push_back (132000); // User 4 estimated TTI throughput from TDTBFQ
- AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase2 (dist1,estThrTdTbfqDl1,packetSize1,1));
+ AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase2 (dist1,estThrTdTbfqDl1,packetSize1,1), TestCase::QUICK);
// Traffic2 info
// UDP traffic: payload size = 200 bytes, interval = 1 ms
@@ -221,7 +221,7 @@
estThrTdTbfqDl2.push_back (138944); // User 2 estimated TTI throughput from TDTBFQ
estThrTdTbfqDl2.push_back (138944); // User 3 estimated TTI throughput from TDTBFQ
estThrTdTbfqDl2.push_back (138944); // User 4 estimated TTI throughput from TDTBFQ
- AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase2 (dist2,estThrTdTbfqDl2,packetSize2,1));
+ AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase2 (dist2,estThrTdTbfqDl2,packetSize2,1), TestCase::QUICK);
// Test Case 3: heterogeneous flow test in TDTBFQ
// UDP traffic: payload size = [100,200,300] bytes, interval = 1 ms
@@ -240,7 +240,7 @@
estThrTdTbfqDl3.push_back (132000); // User 0 estimated TTI throughput from TDTBFQ
estThrTdTbfqDl3.push_back (232000); // User 1 estimated TTI throughput from TDTBFQ
estThrTdTbfqDl3.push_back (332000); // User 2 estimated TTI throughput from TDTBFQ
- AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase2 (dist3,estThrTdTbfqDl3,packetSize3,1));
+ AddTestCase (new LenaTdTbfqFfMacSchedulerTestCase2 (dist3,estThrTdTbfqDl3,packetSize3,1), TestCase::QUICK);
}
--- a/src/lte/test/lte-test-tta-ff-mac-scheduler.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/lte/test/lte-test-tta-ff-mac-scheduler.cc Fri Mar 22 13:14:38 2013 +0100
@@ -74,11 +74,11 @@
// 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 bytes/sec
// 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 bytes/sec
// 15 users -> 1 PRB at Itbs 26 -> 89 -> 89000 bytes/sec
- AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,0,0,2196000,2292000));
- AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,0,0,2196000,749000));
- AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,0,0,2196000,373000));
- AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,0,0,2196000,185000));
- AddTestCase (new LenaTtaFfMacSchedulerTestCase (15,0,0,2196000,89000));
+ AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,0,0,2196000,2292000), TestCase::QUICK);
+ AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,0,0,2196000,749000), TestCase::QUICK);
+ AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,0,0,2196000,373000), TestCase::QUICK);
+ AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,0,0,2196000,185000), TestCase::QUICK);
+ AddTestCase (new LenaTtaFfMacSchedulerTestCase (15,0,0,2196000,89000), TestCase::QUICK);
// DOWNLINK - DISTANCE 3000 -> MCS 24 -> Itbs 30 (from table 7.1.7.2.1-1 of 36.213)
// 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 bytes/sec for first UE; 0 bytes/sec for other UEs
@@ -92,11 +92,11 @@
// 6 users -> 4 PRB at Itbs 18 -> 193 -> 193000 bytes/sec
// 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 bytes/sec
// 15 users -> 1 PRB at Itbs 18 -> 47 -> 47000 bytes/sec
- AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,0,3000,1383000,1239000));
- AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,0,3000,1383000,389000));
- AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,0,3000,1383000,193000));
- AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,0,3000,1383000,97000));
- AddTestCase (new LenaTtaFfMacSchedulerTestCase (15,0,3000,1383000,47000));
+ AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,0,3000,1383000,1239000), TestCase::QUICK);
+ AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,0,3000,1383000,389000), TestCase::QUICK);
+ AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,0,3000,1383000,193000), TestCase::QUICK);
+ AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,0,3000,1383000,97000), TestCase::QUICK);
+ AddTestCase (new LenaTtaFfMacSchedulerTestCase (15,0,3000,1383000,47000), TestCase::QUICK);
// DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
// 1 user -> 24 PRB at Itbs 15 -> 903 -> 903000 bytes/sec for first UE; 0 bytes/sec for other UEs
@@ -110,11 +110,11 @@
// 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 bytes/sec
// 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 bytes/sec
// 15 users -> 1 PRB at Itbs 11 -> 22 -> 22000 bytes/sec
- AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,0,6000,903000,621000));
- AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,0,6000,903000,201000));
- AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,0,6000,903000,97000));
- AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,0,6000,903000,47000));
- AddTestCase (new LenaTtaFfMacSchedulerTestCase (15,0,6000,903000,22000));
+ AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,0,6000,903000,621000), TestCase::QUICK);
+ AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,0,6000,903000,201000), TestCase::QUICK);
+ AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,0,6000,903000,97000), TestCase::QUICK);
+ AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,0,6000,903000,47000), TestCase::QUICK);
+ AddTestCase (new LenaTtaFfMacSchedulerTestCase (15,0,6000,903000,22000), TestCase::QUICK);
// DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
// 1 user -> 24 PRB at Itbs 11 -> 597 -> 597000 bytes/sec
@@ -128,11 +128,11 @@
// 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 bytes/sec
// 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 bytes/sec
// 15 users -> 1 PRB at Itbs 8 -> 15 -> 15000 bytes/sec
- AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,0,9000,597000,437000));
- AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,0,9000,597000,137000));
- AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,0,9000,597000,67000));
- AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,0,9000,597000,32000));
- AddTestCase (new LenaTtaFfMacSchedulerTestCase (15,0,9000,597000,15000));
+ AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,0,9000,597000,437000), TestCase::QUICK);
+ AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,0,9000,597000,137000), TestCase::QUICK);
+ AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,0,9000,597000,67000), TestCase::QUICK);
+ AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,0,9000,597000,32000), TestCase::QUICK);
+ AddTestCase (new LenaTtaFfMacSchedulerTestCase (15,0,9000,597000,15000), TestCase::QUICK);
// DONWLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
// 1 user -> 24 PRB at Itbs 6 -> 309 -> 309000 bytes/sec
@@ -146,11 +146,11 @@
// 6 users -> 4 PRB at Itbs 6 -> 32 -> 32000 bytes/sec
// 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 bytes/sec
// 15 users -> 1 PRB at Itbs 6 -> 7 -> 7000 bytes/sec
- AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,0,15000,309000,233000));
- AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,0,15000,309000,69000));
- AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,0,15000,309000,32000));
- AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,0,15000,309000,15000));
- AddTestCase (new LenaTtaFfMacSchedulerTestCase (15,0,15000,309000,7000));
+ AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,0,15000,309000,233000), TestCase::QUICK);
+ AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,0,15000,309000,69000), TestCase::QUICK);
+ AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,0,15000,309000,32000), TestCase::QUICK);
+ AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,0,15000,309000,15000), TestCase::QUICK);
+ AddTestCase (new LenaTtaFfMacSchedulerTestCase (15,0,15000,309000,7000), TestCase::QUICK);
}
--- a/src/lte/test/lte-test-uplink-sinr.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/lte/test/lte-test-uplink-sinr.cc Fri Mar 22 13:14:38 2013 +0100
@@ -85,9 +85,9 @@
(*theoreticalSinr1)[0] = 3.72589167251055;
(*theoreticalSinr1)[1] = 3.72255684126076;
- AddTestCase (new LteUplinkDataSinrTestCase (rxPsd1, rxPsd2, theoreticalSinr1, "sdBm = [-46 -inf] and [-inf -48]"));
+ AddTestCase (new LteUplinkDataSinrTestCase (rxPsd1, rxPsd2, theoreticalSinr1, "sdBm = [-46 -inf] and [-inf -48]"), TestCase::QUICK);
- AddTestCase (new LteUplinkSrsSinrTestCase (rxPsd1, rxPsd2, theoreticalSinr1, "sdBm = [-46 -inf] and [-inf -48]"));
+ AddTestCase (new LteUplinkSrsSinrTestCase (rxPsd1, rxPsd2, theoreticalSinr1, "sdBm = [-46 -inf] and [-inf -48]"), TestCase::QUICK);
/**
* TX signals #2: Power Spectral Density of the signals of interest = [-63 -inf] and [-inf -61] dBm and BW = [20 22] MHz
@@ -104,9 +104,9 @@
(*theoreticalSinr2)[0] = 0.0743413124381667;
(*theoreticalSinr2)[1] = 0.1865697965291756;
- AddTestCase (new LteUplinkDataSinrTestCase (rxPsd3, rxPsd4, theoreticalSinr2, "sdBm = [-63 -inf] and [-inf -61]"));
+ AddTestCase (new LteUplinkDataSinrTestCase (rxPsd3, rxPsd4, theoreticalSinr2, "sdBm = [-63 -inf] and [-inf -61]"), TestCase::QUICK);
- AddTestCase (new LteUplinkSrsSinrTestCase (rxPsd3, rxPsd4, theoreticalSinr2, "sdBm = [-63 -inf] and [-inf -61]"));
+ AddTestCase (new LteUplinkSrsSinrTestCase (rxPsd3, rxPsd4, theoreticalSinr2, "sdBm = [-63 -inf] and [-inf -61]"), TestCase::QUICK);
}
--- a/src/lte/test/test-epc-tft-classifier.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/lte/test/test-epc-tft-classifier.cc Fri Mar 22 13:14:38 2013 +0100
@@ -208,33 +208,33 @@
// ------------------------------------classifier---direction--------------src address---------------dst address---src port--dst port--ToS--TFT id
// test IP addresses
- AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK, Ipv4Address ("2.2.3.4"), Ipv4Address ("1.1.1.1"), 4, 1234, 0, 1));
- AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK, Ipv4Address ("2.2.3.4"), Ipv4Address ("1.0.0.0"), 2, 123, 5, 1));
- AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK, Ipv4Address ("6.2.3.4"), Ipv4Address ("1.1.1.1"), 4, 1234, 0, 0));
- AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("3.3.3.4"), Ipv4Address ("4.4.4.1"), 4, 1234, 0, 1));
- AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("3.3.4.4"), Ipv4Address ("4.4.4.1"), 4, 1234, 0, 0));
- AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK, Ipv4Address ("3.3.3.4"), Ipv4Address ("4.4.2.1"), 4, 1234, 0, 0));
+ AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK, Ipv4Address ("2.2.3.4"), Ipv4Address ("1.1.1.1"), 4, 1234, 0, 1), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK, Ipv4Address ("2.2.3.4"), Ipv4Address ("1.0.0.0"), 2, 123, 5, 1), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK, Ipv4Address ("6.2.3.4"), Ipv4Address ("1.1.1.1"), 4, 1234, 0, 0), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("3.3.3.4"), Ipv4Address ("4.4.4.1"), 4, 1234, 0, 1), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("3.3.4.4"), Ipv4Address ("4.4.4.1"), 4, 1234, 0, 0), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK, Ipv4Address ("3.3.3.4"), Ipv4Address ("4.4.2.1"), 4, 1234, 0, 0), TestCase::QUICK);
// test remote port
- AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1024, 0, 2));
- AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1025, 0, 2));
- AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1035, 0, 2));
- AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1234, 0, 0));
- AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1024, 0, 0));
- AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1025, 0, 0));
- AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1035, 0, 0));
+ AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1024, 0, 2), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1025, 0, 2), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1035, 0, 2), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1234, 0, 0), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1024, 0, 0), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1025, 0, 0), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1035, 0, 0), TestCase::QUICK);
// test local port
- AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 3456, 0, 0));
- AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 3457, 0, 0));
- AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 3489, 0, 0));
- AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 3456, 6, 0, 2));
- AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 3461, 3461, 0, 2));
- AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 9, 3489, 0, 2));
- AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 9, 7895, 0, 2));
- AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 7895, 10, 0, 2));
- AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 9, 5897, 0, 2));
- AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 5897, 10, 0, 2));
+ AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 3456, 0, 0), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 3457, 0, 0), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 3489, 0, 0), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 3456, 6, 0, 2), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 3461, 3461, 0, 2), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 9, 3489, 0, 2), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 9, 7895, 0, 2), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 7895, 10, 0, 2), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 9, 5897, 0, 2), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c1, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 5897, 10, 0, 2), TestCase::QUICK);
///////////////////////////
@@ -247,29 +247,29 @@
// ------------------------------------classifier---direction--------------src address---------------dst address---src port--dst port--ToS--TFT id
// test IP addresses
- AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK, Ipv4Address ("2.2.3.4"), Ipv4Address ("1.1.1.1"), 4, 1234, 0, 1));
- AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK, Ipv4Address ("2.2.3.4"), Ipv4Address ("1.0.0.0"), 2, 123, 5, 1));
- AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK, Ipv4Address ("6.2.3.4"), Ipv4Address ("1.1.1.1"), 4, 1234, 0, 1));
- AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::DOWNLINK, Ipv4Address ("3.3.3.4"), Ipv4Address ("4.4.4.1"), 4, 1234, 0, 1));
- AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::DOWNLINK, Ipv4Address ("3.3.4.4"), Ipv4Address ("4.4.4.1"), 4, 1234, 0, 1));
- AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK, Ipv4Address ("3.3.3.4"), Ipv4Address ("4.4.2.1"), 4, 1234, 0, 1));
+ AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK, Ipv4Address ("2.2.3.4"), Ipv4Address ("1.1.1.1"), 4, 1234, 0, 1), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK, Ipv4Address ("2.2.3.4"), Ipv4Address ("1.0.0.0"), 2, 123, 5, 1), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK, Ipv4Address ("6.2.3.4"), Ipv4Address ("1.1.1.1"), 4, 1234, 0, 1), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::DOWNLINK, Ipv4Address ("3.3.3.4"), Ipv4Address ("4.4.4.1"), 4, 1234, 0, 1), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::DOWNLINK, Ipv4Address ("3.3.4.4"), Ipv4Address ("4.4.4.1"), 4, 1234, 0, 1), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK, Ipv4Address ("3.3.3.4"), Ipv4Address ("4.4.2.1"), 4, 1234, 0, 1), TestCase::QUICK);
// test remote port
- AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1024, 0, 1));
- AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1025, 0, 1));
- AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1035, 0, 1));
- AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1234, 0, 1));
- AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1024, 0, 1));
- AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1025, 0, 1));
- AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1035, 0, 1));
+ AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1024, 0, 1), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1025, 0, 1), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1035, 0, 1), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1234, 0, 1), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1024, 0, 1), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1025, 0, 1), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1035, 0, 1), TestCase::QUICK);
// test local port
- AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 3456, 0, 1));
- AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 3457, 0, 1));
- AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 3489, 0, 1));
- AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 3456, 6, 0, 1));
- AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 3461, 3461, 0, 1));
- AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 9, 3489, 0, 1));
+ AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 3456, 0, 1), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 3457, 0, 1), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 3489, 0, 1), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 3456, 6, 0, 1), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 3461, 3461, 0, 1), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c2, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 9, 3489, 0, 1), TestCase::QUICK);
@@ -285,29 +285,29 @@
// ------------------------------------classifier---direction--------------src address---------------dst address---src port--dst port--ToS--TFT id
// test IP addresses
- AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK, Ipv4Address ("2.2.3.4"), Ipv4Address ("1.1.1.1"), 4, 1234, 0, 2));
- AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK, Ipv4Address ("2.2.3.4"), Ipv4Address ("1.0.0.0"), 2, 123, 5, 2));
- AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK, Ipv4Address ("6.2.3.4"), Ipv4Address ("1.1.1.1"), 4, 1234, 0, 1));
- AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::DOWNLINK, Ipv4Address ("3.3.3.4"), Ipv4Address ("4.4.4.1"), 4, 1234, 0, 2));
- AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::DOWNLINK, Ipv4Address ("3.3.4.4"), Ipv4Address ("4.4.4.1"), 4, 1234, 0, 1));
- AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK, Ipv4Address ("3.3.3.4"), Ipv4Address ("4.4.2.1"), 4, 1234, 0, 1));
+ AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK, Ipv4Address ("2.2.3.4"), Ipv4Address ("1.1.1.1"), 4, 1234, 0, 2), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK, Ipv4Address ("2.2.3.4"), Ipv4Address ("1.0.0.0"), 2, 123, 5, 2), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK, Ipv4Address ("6.2.3.4"), Ipv4Address ("1.1.1.1"), 4, 1234, 0, 1), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::DOWNLINK, Ipv4Address ("3.3.3.4"), Ipv4Address ("4.4.4.1"), 4, 1234, 0, 2), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::DOWNLINK, Ipv4Address ("3.3.4.4"), Ipv4Address ("4.4.4.1"), 4, 1234, 0, 1), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK, Ipv4Address ("3.3.3.4"), Ipv4Address ("4.4.2.1"), 4, 1234, 0, 1), TestCase::QUICK);
// test remote port
- AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1024, 0, 3));
- AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1025, 0, 3));
- AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1035, 0, 3));
- AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1234, 0, 1));
- AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1024, 0, 1));
- AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1025, 0, 1));
- AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1035, 0, 1));
+ AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1024, 0, 3), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1025, 0, 3), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1035, 0, 3), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1234, 0, 1), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1024, 0, 1), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1025, 0, 1), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 1035, 0, 1), TestCase::QUICK);
// test local port
- AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 3456, 0, 1));
- AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 3457, 0, 1));
- AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 3489, 0, 1));
- AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 3456, 6, 0, 3));
- AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 3461, 3461, 0, 3));
- AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 9, 3489, 0, 3));
+ AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 3456, 0, 1), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 3457, 0, 1), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 4, 3489, 0, 1), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 3456, 6, 0, 3), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 3461, 3461, 0, 3), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c3, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 9, 3489, 0, 3), TestCase::QUICK);
@@ -322,11 +322,11 @@
Ptr<EpcTft> tft4_2 = Create<EpcTft> ();
tft4_2->Add (pf1_2_4);
c4->Add (tft4_2, 2);
- AddTestCase (new EpcTftClassifierTestCase (c4, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 9, 3489, 0, 0));
- AddTestCase (new EpcTftClassifierTestCase (c4, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 9, 7895, 0, 1));
- AddTestCase (new EpcTftClassifierTestCase (c4, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 7895, 10, 0, 1));
- AddTestCase (new EpcTftClassifierTestCase (c4, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 9, 5897, 0, 2));
- AddTestCase (new EpcTftClassifierTestCase (c4, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 5897, 10, 0, 2));
+ AddTestCase (new EpcTftClassifierTestCase (c4, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 9, 3489, 0, 0), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c4, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 9, 7895, 0, 1), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c4, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 7895, 10, 0, 1), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c4, EpcTft::UPLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 9, 5897, 0, 2), TestCase::QUICK);
+ AddTestCase (new EpcTftClassifierTestCase (c4, EpcTft::DOWNLINK, Ipv4Address ("9.1.1.1"), Ipv4Address ("8.1.1.1"), 5897, 10, 0, 2), TestCase::QUICK);
}
--- a/src/lte/test/test-lte-antenna.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/lte/test/test-lte-antenna.cc Fri Mar 22 13:14:38 2013 +0100
@@ -195,32 +195,32 @@
NS_LOG_FUNCTION (this);
// orientation beamwidth x y gain
- AddTestCase (new LteEnbAntennaTestCase ( 0.0, 90.0, 1.0, 0.0, 0.0));
- AddTestCase (new LteEnbAntennaTestCase ( 0.0, 90.0, 1.0, 1.0, -3.0));
- AddTestCase (new LteEnbAntennaTestCase ( 0.0, 90.0, 1.0, -1.0, -3.0));
- AddTestCase (new LteEnbAntennaTestCase ( 0.0, 90.0, -1.0, -1.0, -36.396));
- AddTestCase (new LteEnbAntennaTestCase ( 0.0, 90.0, -1.0, -0.0, -1414.6));
- AddTestCase (new LteEnbAntennaTestCase ( 0.0, 90.0, -1.0, 1.0, -36.396));
- AddTestCase (new LteEnbAntennaTestCase ( 45.0, 90.0, 1.0, 1.0, 0.0));
- AddTestCase (new LteEnbAntennaTestCase ( -45.0, 90.0, 1.0, -1.0, 0.0));
- AddTestCase (new LteEnbAntennaTestCase ( 90.0, 90.0, 1.0, 1.0, -3.0));
- AddTestCase (new LteEnbAntennaTestCase ( -90.0, 90.0, 1.0, -1.0, -3.0));
+ AddTestCase (new LteEnbAntennaTestCase ( 0.0, 90.0, 1.0, 0.0, 0.0), TestCase::QUICK);
+ AddTestCase (new LteEnbAntennaTestCase ( 0.0, 90.0, 1.0, 1.0, -3.0), TestCase::QUICK);
+ AddTestCase (new LteEnbAntennaTestCase ( 0.0, 90.0, 1.0, -1.0, -3.0), TestCase::QUICK);
+ AddTestCase (new LteEnbAntennaTestCase ( 0.0, 90.0, -1.0, -1.0, -36.396), TestCase::QUICK);
+ AddTestCase (new LteEnbAntennaTestCase ( 0.0, 90.0, -1.0, -0.0, -1414.6), TestCase::QUICK);
+ AddTestCase (new LteEnbAntennaTestCase ( 0.0, 90.0, -1.0, 1.0, -36.396), TestCase::QUICK);
+ AddTestCase (new LteEnbAntennaTestCase ( 45.0, 90.0, 1.0, 1.0, 0.0), TestCase::QUICK);
+ AddTestCase (new LteEnbAntennaTestCase ( -45.0, 90.0, 1.0, -1.0, 0.0), TestCase::QUICK);
+ AddTestCase (new LteEnbAntennaTestCase ( 90.0, 90.0, 1.0, 1.0, -3.0), TestCase::QUICK);
+ AddTestCase (new LteEnbAntennaTestCase ( -90.0, 90.0, 1.0, -1.0, -3.0), TestCase::QUICK);
- AddTestCase (new LteEnbAntennaTestCase ( 0.0, 120.0, 1.0, 0.0, 0.0));
- AddTestCase (new LteEnbAntennaTestCase ( 0.0, 120.0, 0.5, sin(M_PI/3), -3.0));
- AddTestCase (new LteEnbAntennaTestCase ( 0.0, 120.0, 0.5, -sin(M_PI/3), -3.0));
- AddTestCase (new LteEnbAntennaTestCase ( 0.0, 120.0, -1.0, -2.0, -13.410));
- AddTestCase (new LteEnbAntennaTestCase ( 0.0, 120.0, -1.0, 1.0, -20.034));
- AddTestCase (new LteEnbAntennaTestCase ( 60.0, 120.0, 0.5, sin(M_PI/3), 0.0));
- AddTestCase (new LteEnbAntennaTestCase ( -60.0, 120.0, 0.5, -sin(M_PI/3), 0.0));
- AddTestCase (new LteEnbAntennaTestCase ( -60.0, 120.0, 0.5, -sin(M_PI/3), 0.0));
- AddTestCase (new LteEnbAntennaTestCase ( -120.0, 120.0, -0.5, -sin(M_PI/3), 0.0));
- AddTestCase (new LteEnbAntennaTestCase ( -120.0, 120.0, 0.5, -sin(M_PI/3), -3.0));
- AddTestCase (new LteEnbAntennaTestCase ( -120.0, 120.0, -1, 0, -3.0));
- AddTestCase (new LteEnbAntennaTestCase ( -120.0, 120.0, -1, 2, -15.578));
- AddTestCase (new LteEnbAntennaTestCase ( -120.0, 120.0, 1, 0, -14.457));
- AddTestCase (new LteEnbAntennaTestCase ( -120.0, 120.0, 1, 2, -73.154));
- AddTestCase (new LteEnbAntennaTestCase ( -120.0, 120.0, 1, -0.1, -12.754));
+ AddTestCase (new LteEnbAntennaTestCase ( 0.0, 120.0, 1.0, 0.0, 0.0), TestCase::QUICK);
+ AddTestCase (new LteEnbAntennaTestCase ( 0.0, 120.0, 0.5, sin(M_PI/3), -3.0), TestCase::QUICK);
+ AddTestCase (new LteEnbAntennaTestCase ( 0.0, 120.0, 0.5, -sin(M_PI/3), -3.0), TestCase::QUICK);
+ AddTestCase (new LteEnbAntennaTestCase ( 0.0, 120.0, -1.0, -2.0, -13.410), TestCase::QUICK);
+ AddTestCase (new LteEnbAntennaTestCase ( 0.0, 120.0, -1.0, 1.0, -20.034), TestCase::QUICK);
+ AddTestCase (new LteEnbAntennaTestCase ( 60.0, 120.0, 0.5, sin(M_PI/3), 0.0), TestCase::QUICK);
+ AddTestCase (new LteEnbAntennaTestCase ( -60.0, 120.0, 0.5, -sin(M_PI/3), 0.0), TestCase::QUICK);
+ AddTestCase (new LteEnbAntennaTestCase ( -60.0, 120.0, 0.5, -sin(M_PI/3), 0.0), TestCase::QUICK);
+ AddTestCase (new LteEnbAntennaTestCase ( -120.0, 120.0, -0.5, -sin(M_PI/3), 0.0), TestCase::QUICK);
+ AddTestCase (new LteEnbAntennaTestCase ( -120.0, 120.0, 0.5, -sin(M_PI/3), -3.0), TestCase::QUICK);
+ AddTestCase (new LteEnbAntennaTestCase ( -120.0, 120.0, -1, 0, -3.0), TestCase::QUICK);
+ AddTestCase (new LteEnbAntennaTestCase ( -120.0, 120.0, -1, 2, -15.578), TestCase::QUICK);
+ AddTestCase (new LteEnbAntennaTestCase ( -120.0, 120.0, 1, 0, -14.457), TestCase::QUICK);
+ AddTestCase (new LteEnbAntennaTestCase ( -120.0, 120.0, 1, 2, -73.154), TestCase::QUICK);
+ AddTestCase (new LteEnbAntennaTestCase ( -120.0, 120.0, 1, -0.1, -12.754), TestCase::QUICK);
}
--- a/src/lte/test/test-lte-epc-e2e-data.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/lte/test/test-lte-epc-e2e-data.cc Fri Mar 22 13:14:38 2013 +0100
@@ -335,7 +335,7 @@
u1.bearers.push_back (f1);
e1.ues.push_back (u1);
v1.push_back (e1);
- AddTestCase (new LteEpcE2eDataTestCase ("1 eNB, 1UE", v1));
+ AddTestCase (new LteEpcE2eDataTestCase ("1 eNB, 1UE", v1), TestCase::QUICK);
std::vector<EnbTestData> v2;
EnbTestData e2;
@@ -348,12 +348,12 @@
u2_2.bearers.push_back (f2_2);
e2.ues.push_back (u2_2);
v2.push_back (e2);
- AddTestCase (new LteEpcE2eDataTestCase ("1 eNB, 2UEs", v2));
+ AddTestCase (new LteEpcE2eDataTestCase ("1 eNB, 2UEs", v2), TestCase::QUICK);
std::vector<EnbTestData> v3;
v3.push_back (e1);
v3.push_back (e2);
- AddTestCase (new LteEpcE2eDataTestCase ("2 eNBs", v3));
+ AddTestCase (new LteEpcE2eDataTestCase ("2 eNBs", v3), TestCase::QUICK);
EnbTestData e4;
UeTestData u4_1;
@@ -372,7 +372,7 @@
v4.push_back (e4);
v4.push_back (e1);
v4.push_back (e2);
- AddTestCase (new LteEpcE2eDataTestCase ("3 eNBs", v4));
+ AddTestCase (new LteEpcE2eDataTestCase ("3 eNBs", v4), TestCase::QUICK);
EnbTestData e5;
UeTestData u5;
@@ -381,7 +381,7 @@
e5.ues.push_back (u5);
std::vector<EnbTestData> v5;
v5.push_back (e5);
- AddTestCase (new LteEpcE2eDataTestCase ("1 eNB, 1UE with 1000 byte packets", v5));
+ AddTestCase (new LteEpcE2eDataTestCase ("1 eNB, 1UE with 1000 byte packets", v5), TestCase::QUICK);
EnbTestData e6;
@@ -391,7 +391,7 @@
e6.ues.push_back (u6);
std::vector<EnbTestData> v6;
v6.push_back (e6);
- AddTestCase (new LteEpcE2eDataTestCase ("1 eNB, 1UE with 1400 byte packets", v6));
+ AddTestCase (new LteEpcE2eDataTestCase ("1 eNB, 1UE with 1400 byte packets", v6), TestCase::QUICK);
EnbTestData e7;
UeTestData u7;
@@ -402,7 +402,7 @@
e7.ues.push_back (u7);
std::vector<EnbTestData> v7;
v7.push_back (e7);
- AddTestCase (new LteEpcE2eDataTestCase ("1 eNB, 1UE with 2 bearers", v7));
+ AddTestCase (new LteEpcE2eDataTestCase ("1 eNB, 1UE with 2 bearers", v7), TestCase::QUICK);
EnbTestData e8;
UeTestData u8;
@@ -411,7 +411,7 @@
e8.ues.push_back (u8);
std::vector<EnbTestData> v8;
v8.push_back (e8);
- AddTestCase (new LteEpcE2eDataTestCase ("1 eNB, 1UE with fragmentation", v8));
+ AddTestCase (new LteEpcE2eDataTestCase ("1 eNB, 1UE with fragmentation", v8), TestCase::QUICK);
EnbTestData e9;
@@ -421,7 +421,7 @@
e9.ues.push_back (u9);
std::vector<EnbTestData> v9;
v9.push_back (e9);
- AddTestCase (new LteEpcE2eDataTestCase ("1 eNB, 1UE with aggregation", v9));
+ AddTestCase (new LteEpcE2eDataTestCase ("1 eNB, 1UE with aggregation", v9), TestCase::QUICK);
}
--- a/src/mesh/test/dot11s/dot11s-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/mesh/test/dot11s/dot11s-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -279,9 +279,9 @@
Dot11sTestSuite::Dot11sTestSuite ()
: TestSuite ("devices-mesh-dot11s", UNIT)
{
- AddTestCase (new MeshHeaderTest);
- AddTestCase (new HwmpRtableTest);
- AddTestCase (new PeerLinkFrameStartTest);
+ AddTestCase (new MeshHeaderTest, TestCase::QUICK);
+ AddTestCase (new HwmpRtableTest, TestCase::QUICK);
+ AddTestCase (new PeerLinkFrameStartTest, TestCase::QUICK);
}
static Dot11sTestSuite g_dot11sTestSuite;
--- a/src/mesh/test/dot11s/regression.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/mesh/test/dot11s/regression.cc Fri Mar 22 13:14:38 2013 +0100
@@ -34,10 +34,10 @@
// We do not use NS_TEST_SOURCEDIR variable here since mesh/test has
// subdirectories
SetDataDir (std::string ("src/mesh/test/dot11s"));
- AddTestCase (new PeerManagementProtocolRegressionTest);
- AddTestCase (new HwmpSimplestRegressionTest);
- AddTestCase (new HwmpReactiveRegressionTest);
- AddTestCase (new HwmpProactiveRegressionTest);
- AddTestCase (new HwmpDoRfRegressionTest);
+ AddTestCase (new PeerManagementProtocolRegressionTest, TestCase::QUICK);
+ AddTestCase (new HwmpSimplestRegressionTest, TestCase::QUICK);
+ AddTestCase (new HwmpReactiveRegressionTest, TestCase::QUICK);
+ AddTestCase (new HwmpProactiveRegressionTest, TestCase::QUICK);
+ AddTestCase (new HwmpDoRfRegressionTest, TestCase::QUICK);
}
} g_dot11sRegressionSuite;
--- a/src/mesh/test/flame/flame-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/mesh/test/flame/flame-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -145,8 +145,8 @@
FlameTestSuite::FlameTestSuite ()
: TestSuite ("devices-mesh-flame", UNIT)
{
- AddTestCase (new FlameHeaderTest);
- AddTestCase (new FlameRtableTest);
+ AddTestCase (new FlameHeaderTest, TestCase::QUICK);
+ AddTestCase (new FlameRtableTest, TestCase::QUICK);
}
static FlameTestSuite g_flameTestSuite;
--- a/src/mesh/test/flame/regression.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/mesh/test/flame/regression.cc Fri Mar 22 13:14:38 2013 +0100
@@ -30,6 +30,6 @@
// We do not use NS_TEST_SOURCEDIR variable here since mesh/test has
// subdirectories
SetDataDir (std::string ("src/mesh/test/flame"));
- AddTestCase (new FlameRegressionTest);
+ AddTestCase (new FlameRegressionTest, TestCase::QUICK);
}
} g_flameRegressionSuite;
--- a/src/mesh/test/mesh-information-element-vector-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/mesh/test/mesh-information-element-vector-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -151,7 +151,7 @@
MeshTestSuite::MeshTestSuite ()
: TestSuite ("devices-mesh", UNIT)
{
- AddTestCase (new MeshInformationElementVectorBist);
+ AddTestCase (new MeshInformationElementVectorBist, TestCase::QUICK);
}
static MeshTestSuite g_meshTestSuite;
--- a/src/mobility/test/mobility-trace-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/mobility/test/mobility-trace-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -123,7 +123,7 @@
MobilityTraceTestSuite::MobilityTraceTestSuite ()
: TestSuite ("mobility-trace", UNIT)
{
- AddTestCase (new MobilityTraceTestCase);
+ AddTestCase (new MobilityTraceTestCase, TestCase::QUICK);
}
static MobilityTraceTestSuite mobilityTraceTestSuite;
--- a/src/mobility/test/ns2-mobility-helper-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/mobility/test/ns2-mobility-helper-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -273,7 +273,7 @@
"$node_(0) set Z_ 3.0\n"
);
t->AddReferencePoint ("0", 0, Vector (1, 2, 3), Vector (0, 0, 0));
- AddTestCase (t);
+ AddTestCase (t, TestCase::QUICK);
// Check parsing comments, empty lines and no EOF at the end of file
t = new Ns2MobilityHelperTest ("comments", Seconds (1));
@@ -285,7 +285,7 @@
"#$node_(0) set Z_ 100 #"
);
t->AddReferencePoint ("0", 0, Vector (1, 2, 3), Vector (0, 0, 0));
- AddTestCase (t);
+ AddTestCase (t, TestCase::QUICK);
// Simple setdest. Arguments are interpreted as x, y, speed by default
t = new Ns2MobilityHelperTest ("simple setdest", Seconds (10));
@@ -294,7 +294,7 @@
t->AddReferencePoint ("0", 0, Vector (0, 0, 0), Vector (0, 0, 0));
t->AddReferencePoint ("0", 1, Vector (0, 0, 0), Vector (5, 0, 0));
t->AddReferencePoint ("0", 6, Vector (25, 0, 0), Vector (0, 0, 0));
- AddTestCase (t);
+ AddTestCase (t, TestCase::QUICK);
// Several set and setdest. Arguments are interpreted as x, y, speed by default
t = new Ns2MobilityHelperTest ("square setdest", Seconds (6));
@@ -315,7 +315,7 @@
t->AddReferencePoint ("0", 4, Vector (0, 5, 0), Vector (0, 0, 0));
t->AddReferencePoint ("0", 4, Vector (0, 5, 0), Vector (0, -5, 0));
t->AddReferencePoint ("0", 5, Vector (0, 0, 0), Vector (0, 0, 0));
- AddTestCase (t);
+ AddTestCase (t, TestCase::QUICK);
// Copy of previous test case but with the initial positions at
// the end of the trace rather than at the beginning.
@@ -339,7 +339,7 @@
t->AddReferencePoint ("0", 4, Vector (10, 15, 0), Vector (0, 0, 0));
t->AddReferencePoint ("0", 4, Vector (10, 15, 0), Vector (0, -5, 0));
t->AddReferencePoint ("0", 5, Vector (10, 10, 0), Vector (0, 0, 0));
- AddTestCase (t);
+ AddTestCase (t, TestCase::QUICK);
// Scheduled set position
t = new Ns2MobilityHelperTest ("scheduled set position", Seconds (2));
@@ -350,7 +350,7 @@
t->AddReferencePoint ("0", 1, Vector (10, 0, 0), Vector (0, 0, 0));
t->AddReferencePoint ("0", 1, Vector (10, 0, 10), Vector (0, 0, 0));
t->AddReferencePoint ("0", 1, Vector (10, 10, 10), Vector (0, 0, 0));
- AddTestCase (t);
+ AddTestCase (t, TestCase::QUICK);
// Malformed lines
t = new Ns2MobilityHelperTest ("malformed lines", Seconds (2));
@@ -366,7 +366,7 @@
t->AddReferencePoint ("0", 0, Vector (1, 2, 3), Vector (0, 0, 0));
t->AddReferencePoint ("0", 1, Vector (1, 2, 3), Vector (1, 0, 0));
t->AddReferencePoint ("0", 2, Vector (2, 2, 3), Vector (0, 0, 0));
- AddTestCase (t);
+ AddTestCase (t, TestCase::QUICK);
// Non possible values
t = new Ns2MobilityHelperTest ("non possible values", Seconds (2));
@@ -386,7 +386,7 @@
t->AddReferencePoint ("0", 0, Vector (1, 2, 3), Vector (0, 0, 0));
t->AddReferencePoint ("0", 1, Vector (1, 2, 3), Vector (1, 0, 0));
t->AddReferencePoint ("0", 2, Vector (2, 2, 3), Vector (0, 0, 0));
- AddTestCase (t);
+ AddTestCase (t, TestCase::QUICK);
// More than one node
t = new Ns2MobilityHelperTest ("few nodes, combinations of set and setdest", Seconds (10), 3);
@@ -414,7 +414,7 @@
t->AddReferencePoint ("2", 4, Vector (0, 5, 0), Vector (0, 0, 0));
t->AddReferencePoint ("2", 4, Vector (0, 5, 0), Vector (0, -5, 0));
t->AddReferencePoint ("2", 5, Vector (0, 0, 0), Vector (0, 0, 0));
- AddTestCase (t);
+ AddTestCase (t, TestCase::QUICK);
// Test for Speed == 0, that acts as stop the node.
t = new Ns2MobilityHelperTest ("setdest with speed cero", Seconds (10));
@@ -425,7 +425,7 @@
t->AddReferencePoint ("0", 1, Vector (0, 0, 0), Vector (5, 0, 0));
t->AddReferencePoint ("0", 6, Vector (25, 0, 0), Vector (0, 0, 0));
t->AddReferencePoint ("0", 7, Vector (25, 0, 0), Vector (0, 0, 0));
- AddTestCase (t);
+ AddTestCase (t, TestCase::QUICK);
// Test negative positions
@@ -440,7 +440,7 @@
t->AddReferencePoint ("0", 2, Vector (0, 0, 0), Vector (0, 0, 0));
t->AddReferencePoint ("0", 2, Vector (0, 0, 0), Vector (0, -1, 0));
t->AddReferencePoint ("0", 3, Vector (0, -1, 0), Vector (0, 0, 0));
- AddTestCase (t);
+ AddTestCase (t, TestCase::QUICK);
// Sqare setdest with values in the form 1.0e+2
t = new Ns2MobilityHelperTest ("Foalt numbers in 1.0e+2 format", Seconds (6));
@@ -460,7 +460,7 @@
t->AddReferencePoint ("0", 4, Vector (0, 100, 0), Vector (0, 0, 0));
t->AddReferencePoint ("0", 4, Vector (0, 100, 0), Vector (0, -100, 0));
t->AddReferencePoint ("0", 5, Vector (0, 0, 0), Vector (0, 0, 0));
- AddTestCase (t);
+ AddTestCase (t, TestCase::QUICK);
t = new Ns2MobilityHelperTest ("Bug 1219 testcase", Seconds (16));
t->SetTrace ("$node_(0) set X_ 0.0\n"
"$node_(0) set Y_ 0.0\n"
@@ -472,14 +472,14 @@
t->AddReferencePoint ("0", 1, Vector (0, 0, 0), Vector (0, 1, 0));
t->AddReferencePoint ("0", 6, Vector (0, 5, 0), Vector (0, -1, 0));
t->AddReferencePoint ("0", 16, Vector (0, -10, 0), Vector (0, 0, 0));
- AddTestCase (t);
+ AddTestCase (t, TestCase::QUICK);
t = new Ns2MobilityHelperTest ("Bug 1059 testcase", Seconds (16));
t->SetTrace ("$node_(0) set X_ 10.0\r\n"
"$node_(0) set Y_ 0.0\r\n"
);
// id t position velocity
t->AddReferencePoint ("0", 0, Vector (10, 0, 0), Vector (0, 0, 0));
- AddTestCase (t);
+ AddTestCase (t, TestCase::QUICK);
t = new Ns2MobilityHelperTest ("Bug 1301 testcase", Seconds (16));
t->SetTrace ("$node_(0) set X_ 10.0\n"
"$node_(0) set Y_ 0.0\n"
@@ -489,7 +489,7 @@
// Moving to the current position must change nothing. No NaN
// speed must be.
t->AddReferencePoint ("0", 0, Vector (10, 0, 0), Vector (0, 0, 0));
- AddTestCase (t);
+ AddTestCase (t, TestCase::QUICK);
t = new Ns2MobilityHelperTest ("Bug 1316 testcase", Seconds (1000));
t->SetTrace ("$node_(0) set X_ 350.00000000000000\n"
@@ -513,7 +513,7 @@
t->AddReferencePoint ("0", 600.000, Vector (250.000, 50.000, 0.000), Vector (0.000, 2.000, 0.000));
t->AddReferencePoint ("0", 900.000, Vector (250.000, 650.000, 0.000), Vector (2.500, 0.000, 0.000));
t->AddReferencePoint ("0", 920.000, Vector (300.000, 650.000, 0.000), Vector (0.000, 0.000, 0.000));
- AddTestCase (t);
+ AddTestCase (t, TestCase::QUICK);
}
} g_ns2TransmobilityHelperTestSuite;
--- a/src/mobility/test/steady-state-random-waypoint-mobility-model-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/mobility/test/steady-state-random-waypoint-mobility-model-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -141,7 +141,7 @@
{
SteadyStateRandomWaypointTestSuite () : TestSuite ("steady-state-rwp-mobility-model", UNIT)
{
- AddTestCase (new SteadyStateRandomWaypointTest);
+ AddTestCase (new SteadyStateRandomWaypointTest, TestCase::QUICK);
}
} g_steadyStateRandomWaypointTestSuite;
--- a/src/mobility/test/waypoint-mobility-model-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/mobility/test/waypoint-mobility-model-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -151,8 +151,8 @@
{
WaypointMobilityModelTestSuite () : TestSuite ("waypoint-mobility-model", UNIT)
{
- AddTestCase (new WaypointMobilityModelNotifyTest (true));
- AddTestCase (new WaypointMobilityModelNotifyTest (false));
+ AddTestCase (new WaypointMobilityModelNotifyTest (true), TestCase::QUICK);
+ AddTestCase (new WaypointMobilityModelNotifyTest (false), TestCase::QUICK);
}
} g_waypointMobilityModelTestSuite;
--- a/src/netanim/test/netanim-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/netanim/test/netanim-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -112,7 +112,7 @@
AnimationInterfaceTestSuite () :
TestSuite ("animation-interface", UNIT)
{
- AddTestCase (new AnimationInterfaceTestCase ());
+ AddTestCase (new AnimationInterfaceTestCase (), TestCase::QUICK);
}
} g_animationInterfaceTestSuite;
--- a/src/network/test/buffer-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/network/test/buffer-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -332,7 +332,7 @@
BufferTestSuite::BufferTestSuite ()
: TestSuite ("buffer", UNIT)
{
- AddTestCase (new BufferTest);
+ AddTestCase (new BufferTest, TestCase::QUICK);
}
static BufferTestSuite g_bufferTestSuite;
--- a/src/network/test/drop-tail-queue-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/network/test/drop-tail-queue-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -83,6 +83,6 @@
DropTailQueueTestSuite ()
: TestSuite ("drop-tail-queue", UNIT)
{
- AddTestCase (new DropTailQueueTestCase ());
+ AddTestCase (new DropTailQueueTestCase (), TestCase::QUICK);
}
} g_dropTailQueueTestSuite;
--- a/src/network/test/error-model-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/network/test/error-model-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -129,7 +129,7 @@
ErrorModelTestSuite::ErrorModelTestSuite ()
: TestSuite ("error-model", UNIT)
{
- AddTestCase (new ErrorModelSimple);
+ AddTestCase (new ErrorModelSimple, TestCase::QUICK);
}
// Do not forget to allocate an instance of this TestSuite
--- a/src/network/test/ipv6-address-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/network/test/ipv6-address-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -100,7 +100,7 @@
Ipv6AddressTestSuite::Ipv6AddressTestSuite ()
: TestSuite ("ipv6-address", UNIT)
{
- AddTestCase (new Ipv6AddressTestCase1);
+ AddTestCase (new Ipv6AddressTestCase1, TestCase::QUICK);
}
static Ipv6AddressTestSuite ipv6AddressTestSuite;
--- a/src/network/test/packet-metadata-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/network/test/packet-metadata-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -829,7 +829,7 @@
PacketMetadataTestSuite::PacketMetadataTestSuite ()
: TestSuite ("packet-metadata", UNIT)
{
- AddTestCase (new PacketMetadataTest);
+ AddTestCase (new PacketMetadataTest, TestCase::QUICK);
}
PacketMetadataTestSuite g_packetMetadataTest;
--- a/src/network/test/packet-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/network/test/packet-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -445,7 +445,7 @@
PacketTestSuite::PacketTestSuite ()
: TestSuite ("packet", UNIT)
{
- AddTestCase (new PacketTest);
+ AddTestCase (new PacketTest, TestCase::QUICK);
}
static PacketTestSuite g_packetTestSuite;
--- a/src/network/test/packetbb-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/network/test/packetbb-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -119,7 +119,7 @@
{
Ptr<PbbPacket> packet = Create<PbbPacket> ();
uint8_t buffer[] = { 0x00};
- AddTestCase (new PbbTestCase ("1", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("1", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 2
@@ -135,7 +135,7 @@
Ptr<PbbPacket> packet = Create<PbbPacket> ();
packet->SetSequenceNumber (2);
uint8_t buffer[] = { 0x08, 0x00, 0x02};
- AddTestCase (new PbbTestCase ("2", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("2", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 3
@@ -154,7 +154,7 @@
Ptr<PbbPacket> packet = Create<PbbPacket> ();
packet->SetSequenceNumber (3);
uint8_t buffer[] = { 0x0c, 0x00, 0x03, 0x00, 0x00};
- AddTestCase (new PbbTestCase ("3", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("3", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
#endif
@@ -183,7 +183,7 @@
0x0c, 0x00, 0x04, 0x00,
0x02, 0x01, 0x00
};
- AddTestCase (new PbbTestCase ("4", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("4", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 5
@@ -220,7 +220,7 @@
0x05, 0x01, 0x00, 0x02,
0x80, 0x64
};
- AddTestCase (new PbbTestCase ("5", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("5", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 6
@@ -263,7 +263,7 @@
0x90, 0x64, 0x04, 0x01,
0x02, 0x03, 0x04
};
- AddTestCase (new PbbTestCase ("6", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("6", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 7
@@ -530,7 +530,7 @@
0x25, 0x26, 0x27, 0x28,
0x29, 0x2a, 0x2b, 0x2c
};
- AddTestCase (new PbbTestCase ("7", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("7", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 8
@@ -571,7 +571,7 @@
0x03, 0x00, 0x06, 0x00,
0x00
};
- AddTestCase (new PbbTestCase ("8", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("8", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 9
@@ -627,7 +627,7 @@
0x0a, 0x0a, 0x00, 0x00,
0x01, 0x00, 0x00
};
- AddTestCase (new PbbTestCase ("9", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("9", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 10
@@ -685,7 +685,7 @@
0x0b, 0x0a, 0x00, 0x00,
0x01, 0x01, 0x00, 0x00,
};
- AddTestCase (new PbbTestCase ("10", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("10", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 11
@@ -746,7 +746,7 @@
0x01, 0xff, 0x01, 0x00,
0x00
};
- AddTestCase (new PbbTestCase ("11", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("11", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 12
@@ -809,7 +809,7 @@
0x01, 0xff, 0x01, 0x30,
0x39, 0x00, 0x00
};
- AddTestCase (new PbbTestCase ("12", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("12", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 13
@@ -872,7 +872,7 @@
0x01, 0xff, 0x01, 0x30,
0x39, 0x00, 0x00
};
- AddTestCase (new PbbTestCase ("13", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("13", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 14
@@ -945,7 +945,7 @@
0x01, 0x30, 0x39, 0x00,
0x00
};
- AddTestCase (new PbbTestCase ("14", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("14", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 15
@@ -1029,7 +1029,7 @@
0x00, 0x00, 0x00, 0x00,
0x00
};
- AddTestCase (new PbbTestCase ("15", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("15", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 16
@@ -1113,7 +1113,7 @@
0xff, 0xff, 0xff, 0x00,
0x00,
};
- AddTestCase (new PbbTestCase ("16", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("16", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 17
@@ -1197,7 +1197,7 @@
0x00, 0x00, 0x01, 0x00,
0x00,
};
- AddTestCase (new PbbTestCase ("17", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("17", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 18
@@ -1281,7 +1281,7 @@
0x00, 0x00, 0x00, 0x00,
0x00,
};
- AddTestCase (new PbbTestCase ("18", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("18", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 19
@@ -1365,7 +1365,7 @@
0x00, 0x00, 0x01, 0x00,
0x00,
};
- AddTestCase (new PbbTestCase ("19", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("19", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 20
@@ -1451,7 +1451,7 @@
0x0a, 0x00, 0x00, 0x01,
0x02, 0x00, 0x00,
};
- AddTestCase (new PbbTestCase ("20", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("20", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 21
@@ -1538,7 +1538,7 @@
0x00, 0x01, 0x01, 0x00,
0x00,
};
- AddTestCase (new PbbTestCase ("21", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("21", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 22
@@ -1636,7 +1636,7 @@
0x00, 0x02, 0x20, 0x03,
0x0a, 0x0b, 0x00, 0x00,
};
- AddTestCase (new PbbTestCase ("22", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("22", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 23
@@ -1749,7 +1749,7 @@
0x20, 0x10, 0x18, 0x00,
0x00,
};
- AddTestCase (new PbbTestCase ("23", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("23", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 24
@@ -1869,7 +1869,7 @@
0x20, 0x10, 0x18, 0x00,
0x02, 0x01, 0x00,
};
- AddTestCase (new PbbTestCase ("24", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("24", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 25
@@ -1991,7 +1991,7 @@
0x20, 0x10, 0x18, 0x00,
0x03, 0x01, 0x40, 0x01,
};
- AddTestCase (new PbbTestCase ("25", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("25", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 26
@@ -2116,7 +2116,7 @@
0x04, 0x01, 0x20, 0x01,
0x03,
};
- AddTestCase (new PbbTestCase ("26", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("26", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 27
@@ -2247,7 +2247,7 @@
0x03, 0x03, 0x01, 0x02,
0x03,
};
- AddTestCase (new PbbTestCase ("27", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("27", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 28
@@ -2602,7 +2602,7 @@
0x26, 0x27, 0x28, 0x29,
0x2a, 0x2b, 0x2c
};
- AddTestCase (new PbbTestCase ("28", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("28", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 29
@@ -2632,7 +2632,7 @@
0x00, 0x01, 0x0f, 0x00,
0x06, 0x00, 0x00,
};
- AddTestCase (new PbbTestCase ("29", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("29", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 30
@@ -2668,7 +2668,7 @@
0x00, 0x00, 0x00, 0x00,
0x01, 0x00, 0x00
};
- AddTestCase (new PbbTestCase ("30", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("30", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 31
@@ -2717,7 +2717,7 @@
0x00, 0x00, 0x00, 0x00,
0x01, 0x00, 0x00,
};
- AddTestCase (new PbbTestCase ("31", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("31", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 32
@@ -2769,7 +2769,7 @@
0x00, 0x01, 0x02, 0x00,
0x00,
};
- AddTestCase (new PbbTestCase ("32", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("32", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 33
@@ -2821,7 +2821,7 @@
0x00, 0x02, 0x00, 0x11,
0x00, 0x00,
};
- AddTestCase (new PbbTestCase ("33", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("33", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 34
@@ -2885,7 +2885,7 @@
0x01, 0x00, 0x0e, 0x10,
0x11, 0x00, 0x00,
};
- AddTestCase (new PbbTestCase ("34", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("34", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 35
@@ -2972,7 +2972,7 @@
0x00, 0x06, 0x80, 0x80,
0x40, 0x30, 0x00, 0x00,
};
- AddTestCase (new PbbTestCase ("35", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("35", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 36
@@ -3394,7 +3394,7 @@
0x80, 0x80, 0x40, 0x30,
0x00, 0x00,
};
- AddTestCase (new PbbTestCase ("36", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("36", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
/* Test 37
@@ -3816,7 +3816,7 @@
0x80, 0x80, 0x40, 0x30,
0x00, 0x00,
};
- AddTestCase (new PbbTestCase ("37", packet, buffer, sizeof(buffer)));
+ AddTestCase (new PbbTestCase ("37", packet, buffer, sizeof(buffer)), TestCase::QUICK);
}
}
--- a/src/network/test/pcap-file-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/network/test/pcap-file-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -1111,13 +1111,13 @@
: TestSuite ("pcap-file", UNIT)
{
SetDataDir (NS_TEST_SOURCEDIR);
- AddTestCase (new WriteModeCreateTestCase);
- AddTestCase (new ReadModeCreateTestCase);
- //AddTestCase (new AppendModeCreateTestCase);
- AddTestCase (new FileHeaderTestCase);
- AddTestCase (new RecordHeaderTestCase);
- AddTestCase (new ReadFileTestCase);
- AddTestCase (new DiffTestCase);
+ AddTestCase (new WriteModeCreateTestCase, TestCase::QUICK);
+ AddTestCase (new ReadModeCreateTestCase, TestCase::QUICK);
+ //AddTestCase (new AppendModeCreateTestCase, TestCase::QUICK);
+ AddTestCase (new FileHeaderTestCase, TestCase::QUICK);
+ AddTestCase (new RecordHeaderTestCase, TestCase::QUICK);
+ AddTestCase (new ReadFileTestCase, TestCase::QUICK);
+ AddTestCase (new DiffTestCase, TestCase::QUICK);
}
static PcapFileTestSuite pcapFileTestSuite;
--- a/src/network/test/red-queue-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/network/test/red-queue-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -276,6 +276,6 @@
RedQueueTestSuite ()
: TestSuite ("red-queue", UNIT)
{
- AddTestCase (new RedQueueTestCase ());
+ AddTestCase (new RedQueueTestCase (), TestCase::QUICK);
}
} g_redQueueTestSuite;
--- a/src/network/test/sequence-number-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/network/test/sequence-number-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -186,6 +186,6 @@
SequenceNumberTestSuite ()
: TestSuite ("SequenceNumber", UNIT)
{
- AddTestCase (new SequenceNumberTestCase ());
+ AddTestCase (new SequenceNumberTestCase (), TestCase::QUICK);
}
} g_seqNumTests;
--- a/src/olsr/test/olsr-header-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/olsr/test/olsr-header-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -305,11 +305,11 @@
OlsrTestSuite::OlsrTestSuite()
: TestSuite ("routing-olsr-header", UNIT)
{
- AddTestCase (new OlsrHnaTestCase ());
- AddTestCase (new OlsrTcTestCase ());
- AddTestCase (new OlsrHelloTestCase ());
- AddTestCase (new OlsrMidTestCase ());
- AddTestCase (new OlsrEmfTestCase ());
+ AddTestCase (new OlsrHnaTestCase (), TestCase::QUICK);
+ AddTestCase (new OlsrTcTestCase (), TestCase::QUICK);
+ AddTestCase (new OlsrHelloTestCase (), TestCase::QUICK);
+ AddTestCase (new OlsrMidTestCase (), TestCase::QUICK);
+ AddTestCase (new OlsrEmfTestCase (), TestCase::QUICK);
}
} // namespace ns3
--- a/src/olsr/test/olsr-routing-protocol-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/olsr/test/olsr-routing-protocol-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -176,7 +176,7 @@
OlsrProtocolTestSuite::OlsrProtocolTestSuite()
: TestSuite ("routing-olsr", UNIT)
{
- AddTestCase (new OlsrMprTestCase ());
+ AddTestCase (new OlsrMprTestCase (), TestCase::QUICK);
}
}
--- a/src/olsr/test/regression-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/olsr/test/regression-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -31,9 +31,9 @@
RegressionTestSuite () : TestSuite ("routing-olsr-regression", SYSTEM)
{
SetDataDir (NS_TEST_SOURCEDIR);
- AddTestCase (new HelloRegressionTest);
- AddTestCase (new TcRegressionTest);
- AddTestCase (new Bug780Test);
+ AddTestCase (new HelloRegressionTest, TestCase::QUICK);
+ AddTestCase (new TcRegressionTest, TestCase::QUICK);
+ AddTestCase (new Bug780Test, TestCase::QUICK);
}
} g_olsrRegressionTestSuite;
--- a/src/openflow/test/openflow-switch-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/openflow/test/openflow-switch-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -181,7 +181,7 @@
SwitchTestSuite::SwitchTestSuite () : TestSuite ("openflow", UNIT)
{
- AddTestCase (new SwitchFlowTableTestCase);
+ AddTestCase (new SwitchFlowTableTestCase, TestCase::QUICK);
}
// Do not forget to allocate an instance of this TestSuite
--- a/src/point-to-point/test/point-to-point-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/point-to-point/test/point-to-point-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -65,7 +65,7 @@
PointToPointTestSuite::PointToPointTestSuite ()
: TestSuite ("devices-point-to-point", UNIT)
{
- AddTestCase (new PointToPointTest);
+ AddTestCase (new PointToPointTest, TestCase::QUICK);
}
static PointToPointTestSuite g_pointToPointTestSuite;
--- a/src/propagation/test/itu-r-1411-los-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/propagation/test/itu-r-1411-los-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -110,9 +110,9 @@
// reference values obtained with the octave scripts in src/propagation/test/reference/
- AddTestCase (new ItuR1411LosPropagationLossModelTestCase (2.1140e9, 100, 30, 1, 81.005, "freq=2114MHz, dist=100m"));
+ AddTestCase (new ItuR1411LosPropagationLossModelTestCase (2.1140e9, 100, 30, 1, 81.005, "freq=2114MHz, dist=100m"), TestCase::QUICK);
- AddTestCase (new ItuR1411LosPropagationLossModelTestCase (1999e6, 200, 30, 1, 87.060, "freq=1999MHz, dist=200m"));
+ AddTestCase (new ItuR1411LosPropagationLossModelTestCase (1999e6, 200, 30, 1, 87.060, "freq=1999MHz, dist=200m"), TestCase::QUICK);
--- a/src/propagation/test/itu-r-1411-nlos-over-rooftop-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/propagation/test/itu-r-1411-nlos-over-rooftop-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -116,9 +116,9 @@
// reference values obtained with the octave scripts in src/propagation/test/reference/
- AddTestCase (new ItuR1411NlosOverRooftopPropagationLossModelTestCase (2.1140e9, 900, 30, 1, UrbanEnvironment, LargeCity, 143.68, "f=2114Mhz, dist=900, urban large city"));
+ AddTestCase (new ItuR1411NlosOverRooftopPropagationLossModelTestCase (2.1140e9, 900, 30, 1, UrbanEnvironment, LargeCity, 143.68, "f=2114Mhz, dist=900, urban large city"), TestCase::QUICK);
- AddTestCase (new ItuR1411NlosOverRooftopPropagationLossModelTestCase (1.865e9, 500, 30, 1, UrbanEnvironment, LargeCity, 132.84, "f=2114Mhz, dist=900, urban large city"));
+ AddTestCase (new ItuR1411NlosOverRooftopPropagationLossModelTestCase (1.865e9, 500, 30, 1, UrbanEnvironment, LargeCity, 132.84, "f=2114Mhz, dist=900, urban large city"), TestCase::QUICK);
}
--- a/src/propagation/test/kun-2600-mhz-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/propagation/test/kun-2600-mhz-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -105,7 +105,7 @@
LogComponentEnable ("Kun2600MhzPropagationLossModelTest", LOG_LEVEL_ALL);
- AddTestCase (new Kun2600MhzPropagationLossModelTestCase (2000, 30, 1, 121.83, "dist=2000m"));
+ AddTestCase (new Kun2600MhzPropagationLossModelTestCase (2000, 30, 1, 121.83, "dist=2000m"), TestCase::QUICK);
}
--- a/src/propagation/test/okumura-hata-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/propagation/test/okumura-hata-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -120,20 +120,20 @@
double freq = 869e6; // this will use the original OH model
- AddTestCase (new OkumuraHataPropagationLossModelTestCase (freq, 2000, 30, 1, UrbanEnvironment, LargeCity, 137.93, "original OH Urban Large city"));
+ AddTestCase (new OkumuraHataPropagationLossModelTestCase (freq, 2000, 30, 1, UrbanEnvironment, LargeCity, 137.93, "original OH Urban Large city"), TestCase::QUICK);
- AddTestCase (new OkumuraHataPropagationLossModelTestCase (freq, 2000, 30, 1, UrbanEnvironment, SmallCity, 137.88, "original OH Urban small city"));
+ AddTestCase (new OkumuraHataPropagationLossModelTestCase (freq, 2000, 30, 1, UrbanEnvironment, SmallCity, 137.88, "original OH Urban small city"), TestCase::QUICK);
- AddTestCase (new OkumuraHataPropagationLossModelTestCase (freq, 2000, 30, 1, SubUrbanEnvironment, LargeCity, 128.03, "original OH SubUrban"));
+ AddTestCase (new OkumuraHataPropagationLossModelTestCase (freq, 2000, 30, 1, SubUrbanEnvironment, LargeCity, 128.03, "original OH SubUrban"), TestCase::QUICK);
- AddTestCase (new OkumuraHataPropagationLossModelTestCase (freq, 2000, 30, 1, OpenAreasEnvironment, LargeCity, 110.21, "original OH OpenAreas"));
+ AddTestCase (new OkumuraHataPropagationLossModelTestCase (freq, 2000, 30, 1, OpenAreasEnvironment, LargeCity, 110.21, "original OH OpenAreas"), TestCase::QUICK);
freq = 2.1140e9; // this will use the extended COST231 OH model
- AddTestCase (new OkumuraHataPropagationLossModelTestCase (freq, 2000, 30, 1, UrbanEnvironment, LargeCity, 148.55, "COST231 OH Urban Large city"));
+ AddTestCase (new OkumuraHataPropagationLossModelTestCase (freq, 2000, 30, 1, UrbanEnvironment, LargeCity, 148.55, "COST231 OH Urban Large city"), TestCase::QUICK);
- AddTestCase (new OkumuraHataPropagationLossModelTestCase (freq, 2000, 30, 1, UrbanEnvironment, SmallCity, 150.64, "COST231 OH Urban small city and suburban"));
+ AddTestCase (new OkumuraHataPropagationLossModelTestCase (freq, 2000, 30, 1, UrbanEnvironment, SmallCity, 150.64, "COST231 OH Urban small city and suburban"), TestCase::QUICK);
}
--- a/src/propagation/test/propagation-loss-model-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/propagation/test/propagation-loss-model-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -443,11 +443,11 @@
PropagationLossModelsTestSuite::PropagationLossModelsTestSuite ()
: TestSuite ("propagation-loss-model", UNIT)
{
- AddTestCase (new FriisPropagationLossModelTestCase);
- AddTestCase (new TwoRayGroundPropagationLossModelTestCase);
- AddTestCase (new LogDistancePropagationLossModelTestCase);
- AddTestCase (new MatrixPropagationLossModelTestCase);
- AddTestCase (new RangePropagationLossModelTestCase);
+ AddTestCase (new FriisPropagationLossModelTestCase, TestCase::QUICK);
+ AddTestCase (new TwoRayGroundPropagationLossModelTestCase, TestCase::QUICK);
+ AddTestCase (new LogDistancePropagationLossModelTestCase, TestCase::QUICK);
+ AddTestCase (new MatrixPropagationLossModelTestCase, TestCase::QUICK);
+ AddTestCase (new RangePropagationLossModelTestCase, TestCase::QUICK);
}
static PropagationLossModelsTestSuite propagationLossModelsTestSuite;
--- a/src/spectrum/test/spectrum-ideal-phy-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/spectrum/test/spectrum-ideal-phy-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -224,22 +224,22 @@
for (double snr = 0.01; snr <= 10 ; snr *= 2)
{
double achievableRate = g_bandwidth*log2(1+snr);
- AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*0.1), true, "ns3::SingleModelSpectrumChannel"));
- AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*0.5), true, "ns3::SingleModelSpectrumChannel"));
- AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*0.95), true, "ns3::SingleModelSpectrumChannel"));
- AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*1.05), false, "ns3::SingleModelSpectrumChannel"));
- AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*2), false, "ns3::SingleModelSpectrumChannel"));
- AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*4), false, "ns3::SingleModelSpectrumChannel"));
+ AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*0.1), true, "ns3::SingleModelSpectrumChannel"), TestCase::QUICK);
+ AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*0.5), true, "ns3::SingleModelSpectrumChannel"), TestCase::QUICK);
+ AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*0.95), true, "ns3::SingleModelSpectrumChannel"), TestCase::QUICK);
+ AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*1.05), false, "ns3::SingleModelSpectrumChannel"), TestCase::QUICK);
+ AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*2), false, "ns3::SingleModelSpectrumChannel"), TestCase::QUICK);
+ AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*4), false, "ns3::SingleModelSpectrumChannel"), TestCase::QUICK);
}
for (double snr = 0.01; snr <= 10 ; snr *= 10)
{
double achievableRate = g_bandwidth*log2(1+snr);
- AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*0.1), true, "ns3::MultiModelSpectrumChannel"));
- AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*0.5), true, "ns3::MultiModelSpectrumChannel"));
- AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*0.95), true, "ns3::MultiModelSpectrumChannel"));
- AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*1.05), false, "ns3::MultiModelSpectrumChannel"));
- AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*2), false, "ns3::MultiModelSpectrumChannel"));
- AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*4), false, "ns3::MultiModelSpectrumChannel"));
+ AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*0.1), true, "ns3::MultiModelSpectrumChannel"), TestCase::QUICK);
+ AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*0.5), true, "ns3::MultiModelSpectrumChannel"), TestCase::QUICK);
+ AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*0.95), true, "ns3::MultiModelSpectrumChannel"), TestCase::QUICK);
+ AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*1.05), false, "ns3::MultiModelSpectrumChannel"), TestCase::QUICK);
+ AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*2), false, "ns3::MultiModelSpectrumChannel"), TestCase::QUICK);
+ AddTestCase (new SpectrumIdealPhyTestCase (snr, static_cast<uint64_t> (achievableRate*4), false, "ns3::MultiModelSpectrumChannel"), TestCase::QUICK);
}
}
--- a/src/spectrum/test/spectrum-interference-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/spectrum/test/spectrum-interference-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -171,24 +171,24 @@
(*s1)[0] = 1.255943215755e-15;
(*s1)[1] = 7.204059965732e-16;
b = 10067205.5632012;
- AddTestCase (new SpectrumInterferenceTestCase (s1, 0, true, "sdBm = [-46 -48] tx bytes: 1"));
- AddTestCase (new SpectrumInterferenceTestCase (s1, static_cast<uint32_t> (b * 0.5 + 0.5), true, "sdBm = [-46 -48] tx bytes: b*0.5"));
- AddTestCase (new SpectrumInterferenceTestCase (s1, static_cast<uint32_t> (b * (1 - e) + 0.5), true, "sdBm = [-46 -48] tx bytes: b*(1-e)"));
- AddTestCase (new SpectrumInterferenceTestCase (s1, static_cast<uint32_t> (b * (1 + e) + 0.5), false, "sdBm = [-46 -48] tx bytes: b*(1+e)"));
- AddTestCase (new SpectrumInterferenceTestCase (s1, static_cast<uint32_t> (b * 1.5 + 0.5), false, "sdBm = [-46 -48] tx bytes: b*1.5"));
- AddTestCase (new SpectrumInterferenceTestCase (s1, 0xffffffff, false, "sdBm = [-46 -48] tx bytes: 2^32-1"));
+ AddTestCase (new SpectrumInterferenceTestCase (s1, 0, true, "sdBm = [-46 -48] tx bytes: 1"), TestCase::QUICK);
+ AddTestCase (new SpectrumInterferenceTestCase (s1, static_cast<uint32_t> (b * 0.5 + 0.5), true, "sdBm = [-46 -48] tx bytes: b*0.5"), TestCase::QUICK);
+ AddTestCase (new SpectrumInterferenceTestCase (s1, static_cast<uint32_t> (b * (1 - e) + 0.5), true, "sdBm = [-46 -48] tx bytes: b*(1-e)"), TestCase::QUICK);
+ AddTestCase (new SpectrumInterferenceTestCase (s1, static_cast<uint32_t> (b * (1 + e) + 0.5), false, "sdBm = [-46 -48] tx bytes: b*(1+e)"), TestCase::QUICK);
+ AddTestCase (new SpectrumInterferenceTestCase (s1, static_cast<uint32_t> (b * 1.5 + 0.5), false, "sdBm = [-46 -48] tx bytes: b*1.5"), TestCase::QUICK);
+ AddTestCase (new SpectrumInterferenceTestCase (s1, 0xffffffff, false, "sdBm = [-46 -48] tx bytes: 2^32-1"), TestCase::QUICK);
// Power Spectral Density of the signal of interest = [-63 -61] dBm;
Ptr<SpectrumValue> s2 = Create<SpectrumValue> (m);
(*s2)[0] = 2.505936168136e-17;
(*s2)[1] = 3.610582885110e-17;
b = 882401.591840728;
- AddTestCase (new SpectrumInterferenceTestCase (s2, 1, true, "sdBm = [-63 -61] tx bytes: 1"));
- AddTestCase (new SpectrumInterferenceTestCase (s2, static_cast<uint32_t> (b * 0.5 + 0.5), true, "sdBm = [-63 -61] tx bytes: b*0.5"));
- AddTestCase (new SpectrumInterferenceTestCase (s2, static_cast<uint32_t> (b * (1 - e) + 0.5), true, "sdBm = [-63 -61] tx bytes: b*(1-e)"));
- AddTestCase (new SpectrumInterferenceTestCase (s2, static_cast<uint32_t> (b * (1 + e) + 0.5), false, "sdBm = [-63 -61] tx bytes: b*(1+e)"));
- AddTestCase (new SpectrumInterferenceTestCase (s2, static_cast<uint32_t> (b * 1.5 + 0.5), false, "sdBm = [-63 -61] tx bytes: b*1.5"));
- AddTestCase (new SpectrumInterferenceTestCase (s2, 0xffffffff, false, "sdBm = [-63 -61] tx bytes: 2^32-1"));
+ AddTestCase (new SpectrumInterferenceTestCase (s2, 1, true, "sdBm = [-63 -61] tx bytes: 1"), TestCase::QUICK);
+ AddTestCase (new SpectrumInterferenceTestCase (s2, static_cast<uint32_t> (b * 0.5 + 0.5), true, "sdBm = [-63 -61] tx bytes: b*0.5"), TestCase::QUICK);
+ AddTestCase (new SpectrumInterferenceTestCase (s2, static_cast<uint32_t> (b * (1 - e) + 0.5), true, "sdBm = [-63 -61] tx bytes: b*(1-e)"), TestCase::QUICK);
+ AddTestCase (new SpectrumInterferenceTestCase (s2, static_cast<uint32_t> (b * (1 + e) + 0.5), false, "sdBm = [-63 -61] tx bytes: b*(1+e)"), TestCase::QUICK);
+ AddTestCase (new SpectrumInterferenceTestCase (s2, static_cast<uint32_t> (b * 1.5 + 0.5), false, "sdBm = [-63 -61] tx bytes: b*1.5"), TestCase::QUICK);
+ AddTestCase (new SpectrumInterferenceTestCase (s2, 0xffffffff, false, "sdBm = [-63 -61] tx bytes: 2^32-1"), TestCase::QUICK);
}
--- a/src/spectrum/test/spectrum-value-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/spectrum/test/spectrum-value-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -180,10 +180,10 @@
tv6 = v1 / v2;
- AddTestCase (new SpectrumValueTestCase (tv3, v3, "tv3 = v1 + v2"));
- AddTestCase (new SpectrumValueTestCase (tv4, v4, "tv4 = v1 - v2"));
- AddTestCase (new SpectrumValueTestCase (tv5, v5, "tv5 = v1 * v2"));
- AddTestCase (new SpectrumValueTestCase (tv6, v6, "tv6 = v1 div v2"));
+ AddTestCase (new SpectrumValueTestCase (tv3, v3, "tv3 = v1 + v2"), TestCase::QUICK);
+ AddTestCase (new SpectrumValueTestCase (tv4, v4, "tv4 = v1 - v2"), TestCase::QUICK);
+ AddTestCase (new SpectrumValueTestCase (tv5, v5, "tv5 = v1 * v2"), TestCase::QUICK);
+ AddTestCase (new SpectrumValueTestCase (tv6, v6, "tv6 = v1 div v2"), TestCase::QUICK);
// std::cerr << v6 << std::endl;
// std::cerr << tv6 << std::endl;
@@ -199,30 +199,30 @@
tv5 *= v2;
tv6 /= v2;
- AddTestCase (new SpectrumValueTestCase (tv3, v3, "tv3 += v2"));
- AddTestCase (new SpectrumValueTestCase (tv4, v4, "tv4 -= v2"));
- AddTestCase (new SpectrumValueTestCase (tv5, v5, "tv5 *= v2"));
- AddTestCase (new SpectrumValueTestCase (tv6, v6, "tv6 div= v2"));
+ AddTestCase (new SpectrumValueTestCase (tv3, v3, "tv3 += v2"), TestCase::QUICK);
+ AddTestCase (new SpectrumValueTestCase (tv4, v4, "tv4 -= v2"), TestCase::QUICK);
+ AddTestCase (new SpectrumValueTestCase (tv5, v5, "tv5 *= v2"), TestCase::QUICK);
+ AddTestCase (new SpectrumValueTestCase (tv6, v6, "tv6 div= v2"), TestCase::QUICK);
SpectrumValue tv7a (f), tv8a (f), tv9a (f), tv10a (f);
tv7a = v1 + doubleValue;
tv8a = v1 - doubleValue;
tv9a = v1 * doubleValue;
tv10a = v1 / doubleValue;
- AddTestCase (new SpectrumValueTestCase (tv7a, v7, "tv7a = v1 + doubleValue"));
- AddTestCase (new SpectrumValueTestCase (tv8a, v8, "tv8a = v1 - doubleValue"));
- AddTestCase (new SpectrumValueTestCase (tv9a, v9, "tv9a = v1 * doubleValue"));
- AddTestCase (new SpectrumValueTestCase (tv10a, v10, "tv10a = v1 div doubleValue"));
+ AddTestCase (new SpectrumValueTestCase (tv7a, v7, "tv7a = v1 + doubleValue"), TestCase::QUICK);
+ AddTestCase (new SpectrumValueTestCase (tv8a, v8, "tv8a = v1 - doubleValue"), TestCase::QUICK);
+ AddTestCase (new SpectrumValueTestCase (tv9a, v9, "tv9a = v1 * doubleValue"), TestCase::QUICK);
+ AddTestCase (new SpectrumValueTestCase (tv10a, v10, "tv10a = v1 div doubleValue"), TestCase::QUICK);
SpectrumValue tv7b (f), tv8b (f), tv9b (f), tv10b (f);
tv7b = doubleValue + v1;
tv8b = doubleValue - v1;
tv9b = doubleValue * v1;
tv10b = doubleValue / v1;
- AddTestCase (new SpectrumValueTestCase (tv7b, v7, "tv7b = doubleValue + v1"));
- AddTestCase (new SpectrumValueTestCase (tv8b, v8, "tv8b = doubleValue - v1"));
- AddTestCase (new SpectrumValueTestCase (tv9b, v9, "tv9b = doubleValue * v1"));
- AddTestCase (new SpectrumValueTestCase (tv10b, v10, "tv10b = doubleValue div v1"));
+ AddTestCase (new SpectrumValueTestCase (tv7b, v7, "tv7b = doubleValue + v1"), TestCase::QUICK);
+ AddTestCase (new SpectrumValueTestCase (tv8b, v8, "tv8b = doubleValue - v1"), TestCase::QUICK);
+ AddTestCase (new SpectrumValueTestCase (tv9b, v9, "tv9b = doubleValue * v1"), TestCase::QUICK);
+ AddTestCase (new SpectrumValueTestCase (tv10b, v10, "tv10b = doubleValue div v1"), TestCase::QUICK);
@@ -234,13 +234,13 @@
v1ls3[0] = v1[3];
v1ls3[1] = v1[4];
tv1ls3 = v1 << 3;
- AddTestCase (new SpectrumValueTestCase (tv1ls3, v1ls3, "tv1ls3 = v1 << 3"));
+ AddTestCase (new SpectrumValueTestCase (tv1ls3, v1ls3, "tv1ls3 = v1 << 3"), TestCase::QUICK);
v1rs3[3] = v1[0];
v1rs3[4] = v1[1];
tv1rs3 = v1 >> 3;
- AddTestCase (new SpectrumValueTestCase (tv1rs3, v1rs3, "tv1rs3 = v1 >> 3"));
+ AddTestCase (new SpectrumValueTestCase (tv1rs3, v1rs3, "tv1rs3 = v1 >> 3"), TestCase::QUICK);
}
@@ -296,7 +296,7 @@
// NS_LOG_LOGIC(t12);
// NS_LOG_LOGIC(*res);
- AddTestCase (new SpectrumValueTestCase (t12, *res, ""));
+ AddTestCase (new SpectrumValueTestCase (t12, *res, ""), TestCase::QUICK);
// TEST_ASSERT(MoreOrLessEqual(t12, *res));
Ptr<SpectrumValue> v2a = Create<SpectrumValue> (sof2);
@@ -308,7 +308,7 @@
// NS_LOG_LOGIC(*v2a);
// NS_LOG_LOGIC(t21a);
// NS_LOG_LOGIC(*res);
- AddTestCase (new SpectrumValueTestCase (t21a, *res, ""));
+ AddTestCase (new SpectrumValueTestCase (t21a, *res, ""), TestCase::QUICK);
// TEST_ASSERT(MoreOrLessEqual(t21a, *res));
Ptr<SpectrumValue> v2b = Create<SpectrumValue> (sof2);
@@ -327,7 +327,7 @@
// NS_LOG_LOGIC(*v2b);
// NS_LOG_LOGIC(t21b);
// NS_LOG_LOGIC(*res);
- AddTestCase (new SpectrumValueTestCase (t21b, *res, ""));
+ AddTestCase (new SpectrumValueTestCase (t21b, *res, ""), TestCase::QUICK);
}
--- a/src/stats/test/basic-data-calculators-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/stats/test/basic-data-calculators-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -270,9 +270,9 @@
BasicDataCalculatorsTestSuite::BasicDataCalculatorsTestSuite ()
: TestSuite ("basic-data-calculators", UNIT)
{
- AddTestCase (new OneIntegerTestCase);
- AddTestCase (new FiveIntegersTestCase);
- AddTestCase (new FiveDoublesTestCase);
+ AddTestCase (new OneIntegerTestCase, TestCase::QUICK);
+ AddTestCase (new FiveIntegersTestCase, TestCase::QUICK);
+ AddTestCase (new FiveDoublesTestCase, TestCase::QUICK);
}
static BasicDataCalculatorsTestSuite basicDataCalculatorsTestSuite;
--- a/src/test/csma-system-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/test/csma-system-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -1079,14 +1079,14 @@
CsmaSystemTestSuite::CsmaSystemTestSuite ()
: TestSuite ("csma-system", UNIT)
{
- AddTestCase (new CsmaBridgeTestCase);
- AddTestCase (new CsmaBroadcastTestCase);
- AddTestCase (new CsmaMulticastTestCase);
- AddTestCase (new CsmaOneSubnetTestCase);
- AddTestCase (new CsmaPacketSocketTestCase);
- AddTestCase (new CsmaPingTestCase);
- AddTestCase (new CsmaRawIpSocketTestCase);
- AddTestCase (new CsmaStarTestCase);
+ AddTestCase (new CsmaBridgeTestCase, TestCase::QUICK);
+ AddTestCase (new CsmaBroadcastTestCase, TestCase::QUICK);
+ AddTestCase (new CsmaMulticastTestCase, TestCase::QUICK);
+ AddTestCase (new CsmaOneSubnetTestCase, TestCase::QUICK);
+ AddTestCase (new CsmaPacketSocketTestCase, TestCase::QUICK);
+ AddTestCase (new CsmaPingTestCase, TestCase::QUICK);
+ AddTestCase (new CsmaRawIpSocketTestCase, TestCase::QUICK);
+ AddTestCase (new CsmaStarTestCase, TestCase::QUICK);
}
// Do not forget to allocate an instance of this TestSuite
--- a/src/test/global-routing-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/test/global-routing-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -395,8 +395,8 @@
GlobalRoutingTestSuite::GlobalRoutingTestSuite ()
: TestSuite ("global-routing", UNIT)
{
- AddTestCase (new DynamicGlobalRoutingTestCase);
- AddTestCase (new GlobalRoutingSlash32TestCase);
+ AddTestCase (new DynamicGlobalRoutingTestCase, TestCase::QUICK);
+ AddTestCase (new GlobalRoutingSlash32TestCase, TestCase::QUICK);
}
// Do not forget to allocate an instance of this TestSuite
--- a/src/test/mobility-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/test/mobility-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -363,10 +363,10 @@
MobilityTestSuite::MobilityTestSuite ()
: TestSuite ("mobility", UNIT)
{
- AddTestCase (new WaypointLazyNotifyFalse);
- AddTestCase (new WaypointLazyNotifyTrue);
- AddTestCase (new WaypointInitialPositionIsWaypoint);
- AddTestCase (new WaypointMobilityModelViaHelper);
+ AddTestCase (new WaypointLazyNotifyFalse, TestCase::QUICK);
+ AddTestCase (new WaypointLazyNotifyTrue, TestCase::QUICK);
+ AddTestCase (new WaypointInitialPositionIsWaypoint, TestCase::QUICK);
+ AddTestCase (new WaypointMobilityModelViaHelper, TestCase::QUICK);
}
static MobilityTestSuite mobilityTestSuite;
--- a/src/test/ns3tcp/ns3tcp-cwnd-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/test/ns3tcp/ns3tcp-cwnd-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -588,8 +588,8 @@
Ns3TcpCwndTestSuite::Ns3TcpCwndTestSuite ()
: TestSuite ("ns3-tcp-cwnd", SYSTEM)
{
- AddTestCase (new Ns3TcpCwndTestCase1);
- AddTestCase (new Ns3TcpCwndTestCase2);
+ AddTestCase (new Ns3TcpCwndTestCase1, TestCase::QUICK);
+ AddTestCase (new Ns3TcpCwndTestCase2, TestCase::QUICK);
}
Ns3TcpCwndTestSuite ns3TcpCwndTestSuite;
--- a/src/test/ns3tcp/ns3tcp-interop-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/test/ns3tcp/ns3tcp-interop-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -311,7 +311,7 @@
Ns3TcpInteroperabilityTestSuite::Ns3TcpInteroperabilityTestSuite ()
: TestSuite ("ns3-tcp-interoperability", SYSTEM)
{
- AddTestCase (new Ns3TcpInteroperabilityTestCase);
+ AddTestCase (new Ns3TcpInteroperabilityTestCase, TestCase::QUICK);
}
static Ns3TcpInteroperabilityTestSuite ns3TcpInteroperabilityTestSuite;
--- a/src/test/ns3tcp/ns3tcp-loss-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/test/ns3tcp/ns3tcp-loss-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -447,23 +447,23 @@
SetDataDir (NS_TEST_SOURCEDIR);
Packet::EnablePrinting (); // Enable packet metadata for all test cases
- AddTestCase (new Ns3TcpLossTestCase ("Tahoe", 0));
- AddTestCase (new Ns3TcpLossTestCase ("Tahoe", 1));
- AddTestCase (new Ns3TcpLossTestCase ("Tahoe", 2));
- AddTestCase (new Ns3TcpLossTestCase ("Tahoe", 3));
- AddTestCase (new Ns3TcpLossTestCase ("Tahoe", 4));
+ AddTestCase (new Ns3TcpLossTestCase ("Tahoe", 0), TestCase::QUICK);
+ AddTestCase (new Ns3TcpLossTestCase ("Tahoe", 1), TestCase::QUICK);
+ AddTestCase (new Ns3TcpLossTestCase ("Tahoe", 2), TestCase::QUICK);
+ AddTestCase (new Ns3TcpLossTestCase ("Tahoe", 3), TestCase::QUICK);
+ AddTestCase (new Ns3TcpLossTestCase ("Tahoe", 4), TestCase::QUICK);
- AddTestCase (new Ns3TcpLossTestCase ("Reno", 0));
- AddTestCase (new Ns3TcpLossTestCase ("Reno", 1));
- AddTestCase (new Ns3TcpLossTestCase ("Reno", 2));
- AddTestCase (new Ns3TcpLossTestCase ("Reno", 3));
- AddTestCase (new Ns3TcpLossTestCase ("Reno", 4));
+ AddTestCase (new Ns3TcpLossTestCase ("Reno", 0), TestCase::QUICK);
+ AddTestCase (new Ns3TcpLossTestCase ("Reno", 1), TestCase::QUICK);
+ AddTestCase (new Ns3TcpLossTestCase ("Reno", 2), TestCase::QUICK);
+ AddTestCase (new Ns3TcpLossTestCase ("Reno", 3), TestCase::QUICK);
+ AddTestCase (new Ns3TcpLossTestCase ("Reno", 4), TestCase::QUICK);
- AddTestCase (new Ns3TcpLossTestCase ("NewReno", 0));
- AddTestCase (new Ns3TcpLossTestCase ("NewReno", 1));
- AddTestCase (new Ns3TcpLossTestCase ("NewReno", 2));
- AddTestCase (new Ns3TcpLossTestCase ("NewReno", 3));
- AddTestCase (new Ns3TcpLossTestCase ("NewReno", 4));
+ AddTestCase (new Ns3TcpLossTestCase ("NewReno", 0), TestCase::QUICK);
+ AddTestCase (new Ns3TcpLossTestCase ("NewReno", 1), TestCase::QUICK);
+ AddTestCase (new Ns3TcpLossTestCase ("NewReno", 2), TestCase::QUICK);
+ AddTestCase (new Ns3TcpLossTestCase ("NewReno", 3), TestCase::QUICK);
+ AddTestCase (new Ns3TcpLossTestCase ("NewReno", 4), TestCase::QUICK);
}
--- a/src/test/ns3tcp/ns3tcp-no-delay-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/test/ns3tcp/ns3tcp-no-delay-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -199,8 +199,8 @@
Ns3TcpNoDelayTestSuite::Ns3TcpNoDelayTestSuite ()
: TestSuite ("ns3-tcp-no-delay", SYSTEM)
{
- AddTestCase (new Ns3TcpNoDelayTestCase (true));
- AddTestCase (new Ns3TcpNoDelayTestCase (false));
+ AddTestCase (new Ns3TcpNoDelayTestCase (true), TestCase::QUICK);
+ AddTestCase (new Ns3TcpNoDelayTestCase (false), TestCase::QUICK);
}
static Ns3TcpNoDelayTestSuite ns3TcpNoDelayTestSuite;
--- a/src/test/ns3tcp/ns3tcp-socket-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/test/ns3tcp/ns3tcp-socket-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -271,8 +271,8 @@
Ns3TcpSocketTestSuite::Ns3TcpSocketTestSuite ()
: TestSuite ("ns3-tcp-socket", SYSTEM)
{
- AddTestCase (new Ns3TcpSocketTestCase1);
- AddTestCase (new Ns3TcpSocketTestCase2);
+ AddTestCase (new Ns3TcpSocketTestCase1, TestCase::QUICK);
+ AddTestCase (new Ns3TcpSocketTestCase2, TestCase::QUICK);
}
static Ns3TcpSocketTestSuite ns3TcpSocketTestSuite;
--- a/src/test/ns3tcp/ns3tcp-state-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/test/ns3tcp/ns3tcp-state-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -449,15 +449,15 @@
: TestSuite ("ns3-tcp-state", SYSTEM)
{
Packet::EnablePrinting (); // Enable packet metadata for all test cases
- AddTestCase (new Ns3TcpStateTestCase (0));
- AddTestCase (new Ns3TcpStateTestCase (1));
- AddTestCase (new Ns3TcpStateTestCase (2));
- AddTestCase (new Ns3TcpStateTestCase (3));
- AddTestCase (new Ns3TcpStateTestCase (4));
- AddTestCase (new Ns3TcpStateTestCase (5));
- AddTestCase (new Ns3TcpStateTestCase (6));
- AddTestCase (new Ns3TcpStateTestCase (7));
- AddTestCase (new Ns3TcpStateTestCase (8));
+ AddTestCase (new Ns3TcpStateTestCase (0), TestCase::QUICK);
+ AddTestCase (new Ns3TcpStateTestCase (1), TestCase::QUICK);
+ AddTestCase (new Ns3TcpStateTestCase (2), TestCase::QUICK);
+ AddTestCase (new Ns3TcpStateTestCase (3), TestCase::QUICK);
+ AddTestCase (new Ns3TcpStateTestCase (4), TestCase::QUICK);
+ AddTestCase (new Ns3TcpStateTestCase (5), TestCase::QUICK);
+ AddTestCase (new Ns3TcpStateTestCase (6), TestCase::QUICK);
+ AddTestCase (new Ns3TcpStateTestCase (7), TestCase::QUICK);
+ AddTestCase (new Ns3TcpStateTestCase (8), TestCase::QUICK);
}
static Ns3TcpStateTestSuite ns3TcpLossTestSuite;
--- a/src/test/ns3tcp/nsctcp-loss-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/test/ns3tcp/nsctcp-loss-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -271,8 +271,8 @@
NscTcpLossTestSuite::NscTcpLossTestSuite ()
: TestSuite ("nsc-tcp-loss", SYSTEM)
{
- AddTestCase (new NscTcpLossTestCase1);
- AddTestCase (new NscTcpLossTestCase2);
+ AddTestCase (new NscTcpLossTestCase1, TestCase::QUICK);
+ AddTestCase (new NscTcpLossTestCase2, TestCase::QUICK);
}
static NscTcpLossTestSuite nscTcpLossTestSuite;
--- a/src/test/ns3wifi/wifi-interference-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/test/ns3wifi/wifi-interference-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -282,7 +282,7 @@
WifiInterferenceTestSuite::WifiInterferenceTestSuite ()
: TestSuite ("ns3-wifi-interference", UNIT)
{
- AddTestCase (new WifiInterferenceTestCase);
+ AddTestCase (new WifiInterferenceTestCase, TestCase::QUICK);
}
static WifiInterferenceTestSuite wifiInterferenceTestSuite;
--- a/src/test/ns3wifi/wifi-msdu-aggregator-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/test/ns3wifi/wifi-msdu-aggregator-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -201,7 +201,7 @@
WifiMsduAggregatorTestSuite::WifiMsduAggregatorTestSuite ()
: TestSuite ("ns3-wifi-msdu-aggregator", SYSTEM)
{
- AddTestCase (new WifiMsduAggregatorThroughputTest);
+ AddTestCase (new WifiMsduAggregatorThroughputTest, TestCase::QUICK);
}
static WifiMsduAggregatorTestSuite wifiMsduAggregatorTestSuite;
--- a/src/test/static-routing-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/test/static-routing-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -163,7 +163,7 @@
StaticRoutingTestSuite::StaticRoutingTestSuite ()
: TestSuite ("static-routing", UNIT)
{
- AddTestCase (new StaticRoutingSlash32TestCase);
+ AddTestCase (new StaticRoutingSlash32TestCase, TestCase::QUICK);
}
// Do not forget to allocate an instance of this TestSuite
--- a/src/tools/test/average-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/tools/test/average-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -264,9 +264,9 @@
AverageTestSuite::AverageTestSuite ()
: TestSuite ("average", UNIT)
{
- AddTestCase (new OneIntegerAverageTestCase);
- AddTestCase (new FiveIntegersAverageTestCase);
- AddTestCase (new FiveDoublesAverageTestCase);
+ AddTestCase (new OneIntegerAverageTestCase, TestCase::QUICK);
+ AddTestCase (new FiveIntegersAverageTestCase, TestCase::QUICK);
+ AddTestCase (new FiveDoublesAverageTestCase, TestCase::QUICK);
}
static AverageTestSuite averageTestSuite;
--- a/src/tools/test/event-garbage-collector-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/tools/test/event-garbage-collector-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -81,7 +81,7 @@
EventGarbageCollectorTestSuite ()
: TestSuite ("event-garbage-collector", UNIT)
{
- AddTestCase (new EventGarbageCollectorTestCase ());
+ AddTestCase (new EventGarbageCollectorTestCase (), TestCase::QUICK);
}
} g_eventGarbageCollectorTests;
--- a/src/topology-read/test/rocketfuel-topology-reader-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/topology-read/test/rocketfuel-topology-reader-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -82,7 +82,7 @@
RocketfuelTopologyReaderTestSuite::RocketfuelTopologyReaderTestSuite ()
: TestSuite ("rocketfuel-topology-reader", UNIT)
{
- AddTestCase (new RocketfuelTopologyReaderTest ());
+ AddTestCase (new RocketfuelTopologyReaderTest (), TestCase::QUICK);
}
static RocketfuelTopologyReaderTestSuite rocketfuelTopologyReaderTestSuite;
--- a/src/uan/test/uan-energy-model-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/uan/test/uan-energy-model-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -303,8 +303,8 @@
UanEnergyModelTestSuite::UanEnergyModelTestSuite ()
: TestSuite ("uan-energy-model", UNIT)
{
- AddTestCase (new AcousticModemEnergyTestCase);
- AddTestCase (new AcousticModemEnergyDepletionTestCase);
+ AddTestCase (new AcousticModemEnergyTestCase, TestCase::QUICK);
+ AddTestCase (new AcousticModemEnergyDepletionTestCase, TestCase::QUICK);
}
// create an instance of the test suite
--- a/src/uan/test/uan-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/uan/test/uan-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -250,7 +250,7 @@
UanTestSuite::UanTestSuite ()
: TestSuite ("devices-uan", UNIT)
{
- AddTestCase (new UanTest);
+ AddTestCase (new UanTest, TestCase::QUICK);
}
static UanTestSuite g_uanTestSuite;
--- a/src/wifi/test/block-ack-test-suite.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/wifi/test/block-ack-test-suite.cc Fri Mar 22 13:14:38 2013 +0100
@@ -284,9 +284,9 @@
BlockAckTestSuite::BlockAckTestSuite ()
: TestSuite ("wifi-block-ack", UNIT)
{
- AddTestCase (new PacketBufferingCaseA);
- AddTestCase (new PacketBufferingCaseB);
- AddTestCase (new CtrlBAckResponseHeaderTest);
+ AddTestCase (new PacketBufferingCaseA, TestCase::QUICK);
+ AddTestCase (new PacketBufferingCaseB, TestCase::QUICK);
+ AddTestCase (new CtrlBAckResponseHeaderTest, TestCase::QUICK);
}
static BlockAckTestSuite g_blockAckTestSuite;
--- a/src/wifi/test/dcf-manager-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/wifi/test/dcf-manager-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -682,7 +682,7 @@
DcfTestSuite::DcfTestSuite ()
: TestSuite ("devices-wifi-dcf", UNIT)
{
- AddTestCase (new DcfManagerTest);
+ AddTestCase (new DcfManagerTest, TestCase::QUICK);
}
static DcfTestSuite g_dcfTestSuite;
--- a/src/wifi/test/tx-duration-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/wifi/test/tx-duration-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -188,7 +188,7 @@
TxDurationTestSuite::TxDurationTestSuite ()
: TestSuite ("devices-wifi-tx-duration", UNIT)
{
- AddTestCase (new TxDurationTest);
+ AddTestCase (new TxDurationTest, TestCase::QUICK);
}
static TxDurationTestSuite g_txDurationTestSuite;
--- a/src/wifi/test/wifi-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/wifi/test/wifi-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -438,10 +438,10 @@
WifiTestSuite::WifiTestSuite ()
: TestSuite ("devices-wifi", UNIT)
{
- AddTestCase (new WifiTest);
- AddTestCase (new QosUtilsIsOldPacketTest);
- AddTestCase (new InterferenceHelperSequenceTest); // Bug 991
- AddTestCase (new Bug555TestCase); // Bug 555
+ AddTestCase (new WifiTest, TestCase::QUICK);
+ AddTestCase (new QosUtilsIsOldPacketTest, TestCase::QUICK);
+ AddTestCase (new InterferenceHelperSequenceTest, TestCase::QUICK); // Bug 991
+ AddTestCase (new Bug555TestCase, TestCase::QUICK); // Bug 555
}
static WifiTestSuite g_wifiTestSuite;
--- a/src/wimax/test/mac-messages-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/wimax/test/mac-messages-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -112,7 +112,7 @@
Ns3WimaxMacMessagesTestSuite::Ns3WimaxMacMessagesTestSuite ()
: TestSuite ("wimax-mac-messages", UNIT)
{
- AddTestCase (new DsaRequestTestCase);
+ AddTestCase (new DsaRequestTestCase, TestCase::QUICK);
}
static Ns3WimaxMacMessagesTestSuite ns3WimaxMacMessagesTestSuite;
--- a/src/wimax/test/phy-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/wimax/test/phy-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -180,8 +180,8 @@
Ns3WimaxPhyTestSuite::Ns3WimaxPhyTestSuite ()
: TestSuite ("wimax-phy-layer", UNIT)
{
- AddTestCase (new Ns3WimaxSNRtoBLERTestCase);
- AddTestCase (new Ns3WimaxSimpleOFDMTestCase);
+ AddTestCase (new Ns3WimaxSNRtoBLERTestCase, TestCase::QUICK);
+ AddTestCase (new Ns3WimaxSimpleOFDMTestCase, TestCase::QUICK);
}
--- a/src/wimax/test/qos-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/wimax/test/qos-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -287,8 +287,8 @@
Ns3WimaxQoSTestSuite::Ns3WimaxQoSTestSuite ()
: TestSuite ("wimax-qos", SYSTEM)
{
- AddTestCase (new Ns3WimaxSFTypeTestCase);
- AddTestCase (new Ns3WimaxSchedulingTestCase);
+ AddTestCase (new Ns3WimaxSFTypeTestCase, TestCase::QUICK);
+ AddTestCase (new Ns3WimaxSchedulingTestCase, TestCase::QUICK);
}
static Ns3WimaxQoSTestSuite ns3WimaxQoSTestSuite;
--- a/src/wimax/test/ss-mac-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/wimax/test/ss-mac-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -165,8 +165,8 @@
Ns3WimaxSSMacTestSuite::Ns3WimaxSSMacTestSuite ()
: TestSuite ("wimax-ss-mac-layer", UNIT)
{
- AddTestCase (new Ns3WimaxNetworkEntryTestCase);
- AddTestCase (new Ns3WimaxManagementConnectionsTestCase);
+ AddTestCase (new Ns3WimaxNetworkEntryTestCase, TestCase::QUICK);
+ AddTestCase (new Ns3WimaxManagementConnectionsTestCase, TestCase::QUICK);
}
static Ns3WimaxSSMacTestSuite ns3WimaxSSMacTestSuite;
--- a/src/wimax/test/wimax-fragmentation-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/wimax/test/wimax-fragmentation-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -161,7 +161,7 @@
Ns3WimaxFragmentationTestSuite::Ns3WimaxFragmentationTestSuite ()
: TestSuite ("wimax-fragmentation", UNIT)
{
- AddTestCase (new Ns3WimaxFragmentationTestCase);
+ AddTestCase (new Ns3WimaxFragmentationTestCase, TestCase::QUICK);
}
static Ns3WimaxFragmentationTestSuite ns3WimaxFragmentationTestSuite;
--- a/src/wimax/test/wimax-service-flow-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/wimax/test/wimax-service-flow-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -165,7 +165,7 @@
Ns3WimaxServiceFlowTestSuite::Ns3WimaxServiceFlowTestSuite ()
: TestSuite ("wimax-service-flow", UNIT)
{
- AddTestCase (new Ns3WimaxSfCreationTestCase);
+ AddTestCase (new Ns3WimaxSfCreationTestCase, TestCase::QUICK);
}
static Ns3WimaxServiceFlowTestSuite ns3WimaxServiceFlowTestSuite;
--- a/src/wimax/test/wimax-tlv-test.cc Tue Mar 19 13:14:12 2013 -0700
+++ b/src/wimax/test/wimax-tlv-test.cc Fri Mar 22 13:14:38 2013 +0100
@@ -208,8 +208,8 @@
Ns3WimaxTlvTestSuite::Ns3WimaxTlvTestSuite ()
: TestSuite ("wimax-tlv", UNIT)
{
- AddTestCase (new Ns3WimaxCsParamTlvTestCase);
- AddTestCase (new Ns3WimaxSfTlvTestCase);
+ AddTestCase (new Ns3WimaxCsParamTlvTestCase, TestCase::QUICK);
+ AddTestCase (new Ns3WimaxSfTlvTestCase, TestCase::QUICK);
}
static Ns3WimaxTlvTestSuite ns3WimaxTlvTestSuite;