diff --git a/src/lte/test/lte-test-ue-measurements-piecewise-1.cc b/src/lte/test/lte-test-ue-measurements-piecewise-1.cc index c852080d0..2efb5505c 100644 --- a/src/lte/test/lte-test-ue-measurements-piecewise-1.cc +++ b/src/lte/test/lte-test-ue-measurements-piecewise-1.cc @@ -129,8 +129,21 @@ LteUeMeasurementsPiecewiseTestSuite1::LteUeMeasurementsPiecewiseTestSuite1 () config, expectedTime, expectedRsrp), TestCase::EXTENSIVE); + // With hysteresis + config.hysteresis = 8; + expectedTime.clear (); + expectedTime << 200 << 320 << 440 << 560 << 680 << 1000 << 1120 << 1240 << 1360 << 1480 + << 2200; + expectedRsrp.clear (); + expectedRsrp << 67 << 67 << 57 << 57 << 66 << 66 << 66 << 57 << 57 << 51 + << 67; + AddTestCase (new LteUeMeasurementsPiecewiseTestCase1 ("Piecewise test case 1 - Event A1 with hysteresis", + config, expectedTime, expectedRsrp), + TestCase::EXTENSIVE); + // With very high threshold config.threshold1.range = 97; + config.hysteresis = 0; expectedTime.clear (); expectedRsrp.clear (); AddTestCase (new LteUeMeasurementsPiecewiseTestCase1 ("Piecewise test case 1 - Event A1 with very high threshold", @@ -158,8 +171,19 @@ LteUeMeasurementsPiecewiseTestSuite1::LteUeMeasurementsPiecewiseTestSuite1 () config, expectedTime, expectedRsrp), TestCase::EXTENSIVE); + // With hysteresis + config.hysteresis = 8; + expectedTime.clear (); + expectedTime << 800 << 920 << 1600 << 1720 << 1840 << 1960 << 2080; + expectedRsrp.clear (); + expectedRsrp << 47 << 47 << 47 << 47 << 51 << 51 << 57; + AddTestCase (new LteUeMeasurementsPiecewiseTestCase1 ("Piecewise test case 1 - Event A2 with hysteresis", + config, expectedTime, expectedRsrp), + TestCase::EXTENSIVE); + // With very high threshold config.threshold1.range = 97; + config.hysteresis = 0; expectedTime.clear (); expectedTime << 200 << 320 << 440 << 560 << 680 << 800 << 920 << 1040 << 1160 << 1280 << 1400 << 1520 << 1640 << 1760 << 1880 << 2000 << 2120; diff --git a/src/lte/test/lte-test-ue-measurements-piecewise-2.cc b/src/lte/test/lte-test-ue-measurements-piecewise-2.cc index 3840be0ed..211a5629a 100644 --- a/src/lte/test/lte-test-ue-measurements-piecewise-2.cc +++ b/src/lte/test/lte-test-ue-measurements-piecewise-2.cc @@ -125,8 +125,19 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2 () config, expectedTime, expectedRsrp), TestCase::EXTENSIVE); + // With hysteresis + config.hysteresis = 6; + expectedTime.clear (); + expectedTime << 200 << 440 << 680 << 1000 << 1240 << 1480 << 2200; + expectedRsrp.clear (); + expectedRsrp << 73 << 63 << 72 << 72 << 59 << 56 << 72; + AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A1 with hysteresis", + config, expectedTime, expectedRsrp), + TestCase::EXTENSIVE); + // With very high threshold config.threshold1.range = 97; + config.hysteresis = 0; expectedTime.clear (); expectedRsrp.clear (); AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A1 with very high threshold", @@ -154,8 +165,19 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2 () config, expectedTime, expectedRsrp), TestCase::EXTENSIVE); + // With hysteresis + config.hysteresis = 6; + expectedTime.clear (); + expectedTime << 800 << 1600 << 1840 << 2080; + expectedRsrp.clear (); + expectedRsrp << 52 << 52 << 56 << 59; + AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A2 with hysteresis", + config, expectedTime, expectedRsrp), + TestCase::EXTENSIVE); + // With very high threshold config.threshold1.range = 97; + config.hysteresis = 0; expectedTime.clear (); expectedTime << 200 << 440 << 680 << 920 << 1160 << 1400 << 1640 << 1880 << 2120; expectedRsrp.clear (); @@ -188,8 +210,19 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2 () config, expectedTime, expectedRsrp), TestCase::EXTENSIVE); + // With hysteresis + config.hysteresis = 6; + expectedTime.clear (); + expectedTime << 800 << 1600 << 1840 << 2080; + expectedRsrp.clear (); + expectedRsrp << 52 << 52 << 56 << 59; + AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A3 with hysteresis", + config, expectedTime, expectedRsrp), + TestCase::EXTENSIVE); + // With negative offset config.a3Offset = -7; + config.hysteresis = 0; expectedTime.clear (); expectedTime << 400 << 800 << 1200 << 1440 << 1680 << 1920 << 2160; expectedRsrp.clear (); @@ -222,8 +255,19 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2 () config, expectedTime, expectedRsrp), TestCase::EXTENSIVE); + // With hysteresis + config.hysteresis = 6; + expectedTime.clear (); + expectedTime << 400 << 800 << 1600 << 1840 << 2080; + expectedRsrp.clear (); + expectedRsrp << 63 << 52 << 52 << 56 << 59; + AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A4 with hysteresis", + config, expectedTime, expectedRsrp), + TestCase::EXTENSIVE); + // With very high threshold config.threshold1.range = 97; + config.hysteresis = 0; expectedTime.clear (); expectedRsrp.clear (); AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A4 with very high threshold", @@ -275,8 +319,19 @@ LteUeMeasurementsPiecewiseTestSuite2::LteUeMeasurementsPiecewiseTestSuite2 () config, expectedTime, expectedRsrp), TestCase::EXTENSIVE); + // With hysteresis + config.hysteresis = 6; + expectedTime.clear (); + expectedTime << 800 << 1600 << 1840 << 2080; + expectedRsrp.clear (); + expectedRsrp << 52 << 52 << 56 << 59; + AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A5 with hysteresis", + config, expectedTime, expectedRsrp), + TestCase::EXTENSIVE); + // With normal-high threshold config.threshold2.range = 97; + config.hysteresis = 0; expectedTime.clear (); expectedRsrp.clear (); AddTestCase (new LteUeMeasurementsPiecewiseTestCase2 ("Piecewise test case 2 - Event A5 with normal-high threshold",