diff --git a/CHANGES.md b/CHANGES.md index 241ede76c..e62e2f489 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -25,6 +25,7 @@ Changes from ns-3.41 to ns-3-dev * `InetSocketAddress::SetTos()` and `InetSocketAddress::GetTos()` have been removed. Applications have a new Attribute to set the IPv4 ToS field. * (core) Deprecated enum `TestDuration` in `TestCase` class. It has been replaced by enum class `Duration`. +* (core) In `TestSuite` class, deprecated `ALL`, `UNIT`, `SYSTEM`, `EXAMPLE` and `PERFORMANCE`. They have been replaced by `Type::ALL`, `Type::UNIT`, `Type::SYSTEM`, `Type::EXAMPLE` and `Type::PERFORMANCE`, respectively. * (wifi) Deprecated `WIFI_TID_TO_LINK_MAPPING_{NOT_SUPPORTED,SAME_LINK_SET,ANY_LINK_SET}`. They have been replaced by `WifiTidToLinkMappingNegSupport::{NOT_SUPPORTED,SAME_LINK_SET,ANY_LINK_SET}`, respectively. ### Changes to build system diff --git a/doc/manual/source/how-to-write-tests.rst b/doc/manual/source/how-to-write-tests.rst index 5a560cedf..1f3b4aac3 100644 --- a/doc/manual/source/how-to-write-tests.rst +++ b/doc/manual/source/how-to-write-tests.rst @@ -61,7 +61,7 @@ is called "router" such as here: :: RouterTestSuite::RouterTestSuite() - : TestSuite("router", UNIT) + : TestSuite("router", Type::UNIT) Try this command: diff --git a/doc/manual/source/new-modules.rst b/doc/manual/source/new-modules.rst index a700bc7c9..163c7e81a 100644 --- a/doc/manual/source/new-modules.rst +++ b/doc/manual/source/new-modules.rst @@ -162,7 +162,7 @@ which declares a new unit test named ``new-module``, with a single test case consisting of the class ``NewModuleTestCase1``:: NewModuleTestSuite::NewModuleTestSuite() - : TestSuite("new-module", UNIT) + : TestSuite("new-module", Type::UNIT) { AddTestCase(new NewModuleTestCase1); } diff --git a/doc/manual/source/test-framework.rst b/doc/manual/source/test-framework.rst index c89eb3c93..5d435bda3 100644 --- a/doc/manual/source/test-framework.rst +++ b/doc/manual/source/test-framework.rst @@ -761,7 +761,7 @@ as a ''unit'' test with the display name, ``my-test-suite-name``. }; MyTestSuite::MyTestSuite() - : TestSuite("my-test-suite-name", UNIT) + : TestSuite("my-test-suite-name", Type::UNIT) { AddTestCase(new MyTestCase, TestCase::Duration::QUICK); } diff --git a/src/antenna/test/test-angles.cc b/src/antenna/test/test-angles.cc index 53fa89a99..f1af5d5dc 100644 --- a/src/antenna/test/test-angles.cc +++ b/src/antenna/test/test-angles.cc @@ -296,7 +296,7 @@ class AnglesTestSuite : public TestSuite }; AnglesTestSuite::AnglesTestSuite() - : TestSuite("angles", UNIT) + : TestSuite("angles", Type::UNIT) { AddTestCase(new OneVectorConstructorTestCase(Vector(1, 0, 0), Angles(0, M_PI_2)), TestCase::Duration::QUICK); diff --git a/src/antenna/test/test-cosine-antenna.cc b/src/antenna/test/test-cosine-antenna.cc index 5d0b89250..efd0a51dd 100644 --- a/src/antenna/test/test-cosine-antenna.cc +++ b/src/antenna/test/test-cosine-antenna.cc @@ -151,7 +151,7 @@ class CosineAntennaModelTestSuite : public TestSuite }; CosineAntennaModelTestSuite::CosineAntennaModelTestSuite() - : TestSuite("cosine-antenna-model", UNIT) + : TestSuite("cosine-antenna-model", Type::UNIT) { // to calculate the azimut angle offset for a given gain in db: // phideg = (2*acos(10^(targetgaindb/(20*n))))*180/pi diff --git a/src/antenna/test/test-degrees-radians.cc b/src/antenna/test/test-degrees-radians.cc index 649be1a81..035199bbc 100644 --- a/src/antenna/test/test-degrees-radians.cc +++ b/src/antenna/test/test-degrees-radians.cc @@ -138,7 +138,7 @@ class DegreesRadiansTestSuite : public TestSuite }; DegreesRadiansTestSuite::DegreesRadiansTestSuite() - : TestSuite("degrees-radians", UNIT) + : TestSuite("degrees-radians", Type::UNIT) { AddTestCase(new DegreesToRadiansTestCase(0, 0), TestCase::Duration::QUICK); AddTestCase(new DegreesToRadiansTestCase(90, M_PI_2), TestCase::Duration::QUICK); diff --git a/src/antenna/test/test-isotropic-antenna.cc b/src/antenna/test/test-isotropic-antenna.cc index 96ffe443d..7d756930c 100644 --- a/src/antenna/test/test-isotropic-antenna.cc +++ b/src/antenna/test/test-isotropic-antenna.cc @@ -94,7 +94,7 @@ class IsotropicAntennaModelTestSuite : public TestSuite }; IsotropicAntennaModelTestSuite::IsotropicAntennaModelTestSuite() - : TestSuite("isotropic-antenna-model", UNIT) + : TestSuite("isotropic-antenna-model", Type::UNIT) { AddTestCase(new IsotropicAntennaModelTestCase(Angles(0, 0), 0.0), TestCase::Duration::QUICK); AddTestCase(new IsotropicAntennaModelTestCase(Angles(0, M_PI), 0.0), TestCase::Duration::QUICK); diff --git a/src/antenna/test/test-parabolic-antenna.cc b/src/antenna/test/test-parabolic-antenna.cc index f6f401153..795dd9baf 100644 --- a/src/antenna/test/test-parabolic-antenna.cc +++ b/src/antenna/test/test-parabolic-antenna.cc @@ -152,7 +152,7 @@ class ParabolicAntennaModelTestSuite : public TestSuite }; ParabolicAntennaModelTestSuite::ParabolicAntennaModelTestSuite() - : TestSuite("parabolic-antenna-model", UNIT) + : TestSuite("parabolic-antenna-model", Type::UNIT) { // with a 60 deg beamwidth, gain is -20dB at +-77.460 degrees from boresight // phi, theta, diff --git a/src/antenna/test/test-uniform-planar-array.cc b/src/antenna/test/test-uniform-planar-array.cc index 9356b4ec1..5c95c6c1e 100644 --- a/src/antenna/test/test-uniform-planar-array.cc +++ b/src/antenna/test/test-uniform-planar-array.cc @@ -215,7 +215,7 @@ class UniformPlanarArrayTestSuite : public TestSuite }; UniformPlanarArrayTestSuite::UniformPlanarArrayTestSuite() - : TestSuite("uniform-planar-array-test", UNIT) + : TestSuite("uniform-planar-array-test", Type::UNIT) { Ptr isotropic = CreateObject(); Ptr tgpp = CreateObject(); diff --git a/src/aodv/test/aodv-id-cache-test-suite.cc b/src/aodv/test/aodv-id-cache-test-suite.cc index 2b7ee0f3b..b3325d6c7 100644 --- a/src/aodv/test/aodv-id-cache-test-suite.cc +++ b/src/aodv/test/aodv-id-cache-test-suite.cc @@ -118,7 +118,7 @@ class IdCacheTestSuite : public TestSuite { public: IdCacheTestSuite() - : TestSuite("aodv-routing-id-cache", UNIT) + : TestSuite("aodv-routing-id-cache", Type::UNIT) { AddTestCase(new IdCacheTest, TestCase::Duration::QUICK); } diff --git a/src/aodv/test/aodv-regression.cc b/src/aodv/test/aodv-regression.cc index 713441d1f..d79384a80 100644 --- a/src/aodv/test/aodv-regression.cc +++ b/src/aodv/test/aodv-regression.cc @@ -52,7 +52,7 @@ class AodvRegressionTestSuite : public TestSuite { public: AodvRegressionTestSuite() - : TestSuite("routing-aodv-regression", SYSTEM) + : TestSuite("routing-aodv-regression", Type::SYSTEM) { SetDataDir(NS_TEST_SOURCEDIR); // General RREQ-RREP-RRER test case diff --git a/src/aodv/test/aodv-test-suite.cc b/src/aodv/test/aodv-test-suite.cc index eb5d411fb..deb6fffb3 100644 --- a/src/aodv/test/aodv-test-suite.cc +++ b/src/aodv/test/aodv-test-suite.cc @@ -739,7 +739,7 @@ class AodvTestSuite : public TestSuite { public: AodvTestSuite() - : TestSuite("routing-aodv", UNIT) + : TestSuite("routing-aodv", Type::UNIT) { AddTestCase(new NeighborTest, TestCase::Duration::QUICK); AddTestCase(new TypeHeaderTest, TestCase::Duration::QUICK); diff --git a/src/aodv/test/loopback.cc b/src/aodv/test/loopback.cc index 837795524..3550c1fab 100644 --- a/src/aodv/test/loopback.cc +++ b/src/aodv/test/loopback.cc @@ -197,7 +197,7 @@ class AodvLoopbackTestSuite : public TestSuite { public: AodvLoopbackTestSuite() - : TestSuite("routing-aodv-loopback", SYSTEM) + : TestSuite("routing-aodv-loopback", Type::SYSTEM) { SetDataDir(NS_TEST_SOURCEDIR); // UDP Echo loopback test case diff --git a/src/applications/test/bulk-send-application-test-suite.cc b/src/applications/test/bulk-send-application-test-suite.cc index 5d9990448..4f71d5ee6 100644 --- a/src/applications/test/bulk-send-application-test-suite.cc +++ b/src/applications/test/bulk-send-application-test-suite.cc @@ -274,7 +274,7 @@ class BulkSendTestSuite : public TestSuite }; BulkSendTestSuite::BulkSendTestSuite() - : TestSuite("bulk-send-application", UNIT) + : TestSuite("bulk-send-application", Type::UNIT) { AddTestCase(new BulkSendBasicTestCase, TestCase::Duration::QUICK); AddTestCase(new BulkSendSeqTsSizeTestCase, TestCase::Duration::QUICK); diff --git a/src/applications/test/three-gpp-http-client-server-test.cc b/src/applications/test/three-gpp-http-client-server-test.cc index ff9801a44..90a1a5b97 100644 --- a/src/applications/test/three-gpp-http-client-server-test.cc +++ b/src/applications/test/three-gpp-http-client-server-test.cc @@ -799,7 +799,7 @@ class ThreeGppHttpClientServerTestSuite : public TestSuite public: /// Instantiate the test suite. ThreeGppHttpClientServerTestSuite() - : TestSuite("three-gpp-http-client-server-test", SYSTEM) + : TestSuite("three-gpp-http-client-server-test", Type::SYSTEM) { // LogComponentEnable ("ThreeGppHttpClientServerTest", LOG_INFO); // LogComponentEnable ("ThreeGppHttpClient", LOG_INFO); diff --git a/src/applications/test/udp-client-server-test.cc b/src/applications/test/udp-client-server-test.cc index aaf30ef37..33ffae14f 100644 --- a/src/applications/test/udp-client-server-test.cc +++ b/src/applications/test/udp-client-server-test.cc @@ -359,7 +359,7 @@ class UdpClientServerTestSuite : public TestSuite }; UdpClientServerTestSuite::UdpClientServerTestSuite() - : TestSuite("udp-client-server", UNIT) + : TestSuite("udp-client-server", Type::UNIT) { AddTestCase(new UdpTraceClientServerTestCase, TestCase::Duration::QUICK); AddTestCase(new UdpClientServerTestCase, TestCase::Duration::QUICK); diff --git a/src/brite/test/brite-test-topology.cc b/src/brite/test/brite-test-topology.cc index 7809f4572..81f6b2f78 100644 --- a/src/brite/test/brite-test-topology.cc +++ b/src/brite/test/brite-test-topology.cc @@ -215,7 +215,7 @@ class BriteTestSuite : public TestSuite { public: BriteTestSuite() - : TestSuite("brite-testing", UNIT) + : TestSuite("brite-testing", Type::UNIT) { AddTestCase(new BriteTopologyStructureTestCase, TestCase::Duration::QUICK); AddTestCase(new BriteTopologyFunctionTestCase, TestCase::Duration::QUICK); diff --git a/src/buildings/test/building-position-allocator-test.cc b/src/buildings/test/building-position-allocator-test.cc index 5c8bfa14d..7fc96c72a 100644 --- a/src/buildings/test/building-position-allocator-test.cc +++ b/src/buildings/test/building-position-allocator-test.cc @@ -235,7 +235,7 @@ class BuildingPositionAllocatorTestSuite : public TestSuite }; BuildingPositionAllocatorTestSuite::BuildingPositionAllocatorTestSuite() - : TestSuite("building-position-allocator", UNIT) + : TestSuite("building-position-allocator", Type::UNIT) { NS_LOG_FUNCTION(this); diff --git a/src/buildings/test/buildings-channel-condition-model-test.cc b/src/buildings/test/buildings-channel-condition-model-test.cc index 35afa203e..ea75acc84 100644 --- a/src/buildings/test/buildings-channel-condition-model-test.cc +++ b/src/buildings/test/buildings-channel-condition-model-test.cc @@ -156,7 +156,7 @@ class BuildingsChannelConditionModelsTestSuite : public TestSuite }; BuildingsChannelConditionModelsTestSuite::BuildingsChannelConditionModelsTestSuite() - : TestSuite("buildings-channel-condition-model", UNIT) + : TestSuite("buildings-channel-condition-model", Type::UNIT) { AddTestCase(new BuildingsChannelConditionModelTestCase, TestCase::Duration::QUICK); } diff --git a/src/buildings/test/buildings-helper-test.cc b/src/buildings/test/buildings-helper-test.cc index 8e80510e3..9dde3fc7d 100644 --- a/src/buildings/test/buildings-helper-test.cc +++ b/src/buildings/test/buildings-helper-test.cc @@ -204,7 +204,7 @@ class BuildingsHelperTestSuite : public TestSuite }; BuildingsHelperTestSuite::BuildingsHelperTestSuite() - : TestSuite("buildings-helper", UNIT) + : TestSuite("buildings-helper", Type::UNIT) { NS_LOG_FUNCTION(this); diff --git a/src/buildings/test/buildings-pathloss-test.cc b/src/buildings/test/buildings-pathloss-test.cc index 84c0e2838..2b2e61719 100644 --- a/src/buildings/test/buildings-pathloss-test.cc +++ b/src/buildings/test/buildings-pathloss-test.cc @@ -41,7 +41,7 @@ NS_LOG_COMPONENT_DEFINE("BuildingsPathlossTest"); * several communication scenarios */ BuildingsPathlossTestSuite::BuildingsPathlossTestSuite() - : TestSuite("buildings-pathloss-test", SYSTEM) + : TestSuite("buildings-pathloss-test", Type::SYSTEM) { LogComponentEnable("BuildingsPathlossTest", LOG_LEVEL_ALL); diff --git a/src/buildings/test/buildings-penetration-loss-pathloss-test.cc b/src/buildings/test/buildings-penetration-loss-pathloss-test.cc index f0619851e..62ed434ec 100644 --- a/src/buildings/test/buildings-penetration-loss-pathloss-test.cc +++ b/src/buildings/test/buildings-penetration-loss-pathloss-test.cc @@ -271,7 +271,7 @@ class BuildingsPenetrationLossesTestSuite : public TestSuite }; BuildingsPenetrationLossesTestSuite::BuildingsPenetrationLossesTestSuite() - : TestSuite("buildings-penetration-losses", UNIT) + : TestSuite("buildings-penetration-losses", Type::UNIT) { AddTestCase(new BuildingsPenetrationLossesTestCase, TestCase::Duration::QUICK); } diff --git a/src/buildings/test/buildings-shadowing-test.cc b/src/buildings/test/buildings-shadowing-test.cc index 03a4f63f1..c553cc509 100644 --- a/src/buildings/test/buildings-shadowing-test.cc +++ b/src/buildings/test/buildings-shadowing-test.cc @@ -45,7 +45,7 @@ NS_LOG_COMPONENT_DEFINE("BuildingsShadowingTest"); */ BuildingsShadowingTestSuite::BuildingsShadowingTestSuite() - : TestSuite("buildings-shadowing-test", SYSTEM) + : TestSuite("buildings-shadowing-test", Type::SYSTEM) { LogComponentEnable("BuildingsShadowingTest", LOG_LEVEL_ALL); diff --git a/src/buildings/test/outdoor-random-walk-test.cc b/src/buildings/test/outdoor-random-walk-test.cc index 83e276a81..3329ef016 100644 --- a/src/buildings/test/outdoor-random-walk-test.cc +++ b/src/buildings/test/outdoor-random-walk-test.cc @@ -173,7 +173,7 @@ class OutdoorRandomWalkTestSuite : public TestSuite }; OutdoorRandomWalkTestSuite::OutdoorRandomWalkTestSuite() - : TestSuite("outdoor-random-walk-model", UNIT) + : TestSuite("outdoor-random-walk-model", Type::UNIT) { AddTestCase(new OutdoorRandomWalkTestCase, TestCase::Duration::QUICK); } diff --git a/src/buildings/test/three-gpp-v2v-channel-condition-model-test.cc b/src/buildings/test/three-gpp-v2v-channel-condition-model-test.cc index 55d714598..428e6d035 100644 --- a/src/buildings/test/three-gpp-v2v-channel-condition-model-test.cc +++ b/src/buildings/test/three-gpp-v2v-channel-condition-model-test.cc @@ -537,7 +537,7 @@ class ThreeGppV2vChCondModelsTestSuite : public TestSuite }; ThreeGppV2vChCondModelsTestSuite::ThreeGppV2vChCondModelsTestSuite() - : TestSuite("three-gpp-v2v-channel-condition-model", SYSTEM) + : TestSuite("three-gpp-v2v-channel-condition-model", Type::SYSTEM) { AddTestCase(new ThreeGppV2vBuildingsChCondModelTestCase, TestCase::Duration::QUICK); // test for the deterministic procedure (NLOS vs diff --git a/src/click/test/ipv4-click-routing-test.cc b/src/click/test/ipv4-click-routing-test.cc index 1d1ef6d0c..086ba9dc0 100644 --- a/src/click/test/ipv4-click-routing-test.cc +++ b/src/click/test/ipv4-click-routing-test.cc @@ -250,7 +250,7 @@ class ClickIfidFromNameTestSuite : public TestSuite { public: ClickIfidFromNameTestSuite() - : TestSuite("routing-click", UNIT) + : TestSuite("routing-click", Type::UNIT) { AddTestCase(new ClickTrivialTest, TestCase::Duration::QUICK); AddTestCase(new ClickIfidFromNameTest, TestCase::Duration::QUICK); diff --git a/src/core/model/example-as-test.cc b/src/core/model/example-as-test.cc index e7bb96ba5..a53353a94 100644 --- a/src/core/model/example-as-test.cc +++ b/src/core/model/example-as-test.cc @@ -155,7 +155,7 @@ ExampleAsTestSuite::ExampleAsTestSuite(const std::string name, const std::string args /* = "" */, const Duration duration /* =QUICK */, const bool shouldNotErr /* = true */) - : TestSuite(name, EXAMPLE) + : TestSuite(name, Type::EXAMPLE) { NS_LOG_FUNCTION(this << name << program << dataDir << args << duration << shouldNotErr); AddTestCase(new ExampleAsTestCase(name, program, dataDir, args, shouldNotErr), duration); diff --git a/src/core/model/test.cc b/src/core/model/test.cc index a47a1e684..8b992a86f 100644 --- a/src/core/model/test.cc +++ b/src/core/model/test.cc @@ -796,11 +796,11 @@ TestRunnerImpl::PrintTestNameList(std::list::const_iterator begin, NS_LOG_FUNCTION(this << &begin << &end << printTestType); std::map label; - label[TestSuite::ALL] = "all "; - label[TestSuite::UNIT] = "unit "; - label[TestSuite::SYSTEM] = "system "; - label[TestSuite::EXAMPLE] = "example "; - label[TestSuite::PERFORMANCE] = "performance "; + label[TestSuite::Type::ALL] = "all "; + label[TestSuite::Type::UNIT] = "unit "; + label[TestSuite::Type::SYSTEM] = "system "; + label[TestSuite::Type::EXAMPLE] = "example "; + label[TestSuite::Type::PERFORMANCE] = "performance "; for (auto i = begin; i != end; ++i) { @@ -840,7 +840,7 @@ TestRunnerImpl::FilterTests(std::string testName, for (uint32_t i = 0; i < m_suites.size(); ++i) { TestSuite* test = m_suites[i]; - if (testType != TestSuite::ALL && test->GetTestType() != testType) + if (testType != TestSuite::Type::ALL && test->GetTestType() != testType) { // skip test continue; @@ -1004,27 +1004,27 @@ TestRunnerImpl::Run(int argc, char* argv[]) TestSuite::Type testType; if (testTypeString.empty()) { - testType = TestSuite::ALL; + testType = TestSuite::Type::ALL; } else if (testTypeString == "core") { - testType = TestSuite::ALL; + testType = TestSuite::Type::ALL; } else if (testTypeString == "example") { - testType = TestSuite::EXAMPLE; + testType = TestSuite::Type::EXAMPLE; } else if (testTypeString == "unit") { - testType = TestSuite::UNIT; + testType = TestSuite::Type::UNIT; } else if (testTypeString == "system") { - testType = TestSuite::SYSTEM; + testType = TestSuite::Type::SYSTEM; } else if (testTypeString == "performance") { - testType = TestSuite::PERFORMANCE; + testType = TestSuite::Type::PERFORMANCE; } else { @@ -1144,6 +1144,25 @@ TestRunner::Run(int argc, char* argv[]) return TestRunnerImpl::Get()->Run(argc, argv); } +std::ostream& +operator<<(std::ostream& os, TestSuite::Type type) +{ + switch (type) + { + case TestSuite::Type::ALL: + return os << "ALL"; + case TestSuite::Type::UNIT: + return os << "UNIT"; + case TestSuite::Type::SYSTEM: + return os << "SYSTEM"; + case TestSuite::Type::EXAMPLE: + return os << "EXAMPLE"; + case TestSuite::Type::PERFORMANCE: + return os << "PERFORMANCE"; + }; + return os << "UNKNOWN(" << static_cast(type) << ")"; +} + std::ostream& operator<<(std::ostream& os, TestCase::Duration duration) { diff --git a/src/core/model/test.h b/src/core/model/test.h index 92d204091..50e95a22d 100644 --- a/src/core/model/test.h +++ b/src/core/model/test.h @@ -1271,7 +1271,7 @@ class TestSuite : public TestCase * \enum Type * \brief Type of test. */ - enum Type + enum class Type { ALL = 0, //!< UNIT, //!< This test suite implements a Unit Test @@ -1280,13 +1280,24 @@ class TestSuite : public TestCase PERFORMANCE //!< This test suite implements a Performance Test }; + NS_DEPRECATED_3_42("Use Type::ALL instead") + static constexpr auto ALL = Type::ALL; //!< @deprecated See Type::ALL. + NS_DEPRECATED_3_42("Use Type::UNIT instead") + static constexpr auto UNIT = Type::UNIT; //!< @deprecated See Type::UNIT. + NS_DEPRECATED_3_42("Use Type::SYSTEM instead") + static constexpr auto SYSTEM = Type::SYSTEM; //!< @deprecated See Type::SYSTEM. + NS_DEPRECATED_3_42("Use Type::EXAMPLE instead") + static constexpr auto EXAMPLE = Type::EXAMPLE; //!< @deprecated See Type::EXAMPLE. + NS_DEPRECATED_3_42("Use Type::PERFORMANCE instead") + static constexpr auto PERFORMANCE = Type::PERFORMANCE; //!< @deprecated See Type::PERFORMANCE. + /** * \brief Construct a new test suite. * * \param [in] name The name of the test suite. * \param [in] type The TestType of the test suite (defaults to UNIT test). */ - TestSuite(std::string name, Type type = UNIT); + TestSuite(std::string name, Type type = Type::UNIT); /** * \brief get the kind of test this test suite implements @@ -1416,6 +1427,14 @@ TestVectors::Get(std::size_t i) const return m_vectors[i]; } +/** + * @brief Stream insertion operator. + * @param [in] os The reference to the output stream. + * @param [in] type The TestSuite::Type. + * @return The reference to the output stream. + */ +std::ostream& operator<<(std::ostream& os, TestSuite::Type type); + /** * @brief Stream insertion operator. * @param [in] os The reference to the output stream. diff --git a/src/core/test/attribute-container-test-suite.cc b/src/core/test/attribute-container-test-suite.cc index 3b8ecd038..f5e35efef 100644 --- a/src/core/test/attribute-container-test-suite.cc +++ b/src/core/test/attribute-container-test-suite.cc @@ -547,7 +547,7 @@ class AttributeContainerTestSuite : public TestSuite }; AttributeContainerTestSuite::AttributeContainerTestSuite() - : TestSuite("attribute-container-test-suite", UNIT) + : TestSuite("attribute-container-test-suite", Type::UNIT) { AddTestCase(new AttributeContainerTestCase(), TestCase::Duration::QUICK); AddTestCase(new AttributeContainerSerializationTestCase(), TestCase::Duration::QUICK); diff --git a/src/core/test/attribute-test-suite.cc b/src/core/test/attribute-test-suite.cc index 9cbca0080..acdec4e4a 100644 --- a/src/core/test/attribute-test-suite.cc +++ b/src/core/test/attribute-test-suite.cc @@ -2084,7 +2084,7 @@ class AttributesTestSuite : public TestSuite }; AttributesTestSuite::AttributesTestSuite() - : TestSuite("attributes", UNIT) + : TestSuite("attributes", Type::UNIT) { AddTestCase(new AttributeTestCase("Check Attributes of type BooleanValue"), TestCase::Duration::QUICK); diff --git a/src/core/test/callback-test-suite.cc b/src/core/test/callback-test-suite.cc index 885a79734..7ffda9d43 100644 --- a/src/core/test/callback-test-suite.cc +++ b/src/core/test/callback-test-suite.cc @@ -1190,7 +1190,7 @@ class CallbackTestSuite : public TestSuite }; CallbackTestSuite::CallbackTestSuite() - : TestSuite("callback", UNIT) + : TestSuite("callback", Type::UNIT) { AddTestCase(new BasicCallbackTestCase, TestCase::Duration::QUICK); AddTestCase(new MakeCallbackTestCase, TestCase::Duration::QUICK); diff --git a/src/core/test/examples-as-tests-test-suite.cc b/src/core/test/examples-as-tests-test-suite.cc index 409ead806..e1540b5a9 100644 --- a/src/core/test/examples-as-tests-test-suite.cc +++ b/src/core/test/examples-as-tests-test-suite.cc @@ -102,7 +102,7 @@ class ExamplesAsTestsTestSuite : public TestSuite }; ExamplesAsTestsTestSuite::ExamplesAsTestsTestSuite() - : TestSuite("examples-as-tests-test-suite", UNIT) + : TestSuite("examples-as-tests-test-suite", Type::UNIT) { AddTestCase( new ExampleAsTestCase("core-example-simulator", "sample-simulator", NS_TEST_SOURCEDIR)); diff --git a/src/core/test/int64x64-test-suite.cc b/src/core/test/int64x64-test-suite.cc index 6fa940a3b..aa444531f 100644 --- a/src/core/test/int64x64-test-suite.cc +++ b/src/core/test/int64x64-test-suite.cc @@ -1557,7 +1557,7 @@ class Int64x64TestSuite : public TestSuite { public: Int64x64TestSuite() - : TestSuite("int64x64", UNIT) + : TestSuite("int64x64", Type::UNIT) { AddTestCase(new Int64x64ImplTestCase(), TestCase::Duration::QUICK); AddTestCase(new Int64x64HiLoTestCase(), TestCase::Duration::QUICK); diff --git a/src/core/test/many-uniform-random-variables-one-get-value-call-test-suite.cc b/src/core/test/many-uniform-random-variables-one-get-value-call-test-suite.cc index 3afe7b4e8..09a364d62 100644 --- a/src/core/test/many-uniform-random-variables-one-get-value-call-test-suite.cc +++ b/src/core/test/many-uniform-random-variables-one-get-value-call-test-suite.cc @@ -98,7 +98,7 @@ class ManyUniformRandomVariablesOneGetValueCallTestSuite : public TestSuite ManyUniformRandomVariablesOneGetValueCallTestSuite:: ManyUniformRandomVariablesOneGetValueCallTestSuite() - : TestSuite("many-uniform-random-variables-one-get-value-call", PERFORMANCE) + : TestSuite("many-uniform-random-variables-one-get-value-call", Type::PERFORMANCE) { AddTestCase(new ManyUniformRandomVariablesOneGetValueCallTestCase); } diff --git a/src/core/test/one-uniform-random-variable-many-get-value-calls-test-suite.cc b/src/core/test/one-uniform-random-variable-many-get-value-calls-test-suite.cc index 6d5edb7fc..8c0505687 100644 --- a/src/core/test/one-uniform-random-variable-many-get-value-calls-test-suite.cc +++ b/src/core/test/one-uniform-random-variable-many-get-value-calls-test-suite.cc @@ -98,7 +98,7 @@ class OneUniformRandomVariableManyGetValueCallsTestSuite : public TestSuite OneUniformRandomVariableManyGetValueCallsTestSuite:: OneUniformRandomVariableManyGetValueCallsTestSuite() - : TestSuite("one-uniform-random-variable-many-get-value-calls", PERFORMANCE) + : TestSuite("one-uniform-random-variable-many-get-value-calls", Type::PERFORMANCE) { AddTestCase(new OneUniformRandomVariableManyGetValueCallsTestCase); } diff --git a/src/core/test/pair-value-test-suite.cc b/src/core/test/pair-value-test-suite.cc index b4e901ffc..b62ae3aa7 100644 --- a/src/core/test/pair-value-test-suite.cc +++ b/src/core/test/pair-value-test-suite.cc @@ -211,7 +211,7 @@ class PairValueTestSuite : public TestSuite }; PairValueTestSuite::PairValueTestSuite() - : TestSuite("pair-value-test-suite", UNIT) + : TestSuite("pair-value-test-suite", Type::UNIT) { AddTestCase(new PairValueTestCase(), TestCase::Duration::QUICK); AddTestCase(new PairValueSettingsTestCase(), TestCase::Duration::QUICK); diff --git a/src/core/test/random-variable-stream-test-suite.cc b/src/core/test/random-variable-stream-test-suite.cc index f91e50a6d..fe5b65118 100644 --- a/src/core/test/random-variable-stream-test-suite.cc +++ b/src/core/test/random-variable-stream-test-suite.cc @@ -2885,7 +2885,7 @@ class RandomVariableSuite : public TestSuite }; RandomVariableSuite::RandomVariableSuite() - : TestSuite("random-variable-stream-generators", UNIT) + : TestSuite("random-variable-stream-generators", Type::UNIT) { AddTestCase(new UniformTestCase); AddTestCase(new UniformAntitheticTestCase); diff --git a/src/core/test/rng-test-suite.cc b/src/core/test/rng-test-suite.cc index dbe37a570..4cad7d7de 100644 --- a/src/core/test/rng-test-suite.cc +++ b/src/core/test/rng-test-suite.cc @@ -488,7 +488,7 @@ class RngTestSuite : public TestSuite }; RngTestSuite::RngTestSuite() - : TestSuite("random-number-generators", UNIT) + : TestSuite("random-number-generators", Type::UNIT) { AddTestCase(new RngUniformTestCase, TestCase::Duration::QUICK); AddTestCase(new RngNormalTestCase, TestCase::Duration::QUICK); diff --git a/src/core/test/time-test-suite.cc b/src/core/test/time-test-suite.cc index 46c9c00cb..0e644b96d 100644 --- a/src/core/test/time-test-suite.cc +++ b/src/core/test/time-test-suite.cc @@ -542,7 +542,7 @@ static class TimeTestSuite : public TestSuite { public: TimeTestSuite() - : TestSuite("time", UNIT) + : TestSuite("time", Type::UNIT) { AddTestCase(new TimeWithSignTestCase(), TestCase::Duration::QUICK); AddTestCase(new TimeInputOutputTestCase(), TestCase::Duration::QUICK); diff --git a/src/core/test/timer-test-suite.cc b/src/core/test/timer-test-suite.cc index 8e8ae95b1..3c2df83c1 100644 --- a/src/core/test/timer-test-suite.cc +++ b/src/core/test/timer-test-suite.cc @@ -229,7 +229,7 @@ class TimerTestSuite : public TestSuite { public: TimerTestSuite() - : TestSuite("timer", UNIT) + : TestSuite("timer", Type::UNIT) { AddTestCase(new TimerStateTestCase(), TestCase::Duration::QUICK); AddTestCase(new TimerTemplateTestCase(), TestCase::Duration::QUICK); diff --git a/src/core/test/traced-callback-test-suite.cc b/src/core/test/traced-callback-test-suite.cc index f21939a5d..441225ca2 100644 --- a/src/core/test/traced-callback-test-suite.cc +++ b/src/core/test/traced-callback-test-suite.cc @@ -145,7 +145,7 @@ class TracedCallbackTestSuite : public TestSuite }; TracedCallbackTestSuite::TracedCallbackTestSuite() - : TestSuite("traced-callback", UNIT) + : TestSuite("traced-callback", Type::UNIT) { AddTestCase(new BasicTracedCallbackTestCase, TestCase::Duration::QUICK); } diff --git a/src/core/test/tuple-value-test-suite.cc b/src/core/test/tuple-value-test-suite.cc index e45538d46..932444ccb 100644 --- a/src/core/test/tuple-value-test-suite.cc +++ b/src/core/test/tuple-value-test-suite.cc @@ -321,7 +321,7 @@ class TupleValueTestSuite : public TestSuite }; TupleValueTestSuite::TupleValueTestSuite() - : TestSuite("tuple-value-test-suite", UNIT) + : TestSuite("tuple-value-test-suite", Type::UNIT) { AddTestCase(new TupleValueTestCase(), TestCase::Duration::QUICK); } diff --git a/src/core/test/type-id-test-suite.cc b/src/core/test/type-id-test-suite.cc index 8ce221f5d..265845726 100644 --- a/src/core/test/type-id-test-suite.cc +++ b/src/core/test/type-id-test-suite.cc @@ -443,7 +443,7 @@ class TypeIdTestSuite : public TestSuite }; TypeIdTestSuite::TypeIdTestSuite() - : TestSuite("type-id", UNIT) + : TestSuite("type-id", Type::UNIT) { // Turn on logging, so we see the result of collisions LogComponentEnable("TypeId", ns3::LogLevel(LOG_ERROR | LOG_PREFIX_FUNC)); @@ -472,7 +472,7 @@ class TypeIdPerformanceSuite : public TestSuite }; TypeIdPerformanceSuite::TypeIdPerformanceSuite() - : TestSuite("type-id-perf", PERFORMANCE) + : TestSuite("type-id-perf", Type::PERFORMANCE) { AddTestCase(new LookupTimeTestCase, Duration::QUICK); } diff --git a/src/dsdv/test/dsdv-testcase.cc b/src/dsdv/test/dsdv-testcase.cc index 517f3e8a2..22a8d457a 100644 --- a/src/dsdv/test/dsdv-testcase.cc +++ b/src/dsdv/test/dsdv-testcase.cc @@ -218,7 +218,7 @@ class DsdvTestSuite : public TestSuite { public: DsdvTestSuite() - : TestSuite("routing-dsdv", UNIT) + : TestSuite("routing-dsdv", Type::UNIT) { AddTestCase(new DsdvHeaderTestCase(), TestCase::Duration::QUICK); AddTestCase(new DsdvTableTestCase(), TestCase::Duration::QUICK); diff --git a/src/dsr/test/dsr-test-suite.cc b/src/dsr/test/dsr-test-suite.cc index 623d882d4..f469372eb 100644 --- a/src/dsr/test/dsr-test-suite.cc +++ b/src/dsr/test/dsr-test-suite.cc @@ -630,7 +630,7 @@ class DsrTestSuite : public TestSuite { public: DsrTestSuite() - : TestSuite("routing-dsr", UNIT) + : TestSuite("routing-dsr", Type::UNIT) { AddTestCase(new DsrFsHeaderTest, TestCase::Duration::QUICK); AddTestCase(new DsrRreqHeaderTest, TestCase::Duration::QUICK); diff --git a/src/energy/test/basic-energy-harvester-test.cc b/src/energy/test/basic-energy-harvester-test.cc index ce06a7aad..db92e674f 100644 --- a/src/energy/test/basic-energy-harvester-test.cc +++ b/src/energy/test/basic-energy-harvester-test.cc @@ -133,7 +133,7 @@ class BasicEnergyHarvesterTestSuite : public TestSuite }; BasicEnergyHarvesterTestSuite::BasicEnergyHarvesterTestSuite() - : TestSuite("basic-energy-harvester", UNIT) + : TestSuite("basic-energy-harvester", Type::UNIT) { AddTestCase(new BasicEnergyHarvesterTestCase, TestCase::Duration::QUICK); } diff --git a/src/energy/test/li-ion-energy-source-test.cc b/src/energy/test/li-ion-energy-source-test.cc index 6ace4ba73..9e0123b01 100644 --- a/src/energy/test/li-ion-energy-source-test.cc +++ b/src/energy/test/li-ion-energy-source-test.cc @@ -92,7 +92,7 @@ class LiIonEnergySourceTestSuite : public TestSuite }; LiIonEnergySourceTestSuite::LiIonEnergySourceTestSuite() - : TestSuite("li-ion-energy-source", UNIT) + : TestSuite("li-ion-energy-source", Type::UNIT) { AddTestCase(new LiIonEnergyTestCase, TestCase::Duration::QUICK); } diff --git a/src/internet-apps/test/dhcp-test.cc b/src/internet-apps/test/dhcp-test.cc index 7f84e002d..db001851c 100644 --- a/src/internet-apps/test/dhcp-test.cc +++ b/src/internet-apps/test/dhcp-test.cc @@ -168,7 +168,7 @@ class DhcpTestSuite : public TestSuite }; DhcpTestSuite::DhcpTestSuite() - : TestSuite("dhcp", UNIT) + : TestSuite("dhcp", Type::UNIT) { AddTestCase(new DhcpTestCase, TestCase::Duration::QUICK); } diff --git a/src/internet-apps/test/ipv6-radvd-test.cc b/src/internet-apps/test/ipv6-radvd-test.cc index a6be3e51f..1f0e89642 100644 --- a/src/internet-apps/test/ipv6-radvd-test.cc +++ b/src/internet-apps/test/ipv6-radvd-test.cc @@ -309,7 +309,7 @@ class RadvdTestSuite : public TestSuite }; RadvdTestSuite::RadvdTestSuite() - : TestSuite("radvd", UNIT) + : TestSuite("radvd", Type::UNIT) { AddTestCase(new RadvdTestCase, TestCase::Duration::QUICK); } diff --git a/src/internet-apps/test/ping-test.cc b/src/internet-apps/test/ping-test.cc index 3186b1ed4..fe7114c48 100644 --- a/src/internet-apps/test/ping-test.cc +++ b/src/internet-apps/test/ping-test.cc @@ -567,7 +567,7 @@ class PingTestSuite : public TestSuite }; PingTestSuite::PingTestSuite() - : TestSuite("ping", UNIT) + : TestSuite("ping", Type::UNIT) { // 1. Unlimited pings, no losses, StopApplication () with no packets in flight // Configuration: Ping::Count = 0, Ping::Interval = 1s, Ping start diff --git a/src/internet/test/global-route-manager-impl-test-suite.cc b/src/internet/test/global-route-manager-impl-test-suite.cc index e479acdca..e0d78fb97 100644 --- a/src/internet/test/global-route-manager-impl-test-suite.cc +++ b/src/internet/test/global-route-manager-impl-test-suite.cc @@ -229,7 +229,7 @@ class GlobalRouteManagerImplTestSuite : public TestSuite }; GlobalRouteManagerImplTestSuite::GlobalRouteManagerImplTestSuite() - : TestSuite("global-route-manager-impl", UNIT) + : TestSuite("global-route-manager-impl", Type::UNIT) { AddTestCase(new GlobalRouteManagerImplTestCase(), TestCase::Duration::QUICK); } diff --git a/src/internet/test/icmp-test.cc b/src/internet/test/icmp-test.cc index c293b2f3c..b6bb89ab6 100644 --- a/src/internet/test/icmp-test.cc +++ b/src/internet/test/icmp-test.cc @@ -664,7 +664,7 @@ class IcmpTestSuite : public TestSuite }; IcmpTestSuite::IcmpTestSuite() - : TestSuite("icmp", UNIT) + : TestSuite("icmp", Type::UNIT) { AddTestCase(new IcmpEchoReplyTestCase, TestCase::Duration::QUICK); AddTestCase(new IcmpTimeExceedTestCase, TestCase::Duration::QUICK); diff --git a/src/internet/test/internet-stack-helper-test-suite.cc b/src/internet/test/internet-stack-helper-test-suite.cc index 2387d6594..b3ecde801 100644 --- a/src/internet/test/internet-stack-helper-test-suite.cc +++ b/src/internet/test/internet-stack-helper-test-suite.cc @@ -148,7 +148,7 @@ class InternetStackHelperTestSuite : public TestSuite { public: InternetStackHelperTestSuite() - : TestSuite("internet-stack-helper", UNIT) + : TestSuite("internet-stack-helper", Type::UNIT) { AddTestCase(new InternetStackHelperTestCase(), TestCase::Duration::QUICK); } diff --git a/src/internet/test/ipv4-address-generator-test-suite.cc b/src/internet/test/ipv4-address-generator-test-suite.cc index c8e219b85..c2d5ede55 100644 --- a/src/internet/test/ipv4-address-generator-test-suite.cc +++ b/src/internet/test/ipv4-address-generator-test-suite.cc @@ -363,7 +363,7 @@ class Ipv4AddressGeneratorTestSuite : public TestSuite }; Ipv4AddressGeneratorTestSuite::Ipv4AddressGeneratorTestSuite() - : TestSuite("ipv4-address-generator", UNIT) + : TestSuite("ipv4-address-generator", Type::UNIT) { AddTestCase(new NetworkNumberAllocatorTestCase(), TestCase::Duration::QUICK); AddTestCase(new AddressAllocatorTestCase(), TestCase::Duration::QUICK); diff --git a/src/internet/test/ipv4-address-helper-test-suite.cc b/src/internet/test/ipv4-address-helper-test-suite.cc index 2db967fa2..4e4c26fcc 100644 --- a/src/internet/test/ipv4-address-helper-test-suite.cc +++ b/src/internet/test/ipv4-address-helper-test-suite.cc @@ -289,7 +289,7 @@ class Ipv4AddressHelperTestSuite : public TestSuite }; Ipv4AddressHelperTestSuite::Ipv4AddressHelperTestSuite() - : TestSuite("ipv4-address-helper", UNIT) + : TestSuite("ipv4-address-helper", Type::UNIT) { AddTestCase(new NetworkAllocatorHelperTestCase(), TestCase::Duration::QUICK); AddTestCase(new AddressAllocatorHelperTestCase(), TestCase::Duration::QUICK); diff --git a/src/internet/test/ipv4-deduplication-test.cc b/src/internet/test/ipv4-deduplication-test.cc index 418edb702..6b9ea9cba 100644 --- a/src/internet/test/ipv4-deduplication-test.cc +++ b/src/internet/test/ipv4-deduplication-test.cc @@ -557,7 +557,7 @@ class Ipv4DeduplicationTestSuite : public TestSuite }; Ipv4DeduplicationTestSuite::Ipv4DeduplicationTestSuite() - : TestSuite("ipv4-deduplication", UNIT) + : TestSuite("ipv4-deduplication", Type::UNIT) { AddTestCase(new Ipv4DeduplicationTest(true), TestCase::Duration::QUICK); AddTestCase(new Ipv4DeduplicationTest(false), TestCase::Duration::QUICK); @@ -737,7 +737,7 @@ class Ipv4DeduplicationPerformanceTestSuite : public TestSuite }; Ipv4DeduplicationPerformanceTestSuite::Ipv4DeduplicationPerformanceTestSuite() - : TestSuite("ipv4-deduplication-performance", PERFORMANCE) + : TestSuite("ipv4-deduplication-performance", Type::PERFORMANCE) { AddTestCase(new Ipv4DeduplicationPerformanceTest, TestCase::Duration::EXTENSIVE); } diff --git a/src/internet/test/ipv4-forwarding-test.cc b/src/internet/test/ipv4-forwarding-test.cc index 986a0b8f6..fa9de630a 100644 --- a/src/internet/test/ipv4-forwarding-test.cc +++ b/src/internet/test/ipv4-forwarding-test.cc @@ -238,7 +238,7 @@ class Ipv4ForwardingTestSuite : public TestSuite }; Ipv4ForwardingTestSuite::Ipv4ForwardingTestSuite() - : TestSuite("ipv4-forwarding", UNIT) + : TestSuite("ipv4-forwarding", Type::UNIT) { AddTestCase(new Ipv4ForwardingTest, TestCase::Duration::QUICK); } diff --git a/src/internet/test/ipv4-fragmentation-test.cc b/src/internet/test/ipv4-fragmentation-test.cc index 2c4209f57..0ceb042de 100644 --- a/src/internet/test/ipv4-fragmentation-test.cc +++ b/src/internet/test/ipv4-fragmentation-test.cc @@ -587,7 +587,7 @@ class Ipv4FragmentationTestSuite : public TestSuite }; Ipv4FragmentationTestSuite::Ipv4FragmentationTestSuite() - : TestSuite("ipv4-fragmentation", UNIT) + : TestSuite("ipv4-fragmentation", Type::UNIT) { AddTestCase(new Ipv4FragmentationTest(false), TestCase::Duration::QUICK); AddTestCase(new Ipv4FragmentationTest(true), TestCase::Duration::QUICK); diff --git a/src/internet/test/ipv4-global-routing-test-suite.cc b/src/internet/test/ipv4-global-routing-test-suite.cc index 3537becbf..b059bbd3d 100644 --- a/src/internet/test/ipv4-global-routing-test-suite.cc +++ b/src/internet/test/ipv4-global-routing-test-suite.cc @@ -1323,7 +1323,7 @@ class Ipv4GlobalRoutingTestSuite : public TestSuite }; Ipv4GlobalRoutingTestSuite::Ipv4GlobalRoutingTestSuite() - : TestSuite("ipv4-global-routing", UNIT) + : TestSuite("ipv4-global-routing", Type::UNIT) { AddTestCase(new LinkTest, TestCase::Duration::QUICK); AddTestCase(new LanTest, TestCase::Duration::QUICK); diff --git a/src/internet/test/ipv4-header-test.cc b/src/internet/test/ipv4-header-test.cc index daafd402e..7a50eeea2 100644 --- a/src/internet/test/ipv4-header-test.cc +++ b/src/internet/test/ipv4-header-test.cc @@ -299,7 +299,7 @@ class Ipv4HeaderTestSuite : public TestSuite { public: Ipv4HeaderTestSuite() - : TestSuite("ipv4-header", UNIT) + : TestSuite("ipv4-header", Type::UNIT) { AddTestCase(new Ipv4HeaderTest, TestCase::Duration::QUICK); } diff --git a/src/internet/test/ipv4-list-routing-test-suite.cc b/src/internet/test/ipv4-list-routing-test-suite.cc index dab9bd85b..5e8ceb328 100644 --- a/src/internet/test/ipv4-list-routing-test-suite.cc +++ b/src/internet/test/ipv4-list-routing-test-suite.cc @@ -209,7 +209,7 @@ class Ipv4ListRoutingTestSuite : public TestSuite { public: Ipv4ListRoutingTestSuite() - : TestSuite("ipv4-list-routing", UNIT) + : TestSuite("ipv4-list-routing", Type::UNIT) { AddTestCase(new Ipv4ListRoutingPositiveTestCase(), TestCase::Duration::QUICK); AddTestCase(new Ipv4ListRoutingNegativeTestCase(), TestCase::Duration::QUICK); diff --git a/src/internet/test/ipv4-packet-info-tag-test-suite.cc b/src/internet/test/ipv4-packet-info-tag-test-suite.cc index a68cf94c5..7697d484e 100644 --- a/src/internet/test/ipv4-packet-info-tag-test-suite.cc +++ b/src/internet/test/ipv4-packet-info-tag-test-suite.cc @@ -220,7 +220,7 @@ class Ipv4PacketInfoTagTestSuite : public TestSuite }; Ipv4PacketInfoTagTestSuite::Ipv4PacketInfoTagTestSuite() - : TestSuite("ipv4-packet-info-tag", UNIT) + : TestSuite("ipv4-packet-info-tag", Type::UNIT) { AddTestCase(new Ipv4PacketInfoTagTest(), TestCase::Duration::QUICK); } diff --git a/src/internet/test/ipv4-raw-test.cc b/src/internet/test/ipv4-raw-test.cc index 720646386..f1174ffc5 100644 --- a/src/internet/test/ipv4-raw-test.cc +++ b/src/internet/test/ipv4-raw-test.cc @@ -378,7 +378,7 @@ class Ipv4RawTestSuite : public TestSuite { public: Ipv4RawTestSuite() - : TestSuite("ipv4-raw", UNIT) + : TestSuite("ipv4-raw", Type::UNIT) { AddTestCase(new Ipv4RawSocketImplTest, TestCase::Duration::QUICK); } diff --git a/src/internet/test/ipv4-rip-test.cc b/src/internet/test/ipv4-rip-test.cc index 3087d4b91..ce8e7746e 100644 --- a/src/internet/test/ipv4-rip-test.cc +++ b/src/internet/test/ipv4-rip-test.cc @@ -703,7 +703,7 @@ class Ipv4RipTestSuite : public TestSuite { public: Ipv4RipTestSuite() - : TestSuite("ipv4-rip", UNIT) + : TestSuite("ipv4-rip", Type::UNIT) { AddTestCase(new Ipv4RipTest, TestCase::Duration::QUICK); AddTestCase(new Ipv4RipCountToInfinityTest, TestCase::Duration::QUICK); diff --git a/src/internet/test/ipv4-static-routing-test-suite.cc b/src/internet/test/ipv4-static-routing-test-suite.cc index a4c1f9dc2..ef911df45 100644 --- a/src/internet/test/ipv4-static-routing-test-suite.cc +++ b/src/internet/test/ipv4-static-routing-test-suite.cc @@ -219,7 +219,7 @@ class Ipv4StaticRoutingTestSuite : public TestSuite }; Ipv4StaticRoutingTestSuite::Ipv4StaticRoutingTestSuite() - : TestSuite("ipv4-static-routing", UNIT) + : TestSuite("ipv4-static-routing", Type::UNIT) { AddTestCase(new Ipv4StaticRoutingSlash32TestCase, TestCase::Duration::QUICK); } diff --git a/src/internet/test/ipv4-test.cc b/src/internet/test/ipv4-test.cc index 88444cfef..6be651da6 100644 --- a/src/internet/test/ipv4-test.cc +++ b/src/internet/test/ipv4-test.cc @@ -129,7 +129,7 @@ class IPv4L3ProtocolTestSuite : public TestSuite { public: IPv4L3ProtocolTestSuite() - : TestSuite("ipv4-protocol", UNIT) + : TestSuite("ipv4-protocol", Type::UNIT) { AddTestCase(new Ipv4L3ProtocolTestCase(), TestCase::Duration::QUICK); } diff --git a/src/internet/test/ipv6-address-duplication-test.cc b/src/internet/test/ipv6-address-duplication-test.cc index 9f1fea227..e0c9cab37 100644 --- a/src/internet/test/ipv6-address-duplication-test.cc +++ b/src/internet/test/ipv6-address-duplication-test.cc @@ -124,7 +124,7 @@ class Ipv6DadTestSuite : public TestSuite { public: Ipv6DadTestSuite() - : TestSuite("ipv6-duplicate-address-detection", UNIT) + : TestSuite("ipv6-duplicate-address-detection", Type::UNIT) { AddTestCase(new Ipv6DadTest, TestCase::Duration::QUICK); } diff --git a/src/internet/test/ipv6-address-helper-test-suite.cc b/src/internet/test/ipv6-address-helper-test-suite.cc index 4a6e41a9b..9c2c2f80c 100644 --- a/src/internet/test/ipv6-address-helper-test-suite.cc +++ b/src/internet/test/ipv6-address-helper-test-suite.cc @@ -179,7 +179,7 @@ class Ipv6AddressHelperTestSuite : public TestSuite }; Ipv6AddressHelperTestSuite::Ipv6AddressHelperTestSuite() - : TestSuite("ipv6-address-helper", UNIT) + : TestSuite("ipv6-address-helper", Type::UNIT) { AddTestCase(new IpAddressHelperTestCasev6, TestCase::Duration::QUICK); } diff --git a/src/internet/test/ipv6-dual-stack-test-suite.cc b/src/internet/test/ipv6-dual-stack-test-suite.cc index 816c17838..300cc90f2 100644 --- a/src/internet/test/ipv6-dual-stack-test-suite.cc +++ b/src/internet/test/ipv6-dual-stack-test-suite.cc @@ -360,7 +360,7 @@ class Ipv6DualStackTestSuite : public TestSuite { public: Ipv6DualStackTestSuite() - : TestSuite("ipv6-dual-stack", UNIT) + : TestSuite("ipv6-dual-stack", Type::UNIT) { AddTestCase(new DualStackTestCase(), TestCase::Duration::QUICK); } diff --git a/src/internet/test/ipv6-extension-header-test-suite.cc b/src/internet/test/ipv6-extension-header-test-suite.cc index d5ee11e93..c5d24a2aa 100644 --- a/src/internet/test/ipv6-extension-header-test-suite.cc +++ b/src/internet/test/ipv6-extension-header-test-suite.cc @@ -279,7 +279,7 @@ class Ipv6ExtensionHeaderTestSuite : public TestSuite { public: Ipv6ExtensionHeaderTestSuite() - : TestSuite("ipv6-extension-header", UNIT) + : TestSuite("ipv6-extension-header", Type::UNIT) { AddTestCase(new TestEmptyOptionField, TestCase::Duration::QUICK); AddTestCase(new TestOptionWithoutAlignment, TestCase::Duration::QUICK); diff --git a/src/internet/test/ipv6-forwarding-test.cc b/src/internet/test/ipv6-forwarding-test.cc index 6cf552977..e1434f772 100644 --- a/src/internet/test/ipv6-forwarding-test.cc +++ b/src/internet/test/ipv6-forwarding-test.cc @@ -218,7 +218,7 @@ class Ipv6ForwardingTestSuite : public TestSuite { public: Ipv6ForwardingTestSuite() - : TestSuite("ipv6-forwarding", UNIT) + : TestSuite("ipv6-forwarding", Type::UNIT) { AddTestCase(new Ipv6ForwardingTest, TestCase::Duration::QUICK); } diff --git a/src/internet/test/ipv6-fragmentation-test.cc b/src/internet/test/ipv6-fragmentation-test.cc index 89d945c77..5cbc40144 100644 --- a/src/internet/test/ipv6-fragmentation-test.cc +++ b/src/internet/test/ipv6-fragmentation-test.cc @@ -623,7 +623,7 @@ class Ipv6FragmentationTestSuite : public TestSuite { public: Ipv6FragmentationTestSuite() - : TestSuite("ipv6-fragmentation", UNIT) + : TestSuite("ipv6-fragmentation", Type::UNIT) { AddTestCase(new Ipv6FragmentationTest, TestCase::Duration::QUICK); } diff --git a/src/internet/test/ipv6-list-routing-test-suite.cc b/src/internet/test/ipv6-list-routing-test-suite.cc index c35d79fee..3926b3cb9 100644 --- a/src/internet/test/ipv6-list-routing-test-suite.cc +++ b/src/internet/test/ipv6-list-routing-test-suite.cc @@ -238,7 +238,7 @@ class Ipv6ListRoutingTestSuite : public TestSuite { public: Ipv6ListRoutingTestSuite() - : TestSuite("ipv6-list-routing", UNIT) + : TestSuite("ipv6-list-routing", Type::UNIT) { AddTestCase(new Ipv6ListRoutingPositiveTestCase(), TestCase::Duration::QUICK); AddTestCase(new Ipv6ListRoutingNegativeTestCase(), TestCase::Duration::QUICK); diff --git a/src/internet/test/ipv6-packet-info-tag-test-suite.cc b/src/internet/test/ipv6-packet-info-tag-test-suite.cc index 8e2e08c17..135f92d24 100644 --- a/src/internet/test/ipv6-packet-info-tag-test-suite.cc +++ b/src/internet/test/ipv6-packet-info-tag-test-suite.cc @@ -256,7 +256,7 @@ class Ipv6PacketInfoTagTestSuite : public TestSuite }; Ipv6PacketInfoTagTestSuite::Ipv6PacketInfoTagTestSuite() - : TestSuite("ipv6-packet-info-tag", UNIT) + : TestSuite("ipv6-packet-info-tag", Type::UNIT) { AddTestCase(new Ipv6PacketInfoTagTest(), TestCase::Duration::QUICK); } diff --git a/src/internet/test/ipv6-raw-test.cc b/src/internet/test/ipv6-raw-test.cc index a5422003c..a042d27de 100644 --- a/src/internet/test/ipv6-raw-test.cc +++ b/src/internet/test/ipv6-raw-test.cc @@ -330,7 +330,7 @@ class Ipv6RawTestSuite : public TestSuite { public: Ipv6RawTestSuite() - : TestSuite("ipv6-raw", UNIT) + : TestSuite("ipv6-raw", Type::UNIT) { AddTestCase(new Ipv6RawSocketImplTest, TestCase::Duration::QUICK); } diff --git a/src/internet/test/ipv6-ripng-test.cc b/src/internet/test/ipv6-ripng-test.cc index 7579c57ed..3bd31a85e 100644 --- a/src/internet/test/ipv6-ripng-test.cc +++ b/src/internet/test/ipv6-ripng-test.cc @@ -702,7 +702,7 @@ class Ipv6RipngTestSuite : public TestSuite { public: Ipv6RipngTestSuite() - : TestSuite("ipv6-ripng", UNIT) + : TestSuite("ipv6-ripng", Type::UNIT) { AddTestCase(new Ipv6RipngTest, TestCase::Duration::QUICK); AddTestCase(new Ipv6RipngCountToInfinityTest, TestCase::Duration::QUICK); diff --git a/src/internet/test/ipv6-test.cc b/src/internet/test/ipv6-test.cc index 7a73a0817..9cd1f6efe 100644 --- a/src/internet/test/ipv6-test.cc +++ b/src/internet/test/ipv6-test.cc @@ -186,7 +186,7 @@ class IPv6L3ProtocolTestSuite : public TestSuite { public: IPv6L3ProtocolTestSuite() - : TestSuite("ipv6-protocol", UNIT) + : TestSuite("ipv6-protocol", Type::UNIT) { AddTestCase(new Ipv6L3ProtocolTestCase(), TestCase::Duration::QUICK); } diff --git a/src/internet/test/neighbor-cache-test.cc b/src/internet/test/neighbor-cache-test.cc index c346548bc..8cfd4e229 100644 --- a/src/internet/test/neighbor-cache-test.cc +++ b/src/internet/test/neighbor-cache-test.cc @@ -1230,7 +1230,7 @@ class NeighborCacheTestSuite : public TestSuite { public: NeighborCacheTestSuite() - : TestSuite("neighbor-cache", UNIT) + : TestSuite("neighbor-cache", Type::UNIT) { AddTestCase(new DynamicNeighborCacheTest, TestCase::Duration::QUICK); AddTestCase(new ChannelTest, TestCase::Duration::QUICK); diff --git a/src/internet/test/rtt-test.cc b/src/internet/test/rtt-test.cc index b37f0d9b4..6edb1270f 100644 --- a/src/internet/test/rtt-test.cc +++ b/src/internet/test/rtt-test.cc @@ -187,7 +187,7 @@ class RttEstimatorTestSuite : public TestSuite { public: RttEstimatorTestSuite() - : TestSuite("rtt-estimator", UNIT) + : TestSuite("rtt-estimator", Type::UNIT) { AddTestCase(new RttEstimatorTestCase, TestCase::Duration::QUICK); } diff --git a/src/internet/test/tcp-advertised-window-test.cc b/src/internet/test/tcp-advertised-window-test.cc index c6ff766c1..af9a22bbb 100644 --- a/src/internet/test/tcp-advertised-window-test.cc +++ b/src/internet/test/tcp-advertised-window-test.cc @@ -473,7 +473,7 @@ class TcpAdvertisedWindowTestSuite : public TestSuite { public: TcpAdvertisedWindowTestSuite() - : TestSuite("tcp-advertised-window-test", UNIT) + : TestSuite("tcp-advertised-window-test", Type::UNIT) { AddTestCase(new TcpAdvertisedWindowTest("TCP advertised window size, small seg + no loss", 500, diff --git a/src/internet/test/tcp-bbr-test.cc b/src/internet/test/tcp-bbr-test.cc index cd3876658..25f794d52 100644 --- a/src/internet/test/tcp-bbr-test.cc +++ b/src/internet/test/tcp-bbr-test.cc @@ -192,7 +192,7 @@ class TcpBbrTestSuite : public TestSuite * \brief constructor */ TcpBbrTestSuite() - : TestSuite("tcp-bbr-test", UNIT) + : TestSuite("tcp-bbr-test", Type::UNIT) { AddTestCase(new TcpBbrPacingEnableTest(true, "BBR must keep pacing feature on"), TestCase::Duration::QUICK); diff --git a/src/internet/test/tcp-bic-test.cc b/src/internet/test/tcp-bic-test.cc index 8e1648a52..0e1e113cb 100644 --- a/src/internet/test/tcp-bic-test.cc +++ b/src/internet/test/tcp-bic-test.cc @@ -310,7 +310,7 @@ class TcpBicTestSuite : public TestSuite { public: TcpBicTestSuite() - : TestSuite("tcp-bic-test", UNIT) + : TestSuite("tcp-bic-test", Type::UNIT) { AddTestCase( new TcpBicIncrementTest(10 * 536, diff --git a/src/internet/test/tcp-bytes-in-flight-test.cc b/src/internet/test/tcp-bytes-in-flight-test.cc index a799b8af3..878c264e9 100644 --- a/src/internet/test/tcp-bytes-in-flight-test.cc +++ b/src/internet/test/tcp-bytes-in-flight-test.cc @@ -289,7 +289,7 @@ class TcpBytesInFlightTestSuite : public TestSuite { public: TcpBytesInFlightTestSuite() - : TestSuite("tcp-bytes-in-flight-test", UNIT) + : TestSuite("tcp-bytes-in-flight-test", Type::UNIT) { std::vector toDrop; AddTestCase(new TcpBytesInFlightTest("BytesInFlight value, no drop", toDrop), diff --git a/src/internet/test/tcp-classic-recovery-test.cc b/src/internet/test/tcp-classic-recovery-test.cc index 8491b703a..9c4bef269 100644 --- a/src/internet/test/tcp-classic-recovery-test.cc +++ b/src/internet/test/tcp-classic-recovery-test.cc @@ -126,7 +126,7 @@ class ClassicRecoveryTestSuite : public TestSuite { public: ClassicRecoveryTestSuite() - : TestSuite("tcp-classic-recovery-test", UNIT) + : TestSuite("tcp-classic-recovery-test", Type::UNIT) { AddTestCase(new ClassicRecoveryTest(3000, 500, diff --git a/src/internet/test/tcp-close-test.cc b/src/internet/test/tcp-close-test.cc index 013c6d21b..0f57f71ca 100644 --- a/src/internet/test/tcp-close-test.cc +++ b/src/internet/test/tcp-close-test.cc @@ -159,7 +159,7 @@ class TcpTcpCloseTestSuite : public TestSuite { public: TcpTcpCloseTestSuite() - : TestSuite("tcp-close", UNIT) + : TestSuite("tcp-close", Type::UNIT) { AddTestCase(new TcpCloseWithLossTestCase(true), TestCase::Duration::QUICK); AddTestCase(new TcpCloseWithLossTestCase(false), TestCase::Duration::QUICK); diff --git a/src/internet/test/tcp-cong-avoid-test.cc b/src/internet/test/tcp-cong-avoid-test.cc index 1514175ca..e938f4c1f 100644 --- a/src/internet/test/tcp-cong-avoid-test.cc +++ b/src/internet/test/tcp-cong-avoid-test.cc @@ -187,7 +187,7 @@ class TcpRenoCongAvoidTestSuite : public TestSuite { public: TcpRenoCongAvoidTestSuite() - : TestSuite("tcp-cong-avoid-test", UNIT) + : TestSuite("tcp-cong-avoid-test", Type::UNIT) { std::list types = { TcpNewReno::GetTypeId(), diff --git a/src/internet/test/tcp-datasentcb-test.cc b/src/internet/test/tcp-datasentcb-test.cc index 9acbeb1f8..74c45c6af 100644 --- a/src/internet/test/tcp-datasentcb-test.cc +++ b/src/internet/test/tcp-datasentcb-test.cc @@ -169,7 +169,7 @@ class TcpDataSentCbTestSuite : public TestSuite { public: TcpDataSentCbTestSuite() - : TestSuite("tcp-datasentcb", UNIT) + : TestSuite("tcp-datasentcb", Type::UNIT) { AddTestCase(new TcpDataSentCbTestCase("Check the data sent callback", 500, 10), TestCase::Duration::QUICK); diff --git a/src/internet/test/tcp-dctcp-test.cc b/src/internet/test/tcp-dctcp-test.cc index 529cac7a2..526c5c17a 100644 --- a/src/internet/test/tcp-dctcp-test.cc +++ b/src/internet/test/tcp-dctcp-test.cc @@ -659,7 +659,7 @@ class TcpDctcpTestSuite : public TestSuite { public: TcpDctcpTestSuite() - : TestSuite("tcp-dctcp-test", UNIT) + : TestSuite("tcp-dctcp-test", Type::UNIT) { AddTestCase(new TcpDctcpToLinuxReno(2 * 1446, 1446, diff --git a/src/internet/test/tcp-ecn-test.cc b/src/internet/test/tcp-ecn-test.cc index a84c3b5d4..831765fc7 100644 --- a/src/internet/test/tcp-ecn-test.cc +++ b/src/internet/test/tcp-ecn-test.cc @@ -585,7 +585,7 @@ class TcpEcnTestSuite : public TestSuite { public: TcpEcnTestSuite() - : TestSuite("tcp-ecn-test", UNIT) + : TestSuite("tcp-ecn-test", Type::UNIT) { AddTestCase(new TcpEcnTest( 1, diff --git a/src/internet/test/tcp-endpoint-bug2211.cc b/src/internet/test/tcp-endpoint-bug2211.cc index 2d4619794..fb7b584df 100644 --- a/src/internet/test/tcp-endpoint-bug2211.cc +++ b/src/internet/test/tcp-endpoint-bug2211.cc @@ -157,7 +157,7 @@ class TcpEndpointBug2211TestSuite : public TestSuite { public: TcpEndpointBug2211TestSuite() - : TestSuite("tcp-endpoint-bug2211-test", UNIT) + : TestSuite("tcp-endpoint-bug2211-test", Type::UNIT) { AddTestCase(new TcpEndPointBug2211Test("Bug 2211 testcase IPv4", false), TestCase::Duration::QUICK); diff --git a/src/internet/test/tcp-fast-retr-test.cc b/src/internet/test/tcp-fast-retr-test.cc index 9020b1c99..64eb09f7f 100644 --- a/src/internet/test/tcp-fast-retr-test.cc +++ b/src/internet/test/tcp-fast-retr-test.cc @@ -437,7 +437,7 @@ class TcpFastRetrTestSuite : public TestSuite { public: TcpFastRetrTestSuite() - : TestSuite("tcp-fast-retr-test", UNIT) + : TestSuite("tcp-fast-retr-test", Type::UNIT) { std::list types; types.insert(types.begin(), TcpWestwoodPlus::GetTypeId()); diff --git a/src/internet/test/tcp-header-test.cc b/src/internet/test/tcp-header-test.cc index c83385d6d..9b984fff1 100644 --- a/src/internet/test/tcp-header-test.cc +++ b/src/internet/test/tcp-header-test.cc @@ -460,7 +460,7 @@ class TcpHeaderTestSuite : public TestSuite { public: TcpHeaderTestSuite() - : TestSuite("tcp-header", UNIT) + : TestSuite("tcp-header", Type::UNIT) { AddTestCase(new TcpHeaderGetSetTestCase("GetSet test cases"), TestCase::Duration::QUICK); AddTestCase(new TcpHeaderWithRFC793OptionTestCase("Test for options in RFC 793"), diff --git a/src/internet/test/tcp-highspeed-test.cc b/src/internet/test/tcp-highspeed-test.cc index 292560bc2..b01db0ef1 100644 --- a/src/internet/test/tcp-highspeed-test.cc +++ b/src/internet/test/tcp-highspeed-test.cc @@ -183,7 +183,7 @@ class TcpHighSpeedTestSuite : public TestSuite { public: TcpHighSpeedTestSuite() - : TestSuite("tcp-highspeed-test", UNIT) + : TestSuite("tcp-highspeed-test", Type::UNIT) { std::stringstream ss; diff --git a/src/internet/test/tcp-htcp-test.cc b/src/internet/test/tcp-htcp-test.cc index cca81b0bd..6fbeee56b 100644 --- a/src/internet/test/tcp-htcp-test.cc +++ b/src/internet/test/tcp-htcp-test.cc @@ -165,7 +165,7 @@ class TcpHtcpTestSuite : public TestSuite { public: TcpHtcpTestSuite() - : TestSuite("tcp-htcp-test", UNIT) + : TestSuite("tcp-htcp-test", Type::UNIT) { AddTestCase(new TcpHtcpIncrementTest(38 * 536, 536, diff --git a/src/internet/test/tcp-hybla-test.cc b/src/internet/test/tcp-hybla-test.cc index aa010667f..b1203c013 100644 --- a/src/internet/test/tcp-hybla-test.cc +++ b/src/internet/test/tcp-hybla-test.cc @@ -155,7 +155,7 @@ class TcpHyblaTestSuite : public TestSuite { public: TcpHyblaTestSuite() - : TestSuite("tcp-hybla-test", UNIT) + : TestSuite("tcp-hybla-test", Type::UNIT) { AddTestCase(new TcpHyblaIncrementTest(1000, 0xFFFFFFFF, diff --git a/src/internet/test/tcp-illinois-test.cc b/src/internet/test/tcp-illinois-test.cc index cbfd95d5b..b4f454e63 100644 --- a/src/internet/test/tcp-illinois-test.cc +++ b/src/internet/test/tcp-illinois-test.cc @@ -352,7 +352,7 @@ class TcpIllinoisTestSuite : public TestSuite { public: TcpIllinoisTestSuite() - : TestSuite("tcp-illinois-test", UNIT) + : TestSuite("tcp-illinois-test", Type::UNIT) { AddTestCase(new TcpIllinoisTest(38 * 1446, 40 * 1446, diff --git a/src/internet/test/tcp-ledbat-test.cc b/src/internet/test/tcp-ledbat-test.cc index f59ae0ff4..3ea322fe7 100644 --- a/src/internet/test/tcp-ledbat-test.cc +++ b/src/internet/test/tcp-ledbat-test.cc @@ -343,7 +343,7 @@ class TcpLedbatTestSuite : public TestSuite { public: TcpLedbatTestSuite() - : TestSuite("tcp-ledbat-test", UNIT) + : TestSuite("tcp-ledbat-test", Type::UNIT) { AddTestCase(new TcpLedbatToNewReno(2 * 1446, 1446, diff --git a/src/internet/test/tcp-linux-reno-test.cc b/src/internet/test/tcp-linux-reno-test.cc index 835184f1f..ae95d79ca 100644 --- a/src/internet/test/tcp-linux-reno-test.cc +++ b/src/internet/test/tcp-linux-reno-test.cc @@ -377,7 +377,7 @@ class TcpLinuxRenoTestSuite : public TestSuite { public: TcpLinuxRenoTestSuite() - : TestSuite("tcp-linux-reno-test", UNIT) + : TestSuite("tcp-linux-reno-test", Type::UNIT) { TypeId cong_control_type = TcpLinuxReno::GetTypeId(); // Test the behavior of Slow Start phase with small segment size diff --git a/src/internet/test/tcp-loss-test.cc b/src/internet/test/tcp-loss-test.cc index 9152f381d..9ea7956ae 100644 --- a/src/internet/test/tcp-loss-test.cc +++ b/src/internet/test/tcp-loss-test.cc @@ -182,7 +182,7 @@ class TcpLossTestSuite : public TestSuite { public: TcpLossTestSuite() - : TestSuite("tcp-loss-test", UNIT) + : TestSuite("tcp-loss-test", Type::UNIT) { // For large transfer tests, the three sequence numbers passed in // are the segment (i.e. not byte) number that should be dropped first, diff --git a/src/internet/test/tcp-lp-test.cc b/src/internet/test/tcp-lp-test.cc index c97c306ae..58954eb4a 100644 --- a/src/internet/test/tcp-lp-test.cc +++ b/src/internet/test/tcp-lp-test.cc @@ -262,7 +262,7 @@ class TcpLpTestSuite : public TestSuite { public: TcpLpTestSuite() - : TestSuite("tcp-lp-test", UNIT) + : TestSuite("tcp-lp-test", Type::UNIT) { AddTestCase(new TcpLpToNewReno(4 * 1446, 1446, diff --git a/src/internet/test/tcp-option-test.cc b/src/internet/test/tcp-option-test.cc index 9b57b0d33..580422d9d 100644 --- a/src/internet/test/tcp-option-test.cc +++ b/src/internet/test/tcp-option-test.cc @@ -203,7 +203,7 @@ class TcpOptionTestSuite : public TestSuite { public: TcpOptionTestSuite() - : TestSuite("tcp-option", UNIT) + : TestSuite("tcp-option", Type::UNIT) { for (uint8_t i = 0; i < 15; ++i) { diff --git a/src/internet/test/tcp-pacing-test.cc b/src/internet/test/tcp-pacing-test.cc index b293ec130..5e3e25522 100644 --- a/src/internet/test/tcp-pacing-test.cc +++ b/src/internet/test/tcp-pacing-test.cc @@ -372,7 +372,7 @@ class TcpPacingTestSuite : public TestSuite { public: TcpPacingTestSuite() - : TestSuite("tcp-pacing-test", UNIT) + : TestSuite("tcp-pacing-test", Type::UNIT) { uint16_t pacingSsRatio = 200; uint16_t pacingCaRatio = 120; diff --git a/src/internet/test/tcp-pkts-acked-test.cc b/src/internet/test/tcp-pkts-acked-test.cc index e42fec3a6..0e768b6da 100644 --- a/src/internet/test/tcp-pkts-acked-test.cc +++ b/src/internet/test/tcp-pkts-acked-test.cc @@ -178,7 +178,7 @@ class TcpPktsAckedTestSuite : public TestSuite { public: TcpPktsAckedTestSuite() - : TestSuite("tcp-pkts-acked-test", UNIT) + : TestSuite("tcp-pkts-acked-test", Type::UNIT) { AddTestCase(new TcpPktsAckedOpenTest("PktsAcked check while in OPEN state"), TestCase::Duration::QUICK); diff --git a/src/internet/test/tcp-prr-recovery-test.cc b/src/internet/test/tcp-prr-recovery-test.cc index 40fe2f9cd..18729bcce 100644 --- a/src/internet/test/tcp-prr-recovery-test.cc +++ b/src/internet/test/tcp-prr-recovery-test.cc @@ -152,7 +152,7 @@ class PrrRecoveryTestSuite : public TestSuite { public: PrrRecoveryTestSuite() - : TestSuite("tcp-prr-recovery-test", UNIT) + : TestSuite("tcp-prr-recovery-test", Type::UNIT) { AddTestCase(new PrrRecoveryTest( 3000, diff --git a/src/internet/test/tcp-rate-ops-test.cc b/src/internet/test/tcp-rate-ops-test.cc index bfe503642..e5000bedd 100644 --- a/src/internet/test/tcp-rate-ops-test.cc +++ b/src/internet/test/tcp-rate-ops-test.cc @@ -601,7 +601,7 @@ class TcpRateOpsTestSuite : public TestSuite { public: TcpRateOpsTestSuite() - : TestSuite("tcp-rate-ops", UNIT) + : TestSuite("tcp-rate-ops", Type::UNIT) { AddTestCase(new TcpRateLinuxBasicTest(1000, SequenceNumber32(20), diff --git a/src/internet/test/tcp-rto-test.cc b/src/internet/test/tcp-rto-test.cc index 1f9347793..37642d52b 100644 --- a/src/internet/test/tcp-rto-test.cc +++ b/src/internet/test/tcp-rto-test.cc @@ -514,7 +514,7 @@ class TcpRtoTestSuite : public TestSuite { public: TcpRtoTestSuite() - : TestSuite("tcp-rto-test", UNIT) + : TestSuite("tcp-rto-test", Type::UNIT) { std::list types = { TcpNewReno::GetTypeId(), diff --git a/src/internet/test/tcp-rtt-estimation.cc b/src/internet/test/tcp-rtt-estimation.cc index 7f4e5e064..820f8f69a 100644 --- a/src/internet/test/tcp-rtt-estimation.cc +++ b/src/internet/test/tcp-rtt-estimation.cc @@ -249,7 +249,7 @@ class TcpRttEstimationTestSuite : public TestSuite { public: TcpRttEstimationTestSuite() - : TestSuite("tcp-rtt-estimation-test", UNIT) + : TestSuite("tcp-rtt-estimation-test", Type::UNIT) { AddTestCase(new TcpRttEstimationTest("RTT estimation, ts, no data", true, 0), TestCase::Duration::QUICK); diff --git a/src/internet/test/tcp-rx-buffer-test.cc b/src/internet/test/tcp-rx-buffer-test.cc index efc84e658..50666c629 100644 --- a/src/internet/test/tcp-rx-buffer-test.cc +++ b/src/internet/test/tcp-rx-buffer-test.cc @@ -302,7 +302,7 @@ class TcpRxBufferTestSuite : public TestSuite { public: TcpRxBufferTestSuite() - : TestSuite("tcp-rx-buffer", UNIT) + : TestSuite("tcp-rx-buffer", Type::UNIT) { AddTestCase(new TcpRxBufferTestCase, TestCase::Duration::QUICK); } diff --git a/src/internet/test/tcp-sack-permitted-test.cc b/src/internet/test/tcp-sack-permitted-test.cc index 10d40f936..736ed7eb7 100644 --- a/src/internet/test/tcp-sack-permitted-test.cc +++ b/src/internet/test/tcp-sack-permitted-test.cc @@ -213,7 +213,7 @@ class TcpSackPermittedTestSuite : public TestSuite public: /** \brief Constructor */ TcpSackPermittedTestSuite() - : TestSuite("tcp-sack-permitted", UNIT) + : TestSuite("tcp-sack-permitted", Type::UNIT) { AddTestCase(new SackPermittedTestCase(SackPermittedTestCase::DISABLED), TestCase::Duration::QUICK); diff --git a/src/internet/test/tcp-scalable-test.cc b/src/internet/test/tcp-scalable-test.cc index 6c44f730c..2c592c71f 100644 --- a/src/internet/test/tcp-scalable-test.cc +++ b/src/internet/test/tcp-scalable-test.cc @@ -170,7 +170,7 @@ class TcpScalableTestSuite : public TestSuite { public: TcpScalableTestSuite() - : TestSuite("tcp-scalable-test", UNIT) + : TestSuite("tcp-scalable-test", Type::UNIT) { AddTestCase( new TcpScalableIncrementTest( diff --git a/src/internet/test/tcp-slow-start-test.cc b/src/internet/test/tcp-slow-start-test.cc index 036c991f4..05e30dfaf 100644 --- a/src/internet/test/tcp-slow-start-test.cc +++ b/src/internet/test/tcp-slow-start-test.cc @@ -267,7 +267,7 @@ class TcpSlowStartTestSuite : public TestSuite { public: TcpSlowStartTestSuite() - : TestSuite("tcp-slow-start-test", UNIT) + : TestSuite("tcp-slow-start-test", Type::UNIT) { // This test have less packets to transmit than SsTh std::list types = { diff --git a/src/internet/test/tcp-syn-connection-failed-test.cc b/src/internet/test/tcp-syn-connection-failed-test.cc index 53bc8b946..54ba9fb42 100644 --- a/src/internet/test/tcp-syn-connection-failed-test.cc +++ b/src/internet/test/tcp-syn-connection-failed-test.cc @@ -102,7 +102,7 @@ class TcpSynConnectionFailedTestSuite : public TestSuite { public: TcpSynConnectionFailedTestSuite() - : TestSuite("tcp-syn-connection-failed-test", UNIT) + : TestSuite("tcp-syn-connection-failed-test", Type::UNIT) { AddTestCase(new TcpSynConnectionFailedTest("TCP SYN connection failed test no ECN", false), TestCase::Duration::QUICK); diff --git a/src/internet/test/tcp-test.cc b/src/internet/test/tcp-test.cc index 37952edbc..132977b20 100644 --- a/src/internet/test/tcp-test.cc +++ b/src/internet/test/tcp-test.cc @@ -543,7 +543,7 @@ class TcpTestSuite : public TestSuite { public: TcpTestSuite() - : TestSuite("tcp", UNIT) + : TestSuite("tcp", Type::UNIT) { // Arguments to these test cases are 1) totalStreamSize, // 2) source write size, 3) source read size diff --git a/src/internet/test/tcp-timestamp-test.cc b/src/internet/test/tcp-timestamp-test.cc index ff76844df..3bd985278 100644 --- a/src/internet/test/tcp-timestamp-test.cc +++ b/src/internet/test/tcp-timestamp-test.cc @@ -296,7 +296,7 @@ class TcpTimestampTestSuite : public TestSuite { public: TcpTimestampTestSuite() - : TestSuite("tcp-timestamp", UNIT) + : TestSuite("tcp-timestamp", Type::UNIT) { AddTestCase(new TimestampTestCase(TimestampTestCase::DISABLED), TestCase::Duration::QUICK); AddTestCase(new TimestampTestCase(TimestampTestCase::ENABLED_RECEIVER), diff --git a/src/internet/test/tcp-tx-buffer-test.cc b/src/internet/test/tcp-tx-buffer-test.cc index 4bf365c3b..d06c1ef4f 100644 --- a/src/internet/test/tcp-tx-buffer-test.cc +++ b/src/internet/test/tcp-tx-buffer-test.cc @@ -439,7 +439,7 @@ class TcpTxBufferTestSuite : public TestSuite { public: TcpTxBufferTestSuite() - : TestSuite("tcp-tx-buffer", UNIT) + : TestSuite("tcp-tx-buffer", Type::UNIT) { AddTestCase(new TcpTxBufferTestCase, TestCase::Duration::QUICK); } diff --git a/src/internet/test/tcp-vegas-test.cc b/src/internet/test/tcp-vegas-test.cc index 513e0d1de..289192ee5 100644 --- a/src/internet/test/tcp-vegas-test.cc +++ b/src/internet/test/tcp-vegas-test.cc @@ -209,7 +209,7 @@ class TcpVegasTestSuite : public TestSuite { public: TcpVegasTestSuite() - : TestSuite("tcp-vegas-test", UNIT) + : TestSuite("tcp-vegas-test", Type::UNIT) { AddTestCase( new TcpVegasTest(38 * 1446, diff --git a/src/internet/test/tcp-veno-test.cc b/src/internet/test/tcp-veno-test.cc index 69bb23dcc..69b9f6fda 100644 --- a/src/internet/test/tcp-veno-test.cc +++ b/src/internet/test/tcp-veno-test.cc @@ -306,7 +306,7 @@ class TcpVenoTestSuite : public TestSuite { public: TcpVenoTestSuite() - : TestSuite("tcp-veno-test", UNIT) + : TestSuite("tcp-veno-test", Type::UNIT) { AddTestCase(new TcpVenoTest(38 * 1446, 1446, diff --git a/src/internet/test/tcp-wscaling-test.cc b/src/internet/test/tcp-wscaling-test.cc index 035a227ef..73f50ed3b 100644 --- a/src/internet/test/tcp-wscaling-test.cc +++ b/src/internet/test/tcp-wscaling-test.cc @@ -232,7 +232,7 @@ class TcpWScalingTestSuite : public TestSuite { public: TcpWScalingTestSuite() - : TestSuite("tcp-wscaling", UNIT) + : TestSuite("tcp-wscaling", Type::UNIT) { AddTestCase( new WScalingTestCase(WScalingTestCase::ENABLED, 200000, 65535, "WS only server"), diff --git a/src/internet/test/tcp-yeah-test.cc b/src/internet/test/tcp-yeah-test.cc index db8faf1db..c97b0b1af 100644 --- a/src/internet/test/tcp-yeah-test.cc +++ b/src/internet/test/tcp-yeah-test.cc @@ -364,7 +364,7 @@ class TcpYeahTestSuite : public TestSuite { public: TcpYeahTestSuite() - : TestSuite("tcp-yeah-test", UNIT) + : TestSuite("tcp-yeah-test", Type::UNIT) { AddTestCase(new TcpYeahIncrementTest(20 * 1446, 25 * 1446, diff --git a/src/internet/test/tcp-zero-window-test.cc b/src/internet/test/tcp-zero-window-test.cc index f3ea371fd..4b6ebf629 100644 --- a/src/internet/test/tcp-zero-window-test.cc +++ b/src/internet/test/tcp-zero-window-test.cc @@ -255,7 +255,7 @@ class TcpZeroWindowTestSuite : public TestSuite { public: TcpZeroWindowTestSuite() - : TestSuite("tcp-zero-window-test", UNIT) + : TestSuite("tcp-zero-window-test", Type::UNIT) { AddTestCase(new TcpZeroWindowTest("zero window test"), TestCase::Duration::QUICK); } diff --git a/src/internet/test/udp-test.cc b/src/internet/test/udp-test.cc index 91080a624..681881ff3 100644 --- a/src/internet/test/udp-test.cc +++ b/src/internet/test/udp-test.cc @@ -769,7 +769,7 @@ class UdpTestSuite : public TestSuite { public: UdpTestSuite() - : TestSuite("udp", UNIT) + : TestSuite("udp", Type::UNIT) { AddTestCase(new UdpSocketImplTest, TestCase::Duration::QUICK); AddTestCase(new UdpSocketLoopbackTest, TestCase::Duration::QUICK); diff --git a/src/lr-wpan/test/lr-wpan-ack-test.cc b/src/lr-wpan/test/lr-wpan-ack-test.cc index 4a700ab4b..7998703eb 100644 --- a/src/lr-wpan/test/lr-wpan-ack-test.cc +++ b/src/lr-wpan/test/lr-wpan-ack-test.cc @@ -336,7 +336,7 @@ class LrWpanAckTestSuite : public TestSuite }; LrWpanAckTestSuite::LrWpanAckTestSuite() - : TestSuite("lr-wpan-ack", UNIT) + : TestSuite("lr-wpan-ack", Type::UNIT) { AddTestCase(new LrWpanAckTestCase("short-unicast", LrWpanAckTestCase::SHORT_ADDRESS_UNICAST), TestCase::Duration::QUICK); diff --git a/src/lr-wpan/test/lr-wpan-cca-test.cc b/src/lr-wpan/test/lr-wpan-cca-test.cc index eca644db9..740931da9 100644 --- a/src/lr-wpan/test/lr-wpan-cca-test.cc +++ b/src/lr-wpan/test/lr-wpan-cca-test.cc @@ -364,7 +364,7 @@ class LrWpanCcaTestSuite : public TestSuite }; LrWpanCcaTestSuite::LrWpanCcaTestSuite() - : TestSuite("lr-wpan-clear-channel-assessment", UNIT) + : TestSuite("lr-wpan-clear-channel-assessment", Type::UNIT) { AddTestCase(new LrWpanCcaTestCase, TestCase::Duration::QUICK); } diff --git a/src/lr-wpan/test/lr-wpan-collision-test.cc b/src/lr-wpan/test/lr-wpan-collision-test.cc index cf03063d3..7d4ffbdab 100644 --- a/src/lr-wpan/test/lr-wpan-collision-test.cc +++ b/src/lr-wpan/test/lr-wpan-collision-test.cc @@ -225,7 +225,7 @@ class LrWpanCollisionTestSuite : public TestSuite }; LrWpanCollisionTestSuite::LrWpanCollisionTestSuite() - : TestSuite("lr-wpan-collision", UNIT) + : TestSuite("lr-wpan-collision", Type::UNIT) { AddTestCase(new LrWpanCollisionTestCase, TestCase::Duration::QUICK); } diff --git a/src/lr-wpan/test/lr-wpan-ed-test.cc b/src/lr-wpan/test/lr-wpan-ed-test.cc index 9373686ac..bdf909e32 100644 --- a/src/lr-wpan/test/lr-wpan-ed-test.cc +++ b/src/lr-wpan/test/lr-wpan-ed-test.cc @@ -266,7 +266,7 @@ class LrWpanEdTestSuite : public TestSuite }; LrWpanEdTestSuite::LrWpanEdTestSuite() - : TestSuite("lr-wpan-energy-detection", UNIT) + : TestSuite("lr-wpan-energy-detection", Type::UNIT) { AddTestCase(new LrWpanEdTestCase, TestCase::Duration::QUICK); } diff --git a/src/lr-wpan/test/lr-wpan-error-model-test.cc b/src/lr-wpan/test/lr-wpan-error-model-test.cc index 75c04a0cd..4f9b6d7ae 100644 --- a/src/lr-wpan/test/lr-wpan-error-model-test.cc +++ b/src/lr-wpan/test/lr-wpan-error-model-test.cc @@ -207,7 +207,7 @@ class LrWpanErrorModelTestSuite : public TestSuite }; LrWpanErrorModelTestSuite::LrWpanErrorModelTestSuite() - : TestSuite("lr-wpan-error-model", UNIT) + : TestSuite("lr-wpan-error-model", Type::UNIT) { AddTestCase(new LrWpanErrorModelTestCase, TestCase::Duration::QUICK); AddTestCase(new LrWpanErrorDistanceTestCase, TestCase::Duration::QUICK); diff --git a/src/lr-wpan/test/lr-wpan-ifs-test.cc b/src/lr-wpan/test/lr-wpan-ifs-test.cc index ee9bbfd49..65af73033 100644 --- a/src/lr-wpan/test/lr-wpan-ifs-test.cc +++ b/src/lr-wpan/test/lr-wpan-ifs-test.cc @@ -418,7 +418,7 @@ class LrWpanIfsTestSuite : public TestSuite }; LrWpanIfsTestSuite::LrWpanIfsTestSuite() - : TestSuite("lr-wpan-ifs-test", UNIT) + : TestSuite("lr-wpan-ifs-test", Type::UNIT) { AddTestCase(new LrWpanDataIfsTestCase, TestCase::Duration::QUICK); } diff --git a/src/lr-wpan/test/lr-wpan-mac-test.cc b/src/lr-wpan/test/lr-wpan-mac-test.cc index c973bece0..343c3f1c5 100644 --- a/src/lr-wpan/test/lr-wpan-mac-test.cc +++ b/src/lr-wpan/test/lr-wpan-mac-test.cc @@ -723,7 +723,7 @@ class LrWpanMacTestSuite : public TestSuite }; LrWpanMacTestSuite::LrWpanMacTestSuite() - : TestSuite("lr-wpan-mac-test", UNIT) + : TestSuite("lr-wpan-mac-test", Type::UNIT) { AddTestCase(new TestRxOffWhenIdleAfterCsmaFailure, TestCase::Duration::QUICK); AddTestCase(new TestActiveScanPanDescriptors, TestCase::Duration::QUICK); diff --git a/src/lr-wpan/test/lr-wpan-packet-test.cc b/src/lr-wpan/test/lr-wpan-packet-test.cc index 5f0f62975..1ee619f3c 100644 --- a/src/lr-wpan/test/lr-wpan-packet-test.cc +++ b/src/lr-wpan/test/lr-wpan-packet-test.cc @@ -120,7 +120,7 @@ class LrWpanPacketTestSuite : public TestSuite }; LrWpanPacketTestSuite::LrWpanPacketTestSuite() - : TestSuite("lr-wpan-packet", UNIT) + : TestSuite("lr-wpan-packet", Type::UNIT) { AddTestCase(new LrWpanPacketTestCase, TestCase::Duration::QUICK); } diff --git a/src/lr-wpan/test/lr-wpan-pd-plme-sap-test.cc b/src/lr-wpan/test/lr-wpan-pd-plme-sap-test.cc index d28fc93a6..633d413ef 100644 --- a/src/lr-wpan/test/lr-wpan-pd-plme-sap-test.cc +++ b/src/lr-wpan/test/lr-wpan-pd-plme-sap-test.cc @@ -104,7 +104,7 @@ class LrWpanPlmeAndPdInterfaceTestSuite : public TestSuite }; LrWpanPlmeAndPdInterfaceTestSuite::LrWpanPlmeAndPdInterfaceTestSuite() - : TestSuite("lr-wpan-plme-pd-sap", UNIT) + : TestSuite("lr-wpan-plme-pd-sap", Type::UNIT) { AddTestCase(new LrWpanPlmeAndPdInterfaceTestCase, TestCase::Duration::QUICK); } diff --git a/src/lr-wpan/test/lr-wpan-slotted-csmaca-test.cc b/src/lr-wpan/test/lr-wpan-slotted-csmaca-test.cc index aed5d1ecc..6ddae0da6 100644 --- a/src/lr-wpan/test/lr-wpan-slotted-csmaca-test.cc +++ b/src/lr-wpan/test/lr-wpan-slotted-csmaca-test.cc @@ -351,7 +351,7 @@ class LrWpanSlottedCsmacaTestSuite : public TestSuite }; LrWpanSlottedCsmacaTestSuite::LrWpanSlottedCsmacaTestSuite() - : TestSuite("lr-wpan-slotted-csmaca", UNIT) + : TestSuite("lr-wpan-slotted-csmaca", Type::UNIT) { AddTestCase(new LrWpanSlottedCsmacaTestCase, TestCase::Duration::QUICK); } diff --git a/src/lr-wpan/test/lr-wpan-spectrum-value-helper-test.cc b/src/lr-wpan/test/lr-wpan-spectrum-value-helper-test.cc index 82764a7d2..2f75ebb29 100644 --- a/src/lr-wpan/test/lr-wpan-spectrum-value-helper-test.cc +++ b/src/lr-wpan/test/lr-wpan-spectrum-value-helper-test.cc @@ -85,7 +85,7 @@ class LrWpanSpectrumValueHelperTestSuite : public TestSuite }; LrWpanSpectrumValueHelperTestSuite::LrWpanSpectrumValueHelperTestSuite() - : TestSuite("lr-wpan-spectrum-value-helper", UNIT) + : TestSuite("lr-wpan-spectrum-value-helper", Type::UNIT) { AddTestCase(new LrWpanSpectrumValueHelperTestCase, TestCase::Duration::QUICK); } diff --git a/src/lte/test/epc-test-gtpu.cc b/src/lte/test/epc-test-gtpu.cc index c89dd4c83..38853fa25 100644 --- a/src/lte/test/epc-test-gtpu.cc +++ b/src/lte/test/epc-test-gtpu.cc @@ -33,7 +33,7 @@ NS_LOG_COMPONENT_DEFINE("EpcGtpuTest"); */ EpsGtpuTestSuite::EpsGtpuTestSuite() - : TestSuite("epc-gtpu", SYSTEM) + : TestSuite("epc-gtpu", Type::SYSTEM) { AddTestCase(new EpsGtpuHeaderTestCase(), TestCase::Duration::QUICK); } diff --git a/src/lte/test/epc-test-s1u-downlink.cc b/src/lte/test/epc-test-s1u-downlink.cc index 6680bff16..596c1ab7b 100644 --- a/src/lte/test/epc-test-s1u-downlink.cc +++ b/src/lte/test/epc-test-s1u-downlink.cc @@ -267,7 +267,7 @@ class EpcS1uDlTestSuite : public TestSuite } g_epcS1uDlTestSuiteInstance; EpcS1uDlTestSuite::EpcS1uDlTestSuite() - : TestSuite("epc-s1u-downlink", SYSTEM) + : TestSuite("epc-s1u-downlink", Type::SYSTEM) { std::vector v1; EnbDlTestData e1; diff --git a/src/lte/test/epc-test-s1u-uplink.cc b/src/lte/test/epc-test-s1u-uplink.cc index 478284417..716a911de 100644 --- a/src/lte/test/epc-test-s1u-uplink.cc +++ b/src/lte/test/epc-test-s1u-uplink.cc @@ -508,7 +508,7 @@ class EpcS1uUlTestSuite : public TestSuite } g_epcS1uUlTestSuiteInstance; EpcS1uUlTestSuite::EpcS1uUlTestSuite() - : TestSuite("epc-s1u-uplink", SYSTEM) + : TestSuite("epc-s1u-uplink", Type::SYSTEM) { std::vector v1; EnbUlTestData e1; diff --git a/src/lte/test/lte-test-aggregation-throughput-scale.cc b/src/lte/test/lte-test-aggregation-throughput-scale.cc index 06a2d14e7..a6ee9ef30 100644 --- a/src/lte/test/lte-test-aggregation-throughput-scale.cc +++ b/src/lte/test/lte-test-aggregation-throughput-scale.cc @@ -48,7 +48,7 @@ using namespace ns3; NS_LOG_COMPONENT_DEFINE("LteAggregationThroughputScaleTest"); LteAggregationThroughputScaleTestSuite::LteAggregationThroughputScaleTestSuite() - : TestSuite("lte-aggregation-throughput-scale", SYSTEM) + : TestSuite("lte-aggregation-throughput-scale", Type::SYSTEM) { AddTestCase(new LteAggregationThroughputScaleTestCase("Carrier aggregation throughput scale"), TestCase::Duration::QUICK); diff --git a/src/lte/test/lte-test-carrier-aggregation-configuration.cc b/src/lte/test/lte-test-carrier-aggregation-configuration.cc index 361b6b08f..d709a469f 100644 --- a/src/lte/test/lte-test-carrier-aggregation-configuration.cc +++ b/src/lte/test/lte-test-carrier-aggregation-configuration.cc @@ -397,7 +397,7 @@ class CarrierAggregationConfigTestSuite : public TestSuite }; CarrierAggregationConfigTestSuite::CarrierAggregationConfigTestSuite() - : TestSuite("lte-carrier-aggregation-configuration", SYSTEM) + : TestSuite("lte-carrier-aggregation-configuration", Type::SYSTEM) { std::vector configToCheck; diff --git a/src/lte/test/lte-test-carrier-aggregation.cc b/src/lte/test/lte-test-carrier-aggregation.cc index 5d1209c87..7bb2fc85f 100644 --- a/src/lte/test/lte-test-carrier-aggregation.cc +++ b/src/lte/test/lte-test-carrier-aggregation.cc @@ -80,7 +80,7 @@ LteTestUlSchedulingCallback(CarrierAggregationTestCase* testcase, } TestCarrierAggregationSuite::TestCarrierAggregationSuite() - : TestSuite("lte-carrier-aggregation", SYSTEM) + : TestSuite("lte-carrier-aggregation", Type::SYSTEM) { NS_LOG_INFO("creating CarrierAggregationTestCase"); diff --git a/src/lte/test/lte-test-cell-selection.cc b/src/lte/test/lte-test-cell-selection.cc index d7566e435..c4fd1cbfe 100644 --- a/src/lte/test/lte-test-cell-selection.cc +++ b/src/lte/test/lte-test-cell-selection.cc @@ -60,7 +60,7 @@ NS_LOG_COMPONENT_DEFINE("LteCellSelectionTest"); */ LteCellSelectionTestSuite::LteCellSelectionTestSuite() - : TestSuite("lte-cell-selection", SYSTEM) + : TestSuite("lte-cell-selection", Type::SYSTEM) { std::vector w; diff --git a/src/lte/test/lte-test-cqa-ff-mac-scheduler.cc b/src/lte/test/lte-test-cqa-ff-mac-scheduler.cc index fedd8f87e..58a04f2e9 100644 --- a/src/lte/test/lte-test-cqa-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-cqa-ff-mac-scheduler.cc @@ -65,7 +65,7 @@ using namespace ns3; NS_LOG_COMPONENT_DEFINE("LenaTestCqaFfMacScheduler"); LenaTestCqaFfMacSchedulerSuite::LenaTestCqaFfMacSchedulerSuite() - : TestSuite("lte-cqa-ff-mac-scheduler", SYSTEM) + : TestSuite("lte-cqa-ff-mac-scheduler", Type::SYSTEM) { NS_LOG_INFO("creating LenaTestCqaFfMacSchedulerSuite"); diff --git a/src/lte/test/lte-test-cqi-generation.cc b/src/lte/test/lte-test-cqi-generation.cc index 6ee8087c8..5f4f16801 100644 --- a/src/lte/test/lte-test-cqi-generation.cc +++ b/src/lte/test/lte-test-cqi-generation.cc @@ -89,7 +89,7 @@ LteTestUlSchedulingCallback2(LteCqiGenerationDlPowerControlTestCase* testcase, */ LteCqiGenerationTestSuite::LteCqiGenerationTestSuite() - : TestSuite("lte-cqi-generation", SYSTEM) + : TestSuite("lte-cqi-generation", Type::SYSTEM) { // LogLevel logLevel = (LogLevel)(LOG_PREFIX_FUNC | LOG_PREFIX_TIME | LOG_LEVEL_DEBUG); // LogComponentEnable ("LteCqiGenerationTest", logLevel); diff --git a/src/lte/test/lte-test-deactivate-bearer.cc b/src/lte/test/lte-test-deactivate-bearer.cc index 4e288386b..4feb0252f 100644 --- a/src/lte/test/lte-test-deactivate-bearer.cc +++ b/src/lte/test/lte-test-deactivate-bearer.cc @@ -62,7 +62,7 @@ namespace ns3 { LenaTestBearerDeactivateSuite::LenaTestBearerDeactivateSuite() - : TestSuite("lte-test-deactivate-bearer", SYSTEM) + : TestSuite("lte-test-deactivate-bearer", Type::SYSTEM) { NS_LOG_INFO("creating LenaTestPssFfMacSchedulerSuite"); diff --git a/src/lte/test/lte-test-downlink-power-control.cc b/src/lte/test/lte-test-downlink-power-control.cc index 3b7b15c53..1fb570091 100644 --- a/src/lte/test/lte-test-downlink-power-control.cc +++ b/src/lte/test/lte-test-downlink-power-control.cc @@ -53,7 +53,7 @@ NS_LOG_COMPONENT_DEFINE("LteDownlinkPowerControlTest"); */ LteDownlinkPowerControlTestSuite::LteDownlinkPowerControlTestSuite() - : TestSuite("lte-downlink-power-control", SYSTEM) + : TestSuite("lte-downlink-power-control", Type::SYSTEM) { // LogLevel logLevel = (LogLevel)(LOG_PREFIX_FUNC | LOG_PREFIX_TIME | LOG_LEVEL_DEBUG); // LogComponentEnable ("LteDownlinkPowerControlTest", logLevel); diff --git a/src/lte/test/lte-test-downlink-sinr.cc b/src/lte/test/lte-test-downlink-sinr.cc index 45ac1f605..83356792d 100644 --- a/src/lte/test/lte-test-downlink-sinr.cc +++ b/src/lte/test/lte-test-downlink-sinr.cc @@ -46,7 +46,7 @@ NS_LOG_COMPONENT_DEFINE("LteDownlinkSinrTest"); */ LteDownlinkSinrTestSuite::LteDownlinkSinrTestSuite() - : TestSuite("lte-downlink-sinr", SYSTEM) + : TestSuite("lte-downlink-sinr", Type::SYSTEM) { /** * Build Spectrum Model values for the TX signal diff --git a/src/lte/test/lte-test-earfcn.cc b/src/lte/test/lte-test-earfcn.cc index a1b79fe12..052e9686a 100644 --- a/src/lte/test/lte-test-earfcn.cc +++ b/src/lte/test/lte-test-earfcn.cc @@ -166,7 +166,7 @@ class LteEarfcnTestSuite : public TestSuite static LteEarfcnTestSuite g_lteEarfcnTestSuite; LteEarfcnTestSuite::LteEarfcnTestSuite() - : TestSuite("lte-earfcn", UNIT) + : TestSuite("lte-earfcn", Type::UNIT) { NS_LOG_FUNCTION(this); diff --git a/src/lte/test/lte-test-fdbet-ff-mac-scheduler.cc b/src/lte/test/lte-test-fdbet-ff-mac-scheduler.cc index 7d5c74c0e..40541d47d 100644 --- a/src/lte/test/lte-test-fdbet-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-fdbet-ff-mac-scheduler.cc @@ -56,7 +56,7 @@ using namespace ns3; NS_LOG_COMPONENT_DEFINE("LenaTestFdBetFfMacScheduler"); LenaTestFdBetFfMacSchedulerSuite::LenaTestFdBetFfMacSchedulerSuite() - : TestSuite("lte-fdbet-ff-mac-scheduler", SYSTEM) + : TestSuite("lte-fdbet-ff-mac-scheduler", Type::SYSTEM) { NS_LOG_INFO("creating LenaTestFdBetFfMacSchedulerSuite"); diff --git a/src/lte/test/lte-test-fdmt-ff-mac-scheduler.cc b/src/lte/test/lte-test-fdmt-ff-mac-scheduler.cc index a1ff9a072..5b8c1ba9a 100644 --- a/src/lte/test/lte-test-fdmt-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-fdmt-ff-mac-scheduler.cc @@ -56,7 +56,7 @@ using namespace ns3; NS_LOG_COMPONENT_DEFINE("LenaTestFdMtFfMacScheduler"); LenaTestFdMtFfMacSchedulerSuite::LenaTestFdMtFfMacSchedulerSuite() - : TestSuite("lte-fdmt-ff-mac-scheduler", SYSTEM) + : TestSuite("lte-fdmt-ff-mac-scheduler", Type::SYSTEM) { NS_LOG_INFO("creating LenaTestFdMtFfMacSchedulerSuite"); diff --git a/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc b/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc index 5ed09403e..0140656fa 100644 --- a/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc @@ -63,7 +63,7 @@ using namespace ns3; NS_LOG_COMPONENT_DEFINE("LenaTestFdTbfqFfMacScheduler"); LenaTestFdTbfqFfMacSchedulerSuite::LenaTestFdTbfqFfMacSchedulerSuite() - : TestSuite("lte-fdtbfq-ff-mac-scheduler", SYSTEM) + : TestSuite("lte-fdtbfq-ff-mac-scheduler", Type::SYSTEM) { NS_LOG_INFO("creating LenaTestFdTbfqFfMacSchedulerSuite"); diff --git a/src/lte/test/lte-test-frequency-reuse.cc b/src/lte/test/lte-test-frequency-reuse.cc index b81407660..67a7603d9 100644 --- a/src/lte/test/lte-test-frequency-reuse.cc +++ b/src/lte/test/lte-test-frequency-reuse.cc @@ -57,7 +57,7 @@ NS_LOG_COMPONENT_DEFINE("LteFrequencyReuseTest"); */ LteFrequencyReuseTestSuite::LteFrequencyReuseTestSuite() - : TestSuite("lte-frequency-reuse", SYSTEM) + : TestSuite("lte-frequency-reuse", Type::SYSTEM) { // LogLevel logLevel = (LogLevel)(LOG_PREFIX_FUNC | LOG_PREFIX_TIME | LOG_LEVEL_DEBUG); // LogComponentEnable ("LteFrequencyReuseTest", logLevel); diff --git a/src/lte/test/lte-test-harq.cc b/src/lte/test/lte-test-harq.cc index 29dff474f..3c07cc35a 100644 --- a/src/lte/test/lte-test-harq.cc +++ b/src/lte/test/lte-test-harq.cc @@ -56,7 +56,7 @@ using namespace ns3; NS_LOG_COMPONENT_DEFINE("LenaTestHarq"); LenaTestHarqSuite::LenaTestHarqSuite() - : TestSuite("lte-harq", SYSTEM) + : TestSuite("lte-harq", Type::SYSTEM) { NS_LOG_INFO("creating LenaTestHarqTestCase"); diff --git a/src/lte/test/lte-test-interference-fr.cc b/src/lte/test/lte-test-interference-fr.cc index 083d5f07a..00c99c469 100644 --- a/src/lte/test/lte-test-interference-fr.cc +++ b/src/lte/test/lte-test-interference-fr.cc @@ -51,7 +51,7 @@ NS_LOG_COMPONENT_DEFINE("LteInterferenceFrTest"); */ LteInterferenceFrTestSuite::LteInterferenceFrTestSuite() - : TestSuite("lte-interference-fr", SYSTEM) + : TestSuite("lte-interference-fr", Type::SYSTEM) { // LogLevel logLevel = (LogLevel)(LOG_PREFIX_FUNC | LOG_PREFIX_TIME | LOG_LEVEL_DEBUG); // LogComponentEnable ("LteInterferenceFrTest", logLevel); diff --git a/src/lte/test/lte-test-interference.cc b/src/lte/test/lte-test-interference.cc index 6b10ec40a..9865103e0 100644 --- a/src/lte/test/lte-test-interference.cc +++ b/src/lte/test/lte-test-interference.cc @@ -65,7 +65,7 @@ LteTestUlSchedulingCallback(LteInterferenceTestCase* testcase, */ LteInterferenceTestSuite::LteInterferenceTestSuite() - : TestSuite("lte-interference", SYSTEM) + : TestSuite("lte-interference", Type::SYSTEM) { // these two first test cases have a spectral efficiency that corresponds to CQI=0 (out of // range) diff --git a/src/lte/test/lte-test-ipv6-routing.cc b/src/lte/test/lte-test-ipv6-routing.cc index 68e5e2b6c..5a51ebc69 100644 --- a/src/lte/test/lte-test-ipv6-routing.cc +++ b/src/lte/test/lte-test-ipv6-routing.cc @@ -387,7 +387,7 @@ class LteIpv6RoutingTestSuite : public TestSuite }; LteIpv6RoutingTestSuite::LteIpv6RoutingTestSuite() - : TestSuite("lte-ipv6-routing-test", UNIT) + : TestSuite("lte-ipv6-routing-test", Type::UNIT) { AddTestCase(new LteIpv6RoutingTestCase, TestCase::Duration::QUICK); } diff --git a/src/lte/test/lte-test-link-adaptation.cc b/src/lte/test/lte-test-link-adaptation.cc index 95f393938..c1c820dcf 100644 --- a/src/lte/test/lte-test-link-adaptation.cc +++ b/src/lte/test/lte-test-link-adaptation.cc @@ -52,7 +52,7 @@ LteTestDlSchedulingCallback(LteLinkAdaptationTestCase* testcase, */ LteLinkAdaptationTestSuite::LteLinkAdaptationTestSuite() - : TestSuite("lte-link-adaptation", SYSTEM) + : TestSuite("lte-link-adaptation", Type::SYSTEM) { NS_LOG_INFO("Creating LteLinkAdaptionTestSuite"); diff --git a/src/lte/test/lte-test-mimo.cc b/src/lte/test/lte-test-mimo.cc index 23b0d2aac..cbaf9d3b7 100644 --- a/src/lte/test/lte-test-mimo.cc +++ b/src/lte/test/lte-test-mimo.cc @@ -58,7 +58,7 @@ using namespace ns3; NS_LOG_COMPONENT_DEFINE("LteTestMimo"); LenaTestMimoSuite::LenaTestMimoSuite() - : TestSuite("lte-mimo", SYSTEM) + : TestSuite("lte-mimo", Type::SYSTEM) { NS_LOG_INFO("creating LenaMimoTestCase"); diff --git a/src/lte/test/lte-test-pathloss-model.cc b/src/lte/test/lte-test-pathloss-model.cc index 2df8a3a77..f2107bbe4 100644 --- a/src/lte/test/lte-test-pathloss-model.cc +++ b/src/lte/test/lte-test-pathloss-model.cc @@ -66,7 +66,7 @@ LteTestPathlossDlSchedCallback(LtePathlossModelSystemTestCase* testcase, } LtePathlossModelTestSuite::LtePathlossModelTestSuite() - : TestSuite("lte-pathloss-model", SYSTEM) + : TestSuite("lte-pathloss-model", Type::SYSTEM) { // LogLevel logLevel = (LogLevel)(LOG_PREFIX_FUNC | LOG_PREFIX_TIME | LOG_LEVEL_ALL); // LogComponentEnable ("LteHelper", logLevel); diff --git a/src/lte/test/lte-test-pf-ff-mac-scheduler.cc b/src/lte/test/lte-test-pf-ff-mac-scheduler.cc index 412dac1ca..db9a512a9 100644 --- a/src/lte/test/lte-test-pf-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-pf-ff-mac-scheduler.cc @@ -55,7 +55,7 @@ using namespace ns3; NS_LOG_COMPONENT_DEFINE("LenaTestPfFfMacScheduler"); LenaTestPfFfMacSchedulerSuite::LenaTestPfFfMacSchedulerSuite() - : TestSuite("lte-pf-ff-mac-scheduler", SYSTEM) + : TestSuite("lte-pf-ff-mac-scheduler", Type::SYSTEM) { NS_LOG_INFO("creating LenaTestPfFfMacSchedulerSuite"); diff --git a/src/lte/test/lte-test-phy-error-model.cc b/src/lte/test/lte-test-phy-error-model.cc index 4a611fdc9..dd150c1b4 100644 --- a/src/lte/test/lte-test-phy-error-model.cc +++ b/src/lte/test/lte-test-phy-error-model.cc @@ -57,7 +57,7 @@ using namespace ns3; NS_LOG_COMPONENT_DEFINE("LteTestPhyErrorModel"); LenaTestPhyErrorModelSuite::LenaTestPhyErrorModelSuite() - : TestSuite("lte-phy-error-model", SYSTEM) + : TestSuite("lte-phy-error-model", Type::SYSTEM) { NS_LOG_INFO("creating LenaTestPhyErrorModelTestCase"); diff --git a/src/lte/test/lte-test-primary-cell-change.cc b/src/lte/test/lte-test-primary-cell-change.cc index 751a5b93b..86a522242 100644 --- a/src/lte/test/lte-test-primary-cell-change.cc +++ b/src/lte/test/lte-test-primary-cell-change.cc @@ -49,7 +49,7 @@ NS_LOG_COMPONENT_DEFINE("LtePrimaryCellChangeTest"); */ LtePrimaryCellChangeTestSuite::LtePrimaryCellChangeTestSuite() - : TestSuite("lte-primary-cell-change", SYSTEM) + : TestSuite("lte-primary-cell-change", Type::SYSTEM) { // Test that handover from eNB to eNB with one carrier works within this framework. AddTestCase(new LtePrimaryCellChangeTestCase("ideal RRC, RngRun=1", true, 1, 1, 0, 1), diff --git a/src/lte/test/lte-test-pss-ff-mac-scheduler.cc b/src/lte/test/lte-test-pss-ff-mac-scheduler.cc index 4ba8a8e1b..49e084787 100644 --- a/src/lte/test/lte-test-pss-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-pss-ff-mac-scheduler.cc @@ -63,7 +63,7 @@ using namespace ns3; NS_LOG_COMPONENT_DEFINE("LenaTestPssFfMacScheduler"); LenaTestPssFfMacSchedulerSuite::LenaTestPssFfMacSchedulerSuite() - : TestSuite("lte-pss-ff-mac-scheduler", SYSTEM) + : TestSuite("lte-pss-ff-mac-scheduler", Type::SYSTEM) { NS_LOG_INFO("creating LenaTestPssFfMacSchedulerSuite"); diff --git a/src/lte/test/lte-test-radio-link-failure.cc b/src/lte/test/lte-test-radio-link-failure.cc index edc7f2a75..87f8467b4 100644 --- a/src/lte/test/lte-test-radio-link-failure.cc +++ b/src/lte/test/lte-test-radio-link-failure.cc @@ -46,7 +46,7 @@ NS_LOG_COMPONENT_DEFINE("LteRadioLinkFailureTest"); * Test Suite */ LteRadioLinkFailureTestSuite::LteRadioLinkFailureTestSuite() - : TestSuite("lte-radio-link-failure", SYSTEM) + : TestSuite("lte-radio-link-failure", Type::SYSTEM) { std::vector uePositionList; std::vector enbPositionList; diff --git a/src/lte/test/lte-test-rlc-am-e2e.cc b/src/lte/test/lte-test-rlc-am-e2e.cc index d0a508ed7..5af96a1c5 100644 --- a/src/lte/test/lte-test-rlc-am-e2e.cc +++ b/src/lte/test/lte-test-rlc-am-e2e.cc @@ -41,7 +41,7 @@ using namespace ns3; NS_LOG_COMPONENT_DEFINE("LteRlcAmE2eTest"); LteRlcAmE2eTestSuite::LteRlcAmE2eTestSuite() - : TestSuite("lte-rlc-am-e2e", SYSTEM) + : TestSuite("lte-rlc-am-e2e", Type::SYSTEM) { // NS_LOG_INFO ("Creating LteRlcAmE2eTestSuite"); diff --git a/src/lte/test/lte-test-rlc-am-transmitter.cc b/src/lte/test/lte-test-rlc-am-transmitter.cc index fbe312deb..8e1663bf9 100644 --- a/src/lte/test/lte-test-rlc-am-transmitter.cc +++ b/src/lte/test/lte-test-rlc-am-transmitter.cc @@ -35,7 +35,7 @@ NS_LOG_COMPONENT_DEFINE("LteRlcAmTransmitterTest"); */ LteRlcAmTransmitterTestSuite::LteRlcAmTransmitterTestSuite() - : TestSuite("lte-rlc-am-transmitter", SYSTEM) + : TestSuite("lte-rlc-am-transmitter", Type::SYSTEM) { // LogLevel logLevel = (LogLevel)(LOG_PREFIX_FUNC | LOG_PREFIX_TIME | LOG_LEVEL_ALL); // LogComponentEnable ("LteRlcAmTransmitterTest", logLevel); diff --git a/src/lte/test/lte-test-rlc-um-e2e.cc b/src/lte/test/lte-test-rlc-um-e2e.cc index 4dcb920ae..3d0ef2df9 100644 --- a/src/lte/test/lte-test-rlc-um-e2e.cc +++ b/src/lte/test/lte-test-rlc-um-e2e.cc @@ -48,7 +48,7 @@ NS_LOG_COMPONENT_DEFINE("LteRlcUmE2eTest"); */ LteRlcUmE2eTestSuite::LteRlcUmE2eTestSuite() - : TestSuite("lte-rlc-um-e2e", SYSTEM) + : TestSuite("lte-rlc-um-e2e", Type::SYSTEM) { // NS_LOG_INFO ("Creating LteRlcUmE2eTestSuite"); diff --git a/src/lte/test/lte-test-rlc-um-transmitter.cc b/src/lte/test/lte-test-rlc-um-transmitter.cc index db6ff78d7..f61757704 100644 --- a/src/lte/test/lte-test-rlc-um-transmitter.cc +++ b/src/lte/test/lte-test-rlc-um-transmitter.cc @@ -35,7 +35,7 @@ NS_LOG_COMPONENT_DEFINE("LteRlcUmTransmitterTest"); */ LteRlcUmTransmitterTestSuite::LteRlcUmTransmitterTestSuite() - : TestSuite("lte-rlc-um-transmitter", SYSTEM) + : TestSuite("lte-rlc-um-transmitter", Type::SYSTEM) { // LogLevel logLevel = (LogLevel)(LOG_PREFIX_FUNC | LOG_PREFIX_TIME | LOG_LEVEL_ALL); // LogComponentEnable ("LteRlcUmTransmitterTest", logLevel); diff --git a/src/lte/test/lte-test-rr-ff-mac-scheduler.cc b/src/lte/test/lte-test-rr-ff-mac-scheduler.cc index 6abc16fd1..4f321f91b 100644 --- a/src/lte/test/lte-test-rr-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-rr-ff-mac-scheduler.cc @@ -53,7 +53,7 @@ using namespace ns3; NS_LOG_COMPONENT_DEFINE("LenaTestRrFfMacScheduler"); LenaTestRrFfMacSchedulerSuite::LenaTestRrFfMacSchedulerSuite() - : TestSuite("lte-rr-ff-mac-scheduler", SYSTEM) + : TestSuite("lte-rr-ff-mac-scheduler", Type::SYSTEM) { NS_LOG_INFO("creating LenaRrFfMacSchedulerTestCase"); diff --git a/src/lte/test/lte-test-secondary-cell-handover.cc b/src/lte/test/lte-test-secondary-cell-handover.cc index 7bcef1599..7f0da5d1a 100644 --- a/src/lte/test/lte-test-secondary-cell-handover.cc +++ b/src/lte/test/lte-test-secondary-cell-handover.cc @@ -205,7 +205,7 @@ class LteSecondaryCellHandoverTestSuite : public TestSuite }; LteSecondaryCellHandoverTestSuite::LteSecondaryCellHandoverTestSuite() - : TestSuite{"lte-secondary-cell-handover", SYSTEM} + : TestSuite{"lte-secondary-cell-handover", Type::SYSTEM} { AddTestCase(new LteSecondaryCellHandoverTestCase("Ideal RRC", true), TestCase::Duration::QUICK); AddTestCase(new LteSecondaryCellHandoverTestCase("Real RRC", false), TestCase::Duration::QUICK); diff --git a/src/lte/test/lte-test-secondary-cell-selection.cc b/src/lte/test/lte-test-secondary-cell-selection.cc index e4d15435c..eae6c03c7 100644 --- a/src/lte/test/lte-test-secondary-cell-selection.cc +++ b/src/lte/test/lte-test-secondary-cell-selection.cc @@ -49,7 +49,7 @@ NS_LOG_COMPONENT_DEFINE("LteSecondaryCellSelectionTest"); */ LteSecondaryCellSelectionTestSuite::LteSecondaryCellSelectionTestSuite() - : TestSuite("lte-secondary-cell-selection", SYSTEM) + : TestSuite("lte-secondary-cell-selection", Type::SYSTEM) { // REAL RRC PROTOCOL, either 2 or 4 UEs connecting to 2 or 4 component carriers diff --git a/src/lte/test/lte-test-spectrum-value-helper.cc b/src/lte/test/lte-test-spectrum-value-helper.cc index 25cf84fe4..c31a97698 100644 --- a/src/lte/test/lte-test-spectrum-value-helper.cc +++ b/src/lte/test/lte-test-spectrum-value-helper.cc @@ -224,7 +224,7 @@ class LteSpectrumValueHelperTestSuite : public TestSuite static LteSpectrumValueHelperTestSuite g_lteSpectrumValueHelperTestSuite; LteSpectrumValueHelperTestSuite::LteSpectrumValueHelperTestSuite() - : TestSuite("lte-spectrum-value-helper", UNIT) + : TestSuite("lte-spectrum-value-helper", Type::UNIT) { // LogLevel logLevel = (LogLevel)(LOG_PREFIX_FUNC | LOG_PREFIX_TIME | LOG_LEVEL_ALL); // LogComponentEnable ("LteSpectrumModelTestCase", logLevel); diff --git a/src/lte/test/lte-test-tdbet-ff-mac-scheduler.cc b/src/lte/test/lte-test-tdbet-ff-mac-scheduler.cc index e13559fac..07794b029 100644 --- a/src/lte/test/lte-test-tdbet-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-tdbet-ff-mac-scheduler.cc @@ -56,7 +56,7 @@ using namespace ns3; NS_LOG_COMPONENT_DEFINE("LenaTestTdBetFfMacScheduler"); LenaTestTdBetFfMacSchedulerSuite::LenaTestTdBetFfMacSchedulerSuite() - : TestSuite("lte-tdbet-ff-mac-scheduler", SYSTEM) + : TestSuite("lte-tdbet-ff-mac-scheduler", Type::SYSTEM) { NS_LOG_INFO("creating LenaTestTdBetFfMacSchedulerSuite"); diff --git a/src/lte/test/lte-test-tdmt-ff-mac-scheduler.cc b/src/lte/test/lte-test-tdmt-ff-mac-scheduler.cc index 4cad3d9c0..5fb94a7fd 100644 --- a/src/lte/test/lte-test-tdmt-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-tdmt-ff-mac-scheduler.cc @@ -56,7 +56,7 @@ using namespace ns3; NS_LOG_COMPONENT_DEFINE("LenaTestTdMtFfMacScheduler"); LenaTestTdMtFfMacSchedulerSuite::LenaTestTdMtFfMacSchedulerSuite() - : TestSuite("lte-tdmt-ff-mac-scheduler", SYSTEM) + : TestSuite("lte-tdmt-ff-mac-scheduler", Type::SYSTEM) { NS_LOG_INFO("creating LenaTestTdMtFfMacSchedulerSuite"); diff --git a/src/lte/test/lte-test-tdtbfq-ff-mac-scheduler.cc b/src/lte/test/lte-test-tdtbfq-ff-mac-scheduler.cc index 1dea8ab33..790451da1 100644 --- a/src/lte/test/lte-test-tdtbfq-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-tdtbfq-ff-mac-scheduler.cc @@ -63,7 +63,7 @@ using namespace ns3; NS_LOG_COMPONENT_DEFINE("LenaTestTdTbfqFfMacScheduler"); LenaTestTdTbfqFfMacSchedulerSuite::LenaTestTdTbfqFfMacSchedulerSuite() - : TestSuite("lte-tdtbfq-ff-mac-scheduler", SYSTEM) + : TestSuite("lte-tdtbfq-ff-mac-scheduler", Type::SYSTEM) { NS_LOG_INFO("creating LenaTestTdTbfqFfMacSchedulerSuite"); diff --git a/src/lte/test/lte-test-tta-ff-mac-scheduler.cc b/src/lte/test/lte-test-tta-ff-mac-scheduler.cc index cb441314b..1514cf6a5 100644 --- a/src/lte/test/lte-test-tta-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-tta-ff-mac-scheduler.cc @@ -56,7 +56,7 @@ using namespace ns3; NS_LOG_COMPONENT_DEFINE("LenaTestTtaFfMacScheduler"); LenaTestTtaFfMacSchedulerSuite::LenaTestTtaFfMacSchedulerSuite() - : TestSuite("lte-tta-ff-mac-scheduler", SYSTEM) + : TestSuite("lte-tta-ff-mac-scheduler", Type::SYSTEM) { NS_LOG_INFO("creating LenaTestTtaFfMacSchedulerSuite"); diff --git a/src/lte/test/lte-test-ue-measurements.cc b/src/lte/test/lte-test-ue-measurements.cc index 8f1df3346..0b175714e 100644 --- a/src/lte/test/lte-test-ue-measurements.cc +++ b/src/lte/test/lte-test-ue-measurements.cc @@ -84,7 +84,7 @@ RecvMeasurementReportCallback(LteUeMeasurementsTestCase* testcase, */ LteUeMeasurementsTestSuite::LteUeMeasurementsTestSuite() - : TestSuite("lte-ue-measurements", SYSTEM) + : TestSuite("lte-ue-measurements", Type::SYSTEM) { AddTestCase(new LteUeMeasurementsTestCase("d1=10, d2=10000", 10.000000, @@ -452,7 +452,7 @@ operator<<(std::vector& v, const uint8_t& range) */ LteUeMeasurementsPiecewiseTestSuite1::LteUeMeasurementsPiecewiseTestSuite1() - : TestSuite("lte-ue-measurements-piecewise-1", SYSTEM) + : TestSuite("lte-ue-measurements-piecewise-1", Type::SYSTEM) { std::vector